mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-28 00:15:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

messageSet closer to matching on PAL, no longer matches on USA

Browse Source
This commit is contained in:
LagoLunatic
2024-07-04 12:15:05 -04:00
parent 5778c31aed
commit ecd91cdf44
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1480,7 +1480,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_klft"),
ActorRel(NonMatching, "d_a_kmon"),
ActorRel(Matching, "d_a_komore", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_lbridge", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_lbridge", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_leaflift"),
ActorRel(NonMatching, "d_a_lstair"),
ActorRel(NonMatching, "d_a_machine"),
src/f_pc/f_pc_manager.cpp
+4 -5
View File
@@ -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
}