Merge branch 'master' into document-scriptmenu

2019-09-22 09:45:44 -04:00
parent b6dffcf8b7 1ffa890d27
commit 8e4e344c7d
9 changed files with 268 additions and 300 deletions
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -17,6 +17,7 @@
 #include "constants/map_scripts.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
+#include "constants/pokemon.h"
 #include "constants/script_menu.h"
 #include "constants/songs.h"
 #include "constants/species.h"