Merge branch 'master' into decompile_use_pokeblock

2017-12-16 11:42:59 +01:00
parent 4351676749 224fdbf026
commit f4ab21ee67
133 changed files with 17392 additions and 19451 deletions
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "safari_zone.h"
 #include "event_data.h"
-#include "game_stat.h"
+#include "constants/game_stat.h"
 #include "main.h"
 #include "battle.h"
 #include "string_util.h"