summaryrefslogtreecommitdiff
path: root/src/battle/battle_transition.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-24 23:38:36 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-24 23:38:36 -0500
commit4ba3b9f592e2a23bb57e59ca41acd0cfb27a0d84 (patch)
tree4009791ef38c7f47f8ba14a1ba17ea3e75058544 /src/battle/battle_transition.c
parent4327bee485510b424cbf28e450d90ff50e6fe78b (diff)
parent4e54b9f65e93e84887ef81b726a187bbf3197530 (diff)
merge
Diffstat (limited to 'src/battle/battle_transition.c')
-rw-r--r--src/battle/battle_transition.c4
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)
{