Minor cleanup

Inlines, wrong indentation, enums, private fields, etc

15 files changed, 53 insertions, 58 deletions

diff --git a/include/d/actor/d_a_auction.h b/include/d/actor/d_a_auction.h
index 191f8521..bdc75e02 100644
--- a/include/d/actor/d_a_auction.h
+++ b/include/d/actor/d_a_auction.h
@@ -93,7 +93,7 @@ public:
     void nextBet();
     int getRand(int);
 
-public:
+private:
     /* 0x6C4 */ request_of_phase_process_class mPhs;
     /* 0x6CC */ dNpc_EventCut_c mNpcEvtInfo;
     /* 0x738 */ fpc_ProcID m738[8];
diff --git a/include/d/actor/d_a_dai.h b/include/d/actor/d_a_dai.h
index fa1f2ce6..3dd30d30 100644
--- a/include/d/actor/d_a_dai.h
+++ b/include/d/actor/d_a_dai.h
@@ -40,7 +40,7 @@ public:
     static const char m_arcname[];
     static const char m_cloth_arcname[];
 
-public:
+private:
     /* 0x6C4 */ request_of_phase_process_class mPhsFdai;
     /* 0x6CC */ request_of_phase_process_class mPhsCloth;
     /* 0x6D4 */ J3DModel* mpModel;
diff --git a/include/d/actor/d_a_npc_ah.h b/include/d/actor/d_a_npc_ah.h
index 363d4a0f..a86ffa43 100644
--- a/include/d/actor/d_a_npc_ah.h
+++ b/include/d/actor/d_a_npc_ah.h
@@ -103,7 +103,7 @@ public:
     static const char m_arcname[];
 
 
-public:
+private:
     /* 0x6C4 */ request_of_phase_process_class mPhs;
     /* 0x6CC */ request_of_phase_process_class mPhsMethod;
     /* 0x6D4 */ J3DAnmTexPattern* m_head_tex_pattern;
diff --git a/include/d/actor/d_a_npc_bm1.h b/include/d/actor/d_a_npc_bm1.h
index 1e648aff..95c55325 100644
--- a/include/d/actor/d_a_npc_bm1.h
+++ b/include/d/actor/d_a_npc_bm1.h
@@ -4,10 +4,6 @@
 #include "JSystem/JParticle/JPAEmitter.h"
 #include "d/d_npc.h"
 #include "f_op/f_op_actor.h"
-#include "m_Do/m_Do_hostIO.h"
-
-class J3DNode;
-
 
 class daNpc_Bm1_c : public fopNpc_npc_c {
 public:
@@ -33,7 +29,7 @@ public:
     };
 
     typedef s8 Type;
-    enum{
+    enum {
         TYPE_Uninitialized_e,
         TYPE_Quill_e,
         TYPE_Akoot_e,
@@ -47,27 +43,27 @@ public:
         TYPE_Kogoli_e,
         TYPE_Invalid_e = 0xFF,
     };
-    struct anm_prm_c{
-        s8 mAnmNum;
-        s8 mBtpNum;
-        f32 mMorf;
-        f32 mSpeed;
-        s32 mLoopMode;
-        BOOL mbHasArms;
+
+    struct anm_prm_c {
+        /* 0x00 */ s8 anmNum;
+        /* 0x01 */ s8 btpNum;
+        /* 0x04 */ f32 morf;
+        /* 0x08 */ f32 speed;
+        /* 0x0C */ int loopMode;
+        /* 0x10 */ BOOL hasArms;
     };
 
     typedef BOOL (daNpc_Bm1_c::*ActionFunc)(void*);
 
-    bool IamKakkuto() {return mSpecificType == SPECIFIC_TYPE_Akoot_e;}
-    bool IamSukketo() {return mSpecificType == SPECIFIC_TYPE_Skett_e;}
-    void clr_manzai() {mbManzai = false;}
-    bool getOdoroki() { return m880;}
-    s8 getStt() { return mStatus;}
-    u16 get_oldMsgStat() {return mOldMsgStat;}
-    void setFocus() {m882 = true;}
-    void setTelescopeDemo() {m881 = true;}
-    void set_manzai() {mbManzai = true;}
-
+    bool IamKakkuto() { return mSpecificType == SPECIFIC_TYPE_Akoot_e; }
+    bool IamSukketo() { return mSpecificType == SPECIFIC_TYPE_Skett_e; }
+    void clr_manzai() { mbManzai = false; }
+    bool getOdoroki() { return m880; }
+    s8 getStt() { return mStatus; }
+    u16 get_oldMsgStat() { return mOldMsgStat; }
+    void setFocus() { m882 = true; }
+    void setTelescopeDemo() { m881 = true; }
+    void set_manzai() { mbManzai = true; }
 
     void nodeWngControl(J3DNode*, J3DModel*);
     void nodeArmControl(J3DNode*, J3DModel*);
@@ -98,24 +94,24 @@ public:
     bool setBtp(bool, int);
     bool iniTexPttrnAnm(bool);
     void plyTexPttrnAnm();
-    void setAnm_tex(signed char);
+    void setAnm_tex(s8);
     BOOL setAnm_anm(anm_prm_c*);
     void setAnm_NUM(int, int);
     bool setAnm();
     void setPlaySpd(float);
     void chg_anmTag();
     void control_anmTag();
-    void chg_anmAtr(unsigned char);
+    void chg_anmAtr(u8);
     void control_anmAtr();
     void setAnm_ATR(int);
-    void anmAtr(unsigned short);
+    void anmAtr(u16);
     void eventOrder();
     void checkOrder();
     u8 chk_manzai();
     bool chk_talk();
     bool chk_partsNotMove();
-    BOOL lookBack();
-    u16 next_msgStatus(unsigned long*);
+    void lookBack();
+    u16 next_msgStatus(u32*);
     s8 getBitMask();
     u32 getMsg_PST_1();
     u32 getMsg_PST_3();
@@ -178,9 +174,9 @@ public:
     void endEvent();
     BOOL isEventEntry();
     void event_proc(int);
-    BOOL set_action(int (daNpc_Bm1_c::*)(void*), void*);
-    BOOL chk_action(int (daNpc_Bm1_c::*)(void*)); //Unused
-    void setStt(signed char);
+    BOOL set_action(ActionFunc, void*);
+    BOOL chk_action(ActionFunc); // Unused
+    void setStt(s8);
     BOOL d_wait();
     BOOL lookup();
     BOOL orooro();
@@ -191,7 +187,7 @@ public:
     BOOL wait_4();
     BOOL flyawy();
     BOOL wait_5();
-    BOOL wait_6();  //Unused
+    BOOL wait_6(); //Unused
     BOOL h_wait();
     BOOL wait_7();
     BOOL wait_3();
@@ -240,7 +236,6 @@ private:
     /* 0x6F0 */ J3DAnmTexPattern* m_hed_tex_pttrn;
     /* 0x6F4 */ mDoExt_btpAnm mHeadBtpAnm;
     /* 0x708 */ u8 mBlinkFrame;
-    /* 0x709    u8 pad709; */
     /* 0x70A */ s16 mBlinkTimer;
     /* 0x70C */ s16 pad70C;
     /* 0x710 */ mDoExt_McaMorf* mpWingMorf;
@@ -248,7 +243,7 @@ private:
     /* 0x715 */ s8 m_wngR1_jnt_num;
     /* 0x716 */ s8 m_wngL3_jnt_num;
     /* 0x717 */ s8 m_wngR3_jnt_num;
-    /* 0x718 */ u8 pad718[0x71C - 0x718];   //Possibly an unused mDoExt_McaMorf* ?
+    /* 0x718 */ u8 pad718[0x71C - 0x718]; //Possibly an unused mDoExt_McaMorf* ?
     /* 0x71C */ mDoExt_McaMorf* mpArmMorf;
     /* 0x720 */ s8 m_armL1_jnt_num;
     /* 0x721 */ s8 m_armR1_jnt_num;
@@ -263,7 +258,6 @@ private:
     /* 0x808 */ fpc_ProcID mPartnerProcID;
     /* 0x80C */ cXyz mInitialPos;
     /* 0x818 */ csXyz m818;
-    /* 0x81E    u8 pad81E[0x820 - 0x81E]; */
     /* 0x820 */ cXyz mEyePos;
     /* 0x82C */ cXyz m82C;
     /* 0x838 */ cXyz mTargetPos;
@@ -306,7 +300,7 @@ private:
     /* 0x88C */ bool mbRanExecute;
     /* 0x88D */ u8 m88D;
     /* 0x88E */ u8 m88E;
-    /* 0x88F */ u8 m88F;                
+    /* 0x88F */ u8 m88F;
     /* 0x890 */ s32 mbSetEyePos;
     /* 0x894 */ bool mbAttention;
     /* 0x895 */ bool m895;
@@ -329,7 +323,7 @@ private:
     /* 0x8EC */ JPABaseEmitter* mpFeather1EmitterL;
     /* 0x8F0 */ JPABaseEmitter* mpFeather1EmitterR;
 #if VERSION == VERSION_DEMO
-    /* 0x8F4 */ u32 mDemoUnused;  //Possibly an unused emitter
+    /* 0x8F4 */ u8 mDemoUnused[4]; //Possibly an unused emitter
 #endif
     /* 0x8F4 */ s8 m8F4;
     /* 0x8F5 */ s8 mActionIndex;
@@ -347,8 +341,7 @@ private:
     /* 0x902 */ SpecificType mSpecificType;
     /* 0x903 */ s8 mSpawnCondition;
     /* 0x904 */ s8 m904;
-    /* 0x904 */ s8 m905;   
-}; 
-STATIC_ASSERT(sizeof(daNpc_Bm1_c) == DEMO_SELECT(0x90C,0x908));
+    /* 0x904 */ s8 m905;
+};
 
 #endif /* D_A_NPC_BM1_H */
diff --git a/include/d/actor/d_a_npc_btsw2.h b/include/d/actor/d_a_npc_btsw2.h
index 532a30c1..ea66cc5a 100644
--- a/include/d/actor/d_a_npc_btsw2.h
+++ b/include/d/actor/d_a_npc_btsw2.h
@@ -51,7 +51,7 @@ public:
 
     static const char m_arc_name[];
 
-public:
+private:
     /* 0x6C4 */ request_of_phase_process_class mPhs;
     /* 0x6CC */ u32 mShadowId;
     /* 0x6D0 */ J3DModel* mpKabanModel; // Bag
diff --git a/include/d/actor/d_a_npc_fa1.h b/include/d/actor/d_a_npc_fa1.h
index dfb004a4..2938d152 100644
--- a/include/d/actor/d_a_npc_fa1.h
+++ b/include/d/actor/d_a_npc_fa1.h
@@ -153,7 +153,7 @@ public:
     int CreateHeap();
     void setMtx();
 
-public:
+private:
     /* 0x6C4 */ u8 m6C4[0x6CC - 0x6C4];
     /* 0x6CC */ mDoExt_McaMorf* mpMorf;
     /* 0x6D0 */ daNpc_Fa1_McaMorfCallBack1_c mMcaMorfCallback1;
diff --git a/include/d/actor/d_a_npc_hi1.h b/include/d/actor/d_a_npc_hi1.h
index 550d4684..ee86fca5 100644
--- a/include/d/actor/d_a_npc_hi1.h
+++ b/include/d/actor/d_a_npc_hi1.h
@@ -71,7 +71,7 @@ public:
     BOOL bodyCreateHeap();
     BOOL CreateHeap();
 
-public:
+private:
     /* 0x6C4 */ request_of_phase_process_class mPhs;
     /* 0x6CC */ s8 m_hed_jnt_num;
     /* 0x6CD */ s8 m_bbone_jnt_num;
diff --git a/include/d/actor/d_a_npc_ho.h b/include/d/actor/d_a_npc_ho.h
index 56287026..0447afe0 100644
--- a/include/d/actor/d_a_npc_ho.h
+++ b/include/d/actor/d_a_npc_ho.h
@@ -114,7 +114,7 @@ public:
     cPhs_State _create();
     BOOL CreateHeap();
 
-public:
+private:
     /* 0x290 */ request_of_phase_process_class mPhs;
     /* 0x298 */ mDoExt_McaMorf* mpMorf;
     /* 0x29C */ J3DModel* mpJoyPendentModel;
@@ -122,7 +122,6 @@ public:
     /* 0x2A4 */ J3DAnmTexPattern* m_head_tex_pattern;
     /* 0x2A8 */ mDoExt_btpAnm mBtpAnm;
     /* 0x2BC */ u8 mBlinkFrame;
-    /* 0x2BD */ u8 field_0x2BD[0x2BE - 0x2BD];
     /* 0x2BE */ s16 mBlinkTimer;
     /* 0x2C0 */ dBgS_ObjAcch mObjAcch;
     /* 0x484 */ dBgS_AcchCir mAcchCir;
@@ -142,7 +141,6 @@ public:
     /* 0x68C */ u8 mMsgAnmIdx;
     /* 0x68D */ u8 mAnmLoopCount;
     /* 0x68E */ u8 mItemNum;
-    /* 0x68F */ u8 field_0x68F[0x690 - 0x68F];
     /* 0x690 */ int mNextMessageId;
     /* 0x694 */ f32 mCylCollisionRadius;
     /* 0x698 */ ActionFunc mCurrActionFunc;
@@ -156,7 +154,6 @@ public:
     /* 0x6AB */ s8 mTalkState;
     /* 0x6AC */ u32 mtrlSndId;
     /* 0x6B0 */ s8 mReverb;
-    /* 0x6B1 */ u8 field_0x6B1[0x6B4 - 0x6B1];
 };  // Size: 0x6B4
 
 #endif /* D_A_NPC_HO_H */
diff --git a/include/d/actor/d_a_npc_jb1.h b/include/d/actor/d_a_npc_jb1.h
index a6c12f1b..2ac2408f 100644
--- a/include/d/actor/d_a_npc_jb1.h
+++ b/include/d/actor/d_a_npc_jb1.h
@@ -58,7 +58,7 @@ public:
     bool create_lgt();
     BOOL CreateHeap();
 
-public:
+private:
     /* 0x6C4 */ request_of_phase_process_class mPhs;
     /* 0x6CC */ s8 m_cse_jnt_num;
     /* 0x6CD */ u8 field_0x6CD[0x6D0 - 0x6CD];
diff --git a/include/d/actor/d_a_npc_ls1.h b/include/d/actor/d_a_npc_ls1.h
index 40445206..8186b325 100644
--- a/include/d/actor/d_a_npc_ls1.h
+++ b/include/d/actor/d_a_npc_ls1.h
@@ -184,7 +184,7 @@ public:
     BOOL itemCreateHeap();
     BOOL CreateHeap();
 
-public:
+private:
     /* 0x6C4 */ request_of_phase_process_class mPhs;
     /* 0x6CC */ s8 m_hed_jnt_num;
     /* 0x6CD */ s8 m_bbone_jnt_num;
diff --git a/include/d/actor/d_a_npc_people.h b/include/d/actor/d_a_npc_people.h
index c9016736..491a6635 100644
--- a/include/d/actor/d_a_npc_people.h
+++ b/include/d/actor/d_a_npc_people.h
@@ -200,7 +200,7 @@ public:
     cXyz getDirDistToPos(s16, f32);
     void warp();
 
-public:
+private:
     /* 0x6C4 */ request_of_phase_process_class mPhase;
     /* 0x6CC */ request_of_phase_process_class mPhase2;
     /* 0x6D4 */ J3DModel* mpHeadModel;
diff --git a/include/d/actor/d_a_npc_tc.h b/include/d/actor/d_a_npc_tc.h
index 9cb3ab12..dda0a083 100644
--- a/include/d/actor/d_a_npc_tc.h
+++ b/include/d/actor/d_a_npc_tc.h
@@ -212,7 +212,7 @@ public:
     void cutPayStart(int);
     void cutPayProc(int);
 
-public:
+private:
     /* 0x6C4 */ u8 field_0x6C4[0x6C8 - 0x6C4];
     /* 0x6C8 */ BOOL field_0x6C8;
     /* 0x6CC */ u8 mJtbtTimer;
diff --git a/include/d/actor/d_a_obj_doguu.h b/include/d/actor/d_a_obj_doguu.h
index 6eb6b81b..91bb7106 100644
--- a/include/d/actor/d_a_obj_doguu.h
+++ b/include/d/actor/d_a_obj_doguu.h
@@ -26,7 +26,7 @@ public:
     int getFinishEventCount();
     void setFinishMyEvent();
 
-public:
+private:
     /* 0x6C4 */ request_of_phase_process_class mPhs;
     /* 0x6CC */ J3DModel* field_0x6CC;
     /* 0x6D0 */ J3DModel* field_0x6D0;
diff --git a/include/d/actor/d_a_tag_kk1.h b/include/d/actor/d_a_tag_kk1.h
index 4c04c41d..17522c23 100644
--- a/include/d/actor/d_a_tag_kk1.h
+++ b/include/d/actor/d_a_tag_kk1.h
@@ -2,7 +2,6 @@
 #define D_A_TAG_KK1_H
 
 #include "d/d_npc.h"
-#include "m_Do/m_Do_hostIO.h"
 
 class daTag_Kk1_c : public fopNpc_npc_c {
 public:
@@ -12,7 +11,7 @@ public:
     BOOL _delete();
     cPhs_State _create();
 
-public:
+private:
     /* 0x6C4 */ u8   padding_0x6C4;
     /* 0x6C5 */ bool mTagSet;
     /* 0x6C6 */ bool mNameIsWrong;
diff --git a/include/d/d_event.h b/include/d/d_event.h
index 8e76648c..97c99741 100644
--- a/include/d/d_event.h
+++ b/include/d/d_event.h
@@ -130,7 +130,13 @@ public:
     void offEventFlag(u16 flag) { mEventFlag &= ~flag; }
     void reset() { onEventFlag(8); }
 
-    BOOL runCheck() { return mMode != dEvtMode_NONE_e; }
+    BOOL runCheck() {
+        #if DEBUG
+        return mMode != dEvtMode_NONE_e || mDebugStb != 0;
+        #else
+        return mMode != dEvtMode_NONE_e;
+        #endif
+    }
     u8 getMode() const { return mMode; }
 
     void onHindFlag(u16 flag) { mHindFlag |= flag; }
@@ -158,7 +164,7 @@ public:
     /* 0xDA */ u8 mEventEndSound;
     /* 0xDB */ u8 field_0xdb;
     /* 0xDC */ u8 field_0xdc;
-    /* 0xDD */ u8 field_0xdd;
+    /* 0xDD */ u8 mDebugStb;
     /* 0xDE */ u8 field_0xde;
     /* 0xDF */ u8 mEventInfoIdx;
     /* 0xE0 */ u8 mTalkButton;