Merge branch 'master' into reverts

2020-10-26 12:16:36 -03:00
parent fe40c0c466 585f313c64
commit 1c3d75f673
382 changed files with 22866 additions and 22447 deletions
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -27,7 +27,6 @@
 #include "constants/items.h"
 #include "constants/pokemon.h"
 #include "constants/songs.h"
-#include "constants/species.h"
 #include "constants/trainers.h"
 #include "constants/moves.h"