diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-07-04 12:15:05 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-07-04 12:15:05 -0400 |
| commit | ecd91cdf44cefe777924270bfa30c310948a7285 (patch) | |
| tree | d9bcc3d444c78b3adce60449bf9f4eabf49e681a /src/f_pc/f_pc_manager.cpp | |
| parent | 5778c31aed79da610fb2b889c112def4fe08adb4 (diff) | |
messageSet closer to matching on PAL, no longer matches on USA
Diffstat (limited to 'src/f_pc/f_pc_manager.cpp')
| -rw-r--r-- | src/f_pc/f_pc_manager.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 179cc11c..0dc69dfe 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -60,7 +60,7 @@ struct BMG_INF1 : JUTDataBlockHeader { /* 8003E3D0-8003E9F0 .text messageSet__FUl */ void messageSet(u32 status) { - /* Nonmatching - PAL-only regswap between msg and tpane */ + /* Nonmatching - regswap on msg[0] for USA and PAL (JPN already matches) */ #if VERSION == VERSION_PAL BMG_INF1* inf1; if (g_dComIfG_gameInfo.play.mGameLanguage == 1) { @@ -111,7 +111,6 @@ void messageSet(u32 status) { #endif s16 height = 27; - s32 ch; #if VERSION != VERSION_JPN f32 maxWidth = 0.0f; s32 curLine = 0; @@ -120,8 +119,8 @@ void messageSet(u32 status) { lineWidth[i] = 0.0f; } #endif - for (; ch = (u8)*msg, (s8)ch != '\0'; msg++) { - if ((s8)ch == '\n') { + for (; msg[0] != '\0'; msg++) { + if (msg[0] == '\n') { height += 27; #if VERSION != VERSION_JPN curLine++; @@ -130,7 +129,7 @@ void messageSet(u32 status) { } #if VERSION != VERSION_JPN - lineWidth[curLine] += font->JUTFont::getWidth(ch); + lineWidth[curLine] += font->JUTFont::getWidth(msg[0]); #endif } |