summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm-de/contest_link_80C2020.s48
-rw-r--r--asm-de/contest_link_80C857C.s8
2 files changed, 28 insertions, 28 deletions
diff --git a/asm-de/contest_link_80C2020.s b/asm-de/contest_link_80C2020.s
index afb4948ff..209a1bb24 100644
--- a/asm-de/contest_link_80C2020.s
+++ b/asm-de/contest_link_80C2020.s
@@ -1086,7 +1086,7 @@ _080C2904:
adds r1, r0
lsls r1, 3
adds r1, r7
- ldr r0, _080C2934 @ =gUnknown_02038690
+ ldr r0, _080C2934 @ =gContestFinalStandings
adds r0, r4, r0
ldrb r0, [r0]
strh r0, [r1, 0x8]
@@ -1098,7 +1098,7 @@ _080C2904:
.align 2, 0
_080C292C: .4byte gTasks
_080C2930: .4byte sub_80C3A5C
-_080C2934: .4byte gUnknown_02038690
+_080C2934: .4byte gContestFinalStandings
_080C2938:
ldr r0, _080C2990 @ =gSharedMem + 0x18000
ldrb r0, [r0, 0x5]
@@ -1128,7 +1128,7 @@ _080C295A:
adds r0, 0x1
strh r0, [r4, 0x8]
movs r4, 0
- ldr r1, _080C2998 @ =gUnknown_02038690
+ ldr r1, _080C2998 @ =gContestFinalStandings
ldrb r0, [r1]
cmp r0, 0
beq _080C2984
@@ -1149,7 +1149,7 @@ _080C2984:
.align 2, 0
_080C2990: .4byte gSharedMem + 0x18000
_080C2994: .4byte sub_80C3B30
-_080C2998: .4byte gUnknown_02038690
+_080C2998: .4byte gContestFinalStandings
_080C299C:
lsls r1, r5, 2
adds r0, r1, r5
@@ -1166,7 +1166,7 @@ _080C299C:
movs r0, 0
strh r0, [r2, 0xA]
movs r4, 0
- ldr r2, _080C29F4 @ =gUnknown_02038690
+ ldr r2, _080C29F4 @ =gContestFinalStandings
ldrb r0, [r2]
ldr r1, _080C29F8 @ =gIsLinkContest
ldr r3, _080C29FC @ =gStringVar1
@@ -1196,7 +1196,7 @@ _080C29D4:
lsls r4, 6
b _080C2A10
.align 2, 0
-_080C29F4: .4byte gUnknown_02038690
+_080C29F4: .4byte gContestFinalStandings
_080C29F8: .4byte gIsLinkContest
_080C29FC: .4byte gStringVar1
_080C2A00: .4byte gLinkPlayers + 0x8
@@ -1310,7 +1310,7 @@ _080C2ADC:
adds r0, r3, 0
strh r0, [r1]
movs r1, 0
- ldr r3, _080C2BD0 @ =gUnknown_02038690
+ ldr r3, _080C2BD0 @ =gContestFinalStandings
ldrb r0, [r3]
lsls r4, r7, 2
mov r10, r4
@@ -1416,7 +1416,7 @@ _080C2B14:
_080C2BC4: .4byte gUnknown_030042C4
_080C2BC8: .4byte gUnknown_03004240
_080C2BCC: .4byte 0x00005050
-_080C2BD0: .4byte gUnknown_02038690
+_080C2BD0: .4byte gContestFinalStandings
_080C2BD4: .4byte gContestMons
_080C2BD8: .4byte gMonFrontPicTable
_080C2BDC: .4byte gMonFrontPicCoords
@@ -1705,7 +1705,7 @@ sub_80C2E14: @ 80C2E14
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r1, _080C2E80 @ =gUnknown_02038690
+ ldr r1, _080C2E80 @ =gContestFinalStandings
ldr r0, _080C2E84 @ =gContestPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
@@ -1715,9 +1715,9 @@ sub_80C2E14: @ 80C2E14
bl sub_810FB10
ldr r0, _080C2E88 @ =gSpecialVar_ContestRank
ldrb r0, [r0]
- bl sub_80B2A7C
+ bl Contest_SaveWinner
movs r0, 0xFE
- bl sub_80B2A7C
+ bl Contest_SaveWinner
ldr r4, _080C2E8C @ =gSharedMem
ldr r0, _080C2E90 @ =0x00015ddf
adds r1, r4, r0
@@ -1748,7 +1748,7 @@ sub_80C2E14: @ 80C2E14
pop {r0}
bx r0
.align 2, 0
-_080C2E80: .4byte gUnknown_02038690
+_080C2E80: .4byte gContestFinalStandings
_080C2E84: .4byte gContestPlayerMonIndex
_080C2E88: .4byte gSpecialVar_ContestRank
_080C2E8C: .4byte gSharedMem
@@ -3444,7 +3444,7 @@ sub_80C3B30: @ 80C3B30
lsrs r0, 24
mov r12, r0
movs r5, 0
- ldr r1, _080C3BC0 @ =gUnknown_02038690
+ ldr r1, _080C3BC0 @ =gContestFinalStandings
ldrb r0, [r1]
ldr r2, _080C3BC4 @ =gTasks
mov r10, r2
@@ -3512,7 +3512,7 @@ _080C3B82:
pop {r0}
bx r0
.align 2, 0
-_080C3BC0: .4byte gUnknown_02038690
+_080C3BC0: .4byte gContestFinalStandings
_080C3BC4: .4byte gTasks
_080C3BC8: .4byte 0x00000fff
_080C3BCC: .4byte 0x0600e100
@@ -4117,7 +4117,7 @@ _080C403A:
negs r0, r0
_080C4060:
strb r0, [r5, 0x12]
- ldr r0, _080C40A8 @ =gUnknown_02038690
+ ldr r0, _080C40A8 @ =gContestFinalStandings
add r0, r8
ldrb r0, [r0]
cmp r0, 0
@@ -4150,7 +4150,7 @@ _080C4098: .4byte gUnknown_02038678
_080C409C: .4byte gUnknown_02038670
_080C40A0: .4byte gSharedMem + 0x18018
_080C40A4: .4byte gUnknown_02038688
-_080C40A8: .4byte gUnknown_02038690
+_080C40A8: .4byte gContestFinalStandings
_080C40AC:
cmp r2, 0
ble _080C40B4
@@ -4695,7 +4695,7 @@ _080C44BC: .4byte gSpecialVar_ContestRank
sub_80C44C0: @ 80C44C0
push {r4-r7,lr}
sub sp, 0x4
- ldr r1, _080C44E8 @ =gUnknown_02038690
+ ldr r1, _080C44E8 @ =gContestFinalStandings
ldr r0, _080C44EC @ =gContestPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
@@ -4716,7 +4716,7 @@ _080C44DE:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080C44E8: .4byte gUnknown_02038690
+_080C44E8: .4byte gContestFinalStandings
_080C44EC: .4byte gContestPlayerMonIndex
_080C44F0: .4byte gSpecialVar_ContestCategory
_080C44F4: .4byte _080C44F8
@@ -5075,7 +5075,7 @@ _080C47BC: .4byte gSpecialVar_0x8006
sub_80C47C0: @ 80C47C0
push {lr}
movs r1, 0
- ldr r2, _080C47E8 @ =gUnknown_02038690
+ ldr r2, _080C47E8 @ =gContestFinalStandings
ldrb r0, [r2]
ldr r3, _080C47EC @ =gSpecialVar_0x8005
cmp r0, 0
@@ -5095,7 +5095,7 @@ _080C47E0:
pop {r0}
bx r0
.align 2, 0
-_080C47E8: .4byte gUnknown_02038690
+_080C47E8: .4byte gContestFinalStandings
_080C47EC: .4byte gSpecialVar_0x8005
thumb_func_end sub_80C47C0
@@ -5103,7 +5103,7 @@ _080C47EC: .4byte gSpecialVar_0x8005
sub_80C47F0: @ 80C47F0
push {r4,lr}
movs r2, 0
- ldr r3, _080C4830 @ =gUnknown_02038690
+ ldr r3, _080C4830 @ =gContestFinalStandings
ldrb r0, [r3]
ldr r1, _080C4834 @ =gIsLinkContest
ldr r4, _080C4838 @ =gStringVar3
@@ -5134,7 +5134,7 @@ _080C4812:
bl sub_80C4674
b _080C484C
.align 2, 0
-_080C4830: .4byte gUnknown_02038690
+_080C4830: .4byte gContestFinalStandings
_080C4834: .4byte gIsLinkContest
_080C4838: .4byte gStringVar3
_080C483C: .4byte gLinkPlayers + 0x8
@@ -5156,7 +5156,7 @@ _080C4854: .4byte gUnknown_0203857D
sub_80C4858: @ 80C4858
push {lr}
movs r1, 0
- ldr r2, _080C4884 @ =gUnknown_02038690
+ ldr r2, _080C4884 @ =gContestFinalStandings
ldrb r0, [r2]
ldr r3, _080C4888 @ =gStringVar1
cmp r0, 0
@@ -5177,7 +5177,7 @@ _080C4878:
pop {r0}
bx r0
.align 2, 0
-_080C4884: .4byte gUnknown_02038690
+_080C4884: .4byte gContestFinalStandings
_080C4888: .4byte gStringVar1
thumb_func_end sub_80C4858
diff --git a/asm-de/contest_link_80C857C.s b/asm-de/contest_link_80C857C.s
index cf1ef216d..e3a8b674d 100644
--- a/asm-de/contest_link_80C857C.s
+++ b/asm-de/contest_link_80C857C.s
@@ -924,18 +924,18 @@ _080C8C18:
lsls r0, 24
cmp r0, 0
beq _080C8C7A
- ldr r0, _080C8C2C @ =gUnknown_02038690
+ ldr r0, _080C8C2C @ =gContestFinalStandings
movs r1, 0x4
bl sub_80C857C
b _080C8C4C
.align 2, 0
-_080C8C2C: .4byte gUnknown_02038690
+_080C8C2C: .4byte gContestFinalStandings
_080C8C30:
bl sub_80C85D8
lsls r0, 24
cmp r0, 0
beq _080C8C7A
- ldr r0, _080C8C60 @ =gUnknown_02038690
+ ldr r0, _080C8C60 @ =gContestFinalStandings
ldr r1, _080C8C64 @ =gUnknown_0203869B
ldrb r1, [r1]
lsls r1, 8
@@ -955,7 +955,7 @@ _080C8C4C:
strh r1, [r0, 0x8]
b _080C8C7A
.align 2, 0
-_080C8C60: .4byte gUnknown_02038690
+_080C8C60: .4byte gContestFinalStandings
_080C8C64: .4byte gUnknown_0203869B
_080C8C68: .4byte gBlockRecvBuffer
_080C8C6C: .4byte gTasks