diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-08-12 16:30:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-12 16:30:44 -0400 |
| commit | 2eaf012e4f8749bf83a6dc00cf1900f64663a33f (patch) | |
| tree | e4b512b394015bb6ab04946c0b59f37c7f3066a2 /include/d/actor | |
| parent | c5878bf0687e54c23f72e72a1514fe7221b1350e (diff) | |
Fix some version differences (#852)
* Fix some version differences
* Found real inline name for checkBowMiniGame
Diffstat (limited to 'include/d/actor')
| -rw-r--r-- | include/d/actor/d_a_boko.h | 4 | ||||
| -rw-r--r-- | include/d/actor/d_a_npc_os.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_player.h | 4 | ||||
| -rw-r--r-- | include/d/actor/d_a_player_main.h | 2 |
4 files changed, 6 insertions, 6 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) { |
