diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 16:52:18 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 16:52:18 -0400 |
| commit | ad1e7f58f2912df805d9a768715497c9cc6a85c1 (patch) | |
| tree | c08534f0cb1a3269e632fec9996ec75482936070 /arm9/asm/scrcmd_15.s | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/asm/scrcmd_15.s')
| -rw-r--r-- | arm9/asm/scrcmd_15.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arm9/asm/scrcmd_15.s b/arm9/asm/scrcmd_15.s index 6553953b..88c7628f 100644 --- a/arm9/asm/scrcmd_15.s +++ b/arm9/asm/scrcmd_15.s @@ -10,13 +10,13 @@ FUN_02043C6C: ; 0x02043C6C add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02023A30 + bl PlayerData_AddMoney mov r0, #0x0 pop {r3-r5, pc} @@ -27,13 +27,13 @@ FUN_02043C90: ; 0x02043C90 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02023A54 + bl PlayerData_SubMoney mov r0, #0x0 pop {r3-r5, pc} @@ -44,7 +44,7 @@ FUN_02043CB4: ; 0x02043CB4 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -54,7 +54,7 @@ FUN_02043CB4: ; 0x02043CB4 bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02023A54 + bl PlayerData_SubMoney mov r0, #0x0 pop {r3-r5, pc} .balign 4 @@ -66,7 +66,7 @@ FUN_02043CE4: ; 0x02043CE4 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -80,7 +80,7 @@ FUN_02043CE4: ; 0x02043CE4 bl ScriptReadWord add r4, r0, #0x0 add r0, r6, #0x0 - bl FUN_02023A10 + bl PlayerData_GetMoney cmp r0, r4 bhs _02043D20 mov r0, #0x0 @@ -99,7 +99,7 @@ FUN_02043D28: ; 0x02043D28 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -117,7 +117,7 @@ FUN_02043D28: ; 0x02043D28 bl VarGet add r4, r0, #0x0 add r0, r6, #0x0 - bl FUN_02023A10 + bl PlayerData_GetMoney cmp r0, r4 bhs _02043D6E mov r0, #0x0 |