diff options
| author | Carco_21 <144170194+carter-ktb21@users.noreply.github.com> | 2025-12-08 15:10:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-08 22:10:37 +0200 |
| commit | c74ce87f5aa51a91aa5ae6f7361c075996bf6dab (patch) | |
| tree | d2339860aa49dfd9171b80df2cad2b585174df2c /include | |
| parent | 1669731d6c8d721add81ce8e9cb8fc6c9523d2f2 (diff) | |
decent work (#2931)
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_boomerang.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_e_hz.h | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/d/actor/d_a_boomerang.h b/include/d/actor/d_a_boomerang.h index 331adf7973..d4a1335fd7 100644 --- a/include/d/actor/d_a_boomerang.h +++ b/include/d/actor/d_a_boomerang.h @@ -114,7 +114,7 @@ public: u32 checkStateFlg0(daBoomerang_FLG0 i_flag) const { return m_stateFlg0 & i_flag; } void onStateFlg0(daBoomerang_FLG0 flag) { m_stateFlg0 |= flag; } void offStateFlg0(daBoomerang_FLG0 flag) { m_stateFlg0 &= ~flag; } - u32 getReturnFlg() { return checkStateFlg0(FLG0_1); } + u32 getReturnFlg() const { return checkStateFlg0(FLG0_1); } void onWindCatch() { onStateFlg0(WIND_CATCH); } bool checkForceDelete() const { return m_forceDelete; } void onForceDelete() { m_forceDelete = true; } diff --git a/include/d/actor/d_a_e_hz.h b/include/d/actor/d_a_e_hz.h index 9d6a6ce763..7e5902e016 100644 --- a/include/d/actor/d_a_e_hz.h +++ b/include/d/actor/d_a_e_hz.h @@ -17,7 +17,8 @@ * * @details Enemy - Tile Worm * - */ +*/ + class daE_HZ_c : public fopEn_enemy_c { public: void setBck(int, u8, f32, f32); @@ -75,9 +76,9 @@ private: /* 0x674 */ daObjCarry_c* mpCarryActor; /* 0x678 */ cXyz field_0x678; /* 0x684 */ cXyz mSmokeEffectPosition; - /* 0x690 */ csXyz field_0x690; - /* 0x696 */ csXyz field_0x696; - /* 0x69C */ csXyz field_0x69c; + /* 0x690 */ csXyz mBackbone1YZRot; + /* 0x696 */ csXyz mBackbone2YZRot; + /* 0x69C */ csXyz mBackbone3YZRot; /* 0x6A4 */ f32 mPlayerDist; /* 0x6A8 */ f32 field_0x6a8; /* 0x6AC */ f32 mGroundCross; @@ -102,7 +103,7 @@ private: /* 0x6E2 */ s16 mCameraOnTimer; /* 0x6E4 */ u8 field_0x6e4; /* 0x6E5 */ u8 mSetModelAnmMtx; - /* 0x6E6 */ u8 field_0x6E6[0x6E7 - 0x6E6]; + /* 0x6E6 */ u8 field_0x6E6; /* 0x6E7 */ u8 mDisableShadow; // Shadow is active when this is false /* 0x6E8 */ u8 field_0x6e8; /* 0x6E9 */ u8 field_0x6e9; |