fix: rm asm/diploma.s

author: dheu <gwimminus@gmail.com> 2019-07-10 14:50:54 +0800
committer: dheu <gwimminus@gmail.com> 2019-07-10 14:50:54 +0800
commit: da593ec33d7b59af1bd125638d5271c64c11c6e7 (patch)
tree: a0e81df26c77c974c5643cb4dbc63ea3558848d9 /asm
parent: 8fe7ed27febc86f61735b1395ebb5924d7607809 (diff)
parent: 39d68ebd445be5657a916dec1b4872717e9c40d3 (diff)
37 files changed, 306 insertions, 4343 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s
index 0826ea927..ee7b80ad4 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -13497,7 +13497,7 @@ sub_8016AC0: @ 8016AC0
 	strh r1, [r0]
 	ldr r0, _08016B08 @ =gBattle_BG0_Y
 	strh r1, [r0]
-	ldr r1, _08016B0C @ =gUnknown_2039994
+	ldr r1, _08016B0C @ =gNumSafariBalls
 	ldrb r0, [r1]
 	subs r0, 0x1
 	strb r0, [r1]
@@ -13518,7 +13518,7 @@ _08016AFC: .4byte gUnknown_2023BDE
 _08016B00: .4byte gUnknown_2023BE2
 _08016B04: .4byte gBattle_BG0_X
 _08016B08: .4byte gBattle_BG0_Y
-_08016B0C: .4byte gUnknown_2039994
+_08016B0C: .4byte gNumSafariBalls
 _08016B10: .4byte gUnknown_2023D68
 _08016B14: .4byte gUnknown_2023D74
 _08016B18: .4byte gUnknown_81D99B0
diff --git a/asm/battle_interface.s b/asm/battle_interface.s
index fa06f684b..acf228669 100644
--- a/asm/battle_interface.s
+++ b/asm/battle_interface.s
@@ -4307,7 +4307,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
 	ldr r1, _08049D84 @ =gUnknown_83FE81C
 	mov r0, sp
 	bl StringCopy
-	ldr r1, _08049D88 @ =gUnknown_2039994
+	ldr r1, _08049D88 @ =gNumSafariBalls
 	ldrb r1, [r1]
 	movs r2, 0
 	movs r3, 0x2
@@ -4351,7 +4351,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
 	bx r0
 	.align 2, 0
 _08049D84: .4byte gUnknown_83FE81C
-_08049D88: .4byte gUnknown_2039994
+_08049D88: .4byte gNumSafariBalls
 _08049D8C: .4byte gSprites
 _08049D90: .4byte 0x060102c0
 _08049D94: .4byte 0x06010a00
diff --git a/asm/battle_records.s b/asm/battle_records.s
index e48a0025e..d0a99b4cf 100644
--- a/asm/battle_records.s
+++ b/asm/battle_records.s
@@ -287,7 +287,7 @@ sub_80CD460: @ 80CD460
 	ands r0, r1
 	cmp r0, 0
 	bne _080CD490
-	ldr r0, _080CD49C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _080CD49C @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	ldr r0, _080CD4A0 @ =gUnknown_2039A1C
 	ldr r0, [r0]
@@ -303,7 +303,7 @@ _080CD490:
 	bx r0
 	.align 2, 0
 _080CD498: .4byte gPaletteFade
-_080CD49C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_080CD49C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _080CD4A0: .4byte gUnknown_2039A1C
 	thumb_func_end sub_80CD460
 
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s
index 60b06f8a6..b240c3da2 100644
--- a/asm/battle_script_commands.s
+++ b/asm/battle_script_commands.s
@@ -17903,7 +17903,7 @@ PutMonIconOnLvlUpBox: @ 8026688
 	orrs r0, r1
 	str r0, [sp, 0x4]
 	adds r0, r4, 0
-	bl sub_80971CC
+	bl GetValidMonIconPalettePtr
 	str r0, [sp, 0x8]
 	add r4, sp, 0x8
 	ldr r0, [r4, 0x4]
diff --git a/asm/battle_setup.s b/asm/battle_setup.s
index a13c1a418..db8b366b4 100644
--- a/asm/battle_setup.s
+++ b/asm/battle_setup.s
@@ -46,7 +46,7 @@ _0807F65E:
 	ldr r0, _0807F68C @ =sub_800FD9C
 	bl SetMainCallback2
 	bl sub_806D7E8
-	bl overworld_poison_timer_set
+	bl ClearPoisonStepCounter
 	adds r0, r5, 0
 	bl DestroyTask
 _0807F686:
@@ -221,7 +221,7 @@ sub_807F7D8: @ 807F7D8
 	bl player_bitmagic
 	bl sub_805C780
 	ldr r1, _0807F804 @ =gMain
-	ldr r0, _0807F808 @ =sub_80A0F4C
+	ldr r0, _0807F808 @ =CB2_EndSafariBattle
 	str r0, [r1, 0x8]
 	ldr r1, _0807F80C @ =gBattleTypeFlags
 	movs r0, 0x80
@@ -235,7 +235,7 @@ sub_807F7D8: @ 807F7D8
 	bx r0
 	.align 2, 0
 _0807F804: .4byte gMain
-_0807F808: .4byte sub_80A0F4C
+_0807F808: .4byte CB2_EndSafariBattle
 _0807F80C: .4byte gBattleTypeFlags
 	thumb_func_end sub_807F7D8
 
@@ -300,7 +300,7 @@ sub_807F888: @ 807F888
 	bl CreateMaleMon
 	bl ScriptContext2_Enable
 	ldr r1, _0807F8B8 @ =gMain
-	ldr r0, _0807F8BC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _0807F8BC @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	str r0, [r1, 0x8]
 	ldr r1, _0807F8C0 @ =gBattleTypeFlags
 	movs r0, 0x80
@@ -314,7 +314,7 @@ sub_807F888: @ 807F888
 	.align 2, 0
 _0807F8B4: .4byte gEnemyParty
 _0807F8B8: .4byte gMain
-_0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_0807F8BC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _0807F8C0: .4byte gBattleTypeFlags
 	thumb_func_end sub_807F888
 
@@ -679,14 +679,14 @@ _0807FBD4: .4byte 0x01000100
 _0807FBD8: .4byte gBattleOutcome
 _0807FBDC: .4byte c2_whiteout
 _0807FBE0:
-	ldr r0, _0807FBEC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _0807FBEC @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 _0807FBE6:
 	add sp, 0x4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0807FBEC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_0807FBEC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_807FBA0
 
 	thumb_func_start sub_807FBF0
@@ -731,7 +731,7 @@ _0807FC40:
 	movs r0, 0x1
 	strh r0, [r1]
 _0807FC46:
-	ldr r0, _0807FC58 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _0807FC58 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 _0807FC4C:
 	add sp, 0x4
@@ -740,7 +740,7 @@ _0807FC4C:
 	bx r0
 	.align 2, 0
 _0807FC54: .4byte gSpecialVar_Result
-_0807FC58: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_0807FC58: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_807FBF0
 
 	thumb_func_start sub_807FC5C
@@ -1878,14 +1878,14 @@ _080804E8:
 	movs r1, 0
 	strh r1, [r0]
 _080804EE:
-	ldr r0, _08080504 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _08080504 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	bl sub_80803FC
 	bl sub_81139BC
 	b _0808054E
 	.align 2, 0
 _08080500: .4byte gSpecialVar_Result
-_08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_08080504: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _08080508:
 	ldr r0, _0808051C @ =gTrainerBattleOpponent_A
 	ldrh r1, [r0]
@@ -1893,12 +1893,12 @@ _08080508:
 	lsls r0, 3
 	cmp r1, r0
 	bne _08080524
-	ldr r0, _08080520 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _08080520 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	b _0808054E
 	.align 2, 0
 _0808051C: .4byte gTrainerBattleOpponent_A
-_08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_08080520: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _08080524:
 	ldr r0, _08080538 @ =gBattleOutcome
 	ldrb r0, [r0]
@@ -1913,7 +1913,7 @@ _08080530:
 _08080538: .4byte gBattleOutcome
 _0808053C: .4byte c2_whiteout
 _08080540:
-	ldr r0, _08080554 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _08080554 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	bl sub_80803FC
 	bl sub_81139BC
@@ -1921,7 +1921,7 @@ _0808054E:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08080554: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_08080554: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_80804AC
 
 	thumb_func_start sub_8080558
@@ -1933,12 +1933,12 @@ sub_8080558: @ 8080558
 	lsls r0, 3
 	cmp r1, r0
 	bne _08080578
-	ldr r0, _08080574 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _08080574 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	b _080805A6
 	.align 2, 0
 _08080570: .4byte gTrainerBattleOpponent_A
-_08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_08080574: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _08080578:
 	ldr r0, _0808058C @ =gBattleOutcome
 	ldrb r0, [r0]
@@ -1952,7 +1952,7 @@ _08080578:
 _0808058C: .4byte gBattleOutcome
 _08080590: .4byte c2_whiteout
 _08080594:
-	ldr r0, _080805AC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _080805AC @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	bl sub_80803FC
 	bl sub_810CDE8
@@ -1961,7 +1961,7 @@ _080805A6:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080805AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_080805AC: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_8080558
 
 	thumb_func_start sub_80805B0
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 503a6343e..01ac780a2 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -2010,14 +2010,14 @@ _080E68A8: .4byte gPlayerParty
 _080E68AC:
 	bl sub_80E7550
 _080E68B0:
-	ldr r0, _080E68C0 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _080E68C0 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	add sp, 0x4
 	pop {r4-r6}
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080E68C0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_080E68C0: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_80E6854
 
 	thumb_func_start sub_80E68C4
diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s
index 716967e65..581b84793 100644
--- a/asm/berry_crush_3.s
+++ b/asm/berry_crush_3.s
@@ -1265,7 +1265,7 @@ _0814DFE0:
 	adds r4, r2, r4
 	str r4, [sp, 0x2C]
 _0814DFF0:
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r0, [sp, 0x10]
 	cmp r0, 0x1
 	beq _0814E0E4
@@ -1610,10 +1610,10 @@ _0814E2B8:
 	ldr r0, [sp, 0xC]
 	adds r1, r0, r1
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r0, _0814E324 @ =gStringVar4
 	adds r1, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	ldr r1, [sp, 0x2C]
 	ldrb r0, [r1]
 	mov r2, r9
diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s
index 6aaa9ba76..8eb127d52 100644
--- a/asm/berry_pouch.s
+++ b/asm/berry_pouch.s
@@ -1409,7 +1409,7 @@ sub_813D844: @ 813D844
 	ldr r4, _0813D884 @ =gUnknown_203F37A
 	subs r2, r4, 0x2
 	adds r1, r4, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldr r0, _0813D888 @ =gUnknown_203F36C
 	ldr r0, [r0]
 	ldr r0, [r0]
@@ -1688,7 +1688,7 @@ _0813DA90:
 	b _0813DB9E
 _0813DA9E:
 	ldrb r0, [r7]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	adds r5, r0, 0
 	ldrb r0, [r7]
 	ldr r4, _0813DAE0 @ =gUnknown_203F37A
@@ -2504,7 +2504,7 @@ _0813E18A:
 	ldr r4, _0813E1F8 @ =gUnknown_203F37A
 	subs r2, r4, 0x2
 	adds r1, r4, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	bl sub_813D8AC
 	bl sub_813D6F4
 	bl sub_813D204
@@ -2646,7 +2646,7 @@ sub_813E2B8: @ 813E2B8
 	ldr r4, _0813E318 @ =gUnknown_203F37A
 	subs r2, r4, 0x2
 	adds r1, r4, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	bl sub_813D8AC
 	bl sub_813D6F4
 	bl sub_813D204
@@ -3277,7 +3277,7 @@ sub_813E7F0: @ 813E7F0
 	ldr r4, _0813E8C8 @ =gUnknown_203F37A
 	subs r2, r4, 0x2
 	adds r1, r4, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	bl sub_813D8AC
 	bl sub_813D6F4
 	bl sub_813D204
diff --git a/asm/buy_menu_helpers.s b/asm/buy_menu_helpers.s
deleted file mode 100644
index 1eba8e42e..000000000
--- a/asm/buy_menu_helpers.s
+++ /dev/null
@@ -1,220 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_813F66C
-sub_813F66C: @ 813F66C
-	push {r4,lr}
-	adds r4, r0, 0
-	cmp r4, 0x1
-	beq _0813F680
-	ldr r0, _0813F67C @ =gUnknown_8464804
-	bl InitWindows
-	b _0813F686
-	.align 2, 0
-_0813F67C: .4byte gUnknown_8464804
-_0813F680:
-	ldr r0, _0813F6CC @ =gUnknown_846483C
-	bl InitWindows
-_0813F686:
-	bl DeactivateAllTextPrinters
-	movs r0, 0
-	movs r1, 0x1
-	movs r2, 0xD0
-	bl TextWindow_SetUserSelectedFrame
-	movs r0, 0
-	movs r1, 0x13
-	movs r2, 0xE0
-	bl TextWindow_LoadResourcesStdFrame0
-	movs r0, 0
-	movs r1, 0xA
-	movs r2, 0xF0
-	bl TextWindow_SetStdFrame0_WithPal
-	movs r0, 0
-	bl PutWindowTilemap
-	movs r0, 0x4
-	bl PutWindowTilemap
-	movs r0, 0x5
-	bl PutWindowTilemap
-	cmp r4, 0x1
-	bne _0813F6C4
-	movs r0, 0x6
-	bl PutWindowTilemap
-_0813F6C4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813F6CC: .4byte gUnknown_846483C
-	thumb_func_end sub_813F66C
-
-	thumb_func_start sub_813F6D0
-sub_813F6D0: @ 813F6D0
-	push {lr}
-	ldr r0, _0813F6F0 @ =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0xA4
-	lsls r1, 2
-	adds r0, r1
-	bl GetMoney
-	adds r3, r0, 0
-	movs r0, 0
-	movs r1, 0xA
-	movs r2, 0xF
-	bl PrintMoneyAmountInMoneyBoxWithBorder
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813F6F0: .4byte gSaveBlock1Ptr
-	thumb_func_end sub_813F6D0
-
-	thumb_func_start sub_813F6F4
-sub_813F6F4: @ 813F6F4
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x14
-	mov r9, r3
-	ldr r3, [sp, 0x30]
-	ldr r4, [sp, 0x34]
-	ldr r6, [sp, 0x38]
-	ldr r5, [sp, 0x3C]
-	mov r8, r5
-	ldr r5, [sp, 0x40]
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	mov r7, r9
-	lsls r7, 24
-	lsrs r7, 24
-	mov r9, r7
-	lsls r3, 24
-	lsrs r3, 24
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r6, 24
-	lsrs r6, 24
-	lsls r5, 24
-	lsrs r5, 24
-	str r4, [sp]
-	str r6, [sp, 0x4]
-	lsls r4, r5, 1
-	adds r4, r5
-	ldr r5, _0813F758 @ =gUnknown_8464884
-	adds r4, r5
-	str r4, [sp, 0x8]
-	mov r4, r8
-	lsls r4, 24
-	asrs r4, 24
-	str r4, [sp, 0xC]
-	str r2, [sp, 0x10]
-	mov r2, r9
-	bl AddTextPrinterParameterized4
-	add sp, 0x14
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813F758: .4byte gUnknown_8464884
-	thumb_func_end sub_813F6F4
-
-	thumb_func_start sub_813F75C
-sub_813F75C: @ 813F75C
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x10
-	adds r5, r0, 0
-	adds r6, r1, 0
-	mov r8, r2
-	lsls r5, 24
-	lsrs r5, 24
-	bl sub_809B56C
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl GetTextSpeedSetting
-	lsls r0, 24
-	lsrs r0, 24
-	str r4, [sp]
-	str r0, [sp, 0x4]
-	str r6, [sp, 0x8]
-	mov r0, r8
-	str r0, [sp, 0xC]
-	adds r0, r5, 0
-	movs r1, 0x2
-	movs r2, 0x13
-	movs r3, 0xE
-	bl DisplayMessageAndContinueTask
-	movs r0, 0
-	bl ScheduleBgCopyTilemapToVram
-	add sp, 0x10
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_813F75C
-
-	thumb_func_start sub_813F7A8
-sub_813F7A8: @ 813F7A8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0x1
-	movs r3, 0xD
-	bl SetWindowBorderStyle
-	pop {r0}
-	bx r0
-	thumb_func_end sub_813F7A8
-
-	thumb_func_start sub_813F7C0
-sub_813F7C0: @ 813F7C0
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0xA
-	movs r3, 0xF
-	bl SetWindowBorderStyle
-	pop {r0}
-	bx r0
-	thumb_func_end sub_813F7C0
-
-	thumb_func_start sub_813F7D8
-sub_813F7D8: @ 813F7D8
-	push {lr}
-	sub sp, 0x10
-	adds r3, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _0813F800 @ =gUnknown_846487C
-	movs r2, 0x2
-	str r2, [sp]
-	movs r2, 0x1
-	str r2, [sp, 0x4]
-	movs r2, 0xD
-	str r2, [sp, 0x8]
-	str r3, [sp, 0xC]
-	movs r2, 0x2
-	movs r3, 0
-	bl CreateYesNoMenuWithCallbacks
-	add sp, 0x10
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813F800: .4byte gUnknown_846487C
-	thumb_func_end sub_813F7D8
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/cable_club.s b/asm/cable_club.s
index ff11c4cef..85f6243b4 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -2387,13 +2387,13 @@ sp02A_crash_sound: @ 8081A1C
 	push {lr}
 	ldr r0, _08081A2C @ =gSpecialVar_0x8006
 	ldrb r0, [r0]
-	ldr r1, _08081A30 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r1, _08081A30 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl sub_808B700
 	pop {r0}
 	bx r0
 	.align 2, 0
 _08081A2C: .4byte gSpecialVar_0x8006
-_08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_08081A30: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sp02A_crash_sound
 
 	thumb_func_start sub_8081A34
diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index 35fefbe29..13a4d95b5 100644
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -9983,7 +9983,7 @@ _08155480:
 	movs r1, 0
 	adds r2, r5, 0
 	bl AddTextPrinterParameterized
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	bl sub_8153390
 	lsls r0, 16
 	lsrs r0, 16
@@ -9992,10 +9992,10 @@ _08155480:
 	bl CopyItemName
 	movs r0, 0
 	adds r1, r5, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r1, _0815556C @ =gUnknown_841CD7A
 	add r0, sp, 0xC
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	ldr r0, [r4]
 	add r0, r10
 	ldrb r0, [r0]
@@ -10016,7 +10016,7 @@ _08155480:
 	beq _0815559E
 	cmp r4, 0x3
 	beq _0815559E
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	bl sub_8153390
 	lsls r0, 16
 	lsrs r0, 16
@@ -10024,12 +10024,12 @@ _08155480:
 	bl CopyItemName
 	movs r0, 0
 	adds r1, r5, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	cmp r4, 0x2
 	bne _08155574
 	ldr r1, _08155570 @ =gUnknown_841CD9F
 	add r0, sp, 0xC
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	b _08155580
 	.align 2, 0
 _08155558: .4byte 0x00000101
@@ -10044,7 +10044,7 @@ _08155574:
 	bne _08155580
 	ldr r1, _081555C4 @ =gUnknown_841CDBA
 	add r0, sp, 0xC
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 _08155580:
 	ldr r0, _081555C8 @ =gUnknown_203F440
 	ldr r0, [r0]
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index c6476053a..2eee6da2f 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -1817,7 +1817,7 @@ _0806D6E0: .4byte gUnknown_203ADFA
 _0806D6E4: .4byte gPlayerAvatar
 _0806D6E8: .4byte gUnknown_81A8CED
 _0806D6EC:
-	bl overworld_poison_step
+	bl DoPoisonFieldEffect_step
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1840,7 +1840,7 @@ _0806D704:
 	.align 2, 0
 _0806D71C: .4byte gUnknown_81BF546
 _0806D720:
-	bl sub_80A0F0C
+	bl SafariZoneTakeStep
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1901,8 +1901,8 @@ _0806D780: .4byte 0x00004021
 _0806D784: .4byte gPlayerParty
 	thumb_func_end AdjustFriendship_step
 
-	thumb_func_start overworld_poison_timer_set
-overworld_poison_timer_set: @ 806D788
+	thumb_func_start ClearPoisonStepCounter
+ClearPoisonStepCounter: @ 806D788
 	push {lr}
 	ldr r0, _0806D798 @ =0x00004022
 	movs r1, 0
@@ -1911,10 +1911,10 @@ overworld_poison_timer_set: @ 806D788
 	bx r0
 	.align 2, 0
 _0806D798: .4byte 0x00004022
-	thumb_func_end overworld_poison_timer_set
+	thumb_func_end ClearPoisonStepCounter
 
-	thumb_func_start overworld_poison_step
-overworld_poison_step: @ 806D79C
+	thumb_func_start DoPoisonFieldEffect_step
+DoPoisonFieldEffect_step: @ 806D79C
 	push {r4,lr}
 	ldr r0, _0806D7D8 @ =gMapHeader
 	ldrb r0, [r0, 0x17]
@@ -1933,7 +1933,7 @@ overworld_poison_step: @ 806D79C
 	lsls r0, 16
 	cmp r0, 0
 	bne _0806D7E0
-	bl overworld_poison
+	bl DoPoisonFieldEffect
 	cmp r0, 0x1
 	beq _0806D7E0
 	cmp r0, 0x1
@@ -1951,7 +1951,7 @@ _0806D7E2:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end overworld_poison_step
+	thumb_func_end DoPoisonFieldEffect_step
 
 	thumb_func_start sub_806D7E8
 sub_806D7E8: @ 806D7E8
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 3655d2830..7bd1abe80 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -2039,8 +2039,8 @@ _08084350:
 	cmp r0, 0
 	bne _08084376
 	bl sub_8054CA0
-	bl warp_in
-	ldr r0, _08084384 @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _08084384 @ =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r1, _08084388 @ =gFieldCallback
 	ldr r0, _0808438C @ =mapldr_08084390
@@ -2054,7 +2054,7 @@ _08084376:
 	.align 2, 0
 _0808437C: .4byte gTasks
 _08084380: .4byte gFieldEffectArguments
-_08084384: .4byte sub_805671C
+_08084384: .4byte CB2_LoadMap
 _08084388: .4byte gFieldCallback
 _0808438C: .4byte mapldr_08084390
 	thumb_func_end task00_8084310
@@ -2860,11 +2860,11 @@ sub_80849A0: @ 80849A0
 	cmp r0, 0x1
 	bne _080849DC
 	bl sub_809C460
-	bl warp_in
+	bl WarpIntoMap
 	ldr r1, _080849E4 @ =gFieldCallback
 	ldr r0, _080849E8 @ =sub_80849F4
 	str r0, [r1]
-	ldr r0, _080849EC @ =sub_805671C
+	ldr r0, _080849EC @ =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r0, _080849F0 @ =sub_80847C0
 	bl FindTaskIdByFunc
@@ -2878,7 +2878,7 @@ _080849DC:
 _080849E0: .4byte gPaletteFade
 _080849E4: .4byte gFieldCallback
 _080849E8: .4byte sub_80849F4
-_080849EC: .4byte sub_805671C
+_080849EC: .4byte CB2_LoadMap
 _080849F0: .4byte sub_80847C0
 	thumb_func_end sub_80849A0
 
@@ -3883,11 +3883,11 @@ sub_8085168: @ 8085168
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _080851A0
-	bl warp_in
+	bl WarpIntoMap
 	ldr r1, _080851AC @ =gFieldCallback
 	ldr r0, _080851B0 @ =mapldr_080851BC
 	str r0, [r1]
-	ldr r0, _080851B4 @ =sub_805671C
+	ldr r0, _080851B4 @ =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r0, _080851B8 @ =sub_8084F44
 	bl FindTaskIdByFunc
@@ -3902,7 +3902,7 @@ _080851A0:
 _080851A8: .4byte gPaletteFade
 _080851AC: .4byte gFieldCallback
 _080851B0: .4byte mapldr_080851BC
-_080851B4: .4byte sub_805671C
+_080851B4: .4byte CB2_LoadMap
 _080851B8: .4byte sub_8084F44
 	thumb_func_end sub_8085168
 
@@ -4388,11 +4388,11 @@ sub_808554C: @ 808554C
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _08085584
-	bl warp_in
+	bl WarpIntoMap
 	ldr r1, _08085590 @ =gFieldCallback
 	ldr r0, _08085594 @ =sub_8084454
 	str r0, [r1]
-	ldr r0, _08085598 @ =sub_805671C
+	ldr r0, _08085598 @ =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r0, _0808559C @ =sub_80853E4
 	bl FindTaskIdByFunc
@@ -4407,7 +4407,7 @@ _08085584:
 _0808558C: .4byte gPaletteFade
 _08085590: .4byte gFieldCallback
 _08085594: .4byte sub_8084454
-_08085598: .4byte sub_805671C
+_08085598: .4byte CB2_LoadMap
 _0808559C: .4byte sub_80853E4
 	thumb_func_end sub_808554C
 
@@ -4612,11 +4612,11 @@ _08085702:
 	adds r0, r6, 0
 	bl FieldObjectSetDirection
 	bl sub_80555E0
-	bl warp_in
+	bl WarpIntoMap
 	ldr r1, _0808575C @ =gFieldCallback
 	ldr r0, _08085760 @ =sub_80859D4
 	str r0, [r1]
-	ldr r0, _08085764 @ =sub_805671C
+	ldr r0, _08085764 @ =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r0, _08085768 @ =sub_808563C
 	bl FindTaskIdByFunc
@@ -4631,7 +4631,7 @@ _08085750:
 _08085758: .4byte gPaletteFade
 _0808575C: .4byte gFieldCallback
 _08085760: .4byte sub_80859D4
-_08085764: .4byte sub_805671C
+_08085764: .4byte CB2_LoadMap
 _08085768: .4byte sub_808563C
 	thumb_func_end sub_8085690
 
@@ -5406,8 +5406,8 @@ sub_8085D34: @ 8085D34
 	cmp r0, 0x1
 	bne _08085D70
 	bl copy_saved_warp3_bank_and_enter_x_to_warp1
-	bl warp_in
-	ldr r0, _08085D78 @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _08085D78 @ =CB2_LoadMap
 	bl SetMainCallback2
 	ldr r1, _08085D7C @ =gFieldCallback
 	ldr r0, _08085D80 @ =mapldr_08085D88
@@ -5422,7 +5422,7 @@ _08085D70:
 	bx r0
 	.align 2, 0
 _08085D74: .4byte gPaletteFade
-_08085D78: .4byte sub_805671C
+_08085D78: .4byte CB2_LoadMap
 _08085D7C: .4byte gFieldCallback
 _08085D80: .4byte mapldr_08085D88
 _08085D84: .4byte sub_8085B78
diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s
index 6939ccac0..b2eb846e7 100644
--- a/asm/field_fadetransition.s
+++ b/asm/field_fadetransition.s
@@ -1411,7 +1411,7 @@ _0807E632:
 	strh r0, [r4, 0x8]
 	b _0807E64A
 _0807E63A:
-	bl warp_in
+	bl WarpIntoMap
 	ldr r0, _0807E650 @ =sub_8056788
 	bl SetMainCallback2
 	adds r0, r5, 0
@@ -1494,8 +1494,8 @@ _0807E6DC:
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0807E6F4
-	bl warp_in
-	ldr r0, _0807E700 @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _0807E700 @ =CB2_LoadMap
 	bl SetMainCallback2
 	adds r0, r5, 0
 	bl DestroyTask
@@ -1505,7 +1505,7 @@ _0807E6F4:
 	bx r0
 	.align 2, 0
 _0807E6FC: .4byte gReceivedRemoteLinkPlayers
-_0807E700: .4byte sub_805671C
+_0807E700: .4byte CB2_LoadMap
 	thumb_func_end sub_807E678
 
 	thumb_func_start sub_807E704
@@ -1563,8 +1563,8 @@ _0807E762:
 	strh r0, [r4, 0x8]
 	b _0807E77A
 _0807E76A:
-	bl warp_in
-	ldr r0, _0807E780 @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _0807E780 @ =CB2_LoadMap
 	bl SetMainCallback2
 	adds r0, r5, 0
 	bl DestroyTask
@@ -1573,7 +1573,7 @@ _0807E77A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0807E780: .4byte sub_805671C
+_0807E780: .4byte CB2_LoadMap
 	thumb_func_end sub_807E718
 
 	thumb_func_start sub_807E784
@@ -1630,8 +1630,8 @@ _0807E7EA:
 	strh r0, [r4, 0x8]
 	b _0807E802
 _0807E7F2:
-	bl warp_in
-	ldr r0, _0807E808 @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _0807E808 @ =CB2_LoadMap
 	bl SetMainCallback2
 	adds r0, r5, 0
 	bl DestroyTask
@@ -1640,7 +1640,7 @@ _0807E802:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0807E808: .4byte sub_805671C
+_0807E808: .4byte CB2_LoadMap
 	thumb_func_end sub_807E784
 
 	thumb_func_start sub_807E80C
@@ -1957,8 +1957,8 @@ _0807EA9A:
 	ldr r0, _0807EAB8 @ =gFieldCallback
 	ldr r1, _0807EABC @ =sub_807DF64
 	str r1, [r0]
-	bl warp_in
-	ldr r0, _0807EAC0 @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _0807EAC0 @ =CB2_LoadMap
 	bl SetMainCallback2
 	adds r0, r4, 0
 	bl DestroyTask
@@ -1970,7 +1970,7 @@ _0807EAB0:
 	.align 2, 0
 _0807EAB8: .4byte gFieldCallback
 _0807EABC: .4byte sub_807DF64
-_0807EAC0: .4byte sub_805671C
+_0807EAC0: .4byte CB2_LoadMap
 	thumb_func_end sub_807E980
 
 	thumb_func_start sub_807EAC4
diff --git a/asm/field_poison.s b/asm/field_poison.s
deleted file mode 100644
index 811f375c6..000000000
--- a/asm/field_poison.s
+++ /dev/null
@@ -1,316 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start CheckMonIsValid
-CheckMonIsValid: @ 80A0460
-	push {lr}
-	movs r1, 0x41
-	bl GetMonData
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0
-	beq _080A0478
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r1, r0
-	bne _080A047C
-_080A0478:
-	movs r0, 0
-	b _080A047E
-_080A047C:
-	movs r0, 0x1
-_080A047E:
-	pop {r1}
-	bx r1
-	thumb_func_end CheckMonIsValid
-
-	thumb_func_start AllMonsFainted
-AllMonsFainted: @ 80A0484
-	push {r4,r5,lr}
-	ldr r4, _080A04A4 @ =gPlayerParty
-	movs r5, 0
-_080A048A:
-	adds r0, r4, 0
-	bl CheckMonIsValid
-	cmp r0, 0
-	beq _080A04A8
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	cmp r0, 0
-	beq _080A04A8
-	movs r0, 0
-	b _080A04B2
-	.align 2, 0
-_080A04A4: .4byte gPlayerParty
-_080A04A8:
-	adds r5, 0x1
-	adds r4, 0x64
-	cmp r5, 0x5
-	ble _080A048A
-	movs r0, 0x1
-_080A04B2:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end AllMonsFainted
-
-	thumb_func_start MonFaintFromPoisonOnField
-MonFaintFromPoisonOnField: @ 80A04B8
-	push {r4,r5,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	adds r4, r0, 0
-	muls r4, r1
-	ldr r0, _080A04FC @ =gPlayerParty
-	adds r4, r0
-	movs r0, 0
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r1, 0x8
-	bl AdjustFriendship
-	adds r0, r4, 0
-	movs r1, 0x37
-	mov r2, sp
-	bl SetMonData
-	ldr r5, _080A0500 @ =gStringVar1
-	adds r0, r4, 0
-	movs r1, 0x2
-	adds r2, r5, 0
-	bl GetMonData
-	adds r0, r5, 0
-	bl StringGetEnd10
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A04FC: .4byte gPlayerParty
-_080A0500: .4byte gStringVar1
-	thumb_func_end MonFaintFromPoisonOnField
-
-	thumb_func_start CheckMonFaintedFromPoison
-CheckMonFaintedFromPoison: @ 80A0504
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	muls r1, r0
-	ldr r0, _080A0540 @ =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	bl CheckMonIsValid
-	cmp r0, 0
-	beq _080A0544
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	cmp r0, 0
-	bne _080A0544
-	adds r0, r4, 0
-	movs r1, 0x37
-	bl GetMonData
-	bl pokemon_ailments_get_primary
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080A0544
-	movs r0, 0x1
-	b _080A0546
-	.align 2, 0
-_080A0540: .4byte gPlayerParty
-_080A0544:
-	movs r0, 0
-_080A0546:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end CheckMonFaintedFromPoison
-
-	thumb_func_start Task_WhiteOut
-Task_WhiteOut: @ 80A054C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, _080A0570 @ =gTasks+0x8
-	adds r4, r0, r1
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _080A05A6
-	cmp r0, 0x1
-	bgt _080A0574
-	cmp r0, 0
-	beq _080A057A
-	b _080A05F6
-	.align 2, 0
-_080A0570: .4byte gTasks+0x8
-_080A0574:
-	cmp r0, 0x2
-	beq _080A05B8
-	b _080A05F6
-_080A057A:
-	ldrh r1, [r4, 0x2]
-	movs r2, 0x2
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x5
-	bgt _080A05A0
-_080A0584:
-	lsls r0, r1, 24
-	lsrs r0, 24
-	bl CheckMonFaintedFromPoison
-	cmp r0, 0
-	bne _080A05D0
-	ldrh r0, [r4, 0x2]
-	adds r0, 0x1
-	strh r0, [r4, 0x2]
-	adds r1, r0, 0
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x5
-	ble _080A0584
-_080A05A0:
-	movs r0, 0x2
-	strh r0, [r4]
-	b _080A05F6
-_080A05A6:
-	bl IsFieldMessageBoxHidden
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A05F6
-	ldrh r0, [r4]
-	subs r0, 0x1
-	strh r0, [r4]
-	b _080A05F6
-_080A05B8:
-	bl AllMonsFainted
-	adds r1, r0, 0
-	cmp r1, 0
-	beq _080A05E8
-	ldr r1, _080A05CC @ =gSpecialVar_Result
-	movs r0, 0x1
-	strh r0, [r1]
-	b _080A05EC
-	.align 2, 0
-_080A05CC: .4byte gSpecialVar_Result
-_080A05D0:
-	ldrb r0, [r4, 0x2]
-	bl MonFaintFromPoisonOnField
-	ldr r0, _080A05E4 @ =gUnknown_81A5476
-	bl ShowFieldMessage
-	ldrh r0, [r4]
-	adds r0, 0x1
-	strh r0, [r4]
-	b _080A05F6
-	.align 2, 0
-_080A05E4: .4byte gUnknown_81A5476
-_080A05E8:
-	ldr r0, _080A05FC @ =gSpecialVar_Result
-	strh r1, [r0]
-_080A05EC:
-	bl EnableBothScriptContexts
-	adds r0, r5, 0
-	bl DestroyTask
-_080A05F6:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A05FC: .4byte gSpecialVar_Result
-	thumb_func_end Task_WhiteOut
-
-	thumb_func_start ExecuteWhiteOut
-ExecuteWhiteOut: @ 80A0600
-	push {lr}
-	ldr r0, _080A0614 @ =Task_WhiteOut
-	movs r1, 0x50
-	bl CreateTask
-	bl ScriptContext1_Stop
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0614: .4byte Task_WhiteOut
-	thumb_func_end ExecuteWhiteOut
-
-	thumb_func_start overworld_poison
-overworld_poison: @ 80A0618
-	push {r4-r7,lr}
-	sub sp, 0x4
-	ldr r4, _080A0684 @ =gPlayerParty
-	movs r7, 0
-	movs r6, 0
-	movs r5, 0x5
-_080A0624:
-	adds r0, r4, 0
-	movs r1, 0x5
-	bl GetMonData
-	cmp r0, 0
-	beq _080A0668
-	adds r0, r4, 0
-	movs r1, 0x37
-	bl GetMonData
-	bl pokemon_ailments_get_primary
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080A0668
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl GetMonData
-	str r0, [sp]
-	cmp r0, 0
-	beq _080A065A
-	subs r0, 0x1
-	str r0, [sp]
-	cmp r0, 0
-	bne _080A065C
-_080A065A:
-	adds r6, 0x1
-_080A065C:
-	adds r0, r4, 0
-	movs r1, 0x39
-	mov r2, sp
-	bl SetMonData
-	adds r7, 0x1
-_080A0668:
-	adds r4, 0x64
-	subs r5, 0x1
-	cmp r5, 0
-	bge _080A0624
-	cmp r6, 0
-	bne _080A0678
-	cmp r7, 0
-	beq _080A067C
-_080A0678:
-	bl FldEffPoison_Start
-_080A067C:
-	cmp r6, 0
-	beq _080A0688
-	movs r0, 0x2
-	b _080A0692
-	.align 2, 0
-_080A0684: .4byte gPlayerParty
-_080A0688:
-	cmp r7, 0
-	bne _080A0690
-	movs r0, 0
-	b _080A0692
-_080A0690:
-	movs r0, 0x1
-_080A0692:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end overworld_poison
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_specials.s b/asm/field_specials.s
index b4980a87a..b2b716a8f 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -268,13 +268,13 @@ _080CA7E6:
 sub_80CA7EC: @ 80CA7EC
 	push {lr}
 	bl sub_8112364
-	ldr r1, _080CA800 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r1, _080CA800 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	movs r0, 0x1
 	bl sub_80BFF50
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080CA800: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_080CA800: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_80CA7EC
 
 	thumb_func_start sub_80CA804
@@ -2781,7 +2781,7 @@ sub_80CBB28: @ 80CBB28
 	ldrh r0, [r6, 0x24]
 	lsls r0, 24
 	lsrs r0, 24
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	adds r4, r0, 0
 	movs r0, 0x2
 	negs r0, r0
@@ -2854,7 +2854,7 @@ sub_80CBBAC: @ 80CBBAC
 	lsrs r0, 24
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldr r0, _080CBC28 @ =gUnknown_2039A14
 	ldr r0, [r0]
 	bl Free
@@ -3183,7 +3183,7 @@ _080CBE20:
 	lsls r0, 24
 	lsrs r0, 24
 _080CBE40:
-	bl sub_813CD24
+	bl GetColorFromTextColorTable
 _080CBE44:
 	lsls r0, 24
 	lsrs r0, 24
@@ -3469,7 +3469,7 @@ ChangeBoxPokemonNickname_CB: @ 80CC064
 	ldrb r1, [r1]
 	ldr r2, _080CC084 @ =gStringVar2
 	bl SetBoxMonNickFromAnyBox
-	bl c2_exit_to_overworld_1_continue_scripts_restart_music
+	bl CB2_ReturnToFieldContinueScriptPlayMapMusic
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -3577,7 +3577,7 @@ ChangePokemonNickname_CB: @ 80CC144
 	ldr r2, _080CC16C @ =gStringVar2
 	movs r1, 0x2
 	bl SetMonData
-	bl c2_exit_to_overworld_1_continue_scripts_restart_music
+	bl CB2_ReturnToFieldContinueScriptPlayMapMusic
 	pop {r0}
 	bx r0
 	.align 2, 0
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 001198d95..8d01691a5 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -1802,7 +1802,7 @@ sub_8108B8C: @ 8108B8C
 	adds r3, r4, 0
 	adds r3, 0x8
 	adds r2, r3
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldr r0, _08108BF0 @ =gUnknown_203AD10
 	ldr r0, [r0]
 	ldr r0, [r0]
@@ -2341,7 +2341,7 @@ _08108FA0:
 _08108FE0: .4byte gUnknown_203AD10
 _08108FE4:
 	ldrb r0, [r7]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	adds r4, r0, 0
 	ldrb r0, [r7]
 	ldr r5, _08109014 @ =gUnknown_203ACFC
@@ -2617,7 +2617,7 @@ sub_81091D0: @ 81091D0
 	adds r1, r2, r1
 	adds r3, 0x8
 	adds r2, r3
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0
 	bl ScheduleBgCopyTilemapToVram
 	ldr r0, _08109290 @ =gUnknown_203AD10
@@ -2835,7 +2835,7 @@ sub_81093B8: @ 81093B8
 	ldrb r0, [r2]
 	movs r1, 0x10
 	movs r2, 0x1
-	bl sub_8107BD0
+	bl ListMenuSetUnkIndicatorsStructField
 	mov r0, r8
 	strh r4, [r0, 0x2]
 	ldr r0, _08109498 @ =gUnknown_203AD10
@@ -2931,7 +2931,7 @@ sub_81094B0: @ 81094B0
 	cmp r0, 0x1
 	beq _0810959E
 	ldrb r0, [r4]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	adds r5, r0, 0
 	ldrb r0, [r4]
 	ldr r3, _0810953C @ =gUnknown_203ACFC
@@ -3082,7 +3082,7 @@ _081095E8:
 	adds r7, r4, 0
 	adds r7, 0x8
 	adds r2, r7
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r3, 0x2
 	ldrsh r0, [r6, r3]
 	cmp r0, r5
@@ -3160,7 +3160,7 @@ sub_810967C: @ 810967C
 	adds r7, r5, 0
 	adds r7, 0x8
 	adds r2, r7
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r3, 0x2
 	ldrsh r0, [r6, r3]
 	cmp r0, r4
@@ -4213,7 +4213,7 @@ _08109F6E:
 	adds r6, r4, 0
 	adds r6, 0x8
 	adds r2, r6
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r4, 0x6]
 	bl sub_8108DC8
 	ldrb r0, [r4, 0x6]
@@ -4304,7 +4304,7 @@ _0810A052:
 	adds r6, r4, 0
 	adds r6, 0x8
 	adds r2, r6
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r4, 0x6]
 	bl sub_810842C
 	ldr r0, _0810A0A4 @ =gMultiuseListMenuTemplate
@@ -4519,7 +4519,7 @@ sub_810A1F8: @ 810A1F8
 	adds r3, r4
 	mov r9, r3
 	add r2, r9
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r4, 0x6]
 	bl sub_8108DC8
 	ldrb r0, [r4, 0x6]
@@ -5497,7 +5497,7 @@ sub_810A9D4: @ 810A9D4
 	adds r3, r4
 	mov r9, r3
 	add r2, r9
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r4, 0x6]
 	bl sub_8108DC8
 	ldrb r0, [r4, 0x6]
@@ -6212,7 +6212,7 @@ _0810B01C:
 	ldrb r0, [r5]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	bl sub_810AECC
 	bl sub_8108CB4
 	adds r0, r7, 0
@@ -6537,7 +6537,7 @@ _0810B29E:
 	adds r6, r4, 0
 	adds r6, 0x8
 	adds r2, r6
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r4, 0x6]
 	bl sub_810842C
 	ldr r0, _0810B328 @ =gMultiuseListMenuTemplate
@@ -6573,7 +6573,7 @@ _0810B32C:
 	movs r0, 0x80
 	strh r0, [r1, 0x30]
 	ldrb r0, [r7]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	b _0810B36C
 	.align 2, 0
 _0810B340: .4byte gMain
@@ -6583,7 +6583,7 @@ _0810B344:
 	ldrb r0, [r7]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	bl sub_810AECC
 	bl sub_8108CB4
 	adds r0, r6, 0
@@ -6701,7 +6701,7 @@ _0810B428:
 _0810B430:
 	strh r0, [r1, 0x30]
 	ldrb r0, [r4]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	b _0810B4B0
 	.align 2, 0
 _0810B43C: .4byte gMain
@@ -6738,7 +6738,7 @@ _0810B468:
 	ldrb r0, [r4]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	bl sub_810AECC
 	bl sub_8108CB4
 	adds r0, r7, 0
@@ -6817,7 +6817,7 @@ _0810B528:
 	strh r6, [r0, 0x2E]
 	strh r7, [r0, 0x30]
 	ldrb r0, [r5]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	b _0810B5C0
 	.align 2, 0
 _0810B538: .4byte gMain
@@ -6854,7 +6854,7 @@ _0810B564:
 	ldrb r0, [r5]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	bl sub_810AECC
 	ldr r1, _0810B5B0 @ =gUnknown_3005E98
 	ldr r0, _0810B5B4 @ =ItemUseCB_Medicine
@@ -6950,7 +6950,7 @@ _0810B64E:
 	strh r5, [r0, 0x2E]
 	strh r7, [r0, 0x30]
 	ldrb r0, [r6]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	b _0810B6E0
 	.align 2, 0
 _0810B65C: .4byte gMain
@@ -6989,7 +6989,7 @@ _0810B68C:
 	ldrb r0, [r6]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	bl sub_810AECC
 	ldr r0, _0810B6D4 @ =gUnknown_203AD10
 	ldr r1, [r0]
diff --git a/asm/learn_move.s b/asm/learn_move.s
index f00135fda..6684874bb 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -1409,7 +1409,7 @@ sub_80E5204: @ 80E5204
 	ldr r1, _080E525C @ =0x00000263
 	adds r0, r1
 	ldrb r0, [r0]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	ldr r0, _080E5260 @ =gMain
 	ldrh r1, [r0, 0x2E]
 	movs r0, 0x1
@@ -1568,7 +1568,7 @@ sub_80E5340: @ 80E5340
 	movs r0, 0x2
 	movs r2, 0x1
 	movs r3, 0x4
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	ldrb r0, [r4, 0x1]
 	cmp r0, 0x1
 	bhi _080E5388
@@ -1680,27 +1680,27 @@ sub_80E5444: @ 80E5444
 	movs r1, 0x13
 	movs r2, 0x1
 	movs r3, 0x4
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	movs r0, 0x1
 	movs r1, 0x14
 	movs r2, 0
 	movs r3, 0x4
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	movs r0, 0x1
 	movs r1, 0x15
 	movs r2, 0
 	movs r3, 0x13
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	movs r0, 0
 	movs r1, 0x16
 	movs r2, 0x1
 	movs r3, 0x13
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	movs r0, 0
 	movs r1, 0x17
 	movs r2, 0x1
 	movs r3, 0x22
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	movs r0, 0
 	bl PutWindowTilemap
 	movs r0, 0x1
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s
index 111161c06..78c09b0ff 100644
--- a/asm/link_rfu_3.s
+++ b/asm/link_rfu_3.s
@@ -620,7 +620,7 @@ _08115DD4:
 	bl sub_81165E8
 	strb r0, [r5, 0x13]
 	ldrb r0, [r5, 0x12]
-	bl sub_8107180
+	bl RedrawListMenu
 	b _0811610C
 	.align 2, 0
 _08115DE4: .4byte gUnknown_203B058
@@ -783,7 +783,7 @@ _08115EF4:
 	movs r0, 0
 	strb r0, [r1, 0x1B]
 	ldrb r0, [r5, 0x12]
-	bl sub_8107180
+	bl RedrawListMenu
 	ldrb r0, [r5, 0x13]
 	adds r0, 0x1
 	strb r0, [r5, 0x13]
@@ -870,7 +870,7 @@ _08115FB4:
 	ldr r0, [r5]
 	bl sub_81165E8
 	ldrb r0, [r5, 0x12]
-	bl sub_8107180
+	bl RedrawListMenu
 _08115FF0:
 	movs r0, 0x4
 	strb r0, [r5, 0xC]
@@ -1139,7 +1139,7 @@ sub_81161E4: @ 81161E4
 	ldrb r0, [r4, 0x12]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r4, 0x10]
 	bl ClearWindowTilemap
 	ldrb r0, [r4, 0xF]
@@ -1400,7 +1400,7 @@ _08116460:
 	movs r0, 0x2
 	bl PlaySE
 	ldrb r0, [r5, 0x12]
-	bl sub_8107180
+	bl RedrawListMenu
 	ldr r4, _081164A0 @ =gStringVar2
 	ldrb r0, [r5, 0x13]
 	lsls r0, 5
@@ -1433,7 +1433,7 @@ _081164AC:
 	movs r1, 0
 	bl sub_80FB9E4
 	ldrb r0, [r5, 0x12]
-	bl sub_8107180
+	bl RedrawListMenu
 	strb r4, [r5, 0xC]
 	movs r0, 0x1
 	b _081164C2
@@ -1972,7 +1972,7 @@ _08116916:
 	b _08116BF6
 _0811691E:
 	ldrb r0, [r6, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	adds r4, r0, 0
 	ldr r0, _0811696C @ =gMain
 	ldrh r1, [r0, 0x2E]
@@ -2301,7 +2301,7 @@ _08116BF4:
 	strb r0, [r6, 0x8]
 _08116BF6:
 	ldrb r0, [r6, 0xE]
-	bl sub_8107180
+	bl RedrawListMenu
 	b _08116D06
 _08116BFE:
 	bl sub_80FB9F4
@@ -2322,7 +2322,7 @@ _08116C10:
 	ldrb r0, [r6, 0xE]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r6, 0xC]
 	bl ClearWindowTilemap
 	ldrb r0, [r6, 0xB]
@@ -2480,7 +2480,7 @@ sub_8116D60: @ 8116D60
 	movs r1, 0
 	bl sub_80FCD74
 	ldrb r0, [r4, 0xE]
-	bl sub_8107180
+	bl RedrawListMenu
 	ldr r5, _08116DD4 @ =gStringVar1
 	ldrb r0, [r4, 0xF]
 	lsls r0, 5
@@ -3367,7 +3367,7 @@ sub_8117440: @ 8117440
 	movs r0, 0
 	mov r3, r8
 	bl SetDynamicWarpWithCoords
-	bl warp_in
+	bl WarpIntoMap
 	add sp, 0x8
 	pop {r3}
 	mov r8, r3
@@ -3424,7 +3424,7 @@ sub_81174B4: @ 81174B4
 	adds r1, r5, 0
 	mov r3, r8
 	bl Overworld_SetWarpDestination
-	bl warp_in
+	bl WarpIntoMap
 	add sp, 0x4
 	pop {r3}
 	mov r8, r3
@@ -3763,21 +3763,21 @@ _08117890:
 	bl GetCursorSelectionMonId
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, _081178AC @ =sub_805671C
+	ldr r1, _081178AC @ =CB2_LoadMap
 	bl sub_8147AA8
 	b _081178E0
 	.align 2, 0
-_081178AC: .4byte sub_805671C
+_081178AC: .4byte CB2_LoadMap
 _081178B0:
 	movs r0, 0x7
 	movs r1, 0x9
 	movs r2, 0x1
 	bl sub_8117440
-	ldr r0, _081178C4 @ =sub_805671C
+	ldr r0, _081178C4 @ =CB2_LoadMap
 	bl sub_814B754
 	b _081178E0
 	.align 2, 0
-_081178C4: .4byte sub_805671C
+_081178C4: .4byte CB2_LoadMap
 _081178C8:
 	movs r0, 0x8
 	movs r1, 0x5
@@ -3786,7 +3786,7 @@ _081178C8:
 	bl GetCursorSelectionMonId
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, _081178F8 @ =sub_805671C
+	ldr r1, _081178F8 @ =CB2_LoadMap
 	bl sub_81507FC
 _081178E0:
 	adds r0, r4, 0
@@ -3800,7 +3800,7 @@ _081178E0:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_081178F8: .4byte sub_805671C
+_081178F8: .4byte CB2_LoadMap
 _081178FC: .4byte gSpecialVar_Result
 	thumb_func_end sub_81175BC
 
@@ -4151,7 +4151,7 @@ _08117BF4:
 	bl sub_81165E8
 	strb r0, [r5, 0x13]
 	ldrb r0, [r5, 0x12]
-	bl sub_8107180
+	bl RedrawListMenu
 _08117C02:
 	movs r0, 0x2
 	strb r0, [r5, 0xC]
@@ -4198,7 +4198,7 @@ _08117C42:
 	adds r1, r0
 	strb r4, [r1, 0x1B]
 	ldrb r0, [r5, 0x12]
-	bl sub_8107180
+	bl RedrawListMenu
 	movs r0, 0x5
 	strb r0, [r5, 0x19]
 	ldrb r1, [r5, 0x13]
@@ -4268,7 +4268,7 @@ _08117CB2:
 	movs r0, 0
 	strb r0, [r1, 0x1B]
 	ldrb r0, [r5, 0x12]
-	bl sub_8107180
+	bl RedrawListMenu
 	ldrb r0, [r5, 0x13]
 	adds r0, 0x1
 	strb r0, [r5, 0x13]
@@ -4327,7 +4327,7 @@ _08117D3C:
 	ldr r0, [r5]
 	bl sub_81165E8
 	ldrb r0, [r5, 0x12]
-	bl sub_8107180
+	bl RedrawListMenu
 	movs r0, 0x2
 	strb r0, [r5, 0xC]
 _08117D7C:
@@ -4398,7 +4398,7 @@ _08117DEE:
 	ldrb r0, [r5, 0x12]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0
 	bl CopyBgTilemapBufferToVram
 	ldrb r0, [r5, 0xF]
@@ -4457,7 +4457,7 @@ _08117E80:
 	ldrb r0, [r5, 0x12]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0
 	bl CopyBgTilemapBufferToVram
 	ldrb r0, [r5, 0xF]
@@ -4673,11 +4673,11 @@ _08118070:
 	bl PlaySE
 _08118086:
 	ldrb r0, [r5, 0xE]
-	bl sub_8107180
+	bl RedrawListMenu
 	b _08118288
 _0811808E:
 	ldrb r0, [r5, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	adds r2, r0, 0
 	ldr r0, _08118128 @ =gMain
 	ldrh r1, [r0, 0x2E]
@@ -4707,7 +4707,7 @@ _0811808E:
 	movs r1, 0
 	bl sub_80FCD74
 	ldrb r0, [r5, 0xE]
-	bl sub_8107180
+	bl RedrawListMenu
 	ldr r4, _0811812C @ =gStringVar1
 	ldrb r0, [r5, 0xF]
 	lsls r0, 5
@@ -4842,7 +4842,7 @@ _081181EC:
 	ldrb r0, [r5, 0xE]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0
 	bl CopyBgTilemapBufferToVram
 	ldrb r0, [r5, 0xD]
@@ -5085,14 +5085,14 @@ _0811841E:
 	b _08118604
 _08118426:
 	ldrb r0, [r5, 0xE]
-	bl sub_8107180
+	bl RedrawListMenu
 	b _08118604
 _0811842E:
 	ldrb r0, [r5, 0x13]
 	cmp r0, 0
 	beq _0811843A
 	ldrb r0, [r5, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 _0811843A:
 	ldrb r0, [r5, 0x14]
 	cmp r0, 0x78
@@ -5242,7 +5242,7 @@ _08118564:
 	ldrb r0, [r5, 0xE]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0
 	bl CopyBgTilemapBufferToVram
 	ldrb r0, [r5, 0xB]
@@ -8715,7 +8715,7 @@ _0811A270: .4byte gMultiuseListMenuTemplate
 _0811A274:
 	mov r3, r9
 	ldrb r0, [r3]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	mov r8, r0
 	ldr r0, _0811A2AC @ =gMain
 	ldrh r1, [r0, 0x2E]
@@ -8726,7 +8726,7 @@ _0811A274:
 	ldrb r0, [r4]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r5]
 	movs r1, 0x1
 	bl ClearStdWindowAndFrame
@@ -8747,7 +8747,7 @@ _0811A2B0:
 	ldrb r0, [r6]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r5]
 	movs r1, 0x1
 	bl ClearStdWindowAndFrame
@@ -8821,7 +8821,7 @@ _0811A350: .4byte gUnknown_8456F1C
 _0811A354: .4byte gMultiuseListMenuTemplate
 _0811A358:
 	ldrb r0, [r5]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	adds r1, r0, 0
 	ldr r0, _0811A3A8 @ =gMain
 	ldrh r2, [r0, 0x2E]
@@ -8842,7 +8842,7 @@ _0811A37E:
 	ldrb r0, [r5]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r4]
 	movs r1, 0x1
 	bl ClearStdWindowAndFrame
@@ -8867,7 +8867,7 @@ _0811A3AC:
 	ldrb r0, [r5]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	ldrb r0, [r4]
 	movs r1, 0x1
 	bl ClearStdWindowAndFrame
@@ -9999,7 +9999,7 @@ _0811AC3C:
 	adds r0, r6, 0
 	movs r2, 0x44
 	adds r3, r5, 0
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	movs r0, 0xB
 	mov r2, r8
 	muls r2, r0
@@ -10537,14 +10537,14 @@ _0811B056:
 	lsls r0, r4, 24
 	lsrs r0, 24
 	adds r1, r5, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	adds r5, 0xB
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0811B056
 	ldr r1, _0811B074 @ =gUnknown_8457D44
 	adds r0, r7, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	b _0811B080
 	.align 2, 0
 _0811B074: .4byte gUnknown_8457D44
@@ -10952,7 +10952,7 @@ sub_811B31C: @ 811B31C
 	ldr r0, _0811B4B0 @ =gUnknown_2039624
 	adds r1, r0
 	mov r8, r1
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	mov r6, r9
 	adds r6, 0xAC
 	bl sub_80447F0
@@ -10966,11 +10966,11 @@ sub_811B31C: @ 811B31C
 	bl StringCopy
 	movs r0, 0
 	adds r1, r6, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	mov r1, r8
 	adds r1, 0x30
 	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	movs r4, 0xB0
 	lsls r4, 1
 	add r4, r9
@@ -10984,7 +10984,7 @@ sub_811B31C: @ 811B31C
 	bl StringCopy
 	movs r0, 0x2
 	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	mov r5, r9
 	adds r5, 0xCA
 	mov r0, r8
@@ -10995,7 +10995,7 @@ sub_811B31C: @ 811B31C
 	bl ConvertIntToDecimalStringN
 	movs r0, 0x3
 	adds r1, r5, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	movs r2, 0xD9
 	add r2, r9
 	mov r10, r2
@@ -11015,16 +11015,16 @@ sub_811B31C: @ 811B31C
 	bl ConvertIntToDecimalStringN
 	movs r0, 0x4
 	mov r1, r10
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	movs r0, 0x5
 	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	movs r4, 0xC8
 	lsls r4, 1
 	add r4, r9
 	ldr r1, _0811B4BC @ =gUnknown_84594C4
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	ldr r0, _0811B4C0 @ =gStringVar4
 	adds r1, r4, 0
 	bl StringCopy
@@ -11041,7 +11041,7 @@ _0811B40A:
 	bl ConvertIntToDecimalStringN
 	movs r0, 0
 	adds r1, r6, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	mov r2, r8
 	ldrh r1, [r2, 0x16]
 	cmp r1, r4
@@ -11056,7 +11056,7 @@ _0811B426:
 	bl ConvertIntToDecimalStringN
 	movs r0, 0x2
 	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	mov r0, r8
 	ldrh r1, [r0, 0x20]
 	adds r0, r5, 0
@@ -11065,7 +11065,7 @@ _0811B426:
 	bl ConvertIntToDecimalStringN
 	movs r0, 0x3
 	adds r1, r5, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	movs r7, 0
 	movs r6, 0x80
 	lsls r6, 19
@@ -11078,7 +11078,7 @@ _0811B45E:
 	bl CopyEasyChatWord
 	lsrs r0, r6, 24
 	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	movs r2, 0x80
 	lsls r2, 17
 	adds r6, r2
@@ -11092,7 +11092,7 @@ _0811B45E:
 	add r4, r9
 	ldr r1, _0811B4C8 @ =gUnknown_8459504
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	ldr r5, _0811B4C0 @ =gStringVar4
 	adds r0, r5, 0
 	adds r1, r4, 0
@@ -11102,7 +11102,7 @@ _0811B45E:
 	bne _0811B4D0
 	ldr r1, _0811B4CC @ =gUnknown_8459588
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	adds r0, r5, 0
 	adds r1, r4, 0
 	bl StringAppend
@@ -11127,7 +11127,7 @@ _0811B4D0:
 	adds r1, r0
 	ldr r1, [r1]
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	adds r0, r5, 0
 	adds r1, r4, 0
 	bl StringAppend
diff --git a/asm/list_menu.s b/asm/list_menu.s
deleted file mode 100644
index e6e316fb7..000000000
--- a/asm/list_menu.s
+++ /dev/null
@@ -1,2019 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start nullsub_90
-nullsub_90: @ 8106ECC
-	bx lr
-	thumb_func_end nullsub_90
-
-	thumb_func_start DoMysteryGiftListMenu
-DoMysteryGiftListMenu: @ 8106ED0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	mov r12, r0
-	str r1, [sp]
-	ldr r0, [sp, 0x28]
-	lsls r2, 24
-	lsrs r6, r2, 24
-	mov r10, r6
-	lsls r3, 16
-	lsrs r7, r3, 16
-	str r7, [sp, 0x4]
-	lsls r0, 16
-	mov r8, r0
-	lsrs r0, 16
-	mov r9, r0
-	ldr r5, _08106F60 @ =gUnknown_203ACF4
-	ldrb r4, [r5, 0x4]
-	cmp r4, 0x1
-	beq _08106F68
-	cmp r4, 0x1
-	ble _08106F06
-	cmp r4, 0x2
-	beq _08106FCC
-_08106F06:
-	mov r0, r12
-	bl AddWindow
-	strb r0, [r5, 0x5]
-	cmp r6, 0x1
-	beq _08106F24
-	cmp r6, 0x2
-	bne _08106F34
-	ldrb r0, [r5, 0x5]
-	mov r1, r9
-	lsls r2, r1, 24
-	lsrs r2, 24
-	adds r1, r7, 0
-	bl TextWindow_SetUserSelectedFrame
-_08106F24:
-	ldrb r0, [r5, 0x5]
-	mov r3, r8
-	lsrs r2, r3, 20
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r1, [sp, 0x4]
-	bl DrawTextBorderOuter
-_08106F34:
-	ldr r0, _08106F64 @ =gMultiuseListMenuTemplate
-	adds r2, r0, 0
-	ldr r1, [sp]
-	ldm r1!, {r3-r5}
-	stm r2!, {r3-r5}
-	ldm r1!, {r3-r5}
-	stm r2!, {r3-r5}
-	ldr r4, _08106F60 @ =gUnknown_203ACF4
-	ldrb r1, [r4, 0x5]
-	strb r1, [r0, 0x10]
-	movs r1, 0
-	movs r2, 0
-	bl ListMenuInit
-	strb r0, [r4, 0x6]
-	ldrb r0, [r4, 0x5]
-	movs r1, 0x1
-	bl CopyWindowToVram
-	movs r0, 0x1
-	strb r0, [r4, 0x4]
-	b _08106FE4
-	.align 2, 0
-_08106F60: .4byte gUnknown_203ACF4
-_08106F64: .4byte gMultiuseListMenuTemplate
-_08106F68:
-	ldrb r0, [r5, 0x6]
-	bl ListMenuHandleInput
-	str r0, [r5]
-	ldr r1, _08106FA4 @ =gMain
-	ldrh r0, [r1, 0x2E]
-	ands r4, r0
-	cmp r4, 0
-	beq _08106F7E
-	movs r0, 0x2
-	strb r0, [r5, 0x4]
-_08106F7E:
-	ldrh r1, [r1, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08106F92
-	movs r0, 0x2
-	negs r0, r0
-	str r0, [r5]
-	movs r0, 0x2
-	strb r0, [r5, 0x4]
-_08106F92:
-	ldrb r0, [r5, 0x4]
-	cmp r0, 0x2
-	bne _08106FE4
-	cmp r6, 0
-	bne _08106FA8
-	ldrb r0, [r5, 0x5]
-	bl ClearWindowTilemap
-	b _08106FBA
-	.align 2, 0
-_08106FA4: .4byte gMain
-_08106FA8:
-	mov r4, r10
-	cmp r4, 0
-	blt _08106FBA
-	cmp r4, 0x2
-	bgt _08106FBA
-	ldrb r0, [r5, 0x5]
-	movs r1, 0
-	bl ClearStdWindowAndFrame
-_08106FBA:
-	ldr r0, _08106FC8 @ =gUnknown_203ACF4
-	ldrb r0, [r0, 0x5]
-	movs r1, 0x1
-	bl CopyWindowToVram
-	b _08106FE4
-	.align 2, 0
-_08106FC8: .4byte gUnknown_203ACF4
-_08106FCC:
-	ldrb r0, [r5, 0x6]
-	movs r1, 0
-	movs r2, 0
-	bl DestroyListMenu
-	ldrb r0, [r5, 0x5]
-	bl RemoveWindow
-	movs r0, 0
-	strb r0, [r5, 0x4]
-	ldr r0, [r5]
-	b _08106FE8
-_08106FE4:
-	movs r0, 0x1
-	negs r0, r0
-_08106FE8:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end DoMysteryGiftListMenu
-
-	thumb_func_start ListMenuInit
-ListMenuInit: @ 8106FF8
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 16
-	lsrs r2, 16
-	bl ListMenuInitInternal
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldrb r0, [r5, 0x10]
-	bl PutWindowTilemap
-	ldrb r0, [r5, 0x10]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end ListMenuInit
-
-	thumb_func_start Unused_ListMenuInit2
-Unused_ListMenuInit2: @ 8107024
-	push {r4-r7,lr}
-	sub sp, 0x8
-	adds r6, r0, 0
-	adds r4, r1, 0
-	adds r1, r2, 0
-	adds r2, r3, 0
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 16
-	lsrs r2, 16
-	bl ListMenuInitInternal
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldrb r0, [r4, 0x4]
-	cmp r0, 0xFF
-	beq _08107064
-	adds r5, r4, 0
-_08107048:
-	ldrb r0, [r6, 0x10]
-	ldrb r1, [r5]
-	ldrb r2, [r5, 0x1]
-	ldrb r3, [r5, 0x2]
-	ldrb r4, [r5, 0x3]
-	str r4, [sp]
-	ldrb r4, [r5, 0x4]
-	str r4, [sp, 0x4]
-	bl PutWindowRectTilemapOverridePalette
-	adds r5, 0x8
-	ldrb r0, [r5, 0x4]
-	cmp r0, 0xFF
-	bne _08107048
-_08107064:
-	ldrb r0, [r6, 0x10]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	adds r0, r7, 0
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end Unused_ListMenuInit2
-
-	thumb_func_start ListMenuHandleInput
-ListMenuHandleInput: @ 8107078
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _081070A4 @ =gTasks+0x8
-	adds r3, r1, r0
-	ldr r2, _081070A8 @ =gMain
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _081070AC
-	ldrh r0, [r3, 0x18]
-	ldrh r1, [r3, 0x1A]
-	adds r0, r1
-	ldr r1, [r3]
-	lsls r0, 3
-	adds r0, r1
-	ldr r0, [r0, 0x4]
-	b _08107136
-	.align 2, 0
-_081070A4: .4byte gTasks+0x8
-_081070A8: .4byte gMain
-_081070AC:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _081070BA
-	movs r0, 0x2
-	negs r0, r0
-	b _08107136
-_081070BA:
-	ldrh r1, [r2, 0x30]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _081070CE
-	adds r0, r3, 0
-	movs r1, 0x1
-	movs r2, 0x1
-	movs r3, 0
-	b _0810712E
-_081070CE:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _081070DE
-	adds r0, r3, 0
-	movs r1, 0x1
-	movs r2, 0x1
-	b _0810712C
-_081070DE:
-	ldrb r0, [r3, 0x16]
-	lsrs r0, 6
-	cmp r0, 0x1
-	beq _081070F4
-	cmp r0, 0x1
-	ble _081070EE
-	cmp r0, 0x2
-	beq _08107100
-_081070EE:
-	movs r2, 0
-	movs r0, 0
-	b _08107114
-_081070F4:
-	movs r0, 0x20
-	ands r0, r1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	movs r0, 0x10
-	b _0810710E
-_08107100:
-	movs r0, 0x80
-	lsls r0, 2
-	ands r0, r1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	movs r0, 0x80
-	lsls r0, 1
-_0810710E:
-	ands r0, r1
-	lsls r0, 16
-	lsrs r0, 16
-_08107114:
-	cmp r2, 0
-	beq _08107122
-	ldrb r2, [r3, 0xE]
-	adds r0, r3, 0
-	movs r1, 0x1
-	movs r3, 0
-	b _0810712E
-_08107122:
-	cmp r0, 0
-	beq _08107132
-	ldrb r2, [r3, 0xE]
-	adds r0, r3, 0
-	movs r1, 0x1
-_0810712C:
-	movs r3, 0x1
-_0810712E:
-	bl ListMenuChangeSelection
-_08107132:
-	movs r0, 0x1
-	negs r0, r0
-_08107136:
-	pop {r1}
-	bx r1
-	thumb_func_end ListMenuHandleInput
-
-	thumb_func_start DestroyListMenu
-DestroyListMenu: @ 810713C
-	push {r4,lr}
-	adds r3, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	adds r4, r0, 0
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, _0810717C @ =gTasks+0x8
-	adds r1, r0, r1
-	cmp r3, 0
-	beq _08107158
-	ldrh r0, [r1, 0x18]
-	strh r0, [r3]
-_08107158:
-	cmp r2, 0
-	beq _08107160
-	ldrh r0, [r1, 0x1A]
-	strh r0, [r2]
-_08107160:
-	ldrb r0, [r1, 0x1E]
-	cmp r0, 0xFF
-	beq _08107170
-	ldrb r1, [r1, 0x17]
-	lsrs r1, 6
-	subs r1, 0x2
-	bl ListMenuRemoveCursorObject
-_08107170:
-	adds r0, r4, 0
-	bl DestroyTask
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810717C: .4byte gTasks+0x8
-	thumb_func_end DestroyListMenu
-
-	thumb_func_start sub_8107180
-sub_8107180: @ 8107180
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	ldr r0, _081071C0 @ =gTasks+0x8
-	adds r4, r0
-	ldrb r0, [r4, 0x10]
-	ldrb r2, [r4, 0x15]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	bl FillWindowPixelBuffer
-	ldrh r1, [r4, 0x18]
-	ldrh r3, [r4, 0xE]
-	adds r0, r4, 0
-	movs r2, 0
-	bl ListMenuPrintEntries
-	adds r0, r4, 0
-	bl ListMenuDrawCursor
-	ldrb r0, [r4, 0x10]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081071C0: .4byte gTasks+0x8
-	thumb_func_end sub_8107180
-
-	thumb_func_start sub_81071C4
-sub_81071C4: @ 81071C4
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 24
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	ldr r0, _08107204 @ =gTasks+0x8
-	adds r4, r0
-	lsrs r1, 20
-	ldrb r6, [r4, 0x14]
-	movs r5, 0xF
-	adds r0, r5, 0
-	ands r0, r6
-	orrs r0, r1
-	strb r0, [r4, 0x14]
-	ands r2, r5
-	ldrb r1, [r4, 0x15]
-	movs r0, 0x10
-	negs r0, r0
-	ands r0, r1
-	orrs r0, r2
-	lsrs r3, 20
-	ands r0, r5
-	orrs r0, r3
-	strb r0, [r4, 0x15]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08107204: .4byte gTasks+0x8
-	thumb_func_end sub_81071C4
-
-	thumb_func_start sub_8107208
-sub_8107208: @ 8107208
-	push {r4,r5,lr}
-	adds r3, r1, 0
-	adds r5, r2, 0
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r3, 24
-	lsrs r3, 24
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	ldr r0, _08107240 @ =gTasks+0x8
-	adds r4, r0
-	ldrb r0, [r4, 0x10]
-	movs r1, 0x1
-	adds r2, r3, 0
-	bl SetWindowAttribute
-	ldrb r0, [r4, 0x10]
-	movs r1, 0x2
-	adds r2, r5, 0
-	bl SetWindowAttribute
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08107240: .4byte gTasks+0x8
-	thumb_func_end sub_8107208
-
-	thumb_func_start sub_8107244
-sub_8107244: @ 8107244
-	push {r4-r7,lr}
-	sub sp, 0x20
-	mov r12, r2
-	ldr r5, [sp, 0x34]
-	lsls r3, 16
-	lsrs r3, 16
-	adds r4, r3, 0
-	mov r3, sp
-	ldm r0!, {r2,r6,r7}
-	stm r3!, {r2,r6,r7}
-	ldm r0!, {r2,r6,r7}
-	stm r3!, {r2,r6,r7}
-	mov r0, sp
-	movs r3, 0
-	strh r1, [r0, 0x18]
-	mov r1, r12
-	strh r1, [r0, 0x1A]
-	strb r3, [r0, 0x1C]
-	strb r3, [r0, 0x1D]
-	cmp r4, 0x40
-	bne _08107278
-	movs r1, 0
-	movs r2, 0x1
-	movs r3, 0
-	bl ListMenuChangeSelection
-_08107278:
-	cmp r4, 0x80
-	bne _08107288
-	mov r0, sp
-	movs r1, 0
-	movs r2, 0x1
-	movs r3, 0x1
-	bl ListMenuChangeSelection
-_08107288:
-	cmp r5, 0
-	beq _08107292
-	mov r0, sp
-	ldrh r0, [r0, 0x18]
-	strh r0, [r5]
-_08107292:
-	ldr r2, [sp, 0x38]
-	cmp r2, 0
-	beq _0810729E
-	mov r0, sp
-	ldrh r0, [r0, 0x1A]
-	strh r0, [r2]
-_0810729E:
-	movs r0, 0x1
-	negs r0, r0
-	add sp, 0x20
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8107244
-
-	thumb_func_start sub_81072AC
-sub_81072AC: @ 81072AC
-	push {lr}
-	adds r2, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _081072D0 @ =gTasks+0x8
-	adds r1, r0
-	cmp r2, 0
-	beq _081072CA
-	ldrh r0, [r1, 0x1A]
-	ldrh r1, [r1, 0x18]
-	adds r0, r1
-	strh r0, [r2]
-_081072CA:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081072D0: .4byte gTasks+0x8
-	thumb_func_end sub_81072AC
-
-	thumb_func_start ListMenuGetScrollAndRow
-ListMenuGetScrollAndRow: @ 81072D4
-	push {lr}
-	adds r3, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _081072FC @ =gTasks+0x8
-	adds r1, r0
-	cmp r3, 0
-	beq _081072EE
-	ldrh r0, [r1, 0x18]
-	strh r0, [r3]
-_081072EE:
-	cmp r2, 0
-	beq _081072F6
-	ldrh r0, [r1, 0x1A]
-	strh r0, [r2]
-_081072F6:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081072FC: .4byte gTasks+0x8
-	thumb_func_end ListMenuGetScrollAndRow
-
-	thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
-ListMenuGetYCoordForPrintingArrowCursor: @ 8107300
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	ldr r0, _08107344 @ =gTasks+0x8
-	adds r4, r0
-	ldrb r0, [r4, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	movs r1, 0x1
-	bl GetFontAttribute
-	ldrb r1, [r4, 0x16]
-	lsls r1, 26
-	lsrs r1, 29
-	adds r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x1A]
-	adds r2, r1, 0
-	muls r2, r0
-	adds r1, r2, 0
-	ldrb r0, [r4, 0x14]
-	lsls r0, 28
-	lsrs r0, 28
-	adds r0, r1
-	lsls r0, 16
-	lsrs r0, 16
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08107344: .4byte gTasks+0x8
-	thumb_func_end ListMenuGetYCoordForPrintingArrowCursor
-
-	thumb_func_start ListMenuInitInternal
-ListMenuInitInternal: @ 8107348
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	lsls r5, 16
-	lsrs r5, 16
-	lsls r6, 16
-	lsrs r6, 16
-	ldr r0, _08107418 @ =nullsub_90
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r0, 2
-	add r0, r8
-	lsls r0, 3
-	ldr r1, _0810741C @ =gTasks+0x8
-	adds r7, r0, r1
-	adds r0, r7, 0
-	ldm r4!, {r1-r3}
-	stm r0!, {r1-r3}
-	ldm r4!, {r1-r3}
-	stm r0!, {r1-r3}
-	movs r1, 0
-	strh r5, [r7, 0x18]
-	strh r6, [r7, 0x1A]
-	strb r1, [r7, 0x1C]
-	strb r1, [r7, 0x1D]
-	movs r0, 0xFF
-	strb r0, [r7, 0x1E]
-	strb r1, [r7, 0x1F]
-	ldr r3, _08107420 @ =gUnknown_3005E60
-	ldrb r1, [r7, 0x14]
-	movs r5, 0xF
-	lsrs r1, 4
-	ldrb r4, [r3]
-	movs r2, 0x10
-	negs r2, r2
-	adds r0, r2, 0
-	ands r0, r4
-	orrs r0, r1
-	strb r0, [r3]
-	ldrb r1, [r7, 0x15]
-	lsls r1, 28
-	lsrs r1, 24
-	ands r0, r5
-	orrs r0, r1
-	strb r0, [r3]
-	ldrb r0, [r7, 0x15]
-	lsrs r0, 4
-	ands r5, r0
-	ldrb r0, [r3, 0x1]
-	ands r2, r0
-	orrs r2, r5
-	strb r2, [r3, 0x1]
-	ldrb r1, [r7, 0x16]
-	lsls r1, 29
-	lsrs r1, 17
-	ldr r0, [r3]
-	ldr r2, _08107424 @ =0xfffc0fff
-	ands r0, r2
-	orrs r0, r1
-	str r0, [r3]
-	ldrb r0, [r7, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	strb r0, [r3, 0x3]
-	ldrh r0, [r7, 0xC]
-	ldrh r1, [r7, 0xE]
-	cmp r0, r1
-	bcs _081073E0
-	strh r0, [r7, 0xE]
-_081073E0:
-	ldrb r0, [r7, 0x10]
-	ldrb r2, [r7, 0x15]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	bl FillWindowPixelBuffer
-	ldrh r1, [r7, 0x18]
-	ldrh r3, [r7, 0xE]
-	adds r0, r7, 0
-	movs r2, 0
-	bl ListMenuPrintEntries
-	adds r0, r7, 0
-	bl ListMenuDrawCursor
-	adds r0, r7, 0
-	movs r1, 0x1
-	bl ListMenuCallSelectionChangedCallback
-	mov r0, r8
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08107418: .4byte nullsub_90
-_0810741C: .4byte gTasks+0x8
-_08107420: .4byte gUnknown_3005E60
-_08107424: .4byte 0xfffc0fff
-	thumb_func_end ListMenuInitInternal
-
-	thumb_func_start ListMenuPrint
-ListMenuPrint: @ 8107428
-	push {r4-r7,lr}
-	sub sp, 0x18
-	adds r4, r0, 0
-	adds r6, r1, 0
-	lsls r2, 24
-	lsrs r7, r2, 24
-	lsls r3, 24
-	lsrs r3, 24
-	mov r12, r3
-	ldr r5, _08107490 @ =gUnknown_3005E60
-	ldrb r1, [r5, 0x3]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0
-	beq _08107494
-	add r1, sp, 0x14
-	ldr r2, [r5]
-	lsls r0, r2, 24
-	lsrs r0, 28
-	movs r3, 0
-	strb r0, [r1]
-	lsls r0, r2, 28
-	lsrs r0, 28
-	strb r0, [r1, 0x1]
-	lsls r0, r2, 20
-	lsrs r0, 28
-	strb r0, [r1, 0x2]
-	ldrb r0, [r4, 0x10]
-	lsls r1, r2, 1
-	lsrs r1, 25
-	lsls r2, 14
-	lsrs r2, 26
-	str r2, [sp]
-	str r3, [sp, 0x4]
-	add r2, sp, 0x14
-	str r2, [sp, 0x8]
-	movs r2, 0x1
-	negs r2, r2
-	str r2, [sp, 0xC]
-	str r6, [sp, 0x10]
-	adds r2, r7, 0
-	mov r3, r12
-	bl AddTextPrinterParameterized4
-	ldrb r1, [r5, 0x3]
-	movs r0, 0x7F
-	ands r0, r1
-	strb r0, [r5, 0x3]
-	b _081074D2
-	.align 2, 0
-_08107490: .4byte gUnknown_3005E60
-_08107494:
-	add r2, sp, 0x14
-	ldrb r1, [r4, 0x15]
-	lsls r0, r1, 28
-	lsrs r0, 28
-	strb r0, [r2]
-	ldrb r0, [r4, 0x14]
-	lsrs r0, 4
-	strb r0, [r2, 0x1]
-	adds r0, r2, 0
-	lsls r1, 24
-	lsrs r1, 28
-	strb r1, [r0, 0x2]
-	ldrb r0, [r4, 0x10]
-	ldrb r1, [r4, 0x17]
-	lsls r1, 26
-	lsrs r1, 26
-	ldrb r2, [r4, 0x16]
-	lsls r2, 29
-	lsrs r2, 29
-	str r2, [sp]
-	str r3, [sp, 0x4]
-	add r2, sp, 0x14
-	str r2, [sp, 0x8]
-	movs r2, 0x1
-	negs r2, r2
-	str r2, [sp, 0xC]
-	str r6, [sp, 0x10]
-	adds r2, r7, 0
-	mov r3, r12
-	bl AddTextPrinterParameterized4
-_081074D2:
-	add sp, 0x18
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end ListMenuPrint
-
-	thumb_func_start ListMenuPrintEntries
-ListMenuPrintEntries: @ 81074DC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	adds r4, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	mov r9, r1
-	lsls r2, 16
-	lsrs r2, 16
-	str r2, [sp]
-	lsls r3, 16
-	lsrs r3, 16
-	mov r10, r3
-	ldrb r0, [r4, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	movs r1, 0x1
-	bl GetFontAttribute
-	ldrb r1, [r4, 0x16]
-	lsls r1, 26
-	lsrs r1, 29
-	adds r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp, 0x4]
-	movs r0, 0
-	mov r8, r0
-	cmp r8, r10
-	bge _08107584
-_0810751E:
-	ldr r0, [r4]
-	mov r2, r9
-	lsls r1, r2, 3
-	adds r0, r1, r0
-	ldr r2, [r0, 0x4]
-	movs r0, 0x3
-	negs r0, r0
-	adds r5, r1, 0
-	cmp r2, r0
-	beq _08107536
-	ldrb r6, [r4, 0x12]
-	b _08107538
-_08107536:
-	ldrb r6, [r4, 0x11]
-_08107538:
-	ldr r0, [sp]
-	add r0, r8
-	ldr r2, [sp, 0x4]
-	adds r1, r0, 0
-	muls r1, r2
-	ldrb r0, [r4, 0x14]
-	lsls r0, 28
-	lsrs r0, 28
-	adds r0, r1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	adds r7, r2, 0
-	ldr r3, [r4, 0x8]
-	cmp r3, 0
-	beq _08107562
-	ldrb r0, [r4, 0x10]
-	ldr r1, [r4]
-	adds r1, r5, r1
-	ldr r1, [r1, 0x4]
-	bl _call_via_r3
-_08107562:
-	ldr r0, [r4]
-	adds r0, r5, r0
-	ldr r1, [r0]
-	adds r0, r4, 0
-	adds r2, r6, 0
-	adds r3, r7, 0
-	bl ListMenuPrint
-	mov r0, r9
-	adds r0, 0x1
-	lsls r0, 16
-	lsrs r0, 16
-	mov r9, r0
-	movs r0, 0x1
-	add r8, r0
-	cmp r8, r10
-	blt _0810751E
-_08107584:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end ListMenuPrintEntries
-
-	thumb_func_start ListMenuDrawCursor
-ListMenuDrawCursor: @ 8107594
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	ldrb r0, [r6, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	movs r1, 0x1
-	bl GetFontAttribute
-	ldrb r1, [r6, 0x16]
-	lsls r1, 26
-	lsrs r1, 29
-	adds r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r6, 0x13]
-	mov r8, r1
-	ldrh r1, [r6, 0x1A]
-	muls r1, r0
-	ldrb r0, [r6, 0x14]
-	lsls r0, 28
-	lsrs r0, 28
-	adds r0, r1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldrb r0, [r6, 0x17]
-	lsrs r0, 6
-	cmp r0, 0x1
-	beq _08107680
-	cmp r0, 0x1
-	bgt _081075DA
-	cmp r0, 0
-	beq _081075E4
-	b _08107680
-_081075DA:
-	cmp r0, 0x2
-	beq _081075F8
-	cmp r0, 0x3
-	beq _08107640
-	b _08107680
-_081075E4:
-	ldr r1, _081075F4 @ =gFameCheckerText_ListMenuCursor
-	adds r0, r6, 0
-	mov r2, r8
-	adds r3, r7, 0
-	bl ListMenuPrint
-	b _08107680
-	.align 2, 0
-_081075F4: .4byte gFameCheckerText_ListMenuCursor
-_081075F8:
-	ldrb r0, [r6, 0x1E]
-	cmp r0, 0xFF
-	bne _08107608
-	adds r0, r6, 0
-	movs r1, 0
-	bl ListMenuAddCursorObject
-	strb r0, [r6, 0x1E]
-_08107608:
-	ldrb r5, [r6, 0x1E]
-	ldrb r0, [r6, 0x10]
-	movs r1, 0x1
-	bl GetWindowAttribute
-	adds r4, r0, 0
-	lsls r4, 19
-	ldr r0, _0810763C @ =0xffff0000
-	adds r4, r0
-	lsrs r4, 16
-	ldrb r0, [r6, 0x10]
-	movs r1, 0x2
-	bl GetWindowAttribute
-	adds r2, r0, 0
-	lsls r2, 3
-	adds r2, r7
-	subs r2, 0x1
-	lsls r2, 16
-	lsrs r2, 16
-	adds r0, r5, 0
-	adds r1, r4, 0
-	movs r3, 0
-	bl ListMenuUpdateCursorObject
-	b _08107680
-	.align 2, 0
-_0810763C: .4byte 0xffff0000
-_08107640:
-	ldrb r0, [r6, 0x1E]
-	cmp r0, 0xFF
-	bne _08107650
-	adds r0, r6, 0
-	movs r1, 0x1
-	bl ListMenuAddCursorObject
-	strb r0, [r6, 0x1E]
-_08107650:
-	ldrb r5, [r6, 0x1E]
-	ldrb r0, [r6, 0x10]
-	movs r1, 0x1
-	bl GetWindowAttribute
-	adds r4, r0, 0
-	lsls r4, 3
-	add r4, r8
-	lsls r4, 16
-	lsrs r4, 16
-	ldrb r0, [r6, 0x10]
-	movs r1, 0x2
-	bl GetWindowAttribute
-	adds r2, r0, 0
-	lsls r2, 3
-	adds r2, r7
-	lsls r2, 16
-	lsrs r2, 16
-	adds r0, r5, 0
-	adds r1, r4, 0
-	movs r3, 0x1
-	bl ListMenuUpdateCursorObject
-_08107680:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end ListMenuDrawCursor
-
-	thumb_func_start ListMenuAddCursorObject
-ListMenuAddCursorObject: @ 810768C
-	push {r4,r5,lr}
-	sub sp, 0xC
-	adds r4, r0, 0
-	adds r5, r1, 0
-	mov r1, sp
-	movs r0, 0
-	strb r0, [r1]
-	movs r0, 0xA0
-	strb r0, [r1, 0x1]
-	ldrb r0, [r4, 0x10]
-	movs r1, 0x3
-	bl GetWindowAttribute
-	mov r1, sp
-	lsls r0, 3
-	adds r0, 0x2
-	strh r0, [r1, 0x2]
-	ldrb r0, [r4, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	movs r1, 0x1
-	bl GetFontAttribute
-	mov r1, sp
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x2
-	strh r0, [r1, 0x4]
-	movs r0, 0x80
-	lsls r0, 7
-	strh r0, [r1, 0x6]
-	ldr r0, _081076E8 @ =0x0000ffff
-	strh r0, [r1, 0x8]
-	movs r0, 0xF
-	strb r0, [r1, 0xA]
-	mov r0, sp
-	adds r1, r5, 0
-	bl ListMenuAddCursorObjectInternal
-	lsls r0, 24
-	lsrs r0, 24
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081076E8: .4byte 0x0000ffff
-	thumb_func_end ListMenuAddCursorObject
-
-	thumb_func_start ListMenuErasePrintedCursor
-ListMenuErasePrintedCursor: @ 81076EC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x8
-	adds r7, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	mov r8, r1
-	ldrb r1, [r7, 0x17]
-	lsrs r0, r1, 6
-	cmp r0, 0
-	bne _08107768
-	lsls r0, r1, 26
-	lsrs r0, 26
-	movs r1, 0x1
-	bl GetFontAttribute
-	adds r4, r0, 0
-	ldrb r0, [r7, 0x16]
-	lsls r0, 26
-	lsrs r0, 29
-	adds r4, r0
-	lsls r4, 24
-	lsrs r4, 24
-	ldrb r0, [r7, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	movs r1, 0
-	bl GetMenuCursorDimensionByFont
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	ldrb r0, [r7, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	movs r1, 0x1
-	bl GetMenuCursorDimensionByFont
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r6, [r7, 0x10]
-	ldrb r2, [r7, 0x15]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	ldrb r2, [r7, 0x13]
-	mov r3, r8
-	muls r3, r4
-	adds r4, r3, 0
-	ldrb r3, [r7, 0x14]
-	lsls r3, 28
-	lsrs r3, 28
-	adds r3, r4
-	lsls r3, 16
-	lsrs r3, 16
-	str r5, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r6, 0
-	bl FillWindowPixelRect
-_08107768:
-	add sp, 0x8
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end ListMenuErasePrintedCursor
-
-	thumb_func_start ListMenuUpdateSelectedRowIndexAndScrollOffset
-ListMenuUpdateSelectedRowIndexAndScrollOffset: @ 8107774
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	lsls r1, 24
-	ldrh r3, [r4, 0x1A]
-	ldrh r5, [r4, 0x18]
-	cmp r1, 0
-	bne _081077E8
-	ldrh r0, [r4, 0xE]
-	cmp r0, 0x1
-	bne _0810778C
-	movs r2, 0
-	b _0810779E
-_0810778C:
-	ldrh r0, [r4, 0xE]
-	lsrs r2, r0, 1
-	movs r1, 0x1
-	ands r1, r0
-	adds r2, r1
-	subs r0, r2
-	subs r0, 0x1
-	lsls r0, 16
-	lsrs r2, r0, 16
-_0810779E:
-	cmp r5, 0
-	bne _081077C4
-	cmp r3, 0
-	beq _0810782A
-	ldr r1, [r4]
-	movs r2, 0x3
-	negs r2, r2
-_081077AC:
-	subs r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	adds r0, r5, r3
-	lsls r0, 3
-	adds r0, r1
-	ldr r0, [r0, 0x4]
-	cmp r0, r2
-	bne _0810782E
-	cmp r3, 0
-	bne _081077AC
-	b _0810782A
-_081077C4:
-	cmp r3, r2
-	bls _081077E4
-	ldr r1, [r4]
-	movs r6, 0x3
-	negs r6, r6
-_081077CE:
-	subs r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	adds r0, r5, r3
-	lsls r0, 3
-	adds r0, r1
-	ldr r0, [r0, 0x4]
-	cmp r0, r6
-	bne _0810782E
-	cmp r3, r2
-	bhi _081077CE
-_081077E4:
-	subs r0, r5, 0x1
-	b _08107856
-_081077E8:
-	ldrh r0, [r4, 0xE]
-	cmp r0, 0x1
-	bne _081077F2
-	movs r2, 0
-	b _081077FC
-_081077F2:
-	ldrh r0, [r4, 0xE]
-	lsrs r2, r0, 1
-	movs r1, 0x1
-	ands r1, r0
-	adds r2, r1
-_081077FC:
-	adds r1, r0, 0
-	ldrh r0, [r4, 0xC]
-	subs r0, r1
-	cmp r5, r0
-	bne _08107834
-	subs r0, r1, 0x1
-	cmp r3, r0
-	bge _0810782A
-	ldr r2, [r4]
-	movs r6, 0x3
-	negs r6, r6
-	adds r1, r0, 0
-_08107814:
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	adds r0, r5, r3
-	lsls r0, 3
-	adds r0, r2
-	ldr r0, [r0, 0x4]
-	cmp r0, r6
-	bne _0810782E
-	cmp r3, r1
-	blt _08107814
-_0810782A:
-	movs r0, 0
-	b _0810785C
-_0810782E:
-	strh r3, [r4, 0x1A]
-	movs r0, 0x1
-	b _0810785C
-_08107834:
-	cmp r3, r2
-	bcs _08107854
-	ldr r1, [r4]
-	movs r6, 0x3
-	negs r6, r6
-_0810783E:
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	adds r0, r5, r3
-	lsls r0, 3
-	adds r0, r1
-	ldr r0, [r0, 0x4]
-	cmp r0, r6
-	bne _0810782E
-	cmp r3, r2
-	bcc _0810783E
-_08107854:
-	adds r0, r5, 0x1
-_08107856:
-	strh r2, [r4, 0x1A]
-	strh r0, [r4, 0x18]
-	movs r0, 0x2
-_0810785C:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end ListMenuUpdateSelectedRowIndexAndScrollOffset
-
-	thumb_func_start ListMenuScroll
-ListMenuScroll: @ 8107864
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x8
-	adds r6, r0, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	adds r7, r5, 0
-	lsls r2, 24
-	lsrs r2, 24
-	mov r8, r2
-	ldrh r0, [r6, 0xE]
-	cmp r5, r0
-	bcc _0810789E
-	ldrb r0, [r6, 0x10]
-	ldrb r2, [r6, 0x15]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	bl FillWindowPixelBuffer
-	ldrh r1, [r6, 0x18]
-	ldrh r3, [r6, 0xE]
-	adds r0, r6, 0
-	movs r2, 0
-	bl ListMenuPrintEntries
-	b _0810798E
-_0810789E:
-	ldrb r0, [r6, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	movs r1, 0x1
-	bl GetFontAttribute
-	ldrb r1, [r6, 0x16]
-	lsls r1, 26
-	lsrs r1, 29
-	adds r0, r1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	mov r1, r8
-	cmp r1, 0
-	bne _08107930
-	ldrb r0, [r6, 0x10]
-	adds r2, r5, 0
-	muls r2, r4
-	lsls r2, 24
-	lsrs r2, 24
-	ldrb r1, [r6, 0x15]
-	lsls r1, 28
-	lsrs r3, r1, 4
-	orrs r3, r1
-	lsrs r3, 24
-	movs r1, 0x1
-	bl ScrollWindow
-	ldrh r1, [r6, 0x18]
-	adds r0, r6, 0
-	movs r2, 0
-	adds r3, r5, 0
-	bl ListMenuPrintEntries
-	ldrh r0, [r6, 0xE]
-	adds r1, r0, 0
-	muls r1, r4
-	adds r0, r1, 0
-	ldrb r4, [r6, 0x14]
-	lsls r4, 28
-	lsrs r4, 28
-	adds r4, r0
-	lsls r4, 16
-	lsrs r4, 16
-	ldrb r0, [r6, 0x10]
-	movs r1, 0x3
-	bl GetWindowAttribute
-	adds r5, r0, 0
-	lsls r5, 19
-	lsrs r5, 16
-	ldrb r0, [r6, 0x10]
-	movs r1, 0x4
-	bl GetWindowAttribute
-	lsls r0, 3
-	subs r0, r4
-	lsls r0, 16
-	lsrs r0, 16
-	ldrb r3, [r6, 0x10]
-	ldrb r2, [r6, 0x15]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	str r5, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r3, 0
-	movs r2, 0
-	adds r3, r4, 0
-	bl FillWindowPixelRect
-	b _0810798E
-_08107930:
-	ldrb r0, [r6, 0x10]
-	adds r2, r7, 0
-	muls r2, r4
-	lsls r2, 24
-	lsrs r2, 24
-	ldrb r1, [r6, 0x15]
-	lsls r1, 28
-	lsrs r3, r1, 4
-	orrs r3, r1
-	lsrs r3, 24
-	movs r1, 0
-	bl ScrollWindow
-	ldrh r2, [r6, 0xE]
-	subs r2, r7
-	ldrh r1, [r6, 0x18]
-	adds r1, r2
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 16
-	lsrs r2, 16
-	adds r0, r6, 0
-	adds r3, r7, 0
-	bl ListMenuPrintEntries
-	ldrb r0, [r6, 0x10]
-	movs r1, 0x3
-	bl GetWindowAttribute
-	lsls r0, 19
-	lsrs r0, 16
-	ldrb r3, [r6, 0x10]
-	ldrb r2, [r6, 0x15]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	str r0, [sp]
-	ldrb r0, [r6, 0x14]
-	lsls r0, 28
-	lsrs r0, 28
-	str r0, [sp, 0x4]
-	adds r0, r3, 0
-	movs r2, 0
-	movs r3, 0
-	bl FillWindowPixelRect
-_0810798E:
-	add sp, 0x8
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end ListMenuScroll
-
-	thumb_func_start ListMenuChangeSelection
-ListMenuChangeSelection: @ 810799C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	adds r4, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	str r1, [sp]
-	lsls r2, 24
-	lsrs r2, 24
-	mov r8, r2
-	lsls r3, 24
-	lsrs r3, 24
-	mov r9, r3
-	ldrh r0, [r4, 0x1A]
-	mov r10, r0
-	movs r7, 0
-	movs r5, 0
-	movs r0, 0
-	cmp r7, r8
-	bcs _08107A04
-_081079CA:
-	adds r6, r0, 0x1
-	b _081079EA
-_081079CE:
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldrh r0, [r4, 0x18]
-	ldrh r1, [r4, 0x1A]
-	adds r0, r1
-	ldr r1, [r4]
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, [r0, 0x4]
-	movs r0, 0x3
-	negs r0, r0
-	cmp r1, r0
-	bne _081079FC
-_081079EA:
-	adds r0, r4, 0
-	mov r1, r9
-	bl ListMenuUpdateSelectedRowIndexAndScrollOffset
-	lsls r0, 24
-	lsrs r0, 24
-	orrs r5, r0
-	cmp r0, 0x2
-	beq _081079CE
-_081079FC:
-	lsls r0, r6, 24
-	lsrs r0, 24
-	cmp r0, r8
-	bcc _081079CA
-_08107A04:
-	ldr r0, [sp]
-	cmp r0, 0
-	beq _08107A62
-	cmp r5, 0x1
-	beq _08107A1A
-	cmp r5, 0x1
-	ble _08107A16
-	cmp r5, 0x3
-	ble _08107A3A
-_08107A16:
-	movs r0, 0x1
-	b _08107A64
-_08107A1A:
-	adds r0, r4, 0
-	mov r1, r10
-	bl ListMenuErasePrintedCursor
-	adds r0, r4, 0
-	bl ListMenuDrawCursor
-	adds r0, r4, 0
-	movs r1, 0
-	bl ListMenuCallSelectionChangedCallback
-	ldrb r0, [r4, 0x10]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	b _08107A62
-_08107A3A:
-	adds r0, r4, 0
-	mov r1, r10
-	bl ListMenuErasePrintedCursor
-	adds r0, r4, 0
-	adds r1, r7, 0
-	mov r2, r9
-	bl ListMenuScroll
-	adds r0, r4, 0
-	bl ListMenuDrawCursor
-	adds r0, r4, 0
-	movs r1, 0
-	bl ListMenuCallSelectionChangedCallback
-	ldrb r0, [r4, 0x10]
-	movs r1, 0x2
-	bl CopyWindowToVram
-_08107A62:
-	movs r0, 0
-_08107A64:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end ListMenuChangeSelection
-
-	thumb_func_start ListMenuCallSelectionChangedCallback
-ListMenuCallSelectionChangedCallback: @ 8107A74
-	push {r4,lr}
-	adds r2, r0, 0
-	lsls r1, 24
-	lsrs r4, r1, 24
-	ldr r3, [r2, 0x4]
-	cmp r3, 0
-	beq _08107A96
-	ldrh r0, [r2, 0x18]
-	ldrh r1, [r2, 0x1A]
-	adds r0, r1
-	ldr r1, [r2]
-	lsls r0, 3
-	adds r0, r1
-	ldr r0, [r0, 0x4]
-	adds r1, r4, 0
-	bl _call_via_r3
-_08107A96:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end ListMenuCallSelectionChangedCallback
-
-	thumb_func_start sub_8107A9C
-sub_8107A9C: @ 8107A9C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r6, _08107AE8 @ =gUnknown_3005E60
-	movs r5, 0xF
-	ands r0, r5
-	ldrb r3, [r6]
-	mov r8, r3
-	movs r4, 0x10
-	negs r4, r4
-	adds r3, r4, 0
-	mov r7, r8
-	ands r3, r7
-	orrs r3, r0
-	lsrs r1, 20
-	ands r3, r5
-	orrs r3, r1
-	strb r3, [r6]
-	ands r2, r5
-	ldrb r0, [r6, 0x1]
-	ands r4, r0
-	orrs r4, r2
-	strb r4, [r6, 0x1]
-	ldrb r0, [r6, 0x3]
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r6, 0x3]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08107AE8: .4byte gUnknown_3005E60
-	thumb_func_end sub_8107A9C
-
-	thumb_func_start ListMenuDefaultCursorMoveFunc
-ListMenuDefaultCursorMoveFunc: @ 8107AEC
-	push {lr}
-	lsls r1, 24
-	cmp r1, 0
-	bne _08107AFA
-	movs r0, 0x5
-	bl PlaySE
-_08107AFA:
-	pop {r0}
-	bx r0
-	thumb_func_end ListMenuDefaultCursorMoveFunc
-
-	thumb_func_start sub_8107B00
-sub_8107B00: @ 8107B00
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r3, r1, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08107B24 @ =gTasks+0x8
-	adds r2, r1, r0
-	cmp r3, 0x10
-	bhi _08107BC8
-	lsls r0, r3, 2
-	ldr r1, _08107B28 @ =_08107B2C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08107B24: .4byte gTasks+0x8
-_08107B28: .4byte _08107B2C
-	.align 2, 0
-_08107B2C:
-	.4byte _08107B70
-	.4byte _08107B70
-	.4byte _08107B74
-	.4byte _08107B78
-	.4byte _08107B7C
-	.4byte _08107B80
-	.4byte _08107B84
-	.4byte _08107B88
-	.4byte _08107B8C
-	.4byte _08107B90
-	.4byte _08107B96
-	.4byte _08107B9E
-	.4byte _08107BA4
-	.4byte _08107BAC
-	.4byte _08107BB4
-	.4byte _08107BBA
-	.4byte _08107BC2
-_08107B70:
-	ldr r0, [r2, 0x4]
-	b _08107BCC
-_08107B74:
-	ldrh r0, [r2, 0xC]
-	b _08107BCC
-_08107B78:
-	ldrh r0, [r2, 0xE]
-	b _08107BCC
-_08107B7C:
-	ldrb r0, [r2, 0x10]
-	b _08107BCC
-_08107B80:
-	ldrb r0, [r2, 0x11]
-	b _08107BCC
-_08107B84:
-	ldrb r0, [r2, 0x12]
-	b _08107BCC
-_08107B88:
-	ldrb r0, [r2, 0x13]
-	b _08107BCC
-_08107B8C:
-	ldrb r0, [r2, 0x14]
-	b _08107B98
-_08107B90:
-	ldrb r0, [r2, 0x14]
-	lsrs r0, 4
-	b _08107BCC
-_08107B96:
-	ldrb r0, [r2, 0x15]
-_08107B98:
-	lsls r0, 28
-	lsrs r0, 28
-	b _08107BCC
-_08107B9E:
-	ldrb r0, [r2, 0x15]
-	lsrs r0, 4
-	b _08107BCC
-_08107BA4:
-	ldrb r0, [r2, 0x16]
-	lsls r0, 29
-	lsrs r0, 29
-	b _08107BCC
-_08107BAC:
-	ldrb r0, [r2, 0x16]
-	lsls r0, 26
-	lsrs r0, 29
-	b _08107BCC
-_08107BB4:
-	ldrb r0, [r2, 0x16]
-	lsrs r0, 6
-	b _08107BCC
-_08107BBA:
-	ldrb r0, [r2, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	b _08107BCC
-_08107BC2:
-	ldrb r0, [r2, 0x17]
-	lsrs r0, 6
-	b _08107BCC
-_08107BC8:
-	movs r0, 0x1
-	negs r0, r0
-_08107BCC:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8107B00
-
-	thumb_func_start sub_8107BD0
-sub_8107BD0: @ 8107BD0
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r4, r1, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08107BF4 @ =gTasks+0x8
-	adds r3, r1, r0
-	cmp r4, 0x10
-	bhi _08107CD0
-	lsls r0, r4, 2
-	ldr r1, _08107BF8 @ =_08107BFC
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08107BF4: .4byte gTasks+0x8
-_08107BF8: .4byte _08107BFC
-	.align 2, 0
-_08107BFC:
-	.4byte _08107C40
-	.4byte _08107C40
-	.4byte _08107C44
-	.4byte _08107C48
-	.4byte _08107C4C
-	.4byte _08107C50
-	.4byte _08107C54
-	.4byte _08107C58
-	.4byte _08107C5C
-	.4byte _08107C68
-	.4byte _08107C76
-	.4byte _08107C82
-	.4byte _08107C90
-	.4byte _08107C9C
-	.4byte _08107CAA
-	.4byte _08107CB8
-	.4byte _08107CC4
-_08107C40:
-	str r2, [r3, 0x4]
-	b _08107CD0
-_08107C44:
-	strh r2, [r3, 0xC]
-	b _08107CD0
-_08107C48:
-	strh r2, [r3, 0xE]
-	b _08107CD0
-_08107C4C:
-	strb r2, [r3, 0x10]
-	b _08107CD0
-_08107C50:
-	strb r2, [r3, 0x11]
-	b _08107CD0
-_08107C54:
-	strb r2, [r3, 0x12]
-	b _08107CD0
-_08107C58:
-	strb r2, [r3, 0x13]
-	b _08107CD0
-_08107C5C:
-	movs r0, 0xF
-	ands r2, r0
-	ldrb r1, [r3, 0x14]
-	movs r0, 0x10
-	negs r0, r0
-	b _08107C6E
-_08107C68:
-	lsls r2, 4
-	ldrb r1, [r3, 0x14]
-	movs r0, 0xF
-_08107C6E:
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r3, 0x14]
-	b _08107CD0
-_08107C76:
-	movs r0, 0xF
-	ands r2, r0
-	ldrb r1, [r3, 0x15]
-	movs r0, 0x10
-	negs r0, r0
-	b _08107C88
-_08107C82:
-	lsls r2, 4
-	ldrb r1, [r3, 0x15]
-	movs r0, 0xF
-_08107C88:
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r3, 0x15]
-	b _08107CD0
-_08107C90:
-	movs r0, 0x7
-	ands r2, r0
-	ldrb r1, [r3, 0x16]
-	movs r0, 0x8
-	negs r0, r0
-	b _08107CB0
-_08107C9C:
-	movs r0, 0x7
-	ands r2, r0
-	lsls r2, 3
-	ldrb r1, [r3, 0x16]
-	movs r0, 0x39
-	negs r0, r0
-	b _08107CB0
-_08107CAA:
-	lsls r2, 6
-	ldrb r1, [r3, 0x16]
-	movs r0, 0x3F
-_08107CB0:
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r3, 0x16]
-	b _08107CD0
-_08107CB8:
-	movs r0, 0x3F
-	ands r2, r0
-	ldrb r1, [r3, 0x17]
-	movs r0, 0x40
-	negs r0, r0
-	b _08107CCA
-_08107CC4:
-	lsls r2, 6
-	ldrb r1, [r3, 0x17]
-	movs r0, 0x3F
-_08107CCA:
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r3, 0x17]
-_08107CD0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8107BD0
-
-	thumb_func_start sub_8107CD8
-sub_8107CD8: @ 8107CD8
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r0, r1, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, 16
-	lsrs r0, 16
-	bl sub_80971CC
-	adds r1, r4, 0
-	movs r2, 0x20
-	bl LoadPalette
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8107CD8
-
-	thumb_func_start sub_8107CF8
-sub_8107CF8: @ 8107CF8
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r6, r0, 0
-	adds r0, r1, 0
-	adds r1, r2, 0
-	adds r4, r3, 0
-	ldr r5, [sp, 0x18]
-	lsls r6, 24
-	lsrs r6, 24
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	movs r2, 0x1
-	bl GetMonIconPtr
-	adds r1, r0, 0
-	movs r0, 0x20
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r6, 0
-	adds r2, r4, 0
-	adds r3, r5, 0
-	bl BlitBitmapToWindow
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8107CF8
-
-	thumb_func_start sub_8107D38
-sub_8107D38: @ 8107D38
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	cmp r1, 0
-	beq _08107D4A
-	cmp r1, 0x1
-	beq _08107D54
-_08107D4A:
-	ldr r0, _08107D50 @ =gUnknown_8E95D9C
-	b _08107D56
-	.align 2, 0
-_08107D50: .4byte gUnknown_8E95D9C
-_08107D54:
-	ldr r0, _08107D64 @ =gUnknown_8E95DBC
-_08107D56:
-	adds r1, r2, 0
-	movs r2, 0x20
-	bl LoadPalette
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08107D64: .4byte gUnknown_8E95DBC
-	thumb_func_end sub_8107D38
-
-	thumb_func_start blit_move_info_icon
-blit_move_info_icon: @ 8107D68
-	push {r4,r5,lr}
-	sub sp, 0x18
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsls r2, 16
-	lsrs r2, 16
-	lsls r3, 16
-	lsrs r3, 16
-	ldr r4, _08107DAC @ =gUnknown_8452C94
-	lsrs r1, 22
-	adds r1, r4
-	ldrh r5, [r1, 0x2]
-	lsls r5, 5
-	ldr r4, _08107DB0 @ =gUnknown_8E95DDC
-	adds r5, r4
-	movs r4, 0x80
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r2, [sp, 0x8]
-	str r3, [sp, 0xC]
-	ldrb r2, [r1]
-	str r2, [sp, 0x10]
-	ldrb r1, [r1, 0x1]
-	str r1, [sp, 0x14]
-	adds r1, r5, 0
-	movs r2, 0
-	movs r3, 0
-	bl BlitBitmapRectToWindow
-	add sp, 0x18
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08107DAC: .4byte gUnknown_8452C94
-_08107DB0: .4byte gUnknown_8E95DDC
-	thumb_func_end blit_move_info_icon
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/menu_indicators.s b/asm/menu_indicators.s
deleted file mode 100644
index d7b78b1b2..000000000
--- a/asm/menu_indicators.s
+++ /dev/null
@@ -1,1185 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8133904
-sub_8133904: @ 8133904
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _08133916
-	cmp r0, 0x1
-	beq _0813392A
-	b _08133984
-_08133916:
-	ldrh r1, [r4, 0x30]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl StartSpriteAnim
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	b _08133984
-_0813392A:
-	movs r1, 0x32
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _0813393A
-	cmp r0, 0x1
-	beq _08133960
-	ldrh r2, [r4, 0x38]
-	b _0813397E
-_0813393A:
-	movs r0, 0x34
-	ldrsh r3, [r4, r0]
-	ldr r1, _0813395C @ =gSineTable
-	ldrh r2, [r4, 0x38]
-	lsls r0, r2, 24
-	lsrs r0, 23
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	muls r0, r3
-	cmp r0, 0
-	bge _08133954
-	adds r0, 0xFF
-_08133954:
-	asrs r0, 8
-	strh r0, [r4, 0x24]
-	b _0813397E
-	.align 2, 0
-_0813395C: .4byte gSineTable
-_08133960:
-	movs r0, 0x34
-	ldrsh r3, [r4, r0]
-	ldr r1, _0813398C @ =gSineTable
-	ldrh r2, [r4, 0x38]
-	lsls r0, r2, 24
-	lsrs r0, 23
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	muls r0, r3
-	cmp r0, 0
-	bge _0813397A
-	adds r0, 0xFF
-_0813397A:
-	asrs r0, 8
-	strh r0, [r4, 0x26]
-_0813397E:
-	ldrh r0, [r4, 0x36]
-	adds r0, r2, r0
-	strh r0, [r4, 0x38]
-_08133984:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813398C: .4byte gSineTable
-	thumb_func_end sub_8133904
-
-	thumb_func_start AddScrollIndicatorArrowObject
-AddScrollIndicatorArrowObject: @ 8133990
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x18
-	adds r6, r0, 0
-	ldr r5, [sp, 0x30]
-	lsls r6, 24
-	lsrs r6, 24
-	mov r8, r6
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r5, 16
-	lsrs r5, 16
-	mov r12, r5
-	mov r4, sp
-	ldr r0, _08133A14 @ =gUnknown_84632A4
-	ldm r0!, {r5-r7}
-	stm r4!, {r5-r7}
-	ldm r0!, {r5-r7}
-	stm r4!, {r5-r7}
-	mov r0, sp
-	movs r4, 0
-	strh r3, [r0]
-	mov r3, r12
-	strh r3, [r0, 0x2]
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08133A18 @ =gSprites
-	lsls r3, r0, 4
-	adds r3, r0
-	lsls r3, 2
-	adds r3, r1
-	adds r5, r3, 0
-	adds r5, 0x3E
-	ldrb r1, [r5]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r5]
-	strh r4, [r3, 0x2E]
-	ldr r1, _08133A1C @ =gUnknown_846325C
-	mov r5, r8
-	lsls r6, r5, 2
-	adds r6, r1
-	ldrb r2, [r6]
-	lsls r1, r2, 28
-	lsrs r1, 28
-	strh r1, [r3, 0x30]
-	lsrs r2, 4
-	strh r2, [r3, 0x32]
-	ldrb r1, [r6, 0x1]
-	strh r1, [r3, 0x34]
-	ldrh r1, [r6, 0x2]
-	strh r1, [r3, 0x36]
-	strh r4, [r3, 0x38]
-	add sp, 0x18
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08133A14: .4byte gUnknown_84632A4
-_08133A18: .4byte gSprites
-_08133A1C: .4byte gUnknown_846325C
-	thumb_func_end AddScrollIndicatorArrowObject
-
-	thumb_func_start AddScrollIndicatorArrowPair
-AddScrollIndicatorArrowPair: @ 8133A20
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x14
-	adds r6, r0, 0
-	mov r9, r1
-	ldr r0, _08133A6C @ =gUnknown_8463328
-	str r0, [sp, 0x4]
-	ldr r5, _08133A70 @ =0xffff0000
-	ldr r0, [sp, 0x8]
-	ands r0, r5
-	movs r1, 0x80
-	lsls r1, 1
-	orrs r0, r1
-	ldrh r1, [r6, 0xA]
-	lsls r1, 16
-	ldr r4, _08133A74 @ =0x0000ffff
-	ands r0, r4
-	orrs r0, r1
-	str r0, [sp, 0x8]
-	add r0, sp, 0x4
-	bl LoadCompressedSpriteSheet
-	ldrh r2, [r6, 0xC]
-	cmp r2, r4
-	bne _08133A7C
-	ldr r0, _08133A78 @ =gUnknown_8463308
-	ldrb r1, [r6, 0xE]
-	lsls r1, 20
-	movs r2, 0x80
-	lsls r2, 17
-	adds r1, r2
-	lsrs r1, 16
-	movs r2, 0x20
-	bl LoadPalette
-	b _08133A8E
-	.align 2, 0
-_08133A6C: .4byte gUnknown_8463328
-_08133A70: .4byte 0xffff0000
-_08133A74: .4byte 0x0000ffff
-_08133A78: .4byte gUnknown_8463308
-_08133A7C:
-	ldr r0, _08133B2C @ =gUnknown_8463308
-	str r0, [sp, 0xC]
-	add r0, sp, 0xC
-	ldr r1, [r0, 0x4]
-	ands r1, r5
-	orrs r1, r2
-	str r1, [r0, 0x4]
-	bl LoadSpritePalette
-_08133A8E:
-	ldr r0, _08133B30 @ =sub_8133BA4
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r0, 2
-	add r0, r8
-	lsls r0, 3
-	ldr r1, _08133B34 @ =gTasks+0x8
-	adds r7, r0, r1
-	movs r0, 0
-	strb r0, [r7]
-	mov r0, r9
-	str r0, [r7, 0x4]
-	ldrh r0, [r6, 0x6]
-	strh r0, [r7, 0x8]
-	ldrh r0, [r6, 0x8]
-	strh r0, [r7, 0xA]
-	ldrh r0, [r6, 0xA]
-	strh r0, [r7, 0xE]
-	ldrh r0, [r6, 0xC]
-	strh r0, [r7, 0x10]
-	ldrb r0, [r6]
-	ldrb r1, [r6, 0x1]
-	ldrb r2, [r6, 0x2]
-	ldrh r3, [r6, 0xA]
-	ldrh r4, [r6, 0xC]
-	str r4, [sp]
-	bl AddScrollIndicatorArrowObject
-	strb r0, [r7, 0xC]
-	ldrb r0, [r6, 0x3]
-	ldrb r1, [r6, 0x4]
-	ldrb r2, [r6, 0x5]
-	ldrh r3, [r6, 0xA]
-	ldrh r4, [r6, 0xC]
-	str r4, [sp]
-	bl AddScrollIndicatorArrowObject
-	strb r0, [r7, 0xD]
-	ldrh r1, [r6, 0xC]
-	ldr r0, _08133B38 @ =0x0000ffff
-	cmp r1, r0
-	bne _08133B1C
-	ldr r5, _08133B3C @ =gSprites
-	ldrb r0, [r7, 0xC]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r5
-	ldrb r3, [r6, 0xE]
-	lsls r3, 4
-	ldrb r4, [r1, 0x5]
-	movs r2, 0xF
-	adds r0, r2, 0
-	ands r0, r4
-	orrs r0, r3
-	strb r0, [r1, 0x5]
-	ldrb r1, [r7, 0xD]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldrb r1, [r6, 0xE]
-	lsls r1, 4
-	ldrb r3, [r0, 0x5]
-	ands r2, r3
-	orrs r2, r1
-	strb r2, [r0, 0x5]
-_08133B1C:
-	mov r0, r8
-	add sp, 0x14
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08133B2C: .4byte gUnknown_8463308
-_08133B30: .4byte sub_8133BA4
-_08133B34: .4byte gTasks+0x8
-_08133B38: .4byte 0x0000ffff
-_08133B3C: .4byte gSprites
-	thumb_func_end AddScrollIndicatorArrowPair
-
-	thumb_func_start AddScrollIndicatorArrowPairParameterized
-AddScrollIndicatorArrowPairParameterized: @ 8133B40
-	push {r4,lr}
-	adds r4, r1, 0
-	subs r0, 0x2
-	cmp r0, 0x1
-	bhi _08133B64
-	ldr r0, _08133B60 @ =gUnknown_203B130
-	movs r1, 0x2
-	strb r1, [r0]
-	strb r4, [r0, 0x1]
-	strb r2, [r0, 0x2]
-	movs r1, 0x3
-	strb r1, [r0, 0x3]
-	strb r4, [r0, 0x4]
-	strb r3, [r0, 0x5]
-	b _08133B76
-	.align 2, 0
-_08133B60: .4byte gUnknown_203B130
-_08133B64:
-	ldr r0, _08133BA0 @ =gUnknown_203B130
-	movs r1, 0
-	strb r1, [r0]
-	strb r2, [r0, 0x1]
-	strb r4, [r0, 0x2]
-	movs r1, 0x1
-	strb r1, [r0, 0x3]
-	strb r3, [r0, 0x4]
-	strb r4, [r0, 0x5]
-_08133B76:
-	adds r2, r0, 0
-	movs r1, 0
-	movs r0, 0
-	strh r0, [r2, 0x6]
-	ldr r0, [sp, 0x8]
-	strh r0, [r2, 0x8]
-	ldr r0, [sp, 0xC]
-	strh r0, [r2, 0xA]
-	ldr r0, [sp, 0x10]
-	strh r0, [r2, 0xC]
-	strb r1, [r2, 0xE]
-	adds r0, r2, 0
-	ldr r1, [sp, 0x14]
-	bl AddScrollIndicatorArrowPair
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08133BA0: .4byte gUnknown_203B130
-	thumb_func_end AddScrollIndicatorArrowPairParameterized
-
-	thumb_func_start sub_8133BA4
-sub_8133BA4: @ 8133BA4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08133BD4 @ =gTasks+0x8
-	adds r4, r1, r0
-	ldr r0, [r4, 0x4]
-	ldrh r5, [r0]
-	ldrh r0, [r4, 0x8]
-	cmp r5, r0
-	bne _08133BDC
-	ldr r3, _08133BD8 @ =gSprites
-	ldrb r1, [r4, 0xC]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	b _08133BF2
-	.align 2, 0
-_08133BD4: .4byte gTasks+0x8
-_08133BD8: .4byte gSprites
-_08133BDC:
-	ldr r3, _08133C10 @ =gSprites
-	ldrb r1, [r4, 0xC]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-_08133BF2:
-	strb r1, [r0]
-	ldrh r0, [r4, 0xA]
-	cmp r5, r0
-	bne _08133C14
-	ldrb r1, [r4, 0xD]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	b _08133C28
-	.align 2, 0
-_08133C10: .4byte gSprites
-_08133C14:
-	ldrb r1, [r4, 0xD]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	adds r0, 0x3E
-	ldrb r2, [r0]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r2
-_08133C28:
-	strb r1, [r0]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8133BA4
-
-	thumb_func_start RemoveScrollIndicatorArrowPair
-RemoveScrollIndicatorArrowPair: @ 8133C30
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r6, r0, 0
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, _08133C84 @ =gTasks+0x8
-	adds r5, r0, r1
-	ldrh r0, [r5, 0xE]
-	ldr r4, _08133C88 @ =0x0000ffff
-	cmp r0, r4
-	beq _08133C4E
-	bl FreeSpriteTilesByTag
-_08133C4E:
-	ldrh r0, [r5, 0x10]
-	cmp r0, r4
-	beq _08133C58
-	bl FreeSpritePaletteByTag
-_08133C58:
-	ldrb r1, [r5, 0xC]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r4, _08133C8C @ =gSprites
-	adds r0, r4
-	bl DestroySprite
-	ldrb r1, [r5, 0xD]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	bl DestroySprite
-	adds r0, r6, 0
-	bl DestroyTask
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08133C84: .4byte gTasks+0x8
-_08133C88: .4byte 0x0000ffff
-_08133C8C: .4byte gSprites
-	thumb_func_end RemoveScrollIndicatorArrowPair
-
-	thumb_func_start ListMenuAddCursorObjectInternal
-ListMenuAddCursorObjectInternal: @ 8133C90
-	push {lr}
-	cmp r1, 0
-	beq _08133C9A
-	cmp r1, 0x1
-	beq _08133CA0
-_08133C9A:
-	bl ListMenuAddRedOutlineCursorObject
-	b _08133CA4
-_08133CA0:
-	bl ListMenuAddRedArrowCursorObject
-_08133CA4:
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end ListMenuAddCursorObjectInternal
-
-	thumb_func_start ListMenuUpdateCursorObject
-ListMenuUpdateCursorObject: @ 8133CAC
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 16
-	lsrs r2, 16
-	cmp r3, 0
-	beq _08133CC4
-	cmp r3, 0x1
-	beq _08133CCA
-	b _08133CCE
-_08133CC4:
-	bl ListMenuUpdateRedOutlineCursorObject
-	b _08133CCE
-_08133CCA:
-	bl ListMenuUpdateRedArrowCursorObject
-_08133CCE:
-	pop {r0}
-	bx r0
-	thumb_func_end ListMenuUpdateCursorObject
-
-	thumb_func_start ListMenuRemoveCursorObject
-ListMenuRemoveCursorObject: @ 8133CD4
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r1, 0
-	beq _08133CE4
-	cmp r1, 0x1
-	beq _08133CEA
-	b _08133CEE
-_08133CE4:
-	bl ListMenuRemoveRedOutlineCursorObject
-	b _08133CEE
-_08133CEA:
-	bl ListMenuRemoveRedArrowCursorObject
-_08133CEE:
-	pop {r0}
-	bx r0
-	thumb_func_end ListMenuRemoveCursorObject
-
-	thumb_func_start nullsub_94
-nullsub_94: @ 8133CF4
-	bx lr
-	thumb_func_end nullsub_94
-
-	thumb_func_start ListMenuGetRedOutlineCursorSpriteCount
-ListMenuGetRedOutlineCursorSpriteCount: @ 8133CF8
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r1, 16
-	lsrs r1, 16
-	movs r3, 0x4
-	cmp r0, 0x10
-	bls _08133D18
-	movs r2, 0x8
-	subs r0, 0x8
-	cmp r2, r0
-	bge _08133D18
-_08133D10:
-	adds r3, 0x2
-	adds r2, 0x8
-	cmp r2, r0
-	blt _08133D10
-_08133D18:
-	cmp r1, 0x10
-	bls _08133D2C
-	movs r2, 0x8
-	subs r1, 0x8
-	cmp r2, r1
-	bge _08133D2C
-_08133D24:
-	adds r3, 0x2
-	adds r2, 0x8
-	cmp r2, r1
-	blt _08133D24
-_08133D2C:
-	lsls r0, r3, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end ListMenuGetRedOutlineCursorSpriteCount
-
-	thumb_func_start ListMenuSetUpRedOutlineCursorSpriteOamTable
-ListMenuSetUpRedOutlineCursorSpriteOamTable: @ 8133D34
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	adds r3, r2, 0
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	lsls r1, 16
-	lsrs r1, 16
-	mov r9, r1
-	ldr r0, _08133E18 @ =gUnknown_84632BC
-	ldr r0, [r0]
-	str r0, [r3]
-	movs r1, 0x88
-	strb r1, [r3]
-	strb r1, [r3, 0x1]
-	ldr r0, _08133E1C @ =gUnknown_84632C0
-	ldr r0, [r0]
-	str r0, [r3, 0x4]
-	mov r2, r8
-	adds r2, 0x80
-	strb r2, [r3, 0x4]
-	strb r1, [r3, 0x5]
-	ldr r0, _08133E20 @ =gUnknown_84632D4
-	ldr r0, [r0]
-	str r0, [r3, 0x8]
-	strb r1, [r3, 0x8]
-	mov r4, r9
-	adds r4, 0x80
-	strb r4, [r3, 0x9]
-	ldr r0, _08133E24 @ =gUnknown_84632D8
-	ldr r0, [r0]
-	str r0, [r3, 0xC]
-	strb r2, [r3, 0xC]
-	strb r4, [r3, 0xD]
-	movs r0, 0x4
-	mov r12, r0
-	mov r2, r8
-	cmp r2, 0x10
-	bls _08133DC8
-	movs r2, 0x8
-	mov r5, r8
-	subs r5, 0x8
-	cmp r2, r5
-	bge _08133DC8
-	ldr r0, _08133E28 @ =gUnknown_84632C4
-	ldr r0, [r0]
-	str r0, [sp]
-	ldr r0, _08133E2C @ =gUnknown_84632D0
-	ldr r6, [r0]
-	adds r1, r3, 0
-	adds r1, 0x10
-	movs r7, 0x88
-	mov r10, r7
-_08133DA6:
-	ldr r0, [sp]
-	str r0, [r1]
-	adds r0, r2, 0
-	subs r0, 0x78
-	strb r0, [r1]
-	mov r7, r10
-	strb r7, [r1, 0x1]
-	adds r1, 0x4
-	str r6, [r1]
-	strb r0, [r1]
-	strb r4, [r1, 0x1]
-	adds r1, 0x4
-	movs r0, 0x2
-	add r12, r0
-	adds r2, 0x8
-	cmp r2, r5
-	blt _08133DA6
-_08133DC8:
-	mov r2, r9
-	cmp r2, 0x10
-	bls _08133E06
-	movs r1, 0x8
-	mov r4, r9
-	subs r4, 0x8
-	cmp r1, r4
-	bge _08133E06
-	ldr r0, _08133E30 @ =gUnknown_84632C8
-	ldr r6, [r0]
-	ldr r0, _08133E34 @ =gUnknown_84632CC
-	ldr r5, [r0]
-	mov r7, r12
-	lsls r0, r7, 2
-	adds r2, r0, r3
-	movs r7, 0x88
-	mov r3, r8
-	adds r3, 0x80
-_08133DEC:
-	str r6, [r2]
-	strb r7, [r2]
-	adds r0, r1, 0
-	subs r0, 0x78
-	strb r0, [r2, 0x1]
-	adds r2, 0x4
-	str r5, [r2]
-	strb r3, [r2]
-	strb r0, [r2, 0x1]
-	adds r2, 0x4
-	adds r1, 0x8
-	cmp r1, r4
-	blt _08133DEC
-_08133E06:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08133E18: .4byte gUnknown_84632BC
-_08133E1C: .4byte gUnknown_84632C0
-_08133E20: .4byte gUnknown_84632D4
-_08133E24: .4byte gUnknown_84632D8
-_08133E28: .4byte gUnknown_84632C4
-_08133E2C: .4byte gUnknown_84632D0
-_08133E30: .4byte gUnknown_84632C8
-_08133E34: .4byte gUnknown_84632CC
-	thumb_func_end ListMenuSetUpRedOutlineCursorSpriteOamTable
-
-	thumb_func_start ListMenuAddRedOutlineCursorObject
-ListMenuAddRedOutlineCursorObject: @ 8133E38
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x28
-	adds r6, r0, 0
-	ldr r0, _08133E84 @ =gUnknown_8463398
-	str r0, [sp, 0x18]
-	ldr r5, _08133E88 @ =0xffff0000
-	add r0, sp, 0x18
-	ldr r1, [r0, 0x4]
-	ands r1, r5
-	movs r2, 0x80
-	lsls r2, 1
-	orrs r1, r2
-	ldrh r2, [r6, 0x6]
-	lsls r2, 16
-	ldr r3, _08133E8C @ =0x0000ffff
-	ands r1, r3
-	orrs r1, r2
-	str r1, [r0, 0x4]
-	bl LoadCompressedSpriteSheet
-	ldrh r2, [r6, 0x8]
-	ldr r7, _08133E8C @ =0x0000ffff
-	cmp r2, r7
-	bne _08133E94
-	ldr r0, _08133E90 @ =gUnknown_8463308
-	ldrb r1, [r6, 0xA]
-	lsls r1, 20
-	movs r2, 0x80
-	lsls r2, 17
-	adds r1, r2
-	lsrs r1, 16
-	movs r2, 0x20
-	bl LoadPalette
-	b _08133EA6
-	.align 2, 0
-_08133E84: .4byte gUnknown_8463398
-_08133E88: .4byte 0xffff0000
-_08133E8C: .4byte 0x0000ffff
-_08133E90: .4byte gUnknown_8463308
-_08133E94:
-	ldr r0, _08133F8C @ =gUnknown_8463308
-	str r0, [sp, 0x20]
-	add r0, sp, 0x20
-	ldr r1, [r0, 0x4]
-	ands r1, r5
-	orrs r1, r2
-	str r1, [r0, 0x4]
-	bl LoadSpritePalette
-_08133EA6:
-	ldr r0, _08133F90 @ =nullsub_94
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	adds r4, r0, 0
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	ldr r1, _08133F94 @ =gTasks+0x8
-	adds r5, r0, r1
-	ldrh r0, [r6, 0x6]
-	movs r3, 0
-	mov r8, r3
-	strh r0, [r5, 0xE]
-	ldrh r0, [r6, 0x8]
-	strh r0, [r5, 0x10]
-	ldrh r0, [r6, 0x2]
-	ldrh r1, [r6, 0x4]
-	bl ListMenuGetRedOutlineCursorSpriteCount
-	strb r0, [r5]
-	ldrb r0, [r5]
-	lsls r0, 2
-	bl Alloc
-	adds r2, r0, 0
-	str r2, [r5, 0x8]
-	str r2, [r5, 0x4]
-	ldrh r0, [r6, 0x2]
-	ldrh r1, [r6, 0x4]
-	bl ListMenuSetUpRedOutlineCursorSpriteOamTable
-	mov r1, sp
-	ldr r0, _08133F98 @ =gDummySpriteTemplate
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	mov r1, sp
-	ldrh r0, [r6, 0x6]
-	strh r0, [r1]
-	ldrh r0, [r6, 0x8]
-	strh r0, [r1, 0x2]
-	ldrb r1, [r6]
-	adds r1, 0x78
-	ldrb r2, [r6, 0x1]
-	adds r2, 0x78
-	mov r0, sp
-	movs r3, 0
-	bl CreateSprite
-	strb r0, [r5, 0xC]
-	ldrb r1, [r5, 0xC]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r7, _08133F9C @ =gSprites
-	adds r0, r7
-	adds r1, r5, 0
-	bl SetSubspriteTables
-	ldrb r0, [r5, 0xC]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r7
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x5]
-	ldrb r1, [r5, 0xC]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	adds r0, 0x43
-	mov r1, r8
-	strb r1, [r0]
-	ldrb r1, [r5, 0xC]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r7
-	adds r0, 0x42
-	ldrb r2, [r0]
-	movs r1, 0x40
-	negs r1, r1
-	ands r1, r2
-	strb r1, [r0]
-	ldrh r1, [r6, 0x8]
-	ldr r0, _08133FA0 @ =0x0000ffff
-	cmp r1, r0
-	bne _08133F7E
-	ldrb r0, [r5, 0xC]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r7
-	ldrb r2, [r6, 0xA]
-	lsls r2, 4
-	ldrb r3, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-_08133F7E:
-	adds r0, r4, 0
-	add sp, 0x28
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08133F8C: .4byte gUnknown_8463308
-_08133F90: .4byte nullsub_94
-_08133F94: .4byte gTasks+0x8
-_08133F98: .4byte gDummySpriteTemplate
-_08133F9C: .4byte gSprites
-_08133FA0: .4byte 0x0000ffff
-	thumb_func_end ListMenuAddRedOutlineCursorObject
-
-	thumb_func_start ListMenuUpdateRedOutlineCursorObject
-ListMenuUpdateRedOutlineCursorObject: @ 8133FA4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 16
-	lsrs r2, 16
-	lsls r3, r0, 2
-	adds r3, r0
-	lsls r3, 3
-	ldr r0, _08133FE0 @ =gTasks+0x8
-	adds r3, r0
-	ldr r5, _08133FE4 @ =gSprites
-	ldrb r4, [r3, 0xC]
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	adds r0, r5
-	adds r1, 0x78
-	strh r1, [r0, 0x20]
-	ldrb r1, [r3, 0xC]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	adds r2, 0x78
-	strh r2, [r0, 0x22]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08133FE0: .4byte gTasks+0x8
-_08133FE4: .4byte gSprites
-	thumb_func_end ListMenuUpdateRedOutlineCursorObject
-
-	thumb_func_start ListMenuRemoveRedOutlineCursorObject
-ListMenuRemoveRedOutlineCursorObject: @ 8133FE8
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r5, r0, 0
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, _08134034 @ =gTasks+0x8
-	adds r4, r0, r1
-	ldr r0, [r4, 0x8]
-	bl Free
-	ldrh r0, [r4, 0xE]
-	ldr r6, _08134038 @ =0x0000ffff
-	cmp r0, r6
-	beq _0813400C
-	bl FreeSpriteTilesByTag
-_0813400C:
-	ldrh r0, [r4, 0x10]
-	cmp r0, r6
-	beq _08134016
-	bl FreeSpritePaletteByTag
-_08134016:
-	ldrb r1, [r4, 0xC]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0813403C @ =gSprites
-	adds r0, r1
-	bl DestroySprite
-	adds r0, r5, 0
-	bl DestroyTask
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08134034: .4byte gTasks+0x8
-_08134038: .4byte 0x0000ffff
-_0813403C: .4byte gSprites
-	thumb_func_end ListMenuRemoveRedOutlineCursorObject
-
-	thumb_func_start ObjectCB_RedArrowCursor
-ObjectCB_RedArrowCursor: @ 8134040
-	push {lr}
-	adds r2, r0, 0
-	ldr r1, _08134068 @ =gSineTable
-	ldrh r3, [r2, 0x2E]
-	lsls r0, r3, 24
-	lsrs r0, 23
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bge _08134058
-	adds r0, 0x3F
-_08134058:
-	asrs r0, 6
-	strh r0, [r2, 0x24]
-	adds r0, r3, 0
-	adds r0, 0x8
-	strh r0, [r2, 0x2E]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08134068: .4byte gSineTable
-	thumb_func_end ObjectCB_RedArrowCursor
-
-	thumb_func_start nullsub_95
-nullsub_95: @ 813406C
-	bx lr
-	thumb_func_end nullsub_95
-
-	thumb_func_start ListMenuAddRedArrowCursorObject
-ListMenuAddRedArrowCursorObject: @ 8134070
-	push {r4-r7,lr}
-	sub sp, 0x28
-	adds r5, r0, 0
-	ldr r0, _081340B4 @ =gUnknown_84633D8
-	str r0, [sp, 0x18]
-	ldr r6, _081340B8 @ =0xffff0000
-	add r0, sp, 0x18
-	ldr r1, [r0, 0x4]
-	ands r1, r6
-	movs r2, 0x80
-	orrs r1, r2
-	ldrh r2, [r5, 0x6]
-	lsls r2, 16
-	ldr r4, _081340BC @ =0x0000ffff
-	ands r1, r4
-	orrs r1, r2
-	str r1, [r0, 0x4]
-	bl LoadCompressedSpriteSheet
-	ldrh r2, [r5, 0x8]
-	cmp r2, r4
-	bne _081340C4
-	ldr r0, _081340C0 @ =gUnknown_8463308
-	ldrb r1, [r5, 0xA]
-	lsls r1, 20
-	movs r2, 0x80
-	lsls r2, 17
-	adds r1, r2
-	lsrs r1, 16
-	movs r2, 0x20
-	bl LoadPalette
-	b _081340D6
-	.align 2, 0
-_081340B4: .4byte gUnknown_84633D8
-_081340B8: .4byte 0xffff0000
-_081340BC: .4byte 0x0000ffff
-_081340C0: .4byte gUnknown_8463308
-_081340C4:
-	ldr r0, _08134160 @ =gUnknown_8463308
-	str r0, [sp, 0x20]
-	add r0, sp, 0x20
-	ldr r1, [r0, 0x4]
-	ands r1, r6
-	orrs r1, r2
-	str r1, [r0, 0x4]
-	bl LoadSpritePalette
-_081340D6:
-	ldr r0, _08134164 @ =nullsub_95
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	adds r6, r0, 0
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, _08134168 @ =gTasks+0x8
-	adds r4, r0, r1
-	ldrh r0, [r5, 0x6]
-	strh r0, [r4, 0x2]
-	ldrh r0, [r5, 0x8]
-	strh r0, [r4, 0x4]
-	mov r1, sp
-	ldr r0, _0813416C @ =gUnknown_84632F0
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	mov r1, sp
-	ldrh r0, [r5, 0x6]
-	strh r0, [r1]
-	ldrh r0, [r5, 0x8]
-	strh r0, [r1, 0x2]
-	ldrb r1, [r5]
-	ldrb r2, [r5, 0x1]
-	mov r0, sp
-	movs r3, 0
-	bl CreateSprite
-	strb r0, [r4]
-	ldr r3, _08134170 @ =gSprites
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	movs r2, 0x8
-	strh r2, [r0, 0x24]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	strh r2, [r0, 0x26]
-	ldrh r1, [r5, 0x8]
-	ldr r0, _08134174 @ =0x0000ffff
-	cmp r1, r0
-	bne _08134156
-	ldrb r0, [r4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r2, [r5, 0xA]
-	lsls r2, 4
-	ldrb r3, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-_08134156:
-	adds r0, r6, 0
-	add sp, 0x28
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08134160: .4byte gUnknown_8463308
-_08134164: .4byte nullsub_95
-_08134168: .4byte gTasks+0x8
-_0813416C: .4byte gUnknown_84632F0
-_08134170: .4byte gSprites
-_08134174: .4byte 0x0000ffff
-	thumb_func_end ListMenuAddRedArrowCursorObject
-
-	thumb_func_start ListMenuUpdateRedArrowCursorObject
-ListMenuUpdateRedArrowCursorObject: @ 8134178
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r3, r0, 2
-	adds r3, r0
-	lsls r3, 3
-	ldr r0, _081341A8 @ =gTasks+0x8
-	adds r3, r0
-	ldr r5, _081341AC @ =gSprites
-	ldrb r4, [r3]
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	adds r0, r5
-	strh r1, [r0, 0x20]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	strh r2, [r0, 0x22]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081341A8: .4byte gTasks+0x8
-_081341AC: .4byte gSprites
-	thumb_func_end ListMenuUpdateRedArrowCursorObject
-
-	thumb_func_start ListMenuRemoveRedArrowCursorObject
-ListMenuRemoveRedArrowCursorObject: @ 81341B0
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r5, r0, 0
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, _081341F4 @ =gTasks+0x8
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x2]
-	ldr r6, _081341F8 @ =0x0000ffff
-	cmp r0, r6
-	beq _081341CE
-	bl FreeSpriteTilesByTag
-_081341CE:
-	ldrh r0, [r4, 0x4]
-	cmp r0, r6
-	beq _081341D8
-	bl FreeSpritePaletteByTag
-_081341D8:
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _081341FC @ =gSprites
-	adds r0, r1
-	bl DestroySprite
-	adds r0, r5, 0
-	bl DestroyTask
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_081341F4: .4byte gTasks+0x8
-_081341F8: .4byte 0x0000ffff
-_081341FC: .4byte gSprites
-	thumb_func_end ListMenuRemoveRedArrowCursorObject
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/new_game.s b/asm/new_game.s
index ad4983770..e2b9c876f 100644
--- a/asm/new_game.s
+++ b/asm/new_game.s
@@ -159,7 +159,7 @@ sub_80549F8: @ 80549F8
 	movs r1, 0x1
 	movs r3, 0x6
 	bl Overworld_SetWarpDestination
-	bl warp_in
+	bl WarpIntoMap
 	add sp, 0x4
 	pop {r0}
 	bx r0
diff --git a/asm/overworld.s b/asm/overworld.s
index cf4e4810e..5e50a5d05 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -22,7 +22,7 @@ sub_8054BC8: @ 8054BC8
 	bl sp000_heal_pokemon
 	bl sub_8054DD8
 	bl sub_80554BC
-	bl warp_in
+	bl WarpIntoMap
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -993,15 +993,15 @@ _0805536C:
 _08055374: .4byte gMapHeader
 	thumb_func_end update_camera_pos_from_warpid
 
-	thumb_func_start warp_in
-warp_in: @ 8055378
+	thumb_func_start WarpIntoMap
+WarpIntoMap: @ 8055378
 	push {lr}
 	bl warp_shift
 	bl set_current_map_header_from_sav1_save_old_name
 	bl update_camera_pos_from_warpid
 	pop {r0}
 	bx r0
-	thumb_func_end warp_in
+	thumb_func_end WarpIntoMap
 
 	thumb_func_start Overworld_SetWarpDestination
 Overworld_SetWarpDestination: @ 805538C
@@ -3571,8 +3571,8 @@ _08056714: .4byte sub_8056534
 _08056718: .4byte sub_80565B4
 	thumb_func_end c2_whiteout
 
-	thumb_func_start sub_805671C
-sub_805671C: @ 805671C
+	thumb_func_start CB2_LoadMap
+CB2_LoadMap: @ 805671C
 	push {lr}
 	bl sub_80569BC
 	bl ScriptContext1_Init
@@ -3590,7 +3590,7 @@ sub_805671C: @ 805671C
 _08056740: .4byte sub_80C9BFC
 _08056744: .4byte gMain
 _08056748: .4byte sub_805674C
-	thumb_func_end sub_805671C
+	thumb_func_end CB2_LoadMap
 
 	thumb_func_start sub_805674C
 sub_805674C: @ 805674C
@@ -3784,8 +3784,8 @@ _080568D8: .4byte gFieldCallback
 _080568DC: .4byte sub_807DD44
 	thumb_func_end sub_80568C4
 
-	thumb_func_start c2_exit_to_overworld_1_continue_scripts_restart_music
-c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80568E0
+	thumb_func_start CB2_ReturnToFieldContinueScriptPlayMapMusic
+CB2_ReturnToFieldContinueScriptPlayMapMusic: @ 80568E0
 	push {lr}
 	bl sub_80569BC
 	ldr r1, _080568F4 @ =gFieldCallback
@@ -3797,7 +3797,7 @@ c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80568E0
 	.align 2, 0
 _080568F4: .4byte gFieldCallback
 _080568F8: .4byte FieldCallback_ReturnToEventScript2
-	thumb_func_end c2_exit_to_overworld_1_continue_scripts_restart_music
+	thumb_func_end CB2_ReturnToFieldContinueScriptPlayMapMusic
 
 	thumb_func_start CB2_Overworld
 CB2_Overworld: @ 80568FC
@@ -3858,14 +3858,14 @@ CB2_ContinueSavedGame: @ 8056938
 	bne _0805699C
 	bl sav2_x9_clear_bit1
 	bl warp1_set_to_sav1w
-	bl warp_in
-	ldr r0, _08056998 @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _08056998 @ =CB2_LoadMap
 	bl SetMainCallback2
 	b _080569AC
 	.align 2, 0
 _08056990: .4byte gFieldCallback2
 _08056994: .4byte gUnknown_2031DE0
-_08056998: .4byte sub_805671C
+_08056998: .4byte CB2_LoadMap
 _0805699C:
 	ldr r0, _080569B0 @ =gFieldCallback
 	ldr r1, _080569B4 @ =sub_8056918
@@ -5139,14 +5139,14 @@ sub_8057430: @ 8057430
 	bne _08057490
 	bl sav2_x9_clear_bit1
 	bl warp1_set_to_sav1w
-	bl warp_in
-	ldr r0, _0805748C @ =sub_805671C
+	bl WarpIntoMap
+	ldr r0, _0805748C @ =CB2_LoadMap
 	bl SetMainCallback2
 	b _0805749A
 	.align 2, 0
 _08057484: .4byte gUnknown_2036E28
 _08057488: .4byte gUnknown_2031DE0
-_0805748C: .4byte sub_805671C
+_0805748C: .4byte CB2_LoadMap
 _08057490:
 	ldr r0, _080574A0 @ =sub_8056534
 	bl sub_80565E0
@@ -5304,7 +5304,7 @@ _08057560:
 	adds r0, r4
 	ldrh r0, [r0, 0x4]
 	strh r0, [r1]
-	bl warp_in
+	bl WarpIntoMap
 	ldr r2, _08057610 @ =gPaletteFade
 	ldrb r0, [r2, 0x8]
 	movs r1, 0x80
@@ -5620,7 +5620,7 @@ sub_8057854: @ 8057854
 	cmp r0, 0
 	bne _08057876
 	bl CleanupOverworldWindowsAndTilemaps
-	ldr r0, _08057880 @ =sub_805671C
+	ldr r0, _08057880 @ =CB2_LoadMap
 	bl SetMainCallback2
 	adds r0, r4, 0
 	bl DestroyTask
@@ -5630,7 +5630,7 @@ _08057876:
 	bx r0
 	.align 2, 0
 _0805787C: .4byte gPaletteFade
-_08057880: .4byte sub_805671C
+_08057880: .4byte CB2_LoadMap
 	thumb_func_end sub_8057854
 
 	thumb_func_start c1_link_related
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 58f7529e2..07db16817 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -17844,7 +17844,7 @@ sub_812781C: @ 812781C
 	str r0, [sp]
 	ldr r0, _08127848 @ =sub_811FB28
 	str r0, [sp, 0x4]
-	ldr r0, _0812784C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _0812784C @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -17855,13 +17855,13 @@ sub_812781C: @ 812781C
 	.align 2, 0
 _08127844: .4byte gSpecialVar_0x8005
 _08127848: .4byte sub_811FB28
-_0812784C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_0812784C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _08127850:
 	movs r0, 0x7F
 	str r0, [sp]
 	ldr r0, _08127878 @ =sub_8126DC8
 	str r0, [sp, 0x4]
-	ldr r0, _0812787C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _0812787C @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -17878,7 +17878,7 @@ _08127870:
 	bx r0
 	.align 2, 0
 _08127878: .4byte sub_8126DC8
-_0812787C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_0812787C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 _08127880: .4byte gUnknown_203B0A0
 _08127884: .4byte gSpecialVar_0x8007
 	thumb_func_end sub_812781C
@@ -17891,7 +17891,7 @@ sub_8127888: @ 8127888
 	str r0, [sp]
 	ldr r0, _081278AC @ =sub_811FB28
 	str r0, [sp, 0x4]
-	ldr r0, _081278B0 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _081278B0 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	str r0, [sp, 0x8]
 	movs r0, 0xB
 	movs r1, 0
@@ -17903,7 +17903,7 @@ sub_8127888: @ 8127888
 	bx r0
 	.align 2, 0
 _081278AC: .4byte sub_811FB28
-_081278B0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_081278B0: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_8127888
 
 	thumb_func_start sub_81278B4
diff --git a/asm/player_pc.s b/asm/player_pc.s
index 4d917504a..dfcac85f4 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -1134,7 +1134,7 @@ sub_80EBF40: @ 80EBF40
 	cmp r0, 0
 	bne _080EBFEA
 	ldrb r0, [r4, 0x16]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	adds r6, r0, 0
 	ldrb r0, [r4, 0x16]
 	ldr r7, _080EBF9C @ =gUnknown_203AAC6
@@ -1174,7 +1174,7 @@ _080EBFB6:
 	ldrb r0, [r4, 0x16]
 	adds r1, r7, 0
 	mov r2, r8
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0
 	bl ScheduleBgCopyTilemapToVram
 	mov r1, r8
@@ -1288,7 +1288,7 @@ sub_80EC094: @ 80EC094
 	ldrb r0, [r4, 0x16]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0
 	bl ScheduleBgCopyTilemapToVram
 	bl sub_810EDB0
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index 80cc1ab5d..268b65fd8 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -621,7 +621,7 @@ _08102A10: .4byte gUnknown_203ACF0
 _08102A14:
 	ldr r0, [r4]
 	ldrb r0, [r0, 0x17]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	ldr r1, [r4]
 	str r0, [r1, 0xC]
 	ldrb r0, [r1, 0x17]
@@ -754,7 +754,7 @@ _08102B24:
 	adds r1, r2, 0
 	adds r1, 0x12
 	adds r2, 0x10
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0x20
 	str r0, [sp]
 	movs r0, 0x14
@@ -804,7 +804,7 @@ _08102B94:
 	adds r1, r2, 0
 	adds r1, 0x12
 	adds r2, 0x10
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0x1
 	bl HideBg
 	ldr r0, [r4]
@@ -832,7 +832,7 @@ _08102BD8:
 	adds r1, r2, 0
 	adds r1, 0x12
 	adds r2, 0x10
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	movs r0, 0x1
 	bl HideBg
 	ldr r0, [r4]
@@ -1238,7 +1238,7 @@ _08102F60:
 	movs r0, 0x1
 	movs r1, 0
 	movs r2, 0x3
-	bl sub_8107A9C
+	bl ListMenuOverrideSetColors
 	b _08102F7A
 	.align 2, 0
 _08102F6C: .4byte gUnknown_203ACF0
@@ -1246,7 +1246,7 @@ _08102F70:
 	movs r0, 0xA
 	movs r1, 0
 	movs r2, 0xB
-	bl sub_8107A9C
+	bl ListMenuOverrideSetColors
 _08102F7A:
 	pop {r0}
 	bx r0
@@ -1379,7 +1379,7 @@ _08103098:
 	ldr r0, [r4]
 	adds r0, 0x41
 	ldrb r0, [r0]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	ldr r1, [r4]
 	str r0, [r1, 0x30]
 	ldrb r0, [r1, 0x17]
@@ -1700,7 +1700,7 @@ _08103362:
 	ldr r0, [r4]
 	adds r0, 0x41
 	ldrb r0, [r0]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	ldr r1, [r4]
 	str r0, [r1, 0x30]
 	ldrb r0, [r1, 0x17]
@@ -2433,7 +2433,7 @@ _08103964:
 	ldrh r3, [r0, 0x3C]
 _0810396E:
 	adds r0, r5, 0
-	bl Unused_ListMenuInit2
+	bl ListMenuInitInRect
 	ldr r1, [r4]
 	adds r1, 0x41
 	strb r0, [r1]
@@ -2467,7 +2467,7 @@ _0810399C:
 	adds r1, r2, 0
 	adds r1, 0x36
 	adds r2, 0x34
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	b _081039E8
 	.align 2, 0
 _081039B4: .4byte gUnknown_203ACF0
@@ -2480,7 +2480,7 @@ _081039B8:
 	adds r1, r2, 0
 	adds r1, 0x3A
 	adds r2, 0x38
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	b _081039E8
 	.align 2, 0
 _081039D0: .4byte gUnknown_203ACF0
@@ -2493,7 +2493,7 @@ _081039D4:
 	adds r1, r2, 0
 	adds r1, 0x3E
 	adds r2, 0x3C
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 _081039E8:
 	pop {r0}
 	bx r0
@@ -2572,7 +2572,7 @@ sub_8103A40: @ 8103A40
 	movs r1, 0
 	movs r2, 0x28
 	adds r3, r6, 0
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	ldr r0, _08103AC4 @ =gBaseStats
 	lsls r4, r5, 3
 	subs r4, r5
@@ -2587,7 +2587,7 @@ sub_8103A40: @ 8103A40
 	lsrs r1, 24
 	movs r2, 0x78
 	adds r3, r6, 0
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	ldrb r1, [r4, 0x7]
 	cmp r5, r1
 	beq _08103AB6
@@ -2599,7 +2599,7 @@ sub_8103A40: @ 8103A40
 	lsrs r1, 24
 	movs r2, 0x98
 	adds r3, r6, 0
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 _08103AB6:
 	add sp, 0x4
 	pop {r4-r7}
@@ -7753,7 +7753,7 @@ _08106478:
 	lsrs r1, 24
 	movs r2, 0
 	movs r3, 0x1
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	ldrb r1, [r4, 0x7]
 	cmp r5, r1
 	beq _08106504
@@ -7765,7 +7765,7 @@ _08106478:
 	lsrs r1, 24
 	movs r2, 0x20
 	movs r3, 0x1
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 _08106504:
 	ldr r7, _081066B8 @ =gUnknown_203ACF0
 	ldr r0, [r7]
diff --git a/asm/pokemon_icon.s b/asm/pokemon_icon.s
index a6a83033a..4eb654a50 100644
--- a/asm/pokemon_icon.s
+++ b/asm/pokemon_icon.s
@@ -519,8 +519,8 @@ _080971C0:
 _080971C8: .4byte gUnknown_83D4038
 	thumb_func_end sub_8097198
 
-	thumb_func_start sub_80971CC
-sub_80971CC: @ 80971CC
+	thumb_func_start GetValidMonIconPalettePtr
+GetValidMonIconPalettePtr: @ 80971CC
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -542,7 +542,7 @@ _080971DC:
 	.align 2, 0
 _080971F0: .4byte gUnknown_83D4038
 _080971F4: .4byte gUnknown_83D3E80
-	thumb_func_end sub_80971CC
+	thumb_func_end GetValidMonIconPalettePtr
 
 	thumb_func_start sub_80971F8
 sub_80971F8: @ 80971F8
diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s
index af4b28a27..7ef149fec 100644
--- a/asm/pokemon_jump_2.s
+++ b/asm/pokemon_jump_2.s
@@ -5644,20 +5644,20 @@ sub_814A468: @ 814A468
 	ldr r1, _0814A530 @ =gUnknown_846D94C
 	bl StringAppend
 _0814A4C2:
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r4, _0814A52C @ =gUnknown_203F3D8
 	ldr r1, [r4]
 	adds r1, 0x26
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r1, [r4]
 	adds r1, 0x66
 	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r0, [r4]
 	adds r0, 0xA6
 	ldr r1, _0814A534 @ =gUnknown_841CBA9
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	movs r0, 0x4
 	movs r1, 0x8
 	movs r2, 0x16
@@ -5706,15 +5706,15 @@ sub_814A53C: @ 814A53C
 	ldr r1, [r4]
 	adds r1, 0x26
 	bl CopyItemName
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r1, [r4]
 	adds r1, 0x26
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r0, [r4]
 	adds r0, 0xA6
 	ldr r1, _0814A5B0 @ =gUnknown_841CBCA
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	movs r0, 0x4
 	movs r1, 0x8
 	movs r2, 0x16
@@ -5761,15 +5761,15 @@ sub_814A5B4: @ 814A5B4
 	ldr r1, [r4]
 	adds r1, 0x26
 	bl CopyItemName
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r1, [r4]
 	adds r1, 0x26
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r0, [r4]
 	adds r0, 0xA6
 	ldr r1, _0814A628 @ =gUnknown_841CBE4
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	movs r0, 0x4
 	movs r1, 0x9
 	movs r2, 0x16
diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s
index 31e3752d3..5c91419df 100644
--- a/asm/pokemon_special_anim.s
+++ b/asm/pokemon_special_anim.s
@@ -1815,15 +1815,15 @@ _0811D3C0:
 _0811D3D4: .4byte gUnknown_841B295
 _0811D3D8: .4byte gUnknown_841B2A7
 _0811D3DC:
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	bl sub_811D0F4
 	adds r1, r0, 0
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	bl sub_811D0D0
 	adds r1, r0, 0
 	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	adds r4, 0x14
 	ldr r1, _0811D400 @ =gUnknown_841B32E
 	b _0811D470
@@ -1866,20 +1866,20 @@ _0811D444: .4byte gUnknown_841B2F1
 _0811D448: .4byte gUnknown_841B2ED
 _0811D44C: .4byte gUnknown_8459998
 _0811D450:
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	bl sub_811D0F4
 	adds r1, r0, 0
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	bl sub_811D0C4
 	adds r1, r0, 0
 	movs r0, 0x1
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	adds r4, 0x14
 	ldr r1, _0811D478 @ =gUnknown_841B306
 _0811D470:
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	b _0811D4A2
 	.align 2, 0
 _0811D478: .4byte gUnknown_841B306
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 0c9536a8e..a5e91a4a6 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -8190,7 +8190,7 @@ sub_808FBA4: @ 808FBA4
 	sub sp, 0xC
 	lsls r0, 24
 	lsrs r6, r0, 24
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r1, _0808FBC8 @ =gUnknown_83CEA88
 	lsls r0, r6, 3
 	adds r0, r1
@@ -8231,7 +8231,7 @@ _0808FC04:
 	adds r1, r2
 _0808FC0C:
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	b _0808FC7C
 	.align 2, 0
 _0808FC14: .4byte gUnknown_20397B0
@@ -8281,7 +8281,7 @@ _0808FC62:
 	ldr r0, _0808FCE0 @ =0x000021db
 	adds r1, r0
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 _0808FC7C:
 	ldr r5, _0808FCDC @ =gUnknown_20397B0
 	ldr r0, [r5]
@@ -8292,7 +8292,7 @@ _0808FC7C:
 	lsls r1, r6, 3
 	adds r1, r2
 	ldr r1, [r1]
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	movs r0, 0x1
 	movs r1, 0x11
 	bl FillWindowPixelBuffer
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index f561ad660..2fa836876 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -5747,7 +5747,7 @@ _08137574:
 sub_8137578: @ 8137578
 	push {r4-r7,lr}
 	sub sp, 0xD4
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r7, _081375E8 @ =gUnknown_203B140
 	ldr r0, [r7]
 	ldr r4, _081375EC @ =0x00003290
@@ -5760,7 +5760,7 @@ sub_8137578: @ 8137578
 	adds r0, r1
 	ldr r1, [r0]
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r0, [r7]
 	adds r0, r4
 	movs r1, 0x24
@@ -5777,7 +5777,7 @@ _081375B2:
 	bl ConvertIntToDecimalStringN
 	movs r0, 0x1
 	add r1, sp, 0x14
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r0, [r7]
 	adds r0, r4
 	movs r1, 0x23
@@ -5824,7 +5824,7 @@ _0813761C:
 _08137626:
 	adds r1, r4, 0
 	movs r0, 0x2
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r4, _08137664 @ =gUnknown_203B140
 	ldr r0, [r4]
 	ldr r1, _08137668 @ =0x00003290
@@ -5901,7 +5901,7 @@ _081376C0:
 	ldr r1, _081376D8 @ =gUnknown_8419841
 _081376CE:
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	b _081376E6
 	.align 2, 0
 _081376D8: .4byte gUnknown_8419841
@@ -5909,7 +5909,7 @@ _081376DC:
 	add r4, sp, 0x3C
 	ldr r1, _08137714 @ =gUnknown_8419822
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 _081376E6:
 	ldr r0, _08137718 @ =gUnknown_203B140
 	ldr r0, [r0]
@@ -5944,7 +5944,7 @@ _08137720: .4byte gUnknown_8463FA4
 sub_8137724: @ 8137724
 	push {r4-r6,lr}
 	sub sp, 0xD4
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r5, _081377A0 @ =gUnknown_203B140
 	ldr r0, [r5]
 	ldr r4, _081377A4 @ =0x00003290
@@ -5957,7 +5957,7 @@ sub_8137724: @ 8137724
 	adds r0, r1
 	ldr r1, [r0]
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r0, [r5]
 	adds r0, r4
 	movs r1, 0x24
@@ -5974,7 +5974,7 @@ _0813775E:
 	bl ConvertIntToDecimalStringN
 	movs r0, 0x1
 	add r1, sp, 0x14
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r0, [r5]
 	adds r0, r4
 	movs r1, 0x23
@@ -6025,7 +6025,7 @@ _081377D0:
 	ldr r1, _081377E8 @ =gUnknown_841979D
 _081377DE:
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	b _081377F6
 	.align 2, 0
 _081377E8: .4byte gUnknown_841979D
@@ -6033,7 +6033,7 @@ _081377EC:
 	add r4, sp, 0x3C
 	ldr r1, _08137820 @ =gUnknown_8419782
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 _081377F6:
 	ldr r0, _08137824 @ =gUnknown_203B140
 	ldr r0, [r0]
@@ -6077,7 +6077,7 @@ _08137846:
 _08137850:
 	adds r1, r4, 0
 	movs r0, 0x2
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r4, _08137890 @ =gUnknown_203B140
 	ldr r0, [r4]
 	ldr r1, _08137894 @ =0x00003290
@@ -6149,7 +6149,7 @@ _081378EA:
 	ldr r1, _081378F8 @ =gUnknown_841988A
 _081378EE:
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	b _08137906
 	.align 2, 0
 _081378F8: .4byte gUnknown_841988A
@@ -6157,7 +6157,7 @@ _081378FC:
 	add r4, sp, 0x3C
 	ldr r1, _08137934 @ =gUnknown_8419860
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 _08137906:
 	ldr r0, _08137938 @ =gUnknown_203B140
 	ldr r0, [r0]
@@ -6636,7 +6636,7 @@ _08137CA4:
 	adds r3, r2
 	lsrs r3, 16
 	movs r2, 0x3
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 _08137CDE:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -6660,7 +6660,7 @@ _08137CDE:
 	lsrs r1, 24
 	movs r2, 0x3
 	movs r3, 0x75
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 _08137D0E:
 	pop {r4,r5}
 	pop {r0}
@@ -8325,7 +8325,7 @@ _08138A62:
 	lsrs r1, 24
 	movs r2, 0x2F
 	movs r3, 0x23
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	ldr r1, [r6]
 	adds r4, r1, r4
 	ldr r3, _08138AB8 @ =0x00003221
@@ -8342,7 +8342,7 @@ _08138A62:
 	lsrs r1, 24
 	movs r2, 0x53
 	movs r3, 0x23
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	b _08138B0E
 	.align 2, 0
 _08138AB0: .4byte 0x00003003
@@ -8365,7 +8365,7 @@ _08138ABC:
 	lsrs r1, 24
 	movs r2, 0
 	movs r3, 0x3
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 	ldr r2, [r6]
 	adds r4, r2, r4
 	ldr r1, _08138B1C @ =0x00003221
@@ -8381,7 +8381,7 @@ _08138ABC:
 	lsrs r1, 24
 	movs r2, 0x24
 	movs r3, 0x3
-	bl blit_move_info_icon
+	bl BlitMoveInfoIcon
 _08138B04:
 	ldr r0, [r6]
 	adds r0, r5
diff --git a/asm/safari_zone.s b/asm/safari_zone.s
deleted file mode 100644
index 4bc9d6eb7..000000000
--- a/asm/safari_zone.s
+++ /dev/null
@@ -1,167 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start GetSafariZoneFlag
-GetSafariZoneFlag: @ 80A0E90
-	push {lr}
-	movs r0, 0x80
-	lsls r0, 4
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	thumb_func_end GetSafariZoneFlag
-
-	thumb_func_start sub_80A0EA4
-sub_80A0EA4: @ 80A0EA4
-	push {lr}
-	movs r0, 0x80
-	lsls r0, 4
-	bl FlagSet
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80A0EA4
-
-	thumb_func_start ResetSafariZoneFlag
-ResetSafariZoneFlag: @ 80A0EB4
-	push {lr}
-	movs r0, 0x80
-	lsls r0, 4
-	bl FlagClear
-	pop {r0}
-	bx r0
-	thumb_func_end ResetSafariZoneFlag
-
-	thumb_func_start sub_80A0EC4
-sub_80A0EC4: @ 80A0EC4
-	push {lr}
-	movs r0, 0x11
-	bl IncrementGameStat
-	bl sub_80A0EA4
-	ldr r1, _080A0EE4 @ =gUnknown_2039994
-	movs r0, 0x1E
-	strb r0, [r1]
-	ldr r1, _080A0EE8 @ =gUnknown_2039996
-	movs r2, 0x96
-	lsls r2, 2
-	adds r0, r2, 0
-	strh r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0EE4: .4byte gUnknown_2039994
-_080A0EE8: .4byte gUnknown_2039996
-	thumb_func_end sub_80A0EC4
-
-	thumb_func_start sub_80A0EEC
-sub_80A0EEC: @ 80A0EEC
-	push {lr}
-	bl ResetSafariZoneFlag
-	ldr r1, _080A0F04 @ =gUnknown_2039994
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, _080A0F08 @ =gUnknown_2039996
-	movs r0, 0
-	strh r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0F04: .4byte gUnknown_2039994
-_080A0F08: .4byte gUnknown_2039996
-	thumb_func_end sub_80A0EEC
-
-	thumb_func_start sub_80A0F0C
-sub_80A0F0C: @ 80A0F0C
-	push {lr}
-	bl GetSafariZoneFlag
-	cmp r0, 0
-	beq _080A0F24
-	ldr r1, _080A0F28 @ =gUnknown_2039996
-	ldrh r0, [r1]
-	subs r0, 0x1
-	strh r0, [r1]
-	lsls r0, 16
-	cmp r0, 0
-	beq _080A0F2C
-_080A0F24:
-	movs r0, 0
-	b _080A0F34
-	.align 2, 0
-_080A0F28: .4byte gUnknown_2039996
-_080A0F2C:
-	ldr r0, _080A0F38 @ =gUnknown_81BFBC5
-	bl ScriptContext1_SetupScript
-	movs r0, 0x1
-_080A0F34:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080A0F38: .4byte gUnknown_81BFBC5
-	thumb_func_end sub_80A0F0C
-
-	thumb_func_start sub_80A0F3C
-sub_80A0F3C: @ 80A0F3C
-	push {lr}
-	ldr r0, _080A0F48 @ =gUnknown_81BFBAA
-	bl ScriptContext1_SetupScript
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0F48: .4byte gUnknown_81BFBAA
-	thumb_func_end sub_80A0F3C
-
-	thumb_func_start sub_80A0F4C
-sub_80A0F4C: @ 80A0F4C
-	push {lr}
-	ldr r0, _080A0F60 @ =gUnknown_2039994
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080A0F68
-	ldr r0, _080A0F64 @ =CB2_ReturnToField
-	bl SetMainCallback2
-	b _080A0FB0
-	.align 2, 0
-_080A0F60: .4byte gUnknown_2039994
-_080A0F64: .4byte CB2_ReturnToField
-_080A0F68:
-	ldr r0, _080A0F88 @ =gBattleOutcome
-	ldrb r0, [r0]
-	cmp r0, 0x8
-	bne _080A0F9C
-	ldr r0, _080A0F8C @ =gUnknown_81BFB87
-	bl ScriptContext2_RunNewScript
-	bl warp_in
-	ldr r1, _080A0F90 @ =gFieldCallback
-	ldr r0, _080A0F94 @ =sub_807E3EC
-	str r0, [r1]
-	ldr r0, _080A0F98 @ =sub_805671C
-	bl SetMainCallback2
-	b _080A0FB0
-	.align 2, 0
-_080A0F88: .4byte gBattleOutcome
-_080A0F8C: .4byte gUnknown_81BFB87
-_080A0F90: .4byte gFieldCallback
-_080A0F94: .4byte sub_807E3EC
-_080A0F98: .4byte sub_805671C
-_080A0F9C:
-	cmp r0, 0x7
-	bne _080A0FB0
-	ldr r0, _080A0FB4 @ =gUnknown_81BFBD7
-	bl ScriptContext1_SetupScript
-	bl ScriptContext1_Stop
-	ldr r0, _080A0FB8 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
-	bl SetMainCallback2
-_080A0FB0:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0FB4: .4byte gUnknown_81BFBD7
-_080A0FB8: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
-	thumb_func_end sub_80A0F4C
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s
index 60f416b48..6b4cdd1a8 100644
--- a/asm/script_pokemon_util_80A0058.s
+++ b/asm/script_pokemon_util_80A0058.s
@@ -411,13 +411,13 @@ _080A0368:
 	movs r0, 0x1
 	strh r0, [r1]
 _080A036E:
-	ldr r0, _080A037C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _080A037C @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080A0378: .4byte gSpecialVar_Result
-_080A037C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_080A037C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_80A0350
 
 	thumb_func_start sub_80A0380
@@ -455,14 +455,14 @@ _080A03B8:
 	movs r0, 0x1
 	strh r0, [r1]
 _080A03C2:
-	ldr r0, _080A03D4 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+	ldr r0, _080A03D4 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	pop {r4}
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080A03D0: .4byte gSpecialVar_Result
-_080A03D4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
+_080A03D4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
 	thumb_func_end sub_80A039C
 
 	thumb_func_start sub_80A03D8
diff --git a/asm/shop.s b/asm/shop.s
index 51955f88d..01bca8033 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -572,7 +572,7 @@ _0809AEAC:
 	ldrb r0, [r0, 0x16]
 	lsls r0, 28
 	lsrs r0, 28
-	bl sub_813F66C
+	bl BuyMenuInitWindows
 	bl sub_809B080
 	b _0809AF5E
 	.align 2, 0
@@ -819,7 +819,7 @@ sub_809B15C: @ 809B15C
 	push {lr}
 	bl sub_809B764
 	bl sub_809BAFC
-	bl sub_813F6D0
+	bl BuyMenuDrawMoneyBox
 	movs r0, 0
 	bl ScheduleBgCopyTilemapToVram
 	movs r0, 0x1
@@ -1116,7 +1116,7 @@ _0809B398:
 	movs r1, 0x2
 	adds r2, r7, 0
 	movs r3, 0
-	bl sub_813F6F4
+	bl BuyMenuPrint
 	b _0809B400
 	.align 2, 0
 _0809B3D0: .4byte 0x00000177
@@ -1138,7 +1138,7 @@ _0809B3D8:
 	movs r1, 0x2
 	adds r2, r7, 0
 	movs r3, 0x2
-	bl sub_813F6F4
+	bl BuyMenuPrint
 _0809B400:
 	add sp, 0x14
 	pop {r4-r7}
@@ -1204,7 +1204,7 @@ _0809B45C:
 	adds r0, r6, 0
 	movs r1, 0
 	movs r3, 0x69
-	bl sub_813F6F4
+	bl BuyMenuPrint
 _0809B480:
 	add sp, 0x14
 	pop {r4-r6}
@@ -1251,7 +1251,7 @@ sub_809B494: @ 809B494
 	movs r1, 0
 	adds r2, r5, 0
 	movs r3, 0
-	bl sub_813F6F4
+	bl BuyMenuPrint
 	lsls r0, r7, 16
 	lsrs r0, 16
 	bl ItemIdToBattleMoveId
@@ -1273,7 +1273,7 @@ sub_809B494: @ 809B494
 	movs r1, 0x2
 	adds r2, r5, 0
 	movs r3, 0
-	bl sub_813F6F4
+	bl BuyMenuPrint
 	b _0809B55C
 	.align 2, 0
 _0809B514: .4byte gStringVar1
@@ -1294,7 +1294,7 @@ _0809B528:
 	movs r0, 0x6
 	movs r1, 0
 	movs r3, 0
-	bl sub_813F6F4
+	bl BuyMenuPrint
 	ldr r2, _0809B568 @ =gUnknown_8416217
 	movs r0, 0x10
 	str r0, [sp]
@@ -1305,7 +1305,7 @@ _0809B528:
 	movs r0, 0x6
 	movs r1, 0x2
 	movs r3, 0
-	bl sub_813F6F4
+	bl BuyMenuPrint
 _0809B55C:
 	add sp, 0x14
 	pop {r4-r7}
@@ -1388,7 +1388,7 @@ _0809B5E0:
 	movs r0, 0x4
 	movs r1, 0x2
 	movs r3, 0x1
-	bl sub_813F6F4
+	bl BuyMenuPrint
 _0809B5F8:
 	add sp, 0x14
 	pop {r4,r5}
@@ -2134,7 +2134,7 @@ sub_809BB44: @ 809BB44
 	movs r1, 0
 	adds r2, r4, 0
 	movs r3, 0x2
-	bl sub_813F6F4
+	bl BuyMenuPrint
 	add sp, 0x14
 	pop {r4}
 	pop {r0}
@@ -2164,7 +2164,7 @@ sub_809BBC0: @ 809BBC0
 	cmp r0, 0
 	bne _0809BC8E
 	ldrb r0, [r5, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenu_ProcessInput
 	adds r4, r0, 0
 	ldrb r0, [r5, 0xE]
 	ldr r7, _0809BC08 @ =gUnknown_2039942
@@ -2223,7 +2223,7 @@ _0809BC1A:
 	ldr r1, _0809BC74 @ =gUnknown_8416842
 	ldr r2, _0809BC78 @ =sub_809BF98
 	adds r0, r6, 0
-	bl sub_813F75C
+	bl BuyMenuDisplayMessage
 	b _0809BC8E
 	.align 2, 0
 _0809BC70: .4byte gSaveBlock1Ptr
@@ -2236,7 +2236,7 @@ _0809BC7C:
 	ldr r1, _0809BC98 @ =gUnknown_8416766
 	ldr r2, _0809BC9C @ =sub_809BCA0
 	adds r0, r6, 0
-	bl sub_813F75C
+	bl BuyMenuDisplayMessage
 _0809BC8E:
 	pop {r4-r7}
 	pop {r0}
@@ -2265,7 +2265,7 @@ sub_809BCA0: @ 809BCA0
 	lsrs r4, 16
 	movs r0, 0x1
 	movs r1, 0
-	bl sub_813F7C0
+	bl BuyMenuQuantityBoxThinBorder
 	ldr r0, _0809BD44 @ =gStringVar1
 	adds r1, r4, 0
 	movs r2, 0x1
@@ -2287,11 +2287,11 @@ sub_809BCA0: @ 809BCA0
 	movs r1, 0x2
 	adds r2, r6, 0
 	movs r3, 0
-	bl sub_813F6F4
+	bl BuyMenuPrint
 	strh r4, [r5, 0x2]
 	movs r0, 0x3
 	movs r1, 0
-	bl sub_813F7A8
+	bl BuyMenuQuantityBoxNormalBorder
 	adds r0, r7, 0
 	bl sub_809BB44
 	movs r0, 0
@@ -2423,7 +2423,7 @@ _0809BDD4:
 	ldr r1, _0809BE4C @ =gUnknown_841678E
 	ldr r2, _0809BE50 @ =sub_809BE90
 	adds r0, r5, 0
-	bl sub_813F75C
+	bl BuyMenuDisplayMessage
 	b _0809BE88
 	.align 2, 0
 _0809BE3C: .4byte gMain
@@ -2464,7 +2464,7 @@ sub_809BE90: @ 809BE90
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, _0809BEA0 @ =gUnknown_83DF0B4
-	bl sub_813F7D8
+	bl BuyMenuConfirmPurchase
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -2493,7 +2493,7 @@ sub_809BEA4: @ 809BEA4
 	ldr r1, _0809BEEC @ =gUnknown_84167E7
 	ldr r2, _0809BEF0 @ =sub_809BF0C
 	adds r0, r5, 0
-	bl sub_813F75C
+	bl BuyMenuDisplayMessage
 	adds r0, r5, 0
 	bl nullsub_52
 	ldrh r0, [r4, 0xA]
@@ -2509,7 +2509,7 @@ _0809BEF4:
 	ldr r1, _0809BF04 @ =gUnknown_8416861
 	ldr r2, _0809BF08 @ =sub_809BF98
 	adds r0, r5, 0
-	bl sub_813F75C
+	bl BuyMenuDisplayMessage
 _0809BEFE:
 	pop {r4,r5}
 	pop {r0}
@@ -2691,7 +2691,7 @@ sub_809C04C: @ 809C04C
 	ldrb r0, [r2, 0xE]
 	movs r1, 0
 	movs r2, 0
-	bl DestroyListMenu
+	bl DestroyListMenuTask
 	bl sub_809B604
 	ldr r0, _0809C090 @ =CB2_ReturnToField
 	bl SetMainCallback2
diff --git a/asm/start_menu.s b/asm/start_menu.s
index 9f6ef8662..4f898b88c 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -160,7 +160,7 @@ sub_806EE7C: @ 806EE7C
 	movs r1, 0
 	bl DrawStdWindowFrame
 	ldr r0, _0806EEFC @ =gStringVar1
-	ldr r1, _0806EF00 @ =gUnknown_2039996
+	ldr r1, _0806EF00 @ =gSafariZoneStepCounter
 	ldrh r1, [r1]
 	movs r2, 0x1
 	movs r3, 0x3
@@ -172,7 +172,7 @@ sub_806EE7C: @ 806EE7C
 	movs r3, 0x3
 	bl ConvertIntToDecimalStringN
 	ldr r0, _0806EF08 @ =gStringVar3
-	ldr r1, _0806EF0C @ =gUnknown_2039994
+	ldr r1, _0806EF0C @ =gNumSafariBalls
 	ldrb r1, [r1]
 	movs r2, 0x1
 	movs r3, 0x2
@@ -203,10 +203,10 @@ sub_806EE7C: @ 806EE7C
 _0806EEF4: .4byte gUnknown_2037101
 _0806EEF8: .4byte gUnknown_83A738C
 _0806EEFC: .4byte gStringVar1
-_0806EF00: .4byte gUnknown_2039996
+_0806EF00: .4byte gSafariZoneStepCounter
 _0806EF04: .4byte gStringVar2
 _0806EF08: .4byte gStringVar3
-_0806EF0C: .4byte gUnknown_2039994
+_0806EF0C: .4byte gNumSafariBalls
 _0806EF10: .4byte gStringVar4
 _0806EF14: .4byte gUnknown_84162A9
 	thumb_func_end sub_806EE7C
@@ -1009,7 +1009,7 @@ sub_806F554: @ 806F554
 	bl sub_806EF18
 	bl sub_80F7998
 	bl sub_806FEA0
-	bl sub_80A0F3C
+	bl SafariZoneRetirePrompt
 	movs r0, 0x1
 	pop {r1}
 	bx r1
diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s
index 137ee69c1..609cf8366 100644
--- a/asm/union_room_chat.s
+++ b/asm/union_room_chat.s
@@ -2362,10 +2362,10 @@ _08129664:
 	ldrb r1, [r4, 0x8]
 	cmp r0, r1
 	beq _081296EC
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	movs r0, 0
 	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r1, _08129684 @ =gUnknown_841B3AA
 	b _081296D8
 	.align 2, 0
@@ -2404,14 +2404,14 @@ _081296BE:
 	ldrb r5, [r5]
 	cmp r0, r5
 	beq _081296EC
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	movs r0, 0
 	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r1, _081296E8 @ =gUnknown_841B3BE
 _081296D8:
 	adds r0, r6, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	movs r0, 0x1
 	b _081296EE
 	.align 2, 0
@@ -3957,11 +3957,11 @@ sub_812A240: @ 812A240
 	beq _0812A280
 	b _0812A28A
 _0812A250:
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	bl sub_8129814
 	adds r1, r0, 0
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	movs r0, 0x5
 	movs r1, 0
 	bl sub_812A578
@@ -4122,11 +4122,11 @@ sub_812A378: @ 812A378
 	beq _0812A3BC
 	b _0812A3C6
 _0812A388:
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r0, _0812A3B4 @ =gSaveBlock2Ptr
 	ldr r1, [r0]
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	movs r0, 0x9
 	movs r1, 0
 	bl sub_812A578
@@ -4455,7 +4455,7 @@ _0812A5F8:
 	adds r0, r1, 0
 	adds r0, 0x22
 	ldr r1, [r4]
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	ldr r0, [r5]
 	adds r6, r0, 0
 	adds r6, 0x22
diff --git a/asm/unk_text_util.s b/asm/unk_text_util.s
deleted file mode 100644
index 15d21c95a..000000000
--- a/asm/unk_text_util.s
+++ /dev/null
@@ -1,130 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start UnkTextUtil_Reset
-UnkTextUtil_Reset: @ 813CC90
-	push {lr}
-	ldr r1, _0813CCA8 @ =gUnknown_203F34C
-	movs r2, 0
-	adds r0, r1, 0
-	adds r0, 0x1C
-_0813CC9A:
-	str r2, [r0]
-	subs r0, 0x4
-	cmp r0, r1
-	bge _0813CC9A
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813CCA8: .4byte gUnknown_203F34C
-	thumb_func_end UnkTextUtil_Reset
-
-	thumb_func_start UnkTextUtil_SetPtrI
-UnkTextUtil_SetPtrI: @ 813CCAC
-	push {lr}
-	adds r2, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x7
-	bhi _0813CCC0
-	ldr r1, _0813CCC4 @ =gUnknown_203F34C
-	lsls r0, 2
-	adds r0, r1
-	str r2, [r0]
-_0813CCC0:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0813CCC4: .4byte gUnknown_203F34C
-	thumb_func_end UnkTextUtil_SetPtrI
-
-	thumb_func_start UnkTextUtil_StringExpandPlaceholders
-UnkTextUtil_StringExpandPlaceholders: @ 813CCC8
-	push {r4,r5,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	ldrb r1, [r4]
-	adds r0, r1, 0
-	cmp r0, 0xFF
-	beq _0813CD08
-	ldr r5, _0813CCE4 @ =gUnknown_203F34C
-_0813CCD8:
-	cmp r1, 0xF7
-	beq _0813CCE8
-	strb r1, [r2]
-	adds r4, 0x1
-	adds r2, 0x1
-	b _0813CD00
-	.align 2, 0
-_0813CCE4: .4byte gUnknown_203F34C
-_0813CCE8:
-	adds r4, 0x1
-	ldrb r0, [r4]
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, [r0]
-	cmp r1, 0
-	beq _0813CCFE
-	adds r0, r2, 0
-	bl StringCopy
-	adds r2, r0, 0
-_0813CCFE:
-	adds r4, 0x1
-_0813CD00:
-	ldrb r1, [r4]
-	adds r0, r1, 0
-	cmp r0, 0xFF
-	bne _0813CCD8
-_0813CD08:
-	movs r0, 0xFF
-	strb r0, [r2]
-	adds r0, r2, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end UnkTextUtil_StringExpandPlaceholders
-
-	thumb_func_start UnkTextUtil_GetPtrI
-UnkTextUtil_GetPtrI: @ 813CD14
-	lsls r0, 24
-	ldr r1, _0813CD20 @ =gUnknown_203F34C
-	lsrs r0, 22
-	adds r0, r1
-	ldr r0, [r0]
-	bx lr
-	.align 2, 0
-_0813CD20: .4byte gUnknown_203F34C
-	thumb_func_end UnkTextUtil_GetPtrI
-
-	thumb_func_start sub_813CD24
-sub_813CD24: @ 813CD24
-	push {lr}
-	lsls r0, 16
-	lsrs r1, r0, 16
-	lsrs r2, r0, 17
-	movs r0, 0x1
-	ands r1, r0
-	lsls r1, 2
-	cmp r2, 0x4B
-	bhi _0813CD48
-	ldr r0, _0813CD44 @ =gUnknown_8464300
-	adds r0, r2, r0
-	ldrb r0, [r0]
-	asrs r0, r1
-	movs r1, 0xF
-	ands r0, r1
-	b _0813CD4A
-	.align 2, 0
-_0813CD44: .4byte gUnknown_8464300
-_0813CD48:
-	movs r0, 0x3
-_0813CD4A:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_813CD24
-
-	.align 2, 0 @ Don't pad with nop.
author	dheu <gwimminus@gmail.com>	2019-07-10 14:50:54 +0800
committer	dheu <gwimminus@gmail.com>	2019-07-10 14:50:54 +0800
commit	da593ec33d7b59af1bd125638d5271c64c11c6e7 (patch)
tree	a0e81df26c77c974c5643cb4dbc63ea3558848d9 /asm
parent	8fe7ed27febc86f61735b1395ebb5924d7607809 (diff)
parent	39d68ebd445be5657a916dec1b4872717e9c40d3 (diff)