8 files changed, 34 insertions, 1016 deletions
diff --git a/arm9/asm/RTC_internal.s b/arm9/asm/RTC_internal.s
deleted file mode 100644
index 408b630c..00000000
--- a/arm9/asm/RTC_internal.s
+++ /dev/null
@@ -1,53 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-    .text
-
-	arm_func_start RtcSendPxiCommand
-RtcSendPxiCommand: ; 0x020D61D4
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	mov r0, r0, lsl #0x8
-	and r1, r0, #0x7f00
-	mov r0, #0x5
-	mov r2, #0x0
-	bl PXI_SendWordByFifo
-_020D61F0: ; 0x020D61F0
-	cmp r0, #0x0
-	movge r0, #0x1
-	movlt r0, #0x0
-	add sp, sp, #0x4
-	ldmia sp!, {lr}
-	bx lr
-
-	arm_func_start RTCi_WriteRawStatus2Async
-RTCi_WriteRawStatus2Async:
-	ldr ip, _020D6214 ; =RtcSendPxiCommand
-	mov r0, #0x27
-	bx r12
-	.balign 4
-_020D6214: .word RtcSendPxiCommand
-
-	arm_func_start RTCi_ReadRawTimeAsync
-RTCi_ReadRawTimeAsync:
-	ldr ip, _020D6224 ; =RtcSendPxiCommand
-	mov r0, #0x12
-	bx r12
-	.balign 4
-_020D6224: .word RtcSendPxiCommand
-
-	arm_func_start RTCi_ReadRawDateAsync
-RTCi_ReadRawDateAsync:
-	ldr ip, _020D6234 ; =RtcSendPxiCommand
-	mov r0, #0x11
-	bx r12
-	.balign 4
-_020D6234: .word RtcSendPxiCommand
-
-	arm_func_start RTCi_ReadRawDateTimeAsync
-RTCi_ReadRawDateTimeAsync:
-	ldr ip, _020D6244 ; =RtcSendPxiCommand
-	mov r0, #0x10
-	bx r12
-	.balign 4
-_020D6244: .word RtcSendPxiCommand
diff --git a/arm9/asm/WIFI_stubsmd5_dummy.s b/arm9/asm/WIFI_stubsmd5_dummy.s
deleted file mode 100644
index dd3f79a7..00000000
--- a/arm9/asm/WIFI_stubsmd5_dummy.s
+++ /dev/null
@@ -1,25 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.text
-
-	arm_func_start MD5Final
-MD5Final: ; 0x020A8BA4
-	ldr ip, _020A8BAC ; =DGT_Hash1GetDigest_R
-	bx r12
-	.balign 4
-_020A8BAC: .word DGT_Hash1GetDigest_R
-
-	arm_func_start MD5Update
-MD5Update: ; 0x020A8BB0
-	ldr ip, _020A8BB8 ; =DGT_Hash1SetSource
-	bx r12
-	.balign 4
-_020A8BB8: .word DGT_Hash1SetSource
-
-	arm_func_start MD5Init
-MD5Init: ; 0x020A8BBC
-	ldr ip, _020A8BC4 ; =DGT_Hash1Reset
-	bx r12
-	.balign 4
-_020A8BC4: .word DGT_Hash1Reset
diff --git a/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s b/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s
deleted file mode 100644
index a590ef02..00000000
--- a/arm9/asm/nonmatchings/GenerateFontHalfRowLookupTable.s
+++ /dev/null
@@ -1,92 +0,0 @@
-.section .text
-
-glabel GenerateFontHalfRowLookupTable
-
-.extern UNK_021C570C
-.extern UNK_021C5734
-
-	push {r3-r7, lr}
-	sub sp, #0x30
-	ldr r3, _0201C0F8 ; =UNK_021C570C
-	mov r5, #0x0
-	str r5, [sp, #0x20]
-	str r0, [sp, #0x24]
-	str r2, [sp, #0x28]
-	str r1, [sp, #0x2c]
-	strh r1, [r3, #0x6]
-	strh r0, [r3, #0x2]
-	add r0, sp, #0x20
-	strh r2, [r3, #0x4]
-	str r5, [sp, #0x14]
-	str r0, [sp, #0x8]
-	mov r12, r0
-	mov lr, r0
-	str r0, [sp, #0x18]
-_0201C07E:
-	mov r0, #0x0
-	str r0, [sp, #0x10]
-	ldr r0, [sp, #0x18]
-	str r0, [sp, #0x4]
-	ldr r0, [sp, #0x8]
-	ldr r0, [r0, #0x0]
-	str r0, [sp, #0x1c]
-_0201C08C:
-	mov r0, #0x0
-	str r0, [sp, #0xc]
-	mov r0, lr
-	str r0, [sp, #0x0]
-	ldr r0, [sp, #0x4]
-	ldr r0, [r0, #0x0]
-	lsl r7, r0, #0x4
-_0201C09A:
-	ldr r0, [sp, #0x0]
-	mov r3, #0x0
-	ldr r0, [r0, #0x0]
-	mov r4, r12
-	lsl r6, r0, #0x8
-_0201C0A4:
-	ldr r0, [r4, #0x0]
-	add r1, r7, #0x0
-	lsl r0, r0, #0xc
-	orr r0, r6
-	orr r1, r0
-	ldr r0, [sp, #0x1c]
-	add r3, r3, #0x1
-	add r2, r0, #0x0
-	orr r2, r1
-	lsl r1, r5, #0x1
-	ldr r0, _0201C0FC ; =UNK_021C5734
-	add r5, r5, #0x1
-	add r4, r4, #0x4
-	strh r2, [r0, r1]
-	cmp r3, #0x4
-	blt _0201C0A4
-	ldr r0, [sp, #0x0]
-	add r0, r0, #0x4
-	str r0, [sp, #0x0]
-	ldr r0, [sp, #0xc]
-	add r0, r0, #0x1
-	str r0, [sp, #0xc]
-	cmp r0, #0x4
-	blt _0201C09A
-	ldr r0, [sp, #0x4]
-	add r0, r0, #0x4
-	str r0, [sp, #0x4]
-	ldr r0, [sp, #0x10]
-	add r0, r0, #0x1
-	str r0, [sp, #0x10]
-	cmp r0, #0x4
-	blt _0201C08C
-	ldr r0, [sp, #0x8]
-	add r0, r0, #0x4
-	str r0, [sp, #0x8]
-	ldr r0, [sp, #0x14]
-	add r0, r0, #0x1
-	str r0, [sp, #0x14]
-	cmp r0, #0x4
-	blt _0201C07E
-	add sp, #0x30
-	pop {r3-r7, pc}
-	.balign 4
-_0201C0F8: .word UNK_021C570C
-_0201C0FC: .word UNK_021C5734
diff --git a/arm9/asm/scrcmd_24.s b/arm9/asm/scrcmd_24.s
deleted file mode 100644
index b9569382..00000000
--- a/arm9/asm/scrcmd_24.s
+++ /dev/null
@@ -1,316 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02045D88
-FUN_02045D88: ; 0x02045D88
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x13
-	bl FUN_02039438
-	add r1, r5, #0x0
-	add r1, #0x80
-	lsl r2, r4, #0x18
-	add r6, r0, #0x0
-	ldr r1, [r1, #0x0]
-	mov r0, #0x20
-	lsr r2, r2, #0x18
-	bl FUN_02037CF0
-	str r0, [r6, #0x0]
-	ldr r1, _02045DCC ; =FUN_0203BC04
-	add r0, r5, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r4-r6, pc}
-	nop
-_02045DCC: .word FUN_0203BC04
-
-	thumb_func_start FUN_02045DD0
-FUN_02045DD0: ; 0x02045DD0
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r4, #0x80
-	add r5, r0, #0x0
-	ldr r0, [r4, #0x0]
-	mov r1, #0x13
-	bl FUN_02039438
-	add r4, r0, #0x0
-	ldr r0, [r4, #0x0]
-	cmp r0, #0x0
-	bne _02045DFC
-	bl ErrorHandling
-_02045DFC:
-	ldr r0, [r4, #0x0]
-	bl FUN_02037D5C
-	strh r0, [r5, #0x0]
-	ldrh r0, [r5, #0x0]
-	cmp r0, #0x4
-	bne _02045E0E
-	mov r0, #0xff
-	strh r0, [r5, #0x0]
-_02045E0E:
-	ldr r0, [r4, #0x0]
-	bl FreeToHeap
-	mov r0, #0x0
-	str r0, [r4, #0x0]
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045E1C
-FUN_02045E1C: ; 0x02045E1C
-	mov r0, #0x0
-	bx lr
-
-	thumb_func_start FUN_02045E20
-FUN_02045E20: ; 0x02045E20
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r5, #0x80
-	add r6, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_PlayerParty_get
-	add r1, r6, #0x0
-	bl GetPartyMonByIndex
-	mov r1, #0x20
-	bl FUN_02088DF8
-	add r5, r0, #0x0
-	bl FUN_02088EF8
-	strh r0, [r4, #0x0]
-	add r0, r5, #0x0
-	bl FreeToHeap
-	mov r0, #0x0
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045E74
-FUN_02045E74: ; 0x02045E74
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r5, r0, #0x0
-	add r0, #0x80
-	add r7, r1, #0x0
-	ldr r0, [r0, #0x0]
-	mov r1, #0x13
-	str r2, [sp, #0x0]
-	add r6, r3, #0x0
-	bl FUN_02039438
-	str r0, [sp, #0x4]
-	mov r0, #0x20
-	bl FUN_02088DD8
-	add r4, r0, #0x0
-	ldr r0, [sp, #0x4]
-	str r4, [r0, #0x0]
-	ldr r0, [sp, #0x0]
-	str r0, [r4, #0x0]
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl ScriptEnvironment_GetSav2Ptr
-	bl Sav2_PlayerData_GetProfileAddr
-	str r0, [r4, #0x4]
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetOptionsAddr
-	str r0, [r4, #0x8]
-	str r6, [r4, #0xc]
-	add r0, r5, #0x0
-	strb r7, [r4, #0x15]
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	add r1, r4, #0x0
-	bl FUN_02038864
-	ldr r1, _02045EDC ; =FUN_0203BC04
-	add r0, r5, #0x0
-	bl SetupNativeScript
-	add r0, r6, #0x0
-	bl FreeToHeap
-	add sp, #0x8
-	pop {r3-r7, pc}
-	.balign 4
-_02045EDC: .word FUN_0203BC04
-
-	thumb_func_start FUN_02045EE0
-FUN_02045EE0: ; 0x02045EE0
-	mov r0, #0x1
-	bx lr
-
-	thumb_func_start FUN_02045EE4
-FUN_02045EE4: ; 0x02045EE4
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_PlayerParty_get
-	add r1, r4, #0x0
-	bl GetPartyMonByIndex
-	add r4, r0, #0x0
-	mov r1, #0x20
-	bl FUN_02088DF8
-	add r3, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x1
-	add r2, r4, #0x0
-	bl FUN_02045E74
-	mov r0, #0x1
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02045F24
-FUN_02045F24: ; 0x02045F24
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_PlayerParty_get
-	add r1, r6, #0x0
-	bl GetPartyMonByIndex
-	add r6, r0, #0x0
-	mov r0, #0x20
-	mov r1, #0x4
-	bl AllocFromHeap
-	add r3, r0, #0x0
-	ldr r0, _02045F80 ; =0x0000FFFF
-	strh r4, [r3, #0x0]
-	strh r0, [r3, #0x2]
-	add r0, r5, #0x0
-	mov r1, #0x0
-	add r2, r6, #0x0
-	bl FUN_02045E74
-	mov r0, #0x1
-	pop {r4-r6, pc}
-	.balign 4
-_02045F80: .word 0x0000FFFF
-
-	thumb_func_start FUN_02045F84
-FUN_02045F84: ; 0x02045F84
-	mov r0, #0x0
-	bx lr
-
-	thumb_func_start FUN_02045F88
-FUN_02045F88: ; 0x02045F88
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r4, #0x80
-	add r5, r0, #0x0
-	ldr r0, [r4, #0x0]
-	mov r1, #0x13
-	bl FUN_02039438
-	ldr r4, [r0, #0x0]
-	cmp r4, #0x0
-	bne _02045FB2
-	bl ErrorHandling
-_02045FB2:
-	ldrb r0, [r4, #0x16]
-	cmp r0, #0x0
-	bne _02045FBC
-	mov r0, #0x0
-	b _02045FBE
-_02045FBC:
-	mov r0, #0xff
-_02045FBE:
-	strh r0, [r5, #0x0]
-	add r0, r4, #0x0
-	bl FUN_02088DF0
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045FCC
-FUN_02045FCC: ; 0x02045FCC
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r4, #0x80
-	add r5, r0, #0x0
-	ldr r0, [r4, #0x0]
-	mov r1, #0x13
-	bl FUN_02039438
-	ldr r4, [r0, #0x0]
-	cmp r4, #0x0
-	bne _02045FF6
-	bl ErrorHandling
-_02045FF6:
-	ldrb r0, [r4, #0x16]
-	cmp r0, #0x0
-	bne _02046000
-	mov r0, #0x0
-	b _02046002
-_02046000:
-	mov r0, #0xff
-_02046002:
-	strh r0, [r5, #0x0]
-	add r0, r4, #0x0
-	bl FUN_02088DF0
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
diff --git a/arm9/asm/scrcmd_6.s b/arm9/asm/scrcmd_6.s
deleted file mode 100644
index 10b41ff7..00000000
--- a/arm9/asm/scrcmd_6.s
+++ /dev/null
@@ -1,399 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_020413C0
-FUN_020413C0: ; 0x020413C0
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl FUN_02005410
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_020413E8
-FUN_020413E8: ; 0x020413E8
-	push {r3, lr}
-	bl ScriptReadHalfword
-	bl FUN_0200521C
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_020413F8
-FUN_020413F8: ; 0x020413F8
-	push {r3, lr}
-	bl ScriptReadHalfword
-	bl FUN_02004124
-	mov r1, #0x0
-	bl FUN_02005350
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_0204140C
-FUN_0204140C: ; 0x0204140C
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r1, [r0, #0x1c]
-	ldr r1, [r1, #0x0]
-	bl FUN_0204ABA8
-	bl FUN_0200521C
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02041424
-FUN_02041424: ; 0x02041424
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl FUN_0204AB20
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_0204143C
-FUN_0204143C: ; 0x0204143C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	bl FUN_020053CC
-	ldr r1, _02041460 ; =FUN_02041464
-	add r0, r5, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r3-r5, pc}
-	.balign 4
-_02041460: .word FUN_02041464
-
-	thumb_func_start FUN_02041464
-FUN_02041464: ; 0x02041464
-	push {r3, lr}
-	bl FUN_02005404
-	cmp r0, #0x0
-	bne _02041472
-	mov r0, #0x1
-	pop {r3, pc}
-_02041472:
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02041478
-FUN_02041478: ; 0x02041478
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	mov r0, #0x7f
-	mov r2, #0x0
-	bl FUN_0200538C
-	ldr r1, _02041498 ; =FUN_02041464
-	add r0, r4, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r4, pc}
-	nop
-_02041498: .word FUN_02041464
-
-	thumb_func_start FUN_0204149C
-FUN_0204149C: ; 0x0204149C
-	push {r3, lr}
-	ldr r1, [r0, #0x8]
-	add r3, r1, #0x1
-	str r3, [r0, #0x8]
-	ldrb r2, [r1, #0x0]
-	add r1, r3, #0x1
-	str r1, [r0, #0x8]
-	ldrb r1, [r3, #0x0]
-	add r0, r2, #0x0
-	bl FUN_020047C8
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_020414B8
-FUN_020414B8: ; 0x020414B8
-	push {r3, lr}
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	mov r0, #0x4
-	bl FUN_02005308
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_020414CC
-FUN_020414CC: ; 0x020414CC
-	push {r3, lr}
-	ldr r2, [r0, #0x8]
-	add r1, r2, #0x1
-	str r1, [r0, #0x8]
-	ldrb r0, [r2, #0x0]
-	bl FUN_020040F4
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_020414E0
-FUN_020414E0: ; 0x020414E0
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl VarGet
-	bl FUN_020054C8
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_020414FC
-FUN_020414FC: ; 0x020414FC
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl VarGet
-	mov r1, #0x0
-	bl FUN_020054F0
-	mov r0, #0x0
-	pop {r4, pc}
-
-	thumb_func_start FUN_02041518
-FUN_02041518: ; 0x02041518
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	str r0, [r4, #0x64]
-	ldr r1, _0204153C ; =FUN_02041540
-	add r0, r4, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r4, pc}
-	nop
-_0204153C: .word FUN_02041540
-
-	thumb_func_start FUN_02041540
-FUN_02041540: ; 0x02041540
-	push {r3, lr}
-	ldr r0, [r0, #0x64]
-	lsl r0, r0, #0x10
-	lsr r0, r0, #0x10
-	bl FUN_02005508
-	cmp r0, #0x0
-	bne _02041554
-	mov r0, #0x1
-	pop {r3, pc}
-_02041554:
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02041558
-FUN_02041558: ; 0x02041558
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl VarGet
-	add r0, r5, #0x0
-	bl FUN_02005578
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start ScrCmd_waitcry
-ScrCmd_waitcry: ; 0x02041588
-	push {r3, lr}
-	ldr r1, _02041594 ; =FUN_02041598
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r3, pc}
-	.balign 4
-_02041594: .word FUN_02041598
-
-	thumb_func_start FUN_02041598
-FUN_02041598: ; 0x02041598
-	push {r3, lr}
-	bl FUN_02005670
-	cmp r0, #0x0
-	bne _020415A6
-	mov r0, #0x1
-	pop {r3, pc}
-_020415A6:
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_playbgm
-ScrCmd_playbgm: ; 0x020415AC
-	push {r3, lr}
-	bl ScriptReadHalfword
-	bl PlayBGM
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_020415BC
-FUN_020415BC: ; 0x020415BC
-	push {r3, lr}
-	ldr r1, _020415C8 ; =FUN_020415CC
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r3, pc}
-	.balign 4
-_020415C8: .word FUN_020415CC
-
-	thumb_func_start FUN_020415CC
-FUN_020415CC: ; 0x020415CC
-	push {r3, lr}
-	bl FUN_02005CBC
-	cmp r0, #0x0
-	bne _020415DA
-	mov r0, #0x1
-	pop {r3, pc}
-_020415DA:
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_020415E0
-FUN_020415E0: ; 0x020415E0
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r5, #0x80
-	add r4, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_02029EF8
-	bl FUN_02005D20
-	cmp r0, #0x1
-	bne _02041610
-	mov r0, #0x1
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_02041610:
-	mov r0, #0x0
-	strh r0, [r4, #0x0]
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02041618
-FUN_02041618: ; 0x02041618
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	add r4, r0, #0x0
-	bl FUN_02005E28
-	cmp r0, #0x0
-	bne _0204163C
-	mov r0, #0x1
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r4, pc}
-_0204163C:
-	mov r0, #0x0
-	strh r0, [r4, #0x0]
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02041644
-FUN_02041644: ; 0x02041644
-	push {r3, lr}
-	bl FUN_02005E64
-	mov r0, #0x1
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02041650
-FUN_02041650: ; 0x02041650
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_02029EF8
-	bl FUN_02005E6C
-	mov r0, #0x1
-	pop {r3, pc}
-
-	thumb_func_start FUN_02041664
-FUN_02041664: ; 0x02041664
-	push {r3, lr}
-	mov r1, #0x0
-	mov r0, #0x3f
-	add r2, r1, #0x0
-	bl FUN_0200433C
-	mov r0, #0x1
-	pop {r3, pc}
-
-	thumb_func_start FUN_02041674
-FUN_02041674: ; 0x02041674
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl VarGet
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	bl FUN_0200488C
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s
index 3d6645c2..c1e91c9f 100644
--- a/arm9/asm/scrcmd_asm.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -14,50 +14,6 @@ UNK_021C5A0C: ; 0x021C5A0C
 
 	.text
 
-	thumb_func_start FUN_0203AFC4
-FUN_0203AFC4: ; 0x0203AFC4
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadWord
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	add r1, r6, #0x0
-	bl FUN_0203B120
-	add r6, r0, #0x0
-	bne _0203AFF6
-	bl ErrorHandling
-_0203AFF6:
-	ldr r1, [r5, #0x8]
-	add r0, r6, #0x0
-	add r1, r1, r4
-	bl FUN_0205AEA4
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x4
-	bl FUN_02039438
-	ldrb r1, [r0, #0x0]
-	add r5, #0x80
-	mov r2, #0x0
-	add r1, r1, #0x1
-	strb r1, [r0, #0x0]
-	ldr r0, [r5, #0x0]
-	add r1, r4, #0x0
-	bl FUN_0203B174
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
 	thumb_func_start FUN_0203B024
 FUN_0203B024: ; 0x0203B024
 	push {r3-r7, lr}
diff --git a/arm9/asm/unk_02022504.s b/arm9/asm/unk_02022504.s
deleted file mode 100644
index e3463538..00000000
--- a/arm9/asm/unk_02022504.s
+++ /dev/null
@@ -1,53 +0,0 @@
-	.include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02022504
-FUN_02022504: ; 0x02022504
-	ldr r3, _0202250C ; =SavArray_get
-	mov r1, #0x1b
-	bx r3
-	nop
-_0202250C: .word SavArray_get
-
-	thumb_func_start GetStoragePCPointer
-GetStoragePCPointer: ; 0x02022510
-	ldr r3, _02022518 ; =SavArray_get
-	mov r1, #0x23
-	bx r3
-	nop
-_02022518: .word SavArray_get
-
-	thumb_func_start FUN_0202251C
-FUN_0202251C: ; 0x0202251C
-	ldr r3, _02022524 ; =SavArray_get
-	mov r1, #0x1f
-	bx r3
-	nop
-_02022524: .word SavArray_get
-
-	thumb_func_start FUN_02022528
-FUN_02022528: ; 0x02022528
-	ldr r3, _02022530 ; =SavArray_get
-	mov r1, #0x20
-	bx r3
-	nop
-_02022530: .word SavArray_get
-
-	thumb_func_start LoadHallOfFame
-LoadHallOfFame: ; 0x02022534
-	push {r3, lr}
-	add r3, r2, #0x0
-	mov r2, #0x0
-	bl ReadSaveFileFromFlash
-	pop {r3, pc}
-
-	thumb_func_start SaveHallOfFame
-SaveHallOfFame: ; 0x02022540
-	ldr r3, _02022548 ; =WriteSaveFileToFlash
-	add r2, r1, #0x0
-	mov r1, #0x0
-	bx r3
-	.balign 4
-_02022548: .word WriteSaveFileToFlash
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index a43768aa..b60088a5 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -222,28 +222,28 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_Unk0046
     .word ScrCmd_Unk0047
     .word ScrCmd_Unk0048
-    .word FUN_020414E0
-    .word FUN_020414FC
-    .word FUN_02041518
-    .word FUN_02041558
-    .word ScrCmd_waitcry
-    .word ScrCmd_playbgm
-    .word FUN_020415BC
-    .word FUN_020413E8
-    .word FUN_020413F8
-    .word FUN_0204140C
-    .word FUN_02041424
-    .word FUN_0204143C
-    .word FUN_02041478
-    .word FUN_0204149C
-    .word FUN_020414B8
-    .word FUN_020414CC
-    .word FUN_020415E0
-    .word FUN_02041618
-    .word FUN_02041644
-    .word FUN_02041650
-    .word FUN_02041664
-    .word FUN_0203AFC4
+    .word ScrCmd_Unk0049
+    .word ScrCmd_Unk004A
+    .word ScrCmd_Unk004B
+    .word ScrCmd_Unk004C
+    .word ScrCmd_PlayCryWait
+    .word ScrCmd_PlayBgm
+    .word ScrCmd_Unk004F
+    .word ScrCmd_Unk0050
+    .word ScrCmd_Unk0051
+    .word ScrCmd_Unk0052
+    .word ScrCmd_Unk0053
+    .word ScrCmd_Unk0054
+    .word ScrCmd_Unk0055
+    .word ScrCmd_Unk0056
+    .word ScrCmd_Unk0057
+    .word ScrCmd_Unk0058
+    .word ScrCmd_Unk0059
+    .word ScrCmd_Unk005A
+    .word ScrCmd_Unk005B
+    .word ScrCmd_Unk005C
+    .word ScrCmd_Unk005D
+    .word ScrCmd_Unk005E
     .word FUN_0203B148
     .word FUN_0203B1F0
     .word FUN_0203B3B0
@@ -603,8 +603,8 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203E078
     .word FUN_0203E0CC
     .word FUN_0203E120
-    .word FUN_02045D88
-    .word FUN_02045DD0
+    .word ScrCmd_Unk01C6
+    .word ScrCmd_Unk01C7
     .word FUN_02044D8C
     .word FUN_02044E34
     .word FUN_02044E78
@@ -691,14 +691,14 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203E848
     .word FUN_0203E858
     .word ScrCmd_Unk021D
-    .word FUN_02045E1C
-    .word FUN_02045E20
-    .word FUN_02045EE0
-    .word FUN_02045EE4
-    .word FUN_02045F84
-    .word FUN_02045F88
-    .word FUN_02045F24
-    .word FUN_02045FCC
+    .word ScrCmd_Unk021E
+    .word ScrCmd_Unk021F
+    .word ScrCmd_Unk0220
+    .word ScrCmd_Unk0221
+    .word ScrCmd_Unk0222
+    .word ScrCmd_Unk0223
+    .word ScrCmd_Unk0224
+    .word ScrCmd_Unk0225
     .word FUN_0203E870
     .word FUN_0203E894
     .word FUN_0203E8C4
@@ -792,7 +792,7 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_Unk0280
     .word FUN_02044A0C
     .word FUN_0203F484
-    .word FUN_02041674
+    .word ScrCmd_Unk0283
     .word FUN_0203F4D8
     .word FUN_0203F508
     .word FUN_0203F5D4
@@ -835,7 +835,7 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203B7F0
     .word FUN_0203FB4C
     .word FUN_0203B790
-    .word FUN_020413C0
+    .word ScrCmd_Unk02AE
     .word FUN_0203FB64
     .word FUN_0203FB94
     .word FUN_0203FBA0