merge overworld with master

2018-02-14 01:12:17 +01:00
parent 94b47c0686 bb8c53f898
commit 5dde701c81
46 changed files with 2827 additions and 7155 deletions
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -49,6 +49,8 @@ struct TrainerBattleParameter
    u8 ptrType;
 };

+extern void (*gFieldCallback)(void);
+
 extern bool8 InBattlePyramid(void);
 extern bool8 InBattlePike(void);
 extern bool32 InTrainerHill(void);