Merge pull request #1338 from HornedCrusader/patch-1

Fix bike flag
This commit is contained in:
luckytyphlosion
2021-02-20 19:14:26 -05:00
committed by GitHub
+1 -2
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);