Merge branch 'master' of https://github.com/zeldaret/tp into lv4floor

include/d/com/d_com_inf_game.h

@@ -413,6 +413,7 @@ public:
 
     JKRArchive* getMsgDtArchive(int idx) { return mMsgDtArchive[idx]; }
     JKRArchive* getMsgArchive(int idx) { return mMsgArchive[idx]; }
+    JKRArchive* getMsgCommonArchive() { return mMsgCommonArchive; }
     JKRArchive* getMain2DArchive() { return mMain2DArchive; }
     JKRArchive* getAnmArchive() { return mAnmArchive; }
     JKRArchive* getCollectResArchive() { return mCollectResArchive; }
@@ -1843,6 +1844,10 @@ inline JKRArchive* dComIfGp_getMsgArchive(int idx) {
     return g_dComIfG_gameInfo.play.getMsgArchive(idx);
 }
 
+inline JKRArchive* dComIfGp_getMsgCommonArchive() {
+    return g_dComIfG_gameInfo.play.getMsgCommonArchive();
+}
+
 inline void dComIfGp_setFieldMapArchive2(JKRArchive* arc) {
     g_dComIfG_gameInfo.play.setFieldMapArchive2(arc);
 }

include/d/meter/d_meter2_info.h

@@ -97,6 +97,7 @@ public:
     void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; }
     u16 getOilGaugeBackUp() { return mOilGaugeBackUp; }
     u8 getWarpStatus() { return mWarpStatus; }
+    void setWarpStatus(u8 status) { mWarpStatus = status; }
     u8 getWarpRoomNo() { return mWarpInfo.mRoomNo; }
     u8 getWarpPlayerNo() { return mWarpInfo.mWarpPlayerNo; }
     cXyz& getWarpPos() { return mWarpInfo.mPosition; }
@@ -274,6 +275,10 @@ inline void dMeter2Info_getStringKanji(u32 param_0, char* param_1, JMSMesgEntry_
     g_meter2_info.getStringKanji(param_0, param_1, param_2);
 }
 
+inline f32 dMeter2Info_getStringLength(JUTFont* param_0, f32 param_1, f32 param_2, char* param_3) {
+    return g_meter2_info.getStringLength(param_0, param_1, param_2, param_3);
+}
+
 inline void dMeter2Info_setHotSpringTimer(u8 time) {
     g_meter2_info.setHotSpringTimer(time);
 }
@@ -290,6 +295,10 @@ inline u8 dMeter2Info_getWarpStatus() {
     return g_meter2_info.getWarpStatus();
 }
 
+inline void dMeter2Info_setWarpStatus(u8 status) {
+    return g_meter2_info.setWarpStatus(status);
+}
+
 inline u8 dMeter2Info_getWarpRoomNo() {
     return g_meter2_info.getWarpRoomNo();
 }

include/d/msg/d_msg_object.h

@@ -118,7 +118,7 @@ public:
     /* 802380C4 */ static void changeGroup(s16);
     /* 8023806C */ static void demoMessageGroup();
     /* 80238098 */ void endFlowGroup();
-    /* 802380F4 */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*,
+    /* 802380F4 */ static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*,
                                   char*, char*, s16*);
     /* 80238174 */ static u8* getMsgDtPtr();
     /* 80238188 */ static void setProcessID(unsigned int);
@@ -322,6 +322,16 @@ inline void dMsgObject_setTalkActor(fopAc_ac_c* actor) {
     }
 }
 
+inline bool dMsgObject_getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
+                                 JUTFont* param_3, COutFont_c* param_4, char* param_5,
+                                 char* param_6, char* param_7, s16* param_8) {
+    return dMsgObject_c::getString(
+        param_0, param_1, param_2, param_3,
+        param_4, param_5, param_6, param_7,
+        param_8
+    );
+}
+
 inline void dMsgObject_onKillMessageFlag() {
     dMsgObject_c::onKillMessageFlag();
 }
@@ -508,7 +518,7 @@ public:
     /* 0x2F2 */ u8 mStageTitleDisplayType;
     /* 0x2F4 */ s16 mMsgIndex;
     /* 0x2F6 */ s16 mFlowIndex;
-    /* 0x2F8 */ u16 mSaveSeqMsgIndex;
+    /* 0x2F8 */ s16 mSaveSeqMsgIndex;
     /* 0x2FA */ u16 mSelWeightFrame;
     /* 0x2FC */ u16 mBoxAppearBound;
     /* 0x2FE */ u16 mBoxAppearFrame;

include/d/msg/d_msg_string.h

@@ -19,6 +19,10 @@ public:
     /* 80249DE4 */ virtual void drawOutFontLocal(J2DTextBox*, f32);
     /* 80249ED0 */ virtual void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
 
+    void drawOutFont(J2DTextBox* param_0, f32 param_1) {
+        drawOutFontLocal(param_0, param_1);
+    }
+
 private:
     /* 0x24 */ COutFont_c* mpOutFont;
     /* 0x28 */ u8 field_0x28;