diff options
author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
---|---|---|
committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
tree | b188427bb1942695f32e14ee3fe137855d638c8c /src/union_room_battle.c | |
parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/union_room_battle.c')
-rw-r--r-- | src/union_room_battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/union_room_battle.c b/src/union_room_battle.c index 3d5ef39eb..1e4528c8c 100644 --- a/src/union_room_battle.c +++ b/src/union_room_battle.c @@ -163,7 +163,7 @@ void CB2_UnionRoomBattle(void) } else { - Link_TryStartSend5FFF(); + SetCloseLinkCallback(); if (gBlockRecvBuffer[GetMultiplayerId()][0] == (ACTIVITY_DECLINE | 0x40)) { gMain.state = 6; @@ -179,7 +179,7 @@ void CB2_UnionRoomBattle(void) case 50: if (!UpdatePaletteFade()) { - PrepareSendLinkCmd2FFE_or_RfuCmd6600(); + SetLinkStandbyCallback(); gMain.state++; } break; |