diff options
| author | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
| commit | 38fcc46abb36df72512f4b532d1379dab1c13af6 (patch) | |
| tree | df44258d7b5a65d2a75a146c7c01b6c683b023f9 /asm/trainer_card.s | |
| parent | 901f3ff55715ec6bdeda5c711e7e73b4c38ab55a (diff) | |
| parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) | |
Merge remote-tracking branch 'upstream/master' into pan-constants
Diffstat (limited to 'asm/trainer_card.s')
| -rw-r--r-- | asm/trainer_card.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 2c38140c6..e0cb5e21e 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -1141,8 +1141,8 @@ _080C308C: .pool thumb_func_end sub_80C3020 - thumb_func_start sub_80C30A4 -sub_80C30A4: @ 80C30A4 + thumb_func_start TrainerCard_GenerateCardForPlayer +TrainerCard_GenerateCardForPlayer: @ 80C30A4 push {r4,lr} adds r4, r0, 0 movs r1, 0 @@ -1197,7 +1197,7 @@ _080C3108: pop {r0} bx r0 .pool - thumb_func_end sub_80C30A4 + thumb_func_end TrainerCard_GenerateCardForPlayer thumb_func_start sub_80C3120 sub_80C3120: @ 80C3120 @@ -4558,8 +4558,8 @@ _080C4E44: .pool thumb_func_end sub_80C4DDC - thumb_func_start sub_80C4E74 -sub_80C4E74: @ 80C4E74 + thumb_func_start TrainerCard_ShowLinkCard +TrainerCard_ShowLinkCard: @ 80C4E74 push {r4-r6,lr} adds r4, r0, 0 adds r6, r1, 0 @@ -4600,7 +4600,7 @@ sub_80C4E74: @ 80C4E74 pop {r0} bx r0 .pool - thumb_func_end sub_80C4E74 + thumb_func_end TrainerCard_ShowLinkCard thumb_func_start sub_80C4EE4 sub_80C4EE4: @ 80C4EE4 |