diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-05-07 10:02:46 -0400 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2026-05-24 20:34:42 -0400 |
| commit | 5b6788804a0d401aba6b2cfb6dc90e137e6dc02a (patch) | |
| tree | 3679825112e8824061700fe22e0f03d6742cc1de /include/d | |
| parent | 7da9558daa9d376f9be9ab079706dd606ac1fef8 (diff) | |
dAcEKs_c + vt_1C0 name for dAcPy_c
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/a/d_a_player.h | 4 | ||||
| -rw-r--r-- | include/d/a/e/d_a_e_ks.h | 18 | ||||
| -rw-r--r-- | include/d/d_player_act.h | 8 |
3 files changed, 19 insertions, 11 deletions
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index c1d45efd..e5e6669c 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -91,10 +91,6 @@ public: return mHeldResFile; } - inline bool hasvt_0x1C0() const { - return vt_0x1C0() != nullptr; - } - inline bool isAffectedByStaminaPotion() const { return FileManager::GetInstance()->hasStaminaPotionNormal() && getRidingActorType() != RIDING_BOAT; } diff --git a/include/d/a/e/d_a_e_ks.h b/include/d/a/e/d_a_e_ks.h index a16652f1..21f29941 100644 --- a/include/d/a/e/d_a_e_ks.h +++ b/include/d/a/e/d_a_e_ks.h @@ -53,6 +53,9 @@ public: /* 0 -> blink_1, 1 -> blink_2, 2 -> blink_3*/ void setBlink(u8 blink); void setBlinkChecked(u8 blink); + bool fn_155_29D0(s32 p1); + bool fn_155_2D60(bool b, s32 p1); + bool fn_155_2EA0(); bool isOutsideRange(); bool isNotWaitingNorDamage(); bool isTargeted(); @@ -101,10 +104,17 @@ private: /* 0xB8C */ u8 _0xB8C[0xBB0 - 0xB8C]; /* 0xBB0 */ mVec3_c field_0xBB0; /* 0xBBC */ mVec3_c field_0xBBC; - /* 0xBC8 */ u8 _0xBC8[0xC34 - 0xBC8]; - /* 0xD32 */ mAng mPitch_0xC34; - /* 0xD32 */ mAng mYaw_0xC36; - /* 0xC38 */ u8 _0xC38[0xD20 - 0xC38]; + /* 0xBC8 */ u8 _0xBC8[0xBF8 - 0xBC8]; + /* 0xBF8 */ mVec3_c field_0xBF8; + /* 0xC04 */ u8 _0xC04[0xC28 - 0xC04]; + /* 0xC28 */ mVec3_c field_0xC28; + /* 0xC34 */ mAng mPitch_0xC34; + /* 0xC36 */ mAng mYaw_0xC36; + /* 0xC38 */ u8 _0xC38[0xC3C - 0xC38]; + /* 0xC3C */ f32 field_0xC3C; + /* 0xC40 */ f32 field_0xC40; + /* 0xC44 */ u8 _0xC44[0xD1C - 0xC44]; + /* 0xD1C */ f32 field_0xD1C; /* 0xD20 */ f32 field_0xD20; /* 0xD24 */ u8 _0xD24[0xD32 - 0xD24]; /* 0xD32 */ s16 mTimer; diff --git a/include/d/d_player_act.h b/include/d/d_player_act.h index 1d4a0096..a9a9a2b3 100644 --- a/include/d/d_player_act.h +++ b/include/d/d_player_act.h @@ -250,7 +250,9 @@ public: /* vt 0x1BC */ virtual UNKWORD vt_0x1BC() { return 0; } - /* vt 0x1C0 */ virtual void *vt_0x1C0() const { + + // I believe this can only return the Beetle Actor in-flight (not on hand) + /* vt 0x1C0 */ virtual dAcObjBase_c *getBeetleInFlight() const { return nullptr; } /* vt 0x1C4 */ virtual UNKWORD getActorInActorRef1() { @@ -648,8 +650,8 @@ public: return mSpecificAttackDirection; } - inline bool hasvt_0x1C0() const { - return vt_0x1C0() != nullptr; + inline bool isBeetleInFlight() const { + return getBeetleInFlight() != nullptr; } static s32 getCurrentSwordTypeInline() { |