Some npc_ks dbg work (#2854)

config/GZ2E01/rels/d_a_npc_ks/symbols.txt

@@ -522,14 +522,16 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
 obj_pos = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float
 leader = .bss:0x00000060; // type:object size:0x4 scope:global data:4byte
 call_pt = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte
-lbl_330_bss_68 = .bss:0x00000068; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000068; // type:object size:0x1 data:byte
 @4025 = .bss:0x0000006C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000078; // type:object size:0x38 scope:global data:byte
 target_info = .bss:0x000000B0; // type:object size:0x28 scope:global
 target_info_count = .bss:0x000000D8; // type:object size:0x4 scope:global data:4byte
 target_bgc = .bss:0x000000DC; // type:object size:0x28 scope:global
 start_pya$6091 = .bss:0x00000104; // type:object size:0x2 scope:local
+init$3911 = .bss:0x00000106; // type:object size:0x1 scope:local data:byte
 @7870 = .bss:0x00000108; // type:object size:0xC scope:local
+init$5647 = .bss:0x00000114; // type:object size:0x1 scope:local data:byte
 sc$7869 = .bss:0x00000118; // type:object size:0xC scope:local
 c_start = .bss:0x00000124; // type:object size:0x4 scope:global
 sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000128; // type:object size:0x4 scope:global

config/ShieldD/symbols.txt

@@ -64304,7 +64304,7 @@ lbl_8074C56C = .sbss:0x8074C56C; // type:object size:0x1 data:byte hash:0x5A01C5
 mProcID__20dStage_roomControl_c = .sbss:0x8074C578; // type:object size:0x4 scope:global data:4byte hash:0x24C2F7B2 dhash:0xBF1DEEF0
 mStayNo__20dStage_roomControl_c = .sbss:0x8074C57C; // type:object size:0x1 data:byte hash:0x87058A4F dhash:0xB3B700CD
 lbl_8074C57D = .sbss:0x8074C57D; // type:object size:0x1 data:byte hash:0x5AF37248 dhash:0x1A945A6A
-lbl_8074C57E = .sbss:0x8074C57E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A
+dStage_roomControl_c::mNextStayNo = .sbss:0x8074C57E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A
 m_time_pass__20dStage_roomControl_c = .sbss:0x8074C57F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17
 lbl_8074C580 = .sbss:0x8074C580; // type:object size:0x1 data:byte hash:0x3F91BE16 dhash:0xDD72DA34
 mArcBankName__20dStage_roomControl_c = .sbss:0x8074C584; // type:object size:0x4 scope:global data:4byte hash:0x885DF1A0 dhash:0xD2AA5D02

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;

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;
     }
 };
 

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);
     }
 

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) {

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; }

src/d/actor/d_a_obj_sw.cpp

@@ -287,9 +287,12 @@ static void demo_camera(obj_sw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
+    camera_class* zero_camera_p = dComIfGp_getCamera(0);
     cXyz sp24, sp30;
 
     switch (i_this->mDemoMode) {
+    case 0:
+        break;
     case 1:
         if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
             fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
@@ -351,7 +354,7 @@ static void demo_camera(obj_sw_class* i_this) {
             cLib_addCalc2(&i_this->mDemoCamEye.z, sp30.z, 0.1f, 200.0f);
         }
 
-        player->changeDemoParam1(i_this->field_0x596 * 10);
+        player->changeDemoParam1(s16(i_this->field_0x596 * 10));
         if (mDoCPd_c::getTrigA(0) != 0) {
             i_this->field_0x5a8[7].mSound.startSound(Z2SE_KOSARU_V_THROW, 0, -1);
             player->changeDemoMode(24, 0, 0, 0);