almost there

5 files changed, 17 insertions, 10 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
diff --git a/include/d/col/c/c_m3d_g_pla.h b/include/d/col/c/c_m3d_g_pla.h
index 2ead0cff..2e178d45 100644
--- a/include/d/col/c/c_m3d_g_pla.h
+++ b/include/d/col/c/c_m3d_g_pla.h
@@ -55,8 +55,8 @@ public:
     void SetupFrom3Vtx(const nw4r::math::VEC3 *v1, const nw4r::math::VEC3 *v2, const nw4r::math::VEC3 *v3) {
         cM3d_CalcPla(v1, v2, v3, &mNormal, &mD);
     }
-    f32 getCrossY_NonIsZero(const mVec3_c *param_1) {
-        return -(mNormal.x * param_1->x + mNormal.z * param_1->z) / mNormal.y;
+    f32 getCrossY_NonIsZero(const mVec3_c *param_1) const {
+        return -(param_1->x * mNormal.x + mNormal.z * param_1->z) / mNormal.y;
     }
 
     f32 GetXZDist() const {
diff --git a/include/m/m_angle.h b/include/m/m_angle.h
index 9913a15a..a6d8fe0f 100644
--- a/include/m/m_angle.h
+++ b/include/m/m_angle.h
@@ -48,10 +48,6 @@ struct mAng {
         return mAng(-mVal);
     }
 
-    mAng operator+(const mAng &other) const {
-        return mAng(mVal + other.mVal);
-    }
-
     mAng &operator+=(const mAng &other) {
         mVal += other.mVal;
         return *this;