diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-13 08:58:40 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-13 08:58:40 -0400 |
| commit | ddd20f2c76a34b4fc46503c8bf88d53a755453a8 (patch) | |
| tree | 829d21a866de69dc92e1b8e5bb1857a21104027c /arm9/modules | |
| parent | a13a7535cd78a113d23a8cccddced3d5f13ad479 (diff) | |
Rename routines in player_data.s
Diffstat (limited to 'arm9/modules')
27 files changed, 203 insertions, 203 deletions
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 |