diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 16:52:18 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 16:52:18 -0400 |
| commit | ad1e7f58f2912df805d9a768715497c9cc6a85c1 (patch) | |
| tree | c08534f0cb1a3269e632fec9996ec75482936070 /arm9/asm | |
| parent | 9e8e57cacbdb4e75cb7e3adce06a957dec25c33f (diff) | |
Merge two struct definitions
Diffstat (limited to 'arm9/asm')
54 files changed, 264 insertions, 264 deletions
diff --git a/arm9/asm/save.s b/arm9/asm/save.s index cbef5ecb..4278bd36 100644 --- a/arm9/asm/save.s +++ b/arm9/asm/save.s @@ -19,7 +19,7 @@ UNK_020EE6E0: ; 0x020EE6E0 .global UNK_020EE700 UNK_020EE700: ; 0x020EE700 .word 0x00, 0x00, FUN_0202376C, FUN_02023770 - .word 0x01, 0x00, FUN_020238C4, FUN_020238C8 + .word 0x01, 0x00, Sav2_PlayerData_sizeof, Sav2_PlayerData_init .word 0x02, 0x00, SavArray_Party_sizeof, SavArray_Party_init .word 0x03, 0x00, FUN_0206EB80, FUN_0206EBA0 .word 0x04, 0x00, SavArray_Flags_sizeof, SavArray_Flags_init diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 924df1ce..47dc0f62 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -6818,7 +6818,7 @@ FUN_0203CFC8: ; 0x0203CFC8 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239CC + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239BC + bl PlayerData_GetTrainerID add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_020239CC + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239BC + bl PlayerData_GetTrainerID add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_020239CC + bl PlayerData_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 FUN_020239CC + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239BC + bl PlayerData_GetTrainerID add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_020239CC + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239CC + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 5b300555..eb431b0e 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239A0 + bl PlayerData_GetPlayerName_NewString add r5, r0, #0x0 ldr r0, [sp, #0xc] - bl FUN_020239BC + bl PlayerData_GetTrainerID str r0, [sp, #0x2c] ldr r0, [sp, #0xc] - bl FUN_020239CC + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 c554aeae..3ed2ed87 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 2411d031..516d9cf4 100644 --- a/arm9/asm/scrcmd_14.s +++ b/arm9/asm/scrcmd_14.s @@ -166,7 +166,7 @@ FUN_02043B84: ; 0x02043B84 ldr r5, [r0, #0x0] add r0, r5, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr ldr r0, [r5, #0xc] bl FUN_0202390C add r6, r0, #0x0 @@ -202,7 +202,7 @@ FUN_02043BD0: ; 0x02043BD0 ldr r4, [r0, #0x0] add r0, r4, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr ldr r0, [r4, #0xc] bl FUN_0202390C add r6, r0, #0x0 diff --git a/arm9/asm/scrcmd_15.s b/arm9/asm/scrcmd_15.s index 6553953b..88c7628f 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02023A30 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02023A54 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_02023A54 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_02023A10 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_02023A10 + bl PlayerData_GetMoney cmp r0, r4 bhs _02043D6E mov r0, #0x0 diff --git a/arm9/asm/scrcmd_16.s b/arm9/asm/scrcmd_16.s index 9a1daf47..012a1812 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 f14155fc..4299ccbe 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239BC + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 56edda7a..c880fd3a 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r5, #0x0 - bl FUN_020239D0 + bl PlayerData_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 82be9edb..83bcf2ad 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r4, #0x0 - bl FUN_020239D0 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r4, #0x0 - bl FUN_020239E4 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr ldrb r1, [r7, r4] - bl FUN_020239D0 + bl PlayerData_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 4d73925a..19eb9485 100644 --- a/arm9/asm/scrcmd_24.s +++ b/arm9/asm/scrcmd_24.s @@ -138,7 +138,7 @@ FUN_02045E74: ; 0x02045E74 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [r4, #0x4] add r0, r5, #0x0 add r0, #0x80 diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 32cfa293..ce57c76c 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239A0 + bl PlayerData_GetPlayerName_NewString add r7, r0, #0x0 ldr r1, [sp, #0x8] add r0, sp, #0x14 diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index f74b9d43..4b62efa9 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239CC + bl PlayerData_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 66812dad..ae54897f 100644 --- a/arm9/asm/scrcmd_8.s +++ b/arm9/asm/scrcmd_8.s @@ -194,17 +194,17 @@ _02041DCE: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r6, #0x0 add r7, r0, #0x0 - bl FUN_02023990 + bl PlayerName_FlatToString add r0, r5, #0x0 mov r1, #0x0 mov r2, #0x1 add r3, r6, #0x0 bl FUN_020287C0 add r0, r7, #0x0 - bl FUN_020239CC + bl PlayerData_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 011a54cf..bad525a0 100644 --- a/arm9/asm/unk_0200AA80.s +++ b/arm9/asm/unk_0200AA80.s @@ -240,7 +240,7 @@ FUN_0200AC0C: ; 0x0200AC0C add r5, r0, #0x0 add r0, r2, #0x0 add r6, r1, #0x0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239CC + bl PlayerData_GetTrainerGender cmp r0, #0x0 bne _0200AC3E ldr r2, [r5, #0xc] diff --git a/arm9/asm/unk_020238C4.s b/arm9/asm/unk_020238C4.s index 4fce0bc3..8a32582c 100644 --- a/arm9/asm/unk_020238C4.s +++ b/arm9/asm/unk_020238C4.s @@ -3,13 +3,13 @@ .text - thumb_func_start FUN_020238C4 -FUN_020238C4: ; 0x020238C4 + thumb_func_start Sav2_PlayerData_sizeof +Sav2_PlayerData_sizeof: ; 0x020238C4 mov r0, #0x2c bx lr - thumb_func_start FUN_020238C8 -FUN_020238C8: ; 0x020238C8 + thumb_func_start Sav2_PlayerData_init +Sav2_PlayerData_init: ; 0x020238C8 push {r4, lr} add r4, r0, #0x0 mov r0, #0x0 @@ -19,7 +19,7 @@ FUN_020238C8: ; 0x020238C8 add r0, r4, #0x0 bl FUN_02024F50 add r0, r4, #0x4 - bl FUN_02023948 + bl PlayerData_Clear add r0, r4, #0x0 add r0, #0x24 bl FUN_02028910 @@ -28,8 +28,8 @@ FUN_020238C8: ; 0x020238C8 bl FUN_02029E48 pop {r4, pc} - thumb_func_start FUN_020238F4 -FUN_020238F4: ; 0x020238F4 + thumb_func_start Sav2_GetPlayerDataPtr +Sav2_GetPlayerDataPtr: ; 0x020238F4 push {r3, lr} mov r1, #0x1 bl SavArray_get @@ -60,18 +60,18 @@ FUN_02023918: ; 0x02023918 add r0, #0x26 pop {r3, pc} - thumb_func_start FUN_02023924 -FUN_02023924: ; 0x02023924 + thumb_func_start PlayerData_sizeof +PlayerData_sizeof: ; 0x02023924 mov r0, #0x20 bx lr - thumb_func_start FUN_02023928 -FUN_02023928: ; 0x02023928 + thumb_func_start PlayerData_init +PlayerData_init: ; 0x02023928 push {r4, lr} mov r1, #0x20 bl AllocFromHeap add r4, r0, #0x0 - bl FUN_02023948 + bl PlayerData_Clear add r0, r4, #0x0 pop {r4, pc} .balign 4 @@ -84,8 +84,8 @@ FUN_0202393C: ; 0x0202393C nop _02023944: .word MI_CpuCopy8 - thumb_func_start FUN_02023948 -FUN_02023948: ; 0x02023948 + thumb_func_start PlayerData_Clear +PlayerData_Clear: ; 0x02023948 push {r4, lr} mov r1, #0x0 mov r2, #0x20 @@ -96,8 +96,8 @@ FUN_02023948: ; 0x02023948 pop {r4, pc} .balign 4 - thumb_func_start FUN_0202395C -FUN_0202395C: ; 0x0202395C + thumb_func_start CopyPlayerName +CopyPlayerName: ; 0x0202395C push {r3-r5, lr} add r4, r1, #0x0 add r5, r0, #0x0 @@ -113,8 +113,8 @@ _02023970: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0202397C -FUN_0202397C: ; 0x0202397C + thumb_func_start PlayerName_StringToFlat +PlayerName_StringToFlat: ; 0x0202397C ldr r3, _02023988 ; =CopyStringToU16Array add r2, r0, #0x0 add r0, r1, #0x0 @@ -129,8 +129,8 @@ FUN_0202398C: ; 0x0202398C bx lr .balign 4 - thumb_func_start FUN_02023990 -FUN_02023990: ; 0x02023990 + thumb_func_start PlayerName_FlatToString +PlayerName_FlatToString: ; 0x02023990 ldr r3, _0202399C ; =CopyU16ArrayToString add r2, r0, #0x0 add r0, r1, #0x0 @@ -139,8 +139,8 @@ FUN_02023990: ; 0x02023990 nop _0202399C: .word CopyU16ArrayToString - thumb_func_start FUN_020239A0 -FUN_020239A0: ; 0x020239A0 + thumb_func_start PlayerData_GetPlayerName_NewString +PlayerData_GetPlayerName_NewString: ; 0x020239A0 push {r3-r5, lr} add r5, r0, #0x0 mov r0, #0x8 @@ -148,7 +148,7 @@ FUN_020239A0: ; 0x020239A0 add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_02023990 + bl PlayerName_FlatToString add r0, r4, #0x0 pop {r3-r5, pc} @@ -157,30 +157,30 @@ FUN_020239B8: ; 0x020239B8 str r1, [r0, #0x10] bx lr - thumb_func_start FUN_020239BC -FUN_020239BC: ; 0x020239BC + thumb_func_start PlayerData_GetTrainerID +PlayerData_GetTrainerID: ; 0x020239BC ldr r0, [r0, #0x10] bx lr - thumb_func_start FUN_020239C0 -FUN_020239C0: ; 0x020239C0 + thumb_func_start PlayerData_GetTrainerID_VisibleHalf +PlayerData_GetTrainerID_VisibleHalf: ; 0x020239C0 ldr r0, [r0, #0x10] lsl r0, r0, #0x10 lsr r0, r0, #0x10 bx lr - thumb_func_start FUN_020239C8 -FUN_020239C8: ; 0x020239C8 + thumb_func_start PlayerData_SetTrainerGender +PlayerData_SetTrainerGender: ; 0x020239C8 strb r1, [r0, #0x18] bx lr - thumb_func_start FUN_020239CC -FUN_020239CC: ; 0x020239CC + thumb_func_start PlayerData_GetTrainerGender +PlayerData_GetTrainerGender: ; 0x020239CC ldrb r0, [r0, #0x18] bx lr - thumb_func_start FUN_020239D0 -FUN_020239D0: ; 0x020239D0 + thumb_func_start PlayerData_TestBadgeFlag +PlayerData_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 FUN_020239E4 -FUN_020239E4: ; 0x020239E4 + thumb_func_start PlayerData_SetBadgeFlag +PlayerData_SetBadgeFlag: ; 0x020239E4 ldrb r3, [r0, #0x1a] mov r2, #0x1 lsl r2, r1 @@ -204,8 +204,8 @@ FUN_020239E4: ; 0x020239E4 bx lr .balign 4 - thumb_func_start FUN_020239F4 -FUN_020239F4: ; 0x020239F4 + thumb_func_start PlayerData_CountBadges +PlayerData_CountBadges: ; 0x020239F4 ldrb r3, [r0, #0x1a] mov r2, #0x0 cmp r3, #0x0 @@ -224,13 +224,13 @@ _02023A0A: bx lr .balign 4 - thumb_func_start FUN_02023A10 -FUN_02023A10: ; 0x02023A10 + thumb_func_start PlayerData_GetMoney +PlayerData_GetMoney: ; 0x02023A10 ldr r0, [r0, #0x14] bx lr - thumb_func_start FUN_02023A14 -FUN_02023A14: ; 0x02023A14 + thumb_func_start PlayerData_SetMoney +PlayerData_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 FUN_02023A30 -FUN_02023A30: ; 0x02023A30 + thumb_func_start PlayerData_AddMoney +PlayerData_AddMoney: ; 0x02023A30 ldr r2, _02023A50 ; =0x000F423F cmp r1, r2 bls _02023A3A @@ -275,8 +275,8 @@ _02023A4A: nop _02023A50: .word 0x000F423F - thumb_func_start FUN_02023A54 -FUN_02023A54: ; 0x02023A54 + thumb_func_start PlayerData_SubMoney +PlayerData_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 FUN_02023AA4 -FUN_02023AA4: ; 0x02023AA4 + thumb_func_start PlayerData_NameAndOTIDMatchPlayer +PlayerData_NameAndOTIDMatchPlayer: ; 0x02023AA4 push {r3-r5, lr} mov r2, #0x7 add r5, r0, #0x0 diff --git a/arm9/asm/unk_02025658.s b/arm9/asm/unk_02025658.s index d2e91382..730b960c 100644 --- a/arm9/asm/unk_02025658.s +++ b/arm9/asm/unk_02025658.s @@ -94,7 +94,7 @@ FUN_020256DC: ; 0x020256DC bl SavArray_PlayerParty_get str r0, [sp, #0x0] add r0, r7, #0x0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r6, r0, #0x0 bl FUN_0202398C add r1, r0, #0x0 @@ -102,10 +102,10 @@ FUN_020256DC: ; 0x020256DC add r0, #0x8 bl CopyU16StringArray add r0, r6, #0x0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender strb r0, [r5, #0x4] add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerData_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 acc65fb4..72387fa7 100644 --- a/arm9/asm/unk_02025954.s +++ b/arm9/asm/unk_02025954.s @@ -469,7 +469,7 @@ FUN_02025C40: ; 0x02025C40 str r0, [sp, #0x0] _02025C50: add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerData_GetTrainerID add r1, r5, #0x0 add r1, #0xa0 ldr r1, [r1, #0x0] @@ -494,7 +494,7 @@ _02025C72: mov r2, #0x10 bl MI_CpuCopy8 add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerData_GetTrainerID ldr r1, [sp, #0x0] lsl r1, r1, #0x2 add r1, r7, r1 @@ -549,11 +549,11 @@ _02025CE8: cmp r0, #0x0 beq _02025D32 add r0, r1, #0x0 - bl FUN_02023928 + bl PlayerData_init ldr r1, [sp, #0x0] add r6, r0, #0x0 add r1, r7, r1 - bl FUN_0202395C + bl CopyPlayerName ldr r1, _02025D3C ; =0x00000109 add r2, r5, r4 ldrb r1, [r2, r1] diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s index 17a80dc8..260e868f 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 FUN_020239D0 + bl PlayerData_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 aec30280..21cad06a 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239A0 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239A0 + bl PlayerData_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 d8604c93..07631ec6 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [sp, #0x8] ldr r0, _0202DBA0 ; =UNK_021C59E4 ldr r0, [r0, #0x0] @@ -137,7 +137,7 @@ FUN_0202DBE0: ; 0x0202DBE0 ldr r0, _0202DCD8 ; =UNK_021C59E4 ldr r0, [r0, #0x0] ldr r0, [r0, #0x4] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr ldr r1, _0202DCD8 ; =UNK_021C59E4 ldr r2, [r1, #0x0] lsl r1, r4, #0x2 @@ -401,7 +401,7 @@ _0202DE0A: strb r4, [r0, #0x0] ldr r0, _0202DE70 ; =UNK_021C59E4 ldr r6, [r0, #0x0] - bl FUN_02023924 + bl PlayerData_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 FUN_02023948 + bl PlayerData_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 0b3f7256..1c18f3e6 100644 --- a/arm9/asm/unk_0202E29C.s +++ b/arm9/asm/unk_0202E29C.s @@ -1092,12 +1092,12 @@ FUN_0202EA9C: ; 0x0202EA9C ble _0202EAC2 bl ErrorHandling _0202EAC2: - bl FUN_02023924 + bl PlayerData_sizeof cmp r0, #0x20 beq _0202EACE bl ErrorHandling _0202EACE: - bl FUN_02023924 + bl PlayerData_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 FUN_020239BC + bl PlayerData_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 FUN_020239BC + bl PlayerData_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 57f7aacc..c7defec6 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr bl FUN_02030F40 cmp r0, #0x0 beq _02033482 diff --git a/arm9/asm/unk_02033874.s b/arm9/asm/unk_02033874.s index 648cf799..3b2b5eaf 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 FUN_020239A0 + bl PlayerData_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 FUN_020239CC + bl PlayerData_GetTrainerGender add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 mov r2, #0x8 bl FUN_020282E8 add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerData_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 FUN_020239CC + bl PlayerData_GetTrainerGender add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 mov r2, #0x8 bl FUN_020282E8 add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerData_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 4366c8a2..8df57f52 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 - bl FUN_020239CC + bl Sav2_GetPlayerDataPtr + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [sp, #0x4] ldr r0, [r5, #0xc] bl SavArray_Flags_get @@ -1880,7 +1880,7 @@ _02035ECC: add r0, r7, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r0, #0x0 add r0, r7, #0x0 bl FUN_0207C2A4 @@ -1928,7 +1928,7 @@ _02035F4A: add r0, r7, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r0, #0x0 add r0, r7, #0x0 bl FUN_0207C2A4 @@ -1985,7 +1985,7 @@ _02035FD0: add r0, r7, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr ldr r1, _0203627C ; =UNK_020F2A90 add r0, r7, #0x0 mov r2, #0xb diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index a69aa9f1..a063db6f 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -752,7 +752,7 @@ FUN_02037C00: ; 0x02037C00 add r0, r4, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -807,7 +807,7 @@ FUN_02037C7C: ; 0x02037C7C add r0, r4, #0x0 bl FUN_0207B000 add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -851,7 +851,7 @@ FUN_02037CF0: ; 0x02037CF0 add r0, r4, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -1250,7 +1250,7 @@ FUN_0203800C: ; 0x0203800C bl FUN_02029FC8 str r0, [r4, #0x10] add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [r5, #0x4] ldr r0, [r4, #0xc] bl SavArray_PlayerParty_get @@ -1405,7 +1405,7 @@ FUN_02038144: ; 0x02038144 ldr r0, [r4, #0xc] bl FUN_02029FC8 str r0, [r5, #0x20] - bl FUN_02023924 + bl PlayerData_sizeof add r1, r0, #0x0 mov r0, #0x20 bl AllocFromHeap @@ -1897,10 +1897,10 @@ _02038572: ; jump table (using 16-bit offset) .short _020385BC - _02038572 - 2; case 6 _02038580: ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr ldr r1, [r4, #0xc] add r1, #0x1c - bl FUN_0202395C + bl CopyPlayerName pop {r3-r5, pc} _02038590: ldr r0, [r5, #0xc] @@ -2107,7 +2107,7 @@ FUN_020386E0: ; 0x020386E0 bl FUN_02029AFC str r0, [r4, #0x18] ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [r4, #0x1c] ldr r0, [r5, #0xc] bl LoadPlayerDataAddress @@ -2311,7 +2311,7 @@ _020388CC: bl LoadPlayerDataAddress str r0, [sp, #0x4] ldr r0, [r4, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [sp, #0x8] ldr r1, [r4, #0x1c] add r0, r4, #0x0 diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 6d65edbc..45743adb 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 FUN_02023928 + bl PlayerData_init add r1, r4, #0x0 add r1, #0xf8 add r6, r6, #0x1 @@ -182,7 +182,7 @@ FUN_02047814: ; 0x02047814 add r5, r1, #0x0 add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [sp, #0x10] ldr r0, [r5, #0xc] bl LoadPlayerDataAddress @@ -203,7 +203,7 @@ FUN_02047814: ; 0x02047814 bl String_ctor add r7, r0, #0x0 ldr r0, [sp, #0x10] - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r2, r0, #0x0 mov r1, #0x1 eor r1, r2 @@ -216,20 +216,20 @@ FUN_02047814: ; 0x02047814 add r0, r4, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_0202395C + bl CopyPlayerName add r0, r7, #0x0 bl String_dtor ldr r0, [sp, #0x18] bl DestroyMsgData ldr r0, [sp, #0x10] - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r2, r0, #0x0 add r0, r4, #0x0 add r0, #0xf8 mov r1, #0x1 ldr r0, [r0, #0x0] eor r1, r2 - bl FUN_020239C8 + bl PlayerData_SetTrainerGender add r0, r4, #0x0 add r1, r5, #0x0 bl FUN_0204806C @@ -468,7 +468,7 @@ FUN_02047A78: ; 0x02047A78 add r4, r1, #0x0 add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r6, r0, #0x0 ldr r0, [r4, #0xc] bl SavArray_PlayerParty_get @@ -612,7 +612,7 @@ FUN_02047BC0: ; 0x02047BC0 ldr r0, [r0, #0xc] str r1, [sp, #0x0] add r7, r2, #0x0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r4, r0, #0x0 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] @@ -783,7 +783,7 @@ FUN_02047D48: ; 0x02047D48 str r1, [sp, #0x0] str r2, [sp, #0x4] add r7, r3, #0x0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [sp, #0x20] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] @@ -953,7 +953,7 @@ _02047E2C: bl FUN_02023A28 add r4, r0, #0x0 ldr r0, [sp, #0x20] - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r1, r4, #0x0 mov r2, #0x1 bl FUN_020536D0 @@ -1010,7 +1010,7 @@ FUN_02047F38: ; 0x02047F38 add r5, r1, #0x0 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r6, r0, #0x0 ldr r0, [r5, #0xc] bl SavArray_PlayerParty_get @@ -1056,7 +1056,7 @@ FUN_02047FA4: ; 0x02047FA4 add r5, r1, #0x0 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr ldr r0, [r5, #0xc] bl SavArray_PlayerParty_get ldr r0, [r5, #0xc] @@ -1233,7 +1233,7 @@ FUN_020480E4: ; 0x020480E4 add r4, r0, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r1, r4, #0x0 add r1, #0x29 strb r0, [r1, #0x0] diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 93dbbb9a..c937f2a5 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 2a914271..78a117e8 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [sp, #0x0] ldr r0, [r4, #0xc] bl FUN_02034E30 @@ -282,7 +282,7 @@ FUN_02048694: ; 0x02048694 bl FUN_0205ED0C str r0, [r5, #0x0] ldr r0, [r4, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [r5, #0x4] ldr r0, [r4, #0xc] bl SavArray_PlayerParty_get @@ -291,8 +291,8 @@ FUN_02048694: ; 0x02048694 bl FUN_02023918 str r0, [r5, #0xc] ldr r0, [r4, #0xc] - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_GetPlayerDataPtr + bl PlayerData_GetTrainerGender str r0, [r5, #0x10] add r0, r6, #0x0 bl FUN_0205ED0C @@ -469,7 +469,7 @@ FUN_02048864: ; 0x02048864 bl FUN_0200AA80 add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r2, r0, #0x0 add r0, r6, #0x0 mov r1, #0x0 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 4555e234..9af7ff73 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 FUN_020238F4 - bl FUN_020239CC + bl Sav2_GetPlayerDataPtr + bl PlayerData_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 FUN_020238F4 - bl FUN_020239CC + bl Sav2_GetPlayerDataPtr + bl PlayerData_GetTrainerGender add r2, r0, #0x0 ldr r0, [r5, #0x34] add r1, r4, #0x0 diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s index aadf8f4c..7614739d 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 010bec23..0d82bdf0 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -1110,7 +1110,7 @@ _0204D37C: lsl r4, r5, #0x3 ldr r7, [r0, #0x0] ldr r0, [sp, #0xc] - bl FUN_020239CC + bl PlayerData_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 FUN_02023928 + bl PlayerData_init mov r3, #0x29 ldr r1, _0204EF48 ; =UNK_021C5A68 add r2, r0, #0x0 @@ -5338,7 +5338,7 @@ _0204F3AC: mov r0, #0x29 lsl r0, r0, #0x4 ldr r0, [r2, r0] - bl FUN_02023AA4 + bl PlayerData_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 FUN_02023AA4 + bl PlayerData_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 FUN_02023928 + bl PlayerData_init add r4, r0, #0x0 mov r0, #0x14 mov r1, #0xf @@ -6060,7 +6060,7 @@ _0204F988: _0204F990: add r0, r4, #0x0 add r1, r5, #0x0 - bl FUN_0202397C + bl PlayerName_StringToFlat mov r0, #0x5b add r1, r4, #0x0 bl FUN_020311D0 @@ -6100,7 +6100,7 @@ FUN_0204F9BC: ; 0x0204F9BC bl FUN_0202393C add r0, r6, #0x0 mov r1, #0xf - bl FUN_020239A0 + bl PlayerData_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 FUN_02023928 + bl PlayerData_init ldr r2, _0204FAC8 ; =UNK_021C5A68 ldr r1, [r2, #0x0] add r3, r1, r4 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index dc21a9c4..5993eeac 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index f7eeac55..ab0f4ac4 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [r4, #0x8] add r0, r4, #0x0 bl FUN_02052E1C @@ -1028,7 +1028,7 @@ FUN_02052734: ; 0x02052734 bl FUN_0202398C add r5, r0, #0x0 add r0, r7, #0x0 - bl FUN_020239CC + bl PlayerData_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 FUN_020239CC + bl PlayerData_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 FUN_020239CC + bl PlayerData_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 FUN_020239BC + bl PlayerData_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 FUN_020239CC + bl PlayerData_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 FUN_020239CC + bl PlayerData_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 FUN_020239CC + bl PlayerData_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 59dd489a..a4d5e2f6 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 FUN_020239BC + bl PlayerData_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 46b1ef06..e844efec 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 FUN_020238F4 - bl FUN_020239CC + bl Sav2_GetPlayerDataPtr + bl PlayerData_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 e8178beb..abb8b529 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -1786,7 +1786,7 @@ FUN_0205DBF0: ; 0x0205DBF0 str r0, [r4, #0x10] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 8580b994..8d8bb8ba 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 FUN_020238F4 - bl FUN_020239CC + bl Sav2_GetPlayerDataPtr + bl PlayerData_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 2e8b043f..b34d5f4a 100644 --- a/arm9/asm/unk_0205FA2C.s +++ b/arm9/asm/unk_0205FA2C.s @@ -188,7 +188,7 @@ FUN_0205FB34: ; 0x0205FB34 add r0, r4, #0x0 bl FUN_0207B000 add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 89d2f88e..e4d492db 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239D0 + bl PlayerData_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 5788ef4f..93cbed7e 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [sp, #0x18] mov r0, #0x4 bl AllocMonZeroed str r0, [sp, #0x1c] bl ZeroMonData ldr r0, [sp, #0x18] - bl FUN_020239C0 + bl PlayerData_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 e050902b..aafce80a 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -1643,7 +1643,7 @@ FUN_02061850: ; 0x02061850 push {r3-r5, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_02023924 + bl PlayerData_sizeof str r0, [r5, #0x0] add r0, r4, #0x0 add r1, r5, #0x4 @@ -1659,7 +1659,7 @@ FUN_02061868: ; 0x02061868 add r5, r1, #0x0 bl MOD06_02248B60 add r4, r0, #0x0 - bl FUN_02023924 + bl PlayerData_sizeof ldr r1, [r4, #0x0] cmp r1, r0 beq _02061884 diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s index 57e5b43a..cc8744cb 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 94a4ffde..de819682 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #0x1 - bl FUN_020239D0 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #0x2 - bl FUN_020239D0 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #0x4 - bl FUN_020239D0 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #0x5 - bl FUN_020239D0 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #0x3 - bl FUN_020239D0 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #0x0 - bl FUN_020239D0 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #0x7 - bl FUN_020239D0 + bl PlayerData_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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #0x6 - bl FUN_020239D0 + bl PlayerData_TestBadgeFlag cmp r0, #0x0 bne _02063FA6 mov r0, #0x2 diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s index ae175ec8..ef39e346 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr 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 FUN_020239C0 + bl PlayerData_GetTrainerID_VisibleHalf str r0, [sp, #0x28] add r0, r7, #0x0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender str r0, [sp, #0x2c] add r0, r7, #0x0 bl FUN_0202398C str r0, [sp, #0x30] add r0, r7, #0x0 - bl FUN_02023A10 + bl PlayerData_GetMoney str r0, [sp, #0x34] ldr r0, [r6, #0xc] bl FUN_02024DA0 @@ -520,7 +520,7 @@ FUN_020652AC: ; 0x020652AC _020652CA: ldr r0, [sp, #0x0] add r1, r4, #0x0 - bl FUN_020239D0 + bl PlayerData_TestBadgeFlag cmp r0, #0x0 beq _020652E6 lsl r0, r4, #0x2 diff --git a/arm9/asm/unk_02066840.s b/arm9/asm/unk_02066840.s index a7031b20..c8a523c6 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r4, r0, #0x0 add r0, r6, #0x0 bl FUN_02029AFC @@ -32,7 +32,7 @@ FUN_02066840: ; 0x02066840 mov r2, #0x10 bl MI_CpuCopy8 add r0, r4, #0x0 - bl FUN_020239BC + bl PlayerData_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 FUN_020239CC + bl PlayerData_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 5099fa54..36b997de 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 ; =FUN_02023924 + ldr r3, _0206C00C ; =PlayerData_sizeof bx r3 .balign 4 -_0206C00C: .word FUN_02023924 +_0206C00C: .word PlayerData_sizeof thumb_func_start FUN_0206C010 FUN_0206C010: ; 0x0206C010 @@ -418,7 +418,7 @@ _0206C238: mov r0, #0x0 pop {r4, pc} _0206C246: - bl FUN_02023924 + bl PlayerData_sizeof add r4, #0x20 add r2, r0, #0x0 mov r0, #0x19 @@ -995,7 +995,7 @@ FUN_0206C66C: ; 0x0206C66C add r0, r4, #0x0 bl CopyU16StringArray add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerData_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 FUN_020239CC + bl PlayerData_GetTrainerGender strb r0, [r4, #0x16] mov r0, #0x0 add r1, r4, #0x0 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 15d30776..61d64181 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -4781,10 +4781,10 @@ FUN_0207C2A4: ; 0x0207C2A4 bl FUN_0202398C str r0, [r5, #0x8] add r0, r4, #0x0 - bl FUN_020239BC + bl PlayerData_GetTrainerID str r0, [r5, #0xc] add r0, r4, #0x0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender strb r0, [r5, #0x10] pop {r3-r5, pc} diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 9e7642aa..f234ac67 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 FUN_020239BC + bl PlayerData_GetTrainerID str r0, [sp, #0x4] add r0, r4, #0x0 - bl FUN_020239CC + bl PlayerData_GetTrainerGender str r0, [sp, #0x0] add r0, r4, #0x0 add r1, r6, #0x0 - bl FUN_020239A0 + bl PlayerData_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 a1d4b4a4..4d468bc2 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr mov r1, #0xb str r0, [sp, #0x0] - bl FUN_020239A0 + bl PlayerData_GetPlayerName_NewString add r5, r0, #0x0 mov r1, #0x0 add r0, sp, #0x4 @@ -943,7 +943,7 @@ _02081304: ldr r1, [r6, #0xc] bl StringCopy ldr r0, [r6, #0x10] - bl FUN_020239CC + bl PlayerData_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 FUN_020239CC + bl PlayerData_GetTrainerGender cmp r0, #0x0 bne _02081384 mov r1, #0xba @@ -977,7 +977,7 @@ _02081384: strh r1, [r4, r0] b _020813A8 _0208138E: - bl FUN_020239CC + bl PlayerData_GetTrainerGender cmp r0, #0x0 bne _020813A0 mov r0, #0x45 @@ -1792,7 +1792,7 @@ _020819A2: add r1, #0xe8 ldr r1, [r1, #0x0] add r0, r7, #0x0 - bl FUN_02023990 + bl PlayerName_FlatToString ldr r0, _020819F0 ; =0x00000127 add r5, r5, #0x1 ldrb r0, [r4, r0] @@ -2262,7 +2262,7 @@ _02081D3C: _02081D4C: add r0, r5, #0x0 bl FUN_0202DFA4 - bl FUN_020239CC + bl PlayerData_GetTrainerGender add r1, r4, r5 strb r0, [r1, r7] ldrb r0, [r4, r6] diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 98f5d44f..1b7a5cc4 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr add r7, r0, #0x0 ldr r0, [r6, #0x1c] ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index 9fd82bab..e07e51d7 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 FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [r7, #0xc] add r0, r4, #0x0 bl SavArray_PlayerParty_get diff --git a/arm9/asm/unk_02088814.s b/arm9/asm/unk_02088814.s index 8e6bf6a1..a0d2abc6 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, FUN_02023924, 0x00000000 + .word FUN_020526B4, PlayerData_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 4d274b76..f39ccd55 100644 --- a/arm9/asm/unk_0208890C.s +++ b/arm9/asm/unk_0208890C.s @@ -27,7 +27,7 @@ FUN_0208890C: ; 0x0208890C bl FUN_02028048 str r0, [r4, #0x8] add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_GetPlayerDataPtr str r0, [r4, #0x10] add r0, r5, #0x0 bl FUN_0206F158 |