diff options
| author | jdflyer <jdflyer10@gmail.com> | 2022-12-30 17:46:04 -0700 |
|---|---|---|
| committer | jdflyer <jdflyer10@gmail.com> | 2022-12-30 17:46:04 -0700 |
| commit | 83c53812ef434dc97050c1148e5fd59cd2c19f19 (patch) | |
| tree | 946b44cd2943aebde0ce5c1c6c092b31700025c9 /include/d/msg/d_msg_object.h | |
| parent | f453841a5ce81e1790ccb130d7568f7908b703e2 (diff) | |
| parent | 463348bfc7f2360d9bb0a6205b8aa4602c8c03d0 (diff) | |
Merge with upstream
Diffstat (limited to 'include/d/msg/d_msg_object.h')
| -rw-r--r-- | include/d/msg/d_msg_object.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |