diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-17 13:38:33 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-17 13:38:33 -0400 |
| commit | 71b40f50c0de173913d11f1e5bc228060cb4a49b (patch) | |
| tree | 4029150523fe2157e746640de6375e9530f7a2d9 /asm/contest.s | |
| parent | 4b04e92e8b236d91ea5cc45813f914f10a86b748 (diff) | |
| parent | 74bda5b68088f08220cf3f1b9791e5900a6a9877 (diff) | |
Merge branch 'master' into field_map_obj
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/contest.s b/asm/contest.s index b891007bb..76effb4e7 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6447,7 +6447,7 @@ sub_80DAF1C: @ 80DAF1C adds r5, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, =gUnknown_085E8D3E + ldr r1, =gText_Slash add r0, sp, 0x4 bl StringCopy lsls r1, r5, 6 @@ -7100,7 +7100,7 @@ _080DB472: ldr r1, [r0] movs r0, 0xA bl sub_80DEB70 - ldr r1, =gUnknown_085E8D3E + ldr r1, =gText_Slash movs r0, 0x9 bl sub_80DEB70 add sp, 0x10 @@ -10296,7 +10296,7 @@ _080DCD92: lsls r0, 16 lsrs r4, r0, 16 adds r0, r2, 0 - ldr r1, =gUnknown_085E8D40 + ldr r1, =gText_OneDash bl StringCopy adds r2, r0, 0 _080DCDBC: @@ -10339,7 +10339,7 @@ _080DCDEA: lsls r0, 16 lsrs r4, r0, 16 adds r0, r2, 0 - ldr r1, =gUnknown_085E8D40 + ldr r1, =gText_OneDash bl StringCopy adds r2, r0, 0 _080DCE14: |