Work on d_msg_flow

2 files changed, 40 insertions, 1 deletions

diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 88e1846ab2..2d252ffc36 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -436,6 +436,24 @@ public:
     void setMsgDtArchive(int i, JKRArchive* arc) { mMsgDtArchive[i] = arc; }
     void setMsgCommonArchive(JKRArchive* arc) { mMsgCommonArchive = arc; }
     void setMsgArchive(int i, JKRArchive* arc) { mMsgArchive[i] = arc; }
+    void setMesgCamInfoActor(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3,
+                             fopAc_ac_c* param_4, fopAc_ac_c* param_5, fopAc_ac_c* param_6,
+                             fopAc_ac_c* param_7, fopAc_ac_c* param_8, fopAc_ac_c* param_9,
+                             fopAc_ac_c* param_10) {
+        mMesgCamInfoActor1 = param_1;
+        mMesgCamInfoActor2 = param_2;
+        mMesgCamInfoActor3 = param_3;
+        mMesgCamInfoActor4 = param_4;
+        mMesgCamInfoActor5 = param_5;
+        mMesgCamInfoActor6 = param_6;
+        mMesgCamInfoActor7 = param_7;
+        mMesgCamInfoActor8 = param_8;
+        mMesgCamInfoActor9 = param_9;
+        mMesgCamInfoActor10 = param_10;
+    }
+    int getMesgCamInfo() {
+        return mMesgCamInfoBasicID;
+    }
     void setFontArchive(JKRArchive* arc) { mFontArchive = arc; }
     void setRubyArchive(JKRArchive* arc) { mRubyArchive = arc; }
     void setMain2DArchive(JKRArchive* arc) { mMain2DArchive = arc; }
@@ -1377,6 +1395,10 @@ inline u8 dComIfGs_getArrowNum() {
     return g_dComIfG_gameInfo.info.getPlayer().getItemRecord().getArrowNum();
 }
 
+inline u8 dComIfGs_checkEmptyBottle() {
+    return g_dComIfG_gameInfo.info.getPlayer().getItem().checkEmptyBottle();
+}
+
 inline void dComIfGs_initZone() {
     g_dComIfG_gameInfo.info.initZone();
 }
@@ -1579,7 +1601,7 @@ inline void dComIfGs_setTmpReg(u16 i_reg, u8 i_no) {
     g_dComIfG_gameInfo.info.getTmp().setEventReg(i_reg, i_no);
 }
 
-inline int dComIfGs_getTmpReg(u16 i_reg) {
+inline u8 dComIfGs_getTmpReg(u16 i_reg) {
     return g_dComIfG_gameInfo.info.getTmp().getEventReg(i_reg);
 }
 
@@ -2690,6 +2712,21 @@ inline void dComIfGp_setMesgCameraTagInfo(int param_0) {
     g_dComIfG_gameInfo.play.setMesgCamInfoID(param_0);
 }
 
+inline void dComIfGp_setMesgCameraInfoActor(fopAc_ac_c* param_1, fopAc_ac_c* param_2,
+                                            fopAc_ac_c* param_3, fopAc_ac_c* param_4,
+                                            fopAc_ac_c* param_5, fopAc_ac_c* param_6,
+                                            fopAc_ac_c* param_7, fopAc_ac_c* param_8,
+                                            fopAc_ac_c* param_9, fopAc_ac_c* param_10)
+
+{
+    g_dComIfG_gameInfo.play.setMesgCamInfoActor(param_1, param_2, param_3, param_4, param_5,
+                                                param_6, param_7, param_8, param_9, param_10);
+}
+
+inline int dComIfGp_getMesgCameraInfo() {
+    return g_dComIfG_gameInfo.play.getMesgCamInfo();
+}
+
 inline s32 dComIfGp_roomControl_getStayNo() {
     return dStage_roomControl_c::getStayNo();
 }
diff --git a/include/d/com/d_com_static.h b/include/d/com/d_com_static.h
index e4ab5deb75..1404ac468c 100644
--- a/include/d/com/d_com_static.h
+++ b/include/d/com/d_com_static.h
@@ -4,5 +4,7 @@
 #include "rel/d/a/d_a_suspend/d_a_suspend.h"
 
 int daNpcKakashi_getSwdTutorialStep();
+bool daNpcKakashi_getSwdTutorialResult();
+int daNpcKakashi_getSuccessCount();
 
 #endif /* D_COM_D_COM_STATIC_H */