Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUGFIX for Localization Oversight in Daisy's Text && Fix Typo in Nurse Script #659

Merged
merged 3 commits into from
Jun 22, 2024
Merged

BUGFIX for Localization Oversight in Daisy's Text && Fix Typo in Nurse Script #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb0c7dc
Fix Typo in Nurse Script
Deokishisu May 25, 2024
4578a59
Fix Localization Oversight in Daisy's Text
Deokishisu May 25, 2024
b2e2648
Use C preprocessor directives
GriffinRichards Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions data/maps/PalletTown_RivalsHouse/text.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.$"
Expand Down
4 changes: 2 additions & 2 deletions data/scripts/pkmn_center_nurse.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand All @@ -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
Expand Down