From e2daa80623cc9858751555751e50fadacc9853d7 Mon Sep 17 00:00:00 2001
From: Jameriquiah <42100286+Jameriquiah@users.noreply.github.com>
Date: Sun, 12 Jul 2026 09:36:03 -0400
Subject: [PATCH] fix master sword in sheath custom equip not loading (#6909)

LoadCustomGfx's check being gated by OR condition broke gCustomMasterSwordInSheathDL, i can only assume this is because the sheathed sword DL is the "default" state called by link's skeleton. that condition in customequipment.cpp is not the cause of the log spam that #6862 aimed to fix so it was unneeded
---
 soh/soh/Enhancements/customequipment.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/customequipment.cpp b/soh/soh/Enhancements/customequipment.cpp
index 866c9227ac..00127311c5 100644
--- a/soh/soh/Enhancements/customequipment.cpp
+++ b/soh/soh/Enhancements/customequipment.cpp
@@ -55,7 +55,7 @@ static Gfx* LoadCustomGfx(const char* path) {
     if (!path)
         return nullptr;
     path = ResolveCustomFPSHand(path);
-    if (!ResourceMgr_FileAltExists(path) || !ResourceGetIsCustomByName(path))
+    if (!ResourceMgr_FileAltExists(path) && !ResourceGetIsCustomByName(path))
         return nullptr;
     return ResourceMgr_LoadGfxByName(path);
 }