diff options
author | scnorton <scnorton@biociphers.org> | 2017-09-26 18:24:39 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-09-26 18:24:39 -0400 |
commit | d160ca467920d97245c012b8dd0cb8be6d06620a (patch) | |
tree | 294fa7011b22853896dc622d291b0a5be08a752a /asm/trader.s | |
parent | 0e75d957d675564977b2e442c16822bab390aa2c (diff) | |
parent | 3c8091393ca12b8eeb26f236a997b70eea5688c6 (diff) |
Merge branch 'master' into easy_chat
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 |