Match debug inlines for some npcs

5 files changed, 40 insertions, 35 deletions

diff --git a/include/d/actor/d_a_npc_bmsw.h b/include/d/actor/d_a_npc_bmsw.h
index 2b2bfef9..ca8d9b26 100644
--- a/include/d/actor/d_a_npc_bmsw.h
+++ b/include/d/actor/d_a_npc_bmsw.h
@@ -34,7 +34,9 @@ public:
     void Throw();
     void EndInit();
     void End();
+#if VERSION > VERSION_DEMO
     void SeDelete();
+#endif
     void move();
     void draw(dKy_tevstr_c*);
 
@@ -61,31 +63,31 @@ public:
 class SwCam_c {
 public:
     SwCam_c() {
-        field_0x1E = 0;
+        mActive = false;
         field_0x1C = 0;
         field_0x1D = 0;
-        field_0x00 = SwCam_c::camera_center_data[0][1];
-        field_0x0C = camera_eye;
-        field_0x18 = 58.0f;
+        mCenter = SwCam_c::camera_center_data[0][1];
+        mEye = camera_eye;
+        mFovY = 58.0f;
     }
 
     void ActiveOff() {
-        field_0x1E = 0;
+        mActive = false;
     }
     void ActiveOn() {
-        field_0x1E = 1;
+        mActive = true;
 
-        field_0x00 = camera_center_data[0][1];
-        field_0x0C = camera_eye;
-        field_0x18 = 58.0f;
+        mCenter = camera_center_data[0][1];
+        mEye = camera_eye;
+        mFovY = 58.0f;
 
         setAimIdx(0, 0);
     }
     cXyz* getCenterP() {
-        return &field_0x0C;
+        return &mCenter;
     }
     cXyz* getEyeP() {
-        return &field_0x00;
+        return &mEye;
     }
     void setAimIdx(s8 row, s8 col) {
         field_0x1C = row;
@@ -98,12 +100,12 @@ public:
     static cXyz camera_eye;
 
 public:
-    /* 0x00 */ cXyz field_0x00;
-    /* 0x0C */ cXyz field_0x0C;
-    /* 0x18 */ f32 field_0x18;
+    /* 0x00 */ cXyz mCenter;
+    /* 0x0C */ cXyz mEye;
+    /* 0x18 */ f32 mFovY;
     /* 0x1C */ s8 field_0x1C;
     /* 0x1D */ s8 field_0x1D;
-    /* 0x1E */ u8 field_0x1E;
+    /* 0x1E */ bool mActive;
 };  // Size: 0x1F
 
 class daNpc_Bmsw_c : public fopNpc_npc_c {
diff --git a/include/d/actor/d_a_npc_btsw.h b/include/d/actor/d_a_npc_btsw.h
index 73370ebd..66eacb67 100644
--- a/include/d/actor/d_a_npc_btsw.h
+++ b/include/d/actor/d_a_npc_btsw.h
@@ -33,7 +33,9 @@ public:
     void Throw();
     void EndInit();
     void End();
+#if VERSION > VERSION_DEMO
     void SeDelete();
+#endif
     void move();
     void draw(dKy_tevstr_c*);
 
diff --git a/include/d/actor/d_a_npc_km1.h b/include/d/actor/d_a_npc_km1.h
index d57f35bf..5746de4f 100644
--- a/include/d/actor/d_a_npc_km1.h
+++ b/include/d/actor/d_a_npc_km1.h
@@ -29,18 +29,18 @@ public:
 
     s8 getHeadJntNum() { return m_head_jnt_num; }
     s8 getBackboneJntNum()  {return m_backbone_jnt_num; }
-    s16 getBackbone_x() { return m_jnt.getBackbone_x(); }
-    s16 getBackbone_y() { return m_jnt.getBackbone_y(); }
-    s16 getHead_x() { return m_jnt.getHead_x(); }
-    s16 getHead_y() { return m_jnt.getHead_y(); }
-    Vec* getAttPos() { return &mAttPos; }
-    Vec* getEyePos() { return &mEyePos; }
+    s16 getHead_x() { return m_jnt.mAngles[0][0]; }
+    s16 getHead_y() { return m_jnt.mAngles[0][1]; }
+    s16 getBackbone_x() { return m_jnt.mAngles[1][0]; }
+    s16 getBackbone_y() { return m_jnt.mAngles[1][1]; }
+    cXyz* getAttPos() { return &mAttPos; }
+    cXyz* getEyePos() { return &mEyePos; }
 
     bool createInit();
     void setMtx();
     bool anmResID(int, int*, int*);
     void BtpNum2ResID(int, int*);
-    void setAnm_tex(signed char);
+    void setAnm_tex(s8);
     bool init_btp(bool, int);
     bool initTexPatternAnm(bool);
     void playTexPatternAnm();
@@ -48,12 +48,12 @@ public:
     void setAnm();
     void chngAnmTag();
     void ctrlAnmTag();
-    void chngAnmAtr(unsigned char);
+    void chngAnmAtr(u8);
     void ctrlAnmAtr();
     void setAnm_ATR(int);
-    void anmAtr(unsigned short);
-    void setStt(signed char);
-    u16 next_msgStatus(unsigned long*);
+    void anmAtr(u16);
+    void setStt(s8);
+    u16 next_msgStatus(u32*);
     u32 getMsg();
     void eventOrder();
     void checkOrder();
@@ -67,6 +67,7 @@ public:
     void endEvent();
     void event_proc();
     bool set_action(ActionFunc, void*);
+    BOOL chk_action(ActionFunc); // Unused
     BOOL wait01();
     BOOL talk01();
     int wait_action1(void*);
diff --git a/include/d/actor/d_a_npc_os.h b/include/d/actor/d_a_npc_os.h
index 7ddab24d..0e85cf2e 100644
--- a/include/d/actor/d_a_npc_os.h
+++ b/include/d/actor/d_a_npc_os.h
@@ -42,12 +42,12 @@ public:
     }
     void clearStatus() { field_0x784 = 0; }
     cXyz& getAttentionBasePos() { return field_0x754; }
-    s16 getBackbone_x() { return mJntCtrl.getBackbone_x(); }
-    s16 getBackbone_y() { return mJntCtrl.getBackbone_y(); }
+    s16 getHead_x() { return mJntCtrl.mAngles[0][0]; }
+    s16 getHead_y() { return mJntCtrl.mAngles[0][1]; }
+    s16 getBackbone_x() { return mJntCtrl.mAngles[1][0]; }
+    s16 getBackbone_y() { return mJntCtrl.mAngles[1][1]; }
     cXyz& getEyePos() { return field_0x748; }
     virtual f32 getGroundY() { return mAcch.GetGroundH(); }
-    s16 getHead_x() { return mJntCtrl.getHead_x(); }
-    s16 getHead_y() { return mJntCtrl.getHead_y(); }
     virtual MtxP getLeftHandMatrix() { return cullMtx; }
     virtual MtxP getRightHandMatrix() { return cullMtx; }
     virtual f32 getBaseAnimeFrameRate() { return 1.0f; }
diff --git a/include/d/d_camera.h b/include/d/d_camera.h
index 59b12d09..4ed1d8bd 100644
--- a/include/d/d_camera.h
+++ b/include/d/d_camera.h
@@ -537,11 +537,11 @@ public:
     bool eventCamera(s32);
     bool demoCamera(s32);
     bool letCamera(s32);
-    bool Set(cXyz, cXyz);
-    bool Set(cXyz, cXyz, f32, s16);
-    bool Set(cXyz, cXyz, s16, f32);
-    bool Reset(cXyz, cXyz, f32, s16);
-    bool Reset(cXyz, cXyz);
+    bool Set(cXyz center, cXyz eye);
+    bool Set(cXyz center, cXyz eye, f32 fovY, s16 bank);
+    bool Set(cXyz center, cXyz eye, s16 bank, f32 fovY);
+    bool Reset(cXyz center, cXyz eye, f32 fovY, s16 bank);
+    bool Reset(cXyz center, cXyz eye);
     bool Reset();
     void ResetView();
     bool Chtyp(s32);