diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-06-25 07:34:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-25 08:34:59 -0600 |
| commit | d923917b39f99ca74bd2ee2f609e8ff193f5c48a (patch) | |
| tree | 380aeb1dc2527f54e23f7b63ede46b2ce24ff0a8 /include/d/a/d_a_alink.h | |
| parent | 3c82015f69403d22f7ee3809425cb217f5bdc3b5 (diff) | |
work on d_camera / d_ev_camera (#2170)
Diffstat (limited to 'include/d/a/d_a_alink.h')
| -rw-r--r-- | include/d/a/d_a_alink.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 45e6e1398d..773643d9b9 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -2291,7 +2291,7 @@ public: /* 800FE868 */ void setMoveBGClimbCorrect(); /* 800FEB90 */ int checkBgCorrectClimbMove(cXyz*, cXyz*); /* 800FEC70 */ void checkClimbRoof(f32); - /* 800FED50 */ void checkClimbGround(cXyz*, f32); + /* 800FED50 */ int checkClimbGround(cXyz*, f32); /* 800FEEC0 */ void checkBgClimbMove(int); /* 800FF28C */ void setClimbStartNotGround(); /* 800FF450 */ int procClimbUpStartInit(int); @@ -3198,7 +3198,7 @@ public: BOOL grassCancelTrigger() { return itemTriggerCheck(BTN_B); } BOOL arrowChangeTrigger() { return itemActionTrigger(); } bool peepSubjectCancelTrigger() { return itemTriggerCheck(0x8); } - u32 getStartMode() { return (fopAcM_GetParam(this) >> 0xC) & 0x1F; } + int getStartMode() { return (fopAcM_GetParam(this) >> 0xC) & 0x1F; } inline bool checkInputOnR() const; static int getSightBti() { return 0x5B; } bool checkBoomerangChargeEndWait() const { @@ -3378,6 +3378,8 @@ public: void itemHitSE(u32 param_1, u32 param_2, Z2SoundObjBase* param_3) { mZ2Link.startHitItemSE(param_1, param_2, param_3, -1.0f); } + BOOL checkStartFall() { return getStartMode() == 3; } + inline bool checkWindSpeedOnXZ() const; inline void startRestartRoomFromOut(int, u32, int); inline u16 getReadyItem(); |