diff options
| author | theo3 <arisstephenson2@gmail.com> | 2022-03-28 12:15:25 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2022-03-28 12:15:25 -0700 |
| commit | bfa69f594ce38e34ab3bcc9fb51ec45edae044d8 (patch) | |
| tree | 2bbfce5aa06af9a5fc6de395fbb72c1e5c960f82 /src | |
| parent | c0eae31c2c6fbe1694337ae74ed4360068bd3a0b (diff) | |
format
Diffstat (limited to 'src')
| -rw-r--r-- | src/game.c | 4 | ||||
| -rw-r--r-- | src/playerItem/playerItem13.c | 6 | ||||
| -rw-r--r-- | src/playerUtils.c | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -1284,8 +1284,8 @@ static void InitRoomTransition(void) { bool32 CanDispEzloMessage(void) { s32 tmp = PL_STATE_WALK; - if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || gPauseMenuOptions.disabled || - gUnk_0200AF00.unk_1) + if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || + gPauseMenuOptions.disabled || gUnk_0200AF00.unk_1) return 0; if ((gPlayerState.flags & (PL_NO_CAP | 0x110)) || (gPlayerState.framestate_last > tmp) || gPlayerState.item || diff --git a/src/playerItem/playerItem13.c b/src/playerItem/playerItem13.c index e4b03d8b..e76faf89 100644 --- a/src/playerItem/playerItem13.c +++ b/src/playerItem/playerItem13.c @@ -42,7 +42,7 @@ void sub_080ACFCC(PlayerItem13Entity* this) { Entity* child = super->child; if ((this->unk_6c == child->kind) || (this->unk_6e == child->id)) { if (child->action != 2) { - sub_08079184(); + PlayerDropHeldObject(); DeleteThisEntity(); } else { if ((gPlayerState.heldObject == 0) || ((gNewPlayerEntity.unk_79 & 0x7f) != 0)) { @@ -54,7 +54,7 @@ void sub_080ACFCC(PlayerItem13Entity* this) { } } } else { - sub_08079184(); + PlayerDropHeldObject(); DeleteThisEntity(); } } @@ -204,7 +204,7 @@ void sub_080AD27C(PlayerItem13Entity* this) { super->flags |= 0x80; sub_0801766C(super); } else { - sub_08079184(); + PlayerDropHeldObject(); DeleteThisEntity(); } } diff --git a/src/playerUtils.c b/src/playerUtils.c index bb80c8b2..10b17c9d 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -569,7 +569,7 @@ void PlayerCancelHoldItem(ItemBehavior* beh, u32 arg1) { * Check if player state believes the held item is valid? * If it's not delete the item? */ -bool32 PlayerTryDropItem(ItemBehavior* arg0, u32 unk) { +bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk) { u32 temp; if (gPlayerState.heldObject == 0) { PlayerCancelHoldItem(arg0, unk); |
