diff options
Diffstat (limited to 'arm9/asm/unk_02025954.s')
| -rw-r--r-- | arm9/asm/unk_02025954.s | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arm9/asm/unk_02025954.s b/arm9/asm/unk_02025954.s index eb1d3969..8495ddab 100644 --- a/arm9/asm/unk_02025954.s +++ b/arm9/asm/unk_02025954.s @@ -469,7 +469,7 @@ FUN_02025C40: ; 0x02025C40 str r0, [sp, #0x0] _02025C50: add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r1, r5, #0x0 add r1, #0xa0 ldr r1, [r1, #0x0] @@ -485,7 +485,7 @@ _02025C50: bl ErrorHandling _02025C72: add r0, r6, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr ldr r1, [sp, #0x0] add r2, r7, #0x0 add r2, #0xb4 @@ -494,7 +494,7 @@ _02025C72: mov r2, #0x10 bl MI_CpuCopy8 add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID ldr r1, [sp, #0x0] lsl r1, r1, #0x2 add r1, r7, r1 @@ -549,11 +549,11 @@ _02025CE8: cmp r0, #0x0 beq _02025D32 add r0, r1, #0x0 - bl FUN_02023928 + bl PlayerProfile_init ldr r1, [sp, #0x0] add r6, r0, #0x0 add r1, r7, r1 - bl FUN_0202395C + bl CopyPlayerName ldr r1, _02025D3C ; =0x00000109 add r2, r5, r4 ldrb r1, [r2, r1] @@ -570,7 +570,7 @@ _02025CE8: add r1, #0xa0 ldr r1, [r1, #0x0] add r0, r6, #0x0 - bl FUN_020239B8 + bl PlayerProfile_SetTrainerID add r0, r6, #0x0 pop {r3-r7, pc} _02025D32: @@ -2887,17 +2887,17 @@ FUN_02026CA0: ; 0x02026CA0 thumb_func_start FUN_02026CA8 FUN_02026CA8: ; 0x02026CA8 - ldr r3, _02026CB0 ; =FUN_02022610 + ldr r3, _02026CB0 ; =SavArray_get mov r1, #0xc bx r3 nop -_02026CB0: .word FUN_02022610 +_02026CB0: .word SavArray_get thumb_func_start FUN_02026CB4 FUN_02026CB4: ; 0x02026CB4 push {r3, lr} mov r1, #0xc - bl FUN_02022610 + bl SavArray_get add r0, #0x50 pop {r3, pc} @@ -2908,8 +2908,8 @@ FUN_02026CC0: ; 0x02026CC0 thumb_func_start FUN_02026CC4 FUN_02026CC4: ; 0x02026CC4 - ldr r3, _02026CCC ; =FUN_02022610 + ldr r3, _02026CCC ; =SavArray_get mov r1, #0xc bx r3 nop -_02026CCC: .word FUN_02022610 +_02026CCC: .word SavArray_get |