ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1338 from HornedCrusader/patch-1

Browse Source 
Fix bike flag
This commit is contained in:
luckytyphlosion 2021-02-20 19:14:26 -05:00 committed by GitHub
commit 6872d6f196
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/field_player_avatar.c
View File

@ -382,8 +382,7 @@ static void npc_clear_strange_bits(struct ObjectEvent *objEvent)
static void MovePlayerAvatarUsingKeypadInput(u8 direction, u16 newKeys, u16 heldKeys) static void MovePlayerAvatarUsingKeypadInput(u8 direction, u16 newKeys, u16 heldKeys)
{ {
if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_MACH_BIKE) if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
|| (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ACRO_BIKE))
MovePlayerOnBike(direction, newKeys, heldKeys); MovePlayerOnBike(direction, newKeys, heldKeys);
else else
MovePlayerNotOnBike(direction, heldKeys); MovePlayerNotOnBike(direction, heldKeys);