diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-20 16:44:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-20 16:44:16 -0400 |
| commit | 95c7e3d067b7ac8e6cb8ef76f58713b0c8b128ec (patch) | |
| tree | e65a787459bcd091537e250c4e5640f67b69228c /src/field_control_avatar.c | |
| parent | 301ef72cf8f3fa38a732fbd7c63d2b6b041f3f13 (diff) | |
Update player avatar state enums
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 572c6af6b..004e2c219 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -105,11 +105,11 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) { if (GetPlayerSpeed() != 4) { - if ((newKeys & START_BUTTON) && !(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING)) + if ((newKeys & START_BUTTON) && !(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FORCED)) input->pressedStartButton = TRUE; if (!QL_IS_PLAYBACK_STATE) { - if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING)) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FORCED)) { if (newKeys & SELECT_BUTTON) input->pressedSelectButton = TRUE; @@ -625,7 +625,7 @@ static bool8 TryStartStepBasedScript(struct MapPosition *position, u16 metatileB return TRUE; if (TryStartStepCountScript(metatileBehavior) == TRUE) return TRUE; - if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior) && UpdateRepelCounter() == TRUE) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FORCED) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior) && UpdateRepelCounter() == TRUE) return TRUE; return FALSE; } @@ -655,7 +655,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) UpdateHappinessStepCounter(); - if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FORCED) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) { if (UpdateVsSeekerStepCounter() == TRUE) { |