diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-31 02:34:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 02:34:42 -0600 |
| commit | 935a098843b1176db8e4b4f8f82f70086a0ed92f (patch) | |
| tree | 2c20338324f10a553e78e731d999dd58669266c3 /src/battle_controller_player.c | |
| parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) | |
| parent | d004ce065c9cc6425df6f567dff39eb831f84875 (diff) | |
Merge pull request #456 from Diegoisawesome/trade
trade.c
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 6ccae2e95..12ffca381 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -869,7 +869,7 @@ static void sub_80586F8(void) } else { - if (sub_800A520()) + if (IsLinkTaskFinished()) { m4aSongNumStop(SE_HINSI); gMain.inBattle = 0; @@ -888,7 +888,7 @@ void sub_80587B0(void) { if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - if (sub_800A520()) + if (IsLinkTaskFinished()) { if (gWirelessCommType == 0) sub_800AC34(); |