Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest

2020-08-16 05:59:10 -04:00
parent 2749948eeb 25f45ffa84
commit 65bd2faf94
511 changed files with 17469 additions and 16800 deletions
@@ -27,7 +27,6 @@
 #include "trainer_pokemon_sprites.h"
 #include "contest_util.h"
 #include "constants/songs.h"
-#include "constants/flags.h"
 #include "constants/game_stat.h"
 #include "constants/battle_frontier.h"
 #include "constants/rgb.h"