diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-04-21 07:18:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 08:18:49 -0600 |
| commit | e1a0f636e5c68d53b4e00a4cff85700f6588ef1b (patch) | |
| tree | 6e3419441ec2cdfbedf4dbb5abfd6017ac5b3156 /include/d/a | |
| parent | f5fc527d39c754fde87aeb90033d2efd698ad7e2 (diff) | |
e_ym / obj_volcball wip. obj_mgate done (#318)
* e_ym / obj_volcball wip. obj_mgate done
* remove asm
---------
Co-authored-by: root <root@DESKTOP-BTVP2BC>
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/d_a_player.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 229859b2e3..34b0ea5b88 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -377,6 +377,7 @@ public: enum daPy_RFLG1 { RFLG1_UNK_30 = 0x30, RFLG1_UNK_2 = 0x2, + RFLG1_WOLF_ATTACK_REVERSE = 0x1, }; enum { @@ -450,7 +451,7 @@ public: static BOOL checkMasterSwordEquip(); static BOOL checkWoodShieldEquip(); static f32 getAttentionOffsetY(); - s16 checkNowWolfEyeUp(); + static int checkNowWolfEyeUp(); static void forceRestartRoom(int, u32, int); static void setFmChainPos(fopAc_ac_c*, cXyz*, int); static void cancelFmChainGrab(); @@ -709,6 +710,7 @@ public: bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); } bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); } bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); } + bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); } void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); } void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); } @@ -749,6 +751,7 @@ public: void i_offEndResetFlg2(daPy_ERFLG2 flag) { mEndResetFlg2 &= ~flag; } int i_checkResetFlg0(daPy_py_c::daPy_RFLG0 flag) const { return mResetFlg0 & flag; } + int checkResetFlg1(daPy_py_c::daPy_RFLG1 flag) const { return mResetFlg1 & flag; } int i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 flag) const { return mEndResetFlg0 & flag; } int i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 flag) const { return mEndResetFlg1 & flag; } |