d_s_play data matches

zeldaret · Jan 22, 2024 · 098873f · 098873f
1 parent f167f18
commit 098873f
Show file tree

Hide file tree

Showing 7 changed files with 716 additions and 45 deletions.
diff --git a/include/d/actor/d_a_dai.h b/include/d/actor/d_a_dai.h
@@ -33,8 +33,8 @@ class daDai_c : public fopAc_ac_c {
     static void getMaxDaiza();
     static void getDaizaSetItemNum();
 
-    static u32 mNowDaizaNum;
-    static u32 mNowItemNum;
+    static s8 mNowDaizaNum;
+    static s8 mNowItemNum;
     static const u16 m_savelabel[];
 
 public:

diff --git a/include/d/actor/d_a_npc_kg2.h b/include/d/actor/d_a_npc_kg2.h
@@ -47,7 +47,7 @@ class daNpc_Kg2_c : public fopAc_ac_c {
         canon_game_result = 0;
     }
 
-    static s32 canon_game_result;
+    static s8 canon_game_result;
 
 public:
     /* Place member variables here */

diff --git a/include/d/actor/d_a_salvage.h b/include/d/actor/d_a_salvage.h
@@ -68,12 +68,12 @@ class daSalvage_c : public fopAc_ac_c {
     static void init_room(signed char);
 
     static void init() {
-        mNowRoomNo = 0xFF;
+        mNowRoomNo = -1;
         mTagData_p = NULL;
         mSalvageId = -1;
     }
 
-    static u8 mNowRoomNo;
+    static s8 mNowRoomNo;
     static daSalvage_control_c* mTagData_p;
     static s32 mSalvageId;
     static const u16 m_savelabel[];

diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
@@ -284,7 +284,7 @@ class dComIfG_camera_info_class {
     /* 0x00 */ camera_class* mpCamera;
     /* 0x04 */ u8 mDlstWindowIdx;
     /* 0x05 */ u8 mCamIdx;
-    /* 0x06 */ u8 field_0x06;
+    /* 0x06 */ s8 field_0x06;
     /* 0x07 */ u8 field_0x07;
     /* 0x08 */ u32 mCameraAttentionStatus;
     /* 0x0C */ f32 mCameraZoomScale;

diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h
@@ -119,7 +119,7 @@ class dScnPly_msg_HIO_c : public JORReflexible {
 
 extern dScnPly_msg_HIO_c g_msgDHIO;
 
-class dScnPly_preLoad_HIO_c : public JORReflexible {
+class dScnPly_preLoad_HIO_c : public mDoHIO_entry_c {
 public:
     virtual ~dScnPly_preLoad_HIO_c() {}
 };

diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
@@ -66,8 +66,8 @@ class mDoGph_gInf_c {
     static void setBlureMtx(const Mtx) {}
     static void setBlureRate(u8) {}
     static void setFrameRate(u16) {}
-    static void setMonotoneRate(s16) {}
-    static void setMonotoneRateSpeed(s16) {}
+    static void setMonotoneRate(s16 rate) { mMonotoneRate = rate; }
+    static void setMonotoneRateSpeed(s16 speed) { mMonotoneRateSpeed = speed; }
 
     static GXTexObj mFrameBufferTexObj;
     static GXTexObj mZbufferTexObj;