mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-09-29 03:17:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix equipping sword over swordless while fishing/riding (#7222)

Browse Source
This commit is contained in:
Philip Dubé
2026-09-20 03:45:53 +00:00
committed by GitHub
parent 5fee87c23e
commit 04ccd608b3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/hook_handlers.cpp
+4 -1
View File
@@ -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;