dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #659 from Deokishisu/patch-5

Browse Source 
BUGFIX for Localization Oversight in Daisy's Text && Fix Typo in Nurse Script
This commit is contained in:
GriffinR
2024-06-22 11:55:49 -04:00
committed by GitHub
parent 9b2fc69e5e b2e2648d15
commit 4c015cd9db
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PalletTown_RivalsHouse/text.inc
+5
View File
@@ -62,8 +62,13 @@ PalletTown_RivalsHouse_Text_LookingNiceInNoTime::
.string "nice in no time.$" .string "nice in no time.$"
PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: PalletTown_RivalsHouse_Text_ThereYouGoAllDone::
#ifdef BUGFIX @ The localizers missed what should be a textcolor change in the localizations.
.string "{COLOR DARK_GRAY}{STR_VAR_1} looks dreamily content…\p"
.string "{COLOR RED}DAISY: There you go! All done.\n"
#else @ In the JP games, gender-based text used a different font instead of different colors.
.string "{FONT_NORMAL}{STR_VAR_1} looks dreamily content…\p" .string "{FONT_NORMAL}{STR_VAR_1} looks dreamily content…\p"
.string "{FONT_FEMALE}DAISY: There you go! All done.\n" .string "{FONT_FEMALE}DAISY: There you go! All done.\n"
#endif
.string "See? Doesn't it look nice?\p" .string "See? Doesn't it look nice?\p"
.string "Giggle…\n" .string "Giggle…\n"
.string "It's such a cute POKéMON.$" .string "It's such a cute POKéMON.$"
data/scripts/pkmn_center_nurse.inc
+2 -2
View File
@@ -34,7 +34,7 @@ EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom::
specialvar VAR_RESULT, BufferUnionRoomPlayerName specialvar VAR_RESULT, BufferUnionRoomPlayerName
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
goto_if_eq VAR_0x8008, 0, EventScript_PkmnCenterNurse_ReturnPkmn goto_if_eq VAR_0x8008, 0, EventScript_PkmnCenterNurse_ReturnPkmn
goto_if_eq VAR_0x8008, 1, EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom goto_if_eq VAR_0x8008, 1, EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom
end end
EventScript_PkmnCenterNurse_ReturnPkmn:: EventScript_PkmnCenterNurse_ReturnPkmn::
@@ -45,7 +45,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn::
msgbox Text_WeHopeToSeeYouAgain msgbox Text_WeHopeToSeeYouAgain
return return
EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom::
goto_if_set FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER, EventScript_PkmnCenterNurse_ReturnPkmn goto_if_set FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER, EventScript_PkmnCenterNurse_ReturnPkmn
msgbox Text_RestoredPkmnToFullHealth msgbox Text_RestoredPkmnToFullHealth
setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER