shop_system stuff

2 files changed, 32 insertions, 11 deletions

diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h
index f387463e3e..7682cafab4 100644
--- a/include/d/msg/d_msg_flow.h
+++ b/include/d/msg/d_msg_flow.h
@@ -22,10 +22,10 @@ public:
     /* 80249F48 */ ~dMsgFlow_c();
     /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**);
     /* 8024A13C */ void checkOpenDoor(fopAc_ac_c*, int*);
-    /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
+    /* 8024A2D8 */ int doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
     /* 8024A424 */ void checkEventRender(int*, int*, int*, int*);
     /* 8024A4C4 */ void remove();
-    /* 8024A528 */ void getEventId(int*);
+    /* 8024A528 */ u16 getEventId(int*);
     /* 8024A538 */ void getMsgNo();
     /* 8024A540 */ void getNowMsgNo();
     /* 8024A548 */ void getMsg();
@@ -47,7 +47,7 @@ public:
     /* 8024B180 */ void query002(mesg_flow_node_branch*, fopAc_ac_c*, int);
     /* 8024B208 */ void query003(mesg_flow_node_branch*, fopAc_ac_c*, int);
     /* 8024B250 */ void query004(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B2C0 */ void query005(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    /* 8024B2C0 */ u16 query005(mesg_flow_node_branch*, fopAc_ac_c*, int);
     /* 8024B2F8 */ void query006(mesg_flow_node_branch*, fopAc_ac_c*, int);
     /* 8024B32C */ void query007(mesg_flow_node_branch*, fopAc_ac_c*, int);
     /* 8024B45C */ void query008(mesg_flow_node_branch*, fopAc_ac_c*, int);
@@ -140,19 +140,23 @@ public:
     /* 8024DA78 */ void event041(mesg_flow_node_event*, fopAc_ac_c*);
     /* 8024DAA8 */ bool event042(mesg_flow_node_event*, fopAc_ac_c*);
 
+    u8 isSelectMessage() { return mSelectMessage; }
+    void onNonStopJunpFlowFlag() { mNonStopJunpFlowFlag = 1; }
+    u16 getSelectNum() { return query005(NULL, NULL, 0); }
+
     static u8 mQueryList[636];
     static u8 mEventList[516];
 
 private:
     /* 0x00 */ void* vtable;
-    /* 0x04 */ void* field_0x04;
-    /* 0x08 */ void* field_0x08;
-    /* 0x0C */ void* field_0x0c;
+    /* 0x04 */ void* mFlow_p;
+    /* 0x08 */ void* mLabelInfo_p;
+    /* 0x0C */ void* mFlowNodeTBL;
     /* 0x10 */ u16 field_0x10;
     /* 0x12 */ u16 field_0x12;
     /* 0x14 */ fopAc_ac_c* field_0x14;
     /* 0x18 */ int field_0x18;
-    /* 0x1C */ u16 field_0x1c;
+    /* 0x1C */ u16 mFlow;
     /* 0x1E */ u8 field_0x1e[2];
     /* 0x20 */ int mMsg;
     /* 0x24 */ u8 mSelectMessage;
diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h
index b9d4b0f6f9..df2380affc 100644
--- a/include/d/msg/d_msg_object.h
+++ b/include/d/msg/d_msg_object.h
@@ -79,7 +79,7 @@ public:
     /* 8023768C */ void getSelectBombPriceLocal();
     /* 8023773C */ void setEquipBombInfoLocal();
     /* 80237748 */ void updateEquipBombInfoLocal();
-    /* 802378B8 */ void setShopWaitTimer(u8);
+    /* 802378B8 */ static void setShopWaitTimer(u8);
     /* 802378CC */ void setSelectWordFlagLocal(u8);
     /* 802378D4 */ void isHowlHearingModeLocal();
     /* 80237934 */ void isCameraCancelFlag();
@@ -123,12 +123,12 @@ public:
     /* 8023826C */ void setTalkActor(fopAc_ac_c*);
     /* 8023829C */ void onMsgSendControl();
     /* 802382C8 */ void offMsgSendControl();
-    /* 802382F4 */ void isMsgSendControl();
-    /* 80238320 */ void onMsgSend();
+    /* 802382F4 */ static int isMsgSendControl();
+    /* 80238320 */ static void onMsgSend();
     /* 8023834C */ void offMsgSend();
     /* 80238378 */ void isMsgSend();
     /* 802383A4 */ void isMouthCheck();
-    /* 802383D0 */ void getMessageID();
+    /* 802383D0 */ static u32 getMessageID();
     /* 802383E4 */ void getSmellTypeMessageID();
     /* 80238410 */ void setSmellType(u8);
     /* 80238440 */ void getSelectCursorPos();
@@ -150,7 +150,16 @@ public:
     /* 80238638 */ void getItemEquipButton();
     /* 8023864C */ void setSelectCancelPos(u8);
 
+    void setShopWaitTimerLocal(u8 timer) { field_0x4c9 = timer; }
+    u8 getSelectPushFlag() { return mSelectPushFlag; }
+    u8 getSelectCancelPos() { return mSelectCancelPos; }
+
     /* 0x100 */ fopAc_ac_c* field_0x100;
+    /* 0x104 */ u8 field_0x104[0x9D];
+    /* 0x1A1 */ u8 mSelectCancelPos;
+    /* 0x1A2 */ u8 mSelectPushFlag;
+    /* 0x1A3 */ u8 field_0x1a3[0x326];
+    /* 0x4C9 */ u8 field_0x4c9;
 };
 
 s16 dMsgObject_getGroupID();
@@ -163,8 +172,16 @@ inline bool dMsgObject_isTalkNowCheck() {
     return dMsgObject_getMsgObjectClass()->getStatus() != 1 ? true : false;
 }
 
+inline u32 dMsgObject_getMessageID() {
+    return dMsgObject_c::getMessageID();
+}
+
 inline void dMsgObject_readMessageGroup(mDoDvdThd_mountXArchive_c** param_0) {
     dMsgObject_getMsgObjectClass()->readMessageGroup(param_0);
 }
 
+inline void dMsgObject_setShopWaitTimer(u8 timer) {
+    dMsgObject_c::setShopWaitTimer(timer);
+}
+
 #endif /* D_MSG_D_MSG_OBJECT_H */