diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-26 18:16:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 18:16:52 -0400 |
| commit | 3c8091393ca12b8eeb26f236a997b70eea5688c6 (patch) | |
| tree | 4140bab7968e1f0d726adf8fdce180a186212940 /asm/trader.s | |
| parent | 701d53be8dc98d33d73536ac00ebe8db5d506f04 (diff) | |
| parent | def827fcd48353d8a0292db249d26ac7a85b54ef (diff) | |
Merge pull request #47 from PikalaxALT/split_data3
Split data3
Diffstat (limited to 'asm/trader.s')
| -rw-r--r-- | asm/trader.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/trader.s b/asm/trader.s index 877d17382..8c21648fc 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -113,7 +113,7 @@ _08133AC2: _08133AF0: ldrb r1, [r1] lsls r1, 5 - ldr r0, =gUnknown_085A5C09 + ldr r0, =gDecorations + 1 adds r1, r0 movs r0, 0x1 movs r2, 0 @@ -172,7 +172,7 @@ _08133B70: ldrb r0, [r7, 0x6] ldrb r2, [r1] lsls r2, 5 - ldr r1, =gUnknown_085A5C09 + ldr r1, =gDecorations + 1 adds r2, r1 lsls r1, r5, 4 adds r1, 0x1 @@ -450,7 +450,7 @@ sub_8133DA0: @ 8133DA0 ldr r1, =gSpecialVar_0x8004 ldrh r1, [r1] lsls r1, 5 - ldr r4, =gUnknown_085A5C09 + ldr r4, =gDecorations + 1 adds r1, r4 bl StringCopy ldr r0, =gStringVar2 |