diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-07 18:18:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-07 18:18:00 -0400 |
| commit | fd1d75ce378aba3148a1fe9882e17c8cc790d5c2 (patch) | |
| tree | c8738398572990b0166c268d0eb32439db6eb702 /asm/trainer_card.s | |
| parent | 61cc1d55743715a64e793187f63d0f1f7a80b0e0 (diff) | |
| parent | f14d2765da6f01eccb08967fd6b22c3bdef2be98 (diff) | |
Merge branch 'master' into mauville_old_man
Diffstat (limited to 'asm/trainer_card.s')
| -rw-r--r-- | asm/trainer_card.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/trainer_card.s b/asm/trainer_card.s index a56dbd157..6d1be17cb 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -3894,7 +3894,7 @@ _080C48F6: sub_80C4904: @ 80C4904 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_02039B58 + ldr r2, =gTrainerCards movs r1, 0x64 muls r0, r1 adds r0, r2 @@ -4578,7 +4578,7 @@ sub_80C4E74: @ 80C4E74 ldr r0, [r5] ldr r1, =0x00000534 adds r0, r1 - ldr r2, =gUnknown_02039B58 + ldr r2, =gTrainerCards movs r1, 0x64 muls r1, r4 adds r1, r2 |