diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
| commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
| tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /src/battle_transition.c | |
| parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
| parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) | |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 37a8cd63f..786d5e869 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -3,8 +3,10 @@ #include "battle_transition.h" #include "bg.h" #include "decompress.h" +#include "event_object_movement.h" #include "field_camera.h" #include "field_effect.h" +#include "field_weather.h" #include "gpu_regs.h" #include "main.h" #include "alloc.h" @@ -57,10 +59,6 @@ struct StructRectangularSpiral typedef bool8 (*TransitionStateFunc)(struct Task *task); typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); -extern const struct OamData gEventObjectBaseOam_32x32; - -extern void SetWeatherScreenFadeOut(void); - // this file's functions static void LaunchBattleTransitionTask(u8 transitionId); static void Task_BattleTransitionMain(u8 taskId); |