diff options
| author | Philip Dubé <159546+serprex@users.noreply.github.com> | 2026-09-20 03:45:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-20 03:45:53 +0000 |
| commit | 04ccd608b3884713bf6bf6284f5d272c256fc507 (patch) | |
| tree | 6f4e2a19530c6ad4aefb40c4fc176d89f0ced8b2 | |
| parent | 5fee87c23ebcdf8cf11078a9ecaa6e474498787f (diff) | |
Fix equipping sword over swordless while fishing/riding (#7222)
| -rw-r--r-- | soh/soh/Enhancements/randomizer/hook_handlers.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index e14498097..c9fd6f708 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; |