summaryrefslogtreecommitdiff
path: root/src/battle_transition.c
diff options
context:
space:
mode:
authorSlawter666 <38655737+Slawter666@users.noreply.github.com>2018-11-13 14:19:04 +0000
committerSlawter666 <38655737+Slawter666@users.noreply.github.com>2018-11-13 14:19:04 +0000
commit1d4650711071b8f142ffccea30de20d45dd87978 (patch)
treee672c6602f13c3da8d6a13daed5c6e3831b34117 /src/battle_transition.c
parentf639c7c309bbd32fc60278eafa726db5c0c49914 (diff)
Move field effects enum to defines
Diffstat (limited to 'src/battle_transition.c')
-rw-r--r--src/battle_transition.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c
index fc8c0eeee..759f15eee 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -1,25 +1,25 @@
#include "global.h"
#include "battle_transition.h"
-#include "unk_transition.h"
+#include "bg.h"
+#include "decompress.h"
+#include "field_camera.h"
+#include "field_effect.h"
+#include "gpu_regs.h"
#include "main.h"
+#include "malloc.h"
#include "overworld.h"
-#include "task.h"
#include "palette.h"
-#include "trig.h"
-#include "field_effect.h"
-#include "field_camera.h"
#include "random.h"
-#include "sprite.h"
+#include "scanline_effect.h"
#include "sound.h"
+#include "sprite.h"
+#include "task.h"
+#include "trig.h"
+#include "unk_transition.h"
+#include "util.h"
+#include "constants/field_effects.h"
#include "constants/songs.h"
#include "constants/trainers.h"
-#include "field_camera.h"
-#include "scanline_effect.h"
-#include "malloc.h"
-#include "gpu_regs.h"
-#include "decompress.h"
-#include "bg.h"
-#include "util.h"
struct TransitionData
{