Merge pull request #1 from pret/master

Update fork to match main fork.

1 files changed, 100 insertions, 100 deletions

diff --git a/asm/contest.s b/asm/contest.s
index 78354b363..4a85f3d16 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -11,15 +11,15 @@ nullsub_89: @ 80AB1AC
 	bx lr
 	thumb_func_end nullsub_89
 
-	thumb_func_start sub_80AB1B0
-sub_80AB1B0: @ 80AB1B0
-	ldr r1, _080AB1B8 @ =gUnknown_0203869A
+	thumb_func_start ResetLinkContestBoolean
+ResetLinkContestBoolean: @ 80AB1B0
+	ldr r1, _080AB1B8 @ =gIsLinkContest
 	movs r0, 0
 	strb r0, [r1]
 	bx lr
 	.align 2, 0
-_080AB1B8: .4byte gUnknown_0203869A
-	thumb_func_end sub_80AB1B0
+_080AB1B8: .4byte gIsLinkContest
+	thumb_func_end ResetLinkContestBoolean
 
 	thumb_func_start sub_80AB1BC
 sub_80AB1BC: @ 80AB1BC
@@ -302,7 +302,7 @@ _080AB3DE:
 	movs r1, 0
 	movs r2, 0x10
 	bl memset
-	ldr r0, _080AB474 @ =gUnknown_0203869A
+	ldr r0, _080AB474 @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r0, 0x1
 	ands r0, r1
@@ -338,7 +338,7 @@ _080AB448:
 _080AB468: .4byte 0x02019204
 _080AB46C: .4byte 0x02019260
 _080AB470: .4byte 0x020192d0
-_080AB474: .4byte gUnknown_0203869A
+_080AB474: .4byte gIsLinkContest
 _080AB478: .4byte gUnknown_02038696
 	thumb_func_end sub_80AB398
 
@@ -420,7 +420,7 @@ _080AB4E0:
 	adds r0, r1
 	movs r1, 0
 	strb r1, [r0]
-	bl sub_8040710
+	bl ClearBattleMonForms
 	bl sub_80AB398
 	ldr r1, _080AB54C @ =gMain
 	ldr r0, _080AB550 @ =0x0000043c
@@ -526,7 +526,7 @@ sub_80AB604: @ 80AB604
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, _080AB648 @ =gUnknown_0203869A
+	ldr r0, _080AB648 @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r0, 0x1
 	ands r0, r1
@@ -555,7 +555,7 @@ sub_80AB604: @ 80AB604
 	str r1, [r0]
 	b _080AB66A
 	.align 2, 0
-_080AB648: .4byte gUnknown_0203869A
+_080AB648: .4byte gIsLinkContest
 _080AB64C: .4byte gPaletteFade
 _080AB650: .4byte sub_80AB678
 _080AB654: .4byte gTasks
@@ -868,7 +868,7 @@ _080AB8CC:
 	bl sub_80B00C8
 	bl sub_80B0324
 	bl sub_80B0518
-	ldr r1, _080AB928 @ =gUnknown_02024A72
+	ldr r1, _080AB928 @ =gBanksBySide
 	strb r4, [r1]
 	movs r0, 0x1
 	strb r0, [r1, 0x1]
@@ -876,14 +876,14 @@ _080AB8CC:
 	strb r3, [r1, 0x2]
 	movs r2, 0x2
 	strb r2, [r1, 0x3]
-	ldr r0, _080AB92C @ =gUnknown_020239F8
+	ldr r0, _080AB92C @ =gBattleTypeFlags
 	strh r4, [r0]
-	ldr r4, _080AB930 @ =gUnknown_02024C07
+	ldr r4, _080AB930 @ =gBankAttacker
 	strb r2, [r4]
-	ldr r0, _080AB934 @ =gUnknown_02024C08
+	ldr r0, _080AB934 @ =gBankTarget
 	strb r3, [r0]
 	bl sub_80AE858
-	ldr r2, _080AB938 @ =gUnknown_02024BE0
+	ldr r2, _080AB938 @ =gObjectBankIDs
 	ldrb r1, [r4]
 	adds r1, r2
 	strb r0, [r1]
@@ -891,11 +891,11 @@ _080AB8CC:
 	b _080AB946
 	.align 2, 0
 _080AB924: .4byte 0x02019204
-_080AB928: .4byte gUnknown_02024A72
-_080AB92C: .4byte gUnknown_020239F8
-_080AB930: .4byte gUnknown_02024C07
-_080AB934: .4byte gUnknown_02024C08
-_080AB938: .4byte gUnknown_02024BE0
+_080AB928: .4byte gBanksBySide
+_080AB92C: .4byte gBattleTypeFlags
+_080AB930: .4byte gBankAttacker
+_080AB934: .4byte gBankTarget
+_080AB938: .4byte gObjectBankIDs
 _080AB93C:
 	movs r0, 0
 	mov r1, r10
@@ -1197,7 +1197,7 @@ sub_80ABB70: @ 80ABB70
 	lsls r0, 24
 	cmp r0, 0
 	bne _080ABBD4
-	ldr r0, _080ABBCC @ =gUnknown_020238CC
+	ldr r0, _080ABBCC @ =gDisplayedStringBattle
 	ldr r1, _080ABBD0 @ =gUnknown_083CAF84
 	bl StringCopy
 	b _080ABBDC
@@ -1209,14 +1209,14 @@ _080ABBBC: .4byte 0x02018204
 _080ABBC0: .4byte 0x040000d4
 _080ABBC4: .4byte 0x84000100
 _080ABBC8: .4byte gContestPlayerMonIndex
-_080ABBCC: .4byte gUnknown_020238CC
+_080ABBCC: .4byte gDisplayedStringBattle
 _080ABBD0: .4byte gUnknown_083CAF84
 _080ABBD4:
-	ldr r0, _080ABC20 @ =gUnknown_020238CC
+	ldr r0, _080ABC20 @ =gDisplayedStringBattle
 	ldr r1, _080ABC24 @ =gUnknown_083CAFAE
 	bl StringCopy
 _080ABBDC:
-	ldr r5, _080ABC20 @ =gUnknown_020238CC
+	ldr r5, _080ABC20 @ =gDisplayedStringBattle
 	ldr r0, _080ABC28 @ =0x02019204
 	ldrb r1, [r0, 0x1]
 	adds r1, 0x1
@@ -1247,7 +1247,7 @@ _080ABBDC:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080ABC20: .4byte gUnknown_020238CC
+_080ABC20: .4byte gDisplayedStringBattle
 _080ABC24: .4byte gUnknown_083CAFAE
 _080ABC28: .4byte 0x02019204
 _080ABC2C: .4byte gStringVar4
@@ -1577,7 +1577,7 @@ _080ABEC6:
 	ands r5, r0
 	cmp r5, 0
 	beq _080ABF08
-	bl sub_814A7FC
+	bl DestroyMenuCursor
 	movs r0, 0x5
 	bl PlaySE
 	ldr r0, _080ABF00 @ =gTasks
@@ -1635,7 +1635,7 @@ _080ABF26:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080ABF78
-	ldr r0, _080ABF70 @ =gUnknown_020238CC
+	ldr r0, _080ABF70 @ =gDisplayedStringBattle
 	ldr r1, _080ABF74 @ =gUnknown_083CAF84
 	bl StringCopy
 	b _080ABF80
@@ -1643,14 +1643,14 @@ _080ABF26:
 _080ABF64: .4byte gUnknown_03004210
 _080ABF68: .4byte gUnknown_083CA340
 _080ABF6C: .4byte gContestPlayerMonIndex
-_080ABF70: .4byte gUnknown_020238CC
+_080ABF70: .4byte gDisplayedStringBattle
 _080ABF74: .4byte gUnknown_083CAF84
 _080ABF78:
-	ldr r0, _080ABFC8 @ =gUnknown_020238CC
+	ldr r0, _080ABFC8 @ =gDisplayedStringBattle
 	ldr r1, _080ABFCC @ =gUnknown_083CAFAE
 	bl StringCopy
 _080ABF80:
-	ldr r5, _080ABFC8 @ =gUnknown_020238CC
+	ldr r5, _080ABFC8 @ =gDisplayedStringBattle
 	ldr r0, _080ABFD0 @ =0x02019204
 	ldrb r1, [r0, 0x1]
 	adds r1, 0x1
@@ -1683,7 +1683,7 @@ _080ABF80:
 	str r1, [r0]
 	b _080AC098
 	.align 2, 0
-_080ABFC8: .4byte gUnknown_020238CC
+_080ABFC8: .4byte gDisplayedStringBattle
 _080ABFCC: .4byte gUnknown_083CAFAE
 _080ABFD0: .4byte 0x02019204
 _080ABFD4: .4byte gStringVar4
@@ -1806,7 +1806,7 @@ sub_80AC0C8: @ 80AC0C8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r0, _080AC120 @ =gUnknown_0203869A
+	ldr r0, _080AC120 @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r0, 0x1
 	ands r0, r1
@@ -1843,7 +1843,7 @@ sub_80AC0C8: @ 80AC0C8
 	bl sub_80AFFE0
 	b _080AC14E
 	.align 2, 0
-_080AC120: .4byte gUnknown_0203869A
+_080AC120: .4byte gIsLinkContest
 _080AC124: .4byte gContestPlayerMonIndex
 _080AC128: .4byte 0x02019260
 _080AC12C: .4byte sub_80C8A38
@@ -2173,7 +2173,7 @@ _080AC42C:
 	ldr r4, _080AC484 @ =0x02019204
 	strb r6, [r4, 0x11]
 	ldrb r7, [r4, 0x11]
-	ldr r0, _080AC488 @ =gUnknown_0203869A
+	ldr r0, _080AC488 @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r5, 0x1
 	adds r0, r5, 0
@@ -2210,7 +2210,7 @@ _080AC458:
 	bl _080AD8CA
 	.align 2, 0
 _080AC484: .4byte 0x02019204
-_080AC488: .4byte gUnknown_0203869A
+_080AC488: .4byte gIsLinkContest
 _080AC48C: .4byte sub_80C8C80
 _080AC490: .4byte sub_80AD8DC
 _080AC494: .4byte gTasks
@@ -2294,7 +2294,7 @@ _080AC534:
 	lsls r4, 2
 	mov r9, r4
 	ldr r4, _080AC5C4 @ =0x02019348
-	ldr r1, _080AC5C8 @ =gUnknown_02024E84
+	ldr r1, _080AC5C8 @ =gBattleMonForms
 	movs r2, 0
 	adds r0, r1, 0x3
 _080AC542:
@@ -2343,8 +2343,8 @@ _080AC542:
 	lsls r4, 3
 	adds r4, r0
 	strh r5, [r4, 0xC]
-	ldr r1, _080AC5E0 @ =gUnknown_02024BE0
-	ldr r0, _080AC5E4 @ =gUnknown_02024C07
+	ldr r1, _080AC5E0 @ =gObjectBankIDs
+	ldr r0, _080AC5E4 @ =gBankAttacker
 	ldrb r0, [r0]
 	adds r0, r1
 	strb r5, [r0]
@@ -2358,14 +2358,14 @@ _080AC542:
 	bl _080AD8CA
 	.align 2, 0
 _080AC5C4: .4byte 0x02019348
-_080AC5C8: .4byte gUnknown_02024E84
+_080AC5C8: .4byte gBattleMonForms
 _080AC5CC: .4byte 0xfffffebc
 _080AC5D0: .4byte gContestMons
 _080AC5D4: .4byte gSprites
 _080AC5D8: .4byte sub_80AD8FC
 _080AC5DC: .4byte gTasks
-_080AC5E0: .4byte gUnknown_02024BE0
-_080AC5E4: .4byte gUnknown_02024C07
+_080AC5E0: .4byte gObjectBankIDs
+_080AC5E4: .4byte gBankAttacker
 _080AC5E8:
 	mov r1, r8
 	lsls r0, r1, 2
@@ -2531,7 +2531,7 @@ _080AC730:
 	adds r0, r4, 0
 	bl sub_80B29B4
 	adds r0, r4, 0
-	bl move_anim_start_t1
+	bl ExecuteMoveAnim
 	ldr r1, _080AC778 @ =gTasks
 	mov r3, r8
 	lsls r0, r3, 2
@@ -2544,10 +2544,10 @@ _080AC730:
 	.align 2, 0
 _080AC778: .4byte gTasks
 _080AC77C:
-	ldr r0, _080AC7B8 @ =gUnknown_0202F7AC
+	ldr r0, _080AC7B8 @ =gAnimScriptCallback
 	ldr r0, [r0]
 	bl _call_via_r0
-	ldr r0, _080AC7BC @ =gUnknown_0202F7B1
+	ldr r0, _080AC7BC @ =gAnimScriptActive
 	ldrb r4, [r0]
 	cmp r4, 0
 	beq _080AC790
@@ -2572,8 +2572,8 @@ _080AC790:
 	strh r0, [r1, 0x8]
 	bl _080AD8CA
 	.align 2, 0
-_080AC7B8: .4byte gUnknown_0202F7AC
-_080AC7BC: .4byte gUnknown_0202F7B1
+_080AC7B8: .4byte gAnimScriptCallback
+_080AC7BC: .4byte gAnimScriptActive
 _080AC7C0: .4byte 0x02019204
 _080AC7C4: .4byte gTasks
 _080AC7C8:
@@ -4763,7 +4763,7 @@ _080AD988:
 	beq _080ADA08
 	b _080ADA10
 _080AD98E:
-	ldr r0, _080AD9D8 @ =gUnknown_0203869A
+	ldr r0, _080AD9D8 @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r6, 0x1
 	adds r0, r6, 0
@@ -4795,7 +4795,7 @@ _080AD9B8:
 	strh r6, [r5, 0x8]
 	b _080ADA10
 	.align 2, 0
-_080AD9D8: .4byte gUnknown_0203869A
+_080AD9D8: .4byte gIsLinkContest
 _080AD9DC: .4byte 0x02019204
 _080AD9E0: .4byte sub_80C8C80
 _080AD9E4: .4byte sub_80AD8DC
@@ -5473,7 +5473,7 @@ sub_80ADEEC: @ 80ADEEC
 	ble _080ADF40
 	movs r0, 0
 	strh r0, [r4, 0x8]
-	ldr r0, _080ADF24 @ =gUnknown_0203869A
+	ldr r0, _080ADF24 @ =gIsLinkContest
 	ldrb r0, [r0]
 	movs r1, 0x1
 	ands r1, r0
@@ -5483,7 +5483,7 @@ sub_80ADEEC: @ 80ADEEC
 	b _080ADF3E
 	.align 2, 0
 _080ADF20: .4byte gTasks
-_080ADF24: .4byte gUnknown_0203869A
+_080ADF24: .4byte gIsLinkContest
 _080ADF28: .4byte sub_80ADF4C
 _080ADF2C:
 	movs r0, 0x1
@@ -5585,7 +5585,7 @@ sub_80ADFD8: @ 80ADFD8
 	bne _080ADFFC
 	adds r0, r2, 0
 	bl DestroyTask
-	ldr r0, _080AE004 @ =gUnknown_0300485C
+	ldr r0, _080AE004 @ =gFieldCallback
 	ldr r1, _080AE008 @ =sub_80AE010
 	str r1, [r0]
 	ldr r0, _080AE00C @ =c2_exit_to_overworld_2_switch
@@ -5595,7 +5595,7 @@ _080ADFFC:
 	bx r0
 	.align 2, 0
 _080AE000: .4byte gPaletteFade
-_080AE004: .4byte gUnknown_0300485C
+_080AE004: .4byte gFieldCallback
 _080AE008: .4byte sub_80AE010
 _080AE00C: .4byte c2_exit_to_overworld_2_switch
 	thumb_func_end sub_80ADFD8
@@ -5642,7 +5642,7 @@ _080AE04C:
 	thumb_func_start sub_80AE054
 sub_80AE054: @ 80AE054
 	push {lr}
-	ldr r0, _080AE06C @ =gUnknown_0203869A
+	ldr r0, _080AE06C @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r0, 0x1
 	ands r0, r1
@@ -5655,7 +5655,7 @@ _080AE068:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080AE06C: .4byte gUnknown_0203869A
+_080AE06C: .4byte gIsLinkContest
 _080AE070: .4byte gContestPlayerMonIndex
 	thumb_func_end sub_80AE054
 
@@ -5694,7 +5694,7 @@ sub_80AE098: @ 80AE098
 	bl StringCopy
 	mov r0, sp
 	bl StripExtCtrlCodes
-	ldr r0, _080AE0F4 @ =gUnknown_0203869A
+	ldr r0, _080AE0F4 @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r0, 0x1
 	ands r0, r1
@@ -5726,7 +5726,7 @@ _080AE0CE:
 	b _080AE108
 	.align 2, 0
 _080AE0F0: .4byte gSaveBlock2
-_080AE0F4: .4byte gUnknown_0203869A
+_080AE0F4: .4byte gIsLinkContest
 _080AE0F8: .4byte gContestPlayerMonIndex
 _080AE0FC: .4byte gUnknown_0203857D
 _080AE100:
@@ -5768,7 +5768,7 @@ _080AE108:
 	bl GetMonData
 	mov r0, sp
 	bl StringGetEnd10
-	ldr r0, _080AE188 @ =gUnknown_0203869A
+	ldr r0, _080AE188 @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r0, 0x1
 	ands r0, r1
@@ -5791,7 +5791,7 @@ _080AE108:
 _080AE17C: .4byte gContestMons
 _080AE180: .4byte gContestPlayerMonIndex
 _080AE184: .4byte gPlayerParty
-_080AE188: .4byte gUnknown_0203869A
+_080AE188: .4byte gIsLinkContest
 _080AE18C:
 	mov r0, sp
 	ldrb r2, [r0, 0x5]
@@ -6359,7 +6359,7 @@ sub_80AE5D4: @ 80AE5D4
 	lsrs r4, r0, 24
 	lsls r2, 24
 	lsrs r2, 24
-	ldr r3, _080AE660 @ =gUnknown_020238CC
+	ldr r3, _080AE660 @ =gDisplayedStringBattle
 	ldr r1, _080AE664 @ =gEmptyString_81E72B0
 	adds r0, r3, 0
 	bl sub_80AE598
@@ -6374,7 +6374,7 @@ sub_80AE5D4: @ 80AE5D4
 	movs r0, 0xBA
 	strb r0, [r3]
 	adds r3, 0x1
-	ldr r0, _080AE668 @ =gUnknown_0203869A
+	ldr r0, _080AE668 @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r0, 0x1
 	ands r0, r1
@@ -6393,7 +6393,7 @@ sub_80AE5D4: @ 80AE5D4
 	adds r0, r3, 0
 	bl StringCopy
 	ldr r0, _080AE670 @ =gUnknown_03004210
-	ldr r1, _080AE660 @ =gUnknown_020238CC
+	ldr r1, _080AE660 @ =gDisplayedStringBattle
 	ldr r2, _080AE674 @ =gUnknown_02038696
 	adds r2, r4, r2
 	ldrb r4, [r2]
@@ -6420,9 +6420,9 @@ sub_80AE5D4: @ 80AE5D4
 	bl sub_8004D04
 	b _080AE6B0
 	.align 2, 0
-_080AE660: .4byte gUnknown_020238CC
+_080AE660: .4byte gDisplayedStringBattle
 _080AE664: .4byte gEmptyString_81E72B0
-_080AE668: .4byte gUnknown_0203869A
+_080AE668: .4byte gIsLinkContest
 _080AE66C: .4byte gLinkPlayers
 _080AE670: .4byte gUnknown_03004210
 _080AE674: .4byte gUnknown_02038696
@@ -6434,7 +6434,7 @@ _080AE67C:
 	adds r0, r3, 0
 	bl StringCopy
 	ldr r0, _080AE6BC @ =gUnknown_03004210
-	ldr r1, _080AE6C0 @ =gUnknown_020238CC
+	ldr r1, _080AE6C0 @ =gDisplayedStringBattle
 	ldr r2, _080AE6C4 @ =gUnknown_02038696
 	adds r2, r4, r2
 	ldrb r4, [r2]
@@ -6460,7 +6460,7 @@ _080AE6B0:
 	.align 2, 0
 _080AE6B8: .4byte gUnknown_0203857D
 _080AE6BC: .4byte gUnknown_03004210
-_080AE6C0: .4byte gUnknown_020238CC
+_080AE6C0: .4byte gDisplayedStringBattle
 _080AE6C4: .4byte gUnknown_02038696
 _080AE6C8: .4byte gUnknown_083CA310
 	thumb_func_end sub_80AE5D4
@@ -6490,7 +6490,7 @@ sub_80AE6E4: @ 80AE6E4
 	lsrs r4, 24
 	lsls r2, 24
 	lsrs r2, 24
-	ldr r3, _080AE75C @ =gUnknown_020238CC
+	ldr r3, _080AE75C @ =gDisplayedStringBattle
 	movs r0, 0xFC
 	strb r0, [r3]
 	movs r0, 0x6
@@ -6507,7 +6507,7 @@ sub_80AE6E4: @ 80AE6E4
 	movs r0, 0xFF
 	strb r0, [r3]
 	ldr r0, _080AE764 @ =gUnknown_03004210
-	ldr r1, _080AE75C @ =gUnknown_020238CC
+	ldr r1, _080AE75C @ =gDisplayedStringBattle
 	ldr r2, _080AE768 @ =gUnknown_02038696
 	adds r4, r2
 	ldrb r4, [r4]
@@ -6540,7 +6540,7 @@ sub_80AE6E4: @ 80AE6E4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080AE75C: .4byte gUnknown_020238CC
+_080AE75C: .4byte gDisplayedStringBattle
 _080AE760: .4byte gContestMons + 0x2
 _080AE764: .4byte gUnknown_03004210
 _080AE768: .4byte gUnknown_02038696
@@ -6900,7 +6900,7 @@ sub_80AE9FC: @ 80AE9FC
 	str r4, [sp]
 	str r5, [sp, 0x4]
 	str r6, [sp, 0x8]
-	bl sub_800D334
+	bl HandleLoadSpecialPokePic
 	adds r0, r5, 0
 	mov r1, r8
 	adds r2, r6, 0
@@ -7941,17 +7941,17 @@ _080AF1FE:
 	ldrh r0, [r1, 0x6]
 	cmp r0, 0
 	bne _080AF228
-	ldr r0, _080AF220 @ =gUnknown_020238CC
+	ldr r0, _080AF220 @ =gDisplayedStringBattle
 	ldr r1, _080AF224 @ =gUnknownText_MissedTurn
 	adds r2, r3, 0
 	bl sub_80AE598
 	b _080AF23A
 	.align 2, 0
 _080AF21C: .4byte 0x02019260
-_080AF220: .4byte gUnknown_020238CC
+_080AF220: .4byte gDisplayedStringBattle
 _080AF224: .4byte gUnknownText_MissedTurn
 _080AF228:
-	ldr r0, _080AF270 @ =gUnknown_020238CC
+	ldr r0, _080AF270 @ =gDisplayedStringBattle
 	ldrh r2, [r1, 0x6]
 	movs r1, 0xD
 	muls r1, r2
@@ -7963,7 +7963,7 @@ _080AF23A:
 	adds r0, r5, 0
 	bl sub_80AF2A0
 	ldr r0, _080AF278 @ =gUnknown_03004210
-	ldr r1, _080AF270 @ =gUnknown_020238CC
+	ldr r1, _080AF270 @ =gDisplayedStringBattle
 	lsls r2, r5, 2
 	adds r2, r5
 	lsls r2, 18
@@ -7985,7 +7985,7 @@ _080AF23A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080AF270: .4byte gUnknown_020238CC
+_080AF270: .4byte gDisplayedStringBattle
 _080AF274: .4byte gMoveNames
 _080AF278: .4byte gUnknown_03004210
 _080AF27C: .4byte gUnknown_083CA318
@@ -9885,7 +9885,7 @@ _080B004A:
 	adds r0, r1
 	lsls r0, 2
 	adds r0, r7
-	ldr r1, _080B00C4 @ =gUnknown_083CA464
+	ldr r1, _080B00C4 @ =gSubspriteTables_83CA464
 	bl SetSubspriteTables
 	ldrb r1, [r4, 0x1]
 	lsls r0, r1, 4
@@ -9914,7 +9914,7 @@ _080B00B4: .4byte gUnknown_083CA3C4
 _080B00B8: .4byte gSpriteTemplate_83CA3F4
 _080B00BC: .4byte gUnknown_02038696
 _080B00C0: .4byte 0x02019338
-_080B00C4: .4byte gUnknown_083CA464
+_080B00C4: .4byte gSubspriteTables_83CA464
 	thumb_func_end sub_80B0034
 
 	thumb_func_start sub_80B00C8
@@ -11237,7 +11237,7 @@ sub_80B09E4: @ 80B09E4
 	movs r1, 0x3
 	movs r2, 0xC0
 	lsls r2, 19
-	bl sub_8040F80
+	bl CopySpriteTiles
 	ldrb r0, [r7]
 	lsls r3, r0, 2
 	adds r3, r0
@@ -11253,7 +11253,7 @@ sub_80B09E4: @ 80B09E4
 	movs r1, 0x3
 	movs r2, 0xC0
 	lsls r2, 19
-	bl sub_8040F80
+	bl CopySpriteTiles
 	ldrh r0, [r4, 0x4]
 	lsls r0, 22
 	lsrs r0, 17
@@ -14595,7 +14595,7 @@ _080B2470: .4byte 0x02019218
 _080B2474: .4byte gUnknown_02038696
 _080B2478: .4byte gTasks
 _080B247C:
-	ldr r0, _080B24C0 @ =gUnknown_0203869A
+	ldr r0, _080B24C0 @ =gIsLinkContest
 	ldrb r0, [r0]
 	ands r1, r0
 	cmp r1, 0
@@ -14625,7 +14625,7 @@ _080B249E:
 	strh r0, [r5, 0x8]
 	b _080B24FC
 	.align 2, 0
-_080B24C0: .4byte gUnknown_0203869A
+_080B24C0: .4byte gIsLinkContest
 _080B24C4: .4byte 0x02019204
 _080B24C8: .4byte sub_80C8C80
 _080B24CC: .4byte sub_80AD8DC
@@ -15034,8 +15034,8 @@ sub_80B2790: @ 80B2790
 	movs r1, 0
 	movs r2, 0x14
 	bl memset
-	bl sub_8075624
-	ldr r1, _080B27F8 @ =gUnknown_02024E84
+	bl battle_anim_clear_some_data
+	ldr r1, _080B27F8 @ =gBattleMonForms
 	movs r2, 0
 	adds r0, r1, 0x3
 _080B27D0:
@@ -15057,7 +15057,7 @@ _080B27D0:
 	.align 2, 0
 _080B27F0: .4byte 0x02019260
 _080B27F4: .4byte gContestMons
-_080B27F8: .4byte gUnknown_02024E84
+_080B27F8: .4byte gBattleMonForms
 _080B27FC:
 	cmp r5, 0x82
 	beq _080B2898
@@ -15126,17 +15126,17 @@ _080B2848:
 _080B2878: .4byte 0x02019260
 _080B287C: .4byte gContestMons
 _080B2880:
-	ldr r1, _080B2888 @ =gUnknown_0202F7BE
+	ldr r1, _080B2888 @ =gHappinessMoveAnim
 	movs r0, 0xFF
 	b _080B28BC
 	.align 2, 0
-_080B2888: .4byte gUnknown_0202F7BE
+_080B2888: .4byte gHappinessMoveAnim
 _080B288C:
-	ldr r1, _080B2894 @ =gUnknown_0202F7BE
+	ldr r1, _080B2894 @ =gHappinessMoveAnim
 	movs r0, 0
 	b _080B28BC
 	.align 2, 0
-_080B2894: .4byte gUnknown_0202F7BE
+_080B2894: .4byte gHappinessMoveAnim
 _080B2898:
 	ldr r0, _080B28B0 @ =0x02019204
 	adds r2, r0, 0
@@ -15223,10 +15223,10 @@ _080B2928: .4byte gContestMons
 sub_80B292C: @ 80B292C
 	push {lr}
 	ldr r0, _080B2958 @ =SpriteCallbackDummy
-	bl object_new_hidden_with_callback
-	ldr r1, _080B295C @ =gUnknown_02024BE0
+	bl CreateInvisibleSpriteWithCallback
+	ldr r1, _080B295C @ =gObjectBankIDs
 	strb r0, [r1, 0x3]
-	ldr r0, _080B2960 @ =gUnknown_02024C08
+	ldr r0, _080B2960 @ =gBankTarget
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r1, [r0]
@@ -15241,15 +15241,15 @@ sub_80B292C: @ 80B292C
 	bx r0
 	.align 2, 0
 _080B2958: .4byte SpriteCallbackDummy
-_080B295C: .4byte gUnknown_02024BE0
-_080B2960: .4byte gUnknown_02024C08
+_080B295C: .4byte gObjectBankIDs
+_080B2960: .4byte gBankTarget
 _080B2964: .4byte gSprites
 	thumb_func_end sub_80B292C
 
 	thumb_func_start sub_80B2968
 sub_80B2968: @ 80B2968
 	push {r4,lr}
-	ldr r0, _080B29AC @ =gUnknown_02024BE0
+	ldr r0, _080B29AC @ =gObjectBankIDs
 	ldrb r0, [r0, 0x3]
 	lsls r4, r0, 4
 	adds r4, r0
@@ -15280,7 +15280,7 @@ sub_80B2968: @ 80B2968
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B29AC: .4byte gUnknown_02024BE0
+_080B29AC: .4byte gObjectBankIDs
 _080B29B0: .4byte gSprites
 	thumb_func_end sub_80B2968
 
@@ -15341,20 +15341,20 @@ _080B29DC:
 	.4byte _080B2A6C
 	.4byte _080B2A6C
 _080B2A60:
-	ldr r1, _080B2A68 @ =gUnknown_02024C08
+	ldr r1, _080B2A68 @ =gBankTarget
 	movs r0, 0x2
 	b _080B2A70
 	.align 2, 0
-_080B2A68: .4byte gUnknown_02024C08
+_080B2A68: .4byte gBankTarget
 _080B2A6C:
-	ldr r1, _080B2A78 @ =gUnknown_02024C08
+	ldr r1, _080B2A78 @ =gBankTarget
 	movs r0, 0x3
 _080B2A70:
 	strb r0, [r1]
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B2A78: .4byte gUnknown_02024C08
+_080B2A78: .4byte gBankTarget
 	thumb_func_end sub_80B29B4
 
 	thumb_func_start sub_80B2A7C
@@ -15537,7 +15537,7 @@ _080B2BC4:
 	adds r1, r4, r1
 	str r2, [sp]
 	bl StringCopy
-	ldr r0, _080B2C1C @ =gUnknown_0203869A
+	ldr r0, _080B2C1C @ =gIsLinkContest
 	ldrb r1, [r0]
 	movs r0, 0x1
 	ands r0, r1
@@ -15556,7 +15556,7 @@ _080B2BC4:
 	.align 2, 0
 _080B2C14: .4byte 0x02015de0
 _080B2C18: .4byte gContestMons
-_080B2C1C: .4byte gUnknown_0203869A
+_080B2C1C: .4byte gIsLinkContest
 _080B2C20: .4byte gLinkPlayers + 0x8
 _080B2C24:
 	adds r0, r5, 0