mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-13 04:29:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Vanilla bugfix, allow fishing with blank B (#6826)

Browse Source
This commit is contained in:
djevangelia
2026-07-24 18:24:56 +02:00
committed by GitHub
parent 581af47419
commit 3c565ed6e6
4 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_player_actor/z_player.c
+5 -2
View File
@@ -2524,8 +2524,10 @@ void Player_ProcessItemButtons(Player* this, PlayState* play) {
}
if (!Player_ItemIsInUse(this, B_BTN_ITEM) && !Player_ItemIsInUse(this, C_BTN_ITEM(0)) &&
!Player_ItemIsInUse(this, C_BTN_ITEM(1)) && !Player_ItemIsInUse(this, C_BTN_ITEM(2)) && !hasOnDpad) {
Player_UseItem(play, this, ITEM_NONE);
return;
if (GameInteractor_Should(VB_PUTAWAY_BECAUSE_DISABLED_ITEM_BUTTONS, true)) {
Player_UseItem(play, this, ITEM_NONE);
return;
}
}
}
@@ -2536,6 +2538,7 @@ void Player_ProcessItemButtons(Player* this, PlayState* play) {
}
item = Player_GetItemOnButton(play, i);
GameInteractor_Should(VB_OVERRIDE_BUTTON_ITEM_USED, true, &i, this, &item);
if (item >= ITEM_NONE_FE) {
for (i = 0; i < ARRAY_COUNT(sItemButtons); i++) {