From 62f56a4791f2202039b5fb6dd6e1f57c00f1803f Mon Sep 17 00:00:00 2001
From: vaguerant <vaguerant@users.noreply.github.com>
Date: Sun, 24 Jul 2022 23:15:33 +1000
Subject: [PATCH] Bug fix: Water Temple gate & bootcommands.c cleanup (#618)

* Vanilla bug fix: child Water Temple gate

* Clean up bootcommands.c
---
 soh/soh/Enhancements/bootcommands.c           | 20 -------------------
 soh/src/code/z_player_lib.c                   |  4 ++--
 .../z_bg_spot06_objects.c                     |  2 +-
 .../actors/ovl_player_actor/z_player.c        |  2 +-
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index b09e5cd0b..6dc6b18b4 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -22,29 +22,9 @@ static BootCommand sCommands[] = { { "--skiplogo", BootCommands_Command_SkipLogo
 
 void BootCommands_Init()
 {
-    CVar_RegisterS32("gDisableLOD", 0);
     CVar_RegisterS32("gDebugEnabled", 0);
-    CVar_RegisterS32("gPauseLiveLink", 0);
-    CVar_RegisterS32("gMinimalUI", 0);
-    CVar_RegisterS32("gRedGanonBlood", 0);
-    CVar_RegisterS32("gHoverFishing", 0);
-    CVar_RegisterS32("gN64WeirdFrames", 0);
-    CVar_RegisterS32("gBombchusOOB", 0);
-    CVar_RegisterS32("gUniformLR", 0);
-    CVar_RegisterS32("gTwoHandedIdle", 0);
-    CVar_RegisterS32("gDekuNutUpgradeFix", 0);
-    CVar_RegisterS32("gNaviTextFix", 0);
-    CVar_RegisterS32("gNewDrops", 0);
-    CVar_RegisterS32("gVisualAgony", 0);
     CVar_RegisterS32("gLanguages", 0); //0 = English / 1 = German / 2 = French
-    CVar_RegisterS32("gForgeTime", 3);
-    CVar_RegisterS32("gGravediggingTourFix", 1);
     CVar_RegisterS32("gHudColors", 1); //0 = N64 / 1 = NGC / 2 = Custom
-    CVar_RegisterS32("gUseNaviCol", 0);
-    CVar_RegisterS32("gUseTunicsCol", 0);
-    CVar_RegisterS32("gGuardVision", 0);
-    CVar_RegisterS32("gTimeFlowFileSelect", 0);
-    CVar_RegisterS32("gSkulltulaDebugEnabled", 0);
 }
 
 //void BootCommands_ParseBootArgs(char* str)
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index a12a14481..239a1e1a9 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -1673,7 +1673,7 @@ void func_8009214C(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime,
     Vec3s* srcTable;
     s32 i;
     bool canswitchrnd = false;
-    s16 SelectedMode = CVar_GetS32("gPauseLiveLink", 1);
+    s16 SelectedMode = CVar_GetS32("gPauseLiveLink", 0);
     MinFrameCount = CVar_GetS32("gMinFrameCount", 200);
 
     gSegments[4] = VIRTUAL_TO_PHYSICAL(segment + 0x3800);
@@ -1699,7 +1699,7 @@ void func_8009214C(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime,
     };
     s16 AnimArraySize = ARRAY_COUNT(PauseMenuAnimSet);
 
-    if (CVar_GetS32("gPauseLiveLink", !0) || CVar_GetS32("gPauseTriforce", 0)) {
+    if (CVar_GetS32("gPauseLiveLink", 0) || CVar_GetS32("gPauseTriforce", 0)) {
         uintptr_t anim = 0; // Initialise anim
 
         if (CUR_EQUIP_VALUE(EQUIP_SWORD) >= 3) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
index 18175c124..5c20fa602 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
@@ -227,7 +227,7 @@ void BgSpot06Objects_GateSpawnBubbles(BgSpot06Objects* this, GlobalContext* glob
 void BgSpot06Objects_GateWaitForSwitch(BgSpot06Objects* this, GlobalContext* globalCtx) {
     s32 i;
 
-    if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
+    if ((CVar_GetS32("gWaterTempleGateFix", 0) == 0 || LINK_IS_ADULT) && Flags_GetSwitch(globalCtx, this->switchFlag)) {
         this->timer = 100;
         this->dyna.actor.world.pos.y += 3.0f;
         this->actionFunc = BgSpot06Objects_GateWaitToOpen;
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 072f5c20c..411647644 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -7139,7 +7139,7 @@ void func_808409CC(GlobalContext* globalCtx, Player* this) {
                 if (sp34 < 4) {
                     if (((sp34 != 0) && (sp34 != 3)) || ((this->rightHandType == PLAYER_MODELTYPE_RH_SHIELD) &&
                         ((sp34 == 3) || Player_GetSwordHeld(this)))) {
-                        if ((sp34 == 1) && Player_HoldsTwoHandedWeapon(this) && CVar_GetS32("gTwoHandedIdle", 1) == 1) {
+                        if ((sp34 == 1) && Player_HoldsTwoHandedWeapon(this) && CVar_GetS32("gTwoHandedIdle", 0) == 1) {
                             sp34 = 4;
                         }
                         sp38 = sp34 + 9;