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_8.s | |
parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) |
Merge two struct definitions
Diffstat (limited to 'arm9/asm/scrcmd_8.s')
-rw-r--r-- | arm9/asm/scrcmd_8.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/asm/scrcmd_8.s b/arm9/asm/scrcmd_8.s index 66812dad..ae54897f 100644 --- a/arm9/asm/scrcmd_8.s +++ b/arm9/asm/scrcmd_8.s @@ -194,17 +194,17 @@ _02041DCE: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r6, #0x0 add r7, r0, #0x0 - bl FUN_02023990 + bl PlayerName_FlatToString add r0, r5, #0x0 mov r1, #0x0 mov r2, #0x1 add r3, r6, #0x0 bl FUN_020287C0 add r0, r7, #0x0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x0 |