From d0f8374c4c6c3a6622a2c999195741662d3b41ca Mon Sep 17 00:00:00 2001 From: aMannus Date: Tue, 23 Aug 2022 09:42:32 +0200 Subject: [PATCH] Changed checkbox to default to on, invert logic --- libultraship/libultraship/ImGuiImpl.cpp | 5 +++-- soh/soh/OTRGlobals.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libultraship/libultraship/ImGuiImpl.cpp b/libultraship/libultraship/ImGuiImpl.cpp index 09e67233b..5efeb2706 100644 --- a/libultraship/libultraship/ImGuiImpl.cpp +++ b/libultraship/libultraship/ImGuiImpl.cpp @@ -452,6 +452,7 @@ namespace SohImGui { io->ConfigFlags |= ImGuiConfigFlags_DockingEnable; io->Fonts->AddFontDefault(); statsWindowOpen = CVar_GetS32("gStatsEnabled", 0); + CVar_RegisterS32("gRandoRandomRupeeNames", 1); #ifdef __SWITCH__ Ship::Switch::SetupFont(io->Fonts); #endif @@ -1912,9 +1913,9 @@ namespace SohImGui { "(medallions/stones/songs). Note that these fanfares\n" "are longer than usual." ); - PaddedEnhancementCheckbox("Disable Random Rupee Names", "gRandoDisableRandomRupeeNames", true, false); + PaddedEnhancementCheckbox("Random Rupee Names", "gRandoRandomRupeeNames", true, false); Tooltip( - "Reverts textboxes for collecting rupees to their default state, disabling the randomization of rupee names." + "When obtaining rupees, randomize what the rupee is called in the textbox." ); ImGui::EndMenu(); } diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 2a5180dce..fd800464d 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -1541,7 +1541,7 @@ extern "C" int CustomMessage_RetrieveIfExists(GlobalContext* globalCtx) { } } else if (textId == TEXT_SCRUB_POH || textId == TEXT_SCRUB_STICK_UPGRADE || textId == TEXT_SCRUB_NUT_UPGRADE) { messageEntry = Randomizer_GetScrubMessage(textId); - } else if (!CVar_GetS32("gRandoDisableRandomRupeeNames", 0) && + } else if (CVar_GetS32("gRandoRandomRupeeNames", 0) && (textId == TEXT_BLUE_RUPEE || textId == TEXT_RED_RUPEE || textId == TEXT_PURPLE_RUPEE || textId == TEXT_HUGE_RUPEE)) { Randomizer randomizerInstance;