merge bike with master, fix conflicts

2017-12-24 00:08:55 +01:00
parent 6b5157b2a3 841ee0f2b2
commit 8cd4908fa3
1429 changed files with 532566 additions and 21602 deletions
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -30,6 +30,7 @@ void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction);
 u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e);
 u8 PlayerGetZCoord(void);
 void SetPlayerAvatarTransitionFlags(u16 a);
+void sub_808BCE8(void);

 void sub_808D074(u8);
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);