Merge with master

2018-07-16 20:23:05 +02:00
parent ee3d505b58 07ef762770
commit ea5ffa3375
1044 changed files with 7296 additions and 7064 deletions
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -32,6 +32,7 @@
 #include "overworld.h"
 #include "field_weather.h"
 #include "gym_leader_rematch.h"
+#include "constants/map_types.h"

 enum
 {