summaryrefslogtreecommitdiff
path: root/src/battle_setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r--src/battle_setup.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index d8319e620..bc569dff7 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -2,6 +2,14 @@
#include "battle_setup.h"
#include "battle.h"
#include "battle_transition.h"
+#include "constants/battle_setup.h"
+#include "constants/items.h"
+#include "constants/map_types.h"
+#include "constants/maps.h"
+#include "constants/opponents.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+#include "contest_util.h"
#include "data2.h"
#include "event_data.h"
#include "field_control_avatar.h"
@@ -13,12 +21,11 @@
#include "fldeff_poison.h"
#include "main.h"
#include "metatile_behavior.h"
+#include "overworld.h"
#include "palette.h"
#include "random.h"
-#include "overworld.h"
#include "safari_zone.h"
#include "script.h"
-#include "script_pokemon_80C4.h"
#include "secret_base.h"
#include "sound.h"
#include "starter_choose.h"
@@ -27,13 +34,6 @@
#include "task.h"
#include "text.h"
#include "trainer.h"
-#include "constants/battle_setup.h"
-#include "constants/map_types.h"
-#include "constants/maps.h"
-#include "constants/opponents.h"
-#include "constants/songs.h"
-#include "constants/species.h"
-#include "constants/items.h"
extern u16 gSpecialVar_Result;