diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-05-27 07:51:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 07:51:44 -0400 |
| commit | 1648d6c66be94705fb2ea935aef8eef37a690ea9 (patch) | |
| tree | 8c75fc8b7e61dbb4fc6a0f0e28ce4e24b2467401 /src | |
| parent | 94b68c54e8fce5ca49c5a87e99140f533711dd1d (diff) | |
| parent | f5c694c5b444c07d6bb44d73612b1c7e0bb6dae8 (diff) | |
Merge pull request #339 from ghoulslash/fixes
fix PLAYER_AVATAR_FLAG_WATERING
Diffstat (limited to 'src')
| -rw-r--r-- | src/bike.c | 2 | ||||
| -rw-r--r-- | src/event_object_movement.c | 2 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bike.c b/src/bike.c index d08a5fe82..e31fd27a4 100644 --- a/src/bike.c +++ b/src/bike.c @@ -374,7 +374,7 @@ s16 GetPlayerSpeed(void) return exp[gPlayerAvatar.bikeFrameCounter]; else if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ACRO_BIKE) return 3; - else if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_WATERING)) + else if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_DASH)) return 2; else return 1; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 72ce58bb5..d11729bd5 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -3037,7 +3037,7 @@ bool8 ObjectEventIsTrainerAndCloseToPlayer(struct ObjectEvent *objectEvent) s16 minY; s16 maxY; - if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_WATERING)) + if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH)) { return FALSE; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 5a8a3e98a..6f8ff69a7 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -181,7 +181,7 @@ static void npc_clear_strange_bits(struct ObjectEvent *objEvent) objEvent->inanimate = FALSE; objEvent->disableAnim = FALSE; objEvent->facingDirectionLocked = FALSE; - gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_WATERING; + gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH; } static void MovePlayerAvatarUsingKeypadInput(u8 direction, u16 newKeys, u16 heldKeys) @@ -517,7 +517,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) PlayerRunSlow(direction); else PlayerRun(direction); - gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_WATERING; + gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH; return; } else @@ -1228,7 +1228,7 @@ void ClearPlayerAvatarInfo(void) void SetPlayerAvatarStateMask(u8 flags) { - gPlayerAvatar.flags &= (PLAYER_AVATAR_FLAG_WATERING | PLAYER_AVATAR_FLAG_FISHING | PLAYER_AVATAR_FLAG_FIELD_MOVE); + gPlayerAvatar.flags &= (PLAYER_AVATAR_FLAG_DASH | PLAYER_AVATAR_FLAG_FISHING | PLAYER_AVATAR_FLAG_FIELD_MOVE); gPlayerAvatar.flags |= flags; } |