diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
commit | 1ff1e8ce9547d646b17b135b3013a516d17f35db (patch) | |
tree | c23fbb425b230e81529932482ddb0fe7fc6a1376 /src/engine/cable_club.c | |
parent | daa0a98ee0129be1797274de318a35df30d39020 (diff) | |
parent | b9388f078ed95e80ac73b35eeb206e52ce376b0c (diff) |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'src/engine/cable_club.c')
-rw-r--r-- | src/engine/cable_club.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index b12ee38ce..44d832e2b 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -374,7 +374,7 @@ void sub_80831F8(u8 taskId) gFieldLinkPlayerCount = GetLinkPlayerCount_2(); gUnknown_03004860 = GetMultiplayerId(); sub_80081C8(gFieldLinkPlayerCount); - sub_8093390((struct TrainerCard *)gBlockSendBuffer); + TrainerCard_GenerateCardForPlayer((struct TrainerCard *)gBlockSendBuffer); gTasks[taskId].func = sub_8083314; } } @@ -395,7 +395,7 @@ static void sub_8083288(u8 taskId) gFieldLinkPlayerCount = GetLinkPlayerCount_2(); gUnknown_03004860 = GetMultiplayerId(); sub_80081C8(gFieldLinkPlayerCount); - sub_8093390((struct TrainerCard *)gBlockSendBuffer); + TrainerCard_GenerateCardForPlayer((struct TrainerCard *)gBlockSendBuffer); gTasks[taskId].func = sub_8083314; sub_8007E9C(2); } @@ -874,7 +874,7 @@ void unref_sub_8083BB0(void) void sub_8083BDC(void) { - sub_8093130(gSpecialVar_0x8006, c2_exit_to_overworld_1_continue_scripts_restart_music); + TrainerCard_ShowLinkCard(gSpecialVar_0x8006, c2_exit_to_overworld_1_continue_scripts_restart_music); } bool32 sub_8083BF4(u8 linkPlayerIndex) |