Fix some version differences (#852)

* Fix some version differences

* Found real inline name for checkBowMiniGame

6 files changed, 44 insertions, 19 deletions

diff --git a/include/d/actor/d_a_boko.h b/include/d/actor/d_a_boko.h
index 2a6c36db..4d9270cd 100644
--- a/include/d/actor/d_a_boko.h
+++ b/include/d/actor/d_a_boko.h
@@ -47,7 +47,7 @@ public:
     f32 getBlurRate() { return m_blur_rate[fopAcM_GetParam(this)]; }
     u8 getSeType() { return m_se_type[fopAcM_GetParam(this)]; }
     
-    void getFlameTimer() {}
+    int getFlameTimer() { return m2C4; }
     void getNowMode() {}
     void setNowMode(int) {}
     void moveStateInit(f32 speedForward, f32 speedY, s16 angleY) {
@@ -62,7 +62,7 @@ public:
         }
     }
     void setRotAngleSpeed(s16 speed) { m2C2 = speed; }
-    void setThrow(s16) {} // maybe m2BA
+    void setThrow(s16 param_0) { m2BA = param_0; }
 
     void getTopPos(cXyz*);
     void getBlurRootPos(cXyz*);
diff --git a/include/d/actor/d_a_npc_os.h b/include/d/actor/d_a_npc_os.h
index 386414e7..13fd2e39 100644
--- a/include/d/actor/d_a_npc_os.h
+++ b/include/d/actor/d_a_npc_os.h
@@ -72,7 +72,7 @@ public:
     void setCattleRoomNo(s8 roomNo) { m_cattleRoomNo = roomNo; }
 
     static bool isPlayerRoom(int idx) { return m_playerRoom[idx]; }
-    static bool isPlayerRoom_Goat() { return isPlayerRoom(1) == 1; }
+    static bool isPlayerRoom_Goat() { return isPlayerRoom(1) == true; }
 
     cPhs_State create();
     BOOL createHeap();
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index 4e684934..4d7139d6 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -98,7 +98,7 @@ public:
         /* 0x041 */ DEMO_FOODSET_e = 65,
         /* 0x042 */ DEMO_SWAIT_e = 66,
         /* 0x043 */ DEMO_PWAIT_067_e = 67,
-        /* 0x044 */ DEMO_UNK_068_e = 68,
+        /* 0x044 */ DEMO_BOW_MINIGAME_e = 68,
         /* 0x045 */ DEMO_SHIPSIT_e = 69,
         /* 0x046 */ DEMO_UNK_070_e = 70,
         /* 0x047 */ DEMO_SHIPOFF_e = 71,
@@ -551,7 +551,7 @@ public:
     void setFace(daPy_FACE face) { mFace = face; }
     
     BOOL checkSwordMiniGame() const { return dComIfGp_getMiniGameType() == 2; }
-    void checkBowMiniGame() const {}
+    BOOL checkBowMiniGame() const { return mDemo.getDemoMode() == daPy_demo_c::DEMO_BOW_MINIGAME_e; }
     void checkSoupPowerUp() const {}
     void checkSubjectAccept() const {}
     void getRopeJumpLand() const {}
diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
index 62e13ec8..5fa121d2 100644
--- a/include/d/actor/d_a_player_main.h
+++ b/include/d/actor/d_a_player_main.h
@@ -1865,7 +1865,7 @@ public:
     BOOL allTrigger() const { return mItemTrigger & (BTN_A | BTN_B | BTN_X | BTN_Y | BTN_Z); }
     void otherWeaponTrigger() const {}
     
-    BOOL checkPlayerDemoMode() const { return mDemo.getDemoType()  != 0; }
+    BOOL checkPlayerDemoMode() const { return mDemo.getDemoType() != 0; }
     void checkSpecialDemoMode() const {}
     
     f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) {
diff --git a/include/d/d_attention.h b/include/d/d_attention.h
index a0f5c1ec..bf2b5e9a 100644
--- a/include/d/d_attention.h
+++ b/include/d/d_attention.h
@@ -230,8 +230,8 @@ public:
     fopAc_ac_c* getLook2Target() { return mLook[1].getLookTarget(); }
     fopAc_ac_c* getZHintTarget() { return mHint.getZHintTarget(); }
 
-    int ZHintRequest(fopAc_ac_c* param_1, int param_2) {
-        return mHint.request(param_1, param_2);
+    int ZHintRequest(fopAc_ac_c* i_actor, int priority) {
+        return mHint.request(i_actor, priority);
     }
 
     int GetLockonCount() { return mLockonCount; }
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 183c187d..c636635b 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -354,6 +354,7 @@ public:
     void setStageNameDelete() { mPlacenameState = 0; }
     void setStageNameOff() { mPlacenameState = 1; }
 
+    u8 getGameoverStatus() { return mGameoverStatus; }
     void setGameoverStatus(u8 stts) { mGameoverStatus = stts; }
 
     fopAc_ac_c* getPlayer(int idx) { return mPlayerInfo[idx].mpPlayer; }
@@ -375,6 +376,7 @@ public:
         mItemTimer = timer;
         mStartItemTimer = false;
     }
+    void startItemTimer() { mStartItemTimer = true; }
 
     int getMessageRupee() { return mMessageRupee; }
     void setMessageRupee(s16 count) { mMessageRupee = count; }
@@ -497,7 +499,7 @@ public:
 
     void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] |= flag; }
     void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] &= ~flag; }
-    BOOL checkPlayerStatus(int param_0, int i, u32 flag) { return mPlayerStatus[param_0][i] & flag; }
+    u32 checkPlayerStatus(int param_0, int i, u32 flag) { return mPlayerStatus[param_0][i] & flag; }
 
     u8 getSelectItem(int idx) { return mSelectItem[idx]; }
     void setSelectItem(int idx, u8 itemNo) { mSelectItem[idx] = itemNo; }
@@ -632,8 +634,7 @@ public:
     u8 getPictureResultDetail() { return mPictureResultDetail; }
     void setBossBattleData(JKRAramBlock* aramBlock, int i) { mBossBattleData[i] = aramBlock; }
 
-    void startItemTimer() { mStartItemTimer = true; }
-
+    void startFwaterTimer() { mFwaterTimer = 1; }
     void stopFwaterTimer() { mFwaterTimer = 0; }
     u8 checkFwaterTimer() { return mFwaterTimer; }
 
@@ -942,6 +943,10 @@ inline int dComIfGs_getRupee() {
     return g_dComIfG_gameInfo.save.getPlayer().getPlayerStatusA().getRupee();
 }
 
+inline void dComIfGp_startItemTimer() {
+    g_dComIfG_gameInfo.play.startItemTimer();
+}
+
 inline int dComIfGp_getItemTimer() {
     return g_dComIfG_gameInfo.play.getItemTimer();
 }
@@ -950,6 +955,10 @@ inline void dComIfGp_resetItemTimer(s16 timer) {
     g_dComIfG_gameInfo.play.resetItemTimer(timer);
 }
 
+inline void dComIfGp_decItemTimer() {
+    // TODO
+}
+
 inline int dComIfGp_getMessageRupee() {
     return g_dComIfG_gameInfo.play.getMessageRupee();
 }
@@ -1212,10 +1221,6 @@ inline void dComIfGs_setPictureNum(u8 num) {
     g_dComIfG_gameInfo.save.getPlayer().getItemRecord().setPictureNum(num);
 }
 
-inline u16 dComIfGs_getFwaterTimer() {
-    return g_dComIfG_gameInfo.save.getPlayer().getItemRecord().getTimer();
-}
-
 inline u8 dComIfGs_getBeastNum(int i_idx) {
     return g_dComIfG_gameInfo.save.getPlayer().getBagItemRecord().getBeastNum(i_idx);
 }
@@ -1252,6 +1257,10 @@ inline void dComIfGs_setReserveItemEmpty() {
     g_dComIfG_gameInfo.save.getPlayer().getBagItem().setReserveItemEmpty();
 }
 
+inline void dComIfGs_setReserveItemEmpty(u8 i_itemBtn) {
+    g_dComIfG_gameInfo.save.getPlayer().getBagItem().setReserveItemEmpty(i_itemBtn);
+}
+
 inline void dComIfGs_setReserveBaitEmpty(u8 i_itemBtn) {
     g_dComIfG_gameInfo.save.getPlayer().getBagItem().setBaitItemEmpty(i_itemBtn);
 }
@@ -2037,8 +2046,12 @@ stage_scls_info_class* dComIfGd_getMeshSceneList(Vec& vec);
 
 BOOL dComIfGs_checkSeaLandingEvent(s8 i_roomNo);
 
-inline void dComIfGp_startItemTimer() {
-    g_dComIfG_gameInfo.play.startItemTimer();
+inline u16 dComIfGs_getFwaterTimer() {
+    return g_dComIfG_gameInfo.save.getPlayer().getItemRecord().getTimer();
+}
+
+inline void dComIfGs_startFwaterTimer() {
+    g_dComIfG_gameInfo.play.startFwaterTimer();
 }
 
 inline void dComIfGs_stopFwaterTimer() {
@@ -2049,6 +2062,14 @@ inline u8 dComIfGs_checkFwaterTimer() {
     return g_dComIfG_gameInfo.play.checkFwaterTimer();
 }
 
+inline void dComIfGs_resetFwaterTimer(u16) {
+    // TODO
+}
+
+inline void dComIfGs_decFwaterTimer() {
+    // TODO
+}
+
 void dComIfGs_setPlayerRecollectionData();
 void dComIfGs_revPlayerRecollectionData();
 
@@ -2097,6 +2118,10 @@ inline void dComIfGp_setStageNameOff() {
     g_dComIfG_gameInfo.play.setStageNameOff();
 }
 
+inline u8 dComIfGp_getGameoverStatus() {
+    return g_dComIfG_gameInfo.play.getGameoverStatus();
+}
+
 inline void dComIfGp_setGameoverStatus(u8 stts) {
     g_dComIfG_gameInfo.play.setGameoverStatus(stts);
 }
@@ -3967,8 +3992,8 @@ inline void dComIfGp_att_offAleart() {
     dComIfGp_getAttention().offAleart();
 }
 
-inline int dComIfGp_att_ZHintRequest(fopAc_ac_c* param_1, int param_2) {
-    return dComIfGp_getAttention().ZHintRequest(param_1, param_2);
+inline int dComIfGp_att_ZHintRequest(fopAc_ac_c* i_actor, int priority) {
+    return dComIfGp_getAttention().ZHintRequest(i_actor, priority);
 }
 
 inline void dComIfGp_att_LookRequest(fopAc_ac_c* param_0, f32 i_horizontalDist, f32 i_upDist,