diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-25 20:40:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-25 20:40:44 -0400 |
| commit | 9cb08e34750ad591daf69900d9f857cb8a4ddfbe (patch) | |
| tree | 2a26856c1fb56f59d81a916b7412d0942b066f61 /src/field_control_avatar.c | |
| parent | adc7a0b65a16f8fcbbadd527980950dec351b9cd (diff) | |
Document player avatar fields
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 891af3e90..ee413df2d 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_MVMT_IS_FORCED)) + if ((newKeys & START_BUTTON) && !(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING)) input->pressedStartButton = TRUE; if (gQuestLogState != QL_STATE_2 && gQuestLogState != QL_STATE_3) { - if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_MVMT_IS_FORCED)) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING)) { 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_MVMT_IS_FORCED) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior) && UpdateRepelCounter() == TRUE) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !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_MVMT_IS_FORCED) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) { if (sub_810C4EC() == TRUE) { |