diff options
| author | Trueffel <106771418+Trueffeloot@users.noreply.github.com> | 2023-11-02 18:42:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-02 19:42:44 +0200 |
| commit | fadcd7bcdfdfa664677e9caaf272dd1895dbd8cd (patch) | |
| tree | c599a139092d389d077bf03651dfabcc5fe58038 /include/d | |
| parent | e1b1ac6a0c4e4b2a85e5ea39ffb80bc6caedc861 (diff) | |
d_a_dbdoor00 OK (#1973)
* initial work on d_a_door_dbdoor00
* dbdoor mostly OK
* finish all functions and header
* remove externs
* remove unused asm
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/a/d_a_player.h | 2 | ||||
| -rw-r--r-- | include/d/com/d_com_inf_game.h | 4 | ||||
| -rw-r--r-- | include/d/d_door_param2.h | 32 | ||||
| -rw-r--r-- | include/d/d_stage.h | 2 |
4 files changed, 23 insertions, 17 deletions
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index e1cad14dbe..3573bce813 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -792,6 +792,8 @@ public: void i_changeDemoPos0(const cXyz* i_posP) { mDemo.setPos0(i_posP); } + void changeDemoMoveAngle(s16 i_angle) { mDemo.setMoveAngle(i_angle); } + inline static u32 i_getLastSceneMode(); inline static u32 getLastSceneMode(); inline static bool checkWoodSwordEquip(); diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 36050fe6f7..1265d0be10 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -2908,6 +2908,10 @@ inline dKy_tevstr_c* dComIfGp_roomControl_getTevStr(int i_roomNo) { return g_dComIfG_gameInfo.play.getRoomControl()->getTevStr(i_roomNo); } +inline BOOL dComIfGp_roomControl_checkRoomDisp(int i_roomNo) { + return g_dComIfG_gameInfo.play.getRoomControl()->checkRoomDisp(i_roomNo); +} + inline BOOL dComIfGp_roomControl_checkStatusFlag(int i_roomNo, u8 flag) { return g_dComIfG_gameInfo.play.getRoomControl()->checkStatusFlag(i_roomNo, flag); } diff --git a/include/d/d_door_param2.h b/include/d/d_door_param2.h index 398af65311..72702e886c 100644 --- a/include/d/d_door_param2.h +++ b/include/d/d_door_param2.h @@ -7,24 +7,24 @@ class fopAc_ac_c; class door_param2_c { public: - /* 8003A188 */ static u8 getKind(fopAc_ac_c* i_actor); - /* 8003A194 */ static u8 getDoorModel(fopAc_ac_c* i_actor); - /* 8003A1A0 */ static u8 getFrontOption(fopAc_ac_c* i_actor); - /* 8003A1AC */ static u8 getBackOption(fopAc_ac_c* i_actor); - /* 8003A1B8 */ static u8 getFRoomNo(fopAc_ac_c* i_actor); - /* 8003A1C4 */ static u8 getBRoomNo(fopAc_ac_c* i_actor); - /* 8003A1D0 */ static u8 getSwbit(fopAc_ac_c* i_actor); - /* 8003A1DC */ static u8 getSwbit2(fopAc_ac_c* i_actor); - /* 8003A1E8 */ static u8 getSwbit3(fopAc_ac_c* i_actor); - /* 8003A1F4 */ static u8 isMsgDoor(fopAc_ac_c* i_actor); - /* 8003A200 */ static u8 getEventNo(fopAc_ac_c* i_actor); - /* 8003A20C */ static u8 getEventNo2(fopAc_ac_c* i_actor); + /* 8003A188 */ static u32 getKind(fopAc_ac_c* i_actor); + /* 8003A194 */ static u32 getDoorModel(fopAc_ac_c* i_actor); + /* 8003A1A0 */ static u32 getFrontOption(fopAc_ac_c* i_actor); + /* 8003A1AC */ static u32 getBackOption(fopAc_ac_c* i_actor); + /* 8003A1B8 */ static u32 getFRoomNo(fopAc_ac_c* i_actor); + /* 8003A1C4 */ static u32 getBRoomNo(fopAc_ac_c* i_actor); + /* 8003A1D0 */ static u32 getSwbit(fopAc_ac_c* i_actor); + /* 8003A1DC */ static u32 getSwbit2(fopAc_ac_c* i_actor); + /* 8003A1E8 */ static u32 getSwbit3(fopAc_ac_c* i_actor); + /* 8003A1F4 */ static u32 isMsgDoor(fopAc_ac_c* i_actor); + /* 8003A200 */ static u32 getEventNo(fopAc_ac_c* i_actor); + /* 8003A20C */ static u32 getEventNo2(fopAc_ac_c* i_actor); /* 8003A218 */ static u16 getMsgNo(fopAc_ac_c* i_actor); /* 8003A224 */ static u8 getExitNo(fopAc_ac_c* i_actor); - /* 8003A230 */ static u8 getFLightInf(fopAc_ac_c* i_actor); - /* 8003A23C */ static u8 getBLightInf(fopAc_ac_c* i_actor); - /* 8003A248 */ static u8 getMFLightInf(fopAc_ac_c* i_actor); - /* 8003A254 */ static u8 getMBLightInf(fopAc_ac_c* i_actor); + /* 8003A230 */ static u32 getFLightInf(fopAc_ac_c* i_actor); + /* 8003A23C */ static u32 getBLightInf(fopAc_ac_c* i_actor); + /* 8003A248 */ static u32 getMFLightInf(fopAc_ac_c* i_actor); + /* 8003A254 */ static u32 getMBLightInf(fopAc_ac_c* i_actor); }; #endif /* D_D_DOOR_PARAM2_H */ diff --git a/include/d/d_stage.h b/include/d/d_stage.h index b1943fc7fb..e919c1ffa7 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -789,7 +789,7 @@ public: /* 800243B0 */ static JKRExpHeap* getMemoryBlock(int); /* 800243E8 */ static void setStayNo(int); /* 80024424 */ static void setNextStayNo(int); - /* 800244E8 */ bool checkRoomDisp(int) const; + /* 800244E8 */ BOOL checkRoomDisp(int) const; /* 8002451C */ int loadRoom(int, u8*, bool); /* 8002471C */ void zoneCountCheck(int) const; /* 80024844 */ static JKRExpHeap* createMemoryBlock(int, u32); |
