diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-11 18:20:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 18:20:58 -0500 |
| commit | f12824e3b1643f86599e2c03c96b752a87a73746 (patch) | |
| tree | ea95b65775cf7caf2089ea21f47a07c8571413bd /asm/link_rfu_3.s | |
| parent | 7526b2ccf1ab02a975ee477341f8accbf3f108c5 (diff) | |
| parent | b43c48202ba3b3a1cd31c8abf1a726bf8980f043 (diff) | |
Merge pull request #180 from ghoulslash/trainer-card
Trainer card
Diffstat (limited to 'asm/link_rfu_3.s')
| -rw-r--r-- | asm/link_rfu_3.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 1e076a55e..d1f18a8ae 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -3252,7 +3252,7 @@ _08117384: lsls r0, 24 lsrs r0, 24 ldr r1, _081173BC @ =CB2_ReturnToField - bl InitLinkPartnerTrainerCard + bl ShowTrainerCardInLink _081173A2: bl RunTasks bl RunTextPrinters @@ -3489,7 +3489,7 @@ sub_8117594: @ 8117594 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - bl sub_80898E8 + bl TrainerCard_GenerateCardForLinkPlayer cmp r5, 0 beq _081175AE bl sub_81440E8 |