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/67 | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/modules/67')
| -rw-r--r-- | arm9/modules/67/asm/module_67.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index a70bda2f..a81eb2f7 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -55,7 +55,7 @@ MOD67_021D74E0: ; 0x021D74E0 bl FUN_020289A4 str r0, [r4, #0x44] add r0, r5, #0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [r4, #0x48] mov r0, #0 mov r1, #0x2a @@ -338,7 +338,7 @@ MOD67_021D77B0: ; 0x021D77B0 sub sp, #0x10 add r4, r0, #0 ldr r0, [r4, #0x48] - bl FUN_020239CC + bl PlayerData_GetTrainerGender cmp r0, #0 bne _021D7802 mov r0, #0 |