Maybe I should commit some thigs

Author: elijah-thomas774

configure.py

@@ -2429,7 +2429,7 @@ def MatchingFor(*versions):
     Rel(NonMatching, "d_a_obj_D3_dummy", "REL/d/a/obj/d_a_obj_D3_dummy.cpp"),
     Rel(NonMatching, "d_a_obj_daynight", "REL/d/a/obj/d_a_obj_daynight.cpp"),
     Rel(NonMatching, "d_a_obj_decoA", "REL/d/a/obj/d_a_obj_decoA.cpp"),
-    Rel(NonMatching, "d_a_obj_decoB", "REL/d/a/obj/d_a_obj_decoB.cpp"),
+    Rel(Matching, "d_a_obj_decoB", "REL/d/a/obj/d_a_obj_decoB.cpp"),
     Rel(NonMatching, "d_a_obj_desert", "REL/d/a/obj/d_a_obj_desert.cpp"),
     Rel(NonMatching, "d_a_obj_desert_ago", "REL/d/a/obj/d_a_obj_desert_ago.cpp"),
     Rel(Matching, "d_a_obj_desert_debris", "REL/d/a/obj/d_a_obj_desert_debris.cpp"),

include/d/a/d_a_base.h

@@ -149,7 +149,7 @@ class dAcBase_c : public dBase_c {
         return mRotation;
     }
 
-    mVec3_c getPostionDifference(const dAcBase_c &other) {
+    mVec3_c getPostionDifference(const dAcBase_c &other) const {
         return mPosition - other.mPosition;
     }
 
@@ -162,10 +162,14 @@ class dAcBase_c : public dBase_c {
         return mPosition.distance(to);
     }
 
-    bool checkBeyondRadius(const mVec3_c &point, f32 radius) {
+    bool checkBeyondRadius(const mVec3_c &point, f32 radius) const {
         return getSquareDistanceTo(point) > radius;
     }
 
+    bool checkWithinRadius(const mVec3_c &point, f32 radius) const {
+        return (mPosition - point).squareMagXZ() < radius * radius;
+    }
+
     u32 getRoomId() {
         return mRoomID;
     }

include/d/a/obj/d_a_obj_bomb.h

@@ -46,10 +46,10 @@ class dAcBomb_c : public dAcObjBase_c {
 
     void setTransformFromFlower(const mMtx_c &);
 
-    void Off_0xA3C(u32 mask) {
+    void unsetField0xA3C(u32 mask) {
         field_0xA3C &= ~mask;
     }
-    void On_0xA3C(u32 mask) {
+    void setField0xA3C(u32 mask) {
         field_0xA3C |= mask;
     }
 

include/d/col/bg/d_bg_s_acch.h

@@ -9,6 +9,8 @@
 #include "d/col/c/c_m3d_g_cyl.h"
 #include "d/col/c/c_m3d_g_lin.h"
 #include "d/col/c/c_m3d_g_pla.h"
+#include "m/m_angle.h"
+#include "m/m_vec.h"
 
 class dAcObjBase_c;
 
@@ -107,11 +109,13 @@ struct dBgS_Acch_0x1A8 {
     u8 field_0x00;
     mVec3_c field_0x04;
     mVec3_c field_0x10;
+    mVec3_c field_0x1C;
 
     dBgS_Acch_0x1A8();
 
     void Init();
     void CalcPos(mVec3_c *);
+    const mVec3_c &GetField_0x1C() const;
 };
 
 class dBgS;
@@ -562,7 +566,6 @@ class dBgS_Acch : public cBgS_Chk, public dBgS_Chk {
     /* 0x0E8 */ f32 field_0x0E8;
     /* 0x0EC */ dBgS_SphChk mSph;
     /* 0x1A8 */ dBgS_Acch_0x1A8 field_0x1A8;
-    /* 0x1C4 */ u8 _0[0x1D0 - 0x1C4];
     /* 0x1D0 */ f32 field_0x1D0;
     /* 0x1D4 */ dBgS_GndChk mGnd;
     /* 0x264 */ dBgS_RoofChk mRoof;

include/d/d_linkage.h

@@ -88,8 +88,8 @@ class dLinkage_c {
     /* 0x14 */ ConnectionType_e mType;
     /* 0x18 */ u16 field_0x18;
     /* 0x1A */ u16 field_0x1A;
-    /* 0x1C */ f32 field_0x1C;
-    /* 0x20 */ f32 field_0x20;
+    /* 0x1C */ f32 field_0x1C; // Used as Y
+    /* 0x20 */ f32 field_0x20; // Used as Z
     /* 0x24 */ f32 field_0x24;
     /* 0x28 */ mMtx_c carryTransMtx;
     /* 0x58 */ mMtx_c field_0x58;

include/d/d_pad.h

@@ -189,11 +189,11 @@ class ex_c {
         return mFSStickMaskChanged && (mFSStickMask & 0xFF) != 0;
     }
 
-    const mVec3_c& getMPLSVelocity() const {
+    const mVec3_c &getMPLSVelocity() const {
         return mMPLSVelocity;
     }
 
-    const mVec2_c& getDpdPosScreen() const {
+    const mVec2_c &getDpdPosScreen() const {
         return mDpdPosScreen;
     }
 

include/d/d_player_act.h

@@ -251,8 +251,8 @@ class daPlayerActBase_c : public daPlBase_c {
     /* vt 0x1C0 */ virtual void *vt_0x1C0() const {
         return nullptr;
     }
-    /* vt 0x1C4 */ virtual UNKWORD getActorInActorRef1() {
-        return 0;
+    /* vt 0x1C4 */ virtual dAcObjBase_c *getActorInActorRef1() {
+        return nullptr;
     }
     /* vt 0x1C8 */ virtual bool doesActorRef1Exist() {
         return false;

include/m/m_angle.h

@@ -16,7 +16,10 @@ struct mAng {
         mVal = val;
         return *this;
     }
-
+    mAng &operator=(const mAng &val) {
+        mVal = val.mVal;
+        return *this;
+    }
     static mAng atan2s(f32 a, f32 b) {
         return mAng(cM::atan2s(a, b));
     }
@@ -40,10 +43,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;
@@ -60,10 +59,21 @@ struct mAng {
         mVal *= other;
         return *this;
     }
-
+    mAng operator*(const mAng &ang) const {
+        return mVal * ang.mVal;
+    }
+    mAng operator*(const f32 f) const {
+        return mVal * f;
+    }
+    mAng operator*(const s32 ang) const {
+        return mVal * ang;
+    }
     static s32 abs(const mAng b) {
         return labs(b);
     }
+    s32 abs() const {
+        return mAng::abs(*this);
+    }
 
     s32 step(s16 target, s32 steps, s16 max, s16 min);
 
@@ -185,6 +195,11 @@ class mAng3_c {
     void addY(f32 val) {
         y.mVal += (s16)val;
     }
+    // TODO - This is the only way I could get the regswap to be fixed..
+    // Found with the pattern mAng3_c.z += cM::rnd()
+    void addZ(f32 val) {
+        z.mVal += (s16)val;
+    }
 
     void addX(const s32 &fx) {
         x += fx;

include/m/m_fader.h

@@ -20,6 +20,10 @@ class mFader_c {
         return isStatus(mFaderBase_c::FADED_IN) || isStatus(mFaderBase_c::FADED_OUT);
     }
 
+    bool isActive() const {
+        return isStatus(mFaderBase_c::FADING_IN) || isStatus(mFaderBase_c::FADING_OUT);
+    }
+
     mFaderBase_c::EStatus getStatus() const {
         return mpFader->getStatus();
     }
@@ -31,6 +35,9 @@ class mFader_c {
     void fadeIn() {
         mpFader->fadeIn();
     }
+    void fadeOut() {
+        mpFader->fadeOut();
+    }
     bool calc() {
         return mpFader->calc();
     }

src/JSystem/JParticle/JPAResource.cpp

@@ -1114,8 +1114,8 @@ void JPAResource::calcWorkData_c(JPAEmitterWorkData* work) {
     Mtx local_scl_mtx, local_rot_mtx, global_mtx;
     MTXScale(local_scl_mtx, work->mpEmtr->mLocalScl.x, work->mpEmtr->mLocalScl.y,
              work->mpEmtr->mLocalScl.z);
-    JPAGetXYZRotateMtx(work->mpEmtr->mLocalRot.x * 182, work->mpEmtr->mLocalRot.y * 182,
-                       work->mpEmtr->mLocalRot.z * 182, local_rot_mtx);
+    JPAGetXYZRotateMtx(work->mpEmtr->mLocalRot.x * (s32)182, work->mpEmtr->mLocalRot.y * (s32)182,
+                       work->mpEmtr->mLocalRot.z * (s32)182, local_rot_mtx);
     MTXScale(global_mtx, work->mpEmtr->mGlobalScl.x, work->mpEmtr->mGlobalScl.y,
              work->mpEmtr->mGlobalScl.z);
     MTXConcat(work->mpEmtr->mGlobalRot, global_mtx, global_mtx);
@@ -1137,8 +1137,8 @@ void JPAResource::calcWorkData_c(JPAEmitterWorkData* work) {
  * calcWorkData_d__11JPAResourceFP18JPAEmitterWorkData          */
 void JPAResource::calcWorkData_d(JPAEmitterWorkData* work) {
     Mtx mtx;
-    JPAGetXYZRotateMtx(work->mpEmtr->mLocalRot.x * 0xB6, work->mpEmtr->mLocalRot.y * 0xB6,
-                       work->mpEmtr->mLocalRot.z * 0xB6, mtx);
+    JPAGetXYZRotateMtx(work->mpEmtr->mLocalRot.x * (s32)182, work->mpEmtr->mLocalRot.y * (s32)182,
+                       work->mpEmtr->mLocalRot.z * (s32)182, mtx);
     MTXConcat(work->mpEmtr->mGlobalRot, mtx, work->mGlobalRot);
     MTXMultVecSR(work->mGlobalRot, work->mpEmtr->mLocalDir, work->mGlobalEmtrDir);
 }