diff options
| author | Patrick12115 <115201185+Patrick12115@users.noreply.github.com> | 2023-04-11 08:18:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 08:18:03 -0400 |
| commit | fe71cdfbb684a2377e7289033f21ac2f184261e1 (patch) | |
| tree | 352008a15cdb1399da7ff2f598d09037520954d8 | |
| parent | 6f8207d3bba7b2e514c6d4bb5793672caccba59e (diff) | |
[Reduced Clutter] Disable Hot/Underwater Warning Text (#2684)
* Disable Warning Text
* Moved to Reduced Clutter
| -rw-r--r-- | soh/soh/GameMenuBar.cpp | 4 | ||||
| -rw-r--r-- | soh/src/code/z_player_lib.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/soh/soh/GameMenuBar.cpp b/soh/soh/GameMenuBar.cpp index 7b9cbb288..880c50eb7 100644 --- a/soh/soh/GameMenuBar.cpp +++ b/soh/soh/GameMenuBar.cpp @@ -357,7 +357,7 @@ namespace GameMenuBar { UIWidgets::PaddedEnhancementCheckbox("Nighttime GS Always Spawn", "gNightGSAlwaysSpawn", true, false); UIWidgets::Tooltip("Nighttime Skulltulas will spawn during both day and night."); UIWidgets::PaddedEnhancementCheckbox("Dampe Appears All Night", "gDampeAllNight", true, false); - UIWidgets::Tooltip("Makes Dampe appear anytime during it's night, not just his usual working hours."); + UIWidgets::Tooltip("Makes Dampe appear anytime during the night, not just his usual working hours."); UIWidgets::PaddedEnhancementCheckbox("Time Travel with the Song of Time", "gTimeTravel", true, false); UIWidgets::Tooltip("Allows Link to freely change age by playing the Song of Time.\n" "Time Blocks can still be used properly.\n\n" @@ -630,6 +630,8 @@ namespace GameMenuBar { UIWidgets::Tooltip("Hides most of the UI when not needed\nNote: Doesn't activate until after loading a new scene"); UIWidgets::PaddedEnhancementCheckbox("Disable Navi Call Audio", "gDisableNaviCallAudio", true, false); UIWidgets::Tooltip("Disables the voice audio when Navi calls you"); + UIWidgets::PaddedEnhancementCheckbox("Disable Hot/Underwater Warning Text", "gDisableWarningText", true, false); + UIWidgets::Tooltip("Disables warning text when you don't have on the Goron/Zora Tunic in Hot/Underwater conditions."); ImGui::EndMenu(); } diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 2ea70cdde..5957b97ca 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -660,9 +660,9 @@ s32 func_8008F2F8(PlayState* play) { triggerEntry = &sTextTriggers[var]; if ((triggerEntry->flag != 0) && !(gSaveContext.textTriggerFlags & triggerEntry->flag) && - (((var == 0) && (this->currentTunic != PLAYER_TUNIC_GORON && CVarGetInteger("gSuperTunic", 0) == 0)) || + (((var == 0) && (this->currentTunic != PLAYER_TUNIC_GORON && CVarGetInteger("gSuperTunic", 0) == 0 && CVarGetInteger("gDisableWarningText", 0) == 0)) || (((var == 1) || (var == 3)) && (this->currentBoots == PLAYER_BOOTS_IRON) && - (this->currentTunic != PLAYER_TUNIC_ZORA && CVarGetInteger("gSuperTunic", 0) == 0)))) { + (this->currentTunic != PLAYER_TUNIC_ZORA && CVarGetInteger("gSuperTunic", 0) == 0 && CVarGetInteger("gDisableWarningText", 0) == 0)))) { Message_StartTextbox(play, triggerEntry->textId, NULL); gSaveContext.textTriggerFlags |= triggerEntry->flag; } |