From 5d4f161d4338f754c6d00956ddf504caa9a5c226 Mon Sep 17 00:00:00 2001
From: Pheenoh <pheenoh@gmail.com>
Date: Thu, 29 Dec 2022 17:30:35 -0700
Subject: f_op_msg_mng 19/20 matched (#227)

---
 include/d/com/d_com_inf_game.h | 10 ++++++++++
 include/d/msg/d_msg_object.h   |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'include/d')

diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index c38edee974..93c1363063 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -287,6 +287,8 @@ public:
     s16 getItemMaxLifeCount() { return mItemMaxLifeCount; }
     f32 getItemLifeCount() { return mItemLifeCount; }
     s16 getItemMaxArrowNumCount() { return mItemMaxArrowNumCount; }
+    void clearNowAnimeID() { mNowAnimeID = -1; }
+    void clearMesgCamInfoID() { mMesgCamInfo = (void*)-1; }
     void clearItemMaxLifeCount() { mItemMaxLifeCount = 0; }
     void clearItemLifeCount() {
         mItemLifeCount = 0.0f;
@@ -2568,6 +2570,14 @@ inline int dComIfG_setTimerNowTimeMs(int time) {
     g_dComIfG_gameInfo.play.setTimerNowTimeMs(time);
 }
 
+inline void dComIfGp_clearMesgAnimeTagInfo() {
+    g_dComIfG_gameInfo.play.clearNowAnimeID();
+}
+
+inline void dComIfGp_clearMesgCameraTagInfo() {
+    g_dComIfG_gameInfo.play.clearMesgCamInfoID();
+}
+
 inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2,
                                  const dKy_tevstr_c* param_3, const csXyz* param_4,
                                  const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7,
diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h
index fedaa1cef2..45fe778606 100644
--- a/include/d/msg/d_msg_object.h
+++ b/include/d/msg/d_msg_object.h
@@ -93,7 +93,7 @@ public:
     /* 80237994 */ static void onKillMessageFlag();
     /* 802379AC */ static void setKillMessageFlag();
     /* 802379D8 */ void setKillMessageFlagLocal();
-    /* 80237A74 */ void setTalkPartner(fopAc_ac_c*);
+    /* 80237A74 */ static void setTalkPartner(fopAc_ac_c*);
     /* 80237A88 */ void setNowTalkFlowNo(s16);
     /* 80237A9C */ void getNowTalkFlowNo();
     /* 80237AB0 */ void setDemoMessage(u32);
@@ -460,7 +460,7 @@ public:
     /* 0x2EC */ f32 mPikariAnmSpeed;
     /* 0x2F0 */ u16 mPikariHaloDelay_spirit;
     /* 0x2F2 */ u8 mStageTitleDisplayType;
-    /* 0x2F4 */ u16 mMsgIndex;
+    /* 0x2F4 */ s16 mMsgIndex;
     /* 0x2F6 */ u16 mFlowIndex;
     /* 0x2F8 */ u16 mSaveSeqMsgIndex;
     /* 0x2FA */ u16 mSelWeightFrame;
-- 
cgit v1.2.3