Some npc_ks dbg work (#2854)

5 files changed, 13 insertions, 8 deletions

diff --git a/include/d/actor/d_a_npc_ks.h b/include/d/actor/d_a_npc_ks.h
index ce37742529..da08da68e1 100644
--- a/include/d/actor/d_a_npc_ks.h
+++ b/include/d/actor/d_a_npc_ks.h
@@ -151,7 +151,7 @@ public:
     /* 0x94E */ s16 field_0x94e;
     /* 0x950 */ dCcD_Stts mStts;
     /* 0x98C */ dCcD_Cyl field_0x98c;
-    /* 0xAC8 */ u8 field_0xac8[0xaec - 0xac8];
+    /* 0xAC8 */ dCcU_AtInfo mAtInfo; // unused
     /* 0xAEC */ s8 field_0xaec;
     /* 0xAED */ s8 field_0xaed;
     /* 0xAEE */ s16 field_0xaee;
@@ -167,7 +167,8 @@ public:
     /* 0xB6C */ cXyz field_0xb6c;
     /* 0xB78 */ cXyz field_0xb78;
     /* 0xB84 */ cXyz field_0xb84;
-    /* 0xB90 */ u8 field_0xb90[0xba8 - 0xb90];
+    /* 0xB90 */ cXyz field_0xb90; // unused
+    /* 0xB90 */ cXyz field_0xb9c; // unused
     /* 0xBA8 */ cXyz field_0xba8;
     /* 0xBB4 */ f32 field_0xbb4;
     /* 0xBB8 */ f32 field_0xbb8;
diff --git a/include/d/actor/d_a_obj_so.h b/include/d/actor/d_a_obj_so.h
index 077762083f..872c95d22a 100644
--- a/include/d/actor/d_a_obj_so.h
+++ b/include/d/actor/d_a_obj_so.h
@@ -86,11 +86,14 @@ public:
     /* 0x1BC4 */ u8 field_0x1bc4[0x1bcc - 0x1bc4];
     /* 0x1BCC */ u8 field_0x1bcc;
 
-    u8 partBreak() {
+    bool partBreak() {
         for (int i = 0; i < 8; i++) {
-            if (field_0x1a98[i] == 2) return 1;
+            if (field_0x1a98[i] == 2) {
+                return true;
+            }
         }
-        return 0;
+
+        return false;
     }
 };
 
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index 6eb58ebabf..634eb245e0 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -1111,7 +1111,7 @@ public:
         mDemo.setParam0(i_param1);
     }
 
-    void changeDemoParam1(s16 i_param1) {
+    void changeDemoParam1(int i_param1) {
         mDemo.setParam1(i_param1);
     }
 
diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h
index b7905a77a2..b538a2112d 100644
--- a/include/d/d_meter2_info.h
+++ b/include/d/d_meter2_info.h
@@ -102,6 +102,7 @@ public:
     CPaneMgr* getMeterItemPanePtr(s32 i_idx) { return mMeterItemPanePtr[i_idx]; }
     void offUseButton(int i_buttonBit) { mUseButton &= ~(u16)i_buttonBit; }
     u16 getOilGaugeBackUp() { return mOilGaugeBackUp; }
+    void setOilGaugeBackUp(u16 arg0) { mOilGaugeBackUp = arg0; }
     u8 getInsectSelectType() { return mInsectSelectType; }
     void setInsectSelectType(u8 i_type) { mInsectSelectType = i_type; }
     u8 getWarpStatus() { return mWarpStatus; }
@@ -366,7 +367,7 @@ inline u16 dMeter2Info_getOilGaugeBackUp() {
 }
 
 inline void dMeter2Info_setOilGaugeBackUp(u16 param_1) {
-    g_meter2_info.mOilGaugeBackUp = param_1;
+    g_meter2_info.setOilGaugeBackUp(param_1);
 }
 
 inline void dMeter2Info_setSaveStageName(const char* i_stageName) {
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 7cffbbd2c9..a9df8d063f 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -1114,7 +1114,7 @@ public:
     static s8 getRoomReadId() { return mRoomReadId; }
     static void offNoChangeRoom() { mNoChangeRoom = false; }
     static void onNoChangeRoom() { mNoChangeRoom = true; }
-    static s8 getNextStayNo() { return mNextStayNo; }
+    static int getNextStayNo() { return mNextStayNo; }
     static void setProcID(u32 id) { mProcID = id; }
     static u32 getProcID() { return mProcID; }
     static void setStatusProcID(int i_roomNo, fpc_ProcID i_id) { mStatus[i_roomNo].mProcID = i_id; }