diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-04-18 14:35:02 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-04-18 14:35:02 -0400 |
| commit | 9f4cf0c308b483556a513d6b438041a47b52a71a (patch) | |
| tree | 1bd9fac212402c5d82c5f5aeb3440f257b86f8b0 /include | |
| parent | 5d27cfd9a517fc13342c3b9bef917647c66c8d0c (diff) | |
dAcEremly_c equivalent
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/e/d_a_e_remly.h | 15 | ||||
| -rw-r--r-- | include/d/a/e/d_a_en_base.h | 2 | ||||
| -rw-r--r-- | include/m/m_angle.h | 2 | ||||
| -rw-r--r-- | include/toBeSorted/event_manager.h | 3 |
4 files changed, 17 insertions, 5 deletions
diff --git a/include/d/a/e/d_a_e_remly.h b/include/d/a/e/d_a_e_remly.h index f90d622d..7935e323 100644 --- a/include/d/a/e/d_a_e_remly.h +++ b/include/d/a/e/d_a_e_remly.h @@ -100,6 +100,10 @@ public: STATE_FUNC_DECLARE(dAcEremly_c, NightJumpAttack); STATE_FUNC_DECLARE(dAcEremly_c, BirthWait); + bool isState(State_e state) { + return field_0xB60 == (u32)state; + } + STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dAcEremly_c); STATE_MGR_DEFINE_UTIL_ISSTATE(dAcEremly_c); STATE_MGR_DEFINE_UTIL_CHANGESTATE(dAcEremly_c); @@ -167,9 +171,12 @@ private: /* 0xA5C */ dWaterEffect_c mWaterEffect; /* 0xAA4 */ mVec3_c field_0xAA4; - - /* 0xAB0 */ u8 _AB0[0xAF8 - 0xAB0]; - + /* 0xAB0 */ mVec3_c field_0xAB0; + /* 0xABC */ mVec3_c field_0xABC; + /* 0xAC8 */ mVec3_c field_0xAC8; + /* 0xAD4 */ mVec3_c field_0xAD4; + /* 0xAE0 */ mVec3_c field_0xAE0; + /* 0xAEC */ mVec3_c field_0xAEC; /* 0xAF8 */ mVec3_c field_0xAF8; /* 0xB04 */ f32 field_0xB04; @@ -207,7 +214,7 @@ private: /* 0xB60 */ u8 field_0xB60; // Some State representation /* 0xB61 */ u8 field_0xB61; /* 0xB62 */ u8 mSleepDemoPlayedSceneflag; - /* */ u8 _B63; + /* 0xB63 */ u8 field_0xB63; /* 0xB64 */ u8 field_0xB64; /* 0xB65 */ u8 field_0xB65; /* 0xB66 */ u8 field_0xB66; diff --git a/include/d/a/e/d_a_en_base.h b/include/d/a/e/d_a_en_base.h index 77eb12e4..4424cfdf 100644 --- a/include/d/a/e/d_a_en_base.h +++ b/include/d/a/e/d_a_en_base.h @@ -70,7 +70,7 @@ public: // Deals with dealing damage to Enemy // Returns a value 0-13 (similar to mStts rank?) - int fn_8002fde0(cCcD_Obj &mCc, u16 *pTgOut); + int fn_8002FDE0(cCcD_Obj &mCc, u16 *pTgOut); void fn_80030030(const mVec3_c &pos, s16 &, s16 &, f32); // Returns 0-3 based on collision int fn_800301b0(const mVec3_c &pos, mAng ang, bool, f32); diff --git a/include/m/m_angle.h b/include/m/m_angle.h index 4aea9f51..bd3e30f3 100644 --- a/include/m/m_angle.h +++ b/include/m/m_angle.h @@ -68,6 +68,8 @@ public: s32 absDiff(const mAng &other) const { return sLib::absDiff(mVal, other.mVal); } + // NOTE: Try not to use this one... + // May need a better home in future. template <typename T> static s32 absDiff2(T a, T b) { return abs(a - b); diff --git a/include/toBeSorted/event_manager.h b/include/toBeSorted/event_manager.h index 3f3946ab..929cb869 100644 --- a/include/toBeSorted/event_manager.h +++ b/include/toBeSorted/event_manager.h @@ -20,6 +20,9 @@ public: static bool canSkipCurrentEvent(); static dAcBase_c *getMainActorInEvent(); + static Event *getSkipOnlyEvent(); + static bool fn_800A0B80(); + static void fn_8009FA10(dAcBase_c *actor, Event *event, void *unknown); static void execute(); static EventManager *sInstance; |