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/20 | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/modules/20')
| -rw-r--r-- | arm9/modules/20/asm/module_20.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index 93fc85ff..8c851ecc 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -1194,8 +1194,8 @@ MOD20_02252C40: ; 0x02252C40 MOD20_02252C44: ; 0x02252C44 push {r3, lr} ldr r0, [r0, #0x54] - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_GetPlayerDataPtr + bl PlayerData_GetTrainerGender cmp r0, #1 beq _02252C58 mov r0, #1 |