f_op_msg_mng Work (#685)

* f_op_msg_mng work

* Fix Some Conflicts

Haven't had much chance to work on actual progress, still looking to do more matching before merge

* Tiny bit of Work

Little bit of cleanup, start on a couple more functions

* More Matches

Also add back some missing nonmatch comments

* Fixes

* JPN ifdefs

* Inline Fix

Also force one match (there's no way that casting is real)

* Reorder Strings

Fix rodata, I think this order is also slightly more accurate to the function (but I'm not really trying to match it right now anyways)
This commit is contained in:
SuperDude88
2025-04-12 21:02:24 -04:00
committed by GitHub
parent e1898d3836
commit 1f1900bf66
7 changed files with 4172 additions and 185 deletions
+22 -3
View File
@@ -287,7 +287,9 @@ public:
}
void setMesgCamInfoBasicID(int id) { mMesgCamInfo.mBasicID = id; }
dComIfG_MesgCamInfo_c* getMesgCamInfo() { return &mMesgCamInfo; }
int getMesgCamInfoID() { return mMesgCamInfo.mID; }
void setMesgCamInfoID(int param_0) { mMesgCamInfo.mID = param_0; }
void clearMesgCamInfoID() { mMesgCamInfo.mID = -1; }
~dComIfG_play_c() {}
@@ -360,6 +362,7 @@ public:
}
int getMessageRupee() { return mMessageRupee; }
void setMessageRupee(s16 count) { mMessageRupee = count; }
void setAuctionRupee(s16 count) { mAuctionRupee = count; }
void setAuctionGauge(s16 gauge) { mAuctionGauge = gauge; }
@@ -627,8 +630,9 @@ public:
u8 getNowAnimeID() { return mMesgAnimeTagInfo; }
void clearNowAnimeID() { mMesgAnimeTagInfo = 0xFF; }
u8 getMesgStatus() { return mMesgStatus; }
u8 checkMesgBgm() { return mMesgBgm;; }
void setMesgBgm(u8 param_0) { mMesgBgm = param_0;; }
void setMesgStatus(u8 status) { mMesgStatus = status; }
u8 checkMesgBgm() { return mMesgBgm; }
void setMesgBgm(u8 param_0) { mMesgBgm = param_0; }
u8 getButtonMode() { return mButtonMode; }
void setButtonMode(u8 mode) { mButtonMode = mode; }
@@ -724,7 +728,7 @@ public:
/* 0x48E6 */ s16 field_0x48e6;
/* 0x48E8 */ s16 mItemBeastNumCounts[8];
/* 0x48F8 */ u8 field_0x48F8[0x4918 - 0x48F8];
/* 0x4918 */ u16 mMsgCountNumber;
/* 0x4918 */ s16 mMsgCountNumber;
/* 0x491A */ s16 mMsgSetNumber;
/* 0x491C */ s16 mMessageRupee;
/* 0x491E */ s16 mAuctionRupee;
@@ -901,6 +905,10 @@ inline int dComIfGp_getMessageRupee() {
return g_dComIfG_gameInfo.play.getMessageRupee();
}
inline void dComIfGp_setMessageRupee(s16 count) {
g_dComIfG_gameInfo.play.setMessageRupee(count);
}
inline void dComIfGp_setAuctionRupee(s16 count) {
g_dComIfG_gameInfo.play.setAuctionRupee(count);
}
@@ -2718,10 +2726,21 @@ inline void dComIfGp_clearMesgAnimeTagInfo() {
g_dComIfG_gameInfo.play.clearNowAnimeID();
}
inline int dComIfGp_getMesgCameraTagInfo() {
return g_dComIfG_gameInfo.play.getMesgCamInfoID();
}
inline void dComIfGp_clearMesgCameraTagInfo() {
g_dComIfG_gameInfo.play.clearMesgCamInfoID();
}
inline u8 dComIfGp_getMesgStatus() {
return g_dComIfG_gameInfo.play.getMesgStatus();
}
inline void dComIfGp_setMesgStatus(u8 status) {
g_dComIfG_gameInfo.play.setMesgStatus(status);
}
inline void dComIfGp_setMesgCameraTagInfo(int id) {
g_dComIfG_gameInfo.play.setMesgCamInfoID(id);