summaryrefslogtreecommitdiff
path: root/src/field_fadetransition.c
diff options
context:
space:
mode:
authorKurausukun <lord.uber1@gmail.com>2021-03-19 14:34:58 -0400
committerKurausukun <lord.uber1@gmail.com>2021-03-19 14:34:58 -0400
commitc94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch)
treeb188427bb1942695f32e14ee3fe137855d638c8c /src/field_fadetransition.c
parent0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff)
parented16a7409ae9c808a110975dec1930f9f949a6d6 (diff)
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/field_fadetransition.c')
-rw-r--r--src/field_fadetransition.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 93bc8133d..a21833729 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -207,7 +207,7 @@ static void sub_807DDF0(u8 taskId)
switch (task->data[0])
{
case 0:
- PrepareSendLinkCmd2FFE_or_RfuCmd6600();
+ SetLinkStandbyCallback();
task->data[0]++;
break;
case 1:
@@ -663,7 +663,7 @@ static void Task_ReturnFromLinkRoomWarp(u8 taskId)
case 1:
if (!WaitWarpFadeOutScreen() && BGMusicStopped())
{
- Link_TryStartSend5FFF();
+ SetCloseLinkCallback();
data[0]++;
}
break;