From 5de662a326e4649b642e29614f1eead9667f964e Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Fri, 5 Aug 2022 12:05:22 -0500 Subject: [PATCH] Fix ice traps --- soh/soh/Enhancements/randomizer/randomizer.cpp | 4 ++-- soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 09bc8ef41..914ad9aee 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -4029,8 +4029,8 @@ void DrawRandoEditor(bool& open) { // Shuffle Frog Song Rupees SohImGui::EnhancementCheckbox(Settings::ShuffleFrogSongRupees.GetName().c_str(), "gRandomizeShuffleFrogSongRupees"); InsertHelpHoverText( - "Shuffles 5 Purple Rupees into to the item pool, and allows you\n" - "to earn items by playing songs at the Frog Choir.\n" + "Shuffles 5 Purple Rupees into to the item pool, and allows\n" + "you to earn items by playing songs at the Frog Choir.\n" "\n" "This setting does not effect the item earned from playing\n" "the Song of Storms and the frog song minigame." diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 5609dc7ac..358b3eaae 100644 --- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1038,7 +1038,7 @@ void EnFr_GiveReward(EnFr* this, GlobalContext* globalCtx) { } void EnFr_SetIdle(EnFr* this, GlobalContext* globalCtx) { - if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(globalCtx)) { + if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(globalCtx) || (gSaveContext.n64ddFlag && this->reward == GI_ICE_TRAP)) { this->actionFunc = EnFr_Idle; } }