Demo work, d_a_kytag02 and d_a_ff OK

7 files changed, 30 insertions, 9 deletions

diff --git a/include/JSystem/JAudio/JAIAnimation.h b/include/JSystem/JAudio/JAIAnimation.h
index 9df25641..8fef132c 100644
--- a/include/JSystem/JAudio/JAIAnimation.h
+++ b/include/JSystem/JAudio/JAIAnimation.h
@@ -31,7 +31,7 @@ struct JAIAnimeSoundData {
     /* 0x02 */ u16 field_0x02;
     /* 0x04 */ void* field_0x04;
     /* 0x08 */ JAIAnimeFrameSoundData mAfsData[];
-};  // Size: 0x20
+};
 
 struct JAIAnimeSound__Slot {
     /* 0x0 */ u8 mbIsPlaying;
diff --git a/include/SSystem/SComponent/c_bg_s.h b/include/SSystem/SComponent/c_bg_s.h
index c71b3318..63aa4139 100644
--- a/include/SSystem/SComponent/c_bg_s.h
+++ b/include/SSystem/SComponent/c_bg_s.h
@@ -45,6 +45,13 @@ public:
     cM3dGPla* GetTriPla(cBgS_PolyInfo& polyInfo) const {
         return GetTriPla(polyInfo.GetBgIndex(), polyInfo.GetPolyIndex());
     }
+    s32 GetTriGrp(cBgS_PolyInfo& polyInfo) const {
+        return GetTriGrp(polyInfo.GetBgIndex(), polyInfo.GetPolyIndex());
+    }
+    fopAc_ac_c* GetActorPointer(cBgS_PolyInfo& i_poly) const {
+        return GetActorPointer(i_poly.GetBgIndex());
+    }
+
     bool Regist(cBgW*, fpc_ProcID, void*);
     bool Release(cBgW*);
     bool LineCross(cBgS_LinChk*);
diff --git a/include/d/actor/d_a_ff.h b/include/d/actor/d_a_ff.h
index 4bea48ec..c6309e5e 100644
--- a/include/d/actor/d_a_ff.h
+++ b/include/d/actor/d_a_ff.h
@@ -31,7 +31,7 @@ public:
     /* 0x306 */ s16 mTargetRotY;
     /* 0x308 */ s16 mTimers[5];
     /* 0x312 */ s16 mLiveTimer;
-    /* 0x314 */ u8 mState;
+    /* 0x314 */ s8 mMode;
     /* 0x315 */ u8 m315[0x317 - 0x315];
     /* 0x317 */ u8 mbNotVisibleZ;
     /* 0x318 */ dCcD_Stts mStts;
diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
index 757d2700..22c4b78b 100644
--- a/include/d/actor/d_a_player_main.h
+++ b/include/d/actor/d_a_player_main.h
@@ -1835,7 +1835,7 @@ public:
     BOOL allTrigger() const { return mItemTrigger & (BTN_A | BTN_B | BTN_X | BTN_Y | BTN_Z); }
     void otherWeaponTrigger() const {}
     
-    BOOL checkPlayerDemoMode() const { return mDemo.getDemoType(); }
+    BOOL checkPlayerDemoMode() const { return mDemo.getDemoType()  != 0; }
     void checkSpecialDemoMode() const {}
     
     void checkAttentionLock() {}
diff --git a/include/d/actor/d_a_swc00.h b/include/d/actor/d_a_swc00.h
index bd1bab20..e0ad2c3b 100644
--- a/include/d/actor/d_a_swc00.h
+++ b/include/d/actor/d_a_swc00.h
@@ -6,8 +6,8 @@
 
 class swc00_class : public fopAc_ac_c {};
 
-static inline s32 daSwc00_getSw1No(swc00_class* i_this) { return fopAcM_GetParam(i_this) & 0xFF; }
-static inline s32 daSwc00_getSw2No(swc00_class* i_this) { return (fopAcM_GetParam(i_this) >> 8) & 0xFF; }
-static inline s32 daSwc00_getType(swc00_class* i_this) { return (fopAcM_GetParam(i_this) >> 0x10) & 0x3; }
+static inline int daSwc00_getSw1No(swc00_class* i_this) { return fopAcM_GetParam(i_this) & 0xFF; }
+static inline int daSwc00_getSw2No(swc00_class* i_this) { return (fopAcM_GetParam(i_this) >> 8) & 0xFF; }
+static inline int daSwc00_getType(swc00_class* i_this) { return (fopAcM_GetParam(i_this) >> 0x10) & 0x3; }
 
 #endif /* D_A_SWC00_H */
diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h
index 42680cf2..74e22221 100644
--- a/include/d/d_bg_s.h
+++ b/include/d/d_bg_s.h
@@ -65,6 +65,22 @@ public:
     dBgS() {}
     virtual ~dBgS() {}
 
+    bool WaterChk(dBgS_SplGrpChk* chk) { return SplGrpChk(chk); }
+    fopAc_ac_c* GetActorPointer(cBgS_PolyInfo& i_poly) const {
+        return cBgS::GetActorPointer(i_poly);
+    }
+
+    // void CaptPoly(dBgS_CaptPoly&) {}
+    // void ChkDeleteActorRegist(fopAc_ac_c*) {}
+    // void DebugDrawPoly(dBgW&) {}
+    // void Draw() {}
+    // void DrawPoly(cBgS_PolyInfo&, _GXColor&) {}
+    // void GetBgWPointer(cBgS_PolyInfo&) {}
+    // void GetPolyCamId(cBgS_PolyInfo&) {}
+    // void GroundCross(cBgS_GndChk*) {}
+    // void LineCross(cBgS_LinChk*) {}
+    // void ShdwDraw(cBgS_ShdwDraw*) {}
+
     virtual void Ct();
     virtual void Dt();
     virtual void Move();
@@ -106,8 +122,6 @@ public:
     void MoveBgMatrixCrrPos(cBgS_PolyInfo&, bool, cXyz*, csXyz*, csXyz*);
     void RideCallBack(cBgS_PolyInfo&, fopAc_ac_c*);
     fopAc_ac_c* PushPullCallBack(cBgS_PolyInfo&, fopAc_ac_c*, short, dBgW::PushPullLabel);
-
-    bool WaterChk(dBgS_SplGrpChk* chk) { return SplGrpChk(chk); }
 };  // Size: 0x1404
 
 class dBgS_CrrPos : public cBgS_PolyInfo, public dBgS_Chk, public cBgS_Chk {
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 737a1726..f20c0988 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -935,7 +935,7 @@ public:
     void set(const char*, s8, s16, s8);
     const char* getName() const { return mName; }
     s16 getPoint() const { return mPoint; }
-    int getRoomNo() const { return mRoomNo; }
+    s8 getRoomNo() const { return mRoomNo; }
     s8 getLayer() const { return mLayer; }
     void setLayer(s8 layer) { mLayer = layer; }