From 73be4e55591f547df1a27884fdddbae36f603e07 Mon Sep 17 00:00:00 2001
From: Archez <Archez@users.noreply.github.com>
Date: Mon, 15 Jul 2024 22:24:38 -0400
Subject: [PATCH] Bump LUS for 2cyc color combiner fix (#4221)

---
 CMakeLists.txt                                   |  2 +-
 libultraship                                     |  2 +-
 .../cosmetics/authenticGfxPatches.cpp            | 16 ----------------
 soh/soh/SohGui.cpp                               |  3 +++
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 490489f55..02b765622 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # Set GBI version
 ################################################################################
 
-add_compile_definitions(F3DEX_GBI_2)
+set(GBI_UCODE F3DEX_GBI_2)
 
 ################################################################################
 # Sub-projects
diff --git a/libultraship b/libultraship
index 9907ebfd6..31e9b009f 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 9907ebfd66ff5bf903ecb7327cca69014993772b
+Subproject commit 31e9b009f94e7074a847c7954926cba354cd7c72
diff --git a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
index f31eedd2c..6b74769c1 100644
--- a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
+++ b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
@@ -9,7 +9,6 @@ extern "C" {
 #include "objects/object_gi_soldout/object_gi_soldout.h"
 #include "objects/object_ik/object_ik.h"
 #include "objects/object_link_child/object_link_child.h"
-#include "objects/object_ru2/object_ru2.h"
 
 uint32_t ResourceMgr_GameHasMasterQuest();
 uint32_t ResourceMgr_GameHasOriginal();
@@ -189,25 +188,10 @@ void PatchIronKnuckleTextureOverflow() {
     }
 }
 
-void PatchPrincessRutoEaring() {
-    // FAST3D: This is a hack for the issue of both TEXEL0 and TEXEL1 using the same texture with different settings.
-    // Ruto's earring uses both TEXEL0 and TEXEL1 to render. The issue is that it never loads anything into TEXEL1, so
-    // it reuses whatever happens to be there, which is the water temple brick texture. It just so happens that the
-    // earring texture loads into the same place in TMEM as the brick texture, so when it comes to rendering, TEXEL1
-    // uses the earring texture with different clamp settings, and it displays without noticeable error. However, both
-    // texel samplers are not intended to be used for the same texture with different settings, so this misuse confuses
-    // our texture cache, and we load the wrong settings for the earrings texture. This patch is a hack that replaces
-    // TEXEL1 with TEXEL0, which is most likely the original intention, and all is well.
-    ResourceMgr_PatchGfxByName(gAdultRutoHeadDL, "RutoEaringTileFix", 162,
-                               gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED,
-                                                  TEXEL0, 0, PRIM_LOD_FRAC, COMBINED));
-}
-
 void ApplyAuthenticGfxPatches() {
     PatchDekuStickTextureOverflow();
     PatchFreezardTextureOverflow();
     PatchIronKnuckleTextureOverflow();
-    PatchPrincessRutoEaring();
 }
 
 // Patches the Sold Out GI DL to render the texture in the mirror boundary
diff --git a/soh/soh/SohGui.cpp b/soh/soh/SohGui.cpp
index 25763525d..71a366021 100644
--- a/soh/soh/SohGui.cpp
+++ b/soh/soh/SohGui.cpp
@@ -206,6 +206,9 @@ namespace SohGui {
     }
 
     void Destroy() {
+        auto gui = Ship::Context::GetInstance()->GetWindow()->GetGui();
+        gui->RemoveAllGuiWindows();
+        
         mModalWindow = nullptr;
         mAdvancedResolutionSettingsWindow = nullptr;
         mRandomizerSettingsWindow = nullptr;