4 files changed, 26 insertions, 11 deletions

diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h
index 7c6b438a4d..1d9b4b5a93 100644
--- a/include/d/d_cc_d.h
+++ b/include/d/d_cc_d.h
@@ -144,7 +144,7 @@ public:
     void ClrEffCounter() { mEffCounter = 0; }
     u32 GetGFlag() const { return mGFlag; }
     u32 GetRPrm() const { return mRPrm; }
-    u32 MskSPrm(u32 mask) const { return mGFlag & mask; }
+    u32 MskSPrm(u32 mask) { return mGFlag & mask; }
     u32 MskRPrm(u32 mask) const { return mRPrm & mask; }
     bool ChkSPrm(u32 mask) { return MskSPrm(mask); }
     void OnSPrm(u32 flag) { mGFlag |= flag; }
@@ -173,7 +173,7 @@ public:
     u8 GetSe() { return mSe; }
     dCcG_At_Spl GetSpl() { return (dCcG_At_Spl)mSpl; }
     u8 GetMtrl() { return mMtrl; }
-    u8 GetHitMark() { return mHitMark; }
+    int GetHitMark() { return mHitMark; }
     void SetRVec(cXyz& vec) { mRVec = vec; }
     void SetHitPos(cXyz& pos) { mHitPos = pos; }
     cXyz* GetHitPosP() { return &mHitPos; }
@@ -203,10 +203,10 @@ public:
     void SetHitMark(CcG_Tg_HitMark mark) { mHitMark = mark; }
     s16* GetShieldFrontRangeYAngle() { return mShieldFrontRangeYAngle; }
     s16 GetShieldRange() { return mShieldRange; }
-    u8 GetSpl() { return mSpl; }
+    int GetSpl() { return mSpl; }
     void SetSpl(dCcG_Tg_Spl tg_spl) { mSpl = tg_spl; }
     void SetSpl(u8 tg_spl) { mSpl = tg_spl; }
-    u8 GetHitMark() { return mHitMark; }
+    int GetHitMark() { return mHitMark; }
     void SetRVec(cXyz& vec) { mRVec = vec; }
     cXyz* GetVecP() { return &mVec; }
     cXyz* GetRVecP() { return &mRVec; }
@@ -250,7 +250,7 @@ public:
     void SetRoomId(int id) { mRoomId = id; }
     fpc_ProcID GetAtOldApid() { return mAtOldApid; }
     fpc_ProcID GetTgOldApid() { return mTgOldApid; }
-    bool ChkNoActor() { return field_0x1C & 1;}
+    BOOL ChkNoActor() { return field_0x1C & 1;}
     bool ChkNoneActorPerfTblId() { return field_0x08 == 0xFFFF; }
     dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mAt; }
     void SetAtSpl(dCcG_At_Spl spl) { mAt = spl; }
diff --git a/include/d/d_cc_mass_s.h b/include/d/d_cc_mass_s.h
index c5d6186014..672adb913a 100644
--- a/include/d/d_cc_mass_s.h
+++ b/include/d/d_cc_mass_s.h
@@ -9,7 +9,7 @@ class dCcMassS_Obj {
 private:
     /* 0x00 */ cCcD_Obj* mpObj;
     /* 0x04 */ u8 mPriority;
-    /* 0x08 */ dCcMassS_ObjCallback mpCallback;
+    /* 0x08 */ dCcMassS_ObjCallback mpAreaCheckFunc;
     /* 0x0C */ cCcD_DivideInfo mDivideInfo;
     /* 0x1C vtable */
 
@@ -19,10 +19,10 @@ public:
     void Set(cCcD_Obj* p_obj, u8 priority, dCcMassS_ObjCallback callback);
     void Clear();
 
-    cCcD_Obj* GetObj() { return mpObj; }
+    cCcD_Obj* GetObj() const { return mpObj; }
     u8 GetPriority() const { return mPriority; }
-    dCcMassS_ObjCallback GetCallback() const { return mpCallback; }
-    cCcD_DivideInfo& GetDivideInfo() { return mDivideInfo; }
+    dCcMassS_ObjCallback GetAreaCheckFunc() const { return mpAreaCheckFunc; }
+    cCcD_DivideInfo* GetPDivideInfo() { return &mDivideInfo; }
 };  // Size = 0x20
 
 STATIC_ASSERT(0x20 == sizeof(dCcMassS_Obj));
diff --git a/include/d/d_cc_s.h b/include/d/d_cc_s.h
index dbd3c18285..b4d90787ae 100644
--- a/include/d/d_cc_s.h
+++ b/include/d/d_cc_s.h
@@ -44,6 +44,16 @@ public:
     virtual void MoveAfterCheck();
     virtual void CalcParticleAngle(dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, csXyz*);
 
+    #if DEBUG
+    void OnMassAllTimer() {
+        m_is_mass_all_timer = 1;
+    }
+
+    void OffMassAllTimer() {
+        m_is_mass_all_timer = 0;
+    }
+    #endif
+
     void SetMass(cCcD_Obj* i_obj, u8 i_priority) { mMass_Mng.Set(i_obj, i_priority); }
     void SetMassCam(cM3dGCps& i_cps) { mMass_Mng.SetCam(i_cps); }
     u32 GetMassResultCam() { return mMass_Mng.GetResultCam(); }
@@ -70,7 +80,7 @@ public:
     // /* 0x0000 */ cCcS mCCcS;
     /* 0x284C */ dCcMassS_Mng mMass_Mng;
 #if DEBUG
-    /* 0x2AD0 */ u8 field_0x2ad0;
+    /* 0x2AD0 */ u8 m_is_mass_all_timer;
 #endif
 };  // Size = 0x2AC4
 
diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h
index c239bf8a69..cc67b7104d 100644
--- a/include/d/d_jnt_col.h
+++ b/include/d/d_jnt_col.h
@@ -33,7 +33,7 @@ public:
     void offPassNum(int num) { field_0xc &= ~(1 << num); }
     bool checkShieldType(int i) { return getType(i) == 3; }
 
-    s8 getType(int i) { return mData[i].mType; }
+    int getType(int i) { return mData[i].mType; }
     int getJntNum(int i) { return (s16)mData[i].mJntNum; }
 
     /* 0x00 */ const dJntColData_c* mData;
@@ -64,4 +64,9 @@ public:
 
 };
 
+#if DEBUG
+void dJntCol_setDebugHIO();
+void dJntCol_deleteDebugHIO();
+#endif
+
 #endif /* D_D_JNT_COL_H */