nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Malon text on Lon Lon Ranch in rando (#6308)

Browse Source 
Missed in #6299
This commit is contained in:
Philip Dubé
2026-02-28 16:33:16 +00:00
committed by GitHub
parent d841357fd4
commit a547d51abb
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
soh/soh/Enhancements/randomizer/Messages/Miscellaneous.cpp
View File

@@ -9,6 +9,7 @@
extern "C" { extern "C" {
#include <variables.h> #include <variables.h>
extern PlayState* gPlayState;
} }
void BuildWaterSwitchMessage(uint16_t* textId, bool* loadFromMessageTable) { void BuildWaterSwitchMessage(uint16_t* textId, bool* loadFromMessageTable) {
@@ -40,14 +41,16 @@ void BuildShootingGalleryNoBowMessage(uint16_t* textId, bool* loadFromMessageTab
} }
void BuildFixedMallonAtCastleMessage(uint16_t* textId, bool* loadFromMessageTable) { void BuildFixedMallonAtCastleMessage(uint16_t* textId, bool* loadFromMessageTable) {
CustomMessage msg = if (gPlayState->sceneNum == SCENE_HYRULE_CASTLE) {
CustomMessage("Looks like my dad already went back to the %rranch%w. You should come visit sometime!", 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!", "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!"); "On dirait que père est déjà rentré au %rranch%w. Tu devrais nous rendre visite à l'occasion!");
msg.AutoFormat(); msg.AutoFormat();
msg.LoadIntoFont(); msg.LoadIntoFont();
*loadFromMessageTable = false; *loadFromMessageTable = false;
} }
}
void RegisterMiscellaneousMessages() { void RegisterMiscellaneousMessages() {
COND_ID_HOOK(OnOpenText, TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI, IS_RANDO, BuildWaterSwitchMessage); COND_ID_HOOK(OnOpenText, TEXT_LAKE_HYLIA_WATER_SWITCH_NAVI, IS_RANDO, BuildWaterSwitchMessage);