diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
| commit | 22ec43a6eddfc63bbb1f9a883c7b1cdda05f0d64 (patch) | |
| tree | b5d33877dbe736022815a40c6ff2af3977e36d77 /asm/trainer_card.s | |
| parent | 39fd42faeadeb73bf57018f69a6d69463635847a (diff) | |
| parent | 83ea8d0cd9f8141181d09718c79b8916df945752 (diff) | |
resolve merge conflicts
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 |