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/69 | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/modules/69')
| -rw-r--r-- | arm9/modules/69/asm/module_69.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 482c0e19..bd245269 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -1350,7 +1350,7 @@ _0222E0D4: ldr r0, [sp, #0x14] ldr r0, [r0, #0xc] ldr r0, [r0] - bl FUN_020239CC + bl PlayerData_GetTrainerGender cmp r0, #1 bne _0222E10C mov r1, #1 @@ -2672,7 +2672,7 @@ MOD69_0222EB4C: ; 0x0222EB4C bl FUN_0200ABC0 ldr r0, [r4, #0xc] ldr r0, [r0] - bl FUN_020239C0 + bl PlayerData_GetTrainerID_VisibleHalf add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -4070,7 +4070,7 @@ _0222F6FA: b _0222F77A _0222F70C: add r0, r6, #0 - bl FUN_020239BC + bl PlayerData_GetTrainerID add r7, r0, #0 add r0, r4, #0 mov r1, #7 @@ -4084,7 +4084,7 @@ _0222F726: ldr r1, _0222F788 ; =0x00001B54 add r0, r6, #0 ldr r1, [r5, r1] - bl FUN_02023990 + bl PlayerName_FlatToString ldr r2, _0222F78C ; =0x00001B58 add r0, r4, #0 ldr r2, [r5, r2] |