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
@@ -23,7 +23,7 @@
 #include "palette.h"
 #include "pokeball.h"
 #include "pokedex.h"
-#include "pokemon_3.h"
+#include "pokemon.h"
 #include "random.h"
 #include "rtc.h"
 #include "save.h"