5 files changed, 18 insertions, 523 deletions
diff --git a/asm/credits.s b/asm/credits.s
index fe9a93668..4c6f9d5d8 100644
--- a/asm/credits.s
+++ b/asm/credits.s
@@ -6,447 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_81441B8
-sub_81441B8: @ 81441B8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _081441E4 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	movs r2, 0x8
-	ldrsh r0, [r0, r2]
-	adds r6, r1, 0
-	cmp r0, 0xA
-	bhi _08144218
-	lsls r0, 2
-	ldr r1, _081441E8 @ =_081441EC
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_081441E4: .4byte gTasks
-_081441E8: .4byte _081441EC
-	.align 2, 0
-_081441EC:
-	.4byte _08144218
-	.4byte _08144258
-	.4byte _08144278
-	.4byte _08144358
-	.4byte _0814438C
-	.4byte _081443F8
-	.4byte _08144218
-	.4byte _08144218
-	.4byte _08144218
-	.4byte _08144218
-	.4byte _08144428
-_08144218:
-	ldr r0, _08144250 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0
-	beq _0814422A
-	b _08144446
-_0814422A:
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r6
-	movs r1, 0x1
-	strh r1, [r0, 0x8]
-	movs r1, 0x58
-	strh r1, [r0, 0xE]
-	movs r3, 0xA
-	ldrsh r1, [r0, r3]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r6
-	strh r2, [r0, 0x24]
-	ldr r0, _08144254 @ =gUnknown_02039320
-	strh r2, [r0]
-	b _08144446
-	.align 2, 0
-_08144250: .4byte gPaletteFade
-_08144254: .4byte gUnknown_02039320
-_08144258:
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r1, r0, r6
-	ldrh r2, [r1, 0xE]
-	movs r3, 0xE
-	ldrsh r0, [r1, r3]
-	cmp r0, 0
-	beq _08144270
-	subs r0, r2, 0x1
-	strh r0, [r1, 0xE]
-	b _08144446
-_08144270:
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-	b _08144446
-_08144278:
-	movs r2, 0x80
-	lsls r2, 19
-	ldrh r1, [r2]
-	ldr r0, _08144320 @ =0x0000feff
-	ands r0, r1
-	strh r0, [r2]
-	lsls r2, r5, 2
-	adds r0, r2, r5
-	lsls r0, 3
-	adds r3, r0, r6
-	movs r0, 0xA
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r4, r0, r6
-	ldr r1, [r4]
-	ldr r0, _08144324 @ =sub_8143B68
-	mov r8, r2
-	cmp r1, r0
-	bne _08144352
-	movs r1, 0xC
-	ldrsh r0, [r3, r1]
-	cmp r0, 0x33
-	bgt _0814434C
-	movs r4, 0
-	ldr r7, _08144328 @ =gCreditsEntryPointerTable
-	adds r6, r3, 0
-_081442B0:
-	movs r2, 0xC
-	ldrsh r1, [r6, r2]
-	lsls r0, r1, 2
-	adds r0, r1
-	adds r0, r4
-	lsls r0, 2
-	adds r0, r7
-	ldr r0, [r0]
-	ldr r0, [r0, 0x4]
-	lsls r2, r4, 25
-	movs r3, 0x90
-	lsls r3, 20
-	adds r2, r3
-	lsrs r2, 24
-	movs r1, 0
-	movs r3, 0xF0
-	bl sub_8072BD8
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x4
-	bls _081442B0
-	ldr r3, _0814432C @ =gTasks
-	mov r0, r8
-	adds r1, r0, r5
-	lsls r1, 3
-	adds r1, r3
-	ldrh r0, [r1, 0xC]
-	adds r0, 0x1
-	strh r0, [r1, 0xC]
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-	movs r0, 0xA
-	ldrsh r2, [r1, r0]
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r3
-	movs r2, 0x1
-	strh r2, [r0, 0x24]
-	movs r2, 0xA
-	ldrsh r1, [r1, r2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r3
-	movs r3, 0x22
-	ldrsh r0, [r0, r3]
-	cmp r0, 0x1
-	bne _08144334
-	movs r0, 0xC0
-	lsls r0, 2
-	ldr r1, _08144330 @ =0x0000328d
-	b _0814433A
-	.align 2, 0
-_08144320: .4byte 0x0000feff
-_08144324: .4byte sub_8143B68
-_08144328: .4byte gCreditsEntryPointerTable
-_0814432C: .4byte gTasks
-_08144330: .4byte 0x0000328d
-_08144334:
-	movs r0, 0xC0
-	lsls r0, 2
-	ldr r1, _08144348 @ =0x00001967
-_0814433A:
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	b _08144446
-	.align 2, 0
-_08144348: .4byte 0x00001967
-_0814434C:
-	movs r0, 0xA
-	strh r0, [r3, 0x8]
-	b _08144446
-_08144352:
-	movs r0, 0
-	strh r0, [r4, 0x24]
-	b _08144446
-_08144358:
-	movs r2, 0x80
-	lsls r2, 19
-	ldrh r0, [r2]
-	movs r3, 0x80
-	lsls r3, 1
-	adds r1, r3, 0
-	orrs r0, r1
-	strh r0, [r2]
-	ldr r0, _08144388 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08144446
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r6
-	movs r1, 0x82
-	strh r1, [r0, 0xE]
-	ldrh r1, [r0, 0x8]
-	adds r1, 0x1
-	strh r1, [r0, 0x8]
-	b _08144446
-	.align 2, 0
-_08144388: .4byte gPaletteFade
-_0814438C:
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r6
-	ldrh r1, [r4, 0xE]
-	movs r2, 0xE
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _081443A4
-	subs r0, r1, 0x1
-	strh r0, [r4, 0xE]
-	b _08144446
-_081443A4:
-	ldrb r0, [r4, 0xC]
-	ldrb r1, [r4, 0xA]
-	bl sub_8144454
-	lsls r0, 24
-	cmp r0, 0
-	beq _081443BA
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _08144446
-_081443BA:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r3, 0xA
-	ldrsh r1, [r4, r3]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r6
-	movs r1, 0x22
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x1
-	bne _081443E0
-	movs r0, 0xC0
-	lsls r0, 2
-	ldr r1, _081443DC @ =0x0000328d
-	b _081443E6
-	.align 2, 0
-_081443DC: .4byte 0x0000328d
-_081443E0:
-	movs r0, 0xC0
-	lsls r0, 2
-	ldr r1, _081443F4 @ =0x00001967
-_081443E6:
-	str r1, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	b _08144446
-	.align 2, 0
-_081443F4: .4byte 0x00001967
-_081443F8:
-	ldr r0, _08144420 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08144446
-	movs r0, 0
-	movs r1, 0x9
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-	ldr r0, _08144424 @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r0
-	movs r0, 0x2
-	strh r0, [r1, 0x8]
-	b _08144446
-	.align 2, 0
-_08144420: .4byte gPaletteFade
-_08144424: .4byte gTasks
-_08144428:
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r6
-	movs r2, 0xA
-	ldrsh r1, [r0, r2]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r6
-	movs r1, 0x1
-	strh r1, [r0, 0x10]
-	adds r0, r5, 0
-	bl DestroyTask
-_08144446:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81441B8
-
-	thumb_func_start sub_8144454
-sub_8144454: @ 8144454
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	adds r6, r3, 0
-	lsls r1, 24
-	lsrs r2, r1, 24
-	adds r5, r2, 0
-	ldr r4, _08144508 @ =gTasks
-	cmp r3, 0x6
-	bne _08144474
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r4
-	movs r1, 0x2
-	strh r1, [r0, 0x1E]
-_08144474:
-	cmp r3, 0xC
-	bne _08144486
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r4
-	movs r1, 0x1
-	strh r1, [r0, 0x16]
-	strh r1, [r0, 0x1E]
-_08144486:
-	cmp r3, 0x12
-	bne _08144496
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r4
-	movs r1, 0x2
-	strh r1, [r0, 0x1E]
-_08144496:
-	cmp r3, 0x18
-	bne _081444AA
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r4
-	movs r1, 0x2
-	strh r1, [r0, 0x16]
-	movs r1, 0x1
-	strh r1, [r0, 0x1E]
-_081444AA:
-	cmp r3, 0x1E
-	bne _081444BA
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r4
-	movs r1, 0x2
-	strh r1, [r0, 0x1E]
-_081444BA:
-	cmp r3, 0x23
-	bne _081444CE
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r4
-	movs r1, 0x3
-	strh r1, [r0, 0x16]
-	movs r1, 0x1
-	strh r1, [r0, 0x1E]
-_081444CE:
-	cmp r3, 0x28
-	bne _081444DE
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r4
-	movs r1, 0x2
-	strh r1, [r0, 0x1E]
-_081444DE:
-	cmp r6, 0x2E
-	bne _081444F2
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r4
-	movs r1, 0x4
-	strh r1, [r0, 0x16]
-	movs r1, 0x1
-	strh r1, [r0, 0x1E]
-_081444F2:
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r4
-	movs r1, 0x1E
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _0814450C
-	movs r0, 0
-	b _0814450E
-	.align 2, 0
-_08144508: .4byte gTasks
-_0814450C:
-	movs r0, 0x1
-_0814450E:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8144454
-
 	thumb_func_start sub_8144514
 sub_8144514: @ 8144514
 	push {r4-r7,lr}
diff --git a/asm/daycare.s b/asm/daycare.s
index 80e7c46e8..d78757d8f 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -6,70 +6,6 @@
 
 	.text
 
-	thumb_func_start pokemon_get_nick
-pokemon_get_nick: @ 80412B0
-	push {r4,lr}
-	sub sp, 0x14
-	adds r4, r1, 0
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	adds r0, r4, 0
-	mov r1, sp
-	bl StringCopy10
-	add sp, 0x14
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end pokemon_get_nick
-
-	thumb_func_start pokemon_get_nick_
-pokemon_get_nick_: @ 80412D0
-	push {r4,lr}
-	sub sp, 0x14
-	adds r4, r1, 0
-	movs r1, 0x2
-	mov r2, sp
-	bl GetBoxMonData
-	adds r0, r4, 0
-	mov r1, sp
-	bl StringCopy10
-	add sp, 0x14
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end pokemon_get_nick_
-
-	thumb_func_start daycare_count_pokemon
-daycare_count_pokemon: @ 80412F0
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r5, 0
-	movs r4, 0
-_080412F8:
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 4
-	adds r0, r6, r0
-	movs r1, 0xB
-	bl GetBoxMonData
-	cmp r0, 0
-	beq _08041310
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-_08041310:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x1
-	bls _080412F8
-	adds r0, r5, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end daycare_count_pokemon
-
 	thumb_func_start sub_8041324
 sub_8041324: @ 8041324
 	push {r4-r7,lr}
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 76ee536c7..aeec1b4bc 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -2253,7 +2253,7 @@ sub_80B6A80: @ 80B6A80
 	lsls r4, 2
 	ldr r5, _080B6B00 @ =gSprites
 	adds r4, r5
-	ldr r1, _080B6B04 @ =gUnknown_083CE558
+	ldr r1, _080B6B04 @ =gSubspriteTables_83CE558
 	adds r0, r4, 0
 	bl SetSubspriteTables
 	ldr r0, _080B6B08 @ =gSpriteTemplate_83CE5F8
@@ -2268,7 +2268,7 @@ sub_80B6A80: @ 80B6A80
 	adds r2, r0
 	lsls r2, 2
 	adds r2, r5
-	ldr r1, _080B6B0C @ =gUnknown_083CE560
+	ldr r1, _080B6B0C @ =gSubspriteTables_83CE560
 	adds r0, r2, 0
 	bl SetSubspriteTables
 	ldr r0, _080B6B10 @ =gSpriteTemplate_83CE5E0
@@ -2297,9 +2297,9 @@ sub_80B6A80: @ 80B6A80
 _080B6AF8: .4byte gSpriteTemplate_83CE5C8
 _080B6AFC: .4byte 0x02000000
 _080B6B00: .4byte gSprites
-_080B6B04: .4byte gUnknown_083CE558
+_080B6B04: .4byte gSubspriteTables_83CE558
 _080B6B08: .4byte gSpriteTemplate_83CE5F8
-_080B6B0C: .4byte gUnknown_083CE560
+_080B6B0C: .4byte gSubspriteTables_83CE560
 _080B6B10: .4byte gSpriteTemplate_83CE5E0
 	thumb_func_end sub_80B6A80
 
@@ -2541,7 +2541,7 @@ sub_80B6CA8: @ 80B6CA8
 	lsls r0, 2
 	ldr r4, _080B6CF8 @ =gSprites
 	adds r0, r4
-	ldr r5, _080B6CFC @ =gUnknown_083CE578
+	ldr r5, _080B6CFC @ =gSubspriteTables_83CE578
 	adds r1, r5, 0
 	bl SetSubspriteTables
 	ldr r0, _080B6D00 @ =gSpriteTemplate_83CE628
@@ -2564,7 +2564,7 @@ sub_80B6CA8: @ 80B6CA8
 	.align 2, 0
 _080B6CF4: .4byte gSpriteTemplate_83CE610
 _080B6CF8: .4byte gSprites
-_080B6CFC: .4byte gUnknown_083CE578
+_080B6CFC: .4byte gSubspriteTables_83CE578
 _080B6D00: .4byte gSpriteTemplate_83CE628
 	thumb_func_end sub_80B6CA8
 
@@ -2816,7 +2816,7 @@ sub_80B6EBC: @ 80B6EBC
 	lsls r4, 2
 	ldr r0, _080B6EF4 @ =gSprites
 	adds r4, r0
-	ldr r1, _080B6EF8 @ =gUnknown_083CE580
+	ldr r1, _080B6EF8 @ =gSubspriteTables_83CE580
 	adds r0, r4, 0
 	bl SetSubspriteTables
 	ldrb r0, [r4, 0x5]
@@ -2829,7 +2829,7 @@ sub_80B6EBC: @ 80B6EBC
 	.align 2, 0
 _080B6EF0: .4byte gSpriteTemplate_83CE688
 _080B6EF4: .4byte gSprites
-_080B6EF8: .4byte gUnknown_083CE580
+_080B6EF8: .4byte gSubspriteTables_83CE580
 	thumb_func_end sub_80B6EBC
 
 	thumb_func_start sub_80B6EFC
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 49d627336..966285ab3 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -12455,7 +12455,7 @@ _080F1F4A:
 	movs r1, 0x3
 	orrs r0, r1
 	strb r0, [r4, 0x1]
-	ldr r0, _080F1FB0 @ =gUnknown_083E4450
+	ldr r0, _080F1FB0 @ =gSpriteAffineAnimTable_83E4450
 	str r0, [r4, 0x10]
 	adds r0, r4, 0
 	bl InitSpriteAffineAnim
@@ -12489,7 +12489,7 @@ _080F1F4A:
 	b _080F1FE4
 	.align 2, 0
 _080F1FAC: .4byte 0x00006dad
-_080F1FB0: .4byte gUnknown_083E4450
+_080F1FB0: .4byte gSpriteAffineAnimTable_83E4450
 _080F1FB4: .4byte sub_80F2240
 _080F1FB8: .4byte gUnknown_083DFEC4
 _080F1FBC: .4byte 0x0000030f
diff --git a/asm/roulette.s b/asm/roulette.s
index 0704caf7f..6382ecf0b 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -369,7 +369,7 @@ _081153D0:
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZ77UnCompVram
-	ldr r0, _08115434 @ =gUnknown_08E81098
+	ldr r0, _08115434 @ =gRouletteWheelTiles
 	ldr r1, _08115438 @ =0x06004000
 	bl LZ77UnCompVram
 	ldr r1, _0811543C @ =gMain
@@ -382,7 +382,7 @@ _08115424: .4byte 0x00004686
 _08115428: .4byte 0x00004401
 _0811542C: .4byte 0x0000060a
 _08115430: .4byte gUnknown_08E8096C
-_08115434: .4byte gUnknown_08E81098
+_08115434: .4byte gRouletteWheelTiles
 _08115438: .4byte 0x06004000
 _0811543C: .4byte gMain
 _08115440: .4byte 0x0000043c
@@ -3571,7 +3571,7 @@ _08116DEE:
 	cmp r3, 0x3
 	bls _08116DC8
 	movs r2, 0
-	ldr r0, _08116E54 @ =gUnknown_083F8D94
+	ldr r0, _08116E54 @ =gUnknown_083F8D90 + 0x4
 	add r0, r12
 	ldr r7, [r0]
 	ldr r4, _08116E58 @ =0x02019016
@@ -3617,7 +3617,7 @@ _08116E38:
 _08116E48: .4byte 0x02019000
 _08116E4C: .4byte gTasks
 _08116E50: .4byte gUnknown_083F8D90
-_08116E54: .4byte gUnknown_083F8D94
+_08116E54: .4byte gUnknown_083F8D90 + 0x4
 _08116E58: .4byte 0x02019016
 	thumb_func_end sub_8116D54
 
@@ -8689,10 +8689,10 @@ _081196A8:
 	cmp r5, r9
 	bcs _0811970E
 	ldr r6, _08119734 @ =0x02019000
-	ldr r7, _08119738 @ =gUnknown_083F8C0C
+	ldr r7, _08119738 @ =gUnknown_083F8C00 + 0xC
 _081196B6:
 	lsls r0, r3, 3
-	ldr r1, _0811973C @ =gUnknown_083F8D94
+	ldr r1, _0811973C @ =gUnknown_083F8D90 + 0x4
 	adds r0, r1
 	ldr r1, [r6, 0x8]
 	ldr r2, [r0]
@@ -8757,8 +8757,8 @@ _0811970E:
 	b _08119766
 	.align 2, 0
 _08119734: .4byte 0x02019000
-_08119738: .4byte gUnknown_083F8C0C
-_0811973C: .4byte gUnknown_083F8D94
+_08119738: .4byte gUnknown_083F8C00 + 0xC
+_0811973C: .4byte gUnknown_083F8D90 + 0x4
 _08119740: .4byte 0x0201901b
 _08119744:
 	ldr r0, [sp, 0x10]