diff options
author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /asm/contest_painting.s | |
parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) |
Merge branch 'master' into link
Diffstat (limited to 'asm/contest_painting.s')
-rw-r--r-- | asm/contest_painting.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/contest_painting.s b/asm/contest_painting.s index 98f001442..4e58b4cc3 100644 --- a/asm/contest_painting.s +++ b/asm/contest_painting.s @@ -386,7 +386,7 @@ sub_813010C: @ 813010C ldr r1, =gText_Space adds r0, r4, 0 bl StringAppend - ldr r1, =gUnknown_085B07D4 + ldr r1, =gContestRankTextPointers ldr r0, [r6] ldrb r0, [r0, 0x1E] lsls r0, 2 @@ -415,7 +415,7 @@ _08130190: adds r1, 0xB bl StringCopy ldr r0, =gStringVar4 - ldr r2, =gUnknown_085B07F4 + ldr r2, =gContestPaintingDescriptionPointers lsls r1, r5, 2 adds r1, r2 ldr r1, [r1] |