diff options
93 files changed, 598 insertions, 598 deletions
diff --git a/arm9/asm/options.s b/arm9/asm/options.s index 5869b5b1..14d2a449 100644 --- a/arm9/asm/options.s +++ b/arm9/asm/options.s @@ -67,7 +67,7 @@ FUN_02024F9C: ; 0x02024F9C push {r3, lr} cmp r0, #0x0 beq _02024FAC - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025064 add r1, r0, #0x0 _02024FAC: diff --git a/arm9/asm/player_data.s b/arm9/asm/player_data.s index f434845a..9761eb48 100644 --- a/arm9/asm/player_data.s +++ b/arm9/asm/player_data.s @@ -19,7 +19,7 @@ Sav2_PlayerData_init: ; 0x020238C8 add r0, r4, #0x0 bl Options_init add r0, r4, #0x4 - bl PlayerData_Clear + bl PlayerProfile_Clear add r0, r4, #0x0 add r0, #0x24 bl InitCoins @@ -28,64 +28,64 @@ Sav2_PlayerData_init: ; 0x020238C8 bl InitIGT pop {r4, pc} - thumb_func_start Sav2_GetPlayerDataPtr -Sav2_GetPlayerDataPtr: ; 0x020238F4 + thumb_func_start Sav2_PlayerData_GetProfileAddr +Sav2_PlayerData_GetProfileAddr: ; 0x020238F4 push {r3, lr} mov r1, #0x1 bl SavArray_get add r0, r0, #0x4 pop {r3, pc} - thumb_func_start LoadPlayerDataAddress -LoadPlayerDataAddress: ; 0x02023900 + thumb_func_start Sav2_PlayerData_GetOptionsAddr +Sav2_PlayerData_GetOptionsAddr: ; 0x02023900 ldr r3, _02023908 ; =SavArray_get mov r1, #0x1 bx r3 nop _02023908: .word SavArray_get - thumb_func_start FUN_0202390C -FUN_0202390C: ; 0x0202390C + thumb_func_start Sav2_PlayerData_GetCoinsAddr +Sav2_PlayerData_GetCoinsAddr: ; 0x0202390C push {r3, lr} mov r1, #0x1 bl SavArray_get add r0, #0x24 pop {r3, pc} - thumb_func_start FUN_02023918 -FUN_02023918: ; 0x02023918 + thumb_func_start Sav2_PlayerData_GetIGTAddr +Sav2_PlayerData_GetIGTAddr: ; 0x02023918 push {r3, lr} mov r1, #0x1 bl SavArray_get add r0, #0x26 pop {r3, pc} - thumb_func_start PlayerData_sizeof -PlayerData_sizeof: ; 0x02023924 + thumb_func_start PlayerProfile_sizeof +PlayerProfile_sizeof: ; 0x02023924 mov r0, #0x20 bx lr - thumb_func_start PlayerData_init -PlayerData_init: ; 0x02023928 + thumb_func_start PlayerProfile_init +PlayerProfile_init: ; 0x02023928 push {r4, lr} mov r1, #0x20 bl AllocFromHeap add r4, r0, #0x0 - bl PlayerData_Clear + bl PlayerProfile_Clear add r0, r4, #0x0 pop {r4, pc} .balign 4 - thumb_func_start FUN_0202393C -FUN_0202393C: ; 0x0202393C + thumb_func_start PlayerProfile_Copy +PlayerProfile_Copy: ; 0x0202393C ldr r3, _02023944 ; =MI_CpuCopy8 mov r2, #0x20 bx r3 nop _02023944: .word MI_CpuCopy8 - thumb_func_start PlayerData_Clear -PlayerData_Clear: ; 0x02023948 + thumb_func_start PlayerProfile_Clear +PlayerProfile_Clear: ; 0x02023948 push {r4, lr} mov r1, #0x0 mov r2, #0x20 @@ -124,8 +124,8 @@ PlayerName_StringToFlat: ; 0x0202397C .balign 4 _02023988: .word CopyStringToU16Array - thumb_func_start FUN_0202398C -FUN_0202398C: ; 0x0202398C + thumb_func_start PlayerProfile_GetNamePtr +PlayerProfile_GetNamePtr: ; 0x0202398C bx lr .balign 4 @@ -139,8 +139,8 @@ PlayerName_FlatToString: ; 0x02023990 nop _0202399C: .word CopyU16ArrayToString - thumb_func_start PlayerData_GetPlayerName_NewString -PlayerData_GetPlayerName_NewString: ; 0x020239A0 + thumb_func_start PlayerProfile_GetPlayerName_NewString +PlayerProfile_GetPlayerName_NewString: ; 0x020239A0 push {r3-r5, lr} add r5, r0, #0x0 mov r0, #0x8 @@ -152,35 +152,35 @@ PlayerData_GetPlayerName_NewString: ; 0x020239A0 add r0, r4, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_020239B8 -FUN_020239B8: ; 0x020239B8 + thumb_func_start PlayerProfile_SetTrainerID +PlayerProfile_SetTrainerID: ; 0x020239B8 str r1, [r0, #0x10] bx lr - thumb_func_start PlayerData_GetTrainerID -PlayerData_GetTrainerID: ; 0x020239BC + thumb_func_start PlayerProfile_GetTrainerID +PlayerProfile_GetTrainerID: ; 0x020239BC ldr r0, [r0, #0x10] bx lr - thumb_func_start PlayerData_GetTrainerID_VisibleHalf -PlayerData_GetTrainerID_VisibleHalf: ; 0x020239C0 + thumb_func_start PlayerProfile_GetTrainerID_VisibleHalf +PlayerProfile_GetTrainerID_VisibleHalf: ; 0x020239C0 ldr r0, [r0, #0x10] lsl r0, r0, #0x10 lsr r0, r0, #0x10 bx lr - thumb_func_start PlayerData_SetTrainerGender -PlayerData_SetTrainerGender: ; 0x020239C8 + thumb_func_start PlayerProfile_SetTrainerGender +PlayerProfile_SetTrainerGender: ; 0x020239C8 strb r1, [r0, #0x18] bx lr - thumb_func_start PlayerData_GetTrainerGender -PlayerData_GetTrainerGender: ; 0x020239CC + thumb_func_start PlayerProfile_GetTrainerGender +PlayerProfile_GetTrainerGender: ; 0x020239CC ldrb r0, [r0, #0x18] bx lr - thumb_func_start PlayerData_TestBadgeFlag -PlayerData_TestBadgeFlag: ; 0x020239D0 + thumb_func_start PlayerProfile_TestBadgeFlag +PlayerProfile_TestBadgeFlag: ; 0x020239D0 ldrb r3, [r0, #0x1a] mov r0, #0x1 add r2, r0, #0x0 @@ -193,8 +193,8 @@ _020239E0: bx lr .balign 4 - thumb_func_start PlayerData_SetBadgeFlag -PlayerData_SetBadgeFlag: ; 0x020239E4 + thumb_func_start PlayerProfile_SetBadgeFlag +PlayerProfile_SetBadgeFlag: ; 0x020239E4 ldrb r3, [r0, #0x1a] mov r2, #0x1 lsl r2, r1 @@ -204,8 +204,8 @@ PlayerData_SetBadgeFlag: ; 0x020239E4 bx lr .balign 4 - thumb_func_start PlayerData_CountBadges -PlayerData_CountBadges: ; 0x020239F4 + thumb_func_start PlayerProfile_CountBadges +PlayerProfile_CountBadges: ; 0x020239F4 ldrb r3, [r0, #0x1a] mov r2, #0x0 cmp r3, #0x0 @@ -224,13 +224,13 @@ _02023A0A: bx lr .balign 4 - thumb_func_start PlayerData_GetMoney -PlayerData_GetMoney: ; 0x02023A10 + thumb_func_start PlayerProfile_GetMoney +PlayerProfile_GetMoney: ; 0x02023A10 ldr r0, [r0, #0x14] bx lr - thumb_func_start PlayerData_SetMoney -PlayerData_SetMoney: ; 0x02023A14 + thumb_func_start PlayerProfile_SetMoney +PlayerProfile_SetMoney: ; 0x02023A14 ldr r2, _02023A24 ; =0x000F423F cmp r1, r2 bls _02023A1C @@ -252,8 +252,8 @@ FUN_02023A2C: ; 0x02023A2C strb r1, [r0, #0x1b] bx lr - thumb_func_start PlayerData_AddMoney -PlayerData_AddMoney: ; 0x02023A30 + thumb_func_start PlayerProfile_AddMoney +PlayerProfile_AddMoney: ; 0x02023A30 ldr r2, _02023A50 ; =0x000F423F cmp r1, r2 bls _02023A3A @@ -275,8 +275,8 @@ _02023A4A: nop _02023A50: .word 0x000F423F - thumb_func_start PlayerData_SubMoney -PlayerData_SubMoney: ; 0x02023A54 + thumb_func_start PlayerProfile_SubMoney +PlayerProfile_SubMoney: ; 0x02023A54 ldr r2, [r0, #0x14] cmp r2, r1 bhs _02023A5E @@ -344,8 +344,8 @@ FUN_02023A9C: ; 0x02023A9C lsr r0, r0, #0x1f bx lr - thumb_func_start PlayerData_NameAndOTIDMatchPlayer -PlayerData_NameAndOTIDMatchPlayer: ; 0x02023AA4 + thumb_func_start PlayerProfile_NameAndOTIDMatchPlayer +PlayerProfile_NameAndOTIDMatchPlayer: ; 0x02023AA4 push {r3-r5, lr} mov r2, #0x7 add r5, r0, #0x0 diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 47dc0f62..7ffad1f7 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -1606,7 +1606,7 @@ FUN_0203A590: ; 0x0203A590 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02054608 @@ -2021,7 +2021,7 @@ FUN_0203A8B8: ; 0x0203A8B8 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 ldr r1, [r7, #0x0] add r0, r4, #0x0 @@ -5376,7 +5376,7 @@ FUN_0203C3E8: ; 0x0203C3E8 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r6, #0x4] add r0, r5, #0x0 add r0, #0x80 @@ -6391,7 +6391,7 @@ FUN_0203CBE8: ; 0x0203CBE8 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 ldr r1, [r6, #0x0] add r0, r4, #0x0 @@ -6818,7 +6818,7 @@ FUN_0203CFC8: ; 0x0203CFC8 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r1, [r5, #0x8] str r0, [sp, #0x0] add r0, r1, #0x1 @@ -6855,7 +6855,7 @@ _0203D02E: bl FUN_02024518 add r5, r0, #0x0 ldr r0, [sp, #0x0] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 lsl r1, r1, #0x10 add r0, r5, #0x0 @@ -7345,7 +7345,7 @@ FUN_0203D3DC: ; 0x0203D3DC add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r5, #0x80 str r0, [sp, #0x4] ldr r0, [r5, #0x0] @@ -7756,7 +7756,7 @@ FUN_0203D738: ; 0x0203D738 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -7764,10 +7764,10 @@ FUN_0203D738: ; 0x0203D738 bl FUN_02039438 add r4, r0, #0x0 add r0, r5, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r6, r0, #0x0 add r0, r5, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 ldr r2, [r4, #0x0] add r0, r6, #0x0 @@ -7783,7 +7783,7 @@ FUN_0203D774: ; 0x0203D774 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -7801,17 +7801,17 @@ FUN_0203D774: ; 0x0203D774 bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r6, r0, #0x0 add r0, r5, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 add r0, r6, #0x0 add r2, r7, #0x0 bl FUN_02053678 strh r0, [r4, #0x0] add r0, r5, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender ldrh r1, [r4, #0x0] mov r2, #0x2 bl FUN_020536D0 @@ -7827,7 +7827,7 @@ FUN_0203D7DC: ; 0x0203D7DC add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -7845,10 +7845,10 @@ FUN_0203D7DC: ; 0x0203D7DC bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r6, r0, #0x0 add r0, r5, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 add r0, r6, #0x0 add r2, r7, #0x0 @@ -7865,7 +7865,7 @@ FUN_0203D834: ; 0x0203D834 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -7918,7 +7918,7 @@ FUN_0203D8A0: ; 0x0203D8A0 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -7928,7 +7928,7 @@ FUN_0203D8A0: ; 0x0203D8A0 bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender strh r0, [r5, #0x0] mov r0, #0x0 pop {r3-r5, pc} @@ -10039,7 +10039,7 @@ FUN_0203E968: ; 0x0203E968 add r5, #0x80 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr bl FUN_02023A90 b _0203E9C8 _0203E9AE: @@ -10316,7 +10316,7 @@ FUN_0203EBE4: ; 0x0203EBE4 ldr r6, [r0, #0x0] add r0, r6, #0x0 bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x4] add r0, r5, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index eb431b0e..2566edfd 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -322,7 +322,7 @@ FUN_02042F48: ; 0x02042F48 strh r0, [r2, #0x0] ldr r0, [r4, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r4, #0x4] mov r1, #0x0 @@ -339,7 +339,7 @@ FUN_02042F6C: ; 0x02042F6C str r0, [sp, #0x10] ldr r0, [sp, #0x4] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0xc] ldr r0, [sp, #0x10] mov r7, #0x0 @@ -612,13 +612,13 @@ _020431D4: bne _0204322C ldr r0, [sp, #0xc] mov r1, #0x20 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r5, r0, #0x0 ldr r0, [sp, #0xc] - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID str r0, [sp, #0x2c] ldr r0, [sp, #0xc] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender str r0, [sp, #0x28] mov r0, #0x20 bl AllocMonZeroed @@ -690,7 +690,7 @@ FUN_02043274: ; 0x02043274 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -736,7 +736,7 @@ FUN_020432C8: ; 0x020432C8 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -808,7 +808,7 @@ FUN_02043358: ; 0x02043358 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -876,7 +876,7 @@ FUN_020433DC: ; 0x020433DC strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -949,7 +949,7 @@ FUN_0204346C: ; 0x0204346C strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1077,7 +1077,7 @@ _02043574: strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1151,7 +1151,7 @@ FUN_020435F8: ; 0x020435F8 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1243,7 +1243,7 @@ FUN_020436B8: ; 0x020436B8 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1334,7 +1334,7 @@ FUN_02043774: ; 0x02043774 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1415,7 +1415,7 @@ FUN_02043818: ; 0x02043818 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1441,7 +1441,7 @@ FUN_02043850: ; 0x02043850 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s index 3ed2ed87..c9a5bc2d 100644 --- a/arm9/asm/scrcmd_13.s +++ b/arm9/asm/scrcmd_13.s @@ -101,7 +101,7 @@ FUN_02043918: ; 0x02043918 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x4] add r0, r6, #0x0 add r0, #0x80 diff --git a/arm9/asm/scrcmd_14.s b/arm9/asm/scrcmd_14.s index f8addc83..e37228c6 100644 --- a/arm9/asm/scrcmd_14.s +++ b/arm9/asm/scrcmd_14.s @@ -77,7 +77,7 @@ FUN_02043ACC: ; 0x02043ACC add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -100,7 +100,7 @@ FUN_02043AFC: ; 0x02043AFC add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -121,7 +121,7 @@ FUN_02043B28: ; 0x02043B28 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -142,7 +142,7 @@ FUN_02043B54: ; 0x02043B54 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -166,9 +166,9 @@ FUN_02043B84: ; 0x02043B84 ldr r5, [r0, #0x0] add r0, r5, #0x0 bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r0, [r5, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -202,9 +202,9 @@ FUN_02043BD0: ; 0x02043BD0 ldr r4, [r0, #0x0] add r0, r4, #0x0 bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r0, [r4, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -242,7 +242,7 @@ FUN_02043C28: ; 0x02043C28 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_15.s b/arm9/asm/scrcmd_15.s index 88c7628f..d33d857b 100644 --- a/arm9/asm/scrcmd_15.s +++ b/arm9/asm/scrcmd_15.s @@ -10,13 +10,13 @@ FUN_02043C6C: ; 0x02043C6C add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r1, r0, #0x0 add r0, r5, #0x0 - bl PlayerData_AddMoney + bl PlayerProfile_AddMoney mov r0, #0x0 pop {r3-r5, pc} @@ -27,13 +27,13 @@ FUN_02043C90: ; 0x02043C90 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r1, r0, #0x0 add r0, r5, #0x0 - bl PlayerData_SubMoney + bl PlayerProfile_SubMoney mov r0, #0x0 pop {r3-r5, pc} @@ -44,7 +44,7 @@ FUN_02043CB4: ; 0x02043CB4 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -54,7 +54,7 @@ FUN_02043CB4: ; 0x02043CB4 bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 - bl PlayerData_SubMoney + bl PlayerProfile_SubMoney mov r0, #0x0 pop {r3-r5, pc} .balign 4 @@ -66,7 +66,7 @@ FUN_02043CE4: ; 0x02043CE4 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -80,7 +80,7 @@ FUN_02043CE4: ; 0x02043CE4 bl ScriptReadWord add r4, r0, #0x0 add r0, r6, #0x0 - bl PlayerData_GetMoney + bl PlayerProfile_GetMoney cmp r0, r4 bhs _02043D20 mov r0, #0x0 @@ -99,7 +99,7 @@ FUN_02043D28: ; 0x02043D28 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -117,7 +117,7 @@ FUN_02043D28: ; 0x02043D28 bl VarGet add r4, r0, #0x0 add r0, r6, #0x0 - bl PlayerData_GetMoney + bl PlayerProfile_GetMoney cmp r0, r4 bhs _02043D6E mov r0, #0x0 diff --git a/arm9/asm/scrcmd_16.s b/arm9/asm/scrcmd_16.s index 012a1812..9b188d47 100644 --- a/arm9/asm/scrcmd_16.s +++ b/arm9/asm/scrcmd_16.s @@ -71,7 +71,7 @@ FUN_02043E68: ; 0x02043E68 add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 add r0, r6, #0x0 add r1, r5, #0x0 diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index 4299ccbe..c4fa299c 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -118,7 +118,7 @@ FUN_020443A8: ; 0x020443A8 ldr r5, [r0, #0x0] add r0, r5, #0x0 bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -145,7 +145,7 @@ FUN_020443A8: ; 0x020443A8 lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r7, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID lsl r0, r0, #0x10 lsr r0, r0, #0x10 cmp r5, r0 @@ -167,7 +167,7 @@ FUN_02044414: ; 0x02044414 add r0, #0x80 ldr r4, [r0, #0x0] ldr r0, [r4, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_2.s b/arm9/asm/scrcmd_2.s index c880fd3a..d7d98c66 100644 --- a/arm9/asm/scrcmd_2.s +++ b/arm9/asm/scrcmd_2.s @@ -188,9 +188,9 @@ _0203FD10: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r5, #0x0 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x1 bne _0203FD2C add r0, r6, #0x1 diff --git a/arm9/asm/scrcmd_21.s b/arm9/asm/scrcmd_21.s index 83bcf2ad..900a2f2b 100644 --- a/arm9/asm/scrcmd_21.s +++ b/arm9/asm/scrcmd_21.s @@ -105,9 +105,9 @@ _020454B6: add r5, #0x80 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r4, #0x0 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag strh r0, [r6, #0x0] mov r0, #0x0 pop {r4-r6, pc} @@ -130,9 +130,9 @@ _020454EA: add r5, #0x80 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r4, #0x0 - bl PlayerData_SetBadgeFlag + bl PlayerProfile_SetBadgeFlag mov r0, #0x0 pop {r3-r5, pc} .balign 4 @@ -177,9 +177,9 @@ _02045548: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldrb r1, [r7, r4] - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x1 bne _02045564 add r0, r5, #0x1 diff --git a/arm9/asm/scrcmd_24.s b/arm9/asm/scrcmd_24.s index 19eb9485..5685ce24 100644 --- a/arm9/asm/scrcmd_24.s +++ b/arm9/asm/scrcmd_24.s @@ -138,13 +138,13 @@ FUN_02045E74: ; 0x02045E74 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x4] add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x8] str r6, [r4, #0xc] add r0, r5, #0x0 diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index ce57c76c..a7879525 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -79,7 +79,7 @@ FUN_0203FF10: ; 0x0203FF10 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -123,7 +123,7 @@ FUN_0203FF10: ; 0x0203FF10 str r0, [sp, #0x10] add r0, r4, #0x0 mov r1, #0x4 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r7, r0, #0x0 ldr r1, [sp, #0x8] add r0, sp, #0x14 @@ -163,7 +163,7 @@ FUN_0203FF10: ; 0x0203FF10 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x2c] add r0, r5, #0x0 add r0, #0x80 diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index 4b62efa9..d7e850ab 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -21,7 +21,7 @@ FUN_020406CC: ; 0x020406CC ldrb r5, [r1, #0x0] add r0, r6, #0x0 bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r4, #0x0] add r1, r5, #0x0 @@ -427,7 +427,7 @@ FUN_02040A30: ; 0x02040A30 ldr r5, [r0, #0x0] add r0, r5, #0x0 bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0xf @@ -438,7 +438,7 @@ FUN_02040A30: ; 0x02040A30 str r0, [r7, #0x8] add r0, r4, #0x0 ldrb r5, [r1, #0x0] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r7, r0, #0x0 add r0, r4, #0x0 bl FUN_02023A28 diff --git a/arm9/asm/scrcmd_8.s b/arm9/asm/scrcmd_8.s index ae54897f..84b2eb30 100644 --- a/arm9/asm/scrcmd_8.s +++ b/arm9/asm/scrcmd_8.s @@ -194,7 +194,7 @@ _02041DCE: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r6, #0x0 add r7, r0, #0x0 bl PlayerName_FlatToString @@ -204,7 +204,7 @@ _02041DCE: add r3, r6, #0x0 bl FUN_020287C0 add r0, r7, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x0 diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s index bad525a0..c5065adc 100644 --- a/arm9/asm/unk_0200AA80.s +++ b/arm9/asm/unk_0200AA80.s @@ -203,7 +203,7 @@ FUN_0200ABC0: ; 0x0200ABC0 add r5, r0, #0x0 add r0, r2, #0x0 add r4, r1, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 ldr r0, [r5, #0xc] bl CopyU16ArrayToString @@ -240,7 +240,7 @@ FUN_0200AC0C: ; 0x0200AC0C add r5, r0, #0x0 add r0, r2, #0x0 add r6, r1, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r2, _0200AC5C ; =0x000001F1 ldr r3, [r5, #0x4] @@ -249,7 +249,7 @@ FUN_0200AC0C: ; 0x0200AC0C bl NewMsgDataFromNarc add r4, r0, #0x0 add r0, r7, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender cmp r0, #0x0 bne _0200AC3E ldr r2, [r5, #0xc] diff --git a/arm9/asm/unk_02025658.s b/arm9/asm/unk_02025658.s index 730b960c..4c6c4960 100644 --- a/arm9/asm/unk_02025658.s +++ b/arm9/asm/unk_02025658.s @@ -94,18 +94,18 @@ FUN_020256DC: ; 0x020256DC bl SavArray_PlayerParty_get str r0, [sp, #0x0] add r0, r7, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 add r0, r5, #0x0 add r0, #0x8 bl CopyU16StringArray add r0, r6, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender strb r0, [r5, #0x4] add r0, r6, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID str r0, [r5, #0x0] ldr r0, [sp, #0x0] mov r6, #0x0 diff --git a/arm9/asm/unk_02025954.s b/arm9/asm/unk_02025954.s index 72387fa7..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 PlayerData_GetTrainerID + 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 PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID ldr r1, [sp, #0x0] lsl r1, r1, #0x2 add r1, r7, r1 @@ -549,7 +549,7 @@ _02025CE8: cmp r0, #0x0 beq _02025D32 add r0, r1, #0x0 - bl PlayerData_init + bl PlayerProfile_init ldr r1, [sp, #0x0] add r6, r0, #0x0 add r1, r7, 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: diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s index d307ef03..6c44488d 100644 --- a/arm9/asm/unk_02028980.s +++ b/arm9/asm/unk_02028980.s @@ -2337,7 +2337,7 @@ _0202998E: bne _020299A8 ldr r1, _020299BC ; =UNK_020EE96A ldrh r1, [r1, r3] - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _020299B2 add r0, r4, #0x0 diff --git a/arm9/asm/unk_0202B870.s b/arm9/asm/unk_0202B870.s index 21cad06a..ad45d567 100644 --- a/arm9/asm/unk_0202B870.s +++ b/arm9/asm/unk_0202B870.s @@ -243,7 +243,7 @@ FUN_0202B9EC: ; 0x0202B9EC sub sp, #0xc add r5, r0, #0x0 add r4, r1, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x4e add r6, r0, #0x0 add r0, r4, #0x0 @@ -261,7 +261,7 @@ FUN_0202B9EC: ; 0x0202B9EC str r0, [sp, #0x8] add r0, r6, #0x0 add r1, r4, #0x0 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r7, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -718,7 +718,7 @@ FUN_0202BD6C: ; 0x0202BD6C str r2, [sp, #0x0] add r4, r0, #0x0 add r5, r1, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x4] ldr r0, [sp, #0x0] mov r1, #0x4c @@ -756,7 +756,7 @@ _0202BDC4: ldr r0, [r5, #0x0] str r0, [r4, #0x8] ldr r0, [sp, #0x4] - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString str r0, [r4, #0xc] ldr r0, [r7, #0x0] add r6, r6, #0x1 diff --git a/arm9/asm/unk_0202DB14.s b/arm9/asm/unk_0202DB14.s index 07631ec6..a725a6c0 100644 --- a/arm9/asm/unk_0202DB14.s +++ b/arm9/asm/unk_0202DB14.s @@ -15,7 +15,7 @@ FUN_0202DB14: ; 0x0202DB14 sub sp, #0xc str r0, [sp, #0x0] str r1, [sp, #0x4] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x8] ldr r0, _0202DBA0 ; =UNK_021C59E4 ldr r0, [r0, #0x0] @@ -73,7 +73,7 @@ _0202DB4A: ldr r2, [r2, #0x0] ldr r0, [sp, #0x8] ldr r1, [r2, r1] - bl FUN_0202393C + bl PlayerProfile_Copy _0202DB9A: add sp, #0xc pop {r4-r7, pc} @@ -137,7 +137,7 @@ FUN_0202DBE0: ; 0x0202DBE0 ldr r0, _0202DCD8 ; =UNK_021C59E4 ldr r0, [r0, #0x0] ldr r0, [r0, #0x4] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r1, _0202DCD8 ; =UNK_021C59E4 ldr r2, [r1, #0x0] lsl r1, r4, #0x2 @@ -145,7 +145,7 @@ FUN_0202DBE0: ; 0x0202DBE0 mov r1, #0xd2 lsl r1, r1, #0x2 ldr r1, [r2, r1] - bl FUN_0202393C + bl PlayerProfile_Copy mov r0, #0x68 add r5, r4, #0x0 mul r5, r0 @@ -401,7 +401,7 @@ _0202DE0A: strb r4, [r0, #0x0] ldr r0, _0202DE70 ; =UNK_021C59E4 ldr r6, [r0, #0x0] - bl PlayerData_sizeof + bl PlayerProfile_sizeof add r2, r0, #0x0 mov r0, #0xd2 add r1, r6, r7 @@ -452,7 +452,7 @@ FUN_0202DE78: ; 0x0202DE78 mov r0, #0xd2 lsl r0, r0, #0x2 ldr r0, [r1, r0] - bl PlayerData_Clear + bl PlayerProfile_Clear ldr r0, _0202DEA0 ; =UNK_021C59E4 mov r2, #0x0 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_0202E29C.s b/arm9/asm/unk_0202E29C.s index 1c18f3e6..06da82b7 100644 --- a/arm9/asm/unk_0202E29C.s +++ b/arm9/asm/unk_0202E29C.s @@ -968,7 +968,7 @@ _0202E9BA: add r0, r3, #0x0 bl FUN_0202EF84 add r1, r4, #0x0 - bl FUN_0202393C + bl PlayerProfile_Copy pop {r4-r6, pc} _0202E9D2: add r5, r5, #0x1 @@ -1092,12 +1092,12 @@ FUN_0202EA9C: ; 0x0202EA9C ble _0202EAC2 bl ErrorHandling _0202EAC2: - bl PlayerData_sizeof + bl PlayerProfile_sizeof cmp r0, #0x20 beq _0202EACE bl ErrorHandling _0202EACE: - bl PlayerData_sizeof + bl PlayerProfile_sizeof add r1, r5, #0x0 add r2, r0, #0x0 add r0, r4, #0x0 @@ -1113,7 +1113,7 @@ _0202EACE: add r1, #0x30 bl MI_CpuCopy8 add r0, r4, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID str r0, [r5, #0x0] bl FUN_02033534 strb r0, [r5, #0x4] @@ -1136,7 +1136,7 @@ _0202EB24: ldr r4, [r1, #0x8] ldr r1, _0202EB70 ; =0x00000CC4 add r5, r4, r1 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID ldr r1, _0202EB70 ; =0x00000CC4 str r0, [r4, r1] bl FUN_02033534 diff --git a/arm9/asm/unk_02031734.s b/arm9/asm/unk_02031734.s index c7defec6..e28c8c38 100644 --- a/arm9/asm/unk_02031734.s +++ b/arm9/asm/unk_02031734.s @@ -69,7 +69,7 @@ FUN_02031734: ; 0x02031734 ldr r0, [r0, #0x0] str r5, [r0, #0x28] add r0, r5, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r1, _020317BC ; =UNK_021C5A00 ldr r2, [r1, #0x0] str r0, [r2, #0x2c] @@ -3810,7 +3810,7 @@ FUN_0203346C: ; 0x0203346C push {r3-r5, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr bl FUN_02030F40 cmp r0, #0x0 beq _02033482 diff --git a/arm9/asm/unk_02033874.s b/arm9/asm/unk_02033874.s index 3b2b5eaf..e48fdc8a 100644 --- a/arm9/asm/unk_02033874.s +++ b/arm9/asm/unk_02033874.s @@ -278,7 +278,7 @@ _02033AA6: bne _02033AEC ldr r1, [sp, #0x4] add r0, r6, #0x0 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString str r0, [sp, #0xc] ldr r2, [sp, #0xc] add r0, r4, #0x0 @@ -287,14 +287,14 @@ _02033AA6: ldr r0, [sp, #0xc] bl String_dtor add r0, r6, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 mov r2, #0x8 bl FUN_020282E8 add r0, r6, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 @@ -311,14 +311,14 @@ _02033AEC: cmp r0, #0x2 bne _02033B22 add r0, r6, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 mov r2, #0x8 bl FUN_020282E8 add r0, r6, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 8df57f52..093c06e6 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -669,7 +669,7 @@ _02035526: str r0, [sp, #0x20] ldr r0, [sp, #0x1c] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 add r0, r6, #0x0 mov r1, #0x0 @@ -775,8 +775,8 @@ _02035614: bl FUN_02019220 ldr r0, [sp, #0x1c] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender add r3, r0, #0x0 add r0, r4, #0x0 add r4, #0x30 @@ -1666,7 +1666,7 @@ FUN_02035D34: ; 0x02035D34 bl FUN_02024DA0 str r0, [sp, #0x0] ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x4] ldr r0, [r5, #0xc] bl SavArray_Flags_get @@ -1851,7 +1851,7 @@ _02035ECC: bl SavArray_PlayerParty_get str r0, [r7, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r7, #0x4] mov r0, #0x1 strb r0, [r7, #0x11] @@ -1880,7 +1880,7 @@ _02035ECC: add r0, r7, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r7, #0x0 bl FUN_0207C2A4 @@ -1903,7 +1903,7 @@ _02035F4A: bl SavArray_PlayerParty_get str r0, [r7, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r7, #0x4] mov r1, #0x1 add r0, r6, #0x0 @@ -1928,7 +1928,7 @@ _02035F4A: add r0, r7, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r7, #0x0 bl FUN_0207C2A4 @@ -1960,7 +1960,7 @@ _02035FD0: bl SavArray_PlayerParty_get str r0, [r7, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r7, #0x4] mov r1, #0x1 add r0, r6, #0x0 @@ -1985,7 +1985,7 @@ _02035FD0: add r0, r7, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r7, #0x0 bl FUN_0207C2A4 @@ -2091,7 +2091,7 @@ _020360EA: bl FUN_0206F158 add r7, r0, #0x0 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r1, _0203627C ; =UNK_020F2A90 add r0, r7, #0x0 mov r2, #0xb @@ -2408,7 +2408,7 @@ _0203638A: bl FUN_02025838 str r0, [r5, #0x8] ldr r0, [r6, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r5, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -2507,7 +2507,7 @@ _02036474: bl FUN_02025838 str r0, [r5, #0x8] ldr r0, [r6, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r5, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -3000,7 +3000,7 @@ FUN_0203684C: ; 0x0203684C bl FUN_02025838 str r0, [r5, #0x8] ldr r0, [r6, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r5, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -3529,7 +3529,7 @@ FUN_02036CEC: ; 0x02036CEC bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -3659,7 +3659,7 @@ FUN_02036E08: ; 0x02036E08 cmp r0, #0x0 ldr r0, [r4, #0xc] bne _02036E9E - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x28] ldr r0, [r4, #0xc] bl FUN_02079C70 @@ -3696,7 +3696,7 @@ FUN_02036E08: ; 0x02036E08 bl FUN_0206C700 b _02036EF2 _02036E9E: - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x38] ldr r0, [r4, #0xc] bl FUN_02079C70 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index d8ae2ca5..48d33a87 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -406,7 +406,7 @@ FUN_0203797C: ; 0x0203797C bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] add r0, r4, #0x0 add r0, #0x21 @@ -726,7 +726,7 @@ FUN_02037C00: ; 0x02037C00 bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] mov r0, #0x1 strb r0, [r4, #0x11] @@ -752,7 +752,7 @@ FUN_02037C00: ; 0x02037C00 add r0, r4, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -779,7 +779,7 @@ FUN_02037C7C: ; 0x02037C7C add r4, r0, #0x0 bl MI_CpuFill8 add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] add r0, r5, #0x0 bl SavArray_PlayerParty_get @@ -807,7 +807,7 @@ FUN_02037C7C: ; 0x02037C7C add r0, r4, #0x0 bl FUN_0207B000 add r0, r5, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -831,7 +831,7 @@ FUN_02037CF0: ; 0x02037CF0 bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] mov r0, #0x1 strb r0, [r4, #0x11] @@ -851,7 +851,7 @@ FUN_02037CF0: ; 0x02037CF0 add r0, r4, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -1084,7 +1084,7 @@ FUN_02037EF8: ; 0x02037EF8 add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_020377AC - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r5, #0x0 bl FUN_02037EE8 @@ -1244,13 +1244,13 @@ FUN_0203800C: ; 0x0203800C str r7, [r4, #0x4] str r0, [r4, #0x8] add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] add r0, r5, #0x0 bl FUN_02029FC8 str r0, [r4, #0x10] add r0, r5, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x14] ldr r0, [sp, #0x18] str r6, [r4, #0x18] @@ -1375,7 +1375,7 @@ FUN_02038144: ; 0x02038144 add r4, r1, #0x0 add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r5, #0x4] ldr r0, [r4, #0xc] bl SavArray_PlayerParty_get @@ -1388,7 +1388,7 @@ FUN_02038144: ; 0x02038144 bl FUN_02029AFC str r0, [r5, #0x14] ldr r0, [r4, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r5, #0x18] ldr r0, [r4, #0xc] bl FUN_02024DA0 @@ -1405,7 +1405,7 @@ FUN_02038144: ; 0x02038144 ldr r0, [r4, #0xc] bl FUN_02029FC8 str r0, [r5, #0x20] - bl PlayerData_sizeof + bl PlayerProfile_sizeof add r1, r0, #0x0 mov r0, #0x20 bl AllocFromHeap @@ -1535,7 +1535,7 @@ _02038288: bl FUN_020690E4 str r0, [r4, #0x4c] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x5c] mov r0, #0x1 str r0, [r4, #0x58] @@ -1603,7 +1603,7 @@ _020382F6: lsl r2, r0, #0x10 bl FUN_0201681C ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x24] ldr r0, [r5, #0xc] bl FUN_02079C70 @@ -1713,7 +1713,7 @@ FUN_020383F8: ; 0x020383F8 ldr r0, [r0, #0x0] str r0, [r4, #0x4] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x8] ldr r1, _02038428 ; =UNK_020F2C94 add r0, r5, #0x0 @@ -1736,7 +1736,7 @@ FUN_0203842C: ; 0x0203842C ldr r0, [r5, #0x7c] str r0, [r4, #0x4] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x8] ldr r0, [r5, #0xc] bl FUN_02029FC8 @@ -1897,7 +1897,7 @@ _02038572: ; jump table (using 16-bit offset) .short _020385BC - _02038572 - 2; case 6 _02038580: ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r1, [r4, #0xc] add r1, #0x1c bl CopyPlayerName @@ -1952,7 +1952,7 @@ FUN_020385CC: ; 0x020385CC ldr r0, [sp, #0x30] str r0, [r4, #0x8] ldr r0, [r7, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x0] ldr r2, [sp, #0x8] ldr r3, [sp, #0xc] @@ -2107,10 +2107,10 @@ FUN_020386E0: ; 0x020386E0 bl FUN_02029AFC str r0, [r4, #0x18] ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x1c] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x24] ldr r0, [r5, #0xc] bl FUN_02029FC8 @@ -2170,7 +2170,7 @@ FUN_02038790: ; 0x02038790 bl FUN_02023788 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x10] ldr r0, [r5, #0xc] bl FUN_020286EC @@ -2308,10 +2308,10 @@ _020388CC: bl FUN_020613CC str r5, [sp, #0x0] ldr r0, [r4, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x4] ldr r0, [r4, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x8] ldr r1, [r4, #0x1c] add r0, r4, #0x0 @@ -2373,7 +2373,7 @@ _02038956: cmp r0, #0x0 bne _020389C6 ldr r0, [r4, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr str r0, [sp, #0x0] bl FUN_020126FC str r0, [sp, #0x4] @@ -2395,7 +2395,7 @@ _02038956: add r0, r4, #0x0 bl FUN_02061A8C ldr r0, [r4, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr ldr r1, [r5, #0x0] bl SetCoins add r0, r7, #0x0 @@ -2426,7 +2426,7 @@ FUN_020389CC: ; 0x020389CC bl FUN_02046528 add r5, r0, #0x0 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x0] mov r0, #0x20 add r1, r0, #0x0 @@ -2434,7 +2434,7 @@ FUN_020389CC: ; 0x020389CC add r4, r0, #0x0 str r4, [r4, #0xc] ldr r0, [r5, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr bl CheckCoins str r0, [r4, #0x0] bl FUN_020126FC diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s index 727dd5ea..33ce011d 100644 --- a/arm9/asm/unk_0204653C.s +++ b/arm9/asm/unk_0204653C.s @@ -1830,7 +1830,7 @@ _02047400: bl GetPartyMonByIndex add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [sp, #0x4] add r0, r6, #0x0 mov r1, #0x5 @@ -1874,7 +1874,7 @@ _02047470: bl GetPartyMonByIndex add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [sp, #0x8] add r0, r6, #0x0 mov r1, #0x5 diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 45743adb..0936ad10 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -85,7 +85,7 @@ _02047748: add r4, r7, #0x0 _0204775C: add r0, r5, #0x0 - bl PlayerData_init + bl PlayerProfile_init add r1, r4, #0x0 add r1, #0xf8 add r6, r6, #0x1 @@ -182,10 +182,10 @@ FUN_02047814: ; 0x02047814 add r5, r1, #0x0 add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x10] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr mov r1, #0x1 str r0, [sp, #0x14] add r0, r6, #0x0 @@ -203,7 +203,7 @@ FUN_02047814: ; 0x02047814 bl String_ctor add r7, r0, #0x0 ldr r0, [sp, #0x10] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r2, r0, #0x0 mov r1, #0x1 eor r1, r2 @@ -222,14 +222,14 @@ FUN_02047814: ; 0x02047814 ldr r0, [sp, #0x18] bl DestroyMsgData ldr r0, [sp, #0x10] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r2, r0, #0x0 add r0, r4, #0x0 add r0, #0xf8 mov r1, #0x1 ldr r0, [r0, #0x0] eor r1, r2 - bl PlayerData_SetTrainerGender + bl PlayerProfile_SetTrainerGender add r0, r4, #0x0 add r1, r5, #0x0 bl FUN_0204806C @@ -446,7 +446,7 @@ _02047A54: add r1, #0xf8 ldr r1, [r1, #0x0] add r0, r6, #0x0 - bl FUN_0202393C + bl PlayerProfile_Copy pop {r4-r6, pc} thumb_func_start FUN_02047A64 @@ -468,7 +468,7 @@ FUN_02047A78: ; 0x02047A78 add r4, r1, #0x0 add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 ldr r0, [r4, #0xc] bl SavArray_PlayerParty_get @@ -483,7 +483,7 @@ FUN_02047A78: ; 0x02047A78 bl FUN_02029EF8 str r0, [sp, #0x8] ldr r0, [r4, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0xc] ldr r0, [r4, #0xc] bl FUN_02034E30 @@ -612,7 +612,7 @@ FUN_02047BC0: ; 0x02047BC0 ldr r0, [r0, #0xc] str r1, [sp, #0x0] add r7, r2, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] @@ -632,7 +632,7 @@ FUN_02047BC0: ; 0x02047BC0 str r0, [sp, #0x8] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x4] mov r0, #0x15 mov r1, #0x6 @@ -783,7 +783,7 @@ FUN_02047D48: ; 0x02047D48 str r1, [sp, #0x0] str r2, [sp, #0x4] add r7, r3, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x20] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] @@ -799,7 +799,7 @@ FUN_02047D48: ; 0x02047D48 str r0, [sp, #0x14] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x10] ldr r0, [sp, #0x0] mov r1, #0x6 @@ -953,7 +953,7 @@ _02047E2C: bl FUN_02023A28 add r4, r0, #0x0 ldr r0, [sp, #0x20] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r4, #0x0 mov r2, #0x1 bl FUN_020536D0 @@ -963,7 +963,7 @@ _02047E2C: add r0, r5, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 add r0, r5, #0x0 add r0, #0x3c @@ -1010,7 +1010,7 @@ FUN_02047F38: ; 0x02047F38 add r5, r1, #0x0 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 ldr r0, [r5, #0xc] bl SavArray_PlayerParty_get @@ -1029,7 +1029,7 @@ FUN_02047F38: ; 0x02047F38 add r0, #0xf8 ldr r0, [r0, #0x0] add r1, r6, #0x0 - bl FUN_0202393C + bl PlayerProfile_Copy ldr r0, [r4, #0x4] add r1, r7, #0x0 bl CopyPlayerParty @@ -1056,7 +1056,7 @@ FUN_02047FA4: ; 0x02047FA4 add r5, r1, #0x0 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r0, [r5, #0xc] bl SavArray_PlayerParty_get ldr r0, [r5, #0xc] @@ -1233,14 +1233,14 @@ FUN_020480E4: ; 0x020480E4 add r4, r0, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r4, #0x0 add r1, #0x29 strb r0, [r1, #0x0] add r0, r4, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x3c diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index c937f2a5..3aa16280 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -97,7 +97,7 @@ _0204817A: bl FUN_02019150 add r0, r5, #0x0 bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r4, #0x20] mov r1, #0x0 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 78a117e8..36b0d359 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -268,7 +268,7 @@ FUN_02048694: ; 0x02048694 bl SavArray_Flags_get add r6, r0, #0x0 ldr r0, [r4, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x0] ldr r0, [r4, #0xc] bl FUN_02034E30 @@ -282,17 +282,17 @@ FUN_02048694: ; 0x02048694 bl FUN_0205ED0C str r0, [r5, #0x0] ldr r0, [r4, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r5, #0x4] ldr r0, [r4, #0xc] bl SavArray_PlayerParty_get str r0, [r5, #0x8] ldr r0, [r4, #0xc] - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [r5, #0xc] ldr r0, [r4, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender str r0, [r5, #0x10] add r0, r6, #0x0 bl FUN_0205ED0C @@ -394,7 +394,7 @@ FUN_020487E4: ; 0x020487E4 add r5, r0, #0x0 ldr r0, [r5, #0xc] add r4, r1, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r6, r0, #0x0 mov r0, #0x1a mov r1, #0xc7 @@ -469,7 +469,7 @@ FUN_02048864: ; 0x02048864 bl FUN_0200AA80 add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 add r0, r6, #0x0 mov r1, #0x0 @@ -491,7 +491,7 @@ _020488B4: add r0, r7, #0x0 bl DestroyMsgData ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 add r0, r4, #0x0 ldr r1, [r4, #0x2c] diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 9af7ff73..4f852dbe 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -268,8 +268,8 @@ FUN_02048AE4: ; 0x02048AE4 bl FUN_02057380 str r0, [r5, #0x34] ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_02034E30 @@ -321,8 +321,8 @@ FUN_02048B50: ; 0x02048B50 bl FUN_02034E20 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender add r2, r0, #0x0 ldr r0, [r5, #0x34] add r1, r4, #0x0 @@ -1999,13 +1999,13 @@ _02049884: mov r2, #0x3 bl FUN_020545B8 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x24 bl FUN_02054608 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 add r0, r4, #0x0 ldr r1, [r4, #0x34] diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s index 7614739d..d66ec174 100644 --- a/arm9/asm/unk_0204A01C.s +++ b/arm9/asm/unk_0204A01C.s @@ -37,7 +37,7 @@ FUN_0204A048: ; 0x0204A048 add r0, r6, #0x0 add r7, r2, #0x0 str r3, [sp, #0x10] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x14] add r0, r6, #0x0 bl SavArray_PlayerParty_get @@ -94,7 +94,7 @@ FUN_0204A0C8: ; 0x0204A0C8 add r0, r4, #0x0 add r5, r2, #0x0 add r7, r3, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x8] add r0, r4, #0x0 bl SavArray_PlayerParty_get diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index 0d82bdf0..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 PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender mov r1, #0x0 str r1, [sp, #0x0] str r0, [sp, #0x4] @@ -4714,7 +4714,7 @@ FUN_0204EEBC: ; 0x0204EEBC beq _0204EF44 mov r0, #0xf lsl r4, r5, #0x2 - bl PlayerData_init + 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 PlayerData_NameAndOTIDMatchPlayer + bl PlayerProfile_NameAndOTIDMatchPlayer cmp r0, #0x1 bne _0204F41A ldrb r0, [r5, #0x2] @@ -5552,7 +5552,7 @@ _0204F58C: mov r0, #0x29 lsl r0, r0, #0x4 ldr r0, [r2, r0] - bl PlayerData_NameAndOTIDMatchPlayer + 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 PlayerData_init + bl PlayerProfile_init add r4, r0, #0x0 mov r0, #0x14 mov r1, #0xf @@ -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 PlayerData_GetPlayerName_NewString + 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 PlayerData_init + 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] diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 5993eeac..74026711 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -30,7 +30,7 @@ FUN_02050E48: ; 0x02050E48 add r4, r0, #0x0 bl MI_CpuFill8 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -41,7 +41,7 @@ FUN_02050E48: ; 0x02050E48 bl FUN_02079C70 str r0, [r4, #0x2c] add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] ldr r0, [sp, #0x0] str r0, [r4, #0x0] @@ -86,7 +86,7 @@ FUN_02050ED4: ; 0x02050ED4 bl MI_CpuFill8 ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] ldr r0, [r5, #0x24] add r0, #0xac @@ -1211,7 +1211,7 @@ FUN_020517C0: ; 0x020517C0 bl FUN_020545B8 ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02054608 @@ -1222,7 +1222,7 @@ _020517F2: _020517F8: ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 add r0, r4, #0x0 add r1, r6, #0x0 @@ -2161,13 +2161,13 @@ _02051EF2: mov r2, #0x3 bl FUN_020545B8 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x8 bl FUN_02054608 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 add r0, r4, #0x0 ldr r1, [r4, #0x4] diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index ab0f4ac4..f620cb87 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -205,7 +205,7 @@ _0205211E: str r5, [r4, #0x0] str r6, [r4, #0x4] add r0, r6, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x8] add r0, r4, #0x0 bl FUN_02052E1C @@ -1025,10 +1025,10 @@ FUN_02052734: ; 0x02052734 cmp r5, r0 beq _02052780 add r0, r7, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r5, r0, #0x0 add r0, r7, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 lsl r1, r1, #0x18 add r0, r5, #0x0 @@ -1177,7 +1177,7 @@ _02052852: asr r4, r0, #0x7 b _02052872 _0205286C: - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r4, r0, #0x0 _02052872: ldrb r0, [r5, #0x1c] @@ -1400,7 +1400,7 @@ FUN_02052A10: ; 0x02052A10 _02052A24: sub r0, r1, #0x1 bl FUN_0202EF84 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 cmp r4, #0x18 bhi _02052AFA @@ -1542,14 +1542,14 @@ _02052B32: bl FUN_0202DFA4 add r7, r0, #0x0 beq _02052B60 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID lsl r1, r4, #0x2 str r0, [r5, r1] add r0, r7, #0x0 bl FUN_02023A28 str r0, [sp, #0x0] add r0, r7, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender lsl r1, r0, #0x7 ldr r0, [sp, #0x0] orr r1, r0 @@ -1691,7 +1691,7 @@ _02052C46: bl FUN_02023A28 add r4, r0, #0x0 ldr r0, [r5, #0x8] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r4, #0x0 mov r2, #0x2 bl FUN_020536D0 @@ -1964,7 +1964,7 @@ FUN_02052E38: ; 0x02052E38 lsl r1, r1, #0x2 str r0, [r4, r1] ldr r0, [r4, #0x8] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r5, r0, #0x0 ldr r0, [r4, #0x8] bl FUN_02023A28 diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s index a4d5e2f6..d46e356e 100644 --- a/arm9/asm/unk_02052EE8.s +++ b/arm9/asm/unk_02052EE8.s @@ -345,7 +345,7 @@ _02053166: bl FUN_02023A28 strb r0, [r5, #0x14] ldr r0, [sp, #0xc] - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r1, r0, #0x0 ldr r0, [sp, #0x8] bl FUN_02025614 diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s index e844efec..73072399 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -826,8 +826,8 @@ FUN_02053D0C: ; 0x02053D0C bl FUN_0201B6C8 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 add r0, r4, #0x4 add r2, r6, #0x0 diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index abb8b529..631cedd6 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -297,7 +297,7 @@ FUN_0205D024: ; 0x0205D024 bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] ldr r0, [r5, #0xc] bl FUN_02022504 @@ -780,7 +780,7 @@ FUN_0205D400: ; 0x0205D400 bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -1433,7 +1433,7 @@ _0205D926: mov r2, #0x3 bl FUN_020545B8 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r5, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 @@ -1511,7 +1511,7 @@ FUN_0205D9A8: ; 0x0205D9A8 bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] ldr r0, [r5, #0xc] bl FUN_02022504 @@ -1786,7 +1786,7 @@ FUN_0205DBF0: ; 0x0205DBF0 str r0, [r4, #0x10] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0xb str r1, [sp, #0x0] ldrh r2, [r5, #0x28] diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s index 8d8bb8ba..73dc567c 100644 --- a/arm9/asm/unk_0205F7A0.s +++ b/arm9/asm/unk_0205F7A0.s @@ -71,8 +71,8 @@ _0205F806: _0205F812: ldr r0, [sp, #0x0] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender str r0, [r5, #0xc] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] diff --git a/arm9/asm/unk_0205FA2C.s b/arm9/asm/unk_0205FA2C.s index b34d5f4a..fc7d7a17 100644 --- a/arm9/asm/unk_0205FA2C.s +++ b/arm9/asm/unk_0205FA2C.s @@ -26,7 +26,7 @@ FUN_0205FA2C: ; 0x0205FA2C add r4, r0, #0x0 bl MI_CpuFill8 add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] add r0, r6, #0x0 bl SavArray_PlayerParty_get @@ -159,7 +159,7 @@ FUN_0205FB34: ; 0x0205FB34 add r4, r0, #0x0 bl MI_CpuFill8 add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] add r0, r5, #0x0 bl SavArray_PlayerParty_get @@ -188,7 +188,7 @@ FUN_0205FB34: ; 0x0205FB34 add r0, r4, #0x0 bl FUN_0207B000 add r0, r5, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 diff --git a/arm9/asm/unk_02060344.s b/arm9/asm/unk_02060344.s index e4d492db..8f67bca3 100644 --- a/arm9/asm/unk_02060344.s +++ b/arm9/asm/unk_02060344.s @@ -14,7 +14,7 @@ FUN_02060344: ; 0x02060344 bl FUN_02029ACC add r4, r0, #0x0 add r0, r5, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r0, [sp, #0x0] mov r1, #0xa @@ -24,7 +24,7 @@ FUN_02060344: ; 0x02060344 _0206036A: add r0, r7, #0x0 add r1, r5, #0x0 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 beq _020603A4 add r0, r5, #0x0 diff --git a/arm9/asm/unk_020603B0.s b/arm9/asm/unk_020603B0.s index 93cbed7e..7550dc1d 100644 --- a/arm9/asm/unk_020603B0.s +++ b/arm9/asm/unk_020603B0.s @@ -219,14 +219,14 @@ _020604D0: add r2, r6, #0x0 bl FUN_0202AAFC ldr r0, [sp, #0x10] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x18] mov r0, #0x4 bl AllocMonZeroed str r0, [sp, #0x1c] bl ZeroMonData ldr r0, [sp, #0x18] - bl PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf mov r1, #0x0 str r1, [sp, #0x0] str r1, [sp, #0x4] diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index aafce80a..11145e7b 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -1643,11 +1643,11 @@ FUN_02061850: ; 0x02061850 push {r3-r5, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl PlayerData_sizeof + bl PlayerProfile_sizeof str r0, [r5, #0x0] add r0, r4, #0x0 add r1, r5, #0x4 - bl FUN_0202393C + bl PlayerProfile_Copy pop {r3-r5, pc} .balign 4 @@ -1659,7 +1659,7 @@ FUN_02061868: ; 0x02061868 add r5, r1, #0x0 bl MOD06_02248B60 add r4, r0, #0x0 - bl PlayerData_sizeof + bl PlayerProfile_sizeof ldr r1, [r4, #0x0] cmp r1, r0 beq _02061884 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index d17df287..5179b667 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -100,11 +100,11 @@ FUN_020625EC: ; 0x020625EC lsl r1, r1, #0x4 str r0, [r4, r1] add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02024FF4 strh r0, [r4, #0x1a] add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025084 strh r0, [r4, #0x1c] str r4, [r7, #0x8] diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s index cc8744cb..431828e8 100644 --- a/arm9/asm/unk_0206367C.s +++ b/arm9/asm/unk_0206367C.s @@ -232,7 +232,7 @@ FUN_0206384C: ; 0x0206384C cmp r6, r4 beq _02063882 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x20 add r5, #0x98 str r1, [sp, #0x0] diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s index de819682..28b6db5b 100644 --- a/arm9/asm/unk_02063948.s +++ b/arm9/asm/unk_02063948.s @@ -210,9 +210,9 @@ FUN_02063A9C: ; 0x02063A9C pop {r4, pc} _02063AAE: ldr r0, [r1, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x1 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063AC2 mov r0, #0x2 @@ -294,9 +294,9 @@ FUN_02063B40: ; 0x02063B40 pop {r4, pc} _02063B52: ldr r0, [r1, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x2 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063B66 mov r0, #0x2 @@ -398,9 +398,9 @@ FUN_02063C14: ; 0x02063C14 pop {r4, pc} _02063C26: ldr r0, [r1, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x4 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063C3A mov r0, #0x2 @@ -501,9 +501,9 @@ FUN_02063CE0: ; 0x02063CE0 pop {r4, pc} _02063CF2: ldr r0, [r1, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x5 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063D06 mov r0, #0x2 @@ -587,9 +587,9 @@ FUN_02063D88: ; 0x02063D88 pop {r4, pc} _02063D9A: ldr r0, [r1, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x3 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063DAE mov r0, #0x2 @@ -673,9 +673,9 @@ FUN_02063E30: ; 0x02063E30 pop {r4, pc} _02063E42: ldr r0, [r1, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x0 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063E56 mov r0, #0x2 @@ -759,9 +759,9 @@ FUN_02063ED8: ; 0x02063ED8 pop {r4, pc} _02063EEA: ldr r0, [r1, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x7 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063EFE mov r0, #0x2 @@ -845,9 +845,9 @@ FUN_02063F80: ; 0x02063F80 pop {r4, pc} _02063F92: ldr r0, [r1, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x6 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063FA6 mov r0, #0x2 diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s index 5fb820cc..e645d179 100644 --- a/arm9/asm/unk_02064E90.s +++ b/arm9/asm/unk_02064E90.s @@ -16,7 +16,7 @@ FUN_02064E90: ; 0x02064E90 ldr r5, [sp, #0xbc] bl FUN_020377AC str r0, [sp, #0x20] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r0, [sp, #0x20] bl FUN_02029FC8 @@ -36,16 +36,16 @@ FUN_02064E90: ; 0x02064E90 mov r1, #GAME_VERSION bl FUN_02065154 add r0, r7, #0x0 - bl PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf str r0, [sp, #0x28] add r0, r7, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender str r0, [sp, #0x2c] add r0, r7, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr str r0, [sp, #0x30] add r0, r7, #0x0 - bl PlayerData_GetMoney + bl PlayerProfile_GetMoney str r0, [sp, #0x34] ldr r0, [r6, #0xc] bl FUN_02024DA0 @@ -71,7 +71,7 @@ FUN_02064E90: ; 0x02064E90 str r5, [sp, #0xc] bl FUN_02065178 ldr r0, [sp, #0x20] - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [sp, #0x40] add r0, r6, #0x0 add r1, sp, #0x90 @@ -520,7 +520,7 @@ FUN_020652AC: ; 0x020652AC _020652CA: ldr r0, [sp, #0x0] add r1, r4, #0x0 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 beq _020652E6 lsl r0, r4, #0x2 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 51d345ca..452513ab 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -66,11 +66,11 @@ FUN_020653EC: ; 0x020653EC mov r1, #0xff add r6, r0, #0x0 strb r1, [r4, #0x1a] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02024FF4 strb r0, [r4, #0x16] add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025084 strh r0, [r4, #0x14] add r0, r4, #0x0 @@ -2389,7 +2389,7 @@ _02066676: lsl r0, r0, #0x2 ldr r0, [r5, r0] bl FUN_020377AC - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] mov r0, #0x5b lsl r0, r0, #0x2 diff --git a/arm9/asm/unk_02066840.s b/arm9/asm/unk_02066840.s index c8a523c6..52fefe54 100644 --- a/arm9/asm/unk_02066840.s +++ b/arm9/asm/unk_02066840.s @@ -13,7 +13,7 @@ FUN_02066840: ; 0x02066840 add r6, r0, #0x0 str r1, [sp, #0x0] add r7, r2, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r6, #0x0 bl FUN_02029AFC @@ -26,13 +26,13 @@ FUN_02066840: ; 0x02066840 mov r2, #0xe4 bl MI_CpuFill8 add r0, r4, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r7, #0x0 add r1, #0xa8 mov r2, #0x10 bl MI_CpuCopy8 add r0, r4, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r1, r7, #0x0 add r1, #0xbc str r0, [r1, #0x0] @@ -57,7 +57,7 @@ FUN_02066840: ; 0x02066840 add r1, #0xbb strb r0, [r1, #0x0] add r0, r4, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r7, #0x0 add r1, #0xc8 lsl r0, r0, #0x18 diff --git a/arm9/asm/unk_0206BF90.s b/arm9/asm/unk_0206BF90.s index 36b997de..b6551933 100644 --- a/arm9/asm/unk_0206BF90.s +++ b/arm9/asm/unk_0206BF90.s @@ -76,10 +76,10 @@ FUN_0206C004: ; 0x0206C004 thumb_func_start FUN_0206C008 FUN_0206C008: ; 0x0206C008 - ldr r3, _0206C00C ; =PlayerData_sizeof + ldr r3, _0206C00C ; =PlayerProfile_sizeof bx r3 .balign 4 -_0206C00C: .word PlayerData_sizeof +_0206C00C: .word PlayerProfile_sizeof thumb_func_start FUN_0206C010 FUN_0206C010: ; 0x0206C010 @@ -394,7 +394,7 @@ _0206C210: add r0, #0xf8 ldr r0, [r0, #0x0] add r1, r4, #0x0 - bl FUN_0202393C + bl PlayerProfile_Copy mov r0, #0x1 pop {r4, pc} .balign 4 @@ -418,7 +418,7 @@ _0206C238: mov r0, #0x0 pop {r4, pc} _0206C246: - bl PlayerData_sizeof + bl PlayerProfile_sizeof add r4, #0x20 add r2, r0, #0x0 mov r0, #0x19 @@ -990,12 +990,12 @@ FUN_0206C66C: ; 0x0206C66C add r4, r2, #0x0 add r6, r0, #0x0 add r5, r1, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 add r0, r4, #0x0 bl CopyU16StringArray add r0, r6, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID str r0, [r4, #0x10] add r0, r6, #0x0 bl FUN_02023A70 @@ -1004,7 +1004,7 @@ FUN_0206C66C: ; 0x0206C66C bl FUN_02023A68 strb r0, [r4, #0x15] add r0, r6, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender strb r0, [r4, #0x16] mov r0, #0x0 add r1, r4, #0x0 diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s index 87dc3013..264f9294 100644 --- a/arm9/asm/unk_0206E2F0.s +++ b/arm9/asm/unk_0206E2F0.s @@ -127,7 +127,7 @@ FUN_0206E394: ; 0x0206E394 thumb_func_start FUN_0206E39C FUN_0206E39C: ; 0x0206E39C push {r3, lr} - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr bl CheckCoins pop {r3, pc} diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 61d64181..5dd4a4a5 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -4778,13 +4778,13 @@ FUN_0207C2A4: ; 0x0207C2A4 add r4, r1, #0x0 add r5, r0, #0x0 add r0, r4, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr str r0, [r5, #0x8] add r0, r4, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID str r0, [r5, #0xc] add r0, r4, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender strb r0, [r5, #0x10] pop {r3-r5, pc} diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index f234ac67..496486d7 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -1711,14 +1711,14 @@ FUN_02080AE4: ; 0x02080AE4 add r5, r0, #0x0 add r0, r4, #0x0 add r6, r2, #0x0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID str r0, [sp, #0x4] add r0, r4, #0x0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender str r0, [sp, #0x0] add r0, r4, #0x0 add r1, r6, #0x0 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x7 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 4d468bc2..55901920 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -112,10 +112,10 @@ _02080CB4: add r7, r0, #0x0 add r0, r6, #0x0 bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0xb str r0, [sp, #0x0] - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r5, r0, #0x0 mov r1, #0x0 add r0, sp, #0x4 @@ -131,7 +131,7 @@ _02080CB4: bl FUN_02027E24 str r0, [sp, #0x18] ldr r0, [r6, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x1c] add r0, sp, #0x4 bl FUN_02081214 @@ -943,7 +943,7 @@ _02081304: ldr r1, [r6, #0xc] bl StringCopy ldr r0, [r6, #0x10] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender mov r1, #0x42 lsl r1, r1, #0x2 strb r0, [r4, r1] @@ -962,7 +962,7 @@ _02081304: cmp r0, #0x0 ldr r0, [r6, #0x10] bne _0208138E - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender cmp r0, #0x0 bne _02081384 mov r1, #0xba @@ -977,7 +977,7 @@ _02081384: strh r1, [r4, r0] b _020813A8 _0208138E: - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender cmp r0, #0x0 bne _020813A0 mov r0, #0x45 @@ -2262,7 +2262,7 @@ _02081D3C: _02081D4C: add r0, r5, #0x0 bl FUN_0202DFA4 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r4, r5 strb r0, [r1, r7] ldrb r0, [r4, r6] diff --git a/arm9/asm/unk_02085338.s b/arm9/asm/unk_02085338.s index 410774f4..22c3f7ab 100644 --- a/arm9/asm/unk_02085338.s +++ b/arm9/asm/unk_02085338.s @@ -31,7 +31,7 @@ FUN_02085338: ; 0x02085338 strb r0, [r4, #0x2] add r0, r6, #0x0 strb r1, [r4, #0x3] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025084 str r0, [r4, #0x8] cmp r5, #0x2 diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index 959d633f..b783b730 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -433,7 +433,7 @@ FUN_020857F8: ; 0x020857F8 bl FUN_020856F0 str r0, [r4, #0x10] ldr r0, [r5, #0x10] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr ldr r1, [r4, #0x10] str r0, [r1, #0x4] ldrh r0, [r5, #0x0] diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index dc27000d..410345d4 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -756,7 +756,7 @@ _02085F5E: str r0, [r4, #0x8] bl memset add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr ldr r1, [r4, #0x8] str r0, [r1, #0x24] ldr r0, [r4, #0x8] diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 1b7a5cc4..4945183c 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -275,7 +275,7 @@ _020862D6: add r6, r0, #0x0 ldr r5, [r4, #0xc] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r0, [r6, #0x1c] ldr r0, [r0, #0x0] @@ -323,7 +323,7 @@ _0208633A: add r7, r0, #0x0 add r0, r6, #0x0 bl FUN_020377AC - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x0] mov r0, #0xb mov r1, #0x1 diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index e07e51d7..46f48b7a 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -60,7 +60,7 @@ FUN_02087D00: ; 0x02087D00 bl FUN_02028048 str r0, [r7, #0x8] add r0, r4, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r7, #0xc] add r0, r4, #0x0 bl SavArray_PlayerParty_get @@ -69,7 +69,7 @@ FUN_02087D00: ; 0x02087D00 bl FUN_0206F158 str r0, [r7, #0x14] add r0, r4, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r7, #0x18] add r0, r5, #0x0 bl FUN_02027E5C diff --git a/arm9/asm/unk_02088814.s b/arm9/asm/unk_02088814.s index a0d2abc6..1e955a77 100644 --- a/arm9/asm/unk_02088814.s +++ b/arm9/asm/unk_02088814.s @@ -81,7 +81,7 @@ UNK_020FD1C4: ; 0x020FD1C4 .word FUN_02050A48, FUN_0202DA84, 0x00000000 .word MOD18_02247414, FUN_0202DA84, 0x00000000 .word MOD18_02247428, MOD18_02247470, 0x00000000 - .word FUN_020526B4, PlayerData_sizeof, 0x00000000 + .word FUN_020526B4, PlayerProfile_sizeof, 0x00000000 .word FUN_020526D8, FUN_0202DA84, 0x00000000 .word FUN_020526B8, FUN_0202DA84, 0x00000000 .word FUN_02052798, FUN_0202DA84, 0x00000000 diff --git a/arm9/asm/unk_0208890C.s b/arm9/asm/unk_0208890C.s index f39ccd55..92bfc9b5 100644 --- a/arm9/asm/unk_0208890C.s +++ b/arm9/asm/unk_0208890C.s @@ -27,13 +27,13 @@ FUN_0208890C: ; 0x0208890C bl FUN_02028048 str r0, [r4, #0x8] add r0, r5, #0x0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x10] add r0, r5, #0x0 bl FUN_0206F158 str r0, [r4, #0x14] add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x18] str r7, [r4, #0x1c] str r6, [r4, #0x4] diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 81b8d40e..d55eaa28 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -465,7 +465,7 @@ _0208A6FA: bl FUN_020545B8 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02054608 @@ -481,7 +481,7 @@ _0208A722: _0208A734: ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 ldr r1, [r5, #0x8] add r0, r4, #0x0 diff --git a/arm9/global.inc b/arm9/global.inc index 3288a315..c8eaec71 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1472,32 +1472,32 @@ .extern FUN_020238A4 .extern Sav2_PlayerData_sizeof .extern Sav2_PlayerData_init -.extern Sav2_GetPlayerDataPtr -.extern FUN_0202390C -.extern FUN_02023918 -.extern PlayerData_sizeof -.extern PlayerData_init -.extern FUN_0202393C -.extern PlayerData_Clear +.extern Sav2_PlayerData_GetProfileAddr +.extern Sav2_PlayerData_GetCoinsAddr +.extern Sav2_PlayerData_GetIGTAddr +.extern PlayerProfile_sizeof +.extern PlayerProfile_init +.extern PlayerProfile_Copy +.extern PlayerProfile_Clear .extern CopyPlayerName .extern PlayerName_StringToFlat -.extern FUN_0202398C +.extern PlayerProfile_GetNamePtr .extern PlayerName_FlatToString -.extern PlayerData_GetPlayerName_NewString -.extern FUN_020239B8 -.extern PlayerData_GetTrainerID -.extern PlayerData_GetTrainerID_VisibleHalf -.extern PlayerData_SetTrainerGender -.extern PlayerData_GetTrainerGender -.extern PlayerData_TestBadgeFlag -.extern PlayerData_SetBadgeFlag -.extern PlayerData_CountBadges -.extern PlayerData_GetMoney -.extern PlayerData_SetMoney +.extern PlayerProfile_GetPlayerName_NewString +.extern PlayerProfile_SetTrainerID +.extern PlayerProfile_GetTrainerID +.extern PlayerProfile_GetTrainerID_VisibleHalf +.extern PlayerProfile_SetTrainerGender +.extern PlayerProfile_GetTrainerGender +.extern PlayerProfile_TestBadgeFlag +.extern PlayerProfile_SetBadgeFlag +.extern PlayerProfile_CountBadges +.extern PlayerProfile_GetMoney +.extern PlayerProfile_SetMoney .extern FUN_02023A28 .extern FUN_02023A2C -.extern PlayerData_AddMoney -.extern PlayerData_SubMoney +.extern PlayerProfile_AddMoney +.extern PlayerProfile_SubMoney .extern FUN_02023A68 .extern FUN_02023A6C .extern FUN_02023A70 @@ -1506,7 +1506,7 @@ .extern FUN_02023A88 .extern FUN_02023A90 .extern FUN_02023A9C -.extern PlayerData_NameAndOTIDMatchPlayer +.extern PlayerProfile_NameAndOTIDMatchPlayer .extern FUN_02023AC4 .extern FUN_02023AC8 .extern FUN_02023ACC @@ -5990,7 +5990,7 @@ .extern GetNarcMemberSizeByIdPair .extern AllocAndReadWholeNarcMemberByIdPair .extern LoadOverlay_MODULE_05 -.extern LoadPlayerDataAddress +.extern Sav2_PlayerData_GetOptionsAddr .extern MATH_CalcCRC16 .extern MATH_CalcCRC16CCITT .extern MATH_CalcCRC32 diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index a00821e4..81ff471b 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -1448,7 +1448,7 @@ _021D8C88: cmp r0, #2 beq _021D8CE0 ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0 ldr r0, [r5, #0x38] bl FUN_02055320 @@ -1467,7 +1467,7 @@ _021D8C88: beq _021D8CE0 add r0, r6, #0 mov r1, #4 - bl PlayerData_TestBadgeFlag + bl PlayerProfile_TestBadgeFlag cmp r0, #0 beq _021D8CE0 ldr r0, [r5, #0xc] diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index db4c4e07..3beaf558 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -1827,8 +1827,8 @@ MOD05_021E28A0: ; 0x021E28A0 bl NewString_ReadMsgData str r0, [sp, #0x10] ldr r0, [r7, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetMoney + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetMoney add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -1955,7 +1955,7 @@ MOD05_021E29C8: ; 0x021E29C8 bl NewString_ReadMsgData str r0, [sp, #0x10] ldr r0, [r6, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr bl CheckCoins add r2, r0, #0 mov r0, #1 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index d9293d4c..bcebfd49 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -204,7 +204,7 @@ MOD05_021E2D00: ; 0x021E2D00 add r0, #0x80 ldr r0, [r0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02024FF4 pop {r3, pc} .balign 4, 0 @@ -286,7 +286,7 @@ MOD05_021E2D9C: ; 0x021E2D9C mov r2, #3 bl FUN_020545B8 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0 ldr r0, [r4, #0xc] bl FUN_02054608 @@ -11529,10 +11529,10 @@ _021E8344: _021E8346: str r0, [r5] add r0, r4, #0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r5, #8] add r0, r4, #0 - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [r5, #0xc] pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -11551,7 +11551,7 @@ MOD05_021E835C: ; 0x021E835C mov r1, #1 bl FUN_0200ABC0 ldr r0, [r4, #8] - bl PlayerData_CountBadges + bl PlayerProfile_CountBadges add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -18589,8 +18589,8 @@ _021EBCC4: .word UNK05_021F7970 MOD05_021EBCC8: ; 0x021EBCC8 push {r3, lr} ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender pop {r3, pc} .balign 4, 0 @@ -19608,8 +19608,8 @@ MOD05_021EC4F0: ; 0x021EC4F0 bl FUN_02023C7C str r0, [sp, #4] add r0, r7, #0 - bl Sav2_GetPlayerDataPtr - bl FUN_0202398C + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetNamePtr add r0, r4, #0 mov r1, #0x74 add r2, sp, #0xc @@ -20947,14 +20947,14 @@ _021ECF7E: cmp r0, #4 bne _021ECFEE add r0, r4, #0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID str r0, [sp, #0x1c] add r0, r4, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender str r0, [sp, #0x18] add r0, r4, #0 mov r1, #0x20 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r6, r0, #0 add r0, r5, #0 mov r1, #0x90 @@ -21091,7 +21091,7 @@ MOD05_021ED0CC: ; 0x021ED0CC bl MOD05_021ECD78 add r6, r0, #0 add r0, r7, #0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r1, sp, #0x10 str r0, [sp, #8] ldrb r1, [r1, #1] @@ -26730,7 +26730,7 @@ _021EFC20: add r0, #0x8c str r1, [r0] ldr r0, [r4, #0x34] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025084 lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -27230,7 +27230,7 @@ _021F000E: bl FUN_020286EC add r7, r0, #0 mov r0, #4 - bl PlayerData_init + bl PlayerProfile_init add r6, r0, #0 add r0, r7, #0 add r1, r4, #0 @@ -27482,14 +27482,14 @@ _021F0204: bl FUN_020545B8 ldr r0, [r4, #0x30] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0 add r0, r4, #0 add r0, #0x10 bl FUN_02054608 ldr r0, [r4, #0x30] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0 add r0, r4, #0 ldr r1, [r4, #0xc] @@ -37402,8 +37402,8 @@ _021F4DDE: lsl r0, r0, #4 str r0, [r4] ldr r0, [r6, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerID + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerID add r1, r5, #0 bl MOD05_021F5138 add r7, r0, #0 @@ -40022,7 +40022,7 @@ MOD05_021F611C: ; 0x021F611C mov r2, #3 bl FUN_020545B8 ldr r0, [r4, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r5, #0x38 add r1, r0, #0 add r0, r5, #0 @@ -40045,7 +40045,7 @@ MOD05_021F6140: ; 0x021F6140 ldr r2, [r5, #0x30] bl StringExpandPlaceholders ldr r0, [r4, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0 add r0, r5, #0 ldr r1, [r5, #0x2c] diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 80748fc0..164e4d16 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -5931,8 +5931,8 @@ _0223C350: bne _0223C38C add r0, r5, #0 bl FUN_020377AC - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerID + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerID str r0, [sp] ldr r0, [sp, #0x34] mov r2, #1 @@ -8031,8 +8031,8 @@ _0223D342: strb r0, [r4, #0x11] _0223D344: ldr r0, [r6, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerID + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerID str r0, [r4] pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -8124,12 +8124,12 @@ MOD06_0223D3D0: ; 0x0223D3D0 lsl r1, r1, #4 str r0, [r4, r1] ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x83 lsl r1, r1, #2 str r0, [r4, r1] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr mov r1, #0x85 lsl r1, r1, #2 str r0, [r4, r1] @@ -9506,7 +9506,7 @@ _0223DF30: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r5, r0] - bl PlayerData_GetMoney + bl PlayerProfile_GetMoney add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -9660,7 +9660,7 @@ _0223E034: str r0, [r5, r1] sub r1, #0x3c ldr r0, [r5, r1] - bl PlayerData_GetMoney + bl PlayerProfile_GetMoney mov r2, #0x92 lsl r2, r2, #2 ldr r1, [r5, r2] @@ -10538,7 +10538,7 @@ _0223E7F6: ldr r3, [r4, r1] ldrsh r1, [r4, r2] mul r1, r3 - bl PlayerData_SubMoney + bl PlayerProfile_SubMoney mov r3, #0x87 lsl r3, r3, #2 add r2, r3, #0 @@ -11300,7 +11300,7 @@ _0223EE34: ldr r0, [r0] ldr r0, [r0, #0x68] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0 ldr r0, _0223EE70 ; =0x02252420 ldr r0, [r0] @@ -11310,7 +11310,7 @@ _0223EE34: ldr r4, [r0] ldr r0, [r4, #0x68] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0 add r0, r4, #0 ldr r1, [r4, #0x14] @@ -11443,12 +11443,12 @@ _0223EF28: ldr r0, [r1] ldr r0, [r0, #0x68] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r1, _0223EFF4 ; =0x02252420 ldr r1, [r1] str r0, [r1, #0x78] mov r0, #4 - bl PlayerData_init + bl PlayerProfile_init ldr r1, _0223EFF4 ; =0x02252420 ldr r2, [r1] str r0, [r2, #0x7c] @@ -11734,7 +11734,7 @@ _0223F11A: ldr r0, _0223F26C ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x7c] - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r2, r0, #0 mov r1, #2 lsl r2, r2, #0x10 @@ -11923,7 +11923,7 @@ MOD06_0223F344: ; 0x0223F344 ldr r0, _0223F3B4 ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x78] - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -12496,7 +12496,7 @@ _0223F7E0: add r0, sp, #0xc ldrh r0, [r0] bl FUN_0202DFA4 - bl PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf mov r1, #2 add r2, r0, #0 str r1, [sp] @@ -14482,7 +14482,7 @@ MOD06_02240864: ; 0x02240864 bl FUN_020545B8 ldr r0, [r5, #0x10] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0 add r0, r5, #0 add r0, #0x54 @@ -14503,7 +14503,7 @@ _022408A6: bl StringExpandPlaceholders ldr r0, [r5, #0x10] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0 add r0, r5, #0 ldr r1, [r5, #0x18] @@ -18907,7 +18907,7 @@ _02242C0E: bl FUN_020545B8 ldr r0, [r4] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0 add r0, r4, #0 add r0, #0x14 @@ -20211,8 +20211,8 @@ _0224356C: bl MOD06_02244A80 _0224362A: add r0, r6, #0 - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender strb r0, [r4, #0x11] ldrb r0, [r4, #0xf] cmp r0, #5 @@ -22396,8 +22396,8 @@ MOD06_022446FC: ; 0x022446FC add r4, r1, #0 add r6, r0, #0 add r0, r4, #0 - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender ldr r1, _02244750 ; =0x0000083E strh r0, [r6, r1] add r0, r4, #0 @@ -31000,9 +31000,9 @@ _0224886C: bl AllocMonZeroed str r0, [r4, #4] add r0, r5, #0 - bl PlayerData_init + bl PlayerProfile_init str r0, [r4, #8] - bl PlayerData_Clear + bl PlayerProfile_Clear add r0, r5, #0 add r1, r6, #4 bl MOD06_022489AC @@ -31018,7 +31018,7 @@ _0224886C: ldr r1, [r4] ldr r0, [r4, #8] ldr r1, [r1, #0x40] - bl PlayerData_SetTrainerGender + bl PlayerProfile_SetTrainerGender add r0, r4, #0 add sp, #0x104 pop {r3, r4, r5, r6, pc} @@ -31111,7 +31111,7 @@ MOD06_0224891C: ; 0x0224891C mov r0, #1 str r0, [r4, #0x10] ldr r0, [r6, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x14] add r0, r6, #0 bl FUN_0204B2A4 @@ -31410,7 +31410,7 @@ MOD06_02248BC0: ; 0x02248BC0 push {r4, r5, r6, lr} ldr r0, [r0, #0xc] add r6, r1, #0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0 mov r0, #4 mov r1, #0x18 @@ -31418,12 +31418,12 @@ MOD06_02248BC0: ; 0x02248BC0 add r4, r0, #0 bl MOD06_02248B0C add r0, r5, #0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0 add r0, r4, #0 bl MOD06_02248B24 add r0, r5, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0 add r0, r4, #0 bl MOD06_02248B18 @@ -31446,7 +31446,7 @@ MOD06_02248C18: ; 0x02248C18 push {r4, r5, r6, lr} ldr r0, [r0, #0xc] add r5, r1, #0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0 mov r0, #4 mov r1, #0x18 @@ -31455,12 +31455,12 @@ MOD06_02248C18: ; 0x02248C18 bl MOD06_02248B0C add r0, r6, #0 strb r5, [r4] - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0 add r0, r4, #0 bl MOD06_02248B24 add r0, r6, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0 add r0, r4, #0 bl MOD06_02248B18 @@ -32163,8 +32163,8 @@ MOD06_02249158: ; 0x02249158 MOD06_0224916C: ; 0x0224916C push {r3, lr} ldr r0, [r0, #0xc] - bl Sav2_GetPlayerDataPtr - bl PlayerData_CountBadges + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_CountBadges cmp r0, #5 blt _02249180 mov r0, #1 @@ -40474,7 +40474,7 @@ MOD06_0224D14C: ; 0x0224D14C lsr r0, r0, #0x18 str r0, [sp, #0x20] add r0, r4, #0 - bl PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf str r0, [sp, #0x1c] mov r0, #0 str r0, [sp, #0x18] @@ -40901,7 +40901,7 @@ MOD06_0224D46C: ; 0x0224D46C bl NewString_ReadMsgData add r5, r0, #0 ldr r0, [sp, #0x1c] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0 ldr r0, [r4, #0x14] mov r1, #0 @@ -41693,7 +41693,7 @@ MOD06_0224DBA8: ; 0x0224DBA8 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #8] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r4, r0, #0 bl FUN_02025084 mov r1, #0x53 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index ff2d1bc1..235b01d0 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -1160,7 +1160,7 @@ _0222DFEC: add r1, #0xf8 ldr r0, [r5, #0x48] ldr r1, [r1] - bl FUN_0202393C + bl PlayerProfile_Copy ldr r0, [r5, #0x48] bl FreeToHeap ldr r0, [sp] @@ -1741,13 +1741,13 @@ MOD11_0222E520: ; 0x0222E520 add r5, r1, #0 _0222E532: mov r0, #5 - bl PlayerData_init + bl PlayerProfile_init add r1, r0, #0 add r0, r5, #0 str r1, [r6, #0x48] add r0, #0xf8 ldr r0, [r0] - bl FUN_0202393C + bl PlayerProfile_Copy mov r0, #0x46 lsl r0, r0, #2 ldr r0, [r5, r0] diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 013cdcfc..b3f10c3b 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -1068,7 +1068,7 @@ _0222FB52: add r7, r0, #0 ldr r0, [r5, #0x48] mov r1, #5 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString mov r1, #7 lsl r1, r1, #6 ldr r2, [r4, r1] @@ -1123,7 +1123,7 @@ _0222FBA4: add r0, r4, r6 ldr r0, [r0, #0x48] mov r1, #5 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString mov r1, #7 lsl r1, r1, #6 ldr r2, [r4, r1] @@ -1136,7 +1136,7 @@ _0222FBA4: add r0, r4, r5 ldr r0, [r0, #0x48] mov r1, #5 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString mov r1, #7 lsl r1, r1, #6 ldr r3, [r4, r1] @@ -1325,7 +1325,7 @@ _0222FD60: add r0, #0xf8 ldr r0, [r0] mov r1, #5 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString ldr r1, [sp, #8] add r4, r4, #1 lsl r1, r1, #2 @@ -1384,7 +1384,7 @@ _0222FDBE: add r0, #0xf8 ldr r0, [r0] mov r1, #5 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString ldr r1, [sp, #0xc] lsl r1, r1, #2 add r1, r6, r1 @@ -1396,7 +1396,7 @@ _0222FDBE: add r0, #0xf8 ldr r0, [r0] mov r1, #5 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString lsl r1, r5, #2 add r1, r6, r1 str r0, [r1, #0x14] @@ -2043,11 +2043,11 @@ MOD11_02230218: ; 0x02230218 MOD11_0223021C: ; 0x0223021C lsl r1, r1, #2 add r0, r0, r1 - ldr r3, _02230228 ; =PlayerData_GetTrainerGender + ldr r3, _02230228 ; =PlayerProfile_GetTrainerGender ldr r0, [r0, #0x48] bx r3 nop -_02230228: .word PlayerData_GetTrainerGender +_02230228: .word PlayerProfile_GetTrainerGender thumb_func_start MOD11_0223022C MOD11_0223022C: ; 0x0223022C @@ -4690,7 +4690,7 @@ MOD11_0223158C: ; 0x0223158C add r6, r1, #0 add r5, r0, #0 add r0, r6, #0 - bl PlayerData_CountBadges + bl PlayerProfile_CountBadges lsl r0, r0, #0x18 lsr r4, r0, #0x18 add r0, r5, #0 @@ -4701,7 +4701,7 @@ MOD11_0223158C: ; 0x0223158C add r4, r1, #0 mul r4, r0 add r0, r6, #0 - bl PlayerData_GetMoney + bl PlayerProfile_GetMoney cmp r4, r0 bls _022315B8 add r4, r0, #0 @@ -11889,7 +11889,7 @@ _02234E2E: mov r1, #0 bl MOD11_022301D4 add r1, r4, #0 - bl PlayerData_AddMoney + bl PlayerProfile_AddMoney b _02234E56 _02234E3E: ldr r0, [r5, #0x68] @@ -11900,7 +11900,7 @@ _02234E3E: mov r1, #0 bl MOD11_022301D4 add r1, r4, #0 - bl PlayerData_SubMoney + bl PlayerProfile_SubMoney _02234E56: cmp r4, #0 beq _02234E62 @@ -12639,7 +12639,7 @@ _02235416: mov r1, #0x13 lsl r1, r1, #4 ldr r1, [r4, r1] - bl PlayerData_AddMoney + bl PlayerProfile_AddMoney mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -33429,7 +33429,7 @@ _0223F8AE: pop {r3, r4, r5, r6, r7, pc} _0223F8C0: add r0, r7, #0 - bl PlayerData_CountBadges + bl PlayerProfile_CountBadges cmp r0, #8 blt _0223F8D0 add sp, #0x20 @@ -33438,19 +33438,19 @@ _0223F8C0: _0223F8D0: add r0, r7, #0 mov r5, #0xa - bl PlayerData_CountBadges + bl PlayerProfile_CountBadges cmp r0, #2 blt _0223F8DE mov r5, #0x1e _0223F8DE: add r0, r7, #0 - bl PlayerData_CountBadges + bl PlayerProfile_CountBadges cmp r0, #4 blt _0223F8EA mov r5, #0x32 _0223F8EA: add r0, r7, #0 - bl PlayerData_CountBadges + bl PlayerProfile_CountBadges cmp r0, #6 blt _0223F8F6 mov r5, #0x46 @@ -57106,13 +57106,13 @@ MOD11_0224ADB8: ; 0x0224ADB8 mov r1, #0 bl MOD11_022301D4 add r4, r0, #0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r6, r0, #0 add r0, r4, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r7, r0, #0 add r0, r4, #0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr ldr r2, [r5, #0x64] mov r1, #0xc0 add r4, r2, #0 @@ -57152,13 +57152,13 @@ MOD11_0224AE14: ; 0x0224AE14 mov r1, #0 bl MOD11_022301D4 add r4, r0, #0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r6, r0, #0 add r0, r4, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r7, r0, #0 add r0, r4, #0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r4, r0, #0 add r0, r5, #0 mov r1, #0x8f diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 182b6876..738bf429 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -1948,7 +1948,7 @@ _021D84AA: mov r0, #0x47 lsl r0, r0, #2 ldr r0, [r4, r0] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0 mov r0, #0x4b lsl r0, r0, #2 @@ -7532,7 +7532,7 @@ MOD14_021DB220: ; 0x021DB220 lsl r1, r1, #2 str r0, [r5, r1] ldr r0, [r4] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr mov r1, #0x69 lsl r1, r1, #2 str r0, [r5, r1] diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 2e9d483c..386eea1e 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -4634,12 +4634,12 @@ _021D980C: ldr r1, _021D989C ; =0x0000174C str r0, [r5, r1] ldr r0, [r4, #4] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender ldr r1, _021D98A0 ; =0x00001750 str r0, [r5, r1] ldr r0, [r4, #4] add r1, r6, #0 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString ldr r1, _021D98A4 ; =0x00001754 str r0, [r5, r1] add r0, r6, #0 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index bbe85329..e258bcc9 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4251,10 +4251,10 @@ MOD17_021D95AC: ; 0x021D95AC beq _021D95EC add r0, r4, #0 mov r1, #0xd - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r5, r0, #0 add r0, r4, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r2, r0, #0 add r0, r6, #0 add r1, r5, #0 @@ -4338,10 +4338,10 @@ MOD17_021D964C: ; 0x021D964C beq _021D969A add r0, r4, #0 mov r1, #0xd - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r5, r0, #0 add r0, r4, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r2, r0, #0 add r0, r7, #0 add r1, r5, #0 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 9c674215..3fbc762e 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -7962,7 +7962,7 @@ MOD18_0223D414: ; 0x0223D414 add r5, r1, #0 add r6, r0, #0 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02024FF4 add r4, r0, #0 ldr r0, _0223D580 ; =0x02251388 @@ -29437,7 +29437,7 @@ MOD18_022479E4: ; 0x022479E4 blt _022479FC ldrh r0, [r0, #0x30] bl FUN_0202DFA4 - bl PlayerData_GetTrainerGender + bl PlayerProfile_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 PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender cmp r0, #1 bne _02247A24 add r4, #0x13 @@ -32978,9 +32978,9 @@ _022495BA: bne _022495E2 ldr r0, [r5, #0xc] bl FUN_020377AC - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #4 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_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 Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr 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 Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr 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 PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_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 PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf add r2, r0, #0 mov r0, #2 str r0, [sp] diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index 8c851ecc..fbe1a1e2 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -1194,8 +1194,8 @@ MOD20_02252C40: ; 0x02252C40 MOD20_02252C44: ; 0x02252C44 push {r3, lr} ldr r0, [r0, #0x54] - bl Sav2_GetPlayerDataPtr - bl PlayerData_GetTrainerGender + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender cmp r0, #1 beq _02252C58 mov r0, #1 diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 3ba4d40f..736ecfdf 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -291,7 +291,7 @@ MOD51_02254A68: ; 0x02254A68 ldr r0, [r5, #0x78] str r0, [r4, #8] ldr r0, [r5, #0xc] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x10] mov r0, #0 mov r1, #0xa2 @@ -1178,7 +1178,7 @@ _0225519C: blt _02255160 _022551A4: bl FUN_0202EF70 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID mov r1, #0x27 lsl r1, r1, #4 ldr r2, [r5, r1] @@ -1539,7 +1539,7 @@ MOD51_02255454: ; 0x02255454 add r7, r2, #0 str r3, [sp, #8] str r4, [sp, #0xc] - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID cmp r5, r0 beq _02255478 add r0, r6, #0 @@ -1641,7 +1641,7 @@ _0225551E: bl String_dtor _02255530: ldr r0, [sp, #8] - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0 ldr r2, [r5] mov r0, #0x1c @@ -1667,7 +1667,7 @@ _02255530: add r1, r4, r1 str r0, [r1, #0xc] ldr r0, [sp, #8] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender ldr r2, [r5] mov r1, #0x1c mul r1, r2 @@ -1834,7 +1834,7 @@ MOD51_02255690: ; 0x02255690 cmp r0, #0 bne _02255714 mov r0, #4 - bl PlayerData_init + bl PlayerProfile_init str r0, [sp, #4] mov r6, #0 _022556AA: @@ -1852,7 +1852,7 @@ _022556AA: add r0, r4, #0 ldr r1, [sp, #4] add r0, #0x10 - bl FUN_0202393C + bl PlayerProfile_Copy ldr r0, [sp] ldr r2, [r7, #0x50] add r1, r5, #0 @@ -1875,7 +1875,7 @@ _022556E6: beq _0225570E ldr r0, [sp] ldr r0, [r0, #0x10] - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r3, r0, #0 ldr r0, [sp] add r2, r4, #0 diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 7b123bba..6858197f 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -68,7 +68,7 @@ MOD52_021D7540: ; 0x021D7540 mov r2, #1 bl MOD52_021D7604 add r0, r4, #0 - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr bl FUN_02015E3C mov r0, #1 pop {r4, pc} @@ -133,7 +133,7 @@ _021D75C8: bl FUN_020237A0 _021D75D8: add r0, r4, #0 - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr bl FUN_02015E3C mov r0, #1 pop {r3, r4, r5, pc} @@ -178,7 +178,7 @@ MOD52_021D7604: ; 0x021D7604 add r0, r5, #0 bl FUN_0206007C add r0, r5, #0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0 bl MTRandom add r7, r0, #0 @@ -186,10 +186,10 @@ MOD52_021D7604: ; 0x021D7604 beq _021D7656 add r0, r4, #0 add r1, r7, #0 - bl FUN_020239B8 + bl PlayerProfile_SetTrainerID _021D7656: add r0, r4, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0 add r0, r7, #0 mov r2, #0 @@ -232,9 +232,9 @@ MOD52_021D769C: ; 0x021D769C add r0, r4, #0 bl FUN_020377E0 add r0, r4, #0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r1, _021D76C4 ; =0x00000BB8 - bl PlayerData_SetMoney + bl PlayerProfile_SetMoney add r0, r4, #0 bl SavArray_Flags_get bl FUN_0205ECD4 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 8c96a947..cc365fa2 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -2799,7 +2799,7 @@ _021D8B2A: ldr r0, [r7, r0] cmp r0, #0 beq _021D8BE4 - bl PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf str r0, [sp, #0x24] mov r0, #0xd9 lsl r0, r0, #2 @@ -3136,7 +3136,7 @@ _021D8D9E: mov r0, #0xd9 lsl r0, r0, #2 ldr r0, [r6, r0] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender str r0, [sp, #0xc] mov r0, #0xd9 lsl r0, r0, #2 @@ -3187,7 +3187,7 @@ _021D8E06: mov r0, #0xd9 lsl r0, r0, #2 ldr r0, [r6, r0] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0 mov r0, #0x8b lsl r0, r0, #2 @@ -3718,7 +3718,7 @@ MOD54_021D91C4: ; 0x021D91C4 str r3, [sp, #4] add r5, r1, #0 str r2, [sp] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0 ldr r0, [sp, #4] mov r7, #0 @@ -3730,17 +3730,17 @@ _021D91DC: mov r2, #0x48 bl MIi_CpuClearFast add r0, r4, #0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID str r0, [r5] add r0, r4, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender strb r0, [r5, #4] mov r0, #GAME_VERSION strb r0, [r5, #5] mov r0, #2 strb r0, [r5, #6] add r0, r4, #0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0 add r0, r5, #0 add r0, #8 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 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index beba0a61..614bbffd 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -1013,7 +1013,7 @@ MOD56_0221257C: ; 0x0221257C bl FUN_020068C8 add r5, #0xc4 ldr r0, [r5] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025084 lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -1974,7 +1974,7 @@ MOD56_02212E0C: ; 0x02212E0C add r0, #0xc4 ldr r0, [r0] str r1, [sp] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x14] add r0, r5, #0 add r0, #0xc4 @@ -2044,7 +2044,7 @@ _02212E82: ldr r1, [r5, #4] strb r0, [r1, #0x1d] ldr r0, [sp, #0x14] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender ldr r1, [r5, #4] strb r0, [r1, #0x1e] ldr r0, [sp, #8] @@ -2767,9 +2767,9 @@ MOD56_0221341C: ; 0x0221341C add r0, #0xc4 ldr r0, [r0] ldr r5, _02213618 ; =0x00010200 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x36 - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r6, r0, #0 mov r0, #0xd3 lsl r0, r0, #2 @@ -7098,7 +7098,7 @@ _02215532: add r3, r1, #0 bl AddTextPrinterParameterized2 mov r0, #0x36 - bl PlayerData_init + bl PlayerProfile_init add r6, r0, #0 ldr r0, [r5] add r1, r4, #0 @@ -8163,7 +8163,7 @@ MOD56_02215EA4: ; 0x02215EA4 ldr r0, [r0] add r4, r1, #0 add r6, r2, #0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02024FF4 add r7, r0, #0 mov r0, #0xdb @@ -8431,7 +8431,7 @@ MOD56_022160E4: ; 0x022160E4 cmp r6, r0 beq _0221611C mov r0, #0x36 - bl PlayerData_init + bl PlayerProfile_init add r4, r0, #0 ldr r0, [r5] add r1, r6, #0 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 30fd8539..625039e7 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -92,7 +92,7 @@ _021D9A36: str r0, [r4, #8] add r0, r6, #0 bl FUN_0200628C - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] add r0, r4, #0 bl MOD58_021D9F14 diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index 69a9237f..ccfa6163 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -26,7 +26,7 @@ MOD59_021D74E0: ; 0x021D74E0 bl FUN_0200628C ldr r0, [r0, #8] str r0, [r4, #4] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr mov r1, #0 str r0, [r4, #8] str r1, [r4, #0xc] @@ -231,15 +231,15 @@ MOD59_021D76C0: ; 0x021D76C0 add r4, r0, #0 ldr r0, [r4, #4] ldr r5, [r4] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r1, [r4, #0x70] ldr r1, [r1, #0x18] bl PlayerName_StringToFlat ldr r0, [r4, #4] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr ldr r1, [r4, #0x70] ldr r1, [r1, #4] - bl PlayerData_SetTrainerGender + bl PlayerProfile_SetTrainerGender ldr r0, [r4, #4] bl FUN_02024EB4 ldr r1, [r4, #0x74] diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index a81eb2f7..e00635fe 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -55,7 +55,7 @@ MOD67_021D74E0: ; 0x021D74E0 bl FUN_020289A4 str r0, [r4, #0x44] add r0, r5, #0 - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x48] mov r0, #0 mov r1, #0x2a @@ -338,7 +338,7 @@ MOD67_021D77B0: ; 0x021D77B0 sub sp, #0x10 add r4, r0, #0 ldr r0, [r4, #0x48] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender cmp r0, #0 bne _021D7802 mov r0, #0 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 0c2c8879..e9c2015c 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -1350,7 +1350,7 @@ _0222E0D4: ldr r0, [sp, #0x14] ldr r0, [r0, #0xc] ldr r0, [r0] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender cmp r0, #1 bne _0222E10C mov r1, #1 @@ -2672,7 +2672,7 @@ MOD69_0222EB4C: ; 0x0222EB4C bl FUN_0200ABC0 ldr r0, [r4, #0xc] ldr r0, [r0] - bl PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -4070,7 +4070,7 @@ _0222F6FA: b _0222F77A _0222F70C: add r0, r6, #0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID add r7, r0, #0 add r0, r4, #0 mov r1, #7 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index ce4e6ff9..9c4c00c9 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -207,11 +207,11 @@ MOD71_0222D780: ; 0x0222D780 add r6, r0, #0 add r0, r4, #0 mov r1, #0x1a - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r4, r0, #0 add r0, r6, #0 mov r1, #0x1a - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString add r6, r0, #0 mov r0, #0x61 lsl r0, r0, #2 @@ -2160,7 +2160,7 @@ MOD71_0222E76C: ; 0x0222E76C bl memset ldr r0, [r4, #4] mov r1, #0x1a - bl PlayerData_GetPlayerName_NewString + bl PlayerProfile_GetPlayerName_NewString mov r1, #0x63 lsl r1, r1, #2 str r0, [r5, r1] @@ -3743,12 +3743,12 @@ MOD71_0222F4BC: ; 0x0222F4BC add r4, r2, #0 add r6, r0, #0 add r5, r1, #0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0 add r0, r4, #0 bl CopyU16StringArray add r0, r6, #0 - bl PlayerData_GetTrainerID + bl PlayerProfile_GetTrainerID str r0, [r4, #0x10] add r0, r6, #0 bl FUN_02023A70 @@ -3757,7 +3757,7 @@ MOD71_0222F4BC: ; 0x0222F4BC bl FUN_02023A68 strb r0, [r4, #0x15] add r0, r6, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender strb r0, [r4, #0x16] mov r0, #0 add r1, r4, #0 @@ -4348,7 +4348,7 @@ _0222F9A0: ldr r0, _0222FA24 ; =0x00003670 str r4, [r5, r0] mov r0, #0x1a - bl PlayerData_init + bl PlayerProfile_init add r6, r0, #0 ldr r0, _0222FA28 ; =0x00003694 add r1, r4, #0 @@ -6371,7 +6371,7 @@ _02230A40: eor r0, r1 bl FUN_0202DFA4 ldr r1, [r5, #0x38] - bl FUN_0202393C + bl PlayerProfile_Copy ldr r0, [sp, #4] ldr r1, _02230AE0 ; =0x000001B9 str r6, [r5, #0x2c] @@ -6429,10 +6429,10 @@ MOD71_02230AE4: ; 0x02230AE4 add r2, sp, #4 bl GetMonData add r0, r5, #0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r7, r0, #0 add r0, r5, #0 - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r5, r0, #0 add r0, r4, #0 bl GetMonGender diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 76811a01..e843de0d 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -29,7 +29,7 @@ MOD74_021D74E0: ; 0x021D74E0 ldrh r0, [r5, #6] strb r0, [r4, #0xa] ldr r0, [r5] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x18] ldr r0, [r5] bl FUN_02029FC8 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index cf8afa3d..59d25787 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -54,7 +54,7 @@ MOD75_021E6BA0: ; 0x021E6BA0 add r0, r4, #0 add r0, #0xcc ldr r0, [r0] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender ldr r1, _021E6D64 ; =0x00000425 mov r3, #0 strb r0, [r4, r1] @@ -481,7 +481,7 @@ MOD75_021E6FA4: ; 0x021E6FA4 add r0, #0xc4 ldr r0, [r0] ldr r0, [r0] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr add r1, r4, #0 add r1, #0xcc str r0, [r1] @@ -489,7 +489,7 @@ MOD75_021E6FA4: ; 0x021E6FA4 add r0, #0xc4 ldr r0, [r0] ldr r0, [r0] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r4, #0xd0 str r0, [r4] pop {r4, pc} @@ -6485,7 +6485,7 @@ _021E9EF8: ldr r1, [r4, r1] ldr r0, [r0] mul r1, r2 - bl PlayerData_AddMoney + bl PlayerProfile_AddMoney ldr r0, _021E9F6C ; =0x00000488 ldrsh r0, [r4, r0] cmp r0, #1 @@ -9697,7 +9697,7 @@ _021EB866: add r0, r5, #0 add r0, #0xcc ldr r0, [r0] - bl PlayerData_GetMoney + bl PlayerProfile_GetMoney add r2, r0, #0 mov r0, #1 str r0, [sp] diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 4c119b1d..a6ce5269 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -67,7 +67,7 @@ _021D7540: ldr r1, _021D75F0 ; =0x0000C324 str r0, [r5, r1] add r0, r4, #0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r5, #8] bl MOD77_021D7C24 bl MOD77_021D7C44 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index c37b7373..c58bb515 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1593,7 +1593,7 @@ _0222E1C6: bl MOD80_0222E7C8 ldr r0, [r4] ldr r0, [r0, #0x1c] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0 add r0, r4, #0 bl MOD80_02235850 @@ -2534,7 +2534,7 @@ MOD80_0222E8F4: ; 0x0222E8F4 strh r0, [r4, #0x34] ldr r0, [r4] ldr r0, [r0, #0x1c] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0 add r0, r4, #0 bl MOD80_02235900 @@ -3440,7 +3440,7 @@ MOD80_0222F0A8: ; 0x0222F0A8 add r4, r0, #0 ldr r0, [r4] ldr r0, [r0, #0x1c] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r0, #0 add r0, r4, #0 bl MOD80_02235A10 @@ -13587,7 +13587,7 @@ _022342B0: _022342BC: ldr r0, [r4] ldr r0, [r0, #0x1c] - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0 mov r0, #0x43 lsl r0, r0, #2 @@ -13596,7 +13596,7 @@ _022342BC: bl CopyU16StringArrayN ldr r0, [r4] ldr r0, [r0, #0x1c] - bl PlayerData_GetTrainerID_VisibleHalf + bl PlayerProfile_GetTrainerID_VisibleHalf mov r1, #0x47 lsl r1, r1, #2 strh r0, [r5, r1] @@ -13618,7 +13618,7 @@ _022342BC: strb r0, [r5, r1] ldr r0, [r4] ldr r0, [r0, #0x1c] - bl PlayerData_GetTrainerGender + bl PlayerProfile_GetTrainerGender add r1, r5, #0 add r1, #0xf6 strb r0, [r1] @@ -17647,9 +17647,9 @@ MOD80_022361AC: ; 0x022361AC push {r3, r4, r5, lr} add r5, r0, #0 mov r0, #0x3e - bl PlayerData_init + bl PlayerProfile_init add r4, r0, #0 - bl PlayerData_Clear + bl PlayerProfile_Clear mov r1, #0x43 lsl r1, r1, #2 add r0, r4, #0 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] diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 8d94be83..37b0b5f6 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -29,7 +29,7 @@ MOD86_021D74E0: ; 0x021D74E0 ldr r0, [r0, #4] str r0, [r4, #4] ldr r0, [r4, #8] - bl Sav2_GetPlayerDataPtr + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0xc] mov r0, #0 add r1, r0, #0 diff --git a/arm9/src/main.c b/arm9/src/main.c index bdb6078e..3de65c45 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -74,7 +74,7 @@ THUMB_FUNC void NitroMain(void) FUN_02002C50(3, 3); gBacklightTop.unk18 = -1; gBacklightTop.unk20 = FUN_0202254C(); - InitSoundData(FUN_02029EF8(gBacklightTop.unk20), LoadPlayerDataAddress(gBacklightTop.unk20)); + InitSoundData(FUN_02029EF8(gBacklightTop.unk20), Sav2_PlayerData_GetOptionsAddr(gBacklightTop.unk20)); FUN_02020AFC(); if (FUN_020337E8(3) == 3) FUN_02034188(3, 0); diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 5367ae45..05df8811 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -3678,11 +3678,11 @@ BOOL FUN_0206A998(struct Pokemon * pokemon) BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct PlayerData * sb2, u32 heap_id) { - u32 myId = PlayerData_GetTrainerID(sb2); + u32 myId = PlayerProfile_GetTrainerID(sb2); u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); - u32 myGender = PlayerData_GetTrainerGender(sb2); + u32 myGender = PlayerProfile_GetTrainerGender(sb2); u32 otGender = GetBoxMonData(boxmon, MON_DATA_MET_GENDER, NULL); - struct String * r7 = PlayerData_GetPlayerName_NewString(sb2, heap_id); + struct String * r7 = PlayerProfile_GetPlayerName_NewString(sb2, heap_id); struct String * r6 = String_ctor(OT_NAME_LENGTH + 1, heap_id); BOOL ret = FALSE; GetBoxMonData(boxmon, MON_DATA_OT_NAME_2, r6); diff --git a/include/player_data.h b/include/player_data.h index 04583052..28133f43 100644 --- a/include/player_data.h +++ b/include/player_data.h @@ -32,9 +32,9 @@ struct PlayerDataSav u8 padding2[2]; }; -struct Options * LoadPlayerDataAddress(struct SaveBlock2 *); -struct String * PlayerData_GetPlayerName_NewString(struct PlayerData *, u32 heap_id); -u32 PlayerData_GetTrainerID(struct PlayerData *); -u32 PlayerData_GetTrainerGender(struct PlayerData *); +struct Options * Sav2_PlayerData_GetOptionsAddr(struct SaveBlock2 *); +struct String * PlayerProfile_GetPlayerName_NewString(struct PlayerData *, u32 heap_id); +u32 PlayerProfile_GetTrainerID(struct PlayerData *); +u32 PlayerProfile_GetTrainerGender(struct PlayerData *); #endif //POKEDIAMOND_PLAYER_DATA_H |