From b18cc9d628bc0ef21247fecb7dd8ca8a625fb36e Mon Sep 17 00:00:00 2001
From: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Date: Mon, 19 Sep 2022 22:55:46 -0400
Subject: [PATCH] Temporary Fishing Fixes for rando (#1525)

Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: briaguya <briaguya@alice>
---
 soh/soh/GameMenuBar.cpp                         | 10 ++++------
 soh/src/overlays/actors/ovl_Fishing/z_fishing.c | 12 +-----------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/soh/soh/GameMenuBar.cpp b/soh/soh/GameMenuBar.cpp
index 0a84d3c41..15aece0f2 100644
--- a/soh/soh/GameMenuBar.cpp
+++ b/soh/soh/GameMenuBar.cpp
@@ -399,16 +399,14 @@ namespace GameMenuBar {
         // Allow the cursor to be on any slot
         CVar_SetS32("gPauseAnyCursor", 1);
 
-        // Instant Fishing
-        CVar_SetS32("gInstantFishing", 1);
         // Guarantee Bite
         CVar_SetS32("gGuaranteeFishingBite", 1);
         // Fish Never Escape
         CVar_SetS32("gFishNeverEscape", 1);
         // Child Minimum Weight (6 to 10)
-        CVar_SetS32("gChildMinimumWeightFish", 6);
+        CVar_SetS32("gChildMinimumWeightFish", 3);
         // Adult Minimum Weight (8 to 13)
-        CVar_SetS32("gAdultMinimumWeightFish", 8);
+        CVar_SetS32("gAdultMinimumWeightFish", 6);
 
         // Visual Stone of Agony
         CVar_SetS32("gVisualAgony", 1);
@@ -861,9 +859,9 @@ namespace GameMenuBar {
                         UIWidgets::Tooltip("When a line is stable, guarantee bite. Otherwise use default logic");
                         UIWidgets::PaddedEnhancementCheckbox("Fish Never Escape", "gFishNeverEscape", true, false);
                         UIWidgets::Tooltip("Once a hook has been set, fish will never let go while being reeled in.");
-                        UIWidgets::PaddedEnhancementSliderInt("Child Minimum Weight: %d", "##cMinimumWeight", "gChildMinimumWeightFish", 6, 10, "", 10, false, true, false);
+                        UIWidgets::PaddedEnhancementSliderInt("Child Minimum Weight: %d", "##cMinimumWeight", "gChildMinimumWeightFish", 3, 10, "", 10, false, true, false);
                         UIWidgets::Tooltip("The minimum weight for the unique fishing reward as a child");
-                        UIWidgets::PaddedEnhancementSliderInt("Adult Minimum Weight: %d", "##aMinimumWeight", "gAdultMinimumWeightFish", 8, 13, "", 13, false, true, false);
+                        UIWidgets::PaddedEnhancementSliderInt("Adult Minimum Weight: %d", "##aMinimumWeight", "gAdultMinimumWeightFish", 6, 13, "", 13, false, true, false);
                         UIWidgets::Tooltip("The minimum weight for the unique fishing reward as an adult");
                         ImGui::EndMenu();
                     }
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index 3342fa8eb..402633330 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -2901,18 +2901,8 @@ f32 Fishing_GetMinimumRequiredScore() {
     // values above rando fish weight values when rando'd
     if(sLinkAge == 1) {
         weight = CVar_GetS32("gChildMinimumWeightFish", 10);
-        if (gSaveContext.n64ddFlag) {
-            if (weight > 8) {
-                weight = 8;
-            }
-        }
     } else {
-        weight = CVar_GetS32("gAdultMinimumWeightFish", 13);
-        if (gSaveContext.n64ddFlag) {
-            if (weight > 10) {
-                weight = 10;
-            }
-        }        
+        weight = CVar_GetS32("gAdultMinimumWeightFish", 13);     
     }
 
     return sqrt(((f32)weight - 0.5f) / 0.0036f);