fix battle transition conflicts

2018-01-14 22:19:26 +01:00
parent bc1a957674 d1630d481a
commit 05aba58d5d
806 changed files with 26595 additions and 2758 deletions
@@ -42,6 +42,9 @@ void sub_8084EBC(s16, s16);

 void player_avatar_init_params_reset(void);

+bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
+void Overworld_ResetStateAfterTeleport(void);
+
 void Overworld_SetFlashLevel(s32 a1);
 //u8 Overworld_GetFlashLevel(void);
 void sub_8085524(u16);