diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2025-03-24 03:46:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-24 08:46:22 +0100 |
| commit | edd8561ddc3ffe155e6c63e37599274e977e70da (patch) | |
| tree | 84152b61870d40fd59cc4293669f92b1dff3ad49 /soh/src | |
| parent | c7e3ef9e4dd86ea38a655eaecce850db8d7f8a03 (diff) | |
assignable tunics/boots - dont throw items (#5045)
* don't throw items when using assigned tunics/boots
* didn't actually need that
* simplify logic so we don't need to check for holding items
* just use a vb should
* fix comment
Diffstat (limited to 'soh/src')
| -rw-r--r-- | soh/src/overlays/actors/ovl_player_actor/z_player.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 1d9c89212..8acdee4a4 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -7436,8 +7436,10 @@ s32 Player_ActionHandler_9(Player* this, PlayState* play) { if (CVarGetInteger(CVAR_ENHANCEMENT("DpadEquips"), 0) != 0) { buttonsToCheck |= BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT; } - if ((this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (this->heldActor != NULL) && - CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck)) { + if (GameInteractor_Should(VB_THROW_OR_PUT_DOWN_HELD_ITEM, ( + (this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (this->heldActor != NULL) && + CHECK_BTN_ANY(sControlInput->press.button, buttonsToCheck) + ), sControlInput)) { if (!func_80835644(play, this, this->heldActor)) { if (!func_8083EAF0(this, this->heldActor)) { Player_SetupAction(play, this, Player_Action_808464B0, 1); |