diff options
| -rw-r--r-- | mm/2s2h/BenGui/BenMenuBar.cpp | 8 | ||||
| -rw-r--r-- | mm/2s2h/BenGui/SearchableMenuItems.h | 6 | ||||
| -rw-r--r-- | mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/mm/2s2h/BenGui/BenMenuBar.cpp b/mm/2s2h/BenGui/BenMenuBar.cpp index 3eb25472e..013070cb4 100644 --- a/mm/2s2h/BenGui/BenMenuBar.cpp +++ b/mm/2s2h/BenGui/BenMenuBar.cpp @@ -770,8 +770,12 @@ void DrawEnhancementsMenu() { UIWidgets::CVarCheckbox("Skip Scarecrow Song", "gEnhancements.Playback.SkipScarecrowSong", { .tooltip = "Pierre appears when the Ocarina is pulled out." }); UIWidgets::CVarCheckbox("Pause Owl Warp", "gEnhancements.Songs.PauseOwlWarp", - { .tooltip = "Allows the player to use the pause menu map to owl warp instead of " - "having to play the Song of Soaring." }); + { .tooltip = + "Allows warping to registered Owl Statues from the pause menu map screen. " + "Requires that you can play Song of Soaring normally.\n\n" + "Accounts for Index-Warp being active, by presenting all valid warps for " + "the registered map points. " + "Great Bay Coast warp is always given for index 0 warp as a convenience." }); UIWidgets::CVarSliderInt("Zora Eggs For Bossa Nova", "gEnhancements.Songs.ZoraEggCount", 1, 7, 7, { .tooltip = "The number of eggs required to unlock new wave bossa nova." }); diff --git a/mm/2s2h/BenGui/SearchableMenuItems.h b/mm/2s2h/BenGui/SearchableMenuItems.h index 04726139b..bbd43496c 100644 --- a/mm/2s2h/BenGui/SearchableMenuItems.h +++ b/mm/2s2h/BenGui/SearchableMenuItems.h @@ -1295,8 +1295,10 @@ void AddEnhancements() { { "Dpad Ocarina", "gEnhancements.Playback.DpadOcarina", "Enables using the Dpad for Ocarina playback.", WIDGET_CVAR_CHECKBOX }, { "Pause Owl Warp", "gEnhancements.Songs.PauseOwlWarp", - "Allows the player to use the pause menu map to owl warp instead of " - "having to play the Song of Soaring.", + "Allows warping to registered Owl Statues from the pause menu map screen. " + "Requires that you can play Song of Soaring normally.\n\n" + "Accounts for Index-Warp being active, by presenting all valid warps for the registered map points. " + "Great Bay Coast warp is always given for index 0 warp as a convenience.", WIDGET_CVAR_CHECKBOX }, { "Zora Eggs For Bossa Nova", "gEnhancements.Songs.ZoraEggCount", diff --git a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp b/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp index 841556565..b246d1080 100644 --- a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp +++ b/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp @@ -157,6 +157,10 @@ void HandlePauseOwlWarp(PauseContext* pauseCtx) { pauseCtx->worldMapPoints[i] = true; } } + + // Always set Great Bay since that is accessible from the "default index" for index warp + // when loading from a save/scene change and never touching the pause map screen + pauseCtx->worldMapPoints[OWL_WARP_GREAT_BAY_COAST] = true; } // Ensure cursor starts at an activated point and is not on the broken stone tower region point |