diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-13 08:58:40 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-13 08:58:40 -0400 |
| commit | ddd20f2c76a34b4fc46503c8bf88d53a755453a8 (patch) | |
| tree | 829d21a866de69dc92e1b8e5bb1857a21104027c /arm9/modules/55 | |
| parent | a13a7535cd78a113d23a8cccddced3d5f13ad479 (diff) | |
Rename routines in player_data.s
Diffstat (limited to 'arm9/modules/55')
| -rw-r--r-- | arm9/modules/55/asm/module_55.s | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index f419f2dd..5ac713b0 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -807,7 +807,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r3, #4 bl FUN_020068C8 ldr r0, [r5, #8] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025084 lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -1309,7 +1309,7 @@ _021D7F86: cmp r6, #2 bne _021D7FF4 ldr r0, [r5, #8] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 @@ -1769,7 +1769,7 @@ MOD55_021D8320: ; 0x021D8320 add r0, r5, #0 bl MOD55_021D778C ldr r0, [r5, #8] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr mov r1, #7 str r0, [sp] mov r0, #0x34 @@ -1869,7 +1869,7 @@ MOD55_021D8404: ; 0x021D8404 add r5, r0, #0 ldr r0, [r5, #8] add r4, r1, #0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp] mov r0, #0x34 mov r1, #4 @@ -1974,7 +1974,7 @@ MOD55_021D84C8: ; 0x021D84C8 cmp r0, #0 beq _021D8534 mov r0, #0x34 - bl PlayerData_init + bl PlayerProfile_init add r4, r0, #0 add r0, r5, #0 add r0, #0xd4 @@ -3314,7 +3314,7 @@ _021D8F1A: add r0, r5, r1 bl FUN_02019220 mov r0, #0x34 - bl PlayerData_init + bl PlayerProfile_init mov r1, #0xf2 lsl r1, r1, #2 ldrb r1, [r5, r1] @@ -3504,7 +3504,7 @@ MOD55_021D90D8: ; 0x021D90D8 orr r0, r1 beq _021D9170 mov r0, #0x34 - bl PlayerData_init + bl PlayerProfile_init mov r1, #0xf2 lsl r1, r1, #2 ldrb r1, [r5, r1] @@ -3607,7 +3607,7 @@ _021D91D6: mov r1, #0 bl FUN_02019620 ldr r0, [r5, #8] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 @@ -4166,7 +4166,7 @@ _021D969A: mov r1, #0 bl FUN_02019620 mov r0, #0x34 - bl PlayerData_init + bl PlayerProfile_init str r0, [sp, #0x20] ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] @@ -4406,7 +4406,7 @@ _021D987C: add r3, r1, #0 bl AddTextPrinterParameterized2 mov r0, #0x34 - bl PlayerData_init + bl PlayerProfile_init add r5, r0, #0 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] @@ -5057,7 +5057,7 @@ MOD55_021D9E40: ; 0x021D9E40 add r0, r4, #0 bl MOD55_021D778C ldr r0, [r4, #8] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr mov r1, #7 str r0, [sp] mov r0, #0x34 @@ -5204,7 +5204,7 @@ MOD55_021D9F8C: ; 0x021D9F8C add r5, r0, #0 mov r0, #0x34 add r6, r1, #0 - bl PlayerData_init + bl PlayerProfile_init add r4, r0, #0 ldr r0, [r5, #8] bl FUN_020286EC @@ -5348,7 +5348,7 @@ MOD55_021DA0A4: ; 0x021DA0A4 add r5, r0, #0 ldr r0, [r5, #8] add r6, r1, #0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02024FF4 add r4, r0, #0 mov r0, #0xce |