diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
commit | 6bef5a2622b432049df9c8b581e21ae09965b02c (patch) | |
tree | d764c1d61d17018c41ef9eab403137d5aeef17d0 /src/battle/battle_transition.c | |
parent | 4327bee485510b424cbf28e450d90ff50e6fe78b (diff) | |
parent | e92ead0e159ccaa8301b189b9ef2bb1a33b2ea62 (diff) |
merge
Diffstat (limited to 'src/battle/battle_transition.c')
-rw-r--r-- | src/battle/battle_transition.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index f7cdc0694..a94974b27 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -6,6 +6,7 @@ #include "palette.h" #include "trig.h" #include "field_effect.h" +#include "field_weather.h" #include "random.h" #include "sprite.h" #include "sound.h" @@ -15,7 +16,6 @@ #include "ewram.h" #include "scanline_effect.h" -void sub_807DE10(void); void ScanlineEffect_Clear(void); extern const struct OamData gFieldOamData_32x32; @@ -567,7 +567,7 @@ static void Task_BattleTransitionMain(u8 taskID) static bool8 Transition_Phase1(struct Task* task) { - sub_807DE10(); + SetWeatherScreenFadeOut(); CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); if (sPhase1_Tasks[task->tTransitionID] != NULL) { |