diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-20 15:24:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 15:24:20 -0800 |
| commit | 185846f20840c03ba1616c4d0c6eca949147512c (patch) | |
| tree | 2ee03f3c11f552976589d1ac0b0de474bf78fb96 /src/battle/battle_transition.c | |
| parent | e2a0522780d7124a392bf028c9c1f50c4213b460 (diff) | |
| parent | 003ed9293b2c51f0481ed31f0e0459cbecbf757e (diff) | |
Merge pull request #544 from huderlem/weather
Further document weather
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) { |