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
--- a/src/contest.c
+++ b/src/contest.c
@@ -38,7 +38,6 @@
 #include "data.h"
 #include "contest_ai.h"
 #include "constants/event_objects.h"
-#include "constants/flags.h"
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/rgb.h"