firewood/tornado/tag_camera done, obj_drop almost (#2190)

* firewood done, obj_drop mostly done

* obj_tornado done, cleanup obj_tornado2

* tag_camera done

* remove asm

* tag_msg done
This commit is contained in:
TakaRikka
2024-08-12 11:34:01 -07:00
committed by GitHub
parent 2fa4bf9f51
commit 2bcec113fb
93 changed files with 1825 additions and 4432 deletions
+1 -1
View File
@@ -2958,7 +2958,7 @@ public:
/* 80140984 */ void statusWindowDraw();
/* 80140AC8 */ void resetStatusWindow();
/* 8018280C */ fopAc_ac_c* getChainGrabActor() { return field_0x2844.getActor(); }
/* 80182814 */ BOOL checkCokkoGlide() const { return mProcID == PROC_AUTO_JUMP && mProcVar2.field_0x300c != 0; }
/* 80182814 */ bool checkCokkoGlide() const { return mProcID == PROC_AUTO_JUMP && mProcVar2.field_0x300c != 0; }
/* 8018283C */ BOOL checkCameraLargeDamage() const { return mProcID == PROC_LARGE_DAMAGE || mProcID == PROC_LARGE_DAMAGE_WALL || mProcID == PROC_LARGE_DAMAGE_UP || mProcID == PROC_WOLF_LARGE_DAMAGE_UP; }
/* 80182870 */ const cXyz& getHsSubChainTopPos() const { return mIronBallBgChkPos; }
/* 80182888 */ BOOL checkCutHeadProc() const { return mProcID == PROC_CUT_HEAD; }
+5
View File
@@ -897,6 +897,11 @@ public:
bool checkWolfEnemyHangBiteOwn(fopAc_ac_c* i_actorP) const { return checkWolfEnemyBiteAllOwn(i_actorP); }
bool checkWolfEnemyLeftThrow() const { return checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); }
void onWolfLightDropGet() {
onEndResetFlg0(ERFLG0_UNK_20000000);
onNoResetFlg3(FLG3_UNK_200000);
}
static daMidna_c* m_midnaActor;
};
+4
View File
@@ -1927,6 +1927,10 @@ inline u8 dComIfGs_getPlayerFieldLastStayRegionNo() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerFieldLastStayInfo().getRegionNo();
}
inline void dComIfGs_setLightDropNum(u8 i_level, u8 i_num) {
g_dComIfG_gameInfo.info.getPlayer().getLightDrop().setLightDropNum(i_level, i_num);
}
void dComIfGp_setSelectItem(int index);
s32 dComIfGp_offHeapLockFlag(int flag);
void dComIfGp_createSubExpHeap2D();
+2
View File
@@ -383,6 +383,8 @@ public:
void setFlag(u32 i_flag) { mEventFlags |= i_flag; }
void clrFlag(u32 i_flag) { mEventFlags &= ~i_flag; }
bool CheckFlag(u32 i_flag) { return mEventFlags & i_flag; }
void ResetView() { setView(0.0f, 0.0f, 608.0f, 448.0f); }
void clearInfo(dCamInfo_c* i_info, s16 param_1) {
+4
View File
@@ -74,6 +74,10 @@ public:
setPosition(i_tboxNo, 0, i_pos, -1);
}
static void setLightDropPostion(int i_tboxNo, const Vec* i_pos) {
setPosition(i_tboxNo, 4, i_pos, -1);
}
static u8 const typeToTypeGroup[17][2];
static type_group_list mTypeGroupListAll[17];
static typeGroupData_c* mTypeGroupData;
+1 -2
View File
@@ -72,8 +72,7 @@ public:
class dPa_followEcallBack : public dPa_levelEcallBack {
public:
/* 80049580 */ dPa_followEcallBack(u8, u8);
/* 80D22230 */ void __defctor(); // compiler generated
/* 80049580 */ dPa_followEcallBack(u8 param_0 = 0, u8 param_1 = 0);
/* 80050200 */ virtual ~dPa_followEcallBack();
/* 800495BC */ virtual void execute(JPABaseEmitter*);