Merge branch 'master' into unk_0205FA2C

4 files changed, 19 insertions, 707 deletions

diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s
deleted file mode 100644
index 1b31ce71..00000000
--- a/arm9/asm/scrcmd_13.s
+++ /dev/null
@@ -1,220 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_0204387C
-FUN_0204387C: ; 0x0204387C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl SavArray_Flags_get
-	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
-	cmp r0, #0x0
-	bne _020438B2
-	add r0, r4, #0x0
-	bl FUN_0205F224
-	add r5, #0x80
-	ldr r0, [r5, #0x0]
-	bl FUN_0204B9EC
-	b _020438CA
-_020438B2:
-	cmp r0, #0x1
-	bne _020438C6
-	add r0, r4, #0x0
-	bl FUN_0205F234
-	add r5, #0x80
-	ldr r0, [r5, #0x0]
-	bl FUN_0204BA1C
-	b _020438CA
-_020438C6:
-	bl ErrorHandling
-_020438CA:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_020438D0
-FUN_020438D0: ; 0x020438D0
-	push {r4-r6, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_02022528
-	add r6, r0, #0x0
-	mov r0, #0x20
-	bl AllocMonZeroed
-	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, r6, #0x0
-	bl FUN_0202C000
-	cmp r0, #0x6
-	bne _02043908
-	mov r0, #0x1
-	b _0204390A
-_02043908:
-	mov r0, #0x0
-_0204390A:
-	strh r0, [r4, #0x0]
-	add r0, r5, #0x0
-	bl FreeToHeap
-	mov r0, #0x0
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_02043918
-FUN_02043918: ; 0x02043918
-	push {r4-r7, lr}
-	sub sp, #0xc
-	add r6, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl FUN_02022528
-	add r7, r0, #0x0
-	add r0, r6, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl GetStoragePCPointer
-	str r0, [sp, #0x8]
-	mov r0, #0x20
-	bl AllocMonZeroed
-	add r4, r0, #0x0
-	add r0, r6, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetProfileAddr
-	str r0, [sp, #0x4]
-	add r0, r6, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_Pokedex_get
-	mov r5, #0x0
-_0204395C:
-	add r0, r7, #0x0
-	add r1, r5, #0x0
-	add r2, r4, #0x0
-	bl FUN_0202BFD8
-	mov r0, #0x20
-	str r0, [sp, #0x0]
-	ldr r1, [sp, #0x4]
-	add r0, r4, #0x0
-	mov r2, #0x2
-	mov r3, #0x0
-	bl FUN_0208089C
-	add r0, r4, #0x0
-	bl FUN_020690E4
-	add r1, r0, #0x0
-	ldr r0, [sp, #0x8]
-	bl PCStorage_PlaceMonInFirstEmptySlotInAnyBox
-	cmp r0, #0x0
-	bne _0204398C
-	bl ErrorHandling
-_0204398C:
-	add r0, r6, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	add r1, r4, #0x0
-	ldr r0, [r0, #0xc]
-	bl FUN_0202C144
-	add r5, r5, #0x1
-	cmp r5, #0x6
-	blt _0204395C
-	add r0, r4, #0x0
-	bl FreeToHeap
-	add r0, r7, #0x0
-	bl FUN_0202BEDC
-	mov r0, #0x0
-	add sp, #0xc
-	pop {r4-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_020439B4
-FUN_020439B4: ; 0x020439B4
-	push {r3-r7, 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 r6, 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
-	add r5, r0, #0x0
-	cmp r6, #0x3
-	bhi _02043A40
-	add r0, r6, r6
-	add r0, pc
-	ldrh r0, [r0, #0x6]
-	lsl r0, r0, #0x10
-	asr r0, r0, #0x10
-	add pc, r0
-_020439EE: ; jump table (using 16-bit offset)
-	.short _020439F6 - _020439EE - 2; case 0
-	.short _02043A02 - _020439EE - 2; case 1
-	.short _02043A0E - _020439EE - 2; case 2
-	.short _02043A1A - _020439EE - 2; case 3
-_020439F6:
-	add r4, #0x80
-	ldr r0, [r4, #0x0]
-	bl FUN_0204BAC4
-	strh r0, [r5, #0x0]
-	b _02043A40
-_02043A02:
-	add r4, #0x80
-	ldr r0, [r4, #0x0]
-	bl FUN_0204BAD4
-	strh r0, [r5, #0x0]
-	b _02043A40
-_02043A0E:
-	add r4, #0x80
-	ldr r0, [r4, #0x0]
-	bl FUN_0204BAE4
-	strh r0, [r5, #0x0]
-	b _02043A40
-_02043A1A:
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl FUN_0204BAD4
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl FUN_0204BAC4
-	add r4, #0x80
-	add r7, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl FUN_0204BAE4
-	add r0, r7, r0
-	add r0, r6, r0
-	strh r0, [r5, #0x0]
-_02043A40:
-	mov r0, #0x0
-	pop {r3-r7, pc}
diff --git a/arm9/asm/scrcmd_22.s b/arm9/asm/scrcmd_22.s
deleted file mode 100644
index 1f354520..00000000
--- a/arm9/asm/scrcmd_22.s
+++ /dev/null
@@ -1,220 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02045784
-FUN_02045784: ; 0x02045784
-	push {r3-r7, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r5, [r1, #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 r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r7, 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
-	ldr r0, [r5, #0xc]
-	bl Sav2_Bag_get
-	add r1, r6, #0x0
-	add r2, r7, #0x0
-	mov r3, #0x4
-	bl Bag_AddItem
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_020457DC
-FUN_020457DC: ; 0x020457DC
-	push {r3-r7, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r5, [r1, #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 r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r7, 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
-	ldr r0, [r5, #0xc]
-	bl Sav2_Bag_get
-	add r1, r6, #0x0
-	add r2, r7, #0x0
-	mov r3, #0x4
-	bl Bag_TakeItem
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02045834
-FUN_02045834: ; 0x02045834
-	push {r3-r7, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r5, [r1, #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 r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r7, 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
-	ldr r0, [r5, #0xc]
-	bl Sav2_Bag_get
-	add r1, r6, #0x0
-	add r2, r7, #0x0
-	mov r3, #0x4
-	bl Bag_HasSpaceForItem
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_0204588C
-FUN_0204588C: ; 0x0204588C
-	push {r3-r7, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r5, [r1, #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 r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r7, 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
-	ldr r0, [r5, #0xc]
-	bl Sav2_Bag_get
-	add r1, r6, #0x0
-	add r2, r7, #0x0
-	mov r3, #0xb
-	bl Bag_HasItem
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_020458E4
-FUN_020458E4: ; 0x020458E4
-	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
-	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_02054CB0
-	strh r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02045918
-FUN_02045918: ; 0x02045918
-	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
-	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, #0x5
-	mov r2, #0xb
-	bl GetItemAttr
-	strh r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02045950
-FUN_02045950: ; 0x02045950
-	mov r0, #0x0
-	bx lr
-
-	thumb_func_start FUN_02045954
-FUN_02045954: ; 0x02045954
-	mov r0, #0x0
-	bx lr
diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s
index c10ba0f5..3d6645c2 100644
--- a/arm9/asm/scrcmd_asm.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -5,7 +5,6 @@
 	.extern UNK_020F3538
 	.extern gMain
 	.extern FUN_0203A2F0
-	.extern FUN_0203AD2C
 
 	.section .bss
 
@@ -15,253 +14,6 @@ UNK_021C5A0C: ; 0x021C5A0C
 
 	.text
 
-	thumb_func_start FUN_0203ADC4
-FUN_0203ADC4: ; 0x0203ADC4
-	push {r4-r7, lr}
-	sub sp, #0x2c
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r6, [r0, #0x0]
-	mov r1, #0x0
-	add r0, r6, #0x0
-	bl FUN_02039438
-	str r0, [sp, #0x1c]
-	add r0, r6, #0x0
-	mov r1, #0xf
-	bl FUN_02039438
-	str r0, [sp, #0x20]
-	ldr r0, [r5, #0x8]
-	add r1, r0, #0x1
-	str r1, [r5, #0x8]
-	ldrb r0, [r0, #0x0]
-	add r2, r1, #0x1
-	str r0, [sp, #0x18]
-	str r2, [r5, #0x8]
-	ldrb r0, [r1, #0x0]
-	add r1, r2, #0x1
-	str r0, [sp, #0x14]
-	str r1, [r5, #0x8]
-	ldrb r7, [r2, #0x0]
-	add r0, r1, #0x1
-	str r0, [r5, #0x8]
-	add r0, r5, #0x0
-	ldrb r4, [r1, #0x0]
-	bl ScriptReadHalfword
-	str r0, [sp, #0x24]
-	ldr r1, [sp, #0x24]
-	add r0, r6, #0x0
-	bl GetVarPointer
-	str r0, [sp, #0x28]
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x1
-	bl FUN_02039438
-	ldr r1, [sp, #0x28]
-	str r4, [sp, #0x0]
-	str r1, [sp, #0x4]
-	ldr r1, [sp, #0x20]
-	add r3, r7, #0x0
-	ldr r1, [r1, #0x0]
-	str r1, [sp, #0x8]
-	str r0, [sp, #0xc]
-	mov r0, #0x0
-	str r0, [sp, #0x10]
-	ldr r1, [sp, #0x18]
-	ldr r2, [sp, #0x14]
-	add r0, r6, #0x0
-	bl MOD05_021E1F34
-	ldr r1, [sp, #0x1c]
-	str r0, [r1, #0x0]
-	ldr r0, [sp, #0x24]
-	str r0, [r5, #0x64]
-	mov r0, #0x1
-	add sp, #0x2c
-	pop {r4-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0203AE4C
-FUN_0203AE4C: ; 0x0203AE4C
-	push {r4-r7, lr}
-	sub sp, #0x2c
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r6, [r0, #0x0]
-	mov r1, #0x0
-	add r0, r6, #0x0
-	bl FUN_02039438
-	str r0, [sp, #0x1c]
-	add r0, r6, #0x0
-	mov r1, #0xf
-	bl FUN_02039438
-	str r0, [sp, #0x20]
-	ldr r0, [r5, #0x8]
-	add r1, r0, #0x1
-	str r1, [r5, #0x8]
-	ldrb r0, [r0, #0x0]
-	add r2, r1, #0x1
-	str r0, [sp, #0x18]
-	str r2, [r5, #0x8]
-	ldrb r0, [r1, #0x0]
-	add r1, r2, #0x1
-	str r0, [sp, #0x14]
-	str r1, [r5, #0x8]
-	ldrb r7, [r2, #0x0]
-	add r0, r1, #0x1
-	str r0, [r5, #0x8]
-	add r0, r5, #0x0
-	ldrb r4, [r1, #0x0]
-	bl ScriptReadHalfword
-	str r0, [sp, #0x24]
-	ldr r1, [sp, #0x24]
-	add r0, r6, #0x0
-	bl GetVarPointer
-	str r0, [sp, #0x28]
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x1
-	bl FUN_02039438
-	ldr r1, [sp, #0x28]
-	str r4, [sp, #0x0]
-	str r1, [sp, #0x4]
-	ldr r1, [sp, #0x20]
-	add r3, r7, #0x0
-	ldr r1, [r1, #0x0]
-	str r1, [sp, #0x8]
-	str r0, [sp, #0xc]
-	ldr r0, [r5, #0x78]
-	str r0, [sp, #0x10]
-	ldr r1, [sp, #0x18]
-	ldr r2, [sp, #0x14]
-	add r0, r6, #0x0
-	bl MOD05_021E1F34
-	ldr r1, [sp, #0x1c]
-	str r0, [r1, #0x0]
-	ldr r0, [sp, #0x24]
-	str r0, [r5, #0x64]
-	mov r0, #0x1
-	add sp, #0x2c
-	pop {r4-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0203AED4
-FUN_0203AED4: ; 0x0203AED4
-	push {r3-r7, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x0
-	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 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 r7, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl VarGet
-	add r3, r0, #0x0
-	lsl r1, r6, #0x18
-	lsl r2, r7, #0x18
-	lsl r3, r3, #0x18
-	ldr r0, [r4, #0x0]
-	lsr r1, r1, #0x18
-	lsr r2, r2, #0x18
-	lsr r3, r3, #0x18
-	bl MOD05_021E1F58
-	mov r0, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_0203AF34
-FUN_0203AF34: ; 0x0203AF34
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x0
-	bl FUN_02039438
-	ldr r0, [r0, #0x0]
-	bl MOD05_021E1F60
-	ldr r1, _0203AF54 ; =FUN_0203AD2C
-	add r0, r4, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r4, pc}
-	.balign 4
-_0203AF54: .word FUN_0203AD2C 
-
-	thumb_func_start FUN_0203AF58
-FUN_0203AF58: ; 0x0203AF58
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x0
-	bl FUN_02039438
-	ldr r2, [r4, #0x8]
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	ldrb r1, [r2, #0x0]
-	ldr r0, [r0, #0x0]
-	bl MOD05_021E26CC
-	ldr r1, _0203AF80 ; =FUN_0203AD2C
-	add r0, r4, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r4, pc}
-	.balign 4
-_0203AF80: .word FUN_0203AD2C 
-
-	thumb_func_start FUN_0203AF84
-FUN_0203AF84: ; 0x0203AF84
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x0
-	bl FUN_02039438
-	ldr r2, [r4, #0x8]
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	ldrb r1, [r2, #0x0]
-	ldr r0, [r0, #0x0]
-	bl MOD05_021E2B80
-	mov r0, #0x1
-	pop {r4, pc}
-
-	thumb_func_start FUN_0203AFA4
-FUN_0203AFA4: ; 0x0203AFA4
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x0
-	bl FUN_02039438
-	ldr r2, [r4, #0x8]
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	ldrb r1, [r2, #0x0]
-	ldr r0, [r0, #0x0]
-	bl MOD05_021E2B9C
-	mov r0, #0x1
-	pop {r4, pc}
-
 	thumb_func_start FUN_0203AFC4
 FUN_0203AFC4: ; 0x0203AFC4
 	push {r4-r6, lr}
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index f8d30d92..a5037d01 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -217,11 +217,11 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_Unk0041
     .word ScrCmd_Unk0042
     .word ScrCmd_Unk0043
-    .word FUN_0203ADC4
-    .word FUN_0203AE4C
-    .word FUN_0203AED4
-    .word FUN_0203AF34
-    .word FUN_0203AF58
+    .word ScrCmd_Unk0044
+    .word ScrCmd_Unk0045
+    .word ScrCmd_Unk0046
+    .word ScrCmd_Unk0047
+    .word ScrCmd_Unk0048
     .word FUN_020414E0
     .word FUN_020414FC
     .word FUN_02041518
@@ -272,14 +272,14 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_GetCoins
     .word ScrCmd_GiveCoins
     .word ScrCmd_TakeCoinsImmediate
-    .word FUN_02045784
-    .word FUN_020457DC
-    .word FUN_02045834
-    .word FUN_0204588C
-    .word FUN_020458E4
-    .word FUN_02045918
-    .word FUN_02045950
-    .word FUN_02045954
+    .word ScrCmd_GiveItem
+    .word ScrCmd_TakeItem
+    .word ScrCmd_HasSpaceForItem
+    .word ScrCmd_HasItem
+    .word ScrCmd_ItemIdIsTMOrHM
+    .word ScrCmd_GetItemPocketId
+    .word ScrCmd_Unk0081
+    .word ScrCmd_Unk0082
     .word FUN_02045958
     .word FUN_020459AC
     .word FUN_020459E8
@@ -744,10 +744,10 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_02041340
     .word FUN_02040964
     .word ScrCmd_pcfreespace
-    .word FUN_0204387C
-    .word FUN_020438D0
-    .word FUN_02043918
-    .word FUN_020439B4
+    .word ScrCmd_Unk0253
+    .word ScrCmd_Unk0254
+    .word ScrCmd_Unk0255
+    .word ScrCmd_Unk0256
     .word FUN_0203FE80
     .word FUN_0203EDA4
     .word FUN_0203EDC8
@@ -868,8 +868,8 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_02041100
     .word FUN_02041138
     .word FUN_02041174
-    .word FUN_0203AF84
-    .word FUN_0203AFA4
+    .word ScrCmd_Unk02CF
+    .word ScrCmd_Unk02D0
 
 	.text