start of scrcmd decomp

2 files changed, 21 insertions, 392 deletions

diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd_asm.s
index c5ae760b..493fea57 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -15,377 +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}
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index f35fd58e..28fad682 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -149,25 +149,25 @@ 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 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 FUN_02039C40
     .word FUN_02039C78
     .word FUN_02039CE4
@@ -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,7 +654,7 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_countpartymonsatorbelowlevel
     .word ScrCmd_survivepsn
     .word FUN_0203BC2C
-    .word FUN_02039A10
+    .word ScrCmd_DebugWatch
     .word ScrCmd_message_from
     .word FUN_0203A098
     .word FUN_0203A0FC