summaryrefslogtreecommitdiff
path: root/src/battle_transition.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_transition.c')
-rw-r--r--src/battle_transition.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c
index fc8c0eeee..94b9e78f9 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -1,25 +1,26 @@
#include "global.h"
+#include "battle.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
{
@@ -56,9 +57,6 @@ struct StructRectangularSpiral
typedef bool8 (*TransitionStateFunc)(struct Task *task);
typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite);
-extern u16 gBattle_BG0_X;
-extern u16 gBattle_BG0_Y;
-
extern const struct OamData gEventObjectBaseOam_32x32;
extern void sub_80AC3D0(void);