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/52 | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/modules/52')
| -rw-r--r-- | arm9/modules/52/asm/module_52.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 53f3737b..7b123bba 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -178,7 +178,7 @@ MOD52_021D7604: ; 0x021D7604 add r0, r5, #0 bl FUN_0206007C add r0, r5, #0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r4, r0, #0 bl MTRandom add r7, r0, #0 @@ -189,7 +189,7 @@ MOD52_021D7604: ; 0x021D7604 bl FUN_020239B8 _021D7656: add r0, r4, #0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r1, r0, #0 add r0, r7, #0 mov r2, #0 @@ -232,9 +232,9 @@ MOD52_021D769C: ; 0x021D769C add r0, r4, #0 bl FUN_020377E0 add r0, r4, #0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr ldr r1, _021D76C4 ; =0x00000BB8 - bl FUN_02023A14 + bl PlayerData_SetMoney add r0, r4, #0 bl SavArray_Flags_get bl FUN_0205ECD4 |