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/scrcmd.s | |
parent | 0e75d957d675564977b2e442c16822bab390aa2c (diff) | |
parent | 3c8091393ca12b8eeb26f236a997b70eea5688c6 (diff) |
Merge branch 'master' into easy_chat
Diffstat (limited to 'asm/scrcmd.s')
-rw-r--r-- | asm/scrcmd.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 39366d29f..7980ba564 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -3977,7 +3977,7 @@ sub_809B114: @ 809B114 adds r4, r0 ldr r0, [r4] lsrs r1, 11 - ldr r2, =gUnknown_085A5C09 + ldr r2, =gDecorations + 1 adds r1, r2 bl StringCopy movs r0, 0 |