From a547d51abb93970e53fd22899ef36f0a870df110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Sat, 28 Feb 2026 16:33:16 +0000 Subject: [PATCH] Fix Malon text on Lon Lon Ranch in rando (#6308) Missed in #6299 --- .../randomizer/Messages/Miscellaneous.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp b/soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp index c45c81369..1393c00c8 100644 --- a/soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp @@ -9,6 +9,7 @@ extern "C" { #include +extern PlayState* gPlayState; } void BuildWaterSwitchMessage(uint16_t* textId, bool* loadFromMessageTable) { @@ -40,13 +41,15 @@ void BuildShootingGalleryNoBowMessage(uint16_t* textId, bool* loadFromMessageTab } void BuildFixedMallonAtCastleMessage(uint16_t* textId, bool* loadFromMessageTable) { - CustomMessage msg = - CustomMessage("Looks like my dad already went back to the %rranch%w. You should come visit sometime!", - "Mein Vater ist wohl schon wieder auf der %rFarm%w, du solltest ihn mal besuchen kommen!", - "On dirait que père est déjà rentré au %rranch%w. Tu devrais nous rendre visite à l'occasion!"); - msg.AutoFormat(); - msg.LoadIntoFont(); - *loadFromMessageTable = false; + if (gPlayState->sceneNum == SCENE_HYRULE_CASTLE) { + CustomMessage msg = CustomMessage( + "Looks like my dad already went back to the %rranch%w. You should come visit sometime!", + "Mein Vater ist wohl schon wieder auf der %rFarm%w, du solltest ihn mal besuchen kommen!", + "On dirait que père est déjà rentré au %rranch%w. Tu devrais nous rendre visite à l'occasion!"); + msg.AutoFormat(); + msg.LoadIntoFont(); + *loadFromMessageTable = false; + } } void RegisterMiscellaneousMessages() {