diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-14 15:07:16 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-14 15:07:16 +0200 |
| commit | 84936b4260f2864fe143415c6ca92e4b1704e4fe (patch) | |
| tree | fded752e2492313082f6c61c930036c0d0a03b2d /src/rom_8011DC0.c | |
| parent | 145df4906326488874b3f75ef96f99e85b18f2a0 (diff) | |
| parent | 0c1d33da4f6db7b90913586a39ed60ea2b13f39e (diff) | |
Merge branch 'master' into apprentice
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 56c31f89f..dc94cb9d5 100644 --- a/src/rom_8011DC0.c +++ b/src/rom_8011DC0.c @@ -1609,7 +1609,7 @@ void sub_80141A4(void) break; case 1: if (!FuncIsActiveTask(sub_80140E0)) - sub_80C4E74(GetMultiplayerId() ^ 1, CB2_ReturnToField); + TrainerCard_ShowLinkCard(GetMultiplayerId() ^ 1, CB2_ReturnToField); break; } @@ -1675,7 +1675,7 @@ void sub_80143E4(void *arg0, bool32 arg1) { u16 *argAsU16Ptr = arg0; - sub_80C30A4(argAsU16Ptr); + TrainerCard_GenerateCardForPlayer((struct TrainerCard *)argAsU16Ptr); if (arg1) argAsU16Ptr[48] = sub_801B39C(); else |