mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-28 12:22:20 -05:00
Code Issues Projects Releases Wiki Activity

Fix function call

Browse Source
This commit is contained in:
Patrick12115 2024-11-11 16:30:18 -05:00
parent f15ebe1e1f
commit 4f6375b458
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -7384,8 +7384,8 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
} }
if ((this->heldActor == NULL) || Player_HoldsHookshot(this)) { if ((this->heldActor == NULL) || Player_HoldsHookshot(this)) {
if ((interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT && if ((interactedActor->id == ACTOR_BG_TOKI_SWD) && LINK_IS_ADULT && !(IS_RANDO &&
!(Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER)))) { Randomizer_GetSettingValue(RSK_SHUFFLE_MASTER_SWORD) && !CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER))) {
s32 sp24 = this->itemAction; s32 sp24 = this->itemAction;
this->itemAction = PLAYER_IA_NONE; this->itemAction = PLAYER_IA_NONE;