diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-19 17:32:32 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-19 17:32:32 +0100 |
| commit | 5d5b4b853c3b79db2abc7f062105f4e1dcdfcea2 (patch) | |
| tree | 953062d60fe4180479ff83ec8ef9742f434637d5 /src/battle_transition.c | |
| parent | 8a00334102f8dada18523bd3c2b57d0b68fbd6ce (diff) | |
| parent | 8f2ddf2997041bc813a32ac604002fcbb987e3a0 (diff) | |
Merge branch 'master' into frontier
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 759f15eee..94b9e78f9 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle.h" #include "battle_transition.h" #include "bg.h" #include "decompress.h" @@ -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); |