Work on d_msg_flow

2 files changed, 23 insertions, 8 deletions

diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h
index 4e975d941b..74dec026b4 100644
--- a/include/d/msg/d_msg_flow.h
+++ b/include/d/msg/d_msg_flow.h
@@ -35,7 +35,7 @@ public:
     /* 80249F48 */ virtual ~dMsgFlow_c();
 
     /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
-    /* 8024A13C */ void checkOpenDoor(fopAc_ac_c*, int*);
+    /* 8024A13C */ int checkOpenDoor(fopAc_ac_c*, int*);
     /* 8024A2D8 */ int doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
     /* 8024A424 */ int checkEventRender(int*, int*, int*, int*);
     /* 8024A4C4 */ void remove();
@@ -48,8 +48,8 @@ public:
     /* 8024A6EC */ u8* getMsgDataBlock(char const*);
     /* 8024A784 */ u16 getInitNodeIndex(u16);
     /* 8024A7CC */ void setNodeIndex(u16, fopAc_ac_c**);
-    /* 8024A95C */ void setSelectMsg(mesg_flow_node*, mesg_flow_node*, fopAc_ac_c*);
-    /* 8024AA50 */ void setNormalMsg(mesg_flow_node*, fopAc_ac_c*);
+    /* 8024A95C */ int setSelectMsg(mesg_flow_node*, mesg_flow_node*, fopAc_ac_c*);
+    /* 8024AA50 */ int setNormalMsg(mesg_flow_node*, fopAc_ac_c*);
     /* 8024AB30 */ int messageNodeProc(fopAc_ac_c*, fopAc_ac_c**);
     /* 8024AD54 */ int branchNodeProc(fopAc_ac_c*, fopAc_ac_c**);
     /* 8024ADEC */ int eventNodeProc(fopAc_ac_c*, fopAc_ac_c**);
@@ -170,7 +170,7 @@ private:
     /* 0x10 */ u16 field_0x10;
     /* 0x12 */ u16 field_0x12;
     /* 0x14 */ u16* field_0x14;
-    /* 0x18 */ int field_0x18;
+    /* 0x18 */ u16* field_0x18;
     /* 0x1C */ u16 mFlow;
     /* 0x1E */ u8 field_0x1e[2];
     /* 0x20 */ u32 mMsg;
diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h
index e82c0ecc33..75a0e42eba 100644
--- a/include/d/msg/d_msg_object.h
+++ b/include/d/msg/d_msg_object.h
@@ -93,7 +93,7 @@ public:
     /* 802379AC */ static void setKillMessageFlag();
     /* 802379D8 */ void setKillMessageFlagLocal();
     /* 80237A74 */ static void setTalkPartner(fopAc_ac_c*);
-    /* 80237A88 */ void setNowTalkFlowNo(s16);
+    /* 80237A88 */ static void setNowTalkFlowNo(s16);
     /* 80237A9C */ void getNowTalkFlowNo();
     /* 80237AB0 */ void setDemoMessage(u32);
     /* 80237AE0 */ void setTalkHeap(void*);
@@ -146,12 +146,12 @@ public:
     /* 80238500 */ void getMsgOutputType();
     /* 80238514 */ static const char* getWord();
     /* 80238528 */ void getSelectWord(int);
-    /* 80238544 */ void setSelectWordFlag(u8);
+    /* 80238544 */ static void setSelectWordFlag(u8);
     /* 80238574 */ void getSelectWordFlag();
     /* 80238588 */ bool isHowlHearingMode();
     /* 802385B4 */ static u8 getSelectBombBagID();
     /* 802385E0 */ static s16 getSelectBombPrice();
-    /* 8023860C */ void setEquipBombInfo();
+    /* 8023860C */ static void setEquipBombInfo();
     /* 80238638 */ u8 getItemEquipButton();
     /* 8023864C */ static void setSelectCancelPos(u8);
 
@@ -334,6 +334,21 @@ inline void dMsgObject_setSmellType(u8 type) {
     dMsgObject_c::setSmellType(type);
 }
 
+inline void dMsgObject_setTalkPartner(fopAc_ac_c *actor) {
+    dMsgObject_getMsgObjectClass()->setTalkPartner(actor);
+}
+
+inline void dMsgObject_setSelectWordFlag(u8 flag) {
+    dMsgObject_getMsgObjectClass()->setSelectWordFlag(flag);
+}
+
+inline void dMsgObject_setNowTalkFlowNo(s16 nowTalkFlowNo) {
+    dMsgObject_c::setNowTalkFlowNo(nowTalkFlowNo);
+}
+
+inline void dMsgObject_setEquipBombInfo() {
+    dMsgObject_c::setEquipBombInfo();
+}
 
 class dMsgObject_HowlHIO_c {
 public:
@@ -488,7 +503,7 @@ public:
     /* 0x2F0 */ u16 mPikariHaloDelay_spirit;
     /* 0x2F2 */ u8 mStageTitleDisplayType;
     /* 0x2F4 */ s16 mMsgIndex;
-    /* 0x2F6 */ u16 mFlowIndex;
+    /* 0x2F6 */ s16 mFlowIndex;
     /* 0x2F8 */ u16 mSaveSeqMsgIndex;
     /* 0x2FA */ u16 mSelWeightFrame;
     /* 0x2FC */ u16 mBoxAppearBound;