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/modules/16/asm/module_16.s | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/modules/16/asm/module_16.s')
| -rw-r--r-- | arm9/modules/16/asm/module_16.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index a6d13041..2e9d483c 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -4634,12 +4634,12 @@ _021D980C: ldr r1, _021D989C ; =0x0000174C str r0, [r5, r1] ldr r0, [r4, #4] - bl FUN_020239CC + bl PlayerData_GetTrainerGender ldr r1, _021D98A0 ; =0x00001750 str r0, [r5, r1] ldr r0, [r4, #4] add r1, r6, #0 - bl FUN_020239A0 + bl PlayerData_GetPlayerName_NewString ldr r1, _021D98A4 ; =0x00001754 str r0, [r5, r1] add r0, r6, #0 |