diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-28 17:26:58 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-28 17:26:58 -0500 |
| commit | 77b7462dbb376fd7fa4215ad5cf21244efa52f62 (patch) | |
| tree | 3498fc738b339cfb0ce5423675c348e9090f94e8 /asm/contest.s | |
| parent | 03a2a3b81bba374bdf3a74a37a4dc3e2d17a196f (diff) | |
| parent | 1496ea3a24f188cad26ac40f5bfcc3e571f3311a (diff) | |
merge
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/contest.s b/asm/contest.s index a07e57b89..7577826cf 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6657,7 +6657,7 @@ sub_80DB0C4: @ 80DB0C4 lsls r1, 1 movs r2, 0x20 bl LoadCompressedPalette - ldr r0, =gUnknown_08587BE8 + ldr r0, =gSpriteTemplate_8587BE8 movs r1, 0x70 movs r2, 0x24 movs r3, 0x1E @@ -6692,7 +6692,7 @@ sub_80DB120: @ 80DB120 bl LoadCompressedObjectPic ldr r0, =gUnknown_08587C10 bl LoadCompressedObjectPalette - ldr r0, =gUnknown_08587C18 + ldr r0, =gSpriteTemplate_8587C18 movs r1, 0x60 movs r2, 0xA movs r3, 0x1D @@ -8946,7 +8946,7 @@ _080DC2C8: ldrb r0, [r0] adds r0, r5 ldrb r2, [r0] - ldr r0, =gUnknown_08587AD0 + ldr r0, =gSpriteTemplate_8587AD0 movs r1, 0xB4 movs r3, 0x1 bl CreateSprite @@ -9240,7 +9240,7 @@ _080DC506: ldr r1, =gUnknown_08587AE8 adds r0, r1 bl LoadCompressedObjectPic - ldr r0, =gUnknown_08587B18 + ldr r0, =gSpriteTemplate_8587B18 adds r0, r6, r0 ldr r2, =gUnknown_08587A70 ldr r1, =gUnknown_02039F26 @@ -9264,7 +9264,7 @@ _080DC506: adds r0, r1 lsls r0, 2 add r0, r8 - ldr r1, =gUnknown_08587B80 + ldr r1, =gSubspriteTables_8587B80 bl SetSubspriteTables ldr r0, [r7] ldr r0, [r0, 0x14] @@ -9298,7 +9298,7 @@ sub_80DC594: @ 80DC594 bl LoadCompressedObjectPic ldr r0, =gUnknown_08587BB8 bl LoadSpritePalette - ldr r0, =gUnknown_08587BC8 + ldr r0, =gSpriteTemplate_8587BC8 movs r1, 0x1E movs r2, 0x2C movs r3, 0x1 @@ -9877,7 +9877,7 @@ sub_80DC9EC: @ 80DC9EC lsls r4, r2, 1 adds r4, r2 lsls r4, 3 - ldr r0, =gUnknown_0858998C + ldr r0, =gSpriteTemplate_858998C adds r4, r0 adds r0, r4, 0 movs r1, 0xB8 |