github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 05:43:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Names On Custom Message (#5278)

Browse source 
* Fix Names On Custom Message

* Display Blank Name

* format
This commit is contained in:
inspectredc 2025-04-02 14:45:51 +01:00 • committed by GitHub
commit c5e0e32391
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
soh/src/code/z_message_PAL.c
View file

@ -1685,7 +1685,8 @@ bool Message_DecodeName(PlayState* play, s16* decodedBufPosPtr, s32* charTexIdxP
} }
} }
if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL && gSaveContext.language != LANGUAGE_JPN) { if (ResourceMgr_GetGameRegion(0) == GAME_REGION_PAL &&
(gSaveContext.language != LANGUAGE_JPN || sDisplayNextMessageAsEnglish)) {
if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_PAL) { if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_PAL) {
for (i = 0; i < playerNameLen; i++) { for (i = 0; i < playerNameLen; i++) {
curChar2 = gSaveContext.playerName[i]; curChar2 = gSaveContext.playerName[i];
@ -1740,7 +1741,7 @@ bool Message_DecodeName(PlayState* play, s16* decodedBufPosPtr, s32* charTexIdxP
msgCtx->msgBufDecoded[(*decodedBufPosPtr)] = curChar2; msgCtx->msgBufDecoded[(*decodedBufPosPtr)] = curChar2;
(*decodedBufPosPtr)++; (*decodedBufPosPtr)++;
} }
} else { } else { // NAME_LANGUAGE_NTSC_JPN
for (i = 0; i < playerNameLen; i++) { for (i = 0; i < playerNameLen; i++) {
curChar2 = gSaveContext.playerName[i]; curChar2 = gSaveContext.playerName[i];
@ -1780,7 +1781,7 @@ bool Message_DecodeName(PlayState* play, s16* decodedBufPosPtr, s32* charTexIdxP
} else { // GAME_REGION_NTSC } else { // GAME_REGION_NTSC
if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_NTSC_JPN) { if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_NTSC_JPN) {
if (gSaveContext.language == LANGUAGE_JPN) { if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
for (i = 0; i < playerNameLen; i++) { for (i = 0; i < playerNameLen; i++) {
curChar2 = gSaveContext.playerName[i]; curChar2 = gSaveContext.playerName[i];
u8* fontBuf = &font->fontBuf[(curChar2 * 32) << 2]; u8* fontBuf = &font->fontBuf[(curChar2 * 32) << 2];
@ -1808,7 +1809,7 @@ bool Message_DecodeName(PlayState* play, s16* decodedBufPosPtr, s32* charTexIdxP
} }
} }
} else if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_NTSC_ENG) { } else if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_NTSC_ENG) {
if (gSaveContext.language == LANGUAGE_JPN) { if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
for (i = 0; i < playerNameLen; i++) { for (i = 0; i < playerNameLen; i++) {
curChar2 = gSaveContext.playerName[i]; curChar2 = gSaveContext.playerName[i];
u8* fontBuf = &font->fontBuf[(curChar2 * 32) << 2]; u8* fontBuf = &font->fontBuf[(curChar2 * 32) << 2];
@ -1850,7 +1851,7 @@ bool Message_DecodeName(PlayState* play, s16* decodedBufPosPtr, s32* charTexIdxP
} }
} }
} else if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_PAL) { } else if (gSaveContext.ship.filenameLanguage == NAME_LANGUAGE_PAL) {
if (gSaveContext.language == LANGUAGE_JPN) { if (gSaveContext.language == LANGUAGE_JPN && !sDisplayNextMessageAsEnglish) {
for (i = 0; i < playerNameLen; i++) { for (i = 0; i < playerNameLen; i++) {
curChar2 = gSaveContext.playerName[i]; curChar2 = gSaveContext.playerName[i];