11 files changed, 35 insertions, 984 deletions
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s
index f1d80c4fc..8c70f5d8a 100644
--- a/asm/battle_script_commands.s
+++ b/asm/battle_script_commands.s
@@ -25315,7 +25315,7 @@ _0802C8E8:
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0x1
-	bl sub_8088E38
+	bl GetPokedexHeightWeight
 	ldrh r1, [r4]
 	lsls r0, 16
 	lsrs r0, 16
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 0ec71e087..604929f1f 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -51,7 +51,7 @@ start_menu_is_selected_item_valid: @ 80BD754
 	cmp r0, 0x15
 	bne _080BD76C
 	movs r0, 0
-	bl pokedex_count
+	bl GetNationalPokedexCount
 	lsls r0, 16
 	lsrs r0, 16
 	b _080BD782
@@ -1054,7 +1054,7 @@ sub_80BDE88: @ 80BDE88
 	ldr r1, [r4]
 	movs r0, 0
 	strh r0, [r1]
-	bl pokedex_count
+	bl GetNationalPokedexCount
 	lsls r0, 16
 	cmp r0, 0
 	beq _080BDEB0
diff --git a/asm/main_menu.s b/asm/main_menu.s
index f88fea21a..fed088ff3 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -1504,13 +1504,13 @@ sub_800CF3C: @ 800CF3C
 	cmp r0, 0
 	beq _0800CF64
 	movs r0, 0x1
-	bl pokedex_count
+	bl GetNationalPokedexCount
 	b _0800CF6A
 	.align 2, 0
 _0800CF60: .4byte 0x00000829
 _0800CF64:
 	movs r0, 0x1
-	bl sub_8088EDC
+	bl GetKantoPokedexCount
 _0800CF6A:
 	lsls r0, 16
 	lsrs r6, r0, 16
diff --git a/asm/overworld.s b/asm/overworld.s
index 24a840edd..eb3832ff5 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -701,7 +701,7 @@ mapdata_load_assets_to_gpu_and_full_redraw: @ 8055148
 	ldr r0, [r4]
 	bl apply_map_tileset1_tileset2_palette
 	bl DrawWholeMapView
-	bl cur_mapheader_run_tileset_funcs_after_some_cpuset
+	bl InitTilesetAnimations
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -1732,7 +1732,7 @@ _080558D4:
 	adds r4, 0x1
 	cmp r4, 0xC
 	ble _080558D4
-	bl sub_806FFB0
+	bl InitSecondaryTilesetAnimation
 	bl UpdateLocationHistoryForRoamer
 	bl RoamerMove
 	bl sub_8110920
@@ -3392,7 +3392,7 @@ sub_8056578: @ 8056578
 	bl UpdateCameraPanning
 	bl BuildOamBuffer
 	bl UpdatePaletteFade
-	bl sub_806FFBC
+	bl UpdateTilesetAnimations
 	bl DoScheduledBgTilemapCopiesToVram
 	pop {r0}
 	bx r0
@@ -4051,7 +4051,7 @@ _08056B30:
 	bl DrawWholeMapView
 	b _08056B62
 _08056B36:
-	bl cur_mapheader_run_tileset_funcs_after_some_cpuset
+	bl InitTilesetAnimations
 	b _08056B62
 _08056B3C:
 	ldr r0, _08056B54 @ =gWirelessCommType
@@ -4193,7 +4193,7 @@ _08056C6C:
 	bl DrawWholeMapView
 	b _08056CCA
 _08056C72:
-	bl cur_mapheader_run_tileset_funcs_after_some_cpuset
+	bl InitTilesetAnimations
 	b _08056CCA
 _08056C78:
 	bl sub_80561B4
@@ -4382,7 +4382,7 @@ _08056E0C:
 	bl DrawWholeMapView
 	b _08056E3E
 _08056E12:
-	bl cur_mapheader_run_tileset_funcs_after_some_cpuset
+	bl InitTilesetAnimations
 	b _08056E3E
 _08056E18:
 	ldr r0, _08056E30 @ =gWirelessCommType
@@ -5093,7 +5093,7 @@ _08057404:
 	bl DrawWholeMapView
 	b _08057412
 _0805740A:
-	bl cur_mapheader_run_tileset_funcs_after_some_cpuset
+	bl InitTilesetAnimations
 	bl sub_815A540
 _08057412:
 	ldrb r0, [r4]
@@ -5176,7 +5176,7 @@ _080574B8:
 	bl UpdateCameraPanning
 	bl BuildOamBuffer
 	bl UpdatePaletteFade
-	bl sub_806FFBC
+	bl UpdateTilesetAnimations
 	bl DoScheduledBgTilemapCopiesToVram
 	cmp r4, 0
 	beq _080574E0
@@ -5442,7 +5442,7 @@ _0805770C:
 	bl DrawWholeMapView
 	b _0805772A
 _08057712:
-	bl cur_mapheader_run_tileset_funcs_after_some_cpuset
+	bl InitTilesetAnimations
 	ldr r2, _08057734 @ =gPaletteFade
 	ldrb r1, [r2, 0x8]
 	movs r0, 0x7F
diff --git a/asm/pokedex.s b/asm/pokedex.s
deleted file mode 100644
index 69ca5adcf..000000000
--- a/asm/pokedex.s
+++ /dev/null
@@ -1,282 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8088E20
-sub_8088E20: @ 8088E20
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088E34 @ =gUnknown_844E850
-	adds r0, r1
-	bx lr
-	.align 2, 0
-_08088E34: .4byte gUnknown_844E850
-	thumb_func_end sub_8088E20
-
-	thumb_func_start sub_8088E38
-sub_8088E38: @ 8088E38
-	push {lr}
-	lsls r0, 16
-	lsrs r2, r0, 16
-	lsls r1, 24
-	lsrs r1, 24
-	cmp r1, 0
-	beq _08088E4E
-	cmp r1, 0x1
-	beq _08088E60
-	movs r0, 0x1
-	b _08088E6C
-_08088E4E:
-	ldr r0, _08088E5C @ =gUnknown_844E850
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	ldrh r0, [r1, 0xC]
-	b _08088E6C
-	.align 2, 0
-_08088E5C: .4byte gUnknown_844E850
-_08088E60:
-	ldr r0, _08088E70 @ =gUnknown_844E850
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r0
-	ldrh r0, [r1, 0xE]
-_08088E6C:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08088E70: .4byte gUnknown_844E850
-	thumb_func_end sub_8088E38
-
-	thumb_func_start GetSetPokedexFlag
-GetSetPokedexFlag: @ 8088E74
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0
-	bl sub_8104AB0
-	lsls r0, 24
-	asrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end GetSetPokedexFlag
-
-	thumb_func_start pokedex_count
-pokedex_count: @ 8088E8C
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r5, 0
-	movs r0, 0
-	ldr r7, _08088EA4 @ =0x00000181
-_08088E98:
-	cmp r6, 0
-	beq _08088EA8
-	cmp r6, 0x1
-	beq _08088EB2
-	adds r4, r0, 0x1
-	b _08088ECA
-	.align 2, 0
-_08088EA4: .4byte 0x00000181
-_08088EA8:
-	adds r4, r0, 0x1
-	lsls r0, r4, 16
-	lsrs r0, 16
-	movs r1, 0
-	b _08088EBA
-_08088EB2:
-	adds r4, r0, 0x1
-	lsls r0, r4, 16
-	lsrs r0, 16
-	movs r1, 0x1
-_08088EBA:
-	bl GetSetPokedexFlag
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088ECA
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-_08088ECA:
-	lsls r0, r4, 16
-	lsrs r0, 16
-	cmp r0, r7
-	bls _08088E98
-	adds r0, r5, 0
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end pokedex_count
-
-	thumb_func_start sub_8088EDC
-sub_8088EDC: @ 8088EDC
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r5, 0
-	movs r0, 0
-_08088EE6:
-	cmp r6, 0
-	beq _08088EF2
-	cmp r6, 0x1
-	beq _08088EFC
-	adds r4, r0, 0x1
-	b _08088F14
-_08088EF2:
-	adds r4, r0, 0x1
-	lsls r0, r4, 16
-	lsrs r0, 16
-	movs r1, 0
-	b _08088F04
-_08088EFC:
-	adds r4, r0, 0x1
-	lsls r0, r4, 16
-	lsrs r0, 16
-	movs r1, 0x1
-_08088F04:
-	bl GetSetPokedexFlag
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088F14
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-_08088F14:
-	lsls r0, r4, 16
-	lsrs r0, 16
-	cmp r0, 0x96
-	bls _08088EE6
-	adds r0, r5, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8088EDC
-
-	thumb_func_start sub_8088F24
-sub_8088F24: @ 8088F24
-	push {r4,lr}
-	movs r0, 0
-_08088F28:
-	adds r0, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	bl HoennToNationalOrder
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	bl GetSetPokedexFlag
-	lsls r0, 24
-	cmp r0, 0
-	bne _08088F48
-	movs r0, 0
-	b _08088F50
-_08088F48:
-	adds r0, r4, 0
-	cmp r0, 0xC7
-	bls _08088F28
-	movs r0, 0x1
-_08088F50:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8088F24
-
-	thumb_func_start sub_8088F58
-sub_8088F58: @ 8088F58
-	push {r4,lr}
-	movs r0, 0
-_08088F5C:
-	adds r0, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl GetSetPokedexFlag
-	lsls r0, 24
-	cmp r0, 0
-	bne _08088F74
-	movs r0, 0
-	b _08088F7C
-_08088F74:
-	adds r0, r4, 0
-	cmp r0, 0x95
-	bls _08088F5C
-	movs r0, 0x1
-_08088F7C:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8088F58
-
-	thumb_func_start HasAllKantoMons
-HasAllKantoMons: @ 8088F84
-	push {r4,r5,lr}
-	movs r0, 0
-_08088F88:
-	adds r0, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl GetSetPokedexFlag
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088FD6
-	adds r0, r4, 0
-	cmp r0, 0x95
-	bls _08088F88
-	movs r0, 0x97
-_08088FA4:
-	adds r0, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl GetSetPokedexFlag
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088FD6
-	adds r0, r4, 0
-	cmp r0, 0xF7
-	bls _08088FA4
-	movs r0, 0xFB
-	ldr r5, _08088FDC @ =0x0000017f
-_08088FC2:
-	adds r0, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl GetSetPokedexFlag
-	lsls r0, 24
-	cmp r0, 0
-	bne _08088FE0
-_08088FD6:
-	movs r0, 0
-	b _08088FE8
-	.align 2, 0
-_08088FDC: .4byte 0x0000017f
-_08088FE0:
-	adds r0, r4, 0
-	cmp r0, r5
-	bls _08088FC2
-	movs r0, 0x1
-_08088FE8:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end HasAllKantoMons
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index 268b65fd8..b9c18d201 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -6230,7 +6230,7 @@ sub_8105800: @ 8105800
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
-	ldr r2, _08105860 @ =gUnknown_844E850
+	ldr r2, _08105860 @ =gPokedexEntries
 	adds r5, r1, r2
 	movs r4, 0
 	movs r1, 0x1
@@ -6260,7 +6260,7 @@ _08105840:
 	bls _08105840
 	b _08105878
 	.align 2, 0
-_08105860: .4byte gUnknown_844E850
+_08105860: .4byte gPokedexEntries
 _08105864:
 	movs r1, 0xAC
 _08105866:
@@ -6331,7 +6331,7 @@ sub_81058C4: @ 81058C4
 	mov r8, r3
 	adds r0, r1, 0
 	bl SpeciesToNationalPokedexNum
-	ldr r2, _08105974 @ =gUnknown_844E850
+	ldr r2, _08105974 @ =gPokedexEntries
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
@@ -6395,7 +6395,7 @@ _0810593A:
 	strb r0, [r1]
 	b _08105998
 	.align 2, 0
-_08105974: .4byte gUnknown_844E850
+_08105974: .4byte gPokedexEntries
 _08105978: .4byte gUnknown_8415F98
 _0810597C: .4byte 0x00002710
 _08105980:
@@ -6514,7 +6514,7 @@ sub_8105A3C: @ 8105A3C
 	mov r9, r3
 	adds r0, r1, 0
 	bl SpeciesToNationalPokedexNum
-	ldr r2, _08105ACC @ =gUnknown_844E850
+	ldr r2, _08105ACC @ =gPokedexEntries
 	lsls r1, r0, 3
 	adds r1, r0
 	lsls r1, 2
@@ -6565,7 +6565,7 @@ _08105AAC:
 	strb r5, [r4]
 	b _08105ADC
 	.align 2, 0
-_08105ACC: .4byte gUnknown_844E850
+_08105ACC: .4byte gPokedexEntries
 _08105AD0: .4byte 0x000186a0
 _08105AD4: .4byte 0x000011b8
 _08105AD8:
@@ -6825,7 +6825,7 @@ sub_8105CB0: @ 8105CB0
 	lsls r0, 24
 	cmp r0, 0
 	beq _08105D5C
-	ldr r1, _08105D44 @ =gUnknown_844E850
+	ldr r1, _08105D44 @ =gPokedexEntries
 	lsls r0, r4, 3
 	adds r0, r4
 	lsls r0, 2
@@ -6876,7 +6876,7 @@ sub_8105CB0: @ 8105CB0
 	lsrs r5, r0, 24
 	b _08105D4A
 	.align 2, 0
-_08105D44: .4byte gUnknown_844E850
+_08105D44: .4byte gPokedexEntries
 _08105D48:
 	movs r5, 0
 _08105D4A:
@@ -7874,7 +7874,7 @@ _08106534:
 	adds r0, r1
 	lsls r0, 2
 	add r0, r10
-	ldr r1, _081066C8 @ =gUnknown_844E850
+	ldr r1, _081066C8 @ =gPokedexEntries
 	ldr r2, [sp, 0x18]
 	lsls r4, r2, 3
 	adds r4, r2
@@ -7979,7 +7979,7 @@ _081066B8: .4byte gUnknown_203ACF0
 _081066BC: .4byte gUnknown_8452368
 _081066C0: .4byte 0x0000ffff
 _081066C4: .4byte gSprites
-_081066C8: .4byte gUnknown_844E850
+_081066C8: .4byte gPokedexEntries
 _081066CC: .4byte gSaveBlock2Ptr
 _081066D0:
 	ldr r0, [r7]
diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s
index ac1f2a017..cb87652fa 100644
--- a/asm/pokemon_size_record.s
+++ b/asm/pokemon_size_record.s
@@ -128,7 +128,7 @@ GetMonSize: @ 80A0770
 	lsls r0, 16
 	lsrs r0, 16
 	movs r1, 0
-	bl sub_8088E38
+	bl GetPokedexHeightWeight
 	lsls r0, 16
 	lsrs r7, r0, 16
 	adds r0, r6, 0
diff --git a/asm/save_menu_util.s b/asm/save_menu_util.s
index 129d08921..2d2866914 100644
--- a/asm/save_menu_util.s
+++ b/asm/save_menu_util.s
@@ -59,11 +59,11 @@ _080F8034:
 	cmp r0, 0
 	beq _080F8044
 	movs r0, 0x1
-	bl pokedex_count
+	bl GetNationalPokedexCount
 	b _080F804A
 _080F8044:
 	movs r0, 0x1
-	bl sub_8088EDC
+	bl GetKantoPokedexCount
 _080F804A:
 	adds r1, r0, 0
 	lsls r1, 16
diff --git a/asm/start_menu.s b/asm/start_menu.s
index f7ea9a712..40a678a01 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -820,7 +820,7 @@ sub_806F3CC: @ 806F3CC
 	cmp r1, r0
 	bne _0806F408
 	movs r0, 0
-	bl pokedex_count
+	bl GetNationalPokedexCount
 	lsls r0, 16
 	cmp r0, 0
 	bne _0806F408
diff --git a/asm/tileset_anims.s b/asm/tileset_anims.s
deleted file mode 100644
index 693962d39..000000000
--- a/asm/tileset_anims.s
+++ /dev/null
@@ -1,667 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start ResetTilesetAnimBuffer
-ResetTilesetAnimBuffer: @ 806FED8
-	push {lr}
-	sub sp, 0x4
-	ldr r1, _0806FEF8 @ =gUnknown_3000FAC
-	movs r0, 0
-	strb r0, [r1]
-	movs r0, 0
-	str r0, [sp]
-	ldr r1, _0806FEFC @ =gUnknown_2037108
-	ldr r2, _0806FF00 @ =0x0500003c
-	mov r0, sp
-	bl CpuSet
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806FEF8: .4byte gUnknown_3000FAC
-_0806FEFC: .4byte gUnknown_2037108
-_0806FF00: .4byte 0x0500003c
-	thumb_func_end ResetTilesetAnimBuffer
-
-	thumb_func_start AppendTilesetAnimToBuffer
-AppendTilesetAnimToBuffer: @ 806FF04
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r2, 16
-	lsrs r6, r2, 16
-	ldr r3, _0806FF4C @ =gUnknown_3000FAC
-	ldrb r0, [r3]
-	cmp r0, 0x13
-	bhi _0806FF44
-	ldr r2, _0806FF50 @ =gUnknown_2037108
-	adds r1, r0, 0
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	str r4, [r0]
-	ldrb r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r2, 0x4
-	adds r0, r1
-	str r5, [r0]
-	ldrb r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	strh r6, [r0, 0x8]
-	ldrb r0, [r3]
-	adds r0, 0x1
-	strb r0, [r3]
-_0806FF44:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806FF4C: .4byte gUnknown_3000FAC
-_0806FF50: .4byte gUnknown_2037108
-	thumb_func_end AppendTilesetAnimToBuffer
-
-	thumb_func_start TransferTilesetAnimsBuffer
-TransferTilesetAnimsBuffer: @ 806FF54
-	push {r4-r6,lr}
-	movs r3, 0
-	ldr r4, _0806FF90 @ =gUnknown_3000FAC
-	adds r6, r4, 0
-	ldrb r0, [r4]
-	cmp r3, r0
-	bge _0806FF86
-	ldr r2, _0806FF94 @ =0x040000d4
-	ldr r1, _0806FF98 @ =gUnknown_2037108
-	movs r5, 0x80
-	lsls r5, 24
-_0806FF6A:
-	ldr r0, [r1]
-	str r0, [r2]
-	ldr r0, [r1, 0x4]
-	str r0, [r2, 0x4]
-	ldrh r0, [r1, 0x8]
-	lsrs r0, 1
-	orrs r0, r5
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	adds r1, 0xC
-	adds r3, 0x1
-	ldrb r0, [r4]
-	cmp r3, r0
-	blt _0806FF6A
-_0806FF86:
-	movs r0, 0
-	strb r0, [r6]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0806FF90: .4byte gUnknown_3000FAC
-_0806FF94: .4byte 0x040000d4
-_0806FF98: .4byte gUnknown_2037108
-	thumb_func_end TransferTilesetAnimsBuffer
-
-	thumb_func_start cur_mapheader_run_tileset_funcs_after_some_cpuset
-cur_mapheader_run_tileset_funcs_after_some_cpuset: @ 806FF9C
-	push {lr}
-	bl ResetTilesetAnimBuffer
-	bl cur_mapheader_run_tileset1_func
-	bl cur_mapheader_run_tileset2_func
-	pop {r0}
-	bx r0
-	thumb_func_end cur_mapheader_run_tileset_funcs_after_some_cpuset
-
-	thumb_func_start sub_806FFB0
-sub_806FFB0: @ 806FFB0
-	push {lr}
-	bl cur_mapheader_run_tileset2_func
-	pop {r0}
-	bx r0
-	thumb_func_end sub_806FFB0
-
-	thumb_func_start sub_806FFBC
-sub_806FFBC: @ 806FFBC
-	push {r4,lr}
-	bl ResetTilesetAnimBuffer
-	ldr r2, _08070014 @ =sPrimaryTilesetCBCounter
-	ldrh r0, [r2]
-	adds r0, 0x1
-	strh r0, [r2]
-	ldr r1, _08070018 @ =sPrimaryTilesetCBBufferSize
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r1]
-	cmp r0, r1
-	bcc _0806FFDA
-	movs r0, 0
-	strh r0, [r2]
-_0806FFDA:
-	ldr r4, _0807001C @ =sSecondaryTilesetCBCounter
-	ldrh r0, [r4]
-	adds r0, 0x1
-	strh r0, [r4]
-	ldr r1, _08070020 @ =sSecondaryTilesetCBBufferSize
-	lsls r0, 16
-	lsrs r0, 16
-	ldrh r1, [r1]
-	cmp r0, r1
-	bcc _0806FFF2
-	movs r0, 0
-	strh r0, [r4]
-_0806FFF2:
-	ldr r0, _08070024 @ =sPrimaryTilesetCB
-	ldr r1, [r0]
-	cmp r1, 0
-	beq _08070000
-	ldrh r0, [r2]
-	bl _call_via_r1
-_08070000:
-	ldr r0, _08070028 @ =sSecondaryTilesetCB
-	ldr r1, [r0]
-	cmp r1, 0
-	beq _0807000E
-	ldrh r0, [r4]
-	bl _call_via_r1
-_0807000E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08070014: .4byte sPrimaryTilesetCBCounter
-_08070018: .4byte sPrimaryTilesetCBBufferSize
-_0807001C: .4byte sSecondaryTilesetCBCounter
-_08070020: .4byte sSecondaryTilesetCBBufferSize
-_08070024: .4byte sPrimaryTilesetCB
-_08070028: .4byte sSecondaryTilesetCB
-	thumb_func_end sub_806FFBC
-
-	thumb_func_start cur_mapheader_run_tileset1_func
-cur_mapheader_run_tileset1_func: @ 807002C
-	push {lr}
-	ldr r0, _08070058 @ =sPrimaryTilesetCBCounter
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, _0807005C @ =sPrimaryTilesetCBBufferSize
-	strh r1, [r0]
-	ldr r1, _08070060 @ =sPrimaryTilesetCB
-	movs r0, 0
-	str r0, [r1]
-	ldr r0, _08070064 @ =gMapHeader
-	ldr r0, [r0]
-	ldr r0, [r0, 0x10]
-	cmp r0, 0
-	beq _08070052
-	ldr r0, [r0, 0x10]
-	cmp r0, 0
-	beq _08070052
-	bl _call_via_r0
-_08070052:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08070058: .4byte sPrimaryTilesetCBCounter
-_0807005C: .4byte sPrimaryTilesetCBBufferSize
-_08070060: .4byte sPrimaryTilesetCB
-_08070064: .4byte gMapHeader
-	thumb_func_end cur_mapheader_run_tileset1_func
-
-	thumb_func_start cur_mapheader_run_tileset2_func
-cur_mapheader_run_tileset2_func: @ 8070068
-	push {lr}
-	ldr r0, _08070094 @ =sSecondaryTilesetCBCounter
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, _08070098 @ =sSecondaryTilesetCBBufferSize
-	strh r1, [r0]
-	ldr r1, _0807009C @ =sSecondaryTilesetCB
-	movs r0, 0
-	str r0, [r1]
-	ldr r0, _080700A0 @ =gMapHeader
-	ldr r0, [r0]
-	ldr r0, [r0, 0x14]
-	cmp r0, 0
-	beq _0807008E
-	ldr r0, [r0, 0x10]
-	cmp r0, 0
-	beq _0807008E
-	bl _call_via_r0
-_0807008E:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08070094: .4byte sSecondaryTilesetCBCounter
-_08070098: .4byte sSecondaryTilesetCBBufferSize
-_0807009C: .4byte sSecondaryTilesetCB
-_080700A0: .4byte gMapHeader
-	thumb_func_end cur_mapheader_run_tileset2_func
-
-	thumb_func_start sub_80700A4
-sub_80700A4: @ 80700A4
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r4, _080700C8 @ =gUnknown_83A7660
-	movs r1, 0x5
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 14
-	adds r0, r4
-	ldr r0, [r0]
-	ldr r1, _080700CC @ =0x06003f80
-	movs r2, 0x80
-	bl AppendTilesetAnimToBuffer
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080700C8: .4byte gUnknown_83A7660
-_080700CC: .4byte 0x06003f80
-	thumb_func_end sub_80700A4
-
-	thumb_func_start sub_80700D0
-sub_80700D0: @ 80700D0
-	push {lr}
-	lsls r0, 16
-	ldr r2, _080700F0 @ =gUnknown_83AA654
-	movs r1, 0xE0
-	lsls r1, 11
-	ands r1, r0
-	lsrs r1, 14
-	adds r1, r2
-	ldr r0, [r1]
-	ldr r1, _080700F4 @ =0x06003400
-	movs r2, 0xC0
-	lsls r2, 3
-	bl AppendTilesetAnimToBuffer
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080700F0: .4byte gUnknown_83AA654
-_080700F4: .4byte 0x06003400
-	thumb_func_end sub_80700D0
-
-	thumb_func_start sub_80700F8
-sub_80700F8: @ 80700F8
-	push {lr}
-	lsls r0, 16
-	ldr r2, _08070118 @ =gUnknown_83AB874
-	movs r1, 0xE0
-	lsls r1, 11
-	ands r1, r0
-	lsrs r1, 14
-	adds r1, r2
-	ldr r0, [r1]
-	ldr r1, _0807011C @ =0x06003a00
-	movs r2, 0x90
-	lsls r2, 2
-	bl AppendTilesetAnimToBuffer
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08070118: .4byte gUnknown_83AB874
-_0807011C: .4byte 0x06003a00
-	thumb_func_end sub_80700F8
-
-	thumb_func_start sub_8070120
-sub_8070120: @ 8070120
-	push {r4-r6,lr}
-	lsls r5, r0, 16
-	lsrs r6, r5, 16
-	movs r0, 0x7
-	ands r0, r6
-	cmp r0, 0
-	bne _08070134
-	lsrs r0, r5, 19
-	bl sub_80700F8
-_08070134:
-	movs r4, 0xF
-	ands r4, r6
-	cmp r4, 0x1
-	bne _08070142
-	lsrs r0, r5, 20
-	bl sub_80700D0
-_08070142:
-	cmp r4, 0x2
-	bne _0807014C
-	lsrs r0, r5, 20
-	bl sub_80700A4
-_0807014C:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8070120
-
-	thumb_func_start sub_8070154
-sub_8070154: @ 8070154
-	ldr r1, _0807016C @ =sPrimaryTilesetCBCounter
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, _08070170 @ =sPrimaryTilesetCBBufferSize
-	movs r2, 0xA0
-	lsls r2, 2
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, _08070174 @ =sPrimaryTilesetCB
-	ldr r0, _08070178 @ =sub_8070120
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_0807016C: .4byte sPrimaryTilesetCBCounter
-_08070170: .4byte sPrimaryTilesetCBBufferSize
-_08070174: .4byte sPrimaryTilesetCB
-_08070178: .4byte sub_8070120
-	thumb_func_end sub_8070154
-
-	thumb_func_start sub_807017C
-sub_807017C: @ 807017C
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r4, _080701A4 @ =gUnknown_83ABDB4
-	movs r1, 0x5
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 14
-	adds r0, r4
-	ldr r0, [r0]
-	ldr r1, _080701A8 @ =0x06005d00
-	movs r2, 0x80
-	lsls r2, 1
-	bl AppendTilesetAnimToBuffer
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080701A4: .4byte gUnknown_83ABDB4
-_080701A8: .4byte 0x06005d00
-	thumb_func_end sub_807017C
-
-	thumb_func_start sub_80701AC
-sub_80701AC: @ 80701AC
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	movs r1, 0xC
-	bl __umodsi3
-	lsls r0, 16
-	cmp r0, 0
-	bne _080701D0
-	adds r0, r4, 0
-	movs r1, 0xC
-	bl __udivsi3
-	lsls r0, 16
-	lsrs r0, 16
-	bl sub_807017C
-_080701D0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80701AC
-
-	thumb_func_start sub_80701D8
-sub_80701D8: @ 80701D8
-	ldr r1, _080701EC @ =sSecondaryTilesetCBCounter
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, _080701F0 @ =sSecondaryTilesetCBBufferSize
-	movs r0, 0x78
-	strh r0, [r1]
-	ldr r1, _080701F4 @ =sSecondaryTilesetCB
-	ldr r0, _080701F8 @ =sub_80701AC
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_080701EC: .4byte sSecondaryTilesetCBCounter
-_080701F0: .4byte sSecondaryTilesetCBBufferSize
-_080701F4: .4byte sSecondaryTilesetCB
-_080701F8: .4byte sub_80701AC
-	thumb_func_end sub_80701D8
-
-	thumb_func_start sub_80701FC
-sub_80701FC: @ 80701FC
-	push {lr}
-	lsls r0, 16
-	ldr r2, _0807021C @ =gUnknown_83AC1E8
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	lsrs r1, 14
-	adds r1, r2
-	ldr r0, [r1]
-	ldr r1, _08070220 @ =0x06007a00
-	movs r2, 0x80
-	lsls r2, 1
-	bl AppendTilesetAnimToBuffer
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0807021C: .4byte gUnknown_83AC1E8
-_08070220: .4byte 0x06007a00
-	thumb_func_end sub_80701FC
-
-	thumb_func_start sub_8070224
-sub_8070224: @ 8070224
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r4, 0
-	movs r1, 0xA
-	bl __umodsi3
-	lsls r0, 16
-	cmp r0, 0
-	bne _08070248
-	adds r0, r4, 0
-	movs r1, 0xA
-	bl __udivsi3
-	lsls r0, 16
-	lsrs r0, 16
-	bl sub_80701FC
-_08070248:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8070224
-
-	thumb_func_start sub_8070250
-sub_8070250: @ 8070250
-	ldr r1, _08070264 @ =sSecondaryTilesetCBCounter
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, _08070268 @ =sSecondaryTilesetCBBufferSize
-	movs r0, 0xA0
-	strh r0, [r1]
-	ldr r1, _0807026C @ =sSecondaryTilesetCB
-	ldr r0, _08070270 @ =sub_8070224
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_08070264: .4byte sSecondaryTilesetCBCounter
-_08070268: .4byte sSecondaryTilesetCBBufferSize
-_0807026C: .4byte sSecondaryTilesetCB
-_08070270: .4byte sub_8070224
-	thumb_func_end sub_8070250
-
-	thumb_func_start sub_8070274
-sub_8070274: @ 8070274
-	push {lr}
-	lsls r0, 16
-	ldr r2, _08070294 @ =gUnknown_83AC5F8
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	lsrs r1, 14
-	adds r1, r2
-	ldr r0, [r1]
-	ldr r1, _08070298 @ =0x06007000
-	movs r2, 0x80
-	lsls r2, 1
-	bl AppendTilesetAnimToBuffer
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08070294: .4byte gUnknown_83AC5F8
-_08070298: .4byte 0x06007000
-	thumb_func_end sub_8070274
-
-	thumb_func_start sub_807029C
-sub_807029C: @ 807029C
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xF0
-	lsls r0, 12
-	ands r0, r1
-	cmp r0, 0
-	bne _080702B0
-	lsrs r0, r1, 20
-	bl sub_8070274
-_080702B0:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_807029C
-
-	thumb_func_start sub_80702B4
-sub_80702B4: @ 80702B4
-	ldr r1, _080702CC @ =sSecondaryTilesetCBCounter
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, _080702D0 @ =sSecondaryTilesetCBBufferSize
-	movs r2, 0x80
-	lsls r2, 1
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, _080702D4 @ =sSecondaryTilesetCB
-	ldr r0, _080702D8 @ =sub_807029C
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_080702CC: .4byte sSecondaryTilesetCBCounter
-_080702D0: .4byte sSecondaryTilesetCBBufferSize
-_080702D4: .4byte sSecondaryTilesetCB
-_080702D8: .4byte sub_807029C
-	thumb_func_end sub_80702B4
-
-	thumb_func_start sub_80702DC
-sub_80702DC: @ 80702DC
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x1
-	ands r0, r1
-	ldr r1, _080702FC @ =gUnknown_83AC7C8
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	ldr r1, _08070300 @ =0x06006e00
-	movs r2, 0xE0
-	bl AppendTilesetAnimToBuffer
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080702FC: .4byte gUnknown_83AC7C8
-_08070300: .4byte 0x06006e00
-	thumb_func_end sub_80702DC
-
-	thumb_func_start sub_8070304
-sub_8070304: @ 8070304
-	push {lr}
-	lsls r2, r0, 16
-	lsrs r0, r2, 16
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _08070318
-	lsrs r0, r2, 17
-	bl sub_80702DC
-_08070318:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8070304
-
-	thumb_func_start sub_807031C
-sub_807031C: @ 807031C
-	ldr r1, _08070330 @ =sSecondaryTilesetCBCounter
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, _08070334 @ =sSecondaryTilesetCBBufferSize
-	movs r0, 0xF0
-	strh r0, [r1]
-	ldr r1, _08070338 @ =sSecondaryTilesetCB
-	ldr r0, _0807033C @ =sub_8070304
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_08070330: .4byte sSecondaryTilesetCBCounter
-_08070334: .4byte sSecondaryTilesetCBBufferSize
-_08070338: .4byte sSecondaryTilesetCB
-_0807033C: .4byte sub_8070304
-	thumb_func_end sub_807031C
-
-	thumb_func_start sub_8070340
-sub_8070340: @ 8070340
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r0
-	ldr r0, _08070360 @ =gUnknown_83AC950
-	lsrs r1, 14
-	adds r1, r0
-	ldr r0, [r1]
-	ldr r1, _08070364 @ =0x06005c60
-	movs r2, 0x80
-	bl AppendTilesetAnimToBuffer
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08070360: .4byte gUnknown_83AC950
-_08070364: .4byte 0x06005c60
-	thumb_func_end sub_8070340
-
-	thumb_func_start sub_8070368
-sub_8070368: @ 8070368
-	push {lr}
-	lsls r1, r0, 16
-	movs r0, 0xF0
-	lsls r0, 12
-	ands r0, r1
-	cmp r0, 0
-	bne _0807037C
-	lsrs r0, r1, 20
-	bl sub_8070340
-_0807037C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8070368
-
-	thumb_func_start sub_8070380
-sub_8070380: @ 8070380
-	ldr r1, _08070398 @ =sSecondaryTilesetCBCounter
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, _0807039C @ =sSecondaryTilesetCBBufferSize
-	movs r2, 0x80
-	lsls r2, 1
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r1, _080703A0 @ =sSecondaryTilesetCB
-	ldr r0, _080703A4 @ =sub_8070368
-	str r0, [r1]
-	bx lr
-	.align 2, 0
-_08070398: .4byte sSecondaryTilesetCBCounter
-_0807039C: .4byte sSecondaryTilesetCBBufferSize
-_080703A0: .4byte sSecondaryTilesetCB
-_080703A4: .4byte sub_8070368
-	thumb_func_end sub_8070380
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index a964b02c8..234e19676 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -973,7 +973,7 @@ _080897EE:
 	ldr r0, _08089890 @ =0x00000829
 	bl FlagGet
 	strb r0, [r5, 0x2]
-	bl sub_8088F24
+	bl HasAllHoennMons
 	strb r0, [r5, 0x3]
 	bl sub_808A0E0
 	strh r0, [r5, 0xC]
@@ -1062,7 +1062,7 @@ _080898BA:
 	mov r0, r8
 	strb r0, [r5, 0x1]
 _080898BE:
-	bl sub_8088F58
+	bl HasAllKantoMons
 	lsls r0, 16
 	cmp r0, 0
 	beq _080898CE
@@ -1070,7 +1070,7 @@ _080898BE:
 	adds r0, 0x1
 	strb r0, [r5, 0x1]
 _080898CE:
-	bl HasAllKantoMons
+	bl HasAllMons
 	lsls r0, 16
 	cmp r0, 0
 	beq _080898DE
@@ -1115,9 +1115,9 @@ _08089918:
 	movs r0, 0x1
 	strb r0, [r5, 0x1]
 _0808991C:
-	bl sub_8088F58
-	strb r0, [r5, 0x3]
 	bl HasAllKantoMons
+	strb r0, [r5, 0x3]
+	bl HasAllMons
 	adds r6, r5, 0
 	adds r6, 0x4D
 	strb r0, [r6]
@@ -2043,11 +2043,11 @@ sub_808A0E0: @ 808A0E0
 	cmp r0, 0
 	bne _0808A0F2
 	movs r0, 0x1
-	bl sub_8088EDC
+	bl GetKantoPokedexCount
 	b _0808A0F8
 _0808A0F2:
 	movs r0, 0x1
-	bl pokedex_count
+	bl GetNationalPokedexCount
 _0808A0F8:
 	lsls r0, 16
 	lsrs r0, 16