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/83 | |
| parent | a13a7535cd78a113d23a8cccddced3d5f13ad479 (diff) | |
Rename routines in player_data.s
Diffstat (limited to 'arm9/modules/83')
| -rw-r--r-- | arm9/modules/83/asm/module_83.s | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index ebd0150e..181dbb80 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -976,7 +976,7 @@ MOD83_0222DD24: ; 0x0222DD24 str r0, [sp, #0x28] ldr r0, [sp, #0x10] ldr r0, [r0, #0xc] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender cmp r0, #1 bne _0222DD58 ldr r0, _0222DEB8 ; =0x0003040F @@ -1948,19 +1948,19 @@ MOD83_0222E48C: ; 0x0222E48C add r0, r0, #4 str r1, [r4, r0] ldr r0, [r4, #4] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0xc] ldr r0, [r4, #4] bl FUN_02024DA0 str r0, [r4, #8] ldr r0, [r4, #4] - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [r4, #0x10] ldr r0, [r4, #8] bl FUN_02024D64 str r0, [r4, #0x4c] ldr r0, [r4, #0xc] - bl PlayerData_CountBadges + bl PlayerProfile_CountBadges str r0, [r4, #0x50] mov r0, #0x45 mov r1, #0xf @@ -2462,7 +2462,7 @@ MOD83_0222E910: ; 0x0222E910 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 ldr r0, [r7, #0x10] - bl FUN_0202398C + bl PlayerProfile_GetNamePtr ldr r5, _0222E948 ; =0x0223B860 add r4, r0, #0 mov r6, #0 @@ -2476,7 +2476,7 @@ _0222E920: cmp r6, #8 blt _0222E920 ldr r0, [r7, #0x10] - bl PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf add r1, r0, #0 ldr r0, _0222E94C ; =0x0223B870 bl MOD83_0222E8A4 @@ -2903,7 +2903,7 @@ MOD83_0222EC78: ; 0x0222EC78 mov r1, #0 bl FUN_0200ABC0 ldr r0, [r5, #0x10] - bl PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -3050,13 +3050,13 @@ MOD83_0222EDF8: ; 0x0222EDF8 bl FUN_0200628C ldr r0, [r0, #8] str r0, [r4, #8] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x10] ldr r0, [r4, #8] bl FUN_02024DA0 str r0, [r4, #0xc] ldr r0, [r4, #8] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x14] ldr r0, [r4] bl MOD83_02238770 @@ -6552,7 +6552,7 @@ _022309D0: bl FUN_0200628C ldr r0, [r0, #8] str r0, [r4, #4] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #8] mov r0, #0xff mov r2, #3 @@ -10282,7 +10282,7 @@ _022327E6: str r0, [r4, r1] add r0, r1, #4 ldr r0, [r4, r0] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr ldr r1, _02232B58 ; =0x00002B48 str r0, [r4, r1] ldr r0, [r4, r1] @@ -11111,7 +11111,7 @@ _02232EE6: bl ReadMsgData_ExpandPlaceholders str r0, [sp, #0x20] add r0, r7, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender cmp r0, #0 str r5, [sp] bne _02232F30 @@ -11144,7 +11144,7 @@ _02232F4A: ldr r0, [sp, #0x20] bl String_dtor add r0, r7, #0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -18534,10 +18534,10 @@ MOD83_02236764: ; 0x02236764 bl FUN_0200628C ldr r0, [r0, #8] str r0, [r4, #0x10] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x14] ldr r0, [r4, #0x10] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x18] bl FUN_02025084 str r0, [r4, #0x1c] |