4 files changed, 21 insertions, 793 deletions
diff --git a/arm9/asm/scrcmd_21.s b/arm9/asm/scrcmd_21.s
deleted file mode 100644
index e1f03c4a..00000000
--- a/arm9/asm/scrcmd_21.s
+++ /dev/null
@@ -1,465 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.section .rodata
-
-	.global UNK_020F4574
-UNK_020F4574: ; 0x020F4574
-	.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
-
-	.text
-
-	thumb_func_start FUN_020453F4
-FUN_020453F4: ; 0x020453F4
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_Pokedex_get
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl Pokedex_GetSinnohDexFlag
-	strh r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045424
-FUN_02045424: ; 0x02045424
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_Pokedex_get
-	bl Pokedex_SetSinnohDexFlag
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045438
-FUN_02045438: ; 0x02045438
-	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_02034E30
-	bl FUN_02034E20
-	bl FUN_02055474
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045468
-FUN_02045468: ; 0x02045468
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_02034E30
-	bl FUN_02034E20
-	mov r1, #0x1
-	bl FUN_02055488
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045484
-FUN_02045484: ; 0x02045484
-	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
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r6, r0, #0x0
-	cmp r4, #0x8
-	blo _020454B6
-	bl ErrorHandling
-_020454B6:
-	add r5, #0x80
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetProfileAddr
-	add r1, r4, #0x0
-	bl PlayerProfile_TestBadgeFlag
-	strh r0, [r6, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_020454CC
-FUN_020454CC: ; 0x020454CC
-	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
-	cmp r4, #0x8
-	blo _020454EA
-	bl ErrorHandling
-_020454EA:
-	add r5, #0x80
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetProfileAddr
-	add r1, r4, #0x0
-	bl PlayerProfile_SetBadgeFlag
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045500
-FUN_02045500: ; 0x02045500
-	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 SavArray_Flags_get
-	bl FUN_0205ECE0
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_0204552C
-FUN_0204552C: ; 0x0204552C
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r6, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	mov r4, #0x0
-	ldr r7, _02045578 ; =UNK_020F4574
-	str r0, [sp, #0x0]
-	add r5, r4, #0x0
-_02045548:
-	add r0, r6, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetProfileAddr
-	ldrb r1, [r7, r4]
-	bl PlayerProfile_TestBadgeFlag
-	cmp r0, #0x1
-	bne _02045564
-	add r0, r5, #0x1
-	lsl r0, r0, #0x10
-	lsr r5, r0, #0x10
-_02045564:
-	add r0, r4, #0x1
-	lsl r0, r0, #0x10
-	lsr r4, r0, #0x10
-	cmp r4, #0x8
-	blo _02045548
-	ldr r0, [sp, #0x0]
-	strh r5, [r0, #0x0]
-	mov r0, #0x0
-	pop {r3-r7, pc}
-	nop
-_02045578: .word UNK_020F4574
-
-	thumb_func_start FUN_0204557C
-FUN_0204557C: ; 0x0204557C
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ECD4
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045590
-FUN_02045590: ; 0x02045590
-	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 SavArray_Flags_get
-	bl FUN_0205ED3C
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_020455BC
-FUN_020455BC: ; 0x020455BC
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED1C
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_020455D0
-FUN_020455D0: ; 0x020455D0
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED2C
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_020455E4
-FUN_020455E4: ; 0x020455E4
-	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 SavArray_Flags_get
-	bl FUN_0205ED6C
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045610
-FUN_02045610: ; 0x02045610
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED4C
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045624
-FUN_02045624: ; 0x02045624
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ED5C
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045638
-FUN_02045638: ; 0x02045638
-	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 SavArray_Flags_get
-	bl FUN_0205ED0C
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045664
-FUN_02045664: ; 0x02045664
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	bl FUN_0205ECFC
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start FUN_02045678
-FUN_02045678: ; 0x02045678
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	ldr r2, [r5, #0x8]
-	add r4, r0, #0x0
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r1, [r2, #0x0]
-	cmp r1, #0x0
-	beq _020456A6
-	cmp r1, #0x1
-	beq _0204569E
-	cmp r1, #0x2
-	beq _020456AE
-	b _020456CC
-_0204569E:
-	mov r1, #0x1
-	bl FUN_0205F264
-	b _020456D0
-_020456A6:
-	mov r1, #0x0
-	bl FUN_0205F264
-	b _020456D0
-_020456AE:
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	mov r1, #0x2
-	bl FUN_0205F264
-	strh r0, [r5, #0x0]
-	b _020456D0
-_020456CC:
-	bl ErrorHandling
-_020456D0:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_020456D4
-FUN_020456D4: ; 0x020456D4
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	ldr r2, [r5, #0x8]
-	add r4, r0, #0x0
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r1, [r2, #0x0]
-	cmp r1, #0x0
-	beq _02045700
-	cmp r1, #0x1
-	beq _020456FA
-	cmp r1, #0x2
-	beq _02045706
-	b _02045722
-_020456FA:
-	bl FUN_0205F274
-	b _02045726
-_02045700:
-	bl FUN_0205F284
-	b _02045726
-_02045706:
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl FUN_0205F294
-	strh r0, [r5, #0x0]
-	b _02045726
-_02045722:
-	bl ErrorHandling
-_02045726:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_0204572C
-FUN_0204572C: ; 0x0204572C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	ldr r2, [r5, #0x8]
-	add r4, r0, #0x0
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r1, [r2, #0x0]
-	cmp r1, #0x0
-	beq _02045758
-	cmp r1, #0x1
-	beq _02045752
-	cmp r1, #0x2
-	beq _0204575E
-	b _0204577A
-_02045752:
-	bl FUN_0205F2A4
-	b _0204577E
-_02045758:
-	bl FUN_0205F2B4
-	b _0204577E
-_0204575E:
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl FUN_0205F2C4
-	strh r0, [r5, #0x0]
-	b _0204577E
-_0204577A:
-	bl ErrorHandling
-_0204577E:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
diff --git a/arm9/asm/scrcmd_8.s b/arm9/asm/scrcmd_8.s
deleted file mode 100644
index fbb5b223..00000000
--- a/arm9/asm/scrcmd_8.s
+++ /dev/null
@@ -1,234 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02041C38
-FUN_02041C38: ; 0x02041C38
-	push {r4-r7, lr}
-	sub sp, #0xc
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xf
-	bl FUN_02039438
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_0202881C
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r7, [r0, #0xc]
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	cmp r0, #0x6
-	bls _02041C6C
-	b _02041E38
-_02041C6C:
-	add r0, r0, r0
-	add r0, pc
-	ldrh r0, [r0, #0x6]
-	lsl r0, r0, #0x10
-	asr r0, r0, #0x10
-	add pc, r0
-_02041C78: ; jump table (using 16-bit offset)
-	.short _02041C86 - _02041C78 - 2; case 0
-	.short _02041CBC - _02041C78 - 2; case 1
-	.short _02041CF2 - _02041C78 - 2; case 2
-	.short _02041D28 - _02041C78 - 2; case 3
-	.short _02041D5E - _02041C78 - 2; case 4
-	.short _02041D94 - _02041C78 - 2; case 5
-	.short _02041DCE - _02041C78 - 2; case 6
-_02041C86:
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, 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
-	add r1, r6, #0x0
-	bl FUN_02028828
-	strh r0, [r4, #0x0]
-	add sp, #0xc
-	mov r0, #0x0
-	pop {r4-r7, pc}
-_02041CBC:
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, 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
-	add r1, r6, #0x0
-	bl FUN_02028840
-	strh r0, [r4, #0x0]
-	add sp, #0xc
-	mov r0, #0x0
-	pop {r4-r7, pc}
-_02041CF2:
-	add r0, r4, #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 r3, r0, #0x0
-	mov r0, #0x0
-	str r0, [sp, #0x0]
-	ldr r0, [r6, #0x0]
-	add r1, r7, #0x0
-	add r2, r5, #0x0
-	bl BufferEasyChatWord
-	b _02041E38
-_02041D28:
-	add r0, r4, #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 r3, r0, #0x0
-	mov r0, #0x1
-	str r0, [sp, #0x0]
-	ldr r0, [r6, #0x0]
-	add r1, r7, #0x0
-	add r2, r5, #0x0
-	bl BufferEasyChatWord
-	b _02041E38
-_02041D5E:
-	mov r1, #0x0
-	add r0, r5, #0x0
-	add r2, r1, #0x0
-	bl FUN_020287A8
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	mov r2, #0x0
-	str r2, [sp, #0x0]
-	str r5, [sp, #0x4]
-	str r0, [sp, #0x8]
-	ldr r0, [r4, #0x74]
-	mov r1, #0x5
-	mov r3, #0x7
-	bl FUN_020385CC
-	add sp, #0xc
-	mov r0, #0x1
-	pop {r4-r7, pc}
-_02041D94:
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r7, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x1
-	bl FUN_02028828
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r7, #0x0
-	mov r2, #0x1
-	bl FUN_02028700
-	cmp r6, #0x0
-	beq _02041DC8
-	add r4, #0x80
-	ldr r0, [r4, #0x0]
-	bl FUN_020612F8
-_02041DC8:
-	add sp, #0xc
-	mov r0, #0x0
-	pop {r4-r7, pc}
-_02041DCE:
-	mov r0, #0x40
-	mov r1, #0x20
-	bl String_ctor
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetProfileAddr
-	add r1, r6, #0x0
-	add r7, r0, #0x0
-	bl PlayerName_FlatToString
-	add r0, r5, #0x0
-	mov r1, #0x0
-	mov r2, #0x1
-	add r3, r6, #0x0
-	bl FUN_020287C0
-	add r0, r7, #0x0
-	bl PlayerProfile_GetTrainerGender
-	add r2, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x0
-	bl FUN_020287EC
-	add r0, r5, #0x0
-	mov r1, #0x0
-	mov r2, #0x2
-	bl FUN_02028810
-	bl MTRandom
-	add r2, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x0
-	bl FUN_02028788
-	add r0, r6, #0x0
-	bl String_dtor
-	add r0, r5, #0x0
-	mov r1, #0x0
-	mov r2, #0x1
-	bl FUN_02028700
-	add r4, #0x80
-	ldr r0, [r4, #0x0]
-	bl FUN_020612EC
-_02041E38:
-	mov r0, #0x0
-	add sp, #0xc
-	pop {r4-r7, pc}
-	.balign 4
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 08416fc7..a43768aa 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -492,23 +492,23 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203D738
     .word FUN_0203D774
     .word FUN_0203D834
-    .word FUN_020453F4
-    .word FUN_02045424
-    .word FUN_02045438
-    .word FUN_02045468
-    .word FUN_02045484
-    .word FUN_020454CC
-    .word FUN_0204552C
-    .word FUN_02045500
-    .word FUN_0204557C
-    .word FUN_02045590
-    .word FUN_020455BC
-    .word FUN_020455D0
-    .word FUN_020455E4
-    .word FUN_02045610
-    .word FUN_02045624
-    .word FUN_02045638
-    .word FUN_02045664
+    .word ScrCmd_HasSinnohDex
+    .word ScrCmd_GiveSinnohDex
+    .word ScrCmd_Unk0159
+    .word ScrCmd_Unk015A
+    .word ScrCmd_HasBadge
+    .word ScrCmd_GiveBadge
+    .word ScrCmd_GetTotalEarnedBadges
+    .word ScrCmd_Unk015E
+    .word ScrCmd_Unk015F
+    .word ScrCmd_Unk0160
+    .word ScrCmd_Unk0161
+    .word ScrCmd_Unk0162
+    .word ScrCmd_Unk0163
+    .word ScrCmd_Unk0164
+    .word ScrCmd_Unk0165
+    .word ScrCmd_Unk0166
+    .word ScrCmd_Unk0167
     .word FUN_0203DC00
     .word FUN_0203DC58
     .word FUN_0203DC70
@@ -612,9 +612,9 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203E138
     .word FUN_0203E168
     .word FUN_0203E254
-    .word FUN_02045678
-    .word FUN_020456D4
-    .word FUN_0204572C
+    .word ScrCmd_Unk01CF
+    .word ScrCmd_Unk01D0
+    .word ScrCmd_Unk01D1
     .word FUN_0203E258
     .word FUN_0203E29C
     .word FUN_0203E2F8
@@ -690,7 +690,7 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203E81C
     .word FUN_0203E848
     .word FUN_0203E858
-    .word FUN_02041C38
+    .word ScrCmd_Unk021D
     .word FUN_02045E1C
     .word FUN_02045E20
     .word FUN_02045EE0
diff --git a/arm9/asm/unk_0208890C.s b/arm9/asm/unk_0208890C.s
deleted file mode 100644
index d27130c9..00000000
--- a/arm9/asm/unk_0208890C.s
+++ /dev/null
@@ -1,73 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.section .rodata
-
-	.global UNK_020FD6E4
-UNK_020FD6E4: ; 0x020FD6E4
-	.word FUN_020889B0, FUN_02088A00, FUN_02088A78, 0xFFFFFFFF
-
-	.text
-
-	thumb_func_start FUN_0208890C
-FUN_0208890C: ; 0x0208890C
-	push {r3-r7, lr}
-	add r6, r0, #0x0
-	add r5, r1, #0x0
-	add r0, r2, #0x0
-	mov r1, #0x20
-	add r7, r3, #0x0
-	bl AllocFromHeap
-	add r4, r0, #0x0
-	mov r1, #0x0
-	mov r2, #0x20
-	bl MI_CpuFill8
-	str r5, [r4, #0xc]
-	add r0, r5, #0x0
-	bl FUN_02028048
-	str r0, [r4, #0x8]
-	add r0, r5, #0x0
-	bl Sav2_PlayerData_GetProfileAddr
-	str r0, [r4, #0x10]
-	add r0, r5, #0x0
-	bl Sav2_Bag_get
-	str r0, [r4, #0x14]
-	add r0, r5, #0x0
-	bl Sav2_PlayerData_GetOptionsAddr
-	str r0, [r4, #0x18]
-	str r7, [r4, #0x1c]
-	str r6, [r4, #0x4]
-	add r0, r4, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02088950
-FUN_02088950: ; 0x02088950
-	ldr r3, _02088958 ; =FUN_020373D4
-	add r2, r1, #0x0
-	ldr r1, _0208895C ; =UNK_020FD6E4
-	bx r3
-	.balign 4
-_02088958: .word FUN_020373D4
-_0208895C: .word UNK_020FD6E4
-
-	thumb_func_start FUN_02088960
-FUN_02088960: ; 0x02088960
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r4, r1, #0x0
-	add r6, r2, #0x0
-	bl ScriptEnvironment_GetSav2Ptr
-	add r3, r5, #0x0
-	add r3, #0x98
-	add r1, r0, #0x0
-	ldr r3, [r3, #0x0]
-	add r0, r4, #0x0
-	add r2, r6, #0x0
-	bl FUN_0208890C
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	bl FUN_02088950
-	add r0, r4, #0x0
-	pop {r4-r6, pc}
-	.balign 4