5 files changed, 20 insertions, 19 deletions

diff --git a/include/d/actor/d_a_npc_bmsw.h b/include/d/actor/d_a_npc_bmsw.h
index bfda5e82..2b2bfef9 100644
--- a/include/d/actor/d_a_npc_bmsw.h
+++ b/include/d/actor/d_a_npc_bmsw.h
@@ -141,13 +141,13 @@ public:
 
     BOOL initTexPatternAnm(bool);
     void playTexPatternAnm();
-    void setAnm(signed char);
-    bool chkAttention(cXyz, short);
+    void setAnm(s8);
+    bool chkAttention(cXyz, s16);
     void eventOrder();
     void checkOrder();
-    u16 next_msgStatus(unsigned long*);
+    u16 next_msgStatus(u32*);
     u32 getMsg();
-    void anmAtr(unsigned short);
+    void anmAtr(u16);
     BOOL CreateInit();
     void set_mtx();
     void setAttention();
@@ -156,7 +156,7 @@ public:
     void talk01();
     BOOL wait_action(void*);
     BOOL checkNextMailThrowOK();
-    void setGameGetRupee(short);
+    void setGameGetRupee(s16);
     void TimerCountDown();
     BOOL shiwake_game_action(void*);
     BOOL _draw();
@@ -173,7 +173,7 @@ public:
     /* 0x6C8 */ s8 m_body_ArmR;
     /* 0x6C9 */ s8 m_body_ArmL;
     /* 0x6CA */ s8 m_neck_jnt_num;
-    /* 0x6CB */ u8 field_0x6CB[0x6CC - 0x6CB];
+private:
     /* 0x6CC */ request_of_phase_process_class mPhs;
     /* 0x6D4 */ J3DModel* field_0x6D4;
     /* 0x6D8 */ J3DModel* field_0x6D8;
diff --git a/include/d/actor/d_a_npc_btsw.h b/include/d/actor/d_a_npc_btsw.h
index d22dd3c5..73370ebd 100644
--- a/include/d/actor/d_a_npc_btsw.h
+++ b/include/d/actor/d_a_npc_btsw.h
@@ -19,7 +19,7 @@ public:
     }
 
     BOOL MailCreateInit(cXyz*, cXyz*);
-    static u8 getNextNo(unsigned char);
+    static u8 getNextNo(u8);
     void init();
     void set_mtx();
     void set_mtx_throw();
@@ -29,7 +29,7 @@ public:
     void Appear();
     void WaitInit();
     void Wait();
-    void ThrowInit(cXyz, unsigned char);
+    void ThrowInit(cXyz, u8);
     void Throw();
     void EndInit();
     void End();
@@ -40,7 +40,7 @@ public:
     static u8 m_same_count;
     static u8 m_no_buff;
 
-public:
+private:
     /* 0x00 */ SwMail_Func mFunc;
     /* 0x0C */ J3DModel* mpModel;
     /* 0x10 */ mDoExt_btpAnm field_0x10;
@@ -132,13 +132,13 @@ public:
 
     BOOL initTexPatternAnm(bool);
     void playTexPatternAnm();
-    void setAnm(signed char);
-    bool chkAttention(cXyz, short);
+    void setAnm(s8);
+    bool chkAttention(cXyz, s16);
     void eventOrder();
     void checkOrder();
-    u16 next_msgStatus(unsigned long*);
+    u16 next_msgStatus(u32*);
     u32 getMsg();
-    void anmAtr(unsigned short);
+    void anmAtr(u16 s16);
     BOOL CreateInit();
     void set_mtx();
     void setAttention();
@@ -157,7 +157,7 @@ public:
     cPhs_State _create();
     BOOL CreateHeap();
 
-public:
+private:
     /* 0x6C4 */ s8 m_handL;
     /* 0x6C5 */ s8 m_handR;
     /* 0x6C6 */ u8 field_0x6C6[0x6C8 - 0x6C6];
diff --git a/include/d/actor/d_a_npc_md.h b/include/d/actor/d_a_npc_md.h
index 6a47968a..5b6d43cb 100644
--- a/include/d/actor/d_a_npc_md.h
+++ b/include/d/actor/d_a_npc_md.h
@@ -19,7 +19,7 @@ public:
     cXyz& getPos() { return mPos; }
     void setAngle(s16 x, s16 y, s16 z) { mAngle.set(x, y, z); }
 
-public:
+private:
     /* 0x04 */ JPABaseEmitter* mpEmitter;
     /* 0x08 */ cXyz mPos;
     /* 0x14 */ csXyz mAngle;
@@ -341,7 +341,7 @@ public:
     static void onPlayerRoom() { m_playerRoom = true; }
     static void offPlayerRoom() { m_playerRoom = false; }
     
-public:
+private:
     /* 0x04EC */ request_of_phase_process_class mPhase;
     /* 0x04F4 */ J3DModel* mpHarpModel;
     /* 0x04F8 */ J3DModel* mpHarpLightModel;
diff --git a/include/d/actor/d_a_tag_mk.h b/include/d/actor/d_a_tag_mk.h
index 7a17a210..5869f9b5 100644
--- a/include/d/actor/d_a_tag_mk.h
+++ b/include/d/actor/d_a_tag_mk.h
@@ -27,8 +27,8 @@ public:
     u8 getSwbit();
     u8 getSwbit2();
     u8 getType();
-    BOOL checkArea(float, float, float);
-    u16 next_msgStatus(unsigned long*);
+    BOOL checkArea(f32, f32, f32);
+    u16 next_msgStatus(u32*);
     u32 getMsg();
     void talkInit();
     u16 talk();
@@ -55,7 +55,7 @@ public:
     BOOL actionDaichi();
     BOOL execute();
 
-public:
+private:
     /* 0x290 */ u32 m290;
     /* 0x294 */ s8 m294;
     /* 0x295 */ u8 m295[0x296 - 0x295];
diff --git a/include/f_op/f_op_msg.h b/include/f_op/f_op_msg.h
index 760c8a21..60cc1363 100644
--- a/include/f_op/f_op_msg.h
+++ b/include/f_op/f_op_msg.h
@@ -10,6 +10,7 @@ enum fopMsg_MessageStatus_e {
     fopMsgStts_MSG_UNK0_e = 0x00,
     fopMsgStts_MSG_PREPARING_e = 0x01,
     fopMsgStts_BOX_OPENING_e = 0x02,
+    fopMsgStts_MSG_UNK5_e = 0x05,
     fopMsgStts_MSG_TYPING_e = 0x06,
     fopMsgStts_STOP_e = 0x07,
     fopMsgStts_SELECT_2_e = 0x08, // Selection box with 2 choices