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_4.s | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/asm/scrcmd_4.s')
| -rw-r--r-- | arm9/asm/scrcmd_4.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index f74b9d43..4b62efa9 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -21,7 +21,7 @@ FUN_020406CC: ; 0x020406CC ldrb r5, [r1, #0x0] add r0, r6, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r2, r0, #0x0 ldr r0, [r4, #0x0] add r1, r5, #0x0 @@ -427,7 +427,7 @@ FUN_02040A30: ; 0x02040A30 ldr r5, [r0, #0x0] add r0, r5, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0xf @@ -438,7 +438,7 @@ FUN_02040A30: ; 0x02040A30 str r0, [r7, #0x8] add r0, r4, #0x0 ldrb r5, [r1, #0x0] - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r7, r0, #0x0 add r0, r4, #0x0 bl FUN_02023A28 |