diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-01-27 00:11:44 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-01-27 00:11:44 -0600 |
| commit | 6b2dda422b533bf0edadcd727f4b491e4e6f4fb7 (patch) | |
| tree | 2b175aba4460597f688bb6b5f8deeef01fc9bee1 /src/rom_8011DC0.c | |
| parent | 7a60f36954e9baeab2df64e24ce7fea5a8d2ada1 (diff) | |
| parent | f4af987c01c95d98a9d2ee943cc11315f80951d1 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/rom_8011DC0.c')
| -rw-r--r-- | src/rom_8011DC0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c index 813d143d2..41f7eeee7 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1577,7 +1577,7 @@ void sub_80140E0(u8 taskId) for (i = 0; i < GetLinkPlayerCount(); i++) { recvBuff = gBlockRecvBuffer[i]; - sub_80C3120(&gTrainerCards[i], recvBuff, gLinkPlayers[i].version); + CopyTrainerCardData(&gTrainerCards[i], recvBuff, gLinkPlayers[i].version); } if (GetLinkPlayerCount() == 2) @@ -1607,7 +1607,7 @@ void sub_80141A4(void) break; case 1: if (!FuncIsActiveTask(sub_80140E0)) - TrainerCard_ShowLinkCard(GetMultiplayerId() ^ 1, CB2_ReturnToField); + ShowTrainerCardInLink(GetMultiplayerId() ^ 1, CB2_ReturnToField); break; } |