From 541a3ff607bc5f5c210f5ed6da93669352a33c77 Mon Sep 17 00:00:00 2001
From: Patrick12115 <Patrick12115@hotmail.com>
Date: Fri, 1 Mar 2024 20:10:54 -0500
Subject: [PATCH] Remove old checkbox

---
 soh/soh/Enhancements/mods.cpp | 24 ++++++++++++++----------
 soh/soh/SohMenuBar.cpp        |  4 ----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp
index 2190588d9..16ee20847 100644
--- a/soh/soh/Enhancements/mods.cpp
+++ b/soh/soh/Enhancements/mods.cpp
@@ -794,22 +794,26 @@ void PatchOrUnpatch(const char* resource, const char* gfx, const char* dlist1, c
     if (resource == NULL || gfx == NULL || dlist1 == NULL || dlist2 == NULL)
         return;
 
-    if (ResourceGetIsCustomByName(gfx) && CVarGetInteger("gAltAssets", 0)) {
-        if (alternateDL == NULL || ResourceGetIsCustomByName(alternateDL) || ResourceMgr_FileExists(alternateDL)) {
-            ResourceMgr_PatchCustomGfxByName(resource, dlist1, 0, gsSPDisplayListOTRFilePath(gfx));
-            if (dlist3 == NULL) {
-                ResourceMgr_PatchCustomGfxByName(resource, dlist2, 1, gsSPEndDisplayList());
-            } else {
-                ResourceMgr_PatchCustomGfxByName(resource, dlist2, 1, gsSPDisplayListOTRFilePath(alternateDL));
+    if (CVarGetInteger("gAltAssets", 0)) {
+        if (ResourceGetIsCustomByName(gfx)) {
+            if (alternateDL == NULL || ResourceGetIsCustomByName(alternateDL) || ResourceMgr_FileExists(alternateDL)) {
+                ResourceMgr_PatchCustomGfxByName(resource, dlist1, 0, gsSPDisplayListOTRFilePath(gfx));
+                if (dlist3 == NULL) {
+                    ResourceMgr_PatchCustomGfxByName(resource, dlist2, 1, gsSPEndDisplayList());
+                } else {
+                    ResourceMgr_PatchCustomGfxByName(resource, dlist2, 1, gsSPDisplayListOTRFilePath(alternateDL));
+                }
+                if (dlist3 != NULL) {
+                    ResourceMgr_PatchCustomGfxByName(resource, dlist3, 2, gsSPEndDisplayList());
+                }
             }
-            if (dlist3 != NULL)
-                ResourceMgr_PatchCustomGfxByName(resource, dlist3, 2, gsSPEndDisplayList());
         }
     } else {
         ResourceMgr_UnpatchGfxByName(resource, dlist1);
         ResourceMgr_UnpatchGfxByName(resource, dlist2);
-        if (dlist3 != NULL)
+        if (dlist3 != NULL) {
             ResourceMgr_UnpatchGfxByName(resource, dlist3);
+        }
     }
 }
 
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index de0bcd232..fbf5368af 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -1074,10 +1074,6 @@ void DrawEnhancementsMenu() {
                     ToggleAltAssetsAtEndOfFrame = true;
                 }
                 UIWidgets::Tooltip("Toggle between standard assets and alternate assets. Usually mods will indicate if this setting has to be used or not.");
-                if (UIWidgets::PaddedEnhancementCheckbox("Use Custom Equipment", "gEnhancements.CustomEquipDlists", true, false)) {
-                    UpdatePatchCustomEquipmentDlists();
-                }
-                UIWidgets::Tooltip("Toggle between standard equipment and custom equipment. Usually mods will indicate if this setting has to be used or not.");
                 UIWidgets::PaddedEnhancementCheckbox("Disable Bomb Billboarding", "gDisableBombBillboarding", true, false);
                 UIWidgets::Tooltip("Disables bombs always rotating to face the camera. To be used in conjunction with mods that want to replace bombs with 3D objects.");
                 UIWidgets::PaddedEnhancementCheckbox("Disable Grotto Fixed Rotation", "gDisableGrottoRotation", true, false);