2 files changed, 9 insertions, 248 deletions
diff --git a/arm9/asm/scrcmd_11.s b/arm9/asm/scrcmd_11.s
deleted file mode 100644
index 5612284f..00000000
--- a/arm9/asm/scrcmd_11.s
+++ /dev/null
@@ -1,239 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02042B0C
-FUN_02042B0C: ; 0x02042B0C
-	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 r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xa
-	bl FUN_02039438
-	add r1, r0, #0x0
-	add r5, #0x80
-	ldr r0, [r5, #0x0]
-	ldr r1, [r1, #0x0]
-	bl FUN_0204B5FC
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02042B40
-FUN_02042B40: ; 0x02042B40
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xa
-	bl FUN_02039438
-	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 r5, #0x80
-	add r6, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r1, [r4, #0x0]
-	bl FUN_0204B63C
-	strh r0, [r6, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02042B74
-FUN_02042B74: ; 0x02042B74
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xa
-	bl FUN_02039438
-	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 r5, #0x80
-	add r6, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r1, [r4, #0x0]
-	bl FUN_0204B660
-	strh r0, [r6, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02042BA8
-FUN_02042BA8: ; 0x02042BA8
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xa
-	bl FUN_02039438
-	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 r5, #0x80
-	add r6, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r1, [r4, #0x0]
-	bl FUN_0204B684
-	strh r0, [r6, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02042BDC
-FUN_02042BDC: ; 0x02042BDC
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xa
-	bl FUN_02039438
-	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 r5, #0x80
-	add r6, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r1, [r4, #0x0]
-	bl FUN_0204B6A4
-	strh r0, [r6, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02042C10
-FUN_02042C10: ; 0x02042C10
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xa
-	bl FUN_02039438
-	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 r2, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r1, [r4, #0x0]
-	bl FUN_0204B57C
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02042C44
-FUN_02042C44: ; 0x02042C44
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xa
-	bl FUN_02039438
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
-	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 r5, #0x80
-	add r2, r0, #0x0
-	ldr r0, [r5, #0x0]
-	ldr r1, [r4, #0x0]
-	bl FUN_0204B5A8
-	add r0, r6, #0x0
-	mov r1, #0x3
-	bl FUN_0202A0E8
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02042C8C
-FUN_02042C8C: ; 0x02042C8C
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	cmp r0, #0x0
-	beq _02042C9E
-	cmp r0, #0x1
-	beq _02042CA8
-	b _02042CB2
-_02042C9E:
-	add r4, #0x80
-	ldr r0, [r4, #0x0]
-	bl FUN_0204B9A0
-	b _02042CB6
-_02042CA8:
-	add r4, #0x80
-	ldr r0, [r4, #0x0]
-	bl FUN_0204B9CC
-	b _02042CB6
-_02042CB2:
-	bl ErrorHandling
-_02042CB6:
-	mov r0, #0x1
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02042CBC
-FUN_02042CBC: ; 0x02042CBC
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_02029FC8
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xa
-	bl FUN_02039438
-	add r1, r0, #0x0
-	add r5, #0x80
-	ldr r0, [r5, #0x0]
-	ldr r1, [r1, #0x0]
-	bl FUN_0204B4FC
-	add r0, r4, #0x0
-	mov r1, #0x0
-	bl FUN_0202A170
-	mov r0, #0x0
-	pop {r3-r5, pc}
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 70b66348..b79288ca 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -530,15 +530,15 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203D958
     .word FUN_02040D04
     .word FUN_02040D7C
-    .word FUN_02042B0C
-    .word FUN_02042B40
-    .word FUN_02042B74
-    .word FUN_02042BA8
-    .word FUN_02042BDC
-    .word FUN_02042C10
-    .word FUN_02042C44
-    .word FUN_02042C8C
-    .word FUN_02042CBC
+    .word ScrCmd_Unk017D
+    .word ScrCmd_Unk017E
+    .word ScrCmd_Unk017F
+    .word ScrCmd_Unk0180
+    .word ScrCmd_Unk0181
+    .word ScrCmd_Unk0182
+    .word ScrCmd_Unk0183
+    .word ScrCmd_Unk0184
+    .word ScrCmd_Unk0185
     .word FUN_0203D998
     .word FUN_0203D9E8
     .word FUN_0203DA78