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/18 | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/modules/18')
| -rw-r--r-- | arm9/modules/18/asm/module_18.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 78d31086..9c674215 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -29437,7 +29437,7 @@ MOD18_022479E4: ; 0x022479E4 blt _022479FC ldrh r0, [r0, #0x30] bl FUN_0202DFA4 - bl FUN_020239CC + bl PlayerData_GetTrainerGender cmp r0, #1 bne _022479FC add r4, #0x13 @@ -29458,7 +29458,7 @@ MOD18_02247A0C: ; 0x02247A0C blt _02247A24 ldrh r0, [r0, #0x2c] bl FUN_0202DFA4 - bl FUN_020239CC + bl PlayerData_GetTrainerGender cmp r0, #1 bne _02247A24 add r4, #0x13 @@ -32978,9 +32978,9 @@ _022495BA: bne _022495E2 ldr r0, [r5, #0xc] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #4 - bl FUN_020239A0 + bl PlayerData_GetPlayerName_NewString add r7, r0, #0 ldr r0, [r5, #0x40] ldr r2, [r4, #4] @@ -35135,7 +35135,7 @@ MOD18_0224A78C: ; 0x0224A78C bl MOD18_0224D704 ldr r0, [r4, #0xc] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r0, #0 mov r0, #1 str r0, [sp] @@ -37483,7 +37483,7 @@ _0224BA70: bl MOD18_0224DD94 ldr r0, [r4, #0xc] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r5, r0, #0 ldr r0, [r4, #0xc] bl FUN_020377AC @@ -40587,7 +40587,7 @@ MOD18_0224D364: ; 0x0224D364 str r1, [sp, #8] bl AddTextPrinterParameterized add r0, r5, #0 - bl FUN_020239C0 + bl PlayerData_GetTrainerID_VisibleHalf add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -41199,7 +41199,7 @@ _0224D8FA: mov r3, #2 bl AddTextPrinterParameterized ldr r0, [sp, #0x24] - bl FUN_020239C0 + bl PlayerData_GetTrainerID_VisibleHalf add r2, r0, #0 mov r0, #2 str r0, [sp] |