msg mng work (#1147)

* msg mng JPN work

* stringShift match, cleanup

* stringLength equivalent for JPN

* stringLength 100% for JPN

* stringSet 100% for JPN

* Match timer tag funcs for PAL
This commit is contained in:
LagoLunatic
2026-08-07 16:14:01 -04:00
committed by GitHub
parent 1d57f04689
commit 5e00819c5b
4 changed files with 3148 additions and 575 deletions
+2 -2
View File
@@ -326,7 +326,7 @@ public:
int getCameraPlayer2ID(int i) { return mCameraInfo[i].mCamP2Id; }
int getCameraWinID(int i) { return mCameraInfo[i].mDlstWindowIdx; }
int getItemTimer() { return mItemTimer; }
s16 getItemTimer() { return mItemTimer; }
void resetItemTimer(s16 timer) {
mItemTimer = timer;
mStartItemTimer = false;
@@ -976,7 +976,7 @@ inline void dComIfGp_startItemTimer() {
g_dComIfG_gameInfo.play.startItemTimer();
}
inline int dComIfGp_getItemTimer() {
inline s16 dComIfGp_getItemTimer() {
return g_dComIfG_gameInfo.play.getItemTimer();
}
+7 -5
View File
@@ -297,13 +297,14 @@ public:
/* 0x00 */ Select_OFF,
/* 0x01 */ Select_ON,
/* 0x02 */ Select_YOKO,
/* 0x03 */ Select_INPUT,
/* 0x03 */ Select_AUCTION,
};
u8 getSelectFlag() { return selectFlag; }
void setSelectFlagOff() { selectFlag = Select_OFF; }
void setSelectFlagOn() { selectFlag = Select_ON; }
void setSelectFlagYokoOn() { selectFlag = Select_YOKO; }
void setSelectFlagAuctionOn() { selectFlag = Select_AUCTION; }
u8 getAutoSendFlag() { return autoSendFlag; }
void setAutoSendFlagOff() { autoSendFlag = 0; }
void setAutoSendFlagOn() { autoSendFlag = 1; }
@@ -369,10 +370,10 @@ public:
/* 0x020 */ f32 nowCursorPos;
/* 0x024 */ f32 field_0x24;
/* 0x028 */ f32 field_0x28;
/* 0x02C */ u32 field_0x2C;
/* 0x030 */ u32 field_0x30;
/* 0x034 */ u32 field_0x34;
/* 0x038 */ u32 field_0x38;
/* 0x02C */ size_t field_0x2C;
/* 0x030 */ size_t field_0x30;
/* 0x034 */ size_t field_0x34;
/* 0x038 */ size_t field_0x38;
/* 0x03C */ const char* bmgData;
/* 0x040 */ char* field_0x40;
/* 0x044 */ char* field_0x44;
@@ -532,6 +533,7 @@ void fopMsgM_blendInit(J2DPicture* pic, const char* data);
u8 fopMsgM_itemNumIdx(u8 i_no);
u8 fopMsgM_itemNum(u8 i_itemNo);
u32 fopMsgM_getColorTable(u16 i_colorNo);
void fopMsgM_int_to_char(char* i_dest, int i_value, bool param_3);
void fopMsgM_blendDraw(fopMsgM_pane_class* i_pane, const char* data);
void fopMsgM_blendDraw(J2DPicture* pic, const char* data);
void fopMsgM_setFontsizeCenter(char* param_1, char* param_2, char* param_3, char* param_4, int param_5, int param_6);
+2 -2
View File
@@ -1512,8 +1512,8 @@ void dMsg_numberInput(sub_msg_class* i_Msg) {
numberPane[2]->setString(num_str[dComIfGp_getMessageSetNumber() / 100]);
numberPane[1]->setString(num_str[(dComIfGp_getMessageSetNumber() % 100) / 10]);
numberPane[0]->setString(num_str[dComIfGp_getMessageSetNumber() % 10]);
daNpc_Bs1_c::m_tag_buy_item = dComIfGp_getMessageSetNumber();
if (((CPad_CHECK_TRIG_A(0)) || (CPad_CHECK_TRIG_B(0))) || (fopMsgM_checkMessageSend())) {
daNpc_Bs1_c::setBuyItem(dComIfGp_getMessageSetNumber());
if (CPad_CHECK_TRIG_A(0) || CPad_CHECK_TRIG_B(0) || fopMsgM_checkMessageSend()) {
dMsg_setCancelMode(i_Msg);
} else {
dMeter_Info.field_0x0 = 3;
+3137 -566
View File
File diff suppressed because it is too large Load Diff