diff options
Diffstat (limited to 'arm9/asm/unk_0204CB20.s')
| -rw-r--r-- | arm9/asm/unk_0204CB20.s | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index 610901c6..f4d8b81a 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -773,7 +773,7 @@ FUN_0204D040: ; 0x0204D040 mov r2, #0x22 mul r2, r1 add r1, r3, r2 - bl FUN_0202393C + bl PlayerProfile_Copy _0204D0F8: ldr r1, _0204D110 ; =UNK_021C5A68 mov r0, #0xff @@ -1110,7 +1110,7 @@ _0204D37C: lsl r4, r5, #0x3 ldr r7, [r0, #0x0] ldr r0, [sp, #0xc] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender mov r1, #0x0 str r1, [sp, #0x0] str r0, [sp, #0x4] @@ -4018,7 +4018,7 @@ FUN_0204E96C: ; 0x0204E96C ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0x0 ldrb r0, [r5, #0x1] cmp r0, #0x8 @@ -4714,7 +4714,7 @@ FUN_0204EEBC: ; 0x0204EEBC beq _0204EF44 mov r0, #0xf lsl r4, r5, #0x2 - bl FUN_02023928 + bl PlayerProfile_init mov r3, #0x29 ldr r1, _0204EF48 ; =UNK_021C5A68 add r2, r0, #0x0 @@ -4726,7 +4726,7 @@ FUN_0204EEBC: ; 0x0204EEBC add r0, r7, #0x0 add r1, r1, r4 ldr r1, [r1, r3] - bl FUN_0202393C + bl PlayerProfile_Copy ldr r1, _0204EF48 ; =UNK_021C5A68 mov r2, #0x1 ldr r0, [r1, #0x0] @@ -4745,7 +4745,7 @@ FUN_0204EEBC: ; 0x0204EEBC add r1, r1, r3 add r0, r7, #0x0 add r1, r1, r2 - bl FUN_0202393C + bl PlayerProfile_Copy bl FUN_02031190 cmp r6, r0 bne _0204EF40 @@ -4818,7 +4818,7 @@ FUN_0204EF50: ; 0x0204EF50 add r2, r2, r5 ldr r0, [r0, r7] add r1, r2, r1 - bl FUN_0202393C + bl PlayerProfile_Copy mov r0, #0x1 pop {r3-r7, pc} _0204EFBE: @@ -5338,7 +5338,7 @@ _0204F3AC: mov r0, #0x29 lsl r0, r0, #0x4 ldr r0, [r2, r0] - bl FUN_02023AA4 + bl PlayerProfile_NameAndOTIDMatchPlayer cmp r0, #0x1 bne _0204F41A ldrb r0, [r5, #0x2] @@ -5478,7 +5478,7 @@ _0204F4D2: ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205EDF8 ldr r0, _0204F5E0 ; =UNK_021C5A68 ldrb r1, [r5, #0x1] @@ -5552,7 +5552,7 @@ _0204F58C: mov r0, #0x29 lsl r0, r0, #0x4 ldr r0, [r2, r0] - bl FUN_02023AA4 + bl PlayerProfile_NameAndOTIDMatchPlayer cmp r0, #0x1 bne _0204F5D4 ldrb r0, [r5, #0x1] @@ -6044,7 +6044,7 @@ FUN_0204F930: ; 0x0204F930 pop {r3-r5, pc} _0204F96E: mov r0, #0xf - bl FUN_02023928 + bl PlayerProfile_init add r4, r0, #0x0 mov r0, #0x14 mov r1, #0xf @@ -6060,7 +6060,7 @@ _0204F988: _0204F990: add r0, r4, #0x0 add r1, r5, #0x0 - bl FUN_0202397C + bl PlayerName_StringToFlat mov r0, #0x5b add r1, r4, #0x0 bl FUN_020311D0 @@ -6097,10 +6097,10 @@ FUN_0204F9BC: ; 0x0204F9BC add r1, r2, r1 add r0, r6, #0x0 add r1, r1, r4 - bl FUN_0202393C + bl PlayerProfile_Copy add r0, r6, #0x0 mov r1, #0xf - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString str r0, [sp, #0x0] bl StringGetLength cmp r0, #0x0 @@ -6190,7 +6190,7 @@ FUN_0204FA78: ; 0x0204FA78 _0204FA98: mov r0, #0xf lsl r4, r5, #0x2 - bl FUN_02023928 + bl PlayerProfile_init ldr r2, _0204FAC8 ; =UNK_021C5A68 ldr r1, [r2, #0x0] add r3, r1, r4 @@ -6201,7 +6201,7 @@ _0204FA98: add r0, r6, #0x0 add r2, r2, r4 ldr r1, [r2, r1] - bl FUN_0202393C + bl PlayerProfile_Copy ldr r0, _0204FAC8 ; =UNK_021C5A68 mov r1, #0x1 ldr r0, [r0, #0x0] @@ -6318,7 +6318,7 @@ _0204FB62: ldr r1, _0204FBA0 ; =0x0000014A add r0, r4, #0x0 add r1, r2, r1 - bl FUN_0202393C + bl PlayerProfile_Copy ldr r0, _0204FB9C ; =UNK_021C5A68 mov r2, #0x0 ldr r1, [r0, #0x0] |