9 files changed, 769 insertions, 1350 deletions

diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index b8accee4..fbe54fd5 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -152,6 +152,7 @@ Static arm9
 	Object script.o
 	Object unk_02038C78.o
 	Object scrcmd.o
+	Object scrcmd_asm.o
 	Object scrcmd_2.o
 	Object scrcmd_3.o
 	Object scrcmd_4.o
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd_asm.s
index c5ae760b..c2751ee2 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -2,10 +2,10 @@
     .include "global.inc"
 
 	.extern UNK_020F34E0
-	.extern sScriptConditionTable
 	.extern UNK_020F34FC
 	.extern UNK_020F3538
 	.extern gMain
+	.extern FUN_0203A2F0
 
 	.section .bss
 
@@ -15,1233 +15,6 @@ UNK_021C5A0C: ; 0x021C5A0C
 
 	.text
 
-	thumb_func_start ScrCmd_nop
-ScrCmd_nop: ; 0x020399A0
-	mov r0, #0x0
-	bx lr
-
-	thumb_func_start ScrCmd_nop2
-ScrCmd_nop2: ; 0x020399A4
-	mov r0, #0x0
-	bx lr
-
-	thumb_func_start ScrCmd_end
-ScrCmd_end: ; 0x020399A8
-	push {r3, lr}
-	bl StopScript
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_delay
-ScrCmd_delay: ; 0x020399B4
-	push {r3-r7, lr}
-	add r5, r0, #0x0
-	add r1, r5, #0x0
-	add r1, #0x80
-	ldr r6, [r1, #0x0]
-	bl ScriptReadHalfword
-	add r7, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r4, r0, #0x0
-	add r0, r6, #0x0
-	add r1, r4, #0x0
-	bl GetVarPointer
-	strh r7, [r0, #0x0]
-	ldr r1, _020399E4 ; =RunPauseTimer
-	add r0, r5, #0x0
-	str r4, [r5, #0x64]
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r3-r7, pc}
-	.balign 4
-_020399E4: .word RunPauseTimer 
-
-	thumb_func_start RunPauseTimer
-RunPauseTimer: ; 0x020399E8
-	push {r3, lr}
-	add r1, r0, #0x0
-	ldr r1, [r1, #0x64]
-	add r0, #0x80
-	lsl r1, r1, #0x10
-	ldr r0, [r0, #0x0]
-	lsr r1, r1, #0x10
-	bl GetVarPointer
-	ldrh r1, [r0, #0x0]
-	sub r1, r1, #0x1
-	strh r1, [r0, #0x0]
-	ldrh r0, [r0, #0x0]
-	cmp r0, #0x0
-	bne _02039A0A
-	mov r0, #0x1
-	pop {r3, pc}
-_02039A0A:
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02039A10
-FUN_02039A10: ; 0x02039A10
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl VarGet
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_loadbyte
-ScrCmd_loadbyte: ; 0x02039A28
-	ldr r1, [r0, #0x8]
-	add r2, r1, #0x1
-	str r2, [r0, #0x8]
-	ldrb r3, [r1, #0x0]
-	add r1, r2, #0x1
-	str r1, [r0, #0x8]
-	ldrb r2, [r2, #0x0]
-	lsl r1, r3, #0x2
-	add r0, r0, r1
-	str r2, [r0, #0x64]
-	mov r0, #0x0
-	bx lr
-
-	thumb_func_start ScrCmd_loadword
-ScrCmd_loadword: ; 0x02039A40
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	ldr r2, [r4, #0x8]
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	ldrb r5, [r2, #0x0]
-	bl ScriptReadWord
-	lsl r1, r5, #0x2
-	add r1, r4, r1
-	str r0, [r1, #0x64]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_loadbytefromaddr
-ScrCmd_loadbytefromaddr: ; 0x02039A5C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldr r2, [r5, #0x8]
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r4, [r2, #0x0]
-	bl ScriptReadWord
-	ldrb r1, [r0, #0x0]
-	lsl r0, r4, #0x2
-	add r0, r5, r0
-	str r1, [r0, #0x64]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start ScrCmd_writebytetoaddr
-ScrCmd_writebytetoaddr: ; 0x02039A78
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadWord
-	ldr r2, [r4, #0x8]
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	ldrb r1, [r2, #0x0]
-	strb r1, [r0, #0x0]
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_setptrbyte
-ScrCmd_setptrbyte: ; 0x02039A90
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadWord
-	ldr r2, [r4, #0x8]
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	ldrb r1, [r2, #0x0]
-	lsl r1, r1, #0x2
-	add r1, r4, r1
-	ldr r1, [r1, #0x64]
-	strb r1, [r0, #0x0]
-	mov r0, #0x0
-	pop {r4, pc}
-
-	thumb_func_start ScrCmd_copylocal
-ScrCmd_copylocal: ; 0x02039AAC
-	ldr r1, [r0, #0x8]
-	add r2, r1, #0x1
-	str r2, [r0, #0x8]
-	ldrb r3, [r1, #0x0]
-	add r1, r2, #0x1
-	str r1, [r0, #0x8]
-	ldrb r1, [r2, #0x0]
-	lsl r1, r1, #0x2
-	add r1, r0, r1
-	ldr r2, [r1, #0x64]
-	lsl r1, r3, #0x2
-	add r0, r0, r1
-	str r2, [r0, #0x64]
-	mov r0, #0x0
-	bx lr
-	.balign 4
-
-	thumb_func_start ScrCmd_copybyte
-ScrCmd_copybyte: ; 0x02039ACC
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadWord
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadWord
-	ldrb r0, [r0, #0x0]
-	strb r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start compare_012
-compare_012: ; 0x02039AE4
-	cmp r0, r1
-	bhs _02039AEC
-	mov r0, #0x0
-	bx lr
-_02039AEC:
-	cmp r0, r1
-	bne _02039AF4
-	mov r0, #0x1
-	bx lr
-_02039AF4:
-	mov r0, #0x2
-	bx lr
-
-	thumb_func_start ScrCmd_compare_local_to_local
-ScrCmd_compare_local_to_local: ; 0x02039AF8
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r0, [r4, #0x8]
-	add r1, r0, #0x1
-	str r1, [r4, #0x8]
-	ldrb r0, [r0, #0x0]
-	add r2, r1, #0x1
-	lsl r0, r0, #0x2
-	add r0, r4, r0
-	ldr r0, [r0, #0x64]
-	str r2, [r4, #0x8]
-	ldrb r1, [r1, #0x0]
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	lsl r1, r1, #0x2
-	add r1, r4, r1
-	ldr r1, [r1, #0x64]
-	lsl r1, r1, #0x18
-	lsr r1, r1, #0x18
-	bl compare_012
-	strb r0, [r4, #0x2]
-	mov r0, #0x0
-	pop {r4, pc}
-
-	thumb_func_start ScrCmd_compare_local_to_value
-ScrCmd_compare_local_to_value: ; 0x02039B28
-	push {r4, lr}
-	add r4, r0, #0x0
-	ldr r0, [r4, #0x8]
-	add r1, r0, #0x1
-	str r1, [r4, #0x8]
-	ldrb r0, [r0, #0x0]
-	add r2, r1, #0x1
-	lsl r0, r0, #0x2
-	add r0, r4, r0
-	ldr r0, [r0, #0x64]
-	str r2, [r4, #0x8]
-	ldrb r1, [r1, #0x0]
-	lsl r0, r0, #0x18
-	lsr r0, r0, #0x18
-	bl compare_012
-	strb r0, [r4, #0x2]
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_compare_local_to_addr
-ScrCmd_compare_local_to_addr: ; 0x02039B50
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	ldr r2, [r4, #0x8]
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	ldrb r1, [r2, #0x0]
-	lsl r1, r1, #0x2
-	add r1, r4, r1
-	ldr r1, [r1, #0x64]
-	lsl r1, r1, #0x18
-	lsr r5, r1, #0x18
-	bl ScriptReadWord
-	ldrb r1, [r0, #0x0]
-	add r0, r5, #0x0
-	bl compare_012
-	strb r0, [r4, #0x2]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start ScrCmd_compare_addr_to_local
-ScrCmd_compare_addr_to_local: ; 0x02039B78
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadWord
-	ldr r2, [r4, #0x8]
-	ldrb r0, [r0, #0x0]
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	ldrb r1, [r2, #0x0]
-	lsl r1, r1, #0x2
-	add r1, r4, r1
-	ldr r1, [r1, #0x64]
-	lsl r1, r1, #0x18
-	lsr r1, r1, #0x18
-	bl compare_012
-	strb r0, [r4, #0x2]
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_compare_addr_to_value
-ScrCmd_compare_addr_to_value: ; 0x02039BA0
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadWord
-	ldr r2, [r4, #0x8]
-	ldrb r0, [r0, #0x0]
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	ldrb r1, [r2, #0x0]
-	bl compare_012
-	strb r0, [r4, #0x2]
-	mov r0, #0x0
-	pop {r4, pc}
-
-	thumb_func_start ScrCmd_compare_addr_to_addr
-ScrCmd_compare_addr_to_addr: ; 0x02039BBC
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	bl ScriptReadWord
-	ldrb r4, [r0, #0x0]
-	add r0, r5, #0x0
-	bl ScriptReadWord
-	ldrb r1, [r0, #0x0]
-	add r0, r4, #0x0
-	bl compare_012
-	strb r0, [r5, #0x2]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_compare_var_to_value
-ScrCmd_compare_var_to_value: ; 0x02039BDC
-	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
-	ldrh r5, [r0, #0x0]
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	bl compare_012
-	strb r0, [r4, #0x2]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_compare_var_to_var
-ScrCmd_compare_var_to_var: ; 0x02039C08
-	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
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl GetVarPointer
-	add r1, r0, #0x0
-	ldrh r0, [r4, #0x0]
-	ldrh r1, [r1, #0x0]
-	bl compare_012
-	strb r0, [r5, #0x2]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02039C40
-FUN_02039C40: ; 0x02039C40
-	push {r3-r7, lr}
-	add r7, r0, #0x0
-	add r0, #0x80
-	ldr r5, [r0, #0x0]
-	mov r1, #0x7
-	add r0, r5, #0x0
-	bl FUN_02039438
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0xe
-	bl FUN_02039438
-	add r6, r0, #0x0
-	add r0, r7, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	bl CreateScriptContext
-	str r0, [r6, #0x0]
-	ldrb r0, [r4, #0x0]
-	add r0, r0, #0x1
-	strb r0, [r4, #0x0]
-	mov r0, #0x1
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_02039C78
-FUN_02039C78: ; 0x02039C78
-	push {r3-r7, lr}
-	str r0, [sp, #0x0]
-	add r0, #0x80
-	ldr r5, [r0, #0x0]
-	mov r1, #0x5
-	add r0, r5, #0x0
-	bl FUN_02039438
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x7
-	bl FUN_02039438
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0xe
-	bl FUN_02039438
-	add r7, r0, #0x0
-	ldr r0, [sp, #0x0]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	mov r0, #0x1
-	strb r0, [r6, #0x0]
-	add r0, r5, #0x0
-	bl CreateScriptContext
-	str r0, [r7, #0x0]
-	ldrb r0, [r4, #0x0]
-	ldr r1, _02039CC4 ; =FUN_02039CC8
-	add r0, r0, #0x1
-	strb r0, [r4, #0x0]
-	ldr r0, [sp, #0x0]
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r3-r7, pc}
-	.balign 4
-_02039CC4: .word FUN_02039CC8 
-
-	thumb_func_start FUN_02039CC8
-FUN_02039CC8: ; 0x02039CC8
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x5
-	bl FUN_02039438
-	ldrb r0, [r0, #0x0]
-	cmp r0, #0x0
-	bne _02039CDE
-	mov r0, #0x1
-	pop {r3, pc}
-_02039CDE:
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02039CE4
-FUN_02039CE4: ; 0x02039CE4
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x5
-	bl FUN_02039438
-	mov r1, #0x0
-	strb r1, [r0, #0x0]
-	add r0, r1, #0x0
-	pop {r3, pc}
-
-	thumb_func_start ScrCmd_goto
-ScrCmd_goto: ; 0x02039CF8
-	; relative jump
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadWord
-	add r2, r0, #0x0
-	ldr r1, [r4, #0x8]
-	add r0, r4, #0x0
-	add r1, r1, r2
-	bl ScriptJump
-	mov r0, #0x0
-	pop {r4, pc}
-
-	thumb_func_start FUN_02039D10
-FUN_02039D10: ; 0x02039D10
-	push {r3-r7, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0xa
-	bl FUN_02039438
-	ldr r1, [r5, #0x8]
-	add r6, r0, #0x0
-	add r0, r1, #0x1
-	str r0, [r5, #0x8]
-	add r0, r5, #0x0
-	ldrb r4, [r1, #0x0]
-	bl ScriptReadWord
-	add r7, r0, #0x0
-	ldr r0, [r6, #0x0]
-	bl FUN_02058448
-	cmp r4, r0
-	bne _02039D44
-	ldr r1, [r5, #0x8]
-	add r0, r5, #0x0
-	add r1, r1, r7
-	bl ScriptJump
-_02039D44:
-	mov r0, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02039D48
-FUN_02039D48: ; 0x02039D48
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	ldr r0, [r5, #0x74]
-	bl FUN_02046534
-	ldr r1, [r5, #0x8]
-	add r6, r0, #0x0
-	add r0, r1, #0x1
-	str r0, [r5, #0x8]
-	ldrb r4, [r1, #0x0]
-	add r0, r5, #0x0
-	bl ScriptReadWord
-	add r2, r0, #0x0
-	cmp r6, r4
-	bne _02039D72
-	ldr r1, [r5, #0x8]
-	add r0, r5, #0x0
-	add r1, r1, r2
-	bl ScriptJump
-_02039D72:
-	mov r0, #0x0
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_02039D78
-FUN_02039D78: ; 0x02039D78
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x9
-	bl FUN_02039438
-	ldr r1, [r5, #0x8]
-	add r6, r0, #0x0
-	add r0, r1, #0x1
-	str r0, [r5, #0x8]
-	ldrb r4, [r1, #0x0]
-	add r0, r5, #0x0
-	bl ScriptReadWord
-	add r2, r0, #0x0
-	ldr r0, [r6, #0x0]
-	cmp r0, r4
-	bne _02039DA8
-	ldr r1, [r5, #0x8]
-	add r0, r5, #0x0
-	add r1, r1, r2
-	bl ScriptJump
-_02039DA8:
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start ScrCmd_call
-ScrCmd_call: ; 0x02039DAC
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadWord
-	add r2, r0, #0x0
-	ldr r1, [r4, #0x8]
-	add r0, r4, #0x0
-	add r1, r1, r2
-	bl ScriptCall
-	mov r0, #0x0
-	pop {r4, pc}
-
-	thumb_func_start ScrCmd_return
-ScrCmd_return: ; 0x02039DC4
-	push {r3, lr}
-	bl ScriptReturn
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_goto_if
-ScrCmd_goto_if: ; 0x02039DD0
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldr r2, [r5, #0x8]
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r4, [r2, #0x0]
-	bl ScriptReadWord
-	add r1, r0, #0x0
-	lsl r0, r4, #0x1
-	add r3, r4, r0
-	ldr r0, _02039E00 ; =sScriptConditionTable
-	ldrb r2, [r5, #0x2]
-	add r0, r0, r3
-	ldrb r0, [r2, r0]
-	cmp r0, #0x1
-	bne _02039DFC
-	ldr r2, [r5, #0x8]
-	add r0, r5, #0x0
-	add r1, r2, r1
-	bl ScriptJump
-_02039DFC:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-_02039E00: .word sScriptConditionTable
-
-	thumb_func_start ScrCmd_call_if
-ScrCmd_call_if: ; 0x02039E04
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldr r2, [r5, #0x8]
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r4, [r2, #0x0]
-	bl ScriptReadWord
-	add r1, r0, #0x0
-	lsl r0, r4, #0x1
-	add r3, r4, r0
-	ldr r0, _02039E34 ; =sScriptConditionTable
-	ldrb r2, [r5, #0x2]
-	add r0, r0, r3
-	ldrb r0, [r2, r0]
-	cmp r0, #0x1
-	bne _02039E30
-	ldr r2, [r5, #0x8]
-	add r0, r5, #0x0
-	add r1, r2, r1
-	bl ScriptCall
-_02039E30:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-_02039E34: .word sScriptConditionTable
-
-	thumb_func_start ScrCmd_setflag
-ScrCmd_setflag: ; 0x02039E38
-	push {r4, lr}
-	add r1, r0, #0x0
-	add r1, #0x80
-	ldr r4, [r1, #0x0]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	bl FlagSet
-	mov r0, #0x0
-	pop {r4, pc}
-
-	thumb_func_start ScrCmd_clearflag
-ScrCmd_clearflag: ; 0x02039E50
-	push {r4, lr}
-	add r1, r0, #0x0
-	add r1, #0x80
-	ldr r4, [r1, #0x0]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	bl FlagClear
-	mov r0, #0x0
-	pop {r4, pc}
-
-	thumb_func_start ScrCmd_checkflag
-ScrCmd_checkflag: ; 0x02039E68
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r5, [r1, #0x0]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	bl FlagCheck
-	strb r0, [r4, #0x2]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02039E84
-FUN_02039E84: ; 0x02039E84
-	push {r4-r6, 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 GetVarPointer
-	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
-	ldrh r1, [r6, #0x0]
-	add r0, r5, #0x0
-	bl FlagCheck
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02039EC0
-FUN_02039EC0: ; 0x02039EC0
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r1, r5, #0x0
-	add r1, #0x80
-	ldr r4, [r1, #0x0]
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r1, r0, #0x0
-	ldrh r1, [r1, #0x0]
-	add r0, r4, #0x0
-	bl FlagSet
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_settrainerflag
-ScrCmd_settrainerflag: ; 0x02039EE8
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r5, [r1, #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 TrainerFlagSet
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start ScrCmd_cleartrainerflag
-ScrCmd_cleartrainerflag: ; 0x02039F0C
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r5, [r1, #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 TrainerFlagClear
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start ScrCmd_checktrainerflag
-ScrCmd_checktrainerflag: ; 0x02039F30
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r1, r5, #0x0
-	add r1, #0x80
-	ldr r4, [r1, #0x0]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	bl TrainerFlagCheck
-	strb r0, [r5, #0x2]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start ScrCmd_addvar
-ScrCmd_addvar: ; 0x02039F58
-	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
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl VarGet
-	ldrh r1, [r4, #0x0]
-	add r0, r1, r0
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start ScrCmd_subvar
-ScrCmd_subvar: ; 0x02039F88
-	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
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl VarGet
-	ldrh r1, [r4, #0x0]
-	sub r0, r1, r0
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start ScrCmd_setvar
-ScrCmd_setvar: ; 0x02039FB8
-	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 r5, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	strh r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_copyvar
-ScrCmd_copyvar: ; 0x02039FDC
-	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
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	ldrh r0, [r0, #0x0]
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start ScrCmd_setorcopyvar
-ScrCmd_setorcopyvar: ; 0x0203A00C
-	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 r5, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl VarGet
-	strh r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start ScrCmd_message
-ScrCmd_message: ; 0x0203A038
-	push {r3, lr}
-	ldr r2, [r0, #0x8]
-	add r1, r2, #0x1
-	str r1, [r0, #0x8]
-	ldrb r2, [r2, #0x0]
-	ldr r1, [r0, #0x78]
-	bl MOD05_ShowMessageInField
-	mov r0, #0x0
-	pop {r3, pc}
-
-	thumb_func_start ScrCmd_message_from
-ScrCmd_message_from: ; 0x0203A04C
-	; message_from bank, id
-	push {r4-r6, 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 r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	mov r0, #0x1
-	mov r1, #0x1a
-	add r2, r5, #0x0
-	mov r3, #0x20
-	bl NewMsgDataFromNarc
-	add r5, r0, #0x0
-	add r0, r4, #0x0
-	add r1, r5, #0x0
-	add r2, r6, #0x0
-	bl MOD05_ShowMessageInField
-	add r0, r5, #0x0
-	bl DestroyMsgData
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_0203A098
-FUN_0203A098: ; 0x0203A098
-	push {r3-r6, lr}
-	sub sp, #0x4
-	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 r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	mov r0, #0x1
-	mov r1, #0x1a
-	add r2, r5, #0x0
-	mov r3, #0x20
-	bl NewMsgDataFromNarc
-	add r5, r0, #0x0
-	mov r0, #0x0
-	str r0, [sp, #0x0]
-	add r0, r4, #0x0
-	add r1, r5, #0x0
-	add r2, r6, #0x0
-	mov r3, #0x1
-	bl MOD05_021E2BD0
-	add r0, r5, #0x0
-	bl DestroyMsgData
-	ldr r1, _0203A0F8 ; =FUN_0203A2F0
-	add r0, r4, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	add sp, #0x4
-	pop {r3-r6, pc}
-	nop
-_0203A0F8: .word FUN_0203A2F0 
-
-	thumb_func_start FUN_0203A0FC
-FUN_0203A0FC: ; 0x0203A0FC
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r7, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	lsl r0, r0, #0x10
-	asr r0, r0, #0x10
-	str r0, [sp, #0x0]
-	mov r0, #0xff
-	str r0, [sp, #0x4]
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	add r2, r6, #0x0
-	add r3, r7, #0x0
-	bl MOD05_021E2C58
-	mov r0, #0x0
-	add sp, #0x8
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0203A13C
-FUN_0203A13C: ; 0x0203A13C
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r7, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	lsl r0, r0, #0x10
-	asr r0, r0, #0x10
-	str r0, [sp, #0x0]
-	mov r0, #0x1
-	str r0, [sp, #0x4]
-	add r0, r5, #0x0
-	add r1, r4, #0x0
-	add r2, r6, #0x0
-	add r3, r7, #0x0
-	bl MOD05_021E2C58
-	ldr r1, _0203A184 ; =FUN_0203A2F0
-	add r0, r5, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	add sp, #0x8
-	pop {r3-r7, pc}
-	nop
-_0203A184: .word FUN_0203A2F0 
-
-	thumb_func_start FUN_0203A188
-FUN_0203A188: ; 0x0203A188
-	push {r4-r6, lr}
-	sub sp, #0x8
-	add r5, r0, #0x0
-	ldr r2, [r5, #0x8]
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	add r1, r5, #0x0
-	add r1, #0x80
-	ldr r1, [r1, #0x0]
-	ldrb r3, [r2, #0x0]
-	add r1, #0xa8
-	ldr r2, [r1, #0x0]
-	cmp r2, #0x0
-	bne _0203A1AA
-	add sp, #0x8
-	mov r0, #0x0
-	pop {r4-r6, pc}
-_0203A1AA:
-	lsl r1, r3, #0x4
-	add r1, r3, r1
-	add r2, #0x90
-	lsl r1, r1, #0x4
-	add r4, r2, r1
-	ldrh r1, [r2, r1]
-	ldr r2, _0203A204 ; =0x0000FFFF
-	cmp r1, r2
-	bne _0203A1E2
-	ldr r2, _0203A208 ; =0x0000022B
-	mov r0, #0x1
-	mov r1, #0x1a
-	mov r3, #0x20
-	bl NewMsgDataFromNarc
-	add r6, r0, #0x0
-	mov r0, #0x0
-	str r0, [sp, #0x0]
-	ldrh r2, [r4, #0x2]
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	mov r3, #0x1
-	bl MOD05_021E2BD0
-	add r0, r6, #0x0
-	bl DestroyMsgData
-	b _0203A1F4
-_0203A1E2:
-	mov r2, #0x6
-	ldrsh r2, [r4, r2]
-	str r2, [sp, #0x0]
-	mov r2, #0x1
-	str r2, [sp, #0x4]
-	ldrh r2, [r4, #0x2]
-	ldrh r3, [r4, #0x4]
-	bl MOD05_021E2C58
-_0203A1F4:
-	ldr r1, _0203A20C ; =FUN_0203A2F0
-	add r0, r5, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	add sp, #0x8
-	pop {r4-r6, pc}
-	nop
-_0203A204: .word 0x0000FFFF
-_0203A208: .word 0x0000022B
-_0203A20C: .word FUN_0203A2F0 
-
-	thumb_func_start FUN_0203A210
-FUN_0203A210: ; 0x0203A210
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r5, r0, #0x0
-	add r1, r5, #0x0
-	add r1, #0x80
-	ldr r2, [r5, #0x8]
-	ldr r6, [r1, #0x0]
-	add r1, r2, #0x1
-	str r1, [r5, #0x8]
-	ldrb r4, [r2, #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
-	ldr r1, [r5, #0x8]
-	add r2, r0, #0x0
-	add r0, r1, #0x1
-	str r0, [r5, #0x8]
-	ldrb r3, [r1, #0x0]
-	mov r1, #0x0
-	add r0, sp, #0x4
-	strb r1, [r0, #0x0]
-	add r0, sp, #0x4
-	str r0, [sp, #0x0]
-	ldr r0, [r6, #0xc]
-	add r1, r7, #0x0
-	bl MOD06_02244210
-	add r6, r0, #0x0
-	add r2, sp, #0x4
-	ldrb r2, [r2, #0x0]
-	add r0, r5, #0x0
-	add r1, r6, #0x0
-	add r2, r4, r2
-	lsl r2, r2, #0x18
-	lsr r2, r2, #0x18
-	mov r3, #0x1
-	bl MOD05_021E2CBC
-	add r0, r6, #0x0
-	bl ScrStrBufs_delete
-	ldr r1, _0203A284 ; =FUN_0203A2F0
-	add r0, r5, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	add sp, #0x8
-	pop {r3-r7, pc}
-	nop
-_0203A284: .word FUN_0203A2F0 
-
-	thumb_func_start FUN_0203A288
-FUN_0203A288: ; 0x0203A288
-	push {r3-r5, lr}
-	sub sp, #0x8
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r4, r0, #0x0
-	add r0, sp, #0x4
-	add r1, r5, #0x0
-	bl MOD05_021E2BB8
-	mov r1, #0x3
-	add r0, sp, #0x4
-	strb r1, [r0, #0x2]
-	add r0, sp, #0x4
-	str r0, [sp, #0x0]
-	ldr r1, [r5, #0x78]
-	add r0, r5, #0x0
-	add r2, r4, #0x0
-	mov r3, #0x0
-	bl MOD05_021E2BD0
-	ldr r1, _0203A2C0 ; =FUN_0203A2F0
-	add r0, r5, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	add sp, #0x8
-	pop {r3-r5, pc}
-	.balign 4
-_0203A2C0: .word FUN_0203A2F0 
-
-	thumb_func_start FUN_0203A2C4
-FUN_0203A2C4: ; 0x0203A2C4
-	push {r3-r4, lr}
-	sub sp, #0x4
-	add r4, r0, #0x0
-	ldr r2, [r4, #0x8]
-	mov r3, #0x1
-	add r1, r2, #0x1
-	str r1, [r4, #0x8]
-	mov r1, #0x0
-	str r1, [sp, #0x0]
-	ldrb r2, [r2, #0x0]
-	ldr r1, [r4, #0x78]
-	bl MOD05_021E2BD0
-	ldr r1, _0203A2EC ; =FUN_0203A2F0
-	add r0, r4, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	add sp, #0x4
-	pop {r3-r4, pc}
-	.balign 4
-_0203A2EC: .word FUN_0203A2F0 
-
-	thumb_func_start FUN_0203A2F0
-FUN_0203A2F0: ; 0x0203A2F0
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x3
-	bl FUN_02039438
-	ldrb r0, [r0, #0x0]
-	bl FUN_020546C8
-	pop {r3, pc}
-
 	thumb_func_start FUN_0203A304
 FUN_0203A304: ; 0x0203A304
 	push {r3-r4, lr}
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index f35fd58e..3978d8c1 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -149,51 +149,51 @@ UNK_020F3538: ; 0x020F3538
 
     .global gScriptCmdTable
 gScriptCmdTable: ; 0x020F355C
-    .word ScrCmd_nop
-    .word ScrCmd_nop2
-    .word ScrCmd_end
-    .word ScrCmd_delay
-    .word ScrCmd_loadbyte
-    .word ScrCmd_loadword
-    .word ScrCmd_loadbytefromaddr
-    .word ScrCmd_writebytetoaddr
-    .word ScrCmd_setptrbyte
-    .word ScrCmd_copylocal
-    .word ScrCmd_copybyte
-    .word ScrCmd_compare_local_to_local
-    .word ScrCmd_compare_local_to_value
-    .word ScrCmd_compare_local_to_addr
-    .word ScrCmd_compare_addr_to_local
-    .word ScrCmd_compare_addr_to_value
-    .word ScrCmd_compare_addr_to_addr
-    .word ScrCmd_compare_var_to_value
-    .word ScrCmd_compare_var_to_var
-    .word FUN_02039C40
-    .word FUN_02039C78
-    .word FUN_02039CE4
-    .word ScrCmd_goto
-    .word FUN_02039D10
-    .word FUN_02039D48
-    .word FUN_02039D78
-    .word ScrCmd_call
-    .word ScrCmd_return
-    .word ScrCmd_goto_if
-    .word ScrCmd_call_if
-    .word ScrCmd_setflag
-    .word ScrCmd_clearflag
-    .word ScrCmd_checkflag
-    .word FUN_02039E84
-    .word FUN_02039EC0
-    .word ScrCmd_settrainerflag
-    .word ScrCmd_cleartrainerflag
-    .word ScrCmd_checktrainerflag
-    .word ScrCmd_addvar
-    .word ScrCmd_subvar
-    .word ScrCmd_setvar
-    .word ScrCmd_copyvar
-    .word ScrCmd_setorcopyvar
-    .word ScrCmd_message
-    .word FUN_0203A2C4
+    .word ScrCmd_Nop
+    .word ScrCmd_Dummy
+    .word ScrCmd_End
+    .word ScrCmd_Wait
+    .word ScrCmd_LoadByte
+    .word ScrCmd_LoadWord
+    .word ScrCmd_LoadByteFromAddr
+    .word ScrCmd_WriteByteToAddr
+    .word ScrCmd_SetPtrByte
+    .word ScrCmd_CopyLocal
+    .word ScrCmd_CopyByte
+    .word ScrCmd_CompareLocalToLocal
+    .word ScrCmd_CompareLocalToValue
+    .word ScrCmd_CompareLocalToAddr
+    .word ScrCmd_CompareAddrToLocal
+    .word ScrCmd_CompareAddrToValue
+    .word ScrCmd_CompareAddrToAddr
+    .word ScrCmd_CompareVarToValue
+    .word ScrCmd_CompareVarToVar
+    .word ScrCmd_RunScript
+    .word ScrCmd_RunScriptWait
+    .word ScrCmd_RestartCurrentScript
+    .word ScrCmd_GoTo
+    .word ScrCmd_ObjectGoTo
+    .word ScrCmd_BgGoTo
+    .word ScrCmd_DirectionGoTo
+    .word ScrCmd_Call
+    .word ScrCmd_Return
+    .word ScrCmd_GoToIf
+    .word ScrCmd_CallIf
+    .word ScrCmd_SetFlag
+    .word ScrCmd_ClearFlag
+    .word ScrCmd_CheckFlag
+    .word ScrCmd_CheckFlagVar
+    .word ScrCmd_SetFlagVar
+    .word ScrCmd_SetTrainerFlag
+    .word ScrCmd_ClearTrainerFlag
+    .word ScrCmd_CheckTrainerFlag
+    .word ScrCmd_AddVar
+    .word ScrCmd_SubVar
+    .word ScrCmd_SetVar
+    .word ScrCmd_CopyVar
+    .word ScrCmd_SetOrCopyVar
+    .word ScrCmd_Message
+    .word ScrCmd_Unk002C
     .word FUN_0203A304
     .word FUN_0203A388
     .word FUN_0203A400
@@ -299,7 +299,7 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203B81C
     .word FUN_0203B85C
     .word FUN_0203B8A0
-    .word ScrCmd_givemon
+    .word ScrCmd_GiveMon
     .word ScrCmd_giveegg
     .word ScrCmd_setpartymonmove
     .word ScrCmd_partymonhasmove
@@ -654,13 +654,13 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_countpartymonsatorbelowlevel
     .word ScrCmd_survivepsn
     .word FUN_0203BC2C
-    .word FUN_02039A10
-    .word ScrCmd_message_from
-    .word FUN_0203A098
-    .word FUN_0203A0FC
-    .word FUN_0203A13C
-    .word FUN_0203A188
-    .word FUN_0203A210
+    .word ScrCmd_DebugWatch
+    .word ScrCmd_MessageFrom
+    .word ScrCmd_MessageFrom2
+    .word ScrCmd_Unk01FC
+    .word ScrCmd_Unk01FD
+    .word ScrCmd_Unk01FE
+    .word ScrCmd_Unk01FF
     .word FUN_0203C7F4
     .word FUN_0203C820
     .word FUN_0203E5DC
@@ -770,7 +770,7 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203F110
     .word FUN_0203F174
     .word FUN_0203F19C
-    .word FUN_0203A288
+    .word ScrCmd_Unk026D
     .word FUN_0203F234
     .word FUN_0203F254
     .word FUN_0203F26C
diff --git a/arm9/global.inc b/arm9/global.inc
index 7c53db63..0190b134 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -2699,59 +2699,59 @@
 .extern FUN_02039754
 .extern RunPokemonCenterScriptsInNewContext
 .extern FUN_0203989C
-.extern ScrCmd_nop
-.extern ScrCmd_nop2
-.extern ScrCmd_end
-.extern ScrCmd_delay
-.extern FUN_02039A10
-.extern ScrCmd_loadbyte
-.extern ScrCmd_loadword
-.extern ScrCmd_loadbytefromaddr
-.extern ScrCmd_writebytetoaddr
-.extern ScrCmd_setptrbyte
-.extern ScrCmd_copylocal
-.extern ScrCmd_copybyte
-.extern ScrCmd_compare_local_to_local
-.extern ScrCmd_compare_local_to_value
-.extern ScrCmd_compare_local_to_addr
-.extern ScrCmd_compare_addr_to_local
-.extern ScrCmd_compare_addr_to_value
-.extern ScrCmd_compare_addr_to_addr
-.extern ScrCmd_compare_var_to_value
-.extern ScrCmd_compare_var_to_var
-.extern FUN_02039C40
-.extern FUN_02039C78
-.extern FUN_02039CE4
-.extern ScrCmd_goto
-.extern FUN_02039D10
-.extern FUN_02039D48
-.extern FUN_02039D78
-.extern ScrCmd_call
-.extern ScrCmd_return
-.extern ScrCmd_goto_if
-.extern ScrCmd_call_if
-.extern ScrCmd_setflag
-.extern ScrCmd_clearflag
-.extern ScrCmd_checkflag
-.extern FUN_02039E84
-.extern FUN_02039EC0
-.extern ScrCmd_settrainerflag
-.extern ScrCmd_cleartrainerflag
-.extern ScrCmd_checktrainerflag
-.extern ScrCmd_addvar
-.extern ScrCmd_subvar
-.extern ScrCmd_setvar
-.extern ScrCmd_copyvar
-.extern ScrCmd_setorcopyvar
-.extern ScrCmd_message
-.extern ScrCmd_message_from
-.extern FUN_0203A098
-.extern FUN_0203A0FC
-.extern FUN_0203A13C
-.extern FUN_0203A188
-.extern FUN_0203A210
-.extern FUN_0203A288
-.extern FUN_0203A2C4
+.extern ScrCmd_Nop
+.extern ScrCmd_Dummy
+.extern ScrCmd_End
+.extern ScrCmd_Wait
+.extern ScrCmd_DebugWatch
+.extern ScrCmd_LoadByte
+.extern ScrCmd_LoadWord
+.extern ScrCmd_LoadByteFromAddr
+.extern ScrCmd_WriteByteToAddr
+.extern ScrCmd_SetPtrByte
+.extern ScrCmd_CopyLocal
+.extern ScrCmd_CopyByte
+.extern ScrCmd_CompareLocalToLocal
+.extern ScrCmd_CompareLocalToValue
+.extern ScrCmd_CompareLocalToAddr
+.extern ScrCmd_CompareAddrToLocal
+.extern ScrCmd_CompareAddrToValue
+.extern ScrCmd_CompareAddrToAddr
+.extern ScrCmd_CompareVarToValue
+.extern ScrCmd_CompareVarToVar
+.extern ScrCmd_RunScript
+.extern ScrCmd_RunScriptWait
+.extern ScrCmd_RestartCurrentScript
+.extern ScrCmd_GoTo
+.extern ScrCmd_ObjectGoTo
+.extern ScrCmd_BgGoTo
+.extern ScrCmd_DirectionGoTo
+.extern ScrCmd_Call
+.extern ScrCmd_Return
+.extern ScrCmd_GoToIf
+.extern ScrCmd_CallIf
+.extern ScrCmd_SetFlag
+.extern ScrCmd_ClearFlag
+.extern ScrCmd_CheckFlag
+.extern ScrCmd_CheckFlagVar
+.extern ScrCmd_SetFlagVar
+.extern ScrCmd_SetTrainerFlag
+.extern ScrCmd_ClearTrainerFlag
+.extern ScrCmd_CheckTrainerFlag
+.extern ScrCmd_AddVar
+.extern ScrCmd_SubVar
+.extern ScrCmd_SetVar
+.extern ScrCmd_CopyVar
+.extern ScrCmd_SetOrCopyVar
+.extern ScrCmd_Message
+.extern ScrCmd_MessageFrom
+.extern ScrCmd_MessageFrom2
+.extern ScrCmd_Unk01FC
+.extern ScrCmd_Unk01FD
+.extern ScrCmd_Unk01FE
+.extern ScrCmd_Unk01FF
+.extern ScrCmd_Unk026D
+.extern ScrCmd_Unk002C
 .extern FUN_0203A304
 .extern FUN_0203A340
 .extern FUN_0203A388
@@ -3320,7 +3320,7 @@
 .extern FUN_02044158
 .extern FUN_0204416C
 .extern FUN_02044198
-.extern ScrCmd_givemon
+.extern ScrCmd_GiveMon
 .extern ScrCmd_getpartyspecies
 .extern ScrCmd_checkpartymonotid
 .extern ScrCmd_giveegg
diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c
new file mode 100644
index 00000000..9e6a337a
--- /dev/null
+++ b/arm9/src/scrcmd.c
@@ -0,0 +1,556 @@
+#include "scrcmd.h"
+#include "unk_0204639C.h"
+
+extern u16 *GetVarPointer(struct UnkSavStruct80* arg, u16);
+extern u16 VarGet(struct UnkSavStruct80* arg, u16 wk);
+extern void *FUN_02039438(struct UnkSavStruct80* arg, u32 id);
+extern void *CreateScriptContext(struct UnkSavStruct80* arg, u16 id);
+extern u8 FUN_02058448(u32 param0);
+extern void FlagSet(struct UnkSavStruct80 *arg, u16 flag);
+extern void FlagClear(struct UnkSavStruct80 *arg, u16 flag);
+extern u8 FlagCheck(struct UnkSavStruct80 *arg, u16 flag);
+extern void TrainerFlagSet(struct UnkSavStruct80 *arg, u16 flag);
+extern void TrainerFlagClear(struct UnkSavStruct80 *arg, u16 flag);
+extern u8 TrainerFlagCheck(struct UnkSavStruct80 *arg, u16 flag);
+extern void MOD05_ShowMessageInField(struct ScriptContext *ctx, struct MsgData *msgData, u16 id);
+extern void MOD05_021E2BD0(struct ScriptContext *ctx, struct MsgData *msgData, u16 msgId, u32 param4, void *param5);
+extern void MOD05_021E2C58(struct ScriptContext *ctx, u16 typ, u16 id, u16 word1, s16 word2, u8 param5);
+extern struct ScrStrBufs *MOD06_02244210(struct SaveBlock2 *sav, u16 poke, u16 sex, u8 flag, u8 *unk);
+extern void MOD05_021E2CBC(struct ScriptContext *ctx, struct ScrStrBufs *str, u8 param2, u32 param3);
+extern void MOD05_021E2BB8(void *param0, struct ScriptContext *ctx);
+extern BOOL FUN_020546C8(u8 param0);
+
+static BOOL RunPauseTimer(struct ScriptContext* ctx);
+static u32 Compare(u16 a, u16 b);
+static BOOL FUN_02039CC8(struct ScriptContext* ctx);
+/*static*/ BOOL FUN_0203A2F0(struct ScriptContext* ctx);
+
+extern u8 sScriptConditionTable[6][3];
+
+THUMB_FUNC BOOL ScrCmd_Nop(struct ScriptContext* ctx)
+{
+#pragma unused(ctx)
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Dummy(struct ScriptContext* ctx)
+{
+#pragma unused(ctx)
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_End(struct ScriptContext* ctx)
+{
+    StopScript(ctx);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Wait(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80* arg = ctx->unk80;
+    u16 num = ScriptReadHalfword(ctx);
+    u16 wk = ScriptReadHalfword(ctx);
+    u16* VarPointer = GetVarPointer(arg, wk);
+    *VarPointer = num;
+    ctx->data[0] = wk;
+    SetupNativeScript(ctx, RunPauseTimer);
+    return TRUE;
+}
+
+THUMB_FUNC static BOOL RunPauseTimer(struct ScriptContext* ctx)
+{
+    u16* VarPointer = GetVarPointer(ctx->unk80, (u16)ctx->data[0]);
+    *VarPointer = (u16)(*VarPointer - 1);
+    return !(*VarPointer);
+}
+
+THUMB_FUNC BOOL ScrCmd_DebugWatch(struct ScriptContext* ctx)
+{
+    u16 wk = ScriptReadHalfword(ctx);
+    VarGet(ctx->unk80, wk);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_LoadByte(struct ScriptContext* ctx)
+{
+    u8 index = ScriptReadByte(ctx);
+    ctx->data[index] = ScriptReadByte(ctx);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_LoadWord(struct ScriptContext* ctx)
+{
+    u8 index = ScriptReadByte(ctx);
+    ctx->data[index] = ScriptReadWord(ctx);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_LoadByteFromAddr(struct ScriptContext* ctx)
+{
+    u8 index = ScriptReadByte(ctx);
+    ctx->data[index] = *(u8 *)ScriptReadWord(ctx);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_WriteByteToAddr(struct ScriptContext* ctx)
+{
+    u8* ptr = (u8*)ScriptReadWord(ctx);
+    *ptr = ScriptReadByte(ctx);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_SetPtrByte(struct ScriptContext* ctx)
+{
+    u8* ptr = (u8*)ScriptReadWord(ctx);
+    *ptr = (u8)ctx->data[ScriptReadByte(ctx)];
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CopyLocal(struct ScriptContext* ctx)
+{
+    u8 index_store = ScriptReadByte(ctx);
+    u8 index_load = ScriptReadByte(ctx);
+    ctx->data[index_store] = ctx->data[index_load];
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CopyByte(struct ScriptContext* ctx)
+{
+    u8 *target = (u8 *)ScriptReadWord(ctx);
+    u8 *source = (u8 *)ScriptReadWord(ctx);
+    *target = *source;
+    return FALSE;
+}
+
+THUMB_FUNC static u32 Compare(u16 a, u16 b)
+{
+    if (a < b)
+    {
+        return 0;
+    }
+    else if (a == b)
+    {
+        return 1;
+    }
+    else
+    {
+        return 2;
+    }
+}
+
+THUMB_FUNC BOOL ScrCmd_CompareLocalToLocal(struct ScriptContext* ctx)
+{
+    u8 a = (u8)ctx->data[ScriptReadByte(ctx)];
+    u8 b = (u8)ctx->data[ScriptReadByte(ctx)];
+    ctx->comparisonResult = (u8)Compare(a, b);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CompareLocalToValue(struct ScriptContext* ctx)
+{
+    u8 a = (u8)ctx->data[ScriptReadByte(ctx)];
+    u8 b = ScriptReadByte(ctx);
+    ctx->comparisonResult = (u8)Compare(a, b);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CompareLocalToAddr(struct ScriptContext* ctx)
+{
+    u8 a = (u8)ctx->data[ScriptReadByte(ctx)];
+    u8 b = *(u8*)ScriptReadWord(ctx);
+    ctx->comparisonResult = (u8)Compare(a, b);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CompareAddrToLocal(struct ScriptContext* ctx)
+{
+    u8 a = *(u8*)ScriptReadWord(ctx);
+    u8 b = (u8)ctx->data[ScriptReadByte(ctx)];
+    ctx->comparisonResult = (u8)Compare(a, b);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CompareAddrToValue(struct ScriptContext* ctx)
+{
+    u8 a = *(u8*)ScriptReadWord(ctx);
+    u8 b = (u8)ScriptReadByte(ctx);
+    ctx->comparisonResult = (u8)Compare(a, b);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CompareAddrToAddr(struct ScriptContext* ctx)
+{
+    u8 a = *(u8*)ScriptReadWord(ctx);
+    u8 b = *(u8*)ScriptReadWord(ctx);
+    ctx->comparisonResult = (u8)Compare(a, b);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CompareVarToValue(struct ScriptContext* ctx)
+{
+    u16 a = *GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 b = ScriptReadHalfword(ctx);
+    ctx->comparisonResult = (u8)Compare(a, b);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CompareVarToVar(struct ScriptContext* ctx)
+{
+    u16 *a = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 *b = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    ctx->comparisonResult = (u8)Compare(*a, *b);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_RunScript(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80* unk80 = ctx->unk80;
+    u8 *unk1 = (u8 *)FUN_02039438(unk80, 0x7);
+    u32 **unk2 = (u32 **)FUN_02039438(unk80, 0xe);
+    u16 id = ScriptReadHalfword(ctx);
+
+    *unk2 = CreateScriptContext(unk80, id);
+    *unk1 = (u8)(*unk1 + 1);
+    return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_RunScriptWait(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80* unk80 = ctx->unk80;
+    u8 *unk1 = (u8 *)FUN_02039438(unk80, 0x5);
+    u8 *unk2 = (u8 *)FUN_02039438(unk80, 0x7);
+    u32 **unk3 = (u32 **)FUN_02039438(unk80, 0xe);
+
+    u16 id = ScriptReadHalfword(ctx);
+    *unk1 = 1;
+    *unk3 = CreateScriptContext(unk80, id);
+    *unk2 = (u8)(*unk2 + 1);
+
+    SetupNativeScript(ctx, FUN_02039CC8);
+    return TRUE;
+}
+
+THUMB_FUNC static BOOL FUN_02039CC8(struct ScriptContext* ctx)
+{
+    u8* unk = FUN_02039438(ctx->unk80, 0x5);
+
+    if (*unk == 0)
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_RestartCurrentScript(struct ScriptContext* ctx)
+{
+    u8* unk = (u8 *)FUN_02039438(ctx->unk80, 0x5);
+
+    *unk = 0;
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_GoTo(struct ScriptContext* ctx)
+{
+    s32 offset = (s32)ScriptReadWord(ctx);
+    ScriptJump(ctx, ctx->scriptPtr + offset);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_ObjectGoTo(struct ScriptContext* ctx)
+{
+    u32* unk = FUN_02039438(ctx->unk80, 0xa);
+    u8 id = ScriptReadByte(ctx);
+    s32 offset = (s32)ScriptReadWord(ctx);
+    if (FUN_02058448(*unk) == id)
+    {
+        ScriptJump(ctx, ctx->scriptPtr + offset);
+    }
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_BgGoTo(struct ScriptContext* ctx)
+{
+    u32 bgId = FUN_02046534(ctx->unk74);
+    u8 id = ScriptReadByte(ctx);
+    s32 offset = (s32)ScriptReadWord(ctx);
+
+    if (bgId == id)
+    {
+        ScriptJump(ctx, ctx->scriptPtr + offset);
+    }
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_DirectionGoTo(struct ScriptContext* ctx)
+{
+    u32 *playerDirection = FUN_02039438(ctx->unk80, 0x9);
+    u8 dir = ScriptReadByte(ctx);
+    s32 offset = (s32)ScriptReadWord(ctx);
+
+    if (*playerDirection == dir)
+    {
+        ScriptJump(ctx, ctx->scriptPtr + offset);
+    }
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Call(struct ScriptContext* ctx)
+{
+    s32 offset = (s32)ScriptReadWord(ctx);
+    ScriptCall(ctx, ctx->scriptPtr + offset);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Return(struct ScriptContext* ctx)
+{
+    ScriptReturn(ctx);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_GoToIf(struct ScriptContext* ctx)
+{
+    u8 compareType = ScriptReadByte(ctx);
+    s32 offset = (s32)ScriptReadWord(ctx);
+
+    if (sScriptConditionTable[compareType][ctx->comparisonResult] == TRUE)
+    {
+        ScriptJump(ctx, ctx->scriptPtr + offset);
+    }
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CallIf(struct ScriptContext* ctx)
+{
+    u8 compareType = ScriptReadByte(ctx);
+    s32 offset = (s32)ScriptReadWord(ctx);
+
+    if (sScriptConditionTable[compareType][ctx->comparisonResult] == TRUE)
+    {
+        ScriptCall(ctx, ctx->scriptPtr + offset);
+    }
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_SetFlag(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80 *unk80 = ctx->unk80;
+    u16 flag = ScriptReadHalfword(ctx);
+    FlagSet(unk80, flag);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_ClearFlag(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80 *unk80 = ctx->unk80;
+    u16 flag = ScriptReadHalfword(ctx);
+    FlagClear(unk80, flag);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CheckFlag(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80 *unk80 = ctx->unk80;
+    u16 flag = ScriptReadHalfword(ctx);
+    ctx->comparisonResult = FlagCheck(unk80, flag);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CheckFlagVar(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80 *unk80 = ctx->unk80;
+    u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 *wk2 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    *wk2 = FlagCheck(unk80, *wk1);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_SetFlagVar(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80 *unk80 = ctx->unk80;
+    u16 *wk = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    FlagSet(unk80, *wk);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_SetTrainerFlag(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80 *unk80 = ctx->unk80;
+    u16 flag = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    TrainerFlagSet(unk80, flag);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_ClearTrainerFlag(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80 *unk80 = ctx->unk80;
+    u16 flag = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    TrainerFlagClear(unk80, flag);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CheckTrainerFlag(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80 *unk80 = ctx->unk80;
+    u16 flag = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    ctx->comparisonResult = TrainerFlagCheck(unk80, flag);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_AddVar(struct ScriptContext* ctx)
+{
+    u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 wk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    *wk1 = (u16)(*wk1 + wk2);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_SubVar(struct ScriptContext* ctx)
+{
+    u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 wk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    *wk1 = (u16)(*wk1 - wk2);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_SetVar(struct ScriptContext* ctx)
+{
+    u16 *wk = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    *wk = ScriptReadHalfword(ctx);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_CopyVar(struct ScriptContext* ctx)
+{
+    u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 *wk2 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    *wk1 = *wk2;
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_SetOrCopyVar(struct ScriptContext* ctx)
+{
+    u16 *wk1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 wk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    *wk1 = wk2;
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Message(struct ScriptContext* ctx)
+{
+    u8 id = ScriptReadByte(ctx);
+    MOD05_ShowMessageInField(ctx, ctx->msgData, id);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_MessageFrom(struct ScriptContext* ctx)
+{
+    u16 arc = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 msg = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    struct MsgData *msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, arc, 32);
+    MOD05_ShowMessageInField(ctx, msgData, msg);
+    DestroyMsgData(msgData);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_MessageFrom2(struct ScriptContext* ctx)
+{
+    u16 arc = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 msg = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    struct MsgData *msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, arc, 32);
+    MOD05_021E2BD0(ctx, msgData, msg, 1, NULL);
+    DestroyMsgData(msgData);
+    SetupNativeScript(ctx, FUN_0203A2F0);
+    return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk01FC(struct ScriptContext* ctx)
+{
+    u16 typ = ScriptReadHalfword(ctx);
+    u16 id = ScriptReadHalfword(ctx);
+    u16 word1 = ScriptReadHalfword(ctx);
+    s16 word2 = (s16)ScriptReadHalfword(ctx);
+
+    MOD05_021E2C58(ctx, typ, id, word1, word2, 0xff);
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk01FD(struct ScriptContext* ctx)
+{
+    u16 typ = ScriptReadHalfword(ctx);
+    u16 id = ScriptReadHalfword(ctx);
+    u16 word1 = ScriptReadHalfword(ctx);
+    s16 word2 = (s16)ScriptReadHalfword(ctx);
+
+    MOD05_021E2C58(ctx, typ, id, word1, word2, 1);
+    SetupNativeScript(ctx, FUN_0203A2F0);
+    return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk01FE(struct ScriptContext* ctx)
+{
+    u8 id = ScriptReadByte(ctx);
+
+    if (ctx->unk80->unkA8 == NULL)
+    {
+        return FALSE;
+    }
+
+    u16 *unkArr = ctx->unk80->unkA8->unk90[id].unk0;
+    if (unkArr[0] == 0xFFFF)
+    {
+        struct MsgData *msgdata = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 0x22b, 32);
+        MOD05_021E2BD0(ctx, msgdata, unkArr[1], 1, NULL);
+        DestroyMsgData(msgdata);
+    }
+    else
+    {
+        MOD05_021E2C58(ctx, unkArr[0], unkArr[1], unkArr[2], (s16)unkArr[3], 1);
+    }
+    SetupNativeScript(ctx, FUN_0203A2F0);
+    return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk01FF(struct ScriptContext* ctx)
+{
+    struct UnkSavStruct80 *unk80 = ctx->unk80;
+    u8 msg = ScriptReadByte(ctx);
+    u16 poke = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 sex = ScriptReadHalfword(ctx);
+    u8 flag = ScriptReadByte(ctx);
+    u8 unk = 0;
+
+    struct ScrStrBufs *str = MOD06_02244210(unk80->saveBlock2, poke, sex, flag, &unk);
+    MOD05_021E2CBC(ctx, str, (u8)(msg + unk), 1);
+    ScrStrBufs_delete(str);
+
+    SetupNativeScript(ctx, FUN_0203A2F0);
+    return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk026D(struct ScriptContext* ctx) //message unown font?
+{
+    struct UnkStruct_0203A288 myLocalStruct;
+    u16 msg = ScriptReadHalfword(ctx);
+
+    MOD05_021E2BB8(&myLocalStruct, ctx);
+    myLocalStruct.unk2 = 3;
+
+    MOD05_021E2BD0(ctx, ctx->msgData, msg, 0, &myLocalStruct);
+    SetupNativeScript(ctx, FUN_0203A2F0);
+
+    return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk002C(struct ScriptContext* ctx)
+{
+    u8 msg = ScriptReadByte(ctx);
+    MOD05_021E2BD0(ctx, ctx->msgData, msg, 1, NULL);
+    SetupNativeScript(ctx, FUN_0203A2F0);
+    return TRUE;
+}
+
+THUMB_FUNC /*static*/ BOOL FUN_0203A2F0(struct ScriptContext* ctx)
+{
+    u8 *unk = (u8 *)FUN_02039438(ctx->unk80, 3);
+    return FUN_020546C8(*unk);
+}
diff --git a/arm9/src/scrcmd_18_c.c b/arm9/src/scrcmd_18_c.c
index b8bbbcdd..633ad71c 100644
--- a/arm9/src/scrcmd_18_c.c
+++ b/arm9/src/scrcmd_18_c.c
@@ -6,19 +6,19 @@
 #include "map_header.h"

 #include "scrcmd.h"

 

-extern u16 VarGet(struct UnkStruct_0204639C* arg, u16 wk);

-extern u16 *GetVarPointer(struct UnkStruct_0204639C* arg, u16);

+extern u16 VarGet(struct UnkSavStruct80* arg, u16 wk);

+extern u16 *GetVarPointer(struct UnkSavStruct80* arg, u16);

 extern BOOL GiveMon(u32 heap_id, struct SaveBlock2 * sav2, u16 species, u8 level, u16 item, u32 mapSec, u8 encounterType);

 

-THUMB_FUNC BOOL ScrCmd_givemon(struct ScriptContext* ctx)

+THUMB_FUNC BOOL ScrCmd_GiveMon(struct ScriptContext* ctx)

 {

-    u32 mapSec = FUN_02034824(*(ctx->unk80->unk1C));

-    struct UnkStruct_0204639C *savePtr = ctx->unk80;

+    u32 mapSec = FUN_02034824(*(ctx->unk80->mapId));

+    struct UnkSavStruct80 *savePtr = ctx->unk80;

     u16 species = VarGet(ctx->unk80, ScriptReadHalfword(ctx));

     u16 level = VarGet(ctx->unk80, ScriptReadHalfword(ctx));

     u16 item = VarGet(ctx->unk80, ScriptReadHalfword(ctx));

     u16 * varPtr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));

-    struct PlayerParty * party = SavArray_PlayerParty_get((struct SaveBlock2 *) savePtr->unkC);

-    *varPtr = (u16)GiveMon(11, (struct SaveBlock2 *) savePtr->unkC, species, (u8)level, item, mapSec, 12);

+    struct PlayerParty * party = SavArray_PlayerParty_get(savePtr->saveBlock2);

+    *varPtr = (u16)GiveMon(11, savePtr->saveBlock2, species, (u8)level, item, mapSec, 12);

     return FALSE;

 }

diff --git a/arm9/src/script.c b/arm9/src/script.c
index a5a5a6e4..d067ac79 100644
--- a/arm9/src/script.c
+++ b/arm9/src/script.c
@@ -27,7 +27,7 @@ THUMB_FUNC u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr)
     return 1;

 }

 

-THUMB_FUNC void SetupNativeScript(struct ScriptContext *ctx, u8 (*ptr)(struct ScriptContext *))

+THUMB_FUNC void SetupNativeScript(struct ScriptContext *ctx, BOOL (*ptr)(struct ScriptContext *))

 {

     ctx->mode = 2;

     ctx->nativePtr = ptr;

diff --git a/include/scrcmd.h b/include/scrcmd.h
index 5ebec947..f40f7841 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -1,6 +1,72 @@
 #ifndef POKEDIAMOND_SCRCMD_H
 #define POKEDIAMOND_SCRCMD_H
 
-BOOL ScrCmd_givemon(struct ScriptContext* ctx);
+#include "global.h"
+#include "script.h"
+
+struct UnkStruct_0203A288 {
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 padding[1];
+};
+
+//scrcmd.c
+BOOL ScrCmd_Nop(struct ScriptContext* ctx);
+BOOL ScrCmd_Dummy(struct ScriptContext* ctx);
+BOOL ScrCmd_End(struct ScriptContext* ctx);
+BOOL ScrCmd_Wait(struct ScriptContext* ctx);
+BOOL ScrCmd_DebugWatch(struct ScriptContext* ctx);
+BOOL ScrCmd_LoadByte(struct ScriptContext* ctx);
+BOOL ScrCmd_LoadWord(struct ScriptContext* ctx);
+BOOL ScrCmd_LoadByteFromAddr(struct ScriptContext* ctx);
+BOOL ScrCmd_WriteByteToAddr(struct ScriptContext* ctx);
+BOOL ScrCmd_SetPtrByte(struct ScriptContext* ctx);
+BOOL ScrCmd_CopyLocal(struct ScriptContext* ctx);
+BOOL ScrCmd_CopyByte(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareLocalToLocal(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareLocalToValue(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareLocalToAddr(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareAddrToLocal(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareAddrToValue(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareAddrToAddr(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareVarToValue(struct ScriptContext* ctx);
+BOOL ScrCmd_CompareVarToVar(struct ScriptContext* ctx);
+BOOL ScrCmd_RunScript(struct ScriptContext* ctx);
+BOOL ScrCmd_RunScriptWait(struct ScriptContext* ctx);
+BOOL ScrCmd_RestartCurrentScript(struct ScriptContext* ctx);
+BOOL ScrCmd_GoTo(struct ScriptContext* ctx);
+BOOL ScrCmd_ObjectGoTo(struct ScriptContext* ctx);
+BOOL ScrCmd_BgGoTo(struct ScriptContext* ctx);
+BOOL ScrCmd_DirectionGoTo(struct ScriptContext* ctx);
+BOOL ScrCmd_Call(struct ScriptContext* ctx);
+BOOL ScrCmd_Return(struct ScriptContext* ctx);
+BOOL ScrCmd_GoToIf(struct ScriptContext* ctx);
+BOOL ScrCmd_CallIf(struct ScriptContext* ctx);
+BOOL ScrCmd_SetFlag(struct ScriptContext* ctx);
+BOOL ScrCmd_ClearFlag(struct ScriptContext* ctx);
+BOOL ScrCmd_CheckFlag(struct ScriptContext* ctx);
+BOOL ScrCmd_CheckFlagVar(struct ScriptContext* ctx);
+BOOL ScrCmd_SetFlagVar(struct ScriptContext* ctx);
+BOOL ScrCmd_SetTrainerFlag(struct ScriptContext* ctx);
+BOOL ScrCmd_ClearTrainerFlag(struct ScriptContext* ctx);
+BOOL ScrCmd_CheckTrainerFlag(struct ScriptContext* ctx);
+BOOL ScrCmd_AddVar(struct ScriptContext* ctx);
+BOOL ScrCmd_SubVar(struct ScriptContext* ctx);
+BOOL ScrCmd_SetVar(struct ScriptContext* ctx);
+BOOL ScrCmd_CopyVar(struct ScriptContext* ctx);
+BOOL ScrCmd_SetOrCopyVar(struct ScriptContext* ctx);
+BOOL ScrCmd_Message(struct ScriptContext* ctx);
+BOOL ScrCmd_MessageFrom(struct ScriptContext* ctx);
+BOOL ScrCmd_MessageFrom2(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk01FC(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk01FD(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk01FE(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk01FF(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk026D(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk002C(struct ScriptContext* ctx);
+
+//scrcmd_18.c
+BOOL ScrCmd_GiveMon(struct ScriptContext* ctx);
 
 #endif //POKEDIAMOND_SCRCMD_H
diff --git a/include/script.h b/include/script.h
index 8fd7696f..5da251b5 100644
--- a/include/script.h
+++ b/include/script.h
@@ -10,28 +10,51 @@ struct ScriptContext;
 typedef u8 (*ScrCmdFunc)(struct ScriptContext *);

 typedef u8 Script[];

 

+

+struct UnkStruct_020464D4

+{

+    u16 unk0[4];

+    u8 padding[0x108];

+};

+

+struct UnkStruct_02046444

+{

+    u8 padding[0x90];

+    struct UnkStruct_020464D4 unk90[1]; //todo find size

+};

+

+struct UnkSavStruct80

+{

+    u8 padding[0xC];

+    struct SaveBlock2 *saveBlock2;

+    u8 padding2[0xC];

+    u32 *mapId;

+    u8 padding3[0x88];

+    struct UnkStruct_02046444 * unkA8;

+};

+

 struct ScriptContext

 {

     u8 stackDepth;

     u8 mode;

     u8 comparisonResult;

-    u8 (*nativePtr)(struct ScriptContext *);

+    BOOL (*nativePtr)(struct ScriptContext *);

     const u8 *scriptPtr;

     const u8 *stack[20];

     ScrCmdFunc *cmdTable;

     u32 cmdCount;

     u32 data[4];

-	u32 unk74;

-	struct MsgData * unk78;

+    struct UnkStruct_0204639C * unk74;

+	struct MsgData * msgData;

 	u8 *unk7C;

-    struct UnkStruct_0204639C * unk80;

+    struct UnkSavStruct80 * unk80;

 };

 

 #define ScriptReadByte(ctx) (*(ctx->scriptPtr++))

 

 void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, u32 cmdCount);

 u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr);

-void SetupNativeScript(struct ScriptContext *ctx, u8 (*ptr)(struct ScriptContext *));

+void SetupNativeScript(struct ScriptContext *ctx, BOOL (*ptr)(struct ScriptContext *));

 void StopScript(struct ScriptContext *ctx);

 void FUN_02038B6C(struct ScriptContext *ctx, s32 r1);

 u8 RunScriptCommand(struct ScriptContext *ctx);