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/17/asm/module_17.s | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/modules/17/asm/module_17.s')
| -rw-r--r-- | arm9/modules/17/asm/module_17.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 239aa59b..bbe85329 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4251,10 +4251,10 @@ MOD17_021D95AC: ; 0x021D95AC beq _021D95EC add r0, r4, #0 mov r1, #0xd - bl FUN_020239A0 + bl PlayerData_GetPlayerName_NewString add r5, r0, #0 add r0, r4, #0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r2, r0, #0 add r0, r6, #0 add r1, r5, #0 @@ -4338,10 +4338,10 @@ MOD17_021D964C: ; 0x021D964C beq _021D969A add r0, r4, #0 mov r1, #0xd - bl FUN_020239A0 + bl PlayerData_GetPlayerName_NewString add r5, r0, #0 add r0, r4, #0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r2, r0, #0 add r0, r7, #0 add r1, r5, #0 |