5 files changed, 12 insertions, 7 deletions
diff --git a/include/SSystem/SComponent/c_bg_s_shdw_draw.h b/include/SSystem/SComponent/c_bg_s_shdw_draw.h
index e99a933b70..9ec3023306 100644
--- a/include/SSystem/SComponent/c_bg_s_shdw_draw.h
+++ b/include/SSystem/SComponent/c_bg_s_shdw_draw.h
@@ -20,6 +20,9 @@ public:
 
     /* 0x14 */ cM3dGAab mM3dGAab;
     /* 0x30 */ cBgS_ShdwDraw_Callback mCallbackFun;
+    #if DEBUG
+    /* 0x34 */ int field_0x34;
+    #endif
 };
 
 #endif /* C_BG_S_SHDW_DRAW_H */
diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h
index f1d5e291b4..23c6747d15 100644
--- a/include/SSystem/SComponent/c_bg_w.h
+++ b/include/SSystem/SComponent/c_bg_w.h
@@ -18,7 +18,7 @@ public:
     cBgW_BgId() { Ct(); }
     void Ct() { m_id = 0x100; }
 
-    u16 GetId() const { return m_id; }
+    int GetId() const { return m_id; }
 };
 
 bool cBgW_CheckBGround(float a1);
diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h
index 6317065a31..b070e776eb 100644
--- a/include/SSystem/SComponent/c_m3d_g_aab.h
+++ b/include/SSystem/SComponent/c_m3d_g_aab.h
@@ -35,16 +35,16 @@ public:
     const f32 GetMinX(void) const { return mMin.x; }
     const f32 GetMinY(void) const { return mMin.y; }
     const f32 GetMinZ(void) const { return mMin.z; }
-    bool Cross(const cM3dGLin *param_1) {
+    bool Cross(const cM3dGLin *param_1) const {
         return cM3d_Cross_MinMaxBoxLine(GetMinP(), GetMaxP(), (Vec*)&param_1->GetStartP(), (Vec*)&param_1->GetEndP());
     }
-    bool Cross(const cM3dGAab *param_1) {
+    bool Cross(const cM3dGAab *param_1) const {
         return cM3d_Cross_AabAab(this, param_1);
     }
-    bool Cross(const cM3dGCyl *param_1) {
+    bool Cross(const cM3dGCyl *param_1) const {
         return cM3d_Cross_AabCyl(this, param_1);
     }
-    bool Cross(const cM3dGSph *param_1) {
+    bool Cross(const cM3dGSph *param_1) const {
         return cM3d_Cross_AabSph(this, param_1);
     }
 };  // Size = 0x1C
diff --git a/include/SSystem/SComponent/c_m3d_g_cir.h b/include/SSystem/SComponent/c_m3d_g_cir.h
index eccd553c86..af837d47d6 100644
--- a/include/SSystem/SComponent/c_m3d_g_cir.h
+++ b/include/SSystem/SComponent/c_m3d_g_cir.h
@@ -30,6 +30,8 @@ public:
     cM3dGCir(void);
     virtual ~cM3dGCir(void);
     void Set(f32, f32, f32, f32);
+
+    f32 GetHeight() const { return mPosZ; }
 };
 
 #endif /* C_M3D_G_CIR_H */
diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h
index 7f25724b55..e2b0eefb55 100644
--- a/include/SSystem/SComponent/c_m3d_g_pla.h
+++ b/include/SSystem/SComponent/c_m3d_g_pla.h
@@ -31,8 +31,8 @@ public:
         cM3d_CalcPla(v1, v2, v3, &mNormal, &mD);
     }
 
-    f32 getCrossY_NonIsZero(const cXyz *param_1) {
-        return ((-mNormal.x * param_1->x - mNormal.z * param_1->z) - mD) / mNormal.y;
+    f32 getCrossY_NonIsZero(const cXyz& param_1) const {
+        return ((-mNormal.x * param_1.x - mNormal.z * param_1.z) - mD) / mNormal.y;
     }
 
     bool cross(cM3dGLin const& line, Vec& point) {