diff options
| author | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-11-20 01:24:43 -0500 |
|---|---|---|
| committer | elijah-thomas774 <elijahthomas774@gmail.com> | 2025-11-22 14:53:36 -0500 |
| commit | b4e57d0f406e8931ae9d9313baee7e704ae5b951 (patch) | |
| tree | 63311a3c0e7dcdf7a82f9162496a9cf447f8e999 /include/d/a | |
| parent | 54c3f67bdfc7de117899055558024b40266202ea (diff) | |
almost there
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/npc/d_a_npc_ce_lady.h | 1 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_barrel.h | 17 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_base.h | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/include/d/a/npc/d_a_npc_ce_lady.h b/include/d/a/npc/d_a_npc_ce_lady.h index 0e11ac72..4afd9267 100644 --- a/include/d/a/npc/d_a_npc_ce_lady.h +++ b/include/d/a/npc/d_a_npc_ce_lady.h @@ -13,6 +13,7 @@ public: bool fn_12_1C20(dAcObjBase_c *); void fn_12_1E00(dAcObjBase_c *, bool *); + void fn_12_1E80(dAcObjBase_c *, bool *); private: /* 0x??? */ STATE_MGR_DECLARE(dAcNpcCeLady_c); diff --git a/include/d/a/obj/d_a_obj_barrel.h b/include/d/a/obj/d_a_obj_barrel.h index b2f9e784..8fee2ca2 100644 --- a/include/d/a/obj/d_a_obj_barrel.h +++ b/include/d/a/obj/d_a_obj_barrel.h @@ -25,7 +25,7 @@ class dAcOBarrel_c : public dAcObjBase_c { public: enum Type { Normal, - Explode, + Bomb, Type2, Kraken, }; @@ -62,7 +62,7 @@ public: /** fn_293_3DB0 */ void fn_293_3DB0(); - /** fn_293_4200 */ + /** Break Barrel */ void fn_293_4200(); /** Check to see if the Barrel should break */ @@ -110,7 +110,7 @@ public: /** fn_293_5850 */ void fn_293_5850(f32 *, bool); - /** fn_293_58C0 */ + /** Set Ground Normal */ void fn_293_58C0(); /** fn_293_5910 */ @@ -136,6 +136,13 @@ public: return mType & 1; } + bool field0x17Check() const { + return field_0xE17 == 0 || field_0xE17 == 1; + } + bool isType_1() const { + return mType & 2; + } + bool checkFlag_0xE18() { return field_0xE18 < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, field_0xE18); } @@ -167,7 +174,9 @@ private: /* 0xDBC */ mVec3_c field_0xDBC; /* 0xDC8 */ mVec3_c field_0xDC8; /* 0xDD4 */ f32 field_0xDD4; - /* 0xDD8 */ mVec3_c field_0xDD8; + /* 0xDD8 */ f32 field_0xDD8; + /* 0xDDC */ f32 field_0xDDC; + /* 0xDE0 */ f32 field_0xDE0; /* 0xDE4 */ mAng3_c field_0xDE4; /* 0xDEA */ mAng field_0xDEA; /* 0xDEC */ mAng field_0xDEC; diff --git a/include/d/a/obj/d_a_obj_base.h b/include/d/a/obj/d_a_obj_base.h index f5137e84..3deba1ae 100644 --- a/include/d/a/obj/d_a_obj_base.h +++ b/include/d/a/obj/d_a_obj_base.h @@ -18,6 +18,7 @@ #include "m/m_mtx.h" #include "m/m_vec.h" #include "m/types_m.h" +#include "nw4r/math/math_arithmetic.h" // Ghidra: ActorObjectBase // size: 0x330 |