From 04ccd608b3884713bf6bf6284f5d272c256fc507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?=
 <159546+serprex@users.noreply.github.com>
Date: Sun, 20 Sep 2026 03:45:53 +0000
Subject: [PATCH] Fix equipping sword over swordless while fishing/riding
 (#7222)

---
 soh/soh/Enhancements/randomizer/hook_handlers.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index e144980975..c9fd6f7089 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -1535,7 +1535,10 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
         case VB_TEMP_B_RESTORE_SWORDLESS:
             // Convert the swordless sentinel back into an empty (swordless) B button.
             if (gSaveContext.buttonStatus[0] == SWORDLESS_STATUS) {
-                gSaveContext.equips.buttonItems[0] = ITEM_NONE;
+                u8 bItem = gSaveContext.equips.buttonItems[0];
+                if (!((bItem >= ITEM_SWORD_KOKIRI && bItem <= ITEM_SWORD_BGS) || bItem == ITEM_SWORD_KNIFE)) {
+                    gSaveContext.equips.buttonItems[0] = ITEM_NONE;
+                }
                 gSaveContext.buttonStatus[0] = BTN_ENABLED;
             }
             break;