diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-20 22:53:08 +0100 |
commit | ecee02816d475f012dd4eec8a59b9ad3ba9ab531 (patch) | |
tree | 5eb0cdad91aeba20866a731033d76add878c3ec4 /src/battle_transition.c | |
parent | 7dcb614cca6d61c5e51960826dddc004858ed9f1 (diff) | |
parent | 6ef96717181dfa1cda548cbe405410aba065e41c (diff) |
Merge with master
Diffstat (limited to 'src/battle_transition.c')
-rw-r--r-- | src/battle_transition.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index f74102467..37a8cd63f 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -59,7 +59,7 @@ typedef bool8 (*TransitionSpriteCallback)(struct Sprite *sprite); extern const struct OamData gEventObjectBaseOam_32x32; -extern void sub_80AC3D0(void); +extern void SetWeatherScreenFadeOut(void); // this file's functions static void LaunchBattleTransitionTask(u8 transitionId); @@ -981,7 +981,7 @@ static void Task_BattleTransitionMain(u8 taskId) static bool8 Transition_Phase1(struct Task *task) { - sub_80AC3D0(); + SetWeatherScreenFadeOut(); CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); if (sPhase1_Tasks[task->tTransitionId] != NULL) { |