mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-01 16:10:00 -04:00
Fix some version differences (#852)
* Fix some version differences * Found real inline name for checkBowMiniGame
This commit is contained in:
@@ -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*);
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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 {}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user