Merge master into sync-script

2020-01-12 15:39:21 -05:00
parent aa84a1d3a1 15ff7eb2f8
commit f276383293
84 changed files with 16393 additions and 35195 deletions
@@ -18,7 +18,7 @@
 #include "new_game.h"
 #include "save.h"
 #include "item.h"
-#include "script_pokemon_util_80A0058.h"
+#include "script_pokemon_util.h"
 #include "constants/species.h"
 #include "constants/items.h"
 #include "constants/moves.h"