summaryrefslogtreecommitdiff
path: root/src/battle_setup.c
diff options
context:
space:
mode:
authorMarijn van der Werf <marijn.vanderwerf@gmail.com>2017-04-27 15:43:31 +0200
committerMarijn van der Werf <marijn.vanderwerf@gmail.com>2017-04-27 16:07:18 +0200
commitddc846fa6a0d9a13cfba6f52488a66f6f4562a2d (patch)
treea87f22742634e2c02643a807b148964ed1b13d6d /src/battle_setup.c
parentaec7b25c1ad0ef646f1430bc8b68d3adb1106edd (diff)
Sort includes
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r--src/battle_setup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index a8f94baed..abc0b978d 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -3,15 +3,21 @@
#include "asm.h"
#include "battle.h"
#include "event_data.h"
+#include "field_control_avatar.h"
+#include "field_map_obj_helpers.h"
#include "field_message_box.h"
#include "field_player_avatar.h"
+#include "field_screeneffect.h"
#include "main.h"
+#include "map_constants.h"
#include "metatile_behavior.h"
+#include "opponent_constants.h"
#include "palette.h"
#include "rng.h"
#include "rom4.h"
#include "safari_zone.h"
#include "script.h"
+#include "script_pokemon_80C4.h"
#include "songs.h"
#include "sound.h"
#include "species.h"
@@ -20,12 +26,6 @@
#include "task.h"
#include "text.h"
#include "trainer.h"
-#include "field_screeneffect.h"
-#include "map_constants.h"
-#include "opponent_constants.h"
-#include "script_pokemon_80C4.h"
-#include "field_map_obj_helpers.h"
-#include "field_control_avatar.h"
extern u16 gScriptResult;