Merge remote-tracking branch 'upstream/master' into berry_crush

2020-12-10 23:30:52 -05:00
parent 32ae13f9b6 8d29f65c6c
commit 58976ebaa8
500 changed files with 25386 additions and 24803 deletions
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -44,7 +44,6 @@
 #include "constants/songs.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
-#include "constants/species.h"
 #include "constants/trainers.h"
 #include "constants/trainer_hill.h"