Merge branch 'master' into contest-ai-cleanup

2019-04-07 20:20:22 -04:00
parent 1360b3a477 a4ea0ac816
commit 50350cc2e1
732 changed files with 38218 additions and 41300 deletions
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle_main.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "gpu_regs.h"