2 files changed, 10 insertions, 277 deletions
diff --git a/arm9/asm/scrcmd_14.s b/arm9/asm/scrcmd_14.s
deleted file mode 100644
index 1fd34357..00000000
--- a/arm9/asm/scrcmd_14.s
+++ /dev/null
@@ -1,267 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02043A44
-FUN_02043A44: ; 0x02043A44
-	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, r5, #0x0
-	mov r1, #0x26
-	bl FUN_02039438
-	lsl r1, r6, #0x18
-	lsl r2, r7, #0x18
-	add r4, #0x80
-	add r5, r0, #0x0
-	ldr r0, [r4, #0x0]
-	lsr r1, r1, #0x18
-	lsr r2, r2, #0x18
-	bl MOD05_021E2950
-	str r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02043A94
-FUN_02043A94: ; 0x02043A94
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x26
-	bl FUN_02039438
-	ldr r0, [r0, #0x0]
-	bl MOD05_021E29B4
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_02043AAC
-FUN_02043AAC: ; 0x02043AAC
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x26
-	bl FUN_02039438
-	add r1, r0, #0x0
-	add r4, #0x80
-	ldr r0, [r4, #0x0]
-	ldr r1, [r1, #0x0]
-	bl MOD05_021E29C8
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02043ACC
-FUN_02043ACC: ; 0x02043ACC
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetCoinsAddr
-	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 CheckCoins
-	strh r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02043AFC
-FUN_02043AFC: ; 0x02043AFC
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetCoinsAddr
-	add r5, r0, #0x0
-	add r0, r4, #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 GiveCoins
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02043B28
-FUN_02043B28: ; 0x02043B28
-	push {r3-r5, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetCoinsAddr
-	add r5, r0, #0x0
-	add r0, r4, #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 TakeCoins
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02043B54
-FUN_02043B54: ; 0x02043B54
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetCoinsAddr
-	add r4, r0, #0x0
-	add r0, r5, #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 TakeCoins
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02043B84
-FUN_02043B84: ; 0x02043B84
-	push {r4-r6, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r5, [r0, #0x0]
-	add r0, r5, #0x0
-	bl ScriptEnvironment_GetSav2Ptr
-	bl Sav2_PlayerData_GetProfileAddr
-	ldr r0, [r5, #0xc]
-	bl Sav2_PlayerData_GetCoinsAddr
-	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
-	add r0, r4, #0x0
-	bl ScriptReadWord
-	add r4, r0, #0x0
-	add r0, r6, #0x0
-	bl CheckCoins
-	cmp r0, r4
-	bhs _02043BC8
-	mov r0, #0x0
-	b _02043BCA
-_02043BC8:
-	mov r0, #0x1
-_02043BCA:
-	strh r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02043BD0
-FUN_02043BD0: ; 0x02043BD0
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r4, [r0, #0x0]
-	add r0, r4, #0x0
-	bl ScriptEnvironment_GetSav2Ptr
-	bl Sav2_PlayerData_GetProfileAddr
-	ldr r0, [r4, #0xc]
-	bl Sav2_PlayerData_GetCoinsAddr
-	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 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 r5, [r0, #0x0]
-	add r0, r6, #0x0
-	bl CheckCoins
-	cmp r0, r5
-	bhs _02043C1E
-	mov r0, #0x0
-	b _02043C20
-_02043C1E:
-	mov r0, #0x1
-_02043C20:
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_02043C28
-FUN_02043C28: ; 0x02043C28
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	ldr r0, [r0, #0xc]
-	bl Sav2_PlayerData_GetCoinsAddr
-	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 GetVarPointer
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl VarGet
-	add r1, r0, #0x0
-	add r0, r6, #0x0
-	bl CanGiveCoins
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-	.balign 4
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 53d41e3b..c9a8bdd6 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -266,12 +266,12 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_Unk0072
     .word ScrCmd_Unk0073
     .word ScrCmd_Unk0074
-    .word FUN_02043A44
-    .word FUN_02043A94
-    .word FUN_02043AAC
-    .word FUN_02043ACC
-    .word FUN_02043AFC
-    .word FUN_02043B28
+    .word ScrCmd_Unk0075
+    .word ScrCmd_Unk0076
+    .word ScrCmd_Unk0077
+    .word ScrCmd_GetCoins
+    .word ScrCmd_GiveCoins
+    .word ScrCmd_TakeCoinsImmediate
     .word FUN_02045784
     .word FUN_020457DC
     .word FUN_02045834
@@ -777,9 +777,9 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203C58C
     .word FUN_02040DEC
     .word FUN_0203F2AC
-    .word FUN_02043B84
+    .word ScrCmd_HasEnoughCoinsImmediate
     .word FUN_0203F2E4
-    .word FUN_02043C28
+    .word ScrCmd_CanGiveCoins
     .word FUN_0203F31C
     .word ScrCmd_getpartymonlevel
     .word FUN_0203F348
@@ -829,8 +829,8 @@ gScriptCmdTable: ; 0x020F355C
     .word FUN_0203B914
     .word ScrCmd_Unk02A6
     .word FUN_0203FA14
-    .word FUN_02043B54
-    .word FUN_02043BD0
+    .word ScrCmd_TakeCoinsAddress
+    .word ScrCmd_HasEnoughCoinsAddress
     .word FUN_0203FA58
     .word FUN_0203B7F0
     .word FUN_0203FB4C