From fb0c7dc3f2516a61ce4cb73c891338f8f90d48be Mon Sep 17 00:00:00 2001 From: Deokishisu <6993375+Deokishisu@users.noreply.github.com> Date: Fri, 24 May 2024 21:58:35 -0400 Subject: [PATCH 1/3] Fix Typo in Nurse Script EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom => EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom --- data/scripts/pkmn_center_nurse.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index f92ff3183..507c8a498 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -34,7 +34,7 @@ EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: specialvar VAR_RESULT, BufferUnionRoomPlayerName copyvar VAR_0x8008, VAR_RESULT 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 EventScript_PkmnCenterNurse_ReturnPkmn:: @@ -45,7 +45,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: msgbox Text_WeHopeToSeeYouAgain return -EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: +EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: goto_if_set FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER, EventScript_PkmnCenterNurse_ReturnPkmn msgbox Text_RestoredPkmnToFullHealth setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER From 4578a59673ce7cbc24d599393478902d7524cbc5 Mon Sep 17 00:00:00 2001 From: Deokishisu <6993375+Deokishisu@users.noreply.github.com> Date: Fri, 24 May 2024 22:09:31 -0400 Subject: [PATCH 2/3] Fix Localization Oversight in Daisy's Text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on the FONT_NORMAL and FONT_FEMALE control codes in Daisy's text when finishing her grooming of a Pokémon, it seems the original intention was for the first part of this text to be NPC_TEXT_COLOR_NEUTRAL and for Daisy's dialogue to be NPC_TEXT_COLOR_FEMALE. If the localizers had caught it, they would've replaced FONT_NORMAL with COLOR DARK_GRAY and FONT_FEMALE with COLOR RED. This commit creates a .ifdef BUGFIX for this oversight. --- data/maps/PalletTown_RivalsHouse/text.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/maps/PalletTown_RivalsHouse/text.inc b/data/maps/PalletTown_RivalsHouse/text.inc index 38172688c..0cd7b0005 100644 --- a/data/maps/PalletTown_RivalsHouse/text.inc +++ b/data/maps/PalletTown_RivalsHouse/text.inc @@ -62,8 +62,13 @@ PalletTown_RivalsHouse_Text_LookingNiceInNoTime:: .string "nice in no time.$" 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_FEMALE}DAISY: There you go! All done.\n" +.endif .string "See? Doesn't it look nice?\p" .string "Giggle…\n" .string "It's such a cute POKéMON.$" From b2e2648d154f0b551075d6e0079f7d8f307c4217 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 22 Jun 2024 11:51:16 -0400 Subject: [PATCH 3/3] Use C preprocessor directives --- data/maps/PalletTown_RivalsHouse/text.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/maps/PalletTown_RivalsHouse/text.inc b/data/maps/PalletTown_RivalsHouse/text.inc index 0cd7b0005..bde0f854c 100644 --- a/data/maps/PalletTown_RivalsHouse/text.inc +++ b/data/maps/PalletTown_RivalsHouse/text.inc @@ -62,13 +62,13 @@ PalletTown_RivalsHouse_Text_LookingNiceInNoTime:: .string "nice in no time.$" PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: -.ifdef BUGFIX @ The localizers missed what should be a textcolor change in the localizations. +#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. +#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_FEMALE}DAISY: There you go! All done.\n" -.endif +#endif .string "See? Doesn't it look nice?\p" .string "Giggle…\n" .string "It's such a cute POKéMON.$"