From 57827579ee0faebfbf91d4bca4528d1eae22982d Mon Sep 17 00:00:00 2001 From: JordanLongstaff Date: Thu, 12 Jun 2025 01:53:02 -0400 Subject: [PATCH] Fix vanilla enhancement disabler --- soh/soh/SohGui/SohMenuEnhancements.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/soh/soh/SohGui/SohMenuEnhancements.cpp b/soh/soh/SohGui/SohMenuEnhancements.cpp index 2fc71ad30..1ded80e74 100644 --- a/soh/soh/SohGui/SohMenuEnhancements.cpp +++ b/soh/soh/SohGui/SohMenuEnhancements.cpp @@ -265,8 +265,10 @@ void SohMenu::AddMenuEnhancements() { AddWidget(path, "Skip Feeding Jabu-Jabu", WIDGET_CVAR_CHECKBOX) .CVar(CVAR_ENHANCEMENT("TimeSavers.SkipJabuJabuFish")) .PreFunc([](WidgetInfo& info) { - info.options->disabled = IS_RANDO && GameInteractor::IsSaveLoaded(true); - info.options->disabledTooltip = "This setting is disabled because a randomizer savefile is loaded."; + info.options->disabled = + IS_RANDO && OTRGlobals::Instance->gRandoContext->GetOption(RSK_JABU_OPEN).Is(RO_JABU_OPEN); + info.options->disabledTooltip = + "This setting is disabled because a randomizer savefile with \"Jabu-Jaby: Open\" is loaded."; }) .Options(CheckboxOptions().Tooltip("Allow Link to enter Jabu-Jabu without feeding him a fish."));