Menu - Enhancements and cheats re-organisation (#5142)

* First pass cheats, extra modes, minigames, difficulty, fixes, graphics

* More progress. One tab left

* Enhancements & cheats done and fix for item tracker font

soh/soh/Enhancements/audio/AudioEditor.cpp

@@ -488,6 +488,85 @@ void AudioEditor::DrawElement() {
 
     UIWidgets::PushStyleTabs(THEME_COLOR);
     if (ImGui::BeginTabBar("SfxContextTabBar", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
+        
+        static ImVec2 cellPadding(8.0f, 8.0f);
+        if (ImGui::BeginTabItem("Audio Options")) {
+            ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
+            ImGui::BeginTable("Audio Options", 1, ImGuiTableFlags_SizingStretchSame);
+            ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
+            ImGui::TableNextRow();
+            ImGui::TableNextColumn();
+            if (ImGui::BeginChild("SfxOptions", ImVec2(0, -8))) {
+                UIWidgets::CVarCheckbox(
+                    "Mute Low HP Alarm", CVAR_AUDIO("LowHPAlarm"),
+                    UIWidgets::CheckboxOptions().Color(THEME_COLOR).Tooltip("Disable the low HP beeping sound."));
+                UIWidgets::CVarCheckbox("Disable Navi Call Audio", CVAR_AUDIO("DisableNaviCallAudio"),
+                                        UIWidgets::CheckboxOptions()
+                                            .Color(THEME_COLOR)
+                                            .Tooltip("Disables the voice audio when Navi calls you."));
+                UIWidgets::CVarCheckbox(
+                    "Disable Enemy Proximity Music", CVAR_AUDIO("EnemyBGMDisable"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip("Disables the music change when getting close to enemies. Useful for hearing "
+                                 "your custom music for each scene more often."));
+                UIWidgets::CVarCheckbox(
+                    "Disable Leading Music in Lost Woods", CVAR_AUDIO("LostWoodsConsistentVolume"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip("Disables the volume shifting in the Lost Woods. Useful for hearing "
+                                 "your custom music in the Lost Woods if you don't need the navigation assitance "
+                                 "the volume changing provides. If toggling this while in the Lost Woods, reload "
+                                 "the area for the effect to kick in."));
+                UIWidgets::CVarCheckbox(
+                    "Display Sequence Name on Overlay", CVAR_AUDIO("SeqNameOverlay"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip("Displays the name of the current sequence in the corner of the screen whenever a new "
+                                 "sequence "
+                                 "is loaded to the main sequence player (does not apply to fanfares or enemy BGM)."));
+                UIWidgets::CVarSliderInt("Overlay Duration: %d seconds", CVAR_AUDIO("SeqNameOverlayDuration"),
+                                         UIWidgets::IntSliderOptions()
+                                             .Min(1)
+                                             .Max(10)
+                                             .DefaultValue(5)
+                                             .Size(ImVec2(300.0f, 0.0f))
+                                             .Color(THEME_COLOR));
+                UIWidgets::CVarSliderFloat("Link's voice pitch multiplier", CVAR_AUDIO("LinkVoiceFreqMultiplier"),
+                                           UIWidgets::FloatSliderOptions()
+                                               .IsPercentage()
+                                               .Min(0.4f)
+                                               .Max(2.5f)
+                                               .DefaultValue(1.0f)
+                                               .Size(ImVec2(300.0f, 0.0f))
+                                               .Color(THEME_COLOR));
+                ImGui::SameLine();
+                ImGui::SetCursorPosY(ImGui::GetCursorPos().y + 40.f);
+                if (UIWidgets::Button("Reset##linkVoiceFreqMultiplier",
+                                      UIWidgets::ButtonOptions().Size(ImVec2(80, 36)).Padding(ImVec2(5.0f, 0.0f)))) {
+                    CVarSetFloat(CVAR_AUDIO("LinkVoiceFreqMultiplier"), 1.0f);
+                }
+                UIWidgets::CVarCheckbox(
+                    "Randomize All Music and Sound Effects on New Scene", CVAR_AUDIO("RandomizeAllOnNewScene"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip(
+                            "Enables randomizing all unlocked music and sound effects when you enter a new scene."));
+                UIWidgets::CVarCheckbox(
+                    "Lower Octaves of Unplayable High Notes", CVAR_AUDIO("ExperimentalOctaveDrop"),
+                    UIWidgets::CheckboxOptions()
+                        .Color(THEME_COLOR)
+                        .Tooltip("Some custom sequences may have notes that are too high for the game's audio "
+                                 "engine to play. Enabling this checkbox will cause these notes to drop a "
+                                 "couple of octaves so they can still harmonize with the other notes of the "
+                                 "sequence."));
+            }
+            ImGui::EndChild();
+            ImGui::EndTable();
+            ImGui::PopStyleVar(1);
+            ImGui::EndTabItem();
+        }
+
         if (ImGui::BeginTabItem("Background Music")) {
             Draw_SfxTab("backgroundMusic", SEQ_BGM_WORLD, "Background Music");
             ImGui::EndTabItem();
@@ -518,78 +597,6 @@ void AudioEditor::DrawElement() {
             ImGui::EndTabItem();
         }
 
-        static ImVec2 cellPadding(8.0f, 8.0f);
-        if (ImGui::BeginTabItem("Options")) {
-            ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
-            ImGui::BeginTable("Options", 1, ImGuiTableFlags_SizingStretchSame);
-            ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
-            ImGui::TableNextRow();
-            ImGui::TableNextColumn();
-            if (ImGui::BeginChild("SfxOptions", ImVec2(0, -8))) {
-                UIWidgets::CVarCheckbox(
-                    "Disable Enemy Proximity Music", CVAR_AUDIO("EnemyBGMDisable"),
-                    UIWidgets::CheckboxOptions()
-                        .Color(THEME_COLOR)
-                        .Tooltip("Disables the music change when getting close to enemies. Useful for hearing "
-                                 "your custom music for each scene more often."));
-                UIWidgets::CVarCheckbox(
-                    "Disable Leading Music in Lost Woods", CVAR_AUDIO("LostWoodsConsistentVolume"),
-                    UIWidgets::CheckboxOptions()
-                        .Color(THEME_COLOR)
-                        .Tooltip("Disables the volume shifting in the Lost Woods. Useful for hearing "
-                                 "your custom music in the Lost Woods if you don't need the navigation assitance "
-                                 "the volume changing provides. If toggling this while in the Lost Woods, reload "
-                                 "the area for the effect to kick in."));
-                UIWidgets::CVarCheckbox(
-                    "Display Sequence Name on Overlay", CVAR_AUDIO("SeqNameOverlay"),
-                    UIWidgets::CheckboxOptions()
-                        .Color(THEME_COLOR)
-                        .Tooltip("Displays the name of the current sequence in the corner of the screen whenever a new "
-                                 "sequence "
-                                 "is loaded to the main sequence player (does not apply to fanfares or enemy BGM)."));
-                UIWidgets::CVarSliderInt("Overlay Duration: %d seconds", CVAR_AUDIO("SeqNameOverlayDuration"),
-                                          UIWidgets::IntSliderOptions()
-                                              .Min(1)
-                                              .Max(10)
-                                              .DefaultValue(5)
-                                              .Size(ImVec2(300.0f, 0.0f))
-                                              .Color(THEME_COLOR));
-                UIWidgets::CVarSliderFloat("Link's voice pitch multiplier",
-                                            CVAR_AUDIO("LinkVoiceFreqMultiplier"),
-                                            UIWidgets::FloatSliderOptions()
-                                                .IsPercentage()
-                                                .Min(0.4f)
-                                                .Max(2.5f)
-                                                .DefaultValue(1.0f)
-                                                .Size(ImVec2(300.0f, 0.0f))
-                                                .Color(THEME_COLOR));
-                ImGui::SameLine();
-                ImGui::SetCursorPosY(ImGui::GetCursorPos().y + 40.f);
-                if (UIWidgets::Button("Reset##linkVoiceFreqMultiplier",
-                                       UIWidgets::ButtonOptions().Size(ImVec2(80, 36)).Padding(ImVec2(5.0f, 0.0f)))) {
-                    CVarSetFloat(CVAR_AUDIO("LinkVoiceFreqMultiplier"), 1.0f);
-                }
-                UIWidgets::CVarCheckbox(
-                    "Randomize All Music and Sound Effects on New Scene", CVAR_AUDIO("RandomizeAllOnNewScene"),
-                    UIWidgets::CheckboxOptions()
-                        .Color(THEME_COLOR)
-                        .Tooltip(
-                            "Enables randomizing all unlocked music and sound effects when you enter a new scene."));
-                UIWidgets::CVarCheckbox(
-                    "Lower Octaves of Unplayable High Notes", CVAR_AUDIO("ExperimentalOctaveDrop"),
-                    UIWidgets::CheckboxOptions()
-                        .Color(THEME_COLOR)
-                        .Tooltip("Some custom sequences may have notes that are too high for the game's audio "
-                                 "engine to play. Enabling this checkbox will cause these notes to drop a "
-                                 "couple of octaves so they can still harmonize with the other notes of the "
-                                 "sequence."));
-            }
-            ImGui::EndChild();
-            ImGui::EndTable();
-            ImGui::PopStyleVar(1);
-            ImGui::EndTabItem();
-        }
-
         static bool excludeTabOpen = false;
         if (ImGui::BeginTabItem("Audio Shuffle Pool Management")) {
             ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);

soh/soh/Enhancements/presets.h

@@ -242,7 +242,7 @@ const std::vector<PresetEntry> enhancedPresetEntries = {
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SeparateArrows"), 1),
 
     // Disable Navi Call Audio
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 1),
+    PRESET_ENTRY_S32(CVAR_AUDIO("DisableNaviCallAudio"), 1),
 
     // Equipment Toggle
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 1),
@@ -373,7 +373,7 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("SeparateArrows"), 1),
 
     // Disable Navi Call Audio
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 1),
+    PRESET_ENTRY_S32(CVAR_AUDIO("DisableNaviCallAudio"), 1),
 
     // Equipment Toggle
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 1),
@@ -436,7 +436,7 @@ const std::vector<PresetEntry> spockRacePresetEntries = {
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterBlockPush"), 5),
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FasterHeavyBlockLift"), 1),
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NoForcedNavi"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 1),
+    PRESET_ENTRY_S32(CVAR_AUDIO("DisableNaviCallAudio"), 1),
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastChests"), 1),
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastDrops"), 1),
     PRESET_ENTRY_S32(CVAR_SETTING("DpadInText"), 1),
@@ -531,7 +531,7 @@ const std::vector<PresetEntry> spockRaceNoLogicPresetEntries = {
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("CustomizeFishing"), 1),
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DampeAllNight"), 1),
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DayGravePull"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 1),
+    PRESET_ENTRY_S32(CVAR_AUDIO("DisableNaviCallAudio"), 1),
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DpadNoDropOcarinaInput"), 1),
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EquipmentCanBeRemoved"), 1),
     PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FastBoomerang"), 1),

soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp

@@ -469,7 +469,6 @@ void DrawItemCount(ItemTrackerItem item, bool hideMax) {
     if (!GameInteractor::IsSaveLoaded()) {
         return;
     }
-    ImGui::PushFont(OTRGlobals::Instance->fontMono);
     int iconSize = CVarGetInteger(CVAR_TRACKER_ITEM("IconSize"), 36);
     int textSize = CVarGetInteger(CVAR_TRACKER_ITEM("TextSize"), 13);
     ItemTrackerNumbers currentAndMax = GetItemCurrentAndMax(item);
@@ -612,7 +611,6 @@ void DrawItemCount(ItemTrackerItem item, bool hideMax) {
         ImGui::SetCursorScreenPos(ImVec2(p.x, p.y - 14));
         ImGui::Text("");
     }
-    ImGui::PopFont();
 }
 
 void DrawEquip(ItemTrackerItem item) {
@@ -1218,9 +1216,11 @@ void ItemTrackerWindow::Draw() {
     if (!IsVisible()) {
         return;
     }
+    ImGui::PushFont(OTRGlobals::Instance->fontMono);
     DrawElement();
     // Sync up the IsVisible flag if it was changed by ImGui
     SyncVisibilityConsoleVariable();
+    ImGui::PopFont();
 }
 
 void ItemTrackerWindow::DrawElement() {

soh/soh/SohGui/SohMenuSettings.cpp

@@ -102,6 +102,20 @@ void SohMenu::AddMenuSettings() {
             SDL_OpenURL(std::string("file:///" + std::filesystem::absolute(filesPath).string()).c_str());
         })
         .Options(ButtonOptions().Tooltip("Opens the folder that contains the save and mods folders, etc."));
+
+    AddWidget(path, "Boot", WIDGET_SEPARATOR_TEXT);
+    AddWidget(path, "Boot Sequence", WIDGET_CVAR_COMBOBOX)
+        .CVar(CVAR_ENHANCEMENT("BootSequence"))
+        .Options(ComboboxOptions()
+                     .DefaultIndex(BOOTSEQUENCE_DEFAULT)
+                     .LabelPosition(LabelPosition::Far)
+                     .ComponentAlignment(ComponentAlignment::Right)
+                     .ComboMap(bootSequenceLabels)
+                     .Tooltip("Configure what happens when starting or resetting the game.\n\n"
+                              "Default: LUS logo -> N64 logo\n"
+                              "Authentic: N64 logo only\n"
+                              "File Select: Skip to file select menu"));
+
     AddWidget(path, "Languages", WIDGET_SEPARATOR_TEXT);
     AddWidget(path, "Translate Title Screen", WIDGET_CVAR_CHECKBOX)
         .CVar(CVAR_SETTING("TitleScreenTranslation"));

soh/soh/config/ConfigMigrators.h

@@ -186,7 +186,7 @@ namespace SOH {
         { MigrationAction::Rename, "gDisableGrottoRotation", "gEnhancements.DisableGrottoRotation" },
         { MigrationAction::Rename, "gDisableKokiriDrawDistance", "gEnhancements.DisableKokiriDrawDistance" },
         { MigrationAction::Rename, "gDisableLOD", "gEnhancements.DisableLOD" },
-        { MigrationAction::Rename, "gDisableNaviCallAudio", "gEnhancements.DisableNaviCallAudio" },
+        { MigrationAction::Rename, "gDisableNaviCallAudio", "gAudioEditor.DisableNaviCallAudio" },
         { MigrationAction::Rename, "gDisableTunicWarningText", "gEnhancements.DisableTunicWarningText" },
         { MigrationAction::Rename, "gDogFollowsEverywhere", "gEnhancements.DogFollowsEverywhere" },
         { MigrationAction::Rename, "gDpadNoDropOcarinaInput", "gEnhancements.DpadNoDropOcarinaInput" },
@@ -236,7 +236,7 @@ namespace SOH {
         { MigrationAction::Rename, "gInstantShootingGalleryWin", "gEnhancements.InstantShootingGalleryWin" },
         { MigrationAction::Rename, "gIvanCoopModeEnabled", "gEnhancements.IvanCoopModeEnabled" },
         { MigrationAction::Rename, "gLinkDefaultName", "gEnhancements.LinkDefaultName" },
-        { MigrationAction::Rename, "gLowHpAlarm", "gEnhancements.LowHpAlarm" },
+        { MigrationAction::Rename, "gLowHpAlarm", "gAudioEditor.LowHpAlarm" },
         { MigrationAction::Rename, "gMMBunnyHood", "gEnhancements.MMBunnyHood" },
         { MigrationAction::Rename, "gMarketSneak", "gEnhancements.MarketSneak" },
         { MigrationAction::Rename, "gMaskSelect", "gEnhancements.MaskSelect" },

soh/src/code/z_lifemeter.c

@@ -651,7 +651,7 @@ void HealthMeter_HandleCriticalAlarm(PlayState* play) {
         if (interfaceCtx->unk_22A <= 0) {
             interfaceCtx->unk_22A = 0;
             interfaceCtx->unk_22C = 0;
-            if (CVarGetInteger(CVAR_ENHANCEMENT("LowHpAlarm"), 0) == 0 && !Player_InCsMode(play) && (play->pauseCtx.state == 0) &&
+            if (CVarGetInteger(CVAR_AUDIO("LowHpAlarm"), 0) == 0 && !Player_InCsMode(play) && (play->pauseCtx.state == 0) &&
             (play->pauseCtx.debugState == 0) && HealthMeter_IsCritical() && !Play_InCsMode(play)) {
                 Sfx_PlaySfxCentered(NA_SE_SY_HITPOINT_ALARM);
             }

soh/src/code/z_parameter.c

@@ -2832,7 +2832,7 @@ void Interface_SetNaviCall(PlayState* play, u16 naviCallState) {
 
     if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling &&
         (play->csCtx.state == CS_STATE_IDLE)) {
-        if (!CVarGetInteger(CVAR_ENHANCEMENT("DisableNaviCallAudio"), 0)) {
+        if (!CVarGetInteger(CVAR_AUDIO("DisableNaviCallAudio"), 0)) {
             // clang-format off
             if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &gSfxDefaultPos, 4,
                                                                 &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); }