diff options
Diffstat (limited to 'arm9/modules')
46 files changed, 623 insertions, 623 deletions
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index 39ef4e7b..81ff471b 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -220,7 +220,7 @@ MOD05_021D825C: ; 0x021D825C pop {r4, r5, r6, pc} _021D827C: ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0 bne _021D8290 @@ -318,11 +318,11 @@ _021D8342: lsr r0, r0, #0x1f bne _021D8384 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_0204A248 add r6, r0, #0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #1 bne _021D8366 @@ -346,7 +346,7 @@ _021D8384: lsr r0, r0, #0x1f beq _021D83A6 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED5C add r0, r4, #0 bl MOD05_021D8D24 @@ -376,7 +376,7 @@ _021D83C2: bl FUN_02057020 add r7, r0, #0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #2 bl FUN_0205F264 cmp r0, #0 @@ -385,7 +385,7 @@ _021D83C2: orr r6, r0 _021D83E4: ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0x7f bl FUN_0204A138 cmp r0, #0xff @@ -1050,7 +1050,7 @@ MOD05_021D8954: ; 0x021D8954 add r2, sp, #0 bl MOD05_021D90F8 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #1 bne _021D8998 @@ -1448,7 +1448,7 @@ _021D8C88: cmp r0, #2 beq _021D8CE0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0 ldr r0, [r5, #0x38] bl FUN_02055320 @@ -1467,11 +1467,11 @@ _021D8C88: beq _021D8CE0 add r0, r6, #0 mov r1, #4 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0 beq _021D8CE0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0x39 bl FUN_0204A138 cmp r0, #0xff @@ -1611,7 +1611,7 @@ _021D8DFC: bl MOD05_021D8FD0 _021D8E0C: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F56C mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -1762,7 +1762,7 @@ MOD05_021D8F38: ; 0x021D8F38 push {r3, r4, r5, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r5, r0, #0 ldr r0, [r4, #0xc] bl FUN_02023D58 @@ -1821,7 +1821,7 @@ MOD05_021D8FA8: ; 0x021D8FA8 push {r3, r4, r5, lr} ldr r0, [r0, #0xc] mov r5, #0 - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0 bl FUN_0205F780 add r0, r0, #1 @@ -1842,7 +1842,7 @@ MOD05_021D8FD0: ; 0x021D8FD0 push {r3, r4, r5, r6, r7, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] @@ -1874,7 +1874,7 @@ MOD05_021D9010: ; 0x021D9010 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r4, r0, #0 ldr r0, [r5, #0xc] bl FUN_02034E30 @@ -1937,7 +1937,7 @@ MOD05_021D9090: ; 0x021D9090 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0 bne _021D90A6 diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index daf7b4ce..018f4d8c 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -26,7 +26,7 @@ _021E1396: bl memset str r7, [r4, #4] ldr r0, [r7, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get str r0, [r4, #8] mov r0, #0x45 lsl r0, r0, #2 @@ -388,7 +388,7 @@ MOD05_021E1654: ; 0x021E1654 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 ldr r0, [r7, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0 bl FUN_0205F41C add r6, r0, #0 @@ -553,7 +553,7 @@ MOD05_021E17A0: ; 0x021E17A0 add r5, r0, #0 ldr r0, [r5, #4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get str r0, [sp] mov r0, #0x11 lsl r0, r0, #4 @@ -568,7 +568,7 @@ _021E17BE: bl MOD05_021E1848 add r1, r0, #0 ldr r0, [r5, #4] - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0 bne _021E17DE ldr r1, [r4, #0x10] @@ -712,7 +712,7 @@ _021E18DC: cmp r1, r7 beq _021E18F0 add r0, r6, #0 - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0 bne _021E18F0 lsl r0, r4, #0x10 @@ -737,7 +737,7 @@ MOD05_021E1908: ; 0x021E1908 ldr r0, [r0, #0xc] add r5, r1, #0 add r4, r2, #0 - bl FUN_020462AC + bl SavArray_Flags_get cmp r4, #0 beq _021E192C add r1, r4, #0 diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 8dba7426..3beaf558 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -340,7 +340,7 @@ MOD05_021E1D38: ; 0x021E1D38 ldr r0, [r0] ldr r1, [r1, #0x1c] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0x9b ldrb r2, [r0] @@ -782,7 +782,7 @@ MOD05_021E2094: ; 0x021E2094 ldr r0, [r0] ldr r1, [r1, #0x1c] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0x9b ldrb r1, [r0] @@ -1201,7 +1201,7 @@ MOD05_021E23D0: ; 0x021E23D0 ldr r0, [r0] add r1, r6, #0 add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] str r7, [sp, #4] @@ -1373,7 +1373,7 @@ MOD05_021E2540: ; 0x021E2540 ldr r0, [r0] add r1, r6, #0 add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders str r7, [sp] mov r0, #0xff str r0, [sp, #4] @@ -1827,8 +1827,8 @@ MOD05_021E28A0: ; 0x021E28A0 bl NewString_ReadMsgData str r0, [sp, #0x10] ldr r0, [r7, #0xc] - bl FUN_020238F4 - bl FUN_02023A10 + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetMoney add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -1840,7 +1840,7 @@ MOD05_021E28A0: ; 0x021E28A0 ldr r2, [sp, #0x10] add r0, r6, #0 add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -1955,8 +1955,8 @@ MOD05_021E29C8: ; 0x021E29C8 bl NewString_ReadMsgData str r0, [sp, #0x10] ldr r0, [r6, #0xc] - bl FUN_0202390C - bl FUN_02028930 + bl Sav2_PlayerData_GetCoinsAddr + bl CheckCoins add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -1968,7 +1968,7 @@ MOD05_021E29C8: ; 0x021E29C8 ldr r2, [sp, #0x10] add r0, r5, #0 add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -2088,7 +2088,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 ldr r2, [sp, #0x10] add r0, r5, #0 add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 6e557880..bcebfd49 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -93,8 +93,8 @@ _021E2C16: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} - thumb_func_start MOD05_021E2C24 -MOD05_021E2C24: ; 0x021E2C24 + thumb_func_start MOD05_ShowMessageInField +MOD05_ShowMessageInField: ; 0x021E2C24 push {r4, r5, r6, lr} sub sp, #0x18 add r5, r0, #0 @@ -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 @@ -311,7 +311,7 @@ MOD05_021E2DD4: ; 0x021E2DD4 ldr r0, [r4, #8] ldr r1, [r4] ldr r2, [r4, #4] - bl FUN_0200B7B8 + bl StringExpandPlaceholders pop {r4, pc} .balign 4, 0 @@ -9333,7 +9333,7 @@ MOD05_021E72E8: ; 0x021E72E8 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0 bl GetPartyMonByIndex pop {r4, pc} @@ -11529,10 +11529,10 @@ _021E8344: _021E8346: str r0, [r5] add r0, r4, #0 - bl FUN_020238F4 + 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 FUN_020239F4 + bl PlayerProfile_CountBadges add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -11583,7 +11583,7 @@ _021E83A8: mov r1, #3 bl FUN_0200AD38 ldr r0, [r4, #0xc] - bl FUN_02029EBC + bl GetIGTHours add r2, r0, #0 cmp r2, #0x64 blt _021E83C8 @@ -11607,7 +11607,7 @@ _021E83D6: mov r1, #4 bl FUN_0200AD38 ldr r0, [r4, #0xc] - bl FUN_02029EC0 + bl GetIGTMinutes mov r3, #2 add r2, r0, #0 str r3, [sp] @@ -18589,8 +18589,8 @@ _021EBCC4: .word UNK05_021F7970 MOD05_021EBCC8: ; 0x021EBCC8 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020238F4 - bl FUN_020239CC + 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 FUN_020238F4 - bl FUN_0202398C + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetNamePtr add r0, r4, #0 mov r1, #0x74 add r2, sp, #0xc @@ -19634,7 +19634,7 @@ _021EC544: bl FUN_02023CA0 ldr r1, [sp] add r0, r6, #0 - bl FUN_0206B938 + bl RemoveMonFromParty ldr r1, _021EC578 ; =0x000001B9 add r0, r6, #0 bl PartyHasMon @@ -19828,7 +19828,7 @@ _021EC6E0: _021EC6FA: ldr r0, [sp] add r1, r4, #0 - bl FUN_0206B900 + bl AddMonToParty add r0, r5, #0 bl ZeroBoxMonData add r0, r6, #0 @@ -20947,14 +20947,14 @@ _021ECF7E: cmp r0, #4 bne _021ECFEE add r0, r4, #0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID str r0, [sp, #0x1c] add r0, r4, #0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender str r0, [sp, #0x18] add r0, r4, #0 mov r1, #0x20 - bl FUN_020239A0 + 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 FUN_020239BC + bl PlayerProfile_GetTrainerID add r1, sp, #0x10 str r0, [sp, #8] ldrb r1, [r1, #1] @@ -21149,7 +21149,7 @@ _021ED168: bl SetMonData ldr r0, [sp, #4] add r1, r4, #0 - bl FUN_0206B900 + bl AddMonToParty add r0, r5, #0 bl MOD05_021ECD64 add r0, r4, #0 @@ -26557,7 +26557,7 @@ MOD05_021EFAAC: ; 0x021EFAAC bl FUN_0204C1A8 add r4, r0, #0 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0 add r0, r4, #0 bl FUN_0204BEC8 @@ -26601,7 +26601,7 @@ MOD05_021EFB14: ; 0x021EFB14 bl FUN_0204C1A8 add r4, r0, #0 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0 add r0, r4, #0 bl FUN_0204BEC8 @@ -26629,7 +26629,7 @@ MOD05_021EFB50: ; 0x021EFB50 bl FUN_0204C1A8 add r4, r0, #0 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0 add r0, r4, #0 bl FUN_0204BEC8 @@ -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,14 +27230,14 @@ _021F000E: bl FUN_020286EC add r7, r0, #0 mov r0, #4 - bl FUN_02023928 + bl PlayerProfile_init add r6, r0, #0 add r0, r7, #0 add r1, r4, #0 bl FUN_020283A4 add r1, r0, #0 add r0, r6, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r5, #0x38] mov r1, #0 add r2, r6, #0 @@ -27473,7 +27473,7 @@ _021F0204: ldr r0, [r4, #0x38] ldr r1, [r4, #0xc] ldr r2, [r4, #8] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r4, #0x30] add r1, r4, #0 ldr r0, [r0, #8] @@ -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] @@ -34755,7 +34755,7 @@ MOD05_021F3A18: ; 0x021F3A18 add r4, r0, #0 ldr r0, [r4, #0xc] add r5, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0 bl GetPartyMonByIndex mov r1, #5 @@ -34773,7 +34773,7 @@ MOD05_021F3A18: ; 0x021F3A18 bl MOD05_021F39A0 add r6, r0, #0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F3E8 add r1, sp, #4 strh r0, [r1] @@ -34824,14 +34824,14 @@ MOD05_021F3AB4: ; 0x021F3AB4 add r4, r0, #0 ldr r0, [r4, #0xc] add r5, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0 bl GetPartyMonByIndex bl MOD05_021F38CC add r1, sp, #0 strh r0, [r1] ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r1, sp, #0 ldrh r1, [r1] bl FUN_0205F3F8 @@ -34896,7 +34896,7 @@ MOD05_021F3B4C: ; 0x021F3B4C add r4, r1, #0 add r6, r2, #0 add r7, r3, #0 - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F3E8 add r1, sp, #4 strh r0, [r1] @@ -34920,7 +34920,7 @@ MOD05_021F3B7C: ; 0x021F3B7C ldr r0, [r5, #0xc] add r4, r3, #0 add r7, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0 bl GetPartyMonByIndex mov r1, #5 @@ -37402,8 +37402,8 @@ _021F4DDE: lsl r0, r0, #4 str r0, [r4] ldr r0, [r6, #0xc] - bl FUN_020238F4 - bl FUN_020239BC + 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 @@ -40043,9 +40043,9 @@ MOD05_021F6140: ; 0x021F6140 ldr r0, [r5, #0x34] ldr r1, [r5, #0x2c] ldr r2, [r5, #0x30] - bl FUN_0200B7B8 + 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 485937c9..164e4d16 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -4844,7 +4844,7 @@ MOD06_0223BA04: ; 0x0223BA04 pop {r4, r5, r6, r7, pc} _0223BA42: ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r7, r0, #0 add r0, r5, #0 bl FUN_02034CE0 @@ -4942,7 +4942,7 @@ _0223BB0C: pop {r4, r5, r6, r7, pc} _0223BB18: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0 beq _0223BB2C @@ -5003,7 +5003,7 @@ _0223BB98: cmp r0, #0 bne _0223BBB6 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 str r0, [sp, #0x18] ldr r1, [sp, #0x18] @@ -5087,7 +5087,7 @@ _0223BBDA: b _0223BCCC _0223BC5A: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F368 ldr r1, [sp, #0x2c] mov r2, #0xb @@ -5193,7 +5193,7 @@ MOD06_0223BD14: ; 0x0223BD14 _0223BD2E: ldr r0, [sp, #8] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0 bl GetPartyMonByIndex str r0, [sp, #0x14] @@ -5232,7 +5232,7 @@ _0223BD80: _0223BD8A: ldr r0, [sp, #8] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 add r1, r0, #0 ldr r0, [sp, #8] @@ -5370,7 +5370,7 @@ MOD06_0223BE70: ; 0x0223BE70 pop {r4, r5, r6, r7, pc} _0223BEA4: ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r6, r0, #0 add r0, r5, #0 bl FUN_02034CE0 @@ -5394,7 +5394,7 @@ _0223BEA4: str r1, [sp, #0x2c] str r1, [r0, #0xc] ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0 beq _0223BEF0 @@ -5440,7 +5440,7 @@ _0223BF3C: cmp r0, #0 bne _0223BF5A ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 str r0, [sp, #0x14] ldr r1, [sp, #0x14] @@ -5524,7 +5524,7 @@ _0223BF7E: b _0223C06A _0223BFFE: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F368 ldr r1, [sp, #0x24] mov r2, #0xb @@ -5626,7 +5626,7 @@ MOD06_0223C08C: ; 0x0223C08C pop {r4, r5, r6, r7, pc} _0223C0CE: ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r6, r0, #0 add r0, r5, #0 bl FUN_02034CE0 @@ -5696,7 +5696,7 @@ _0223C162: str r0, [r1, #0xc] str r0, [sp, #0x48] ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0 beq _0223C184 @@ -5750,7 +5750,7 @@ _0223C1E0: cmp r0, #0 bne _0223C1FE ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 str r0, [sp, #0x18] ldr r1, [sp, #0x18] @@ -5834,7 +5834,7 @@ _0223C222: b _0223C2DC _0223C2A2: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F368 ldr r1, [r4] mov r2, #0xb @@ -5931,8 +5931,8 @@ _0223C350: bne _0223C38C add r0, r5, #0 bl FUN_020377AC - bl FUN_020238F4 - bl FUN_020239BC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerID str r0, [sp] ldr r0, [sp, #0x34] mov r2, #1 @@ -7181,7 +7181,7 @@ MOD06_0223CCDC: ; 0x0223CCDC bl MOD05_021F51D0 str r0, [sp, #8] ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0 bl GetPartyMonByIndex str r0, [sp, #0xc] @@ -7257,7 +7257,7 @@ MOD06_0223CD7C: ; 0x0223CD7C ldr r0, [r5, #0xc] add r7, r1, #0 add r6, r3, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0 bl GetPartyMonByIndex add r4, r0, #0 @@ -7702,7 +7702,7 @@ MOD06_0223D044: ; 0x0223D044 bl SetMonData ldr r0, [r6, #8] add r1, r4, #0 - bl FUN_0206B900 + bl AddMonToParty cmp r0, #0 bne _0223D0D8 bl ErrorHandling @@ -7911,7 +7911,7 @@ _0223D25C: lsl r0, r0, #2 add r0, r7, r0 ldr r0, [r0, #4] - bl FUN_0206B900 + bl AddMonToParty add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -8031,8 +8031,8 @@ _0223D342: strb r0, [r4, #0x11] _0223D344: ldr r0, [r6, #0xc] - bl FUN_020238F4 - bl FUN_020239BC + 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 FUN_020238F4 + 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] @@ -8139,7 +8139,7 @@ MOD06_0223D3D0: ; 0x0223D3D0 lsl r1, r1, #2 str r0, [r4, r1] ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x22 lsl r1, r1, #4 str r0, [r4, r1] @@ -9418,7 +9418,7 @@ MOD06_0223DE34: ; 0x0223DE34 ldr r0, [r0] add r1, r4, #0 add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -9506,7 +9506,7 @@ _0223DF30: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02023A10 + bl PlayerProfile_GetMoney add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -9522,7 +9522,7 @@ _0223DF30: ldr r0, [r0] add r1, r4, #0 add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -9660,7 +9660,7 @@ _0223E034: str r0, [r5, r1] sub r1, #0x3c ldr r0, [r5, r1] - bl FUN_02023A10 + bl PlayerProfile_GetMoney mov r2, #0x92 lsl r2, r2, #2 ldr r1, [r5, r2] @@ -9679,7 +9679,7 @@ _0223E034: ldr r0, [r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor mov r2, #0x23 @@ -9734,7 +9734,7 @@ _0223E124: ldr r0, [r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor mov r2, #0x23 @@ -9864,7 +9864,7 @@ _0223E214: ldr r0, [r0] add r1, r6, #0 add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r1, [sp] mov r0, #0xff @@ -10072,7 +10072,7 @@ _0223E418: ldr r0, [r0] ldr r1, [r4, r1] add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 bl String_dtor mov r2, #0x23 @@ -10137,7 +10137,7 @@ _0223E450: ldr r0, [r0] ldr r1, [r4, r1] add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 bl String_dtor mov r2, #0x23 @@ -10204,7 +10204,7 @@ _0223E50A: ldr r0, [r0] add r1, r4, #0 add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #8 str r0, [sp] mov r0, #0xff @@ -10244,7 +10244,7 @@ _0223E50A: ldr r0, [r0] add r1, r4, #0 add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -10423,7 +10423,7 @@ _0223E704: ldr r0, [r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -10538,7 +10538,7 @@ _0223E7F6: ldr r3, [r4, r1] ldrsh r1, [r4, r2] mul r1, r3 - bl FUN_02023A54 + bl PlayerProfile_SubMoney mov r3, #0x87 lsl r3, r3, #2 add r2, r3, #0 @@ -10638,7 +10638,7 @@ _0223E88A: ldr r0, [r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -10880,7 +10880,7 @@ _0223EA74: ldr r0, [r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor mov r2, #0x23 @@ -10941,7 +10941,7 @@ MOD06_0223EB2C: ; 0x0223EB2C ldr r0, [r0] ldr r1, [r4, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor add r1, r4, #0 @@ -11223,7 +11223,7 @@ _0223ED66: ldr r0, [r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor mov r2, #0x23 @@ -11272,7 +11272,7 @@ _0223EDE6: ldr r0, [r2, #0x58] ldr r1, [r2, #0x14] ldr r2, [r2, #0x10] - bl FUN_0200B7B8 + bl StringExpandPlaceholders b _0223EE16 _0223EE08: ldr r0, _0223EE70 ; =0x02252420 @@ -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 FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r1, _0223EFF4 ; =0x02252420 ldr r1, [r1] str r0, [r1, #0x78] mov r0, #4 - bl FUN_02023928 + bl PlayerProfile_init ldr r1, _0223EFF4 ; =0x02252420 ldr r2, [r1] str r0, [r2, #0x7c] @@ -11718,7 +11718,7 @@ _0223F11A: ldr r2, [r0] ldr r0, [r2, #0x50] ldmia r2!, {r1, r2} - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _0223F26C ; =0x02252420 mov r1, #0 ldr r2, [r0] @@ -11734,7 +11734,7 @@ _0223F11A: ldr r0, _0223F26C ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x7c] - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r2, r0, #0 mov r1, #2 lsl r2, r2, #0x10 @@ -11758,7 +11758,7 @@ _0223F11A: ldr r0, [r2, #0x50] ldr r1, [r2, #8] ldr r2, [r2, #0xc] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _0223F26C ; =0x02252420 mov r1, #0 ldr r2, [r0] @@ -11794,7 +11794,7 @@ _0223F21C: ldr r2, [r0] ldr r0, [r2, #0x50] ldmia r2!, {r1, r2} - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _0223F26C ; =0x02252420 mov r1, #0 ldr r2, [r0] @@ -11923,7 +11923,7 @@ MOD06_0223F344: ; 0x0223F344 ldr r0, _0223F3B4 ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x78] - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -11947,7 +11947,7 @@ MOD06_0223F344: ; 0x0223F344 ldr r0, [r2, #0x54] ldr r1, [r2, #0x1c] ldr r2, [r2, #0x18] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _0223F3B4 ; =0x02252420 mov r3, #2 ldr r2, [r0] @@ -12001,7 +12001,7 @@ _0223F3E0: ldr r2, [r4] ldr r0, [r2, #0x50] ldmia r2!, {r1, r2} - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, [r4] mov r2, #0 ldr r0, [r1, #0x64] @@ -12480,7 +12480,7 @@ _0223F7E0: ldr r2, [r0] ldr r0, [r2, #0x50] ldmia r2!, {r1, r2} - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _0223F898 ; =0x02252420 lsl r4, r4, #4 ldr r2, [r0] @@ -12496,7 +12496,7 @@ _0223F7E0: add r0, sp, #0xc ldrh r0, [r0] bl FUN_0202DFA4 - bl FUN_020239C0 + bl PlayerProfile_GetTrainerID_VisibleHalf mov r1, #2 add r2, r0, #0 str r1, [sp] @@ -12518,7 +12518,7 @@ _0223F7E0: ldr r0, [r2, #0x50] ldr r1, [r2, #8] ldr r2, [r2, #0xc] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _0223F898 ; =0x02252420 mov r1, #0 ldr r2, [r0] @@ -12739,7 +12739,7 @@ _0223FA02: ldr r0, [r2, #0x54] ldr r1, [r2, #0x18] ldr r2, [r2, #0x1c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _0223FA5C ; =0x02252420 mov r3, #2 ldr r2, [r0] @@ -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 @@ -14500,10 +14500,10 @@ _022408A6: ldr r0, [r5, #0x64] ldr r1, [r5, #0x18] ldr r2, [r5, #0x14] - bl FUN_0200B7B8 + 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] @@ -14621,7 +14621,7 @@ _02240998: ldr r0, [r5, #0x64] ldr r1, [r5, #0x20] ldr r2, [r5, #0x1c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r5, #8] ldr r1, [r5, #0x20] add r2, r4, #0 @@ -15006,7 +15006,7 @@ MOD06_02240C58: ; 0x02240C58 ldr r1, [sp, #0x28] ldr r2, [sp, #0x2c] add r0, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r1, [sp] mov r0, #0xff @@ -15223,7 +15223,7 @@ _02240E8C: ldr r1, [sp, #0x28] ldr r2, [sp, #0x2c] add r0, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 ldr r1, [sp, #0x28] add r2, r0, #0 @@ -15300,7 +15300,7 @@ MOD06_02240F40: ; 0x02240F40 add r4, r0, #0 ldr r0, [r4, #0x10] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r0, #0 ldr r0, [r4, #0x10] ldr r2, [r4, #0x6c] @@ -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 @@ -19488,7 +19488,7 @@ MOD06_02243080: ; 0x02243080 ldr r0, [r5, #0x58] add r1, r6, #0 add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] add r5, #0x14 @@ -19798,7 +19798,7 @@ MOD06_022432E4: ; 0x022432E4 sub sp, #0x28 str r0, [sp] add r0, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #4] bl GetPartyCount lsl r0, r0, #0x18 @@ -19929,7 +19929,7 @@ MOD06_022433B8: ; 0x022433B8 mov r0, #0 str r0, [r4, #0x10] ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F154 pop {r4, r5, r6, pc} .align 2, 0 @@ -19938,7 +19938,7 @@ MOD06_022433B8: ; 0x022433B8 MOD06_022433F8: ; 0x022433F8 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F164 pop {r3, pc} .align 2, 0 @@ -20211,8 +20211,8 @@ _0224356C: bl MOD06_02244A80 _0224362A: add r0, r6, #0 - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender strb r0, [r4, #0x11] ldrb r0, [r4, #0xf] cmp r0, #5 @@ -20327,7 +20327,7 @@ _02243706: pop {r4, r5, r6, r7, pc} _02243716: add r0, r2, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #8] ldrb r0, [r5, #0xe] mov r4, #0 @@ -20383,7 +20383,7 @@ MOD06_02243780: ; 0x02243780 sub sp, #0x1c str r0, [sp] add r0, r1, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #4] ldr r0, [sp] mov r5, #0 @@ -20638,7 +20638,7 @@ MOD06_02243938: ; 0x02243938 bne _02243980 _0224394A: ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldrb r1, [r5, #0xf] cmp r1, #0 bne _0224396C @@ -21506,7 +21506,7 @@ MOD06_02243FDC: ; 0x02243FDC mov r2, #1 add r1, sp, #8 strb r2, [r1] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp] mov r7, #0 ldrb r0, [r5, #0xe] @@ -21729,7 +21729,7 @@ MOD06_02244190: ; 0x02244190 str r0, [sp, #4] bl MI_CpuFill8 add r0, r4, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldr r5, [sp, #4] add r7, r0, #0 mov r4, #0 @@ -22189,7 +22189,7 @@ MOD06_02244558: ; 0x02244558 bl FUN_020476CC add r7, r0, #0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #4] add r0, r7, #0 add r1, r4, #0 @@ -22206,7 +22206,7 @@ MOD06_02244558: ; 0x02244558 add r4, r0, #0 ldrb r1, [r5, #0xe] ldr r0, [r7, #4] - bl FUN_0206B8CC + bl InitPartyWithMaxSize ldrb r0, [r5, #0xe] mov r6, #0 cmp r0, #0 @@ -22396,12 +22396,12 @@ MOD06_022446FC: ; 0x022446FC add r4, r1, #0 add r6, r0, #0 add r0, r4, #0 - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender ldr r1, _02244750 ; =0x0000083E strh r0, [r6, r1] add r0, r4, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r7, r0, #0 mov r4, #0 add r5, r6, #0 @@ -23257,7 +23257,7 @@ _02244D8A: bl MOD06_02244388 ldr r0, [r7, #4] add r1, r4, #0 - bl FUN_0206B900 + bl AddMonToParty ldr r0, [sp] add r6, r6, #1 add r5, #0x38 @@ -31000,9 +31000,9 @@ _0224886C: bl AllocMonZeroed str r0, [r4, #4] add r0, r5, #0 - bl FUN_02023928 + bl PlayerProfile_init str r0, [r4, #8] - bl FUN_02023948 + bl PlayerProfile_Clear add r0, r5, #0 add r1, r6, #4 bl MOD06_022489AC @@ -31014,11 +31014,11 @@ _0224886C: bl String_dtor ldr r0, [r4, #8] add r1, sp, #4 - bl FUN_0202395C + bl CopyPlayerName ldr r1, [r4] ldr r0, [r4, #8] ldr r1, [r1, #0x40] - bl FUN_020239C8 + bl PlayerProfile_SetTrainerGender add r0, r4, #0 add sp, #0x104 pop {r3, r4, r5, r6, pc} @@ -31059,10 +31059,10 @@ MOD06_022488FC: ; 0x022488FC ldr r0, [r5, #0xc] add r4, r1, #0 add r6, r2, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldr r2, [r4, #4] add r1, r6, #0 - bl FUN_0206B9DC + bl ReplacePartySlotWithMon ldr r0, [r5, #0xc] ldr r1, [r4, #4] bl FUN_0202C144 @@ -31077,7 +31077,7 @@ MOD06_0224891C: ; 0x0224891C add r7, r2, #0 add r5, r1, #0 add r4, r3, #0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r7, #0 bl GetPartyMonByIndex mov r1, #0xa0 @@ -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 FUN_020238F4 + 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 FUN_020239CC + 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 FUN_020238F4 + 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 FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r0, #0 add r0, r4, #0 bl MOD06_02248B18 @@ -32097,7 +32097,7 @@ MOD06_022490F0: ; 0x022490F0 MOD06_022490F4: ; 0x022490F4 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #2 mov r2, #7 bl FUN_0205F2E4 @@ -32108,7 +32108,7 @@ MOD06_022490F4: ; 0x022490F4 MOD06_02249108: ; 0x02249108 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #2 add r2, r1, #0 bl FUN_0205F2E4 @@ -32119,7 +32119,7 @@ MOD06_02249108: ; 0x02249108 MOD06_0224911C: ; 0x0224911C push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #2 mov r2, #9 bl FUN_0205F2E4 @@ -32130,7 +32130,7 @@ MOD06_0224911C: ; 0x0224911C MOD06_02249130: ; 0x02249130 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #2 mov r2, #0xa bl FUN_0205F2E4 @@ -32141,7 +32141,7 @@ MOD06_02249130: ; 0x02249130 MOD06_02249144: ; 0x02249144 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #2 mov r2, #0xb bl FUN_0205F2E4 @@ -32152,7 +32152,7 @@ MOD06_02249144: ; 0x02249144 MOD06_02249158: ; 0x02249158 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #2 mov r2, #0x11 bl FUN_0205F2E4 @@ -32163,8 +32163,8 @@ MOD06_02249158: ; 0x02249158 MOD06_0224916C: ; 0x0224916C push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020238F4 - bl FUN_020239F4 + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_CountBadges cmp r0, #5 blt _02249180 mov r0, #1 @@ -32195,7 +32195,7 @@ MOD06_02249194: ; 0x02249194 MOD06_022491A4: ; 0x022491A4 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED0C pop {r3, pc} .align 2, 0 @@ -38773,7 +38773,7 @@ _0224C476: mov r2, #0 bl MOD05_021DA4EC ldr r0, _0224C51C ; =0x0000048E - bl FUN_02005C28 + bl PlayBGM ldrb r0, [r4, #0xf] add r0, r0, #1 strb r0, [r4, #0xf] @@ -40474,7 +40474,7 @@ MOD06_0224D14C: ; 0x0224D14C lsr r0, r0, #0x18 str r0, [sp, #0x20] add r0, r4, #0 - bl FUN_020239C0 + 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 FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0 ldr r0, [r4, #0x14] mov r1, #0 @@ -40909,7 +40909,7 @@ MOD06_0224D46C: ; 0x0224D46C ldr r0, [r4, #0x14] add r1, r6, #0 add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 mov r1, #0 mov r2, #1 @@ -41040,7 +41040,7 @@ _0224D60C: ldr r0, [r4, #0x14] ldr r2, [sp, #0x2c] add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #4 ldrsh r3, [r5, r3] add r0, r6, #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 @@ -41950,7 +41950,7 @@ MOD06_0224DD50: ; 0x0224DD50 ldr r1, [sp, #0xc] ldr r2, [sp, #0x10] add r0, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #8] ldr r1, [sp, #0xc] add r2, r7, #0 @@ -42010,7 +42010,7 @@ MOD06_0224DDD8: ; 0x0224DDD8 ldr r1, [sp, #0xc] ldr r2, [sp, #0x10] add r0, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #8] ldr r1, [sp, #0xc] add r2, r7, #0 @@ -42155,7 +42155,7 @@ _0224DF64: ldr r0, [r5, #8] ldr r1, [r5, #0xc] ldr r2, [r6, #0x10] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r4, [sp] mov r0, #0xff @@ -42266,7 +42266,7 @@ _0224E034: ldr r0, [r5, r0] ldr r1, [r5, r1] ldr r2, [sp, #0x1c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x4a lsl r0, r0, #2 ldr r0, [r5, r0] @@ -43182,7 +43182,7 @@ MOD06_0224E764: ; 0x0224E764 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F1A4 cmp r0, #0 bne _0224E794 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 11506c14..2b139a82 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -4511,7 +4511,7 @@ _022142BE: ldr r0, [sp, #0x14] ldr r2, [sp, #0x20] add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x20] bl String_dtor mov r1, #0 @@ -4625,7 +4625,7 @@ MOD07_0221437C: ; 0x0221437C ldr r0, [sp, #0x10] ldr r1, [sp, #0x28] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r7, #0 bl String_dtor mov r1, #0 @@ -4682,7 +4682,7 @@ MOD07_022143FC: ; 0x022143FC ldr r0, [sp, #0x18] ldr r2, [sp, #0x20] add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x20] bl String_dtor mov r0, #0 @@ -4746,7 +4746,7 @@ MOD07_022143FC: ; 0x022143FC ldr r0, [sp, #0x18] add r1, r4, #0 add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 bl String_dtor mov r1, #0 diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 882a9e27..115ee3cb 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -3480,7 +3480,7 @@ MOD09_022139D4: ; 0x022139D4 ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor mov r0, #0 @@ -3506,7 +3506,7 @@ _02213A30: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r0, #0 @@ -3541,7 +3541,7 @@ _02213A82: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r0, #0 @@ -3590,7 +3590,7 @@ _02213AD4: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r0, #0 @@ -3622,7 +3622,7 @@ _02213B24: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r7, #0 bl String_dtor mov r0, #0 @@ -4093,7 +4093,7 @@ MOD09_02213E84: ; 0x02213E84 ldr r1, [sp, #0x1c] ldr r0, [r6, r0] ldr r2, [sp, #0x18] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x10] add r3, sp, #0x38 cmp r0, #0 @@ -4486,7 +4486,7 @@ MOD09_022141D8: ; 0x022141D8 ldr r2, [sp, #0x10] ldr r0, [r5, r0] add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r1, [sp] mov r0, #0xff @@ -4556,7 +4556,7 @@ _02214284: ldr r2, [sp, #0x10] ldr r0, [r4, r0] add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x10] bl String_dtor _022142BA: @@ -4617,7 +4617,7 @@ MOD09_022142FC: ; 0x022142FC ldr r2, [sp, #0x18] ldr r0, [r5, r0] add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, sp, #0x20 ldrh r0, [r0, #0x10] cmp r0, #2 @@ -4854,7 +4854,7 @@ MOD09_022144C0: ; 0x022144C0 ldr r1, [sp, #0x1c] ldr r0, [r5, r0] ldr r2, [sp, #0x18] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 add r0, r6, #0 add r0, #0xb @@ -4938,7 +4938,7 @@ _022145F4: ldr r1, [sp, #0x10] ldr r0, [r5, r0] ldr r2, [sp, #0x14] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _02214684 ; =0x00002070 add r6, #0xc ldr r0, [r5, r0] @@ -5058,7 +5058,7 @@ MOD09_02214694: ; 0x02214694 ldr r2, [sp, #0x10] ldr r0, [r5, r0] add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r6, #0 add r2, r0, #0 @@ -5167,7 +5167,7 @@ MOD09_02214790: ; 0x02214790 ldr r2, [sp, #0x10] ldr r0, [r5, r0] add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r6, #0 add r2, r0, #0 @@ -5277,7 +5277,7 @@ MOD09_0221488C: ; 0x0221488C ldr r2, [sp, #0x10] ldr r0, [r5, r0] add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r6, #0 add r2, r0, #0 @@ -5389,7 +5389,7 @@ MOD09_0221498C: ; 0x0221498C ldr r2, [sp, #0x10] ldr r0, [r4, r0] add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r6, #0 add r2, r0, #0 @@ -5501,7 +5501,7 @@ MOD09_02214A8C: ; 0x02214A8C ldr r2, [sp, #0x10] ldr r0, [r4, r0] add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r6, #0 add r2, r0, #0 @@ -5648,7 +5648,7 @@ MOD09_02214B8C: ; 0x02214B8C ldr r1, [sp, #0x1c] ldr r0, [r5, r0] ldr r2, [sp, #0x18] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 ldr r1, [sp, #0x1c] add r2, r0, #0 @@ -5694,7 +5694,7 @@ MOD09_02214B8C: ; 0x02214B8C ldr r1, [sp, #0x24] ldr r0, [r5, r0] ldr r2, [sp, #0x20] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 ldr r3, [sp, #0x14] str r1, [sp] @@ -5885,7 +5885,7 @@ _02214E42: ldr r2, [sp, #0x14] ldr r0, [r5, r0] add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r7, #0 add r2, r0, #0 @@ -6021,7 +6021,7 @@ _02214F72: ldr r2, [sp, #0x14] ldr r0, [r5, r0] add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r7, #0 add r2, r0, #0 @@ -6316,7 +6316,7 @@ MOD09_022151A8: ; 0x022151A8 ldr r1, [sp, #0x24] ldr r0, [r5, r0] ldr r2, [sp, #0x20] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 ldr r1, [sp, #0x24] add r2, r0, #0 @@ -6360,7 +6360,7 @@ MOD09_022151A8: ; 0x022151A8 ldr r1, [sp, #0x2c] ldr r0, [r5, r0] ldr r2, [sp, #0x28] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 ldr r3, [sp, #0x1c] str r1, [sp] @@ -6565,7 +6565,7 @@ MOD09_022153B0: ; 0x022153B0 ldr r2, [sp, #0x20] ldr r0, [r5, r0] add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x18 str r0, [sp] mov r0, #0xff @@ -6601,7 +6601,7 @@ MOD09_022153B0: ; 0x022153B0 ldr r2, [sp, #0x24] ldr r0, [r5, r0] add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r7, #0 add r2, r0, #0 @@ -6693,7 +6693,7 @@ MOD09_022154FC: ; 0x022154FC ldr r1, [sp, #0x14] ldr r0, [r5, r0] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 ldr r1, [sp, #0x14] add r2, r0, #0 @@ -6977,7 +6977,7 @@ MOD09_02215784: ; 0x02215784 ldr r1, [sp, #0x10] ldr r0, [r4, r0] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor ldr r0, [sp, #0x14] @@ -8439,7 +8439,7 @@ _02216444: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor b _022166BE @@ -8480,7 +8480,7 @@ _0221648E: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor b _022166BE @@ -8523,7 +8523,7 @@ _02216512: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor b _022166BE @@ -8546,7 +8546,7 @@ _0221654A: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor b _022166BE @@ -8569,7 +8569,7 @@ _02216580: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor b _022166BE @@ -8592,7 +8592,7 @@ _022165B6: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor b _022166BE @@ -8615,7 +8615,7 @@ _022165EC: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor b _022166BE @@ -8638,7 +8638,7 @@ _02216622: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor b _022166BE @@ -8661,7 +8661,7 @@ _02216658: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor b _022166BE @@ -8682,7 +8682,7 @@ _0221668E: ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor _022166BE: @@ -8729,7 +8729,7 @@ MOD09_022166D0: ; 0x022166D0 ldr r0, [r5, r1] add r1, r1, #4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor pop {r4, r5, r6, pc} @@ -13359,7 +13359,7 @@ _02218C68: ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -13420,7 +13420,7 @@ _02218D22: ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor add r0, r7, #0 @@ -14619,7 +14619,7 @@ MOD09_02219694: ; 0x02219694 ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] ldr r2, [sp, #0x14] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x30] ldr r1, [r5, #0x18] mov r2, #0 @@ -14699,7 +14699,7 @@ MOD09_02219738: ; 0x02219738 ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] ldr r2, [sp, #0x14] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x34] mov r3, #0 str r0, [sp] @@ -14882,7 +14882,7 @@ MOD09_02219884: ; 0x02219884 ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] ldr r2, [sp, #0x14] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #4 str r0, [sp] mov r0, #0xff @@ -14920,7 +14920,7 @@ MOD09_02219884: ; 0x02219884 ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 ldr r1, [r5, #0x18] add r2, r0, #0 @@ -15086,7 +15086,7 @@ MOD09_02219A8C: ; 0x02219A8C ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 mov r1, #0 bl FUN_02019620 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index ed9b4dc3..235b01d0 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -1153,14 +1153,14 @@ _0222DFE4: _0222DFEC: ldr r0, [r5, #0x68] ldr r1, [r6, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [r5, #0x68] bl FreeToHeap add r1, r6, #0 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 FUN_02023928 + 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] @@ -1945,7 +1945,7 @@ _0222E69E: mov r7, #5 _0222E6D2: add r0, r7, #0 - bl FUN_0206B8AC + bl SavArray_Party_alloc str r0, [r5, #0x68] add r6, r6, #1 add r5, r5, #4 @@ -1997,7 +1997,7 @@ _0222E734: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2102,7 +2102,7 @@ _0222E810: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2212,7 +2212,7 @@ _0222E8FE: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2342,7 +2342,7 @@ _0222EA0C: ldr r0, [sp, #4] ldr r1, [r7, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [r7, #0x68] mov r5, #0 bl GetPartyCount @@ -2428,7 +2428,7 @@ _0222EAC0: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2555,7 +2555,7 @@ _0222EBC6: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2664,7 +2664,7 @@ _0222ECA6: ldr r0, [sp, #4] ldr r1, [r5, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [sp, #4] add r6, r6, #1 add r0, r0, #4 @@ -2797,7 +2797,7 @@ _0222EDBC: ldr r0, [sp, #4] ldr r1, [r7, #0x68] ldr r0, [r0, #4] - bl FUN_0206BAD0 + bl CopyPlayerParty ldr r0, [r7, #0x68] mov r5, #0 bl GetPartyCount diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 5640bb75..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 FUN_020239A0 + 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 FUN_020239A0 + 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 FUN_020239A0 + 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 FUN_020239A0 + 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 FUN_020239A0 + 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 FUN_020239A0 + 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 ; =FUN_020239CC + ldr r3, _02230228 ; =PlayerProfile_GetTrainerGender ldr r0, [r0, #0x48] bx r3 nop -_02230228: .word FUN_020239CC +_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 FUN_020239F4 + 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 FUN_02023A10 + bl PlayerProfile_GetMoney cmp r4, r0 bls _022315B8 add r4, r0, #0 @@ -6224,7 +6224,7 @@ MOD11_022321EC: ; 0x022321EC ldr r0, [r5, #0x14] ldr r1, [r5, #0x18] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor pop {r3, r4, r5, pc} @@ -6258,7 +6258,7 @@ _02232234: b _02232252 _0223223C: ldr r0, _02232258 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM b _02232252 _02232244: ldr r0, _0223225C ; =0x000005E6 @@ -6266,7 +6266,7 @@ _02232244: b _02232252 _0223224C: ldr r0, _02232260 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM _02232252: add r0, r4, #0 pop {r4, pc} @@ -11889,7 +11889,7 @@ _02234E2E: mov r1, #0 bl MOD11_022301D4 add r1, r4, #0 - bl FUN_02023A30 + 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 FUN_02023A54 + 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 FUN_02023A30 + bl PlayerProfile_AddMoney mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -25766,7 +25766,7 @@ _0223BC8A: bl MOD11_022564A8 ldr r0, [sp, #0x28] add r1, r6, #0 - bl FUN_0206B900 + bl AddMonToParty cmp r0, #1 bne _0223BD1E ldr r0, [r4, #0x28] @@ -28095,7 +28095,7 @@ _0223CF5C: ldr r0, [sp, #0x24] ldr r1, [sp, #0x20] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor add r0, sp, #0x68 @@ -33429,7 +33429,7 @@ _0223F8AE: pop {r3, r4, r5, r6, r7, pc} _0223F8C0: add r0, r7, #0 - bl FUN_020239F4 + 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 FUN_020239F4 + bl PlayerProfile_CountBadges cmp r0, #2 blt _0223F8DE mov r5, #0x1e _0223F8DE: add r0, r7, #0 - bl FUN_020239F4 + bl PlayerProfile_CountBadges cmp r0, #4 blt _0223F8EA mov r5, #0x32 _0223F8EA: add r0, r7, #0 - bl FUN_020239F4 + 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 FUN_020239BC + bl PlayerProfile_GetTrainerID add r6, r0, #0 add r0, r4, #0 - bl FUN_020239CC + 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 FUN_020239BC + bl PlayerProfile_GetTrainerID add r6, r0, #0 add r0, r4, #0 - bl FUN_020239CC + 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 @@ -63816,7 +63816,7 @@ MOD11_0224E130: ; 0x0224E130 ldr r1, [r4, #8] str r0, [r1, #4] mov r0, #5 - bl FUN_0206B8AC + bl SavArray_Party_alloc ldr r1, [r4, #8] mov r6, #0 ldr r1, [r1, #4] @@ -70358,7 +70358,7 @@ _02251662: mov r1, #6 ldr r0, [r0, #4] ldr r0, [r0] - bl FUN_0206B8CC + bl InitPartyWithMaxSize ldr r0, [sp, #0x14] mov r6, #0 bl GetPartyCount @@ -70376,7 +70376,7 @@ _02251680: ldr r0, [r4, #8] ldr r0, [r0, #4] ldr r0, [r0] - bl FUN_0206B900 + bl AddMonToParty ldr r1, [r4, #8] ldrb r0, [r5, #0x18] ldr r1, [r1, #4] @@ -71710,7 +71710,7 @@ _02252146: bl AllocFromHeap str r0, [r4, #4] mov r0, #5 - bl FUN_0206B8AC + bl SavArray_Party_alloc ldr r1, [r4, #4] str r0, [r1] ldr r0, [r4] @@ -71753,7 +71753,7 @@ _022521AE: ldr r0, [r4, #4] add r1, r6, #0 ldr r0, [r0] - bl FUN_0206B900 + bl AddMonToParty add r5, r5, #1 cmp r5, #6 blt _022521AE @@ -71904,7 +71904,7 @@ _022522E2: add r1, r0, #0 ldr r0, [r4, #4] ldr r0, [r0] - bl FUN_0206B900 + bl AddMonToParty ldr r0, [r4, #4] ldrb r1, [r6, #0x1c] add r0, r0, r5 @@ -82473,7 +82473,7 @@ MOD11_022574F0: ; 0x022574F0 ldr r1, [sp, #0x18] ldr r2, [sp, #0x1c] add r0, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 str r0, [sp] mov r0, #0xf @@ -83172,7 +83172,7 @@ _02257B1E: ldr r2, [sp, #0x18] add r0, r7, #0 add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 str r0, [sp] mov r0, #0xf @@ -86994,11 +86994,11 @@ MOD11_022599CC: ; 0x022599CC ldr r2, [sp, #0x1c] add r0, r4, #0 add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r2, [sp, #0x20] add r0, r4, #0 add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _02259AA0 ; =0x00010203 ldr r1, _02259AA4 ; =0x000004CC str r0, [sp] @@ -87090,11 +87090,11 @@ MOD11_02259AB0: ; 0x02259AB0 ldr r2, [sp, #0x1c] add r0, r4, #0 add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r2, [sp, #0x20] add r0, r4, #0 add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _02259B84 ; =0x00010203 ldr r1, _02259B88 ; =0x000004CC str r0, [sp] @@ -87187,11 +87187,11 @@ MOD11_02259B94: ; 0x02259B94 ldr r2, [sp, #0x1c] add r0, r4, #0 add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r2, [sp, #0x20] add r0, r4, #0 add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _02259C64 ; =0x00010203 ldr r1, _02259C68 ; =0x000004CC str r0, [sp] @@ -87348,7 +87348,7 @@ _02259D2A: ldr r0, [sp, #0x1c] ldr r1, [sp, #0x28] ldr r2, [sp, #0x24] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #1 tst r0, r4 beq _02259D5A @@ -88794,7 +88794,7 @@ _0225A876: ldr r0, [sp, #0x24] ldr r1, [sp, #0x30] ldr r2, [sp, #0x2c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldrh r0, [r5, #8] ldrh r1, [r5, #0x10] bl MOD11_0225B3D4 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index c8a949ca..122cd442 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -15271,7 +15271,7 @@ _02234F42: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0x34 mov r1, #0xff @@ -25514,7 +25514,7 @@ _02239AF4: ldr r0, [r5, #0x48] ldr r1, [r5, #0x4c] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0x34 mov r1, #0xff @@ -34763,7 +34763,7 @@ _0223E210: ldr r0, [r0] ldr r1, [r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0x78 mov r1, #0xff @@ -35100,7 +35100,7 @@ _0223E49A: ldr r0, [r0] ldr r1, [r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0x88 mov r1, #0xff @@ -43550,7 +43550,7 @@ _02242618: ldr r0, [r0] ldr r1, [r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0x34 mov r1, #0xff diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 911f12fe..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 FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0 mov r0, #0x4b lsl r0, r0, #2 @@ -7527,12 +7527,12 @@ MOD14_021DB220: ; 0x021DB220 sub r0, r1, #4 str r2, [r5, r0] ldr r0, [r4] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0x49 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] @@ -8661,7 +8661,7 @@ _021DBA98: lsl r0, r0, #2 ldrsb r1, [r5, r1] ldr r0, [r7, r0] - bl FUN_0206B938 + bl RemoveMonFromParty mov r0, #1 _021DBAB6: strb r0, [r4, #0xb] @@ -8878,7 +8878,7 @@ _021DBC42: lsl r0, r0, #2 ldr r0, [r5, r0] ldr r1, [r4] - bl FUN_0206B900 + bl AddMonToParty b _021DBC70 _021DBC56: mov r1, #0x1a @@ -8891,7 +8891,7 @@ _021DBC56: ldr r0, [r5, r1] add r1, #0x7c ldr r1, [r5, r1] - bl FUN_0206B900 + bl AddMonToParty _021DBC70: mov r0, #0x49 lsl r0, r0, #2 @@ -9056,7 +9056,7 @@ _021DBDB0: ldrsb r1, [r1, r2] add r3, #0x7c ldr r2, [r5, r3] - bl FUN_0206B9DC + bl ReplacePartySlotWithMon mov r0, #1 strb r0, [r4, #0xb] _021DBDC8: @@ -9108,7 +9108,7 @@ MOD14_021DBE00: ; 0x021DBE00 lsl r0, r0, #2 ldrsb r1, [r4, r1] ldr r0, [r5, r0] - bl FUN_0206B938 + bl RemoveMonFromParty add r0, r5, #0 bl MOD14_021DB934 mov r0, #1 @@ -9154,7 +9154,7 @@ _021DBE70: lsl r0, r0, #2 ldrsb r1, [r4, r1] ldr r0, [r5, r0] - bl FUN_0206B938 + bl RemoveMonFromParty _021DBE7E: add r0, r5, #0 bl MOD14_021DB934 @@ -20836,7 +20836,7 @@ MOD14_021E189C: ; 0x021E189C ldr r0, [r5, #0x2c] ldr r1, [r5, #0x34] ldr r2, [r5, #0x30] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] mov r0, #0xff diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 5a05b6f7..ea50637f 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -5232,7 +5232,7 @@ _021D9CDC: ldr r2, [r4, #0x4c] add r0, r5, #0 add r1, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] mov r0, #0xff diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index a6d13041..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 FUN_020239CC + bl PlayerProfile_GetTrainerGender ldr r1, _021D98A0 ; =0x00001750 str r0, [r5, r1] ldr r0, [r4, #4] add r1, r6, #0 - bl FUN_020239A0 + 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 624ed28f..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 FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r5, r0, #0 add r0, r4, #0 - bl FUN_020239CC + 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 FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r5, r0, #0 add r0, r4, #0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r2, r0, #0 add r0, r7, #0 add r1, r5, #0 @@ -4772,7 +4772,7 @@ MOD17_021D99E0: ; 0x021D99E0 add r1, r4, #0 ldr r0, [r5, r0] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] ldr r0, _021D9A64 ; =0x0001020F @@ -4839,7 +4839,7 @@ _021D9A7E: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _021D9B10 ; =0x000006C4 ldr r1, [r5, r0] ldrb r1, [r1, #0x16] @@ -14415,7 +14415,7 @@ _021DDFF8: add r0, r6, #0 add r1, r4, #0 add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -14531,7 +14531,7 @@ _021DE1A0: add r0, r7, #0 add r1, r4, #0 add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r0, #0 @@ -14563,7 +14563,7 @@ _021DE1A0: add r0, r7, #0 add r1, r4, #0 add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r0, #0 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index fd50f831..3fbc762e 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -2713,7 +2713,7 @@ MOD18_0223AC24: ; 0x0223AC24 ldr r0, [r0, #0x1c] bl MOD05_021F4608 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205EDBC ldr r0, _0223AC78 ; =MOD18_0223A64C add r1, r4, #0 @@ -5337,7 +5337,7 @@ _0223C000: ldr r0, [r0] ldr r0, [r0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0 bl FUN_0205F740 add r1, r0, #0 @@ -7510,7 +7510,7 @@ _0223D07E: ldr r0, _0223D0E0 ; =0x000004C8 ldr r0, [r1, r0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205EDCC ldr r0, _0223D0DC ; =0x02251384 add r2, r7, #0 @@ -7729,7 +7729,7 @@ _0223D212: ldr r1, [sp] add r0, r5, #0 add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, _0223D290 ; =0x02251384 mov r0, #0 ldr r1, [r1] @@ -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 @@ -8112,7 +8112,7 @@ _0223D536: ldr r0, [r0] ldr r0, [r0, #0xc] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205EDAC mov r1, #0 ldr r0, _0223D59C ; =MOD18_0223E7AC @@ -8341,7 +8341,7 @@ MOD18_0223D6D8: ; 0x0223D6D8 ldr r1, [sp, #4] add r0, r4, #0 add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r7, #0 bl String_dtor add r0, r4, #0 @@ -8384,7 +8384,7 @@ MOD18_0223D744: ; 0x0223D744 ldr r1, [sp, #4] add r0, r4, #0 add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor add r0, r4, #0 @@ -10160,7 +10160,7 @@ MOD18_0223E4D4: ; 0x0223E4D4 add r1, r1, r4 add r1, #0xdc ldr r1, [r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r7, #0 bl String_dtor add r0, r6, #0 @@ -12954,7 +12954,7 @@ _0223FA34: ldr r0, [r0, #4] ldr r0, [r0, #0x40] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r5, r0, #0 bl FUN_0205F760 add r1, r0, #0 @@ -28118,7 +28118,7 @@ MOD18_02246FB4: ; 0x02246FB4 ldr r0, [r0] ldr r0, [r0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205EDD8 ldr r0, [sp, #0xc] bl FUN_020266E0 @@ -29437,7 +29437,7 @@ MOD18_022479E4: ; 0x022479E4 blt _022479FC ldrh r0, [r0, #0x30] bl FUN_0202DFA4 - bl FUN_020239CC + 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 FUN_020239CC + bl PlayerProfile_GetTrainerGender cmp r0, #1 bne _02247A24 add r4, #0x13 @@ -30665,7 +30665,7 @@ _022483BC: bl MOD18_02247EA0 ldr r0, [r4, #8] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0 bl FUN_0205F720 add r1, r0, #0 @@ -32978,9 +32978,9 @@ _022495BA: bne _022495E2 ldr r0, [r5, #0xc] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #4 - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r7, r0, #0 ldr r0, [r5, #0x40] ldr r2, [r4, #4] @@ -34255,7 +34255,7 @@ _0224A002: ldr r0, [r5, #0x70] ldr r1, [r5, #0x68] ldr r2, [r5, #0x6c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r5, #0x40] ldr r1, [r5, #0x68] add r2, r4, #0 @@ -35135,7 +35135,7 @@ MOD18_0224A78C: ; 0x0224A78C bl MOD18_0224D704 ldr r0, [r4, #0xc] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0 mov r0, #1 str r0, [sp] @@ -37342,7 +37342,7 @@ _0224B946: add r0, r4, #0 bl MOD18_02245054 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205EDE8 add r0, r4, #0 bl MOD18_0224BD54 @@ -37483,7 +37483,7 @@ _0224BA70: bl MOD18_0224DD94 ldr r0, [r4, #0xc] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0 ldr r0, [r4, #0xc] bl FUN_020377AC @@ -38687,7 +38687,7 @@ _0224C434: ldr r0, [r4, #0x70] ldr r1, [r4, #0x6c] ldr r2, [r4, #0x68] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x11 str r0, [sp] mov r1, #0 @@ -38994,7 +38994,7 @@ _0224C6C4: ldr r0, [r4, #0x70] ldr r1, [r4, #0x6c] ldr r2, [r4, #0x68] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x11 str r0, [sp] mov r1, #0 @@ -40587,7 +40587,7 @@ MOD18_0224D364: ; 0x0224D364 str r1, [sp, #8] bl AddTextPrinterParameterized add r0, r5, #0 - bl FUN_020239C0 + bl PlayerProfile_GetTrainerID_VisibleHalf add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -40604,7 +40604,7 @@ MOD18_0224D364: ; 0x0224D364 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #1 str r0, [sp] mov r0, #0xff @@ -40626,7 +40626,7 @@ MOD18_0224D364: ; 0x0224D364 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #1 str r0, [sp] mov r0, #0xff @@ -40698,7 +40698,7 @@ _0224D500: ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -41095,7 +41095,7 @@ MOD18_0224D814: ; 0x0224D814 add r0, r7, #0 add r1, r6, #0 add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #1 str r0, [sp] mov r0, #0xff @@ -41137,7 +41137,7 @@ MOD18_0224D814: ; 0x0224D814 add r0, r7, #0 add r1, r6, #0 add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x12 str r0, [sp] mov r0, #0xff @@ -41183,7 +41183,7 @@ _0224D8FA: add r0, r7, #0 add r1, r6, #0 add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 str r0, [sp, #0x1c] add r0, #0x45 @@ -41199,7 +41199,7 @@ _0224D8FA: mov r3, #2 bl AddTextPrinterParameterized ldr r0, [sp, #0x24] - bl FUN_020239C0 + bl PlayerProfile_GetTrainerID_VisibleHalf add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -41216,7 +41216,7 @@ _0224D8FA: add r0, r7, #0 add r1, r6, #0 add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x1c] mov r1, #0 str r0, [sp] @@ -41543,7 +41543,7 @@ MOD18_0224DBE4: ; 0x0224DBE4 beq _0224DC04 ldr r0, [r4, #0x28] ldr r1, [r4, #4] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, [r4, #0x40] mov r0, #2 ldr r2, [r4, #4] @@ -42851,7 +42851,7 @@ _0224E454: ldr r2, [sp, #0x2c] add r0, r6, #0 add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x10 str r0, [sp] mov r0, #0xff diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index 93fc85ff..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 FUN_020238F4 - bl FUN_020239CC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender cmp r0, #1 beq _02252C58 mov r0, #1 diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 3ac786b0..9fa91fb4 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -56,7 +56,7 @@ MOD27_0225489C: ; 0x0225489C strb r0, [r5, #2] add r0, r4, #0 bl MOD20_02252C40 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r0, #0 add r0, r5, #4 bl MOD27_02254A48 @@ -223,7 +223,7 @@ _0225499C: blo _02254A02 ldr r0, [r4, #0x78] bl MOD20_02252C40 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r0, #0 add r0, r4, #4 bl MOD27_02254A48 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 16acbd62..618309d1 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -57,7 +57,7 @@ MOD28_0225489C: ; 0x0225489C strb r0, [r7, #2] str r4, [r7, #0x60] bl FUN_020225F8 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0 str r0, [sp, #4] str r1, [sp] diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index 6ee54fe8..a850e16a 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -49,7 +49,7 @@ MOD39_0225489C: ; 0x0225489C str r1, [sp, #8] str r2, [sp, #0xc] bl MOD20_02252C40 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0x10] bl GetPartyCount ldr r1, [sp, #4] diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index 8bda4f17..3e0b6d71 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -92,7 +92,7 @@ _022548BE: str r0, [r5, #0xc] ldr r0, [sp] bl MOD20_02252C40 - bl FUN_020462AC + bl SavArray_Flags_get add r7, r0, #0 mov r4, #0 add r6, r5, #0 diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index a027b5d8..8efadd9b 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -435,7 +435,7 @@ MOD43_02254B60: ; 0x02254B60 add r5, r0, #0 add r0, r1, #0 bl MOD20_02252C40 - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0 mov r4, #0 _02254B72: diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 1224b249..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 FUN_020238F4 + 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 FUN_020239BC + 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 FUN_020239BC + 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 FUN_020239CC + 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 FUN_02023928 + 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 FUN_020239BC + 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 7d33bbfb..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 FUN_020238F4 + 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 FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r0, #0 add r0, r7, #0 mov r2, #0 @@ -228,15 +228,15 @@ MOD52_021D769C: ; 0x021D769C push {r4, lr} add r4, r1, #0 add r0, r4, #0 - bl FUN_020227DC + bl Sav2_InitDynamicRegion add r0, r4, #0 bl FUN_020377E0 add r0, r4, #0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r1, _021D76C4 ; =0x00000BB8 - bl FUN_02023A14 + bl PlayerProfile_SetMoney add r0, r4, #0 - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ECD4 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index ed7427c8..23ad97c5 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -3443,7 +3443,7 @@ _021D908C: cmp r0, #0 beq _021D90DC ldr r1, [r4, #0x14] - bl FUN_02023990 + bl PlayerName_FlatToString ldr r0, [sp, #0x14] cmp r0, r6 bne _021D90C0 @@ -3626,7 +3626,7 @@ MOD53_021D91C8: ; 0x021D91C8 ldr r0, [r5, #0xc] ldr r1, [r5, #0x2c] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r0, #0xb6 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 963dafe4..cc365fa2 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -2799,13 +2799,13 @@ _021D8B2A: ldr r0, [r7, r0] cmp r0, #0 beq _021D8BE4 - bl FUN_020239C0 + bl PlayerProfile_GetTrainerID_VisibleHalf str r0, [sp, #0x24] mov r0, #0xd9 lsl r0, r0, #2 ldr r0, [r7, r0] ldr r1, [r4, #0x2c] - bl FUN_02023990 + bl PlayerName_FlatToString mov r0, #2 str r0, [sp] mov r0, #1 @@ -3006,7 +3006,7 @@ MOD54_021D8C90: ; 0x021D8C90 ldr r0, [r5, #0x24] ldr r1, [r5, #0x44] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor mov r0, #0xba @@ -3136,7 +3136,7 @@ _021D8D9E: mov r0, #0xd9 lsl r0, r0, #2 ldr r0, [r6, r0] - bl FUN_020239CC + 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 FUN_020239CC + 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 FUN_020238F4 + 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 FUN_020239BC + bl PlayerProfile_GetTrainerID str r0, [r5] add r0, r4, #0 - bl FUN_020239CC + 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 45cf9f2e..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 FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 @@ -1327,7 +1327,7 @@ _021D7F86: ldr r0, [r5, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders b _021D8002 _021D7FF4: add r2, r7, #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 FUN_02023928 + bl PlayerProfile_init add r4, r0, #0 add r0, r5, #0 add r0, #0xd4 @@ -1982,7 +1982,7 @@ MOD55_021D84C8: ; 0x021D84C8 bl String_c_str add r1, r0, #0 add r0, r4, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r5, #0xc] mov r1, #0 add r2, r4, #0 @@ -3314,7 +3314,7 @@ _021D8F1A: add r0, r5, r1 bl FUN_02019220 mov r0, #0x34 - bl FUN_02023928 + bl PlayerProfile_init mov r1, #0xf2 lsl r1, r1, #2 ldrb r1, [r5, r1] @@ -3326,7 +3326,7 @@ _021D8F1A: bl FUN_020283A4 add r1, r0, #0 add r0, r4, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r5, #0xc] mov r1, #0 add r2, r4, #0 @@ -3504,7 +3504,7 @@ MOD55_021D90D8: ; 0x021D90D8 orr r0, r1 beq _021D9170 mov r0, #0x34 - bl FUN_02023928 + bl PlayerProfile_init mov r1, #0xf2 lsl r1, r1, #2 ldrb r1, [r5, r1] @@ -3516,7 +3516,7 @@ MOD55_021D90D8: ; 0x021D90D8 bl FUN_020283A4 add r1, r0, #0 add r0, r6, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, _021D9180 ; =0x000005DC bl FUN_020054C8 ldr r2, [sp, #4] @@ -3607,7 +3607,7 @@ _021D91D6: mov r1, #0 bl FUN_02019620 ldr r0, [r5, #8] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0 ldr r0, [r5, #0xc] mov r1, #0 @@ -3625,7 +3625,7 @@ _021D91D6: ldr r0, [r5, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #4 str r0, [sp] mov r0, #0xff @@ -3776,7 +3776,7 @@ _021D9338: ldr r0, [r5, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 @@ -4166,14 +4166,14 @@ _021D969A: mov r1, #0 bl FUN_02019620 mov r0, #0x34 - bl FUN_02023928 + bl PlayerProfile_init str r0, [sp, #0x20] ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] bl FUN_020283A4 add r1, r0, #0 ldr r0, [sp, #0x20] - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r4, #0xc] ldr r2, [sp, #0x20] mov r1, #0 @@ -4191,7 +4191,7 @@ _021D969A: ldr r0, [r4, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #4 str r0, [sp] mov r0, #0xff @@ -4261,7 +4261,7 @@ _021D974E: ldr r0, [r4, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _021D9A54 ; =0x000F0E00 add r1, r4, #0 str r0, [sp] @@ -4406,14 +4406,14 @@ _021D987C: add r3, r1, #0 bl AddTextPrinterParameterized2 mov r0, #0x34 - bl FUN_02023928 + bl PlayerProfile_init add r5, r0, #0 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] bl FUN_020283E8 add r1, r0, #0 add r0, r5, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r4, #0xc] mov r1, #0 add r2, r5, #0 @@ -4433,7 +4433,7 @@ _021D987C: ldr r0, [r4, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r1, r4, #0 add r1, #0xc4 mov r0, #0 @@ -4504,7 +4504,7 @@ _021D987C: ldr r0, [r4, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r1, r4, #0 add r1, #0xc0 mov r0, #0 @@ -4553,7 +4553,7 @@ _021D987C: ldr r0, [r4, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r1, r4, #0 add r1, #0xc0 mov r0, #0 @@ -4643,7 +4643,7 @@ _021D9AE8: ldr r0, [r4, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r1, r4, #0 add r1, #0xc0 mov r0, #0 @@ -4747,7 +4747,7 @@ _021D9AE8: ldr r0, [r4, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r1, r4, #0 add r1, #0xc0 mov r0, #0 @@ -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 FUN_02023928 + bl PlayerProfile_init add r4, r0, #0 ldr r0, [r5, #8] bl FUN_020286EC @@ -5217,7 +5217,7 @@ MOD55_021D9F8C: ; 0x021D9F8C bl FUN_020283A4 add r1, r0, #0 add r0, r4, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, [r5, #0xc] mov r1, #0 add r2, r4, #0 @@ -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 @@ -5392,7 +5392,7 @@ _021DA0D0: ldr r0, [r5, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 @@ -5473,7 +5473,7 @@ _021DA17C: ldr r0, [r5, #0xc] ldr r1, [r1] ldr r2, [r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 8b6b5517..614bbffd 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -210,7 +210,7 @@ MOD56_02211F88: ; 0x02211F88 push {r3, r4, r5, r6, r7, lr} add r0, #0xc4 ldr r0, [r0] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp] bl GetPartyCount mov r5, #0 @@ -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 FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x14] add r0, r5, #0 add r0, #0xc4 @@ -1984,7 +1984,7 @@ MOD56_02212E0C: ; 0x02212E0C add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0xc] 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 FUN_020239CC + 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 FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x36 - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r6, r0, #0 mov r0, #0xd3 lsl r0, r0, #2 @@ -7051,7 +7051,7 @@ _02215532: sub r2, #8 ldr r0, [r0] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] mov r2, #0xff @@ -7098,14 +7098,14 @@ _02215532: add r3, r1, #0 bl AddTextPrinterParameterized2 mov r0, #0x36 - bl FUN_02023928 + bl PlayerProfile_init add r6, r0, #0 ldr r0, [r5] add r1, r4, #0 bl FUN_020283E8 add r1, r0, #0 add r0, r6, #0 - bl FUN_0202395C + bl CopyPlayerName add r0, r5, #0 add r0, #0xc8 ldr r0, [r0] @@ -7130,7 +7130,7 @@ _02215532: sub r2, #8 ldr r0, [r0] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0x16 lsl r1, r1, #4 mov r0, #0 @@ -7206,7 +7206,7 @@ _02215532: sub r2, #8 ldr r0, [r0] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x30 str r0, [sp] mov r2, #0xff @@ -7252,7 +7252,7 @@ _02215532: sub r2, #8 ldr r0, [r0] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0x16 lsl r1, r1, #4 mov r0, #0 @@ -7343,7 +7343,7 @@ _02215822: sub r2, #8 ldr r0, [r0] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0x16 lsl r1, r1, #4 mov r0, #0 @@ -7445,7 +7445,7 @@ _02215822: sub r2, #8 ldr r0, [r0] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0x16 lsl r1, r1, #4 mov r0, #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 @@ -8267,7 +8267,7 @@ _02215F82: sub r2, r2, #4 ldr r0, [r0] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 @@ -8383,7 +8383,7 @@ _02216048: sub r2, r2, #4 ldr r0, [r0] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 @@ -8431,14 +8431,14 @@ MOD56_022160E4: ; 0x022160E4 cmp r6, r0 beq _0221611C mov r0, #0x36 - bl FUN_02023928 + bl PlayerProfile_init add r4, r0, #0 ldr r0, [r5] add r1, r6, #0 bl FUN_020283A4 add r1, r0, #0 add r0, r4, #0 - bl FUN_0202395C + bl CopyPlayerName add r5, #0xc8 ldr r0, [r5] mov r1, #0 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index b876924b..f317d49f 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -2843,7 +2843,7 @@ _021D8AE0: ldr r2, [sp, #0x10] add r0, r4, #0 add r1, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r5, #0 add r2, r0, #0 @@ -2896,7 +2896,7 @@ _021D8BA4: lsr r0, r0, #0x1f beq _021D8C02 ldr r0, [r6, #0x18] - bl FUN_02029EBC + bl GetIGTHours add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -2906,7 +2906,7 @@ _021D8BA4: mov r3, #3 bl FUN_0200AD38 ldr r0, [r6, #0x18] - bl FUN_02029EC0 + bl GetIGTMinutes mov r3, #2 add r2, r0, #0 str r3, [sp] @@ -2945,7 +2945,7 @@ _021D8C32: ldr r2, [sp, #0x10] add r0, r4, #0 add r1, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r5, #0 add r2, r0, #0 @@ -2994,7 +2994,7 @@ _021D8C32: ldr r2, [sp, #0x10] add r0, r4, #0 add r1, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r5, #0 add r2, r0, #0 @@ -3173,7 +3173,7 @@ _021D8D72: ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders b _021D8E74 _021D8E3C: ldr r2, [sp, #0x14] @@ -3224,7 +3224,7 @@ _021D8E74: ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r5, #0 add r2, r0, #0 @@ -3445,7 +3445,7 @@ MOD57_021D905C: ; 0x021D905C bl ErrorHandling _021D906E: ldr r0, [r5, #0x18] - bl FUN_02029EBC + bl GetIGTHours mov r0, #0x28 str r0, [sp] mov r0, #0x10 @@ -3476,7 +3476,7 @@ _021D906E: bl FUN_0200AA90 add r6, r0, #0 ldr r0, [r5, #0x18] - bl FUN_02029EBC + bl GetIGTHours add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -3486,7 +3486,7 @@ _021D906E: mov r3, #3 bl FUN_0200AD38 ldr r0, [r5, #0x18] - bl FUN_02029EC0 + bl GetIGTMinutes mov r3, #2 add r2, r0, #0 str r3, [sp] @@ -3501,7 +3501,7 @@ _021D906E: ldr r2, [sp, #0x14] add r0, r6, #0 add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r4, #0 add r2, r0, #0 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 5d8425be..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 @@ -2210,7 +2210,7 @@ MOD58_021DAB94: ; 0x021DAB94 ldr r0, [r5, #0x10] ldr r1, [r5, #0x34] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor mov r0, #0xb5 diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index 1493661d..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 FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r1, [r4, #0x70] ldr r1, [r1, #0x18] - bl FUN_0202397C + bl PlayerName_StringToFlat ldr r0, [r4, #4] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r1, [r4, #0x70] ldr r1, [r1, #4] - bl FUN_020239C8 + bl PlayerProfile_SetTrainerGender ldr r0, [r4, #4] bl FUN_02024EB4 ldr r1, [r4, #0x74] @@ -995,7 +995,7 @@ _021D7C5E: ldr r0, [r5, #0x64] ldr r1, [r5, #0x5c] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor ldr r0, [r5, #8] diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index f6048964..87f493d0 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -1579,7 +1579,7 @@ _021D80EE: ldr r0, [r5, #0x30] ldr r1, [r5, #0x34] ldr r2, [r5, #0x3c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 add r0, #0xcc ldrb r2, [r6, #5] @@ -2183,7 +2183,7 @@ _021D85D4: ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x40] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r1, [sp] ldr r0, _021D8630 ; =0x00010200 @@ -2358,7 +2358,7 @@ MOD65_021D8718: ; 0x021D8718 ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x44] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 ldr r1, [r4, #0x34] add r4, #0x7c @@ -2395,7 +2395,7 @@ MOD65_021D8764: ; 0x021D8764 ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x48] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 ldr r1, [r4, #0x34] add r4, #0x7c @@ -3861,7 +3861,7 @@ MOD65_021D92C4: ; 0x021D92C4 lsl r2, r2, #2 add r2, r4, r2 ldr r2, [r2, #0x24] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] ldr r0, [r4, #0x10] diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 82805b95..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 FUN_020238F4 + 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 FUN_020239CC + bl PlayerProfile_GetTrainerGender cmp r0, #0 bne _021D7802 mov r0, #0 @@ -1202,7 +1202,7 @@ _021D7E32: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor mov r1, #0 @@ -1256,7 +1256,7 @@ _021D7E32: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r1, [sp] mov r0, #0xff @@ -1715,7 +1715,7 @@ _021D822A: ldr r0, [r4, #0x54] ldr r1, [r4, #0x58] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r4, #0x58] bl StringGetLength add r5, r5, r0 @@ -1782,7 +1782,7 @@ _021D82F2: ldr r0, [r4, #0x54] ldr r1, [r4, #0x58] add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x60 str r0, [sp] mov r0, #0xff @@ -2261,7 +2261,7 @@ MOD67_021D8688: ; 0x021D8688 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2306,7 +2306,7 @@ MOD67_021D86DC: ; 0x021D86DC ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2347,7 +2347,7 @@ MOD67_021D873C: ; 0x021D873C ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2388,7 +2388,7 @@ MOD67_021D8790: ; 0x021D8790 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2431,7 +2431,7 @@ MOD67_021D87E4: ; 0x021D87E4 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2486,7 +2486,7 @@ _021D886E: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2536,7 +2536,7 @@ _021D88D2: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r4, #4 add r0, #0x10 str r0, [sp] @@ -2639,7 +2639,7 @@ MOD67_021D898C: ; 0x021D898C ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2682,7 +2682,7 @@ MOD67_021D89E0: ; 0x021D89E0 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2725,7 +2725,7 @@ MOD67_021D8A3C: ; 0x021D8A3C ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2768,7 +2768,7 @@ MOD67_021D8A98: ; 0x021D8A98 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2811,7 +2811,7 @@ MOD67_021D8AF4: ; 0x021D8AF4 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2854,7 +2854,7 @@ MOD67_021D8B50: ; 0x021D8B50 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2897,7 +2897,7 @@ MOD67_021D8BAC: ; 0x021D8BAC ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2940,7 +2940,7 @@ MOD67_021D8C08: ; 0x021D8C08 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -2983,7 +2983,7 @@ MOD67_021D8C64: ; 0x021D8C64 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -3026,7 +3026,7 @@ MOD67_021D8CC0: ; 0x021D8CC0 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -3069,7 +3069,7 @@ MOD67_021D8D1C: ; 0x021D8D1C ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -3112,7 +3112,7 @@ MOD67_021D8D78: ; 0x021D8D78 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x10 str r0, [sp] @@ -3384,7 +3384,7 @@ _021D8F9A: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x50 str r0, [sp] mov r0, #0xff @@ -3469,7 +3469,7 @@ _021D9046: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x50 str r0, [sp] mov r0, #0xff @@ -3565,7 +3565,7 @@ _021D9114: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -3632,7 +3632,7 @@ _021D9198: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -3707,7 +3707,7 @@ _021D921C: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -3774,7 +3774,7 @@ _021D92B4: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -3849,7 +3849,7 @@ _021D9338: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -3893,7 +3893,7 @@ MOD67_021D9390: ; 0x021D9390 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -3945,7 +3945,7 @@ MOD67_021D93EC: ; 0x021D93EC ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -4021,7 +4021,7 @@ MOD67_021D9494: ; 0x021D9494 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -4119,7 +4119,7 @@ _021D956C: ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -4196,7 +4196,7 @@ MOD67_021D95EC: ; 0x021D95EC ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] @@ -4279,7 +4279,7 @@ MOD67_021D9688: ; 0x021D9688 ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders lsl r0, r6, #4 add r0, #0x70 str r0, [sp] diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index c7cef5c8..953d3b63 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -699,7 +699,7 @@ MOD68_021D7A18: ; 0x021D7A18 ldr r0, [r0] add r1, r6, #0 add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r1, [sp] mov r0, #0xff @@ -963,7 +963,7 @@ MOD68_021D7C28: ; 0x021D7C28 ldr r0, [r5] ldr r2, [sp, #0x10] add r1, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r1, [sp] mov r0, #0xff diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 6bde4c55..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 FUN_020239CC + bl PlayerProfile_GetTrainerGender cmp r0, #1 bne _0222E10C mov r1, #1 @@ -2398,7 +2398,7 @@ _0222E95E: ldr r0, [r4, #0x14] ldr r1, [r4, #0x1c] ldr r2, [r4, #0x18] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add sp, #8 pop {r4, pc} @@ -2431,7 +2431,7 @@ _0222E996: ldr r0, [r5, #0x14] ldr r1, [r5, #0x1c] ldr r2, [r5, #0x18] - bl FUN_0200B7B8 + bl StringExpandPlaceholders pop {r3, r4, r5, pc} thumb_func_start MOD69_0222E9AC @@ -2511,7 +2511,7 @@ _0222EA2E: ldr r0, [r4, #0x14] ldr r1, [r4, #0x1c] ldr r2, [r4, #0x18] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 mov r1, #0x78 bl MOD69_0222E89C @@ -2672,7 +2672,7 @@ MOD69_0222EB4C: ; 0x0222EB4C bl FUN_0200ABC0 ldr r0, [r4, #0xc] ldr r0, [r0] - bl FUN_020239C0 + bl PlayerProfile_GetTrainerID_VisibleHalf add r2, r0, #0 mov r0, #2 str r0, [sp] @@ -2684,7 +2684,7 @@ MOD69_0222EB4C: ; 0x0222EB4C bl FUN_0200AD38 ldr r0, [r4, #0xc] ldr r0, [r0, #8] - bl FUN_02029EBC + bl GetIGTHours add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -2697,7 +2697,7 @@ MOD69_0222EB4C: ; 0x0222EB4C bl FUN_0200AD38 ldr r0, [r4, #0xc] ldr r0, [r0, #8] - bl FUN_02029EC0 + bl GetIGTMinutes mov r3, #2 add r2, r0, #0 str r3, [sp] @@ -2719,7 +2719,7 @@ MOD69_0222EB4C: ; 0x0222EB4C add r2, #8 ldr r1, [r4, r1] ldr r2, [r4, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, _0222EC54 ; =0x00001B54 mov r0, #0 ldr r1, [r4, r1] @@ -4070,7 +4070,7 @@ _0222F6FA: b _0222F77A _0222F70C: add r0, r6, #0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r7, r0, #0 add r0, r4, #0 mov r1, #7 @@ -4084,7 +4084,7 @@ _0222F726: ldr r1, _0222F788 ; =0x00001B54 add r0, r6, #0 ldr r1, [r5, r1] - bl FUN_02023990 + bl PlayerName_FlatToString ldr r2, _0222F78C ; =0x00001B58 add r0, r4, #0 ldr r2, [r5, r2] diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 59c97d17..e2e99a1f 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -1099,7 +1099,7 @@ MOD70_021D7CE8: ; 0x021D7CE8 add r2, r2, #4 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 mov r1, #0xf bl FUN_02019620 @@ -1256,7 +1256,7 @@ _021D7E68: add r2, r2, #4 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r1, [sp] mov r2, #0xff diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index a409c3fb..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 FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r4, r0, #0 add r0, r6, #0 mov r1, #0x1a - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r6, r0, #0 mov r0, #0x61 lsl r0, r0, #2 @@ -2143,7 +2143,7 @@ MOD71_0222E76C: ; 0x0222E76C str r0, [r5, r1] ldr r0, [r4, #0x10] str r0, [r5, #4] - bl FUN_0206B8A4 + bl SavArray_Party_sizeof add r1, r0, #0 mov r0, #0x1a bl AllocFromHeap @@ -2151,8 +2151,8 @@ MOD71_0222E76C: ; 0x0222E76C str r0, [r5, r1] ldr r0, [r5, r1] mov r1, #6 - bl FUN_0206B8CC - bl FUN_0206B8A4 + bl InitPartyWithMaxSize + bl SavArray_Party_sizeof add r2, r0, #0 ldr r0, _0222E844 ; =0x0000221C mov r1, #0xff @@ -2160,7 +2160,7 @@ MOD71_0222E76C: ; 0x0222E76C bl memset ldr r0, [r4, #4] mov r1, #0x1a - bl FUN_020239A0 + 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 FUN_020239BC + 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 FUN_020239CC + 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 FUN_02023928 + bl PlayerProfile_init add r6, r0, #0 ldr r0, _0222FA28 ; =0x00003694 add r1, r4, #0 @@ -4356,7 +4356,7 @@ _0222F9A0: bl FUN_020283A4 add r1, r0, #0 add r0, r6, #0 - bl FUN_0202395C + bl CopyPlayerName ldr r0, _0222FA18 ; =0x00003674 mov r1, #0 ldr r0, [r5, r0] @@ -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 FUN_020239CC + bl PlayerProfile_GetTrainerGender add r5, r0, #0 add r0, r4, #0 bl GetMonGender diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 6a1954b8..b9d19767 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -4909,7 +4909,7 @@ _021D9B02: ldr r0, [r2, #4] ldr r1, [r2, #8] ldr r2, [r2, #0x14] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, [r5, #0x18] lsl r0, r6, #3 ldr r1, [r1, #8] @@ -6272,7 +6272,7 @@ MOD73_021DA550: ; 0x021DA550 ldr r0, [r2, #4] ldr r1, [r2, #8] ldr r2, [r2, #0x50] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x18 str r0, [sp] mov r1, #0 @@ -6322,7 +6322,7 @@ _021DA61A: ldr r0, [r3, #4] ldr r1, [r3, #8] ldr r2, [r2, #0x4c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x30 str r0, [sp] mov r1, #0 @@ -6372,7 +6372,7 @@ _021DA682: ldr r0, [r3, #4] ldr r1, [r3, #8] ldr r2, [r2, #0x4c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x44 str r0, [sp] mov r1, #0 @@ -6428,7 +6428,7 @@ MOD73_021DA6BC: ; 0x021DA6BC ldr r0, [r2, #4] ldr r1, [r2, #8] ldr r2, [r2, #0x68] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x18 str r0, [sp] mov r1, #0 @@ -6528,7 +6528,7 @@ _021DA79E: ldr r0, [r2, #4] ldr r1, [r2, #8] ldr r2, [r2, #0x18] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r4, #0x1c] ldr r5, [r0, #8] b _021DA7EC diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 1e7b6d56..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 @@ -996,7 +996,7 @@ MOD74_021D7C10: ; 0x021D7C10 ldr r0, [r5, #0x2c] ldr r1, [r5, #0x30] ldr r2, [r5, #0x5c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 ldr r1, [r5, #0x30] add r2, r0, #0 @@ -1041,7 +1041,7 @@ MOD74_021D7C10: ; 0x021D7C10 ldr r0, [r5, #0x2c] ldr r1, [r5, #0x30] ldr r2, [r5, #0x5c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 ldr r1, [r5, #0x30] add r2, r0, #0 @@ -1207,7 +1207,7 @@ _021D7E04: ldr r0, [r4, #0x2c] ldr r1, [r4, #0x30] ldr r2, [r4, #0x60] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 ldr r1, [r4, #0x30] add r2, r0, #0 @@ -1465,7 +1465,7 @@ MOD74_021D8008: ; 0x021D8008 ldr r0, [r4, #0x2c] ldr r1, [r4, #0x30] ldr r2, [r4, #0x38] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 ldr r1, [r4, #0x30] add r2, r0, #0 @@ -1566,7 +1566,7 @@ _021D8108: ldr r0, [r4, #0x2c] ldr r1, [r4, #0x30] ldr r2, [r4, #0x44] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #4 str r0, [sp] mov r1, #0 @@ -1591,7 +1591,7 @@ _021D813C: ldr r0, [r4, #0x2c] ldr r1, [r4, #0x30] ldr r2, [r4, #0x40] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #4 str r0, [sp] mov r1, #0 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index e61c2137..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 FUN_020239CC + 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 FUN_020238F4 + 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} @@ -4734,7 +4734,7 @@ _021E908E: ldr r0, [r4, r0] ldr r1, [r4, r1] add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 bl String_dtor add r0, r4, #0 @@ -4928,7 +4928,7 @@ _021E923E: ldr r0, [r4, r0] ldr r1, [r4, r1] add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 bl String_dtor mov r0, #1 @@ -5467,7 +5467,7 @@ _021E967A: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -5741,7 +5741,7 @@ _021E9872: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -5922,7 +5922,7 @@ _021E9A38: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -5984,7 +5984,7 @@ _021E9A6E: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -6008,7 +6008,7 @@ _021E9AF4: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -6128,7 +6128,7 @@ _021E9BAC: ldr r0, [r4, r0] ldr r1, [r4, r1] add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 bl String_dtor add r0, r4, #0 @@ -6223,7 +6223,7 @@ _021E9C80: ldr r0, [r4, r0] ldr r1, [r4, r1] add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 bl String_dtor add r0, r4, #0 @@ -6399,7 +6399,7 @@ _021E9E2A: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -6485,7 +6485,7 @@ _021E9EF8: ldr r1, [r4, r1] ldr r0, [r0] mul r1, r2 - bl FUN_02023A30 + bl PlayerProfile_AddMoney ldr r0, _021E9F6C ; =0x00000488 ldrsh r0, [r4, r0] cmp r0, #1 @@ -8218,7 +8218,7 @@ MOD75_021EAB44: ; 0x021EAB44 ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r0, #0x10 @@ -8273,7 +8273,7 @@ _021EACC6: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r0, #0x10 @@ -8327,7 +8327,7 @@ _021EAD3C: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r0, #0x20 @@ -8454,7 +8454,7 @@ _021EAE2E: ldr r0, [r5, r0] ldr r2, [r5, r2] add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0 add r1, r7, #0 add r2, r0, #0 @@ -9033,7 +9033,7 @@ _021EB298: ldr r0, [r5, r0] ldr r2, [sp, #0x18] add r1, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] mov r0, #0xff @@ -9166,7 +9166,7 @@ MOD75_021EB3D8: ; 0x021EB3D8 ldr r0, [r5, r0] add r1, r4, #0 add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 str r1, [sp] mov r0, #0xff @@ -9246,7 +9246,7 @@ MOD75_021EB454: ; 0x021EB454 ldr r0, [r5, r0] add r1, r4, #0 add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] mov r0, #0xff @@ -9306,7 +9306,7 @@ MOD75_021EB504: ; 0x021EB504 ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #8 str r0, [sp] mov r0, #0xff @@ -9420,7 +9420,7 @@ _021EB616: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add r0, r5, #0 @@ -9568,7 +9568,7 @@ _021EB722: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #8 str r0, [sp] mov r0, #0xff @@ -9610,7 +9610,7 @@ _021EB722: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0xfe lsl r1, r1, #2 mov r0, #0 @@ -9697,7 +9697,7 @@ _021EB866: add r0, r5, #0 add r0, #0xcc ldr r0, [r0] - bl FUN_02023A10 + bl PlayerProfile_GetMoney add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -9715,7 +9715,7 @@ _021EB866: ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0xfe lsl r1, r1, #2 mov r0, #0 @@ -9807,7 +9807,7 @@ MOD75_021EB8E8: ; 0x021EB8E8 ldr r0, [r5, r0] ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor mov r1, #0xfe diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index ed94aa20..3a079284 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -1098,7 +1098,7 @@ MOD76_021D7D60: ; 0x021D7D60 ldr r0, [r0] ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 bl String_dtor add sp, #8 @@ -2000,7 +2000,7 @@ _021D84D8: ldr r0, [r0] ldr r1, [r4, r1] add r2, r5, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0 bl String_dtor pop {r3, r4, r5, pc} @@ -2105,7 +2105,7 @@ _021D85BE: b _021D85D6 _021D85C6: ldr r0, _021D85E0 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM b _021D85D6 _021D85CE: ldr r0, _021D85DC ; =0x000005E6 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 8fe53b7d..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 @@ -2008,7 +2008,7 @@ MOD77_021D8510: ; 0x021D8510 add r1, r4, #0 ldr r0, [r5, r0] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0 ldr r0, _021D85CC ; =0x0000C044 str r1, [sp] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 1c8a9d21..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 FUN_020239CC + 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 FUN_020239CC + 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 FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r0, #0 add r0, r4, #0 bl MOD80_02235A10 @@ -4801,7 +4801,7 @@ MOD80_0222FB3C: ; 0x0222FB3C add r1, #0x1c ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _0222FBB8 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 @@ -10667,7 +10667,7 @@ MOD80_02232B34: ; 0x02232B34 add r1, #0x1c ldr r1, [r5, r1] add r2, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x24] cmp r0, #0 bne _02232B60 @@ -11653,7 +11653,7 @@ MOD80_022332EC: ; 0x022332EC add r1, #0x1c ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _02233350 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 @@ -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 FUN_020239C0 + 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 FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r5, #0 add r1, #0xf6 strb r0, [r1] @@ -16117,7 +16117,7 @@ _02235590: add r1, #0xba ldrh r1, [r1] ldr r0, [r0, #8] - bl FUN_0206B938 + bl RemoveMonFromParty ldr r0, [r5] ldr r1, _022355EC ; =0x000001B9 ldr r0, [r0, #8] @@ -16186,7 +16186,7 @@ _02235640: ldr r0, [r5] add r1, r4, #0 ldr r0, [r0, #8] - bl FUN_0206B900 + bl AddMonToParty ldr r0, [r5] ldr r0, [r0, #8] bl GetPartyCount @@ -16265,7 +16265,7 @@ _022356D2: ldr r0, [r5] add r1, r4, #0 ldr r0, [r0, #8] - bl FUN_0206B900 + bl AddMonToParty ldr r0, [r5] ldr r0, [r0, #8] bl GetPartyCount @@ -17647,14 +17647,14 @@ MOD80_022361AC: ; 0x022361AC push {r3, r4, r5, lr} add r5, r0, #0 mov r0, #0x3e - bl FUN_02023928 + bl PlayerProfile_init add r4, r0, #0 - bl FUN_02023948 + bl PlayerProfile_Clear mov r1, #0x43 lsl r1, r1, #2 add r0, r4, #0 add r1, r5, r1 - bl FUN_0202395C + bl CopyPlayerName ldr r1, _022361E0 ; =0x00000122 add r0, r4, #0 ldrb r1, [r5, r1] @@ -19045,7 +19045,7 @@ MOD80_02236C70: ; 0x02236C70 add r1, #0x1c ldr r1, [r5, r1] add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0 bl String_dtor ldr r0, _02236CD8 ; =0x00000E98 @@ -19202,7 +19202,7 @@ MOD80_02236D8C: ; 0x02236D8C add r1, #0x4c ldr r1, [r5, r1] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, _02236DFC ; =0x00000EC8 mov r1, #0xf add r0, r5, r0 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index c5c4a97f..6b04578f 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -2467,7 +2467,7 @@ _022390F4: ldr r1, [r4, #0x58] ldr r2, [r4, #0x54] add r0, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] mov r0, #0xff @@ -2509,7 +2509,7 @@ _02239138: ldr r1, [r4, #0x58] ldr r2, [r4, #0x54] add r0, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r4] bl MOD81_02238818 mov r1, #0x4c @@ -9591,7 +9591,7 @@ _0223C982: ldr r1, [r4, #0x5c] ldr r2, [r4, #0x58] add r0, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0 str r3, [sp] mov r0, #0xff @@ -9611,7 +9611,7 @@ _0223C982: add r0, #0x48 bl FUN_020191D0 ldr r0, _0223CA90 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -9636,7 +9636,7 @@ _0223C9D0: ldr r1, [r4, #0x5c] ldr r2, [r4, #0x58] add r0, r7, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 add r0, #0x48 mov r1, #0xf diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 36d3f681..1427108d 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -4032,7 +4032,7 @@ MOD82_0222F4D8: ; 0x0222F4D8 ldr r0, [r5, r1] add r1, #0x10 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x36 lsl r0, r0, #6 add r0, r5, r0 @@ -4370,7 +4370,7 @@ MOD82_0222F740: ; 0x0222F740 ldr r0, [r5, r1] add r1, #0x20 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x37 lsl r0, r0, #6 add r0, r5, r0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 391b40c8..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 FUN_020239CC + bl PlayerProfile_GetTrainerGender cmp r0, #1 bne _0222DD58 ldr r0, _0222DEB8 ; =0x0003040F @@ -1052,13 +1052,13 @@ _0222DDB8: bl MOD83_0222DCA0 ldr r0, [sp, #0x10] ldr r0, [r0, #0x10] - bl FUN_02029EBC + bl GetIGTHours add r1, r0, #0 ldr r0, [sp, #0x28] bl MOD83_0222DCF4 ldr r0, [sp, #0x10] ldr r0, [r0, #0x10] - bl FUN_02029EC0 + bl GetIGTMinutes add r2, r0, #0 mov r3, #2 ldr r0, [sp, #0x28] @@ -1948,19 +1948,19 @@ MOD83_0222E48C: ; 0x0222E48C add r0, r0, #4 str r1, [r4, r0] ldr r0, [r4, #4] - bl FUN_020238F4 + 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 FUN_020239F4 + 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 FUN_020239C0 + 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 FUN_020239C0 + 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 FUN_020238F4 + 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 FUN_020239CC + 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 FUN_020239BC + 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 FUN_020238F4 + 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 166d85a6..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 FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0xc] mov r0, #0 add r1, r0, #0 @@ -816,7 +816,7 @@ MOD86_021D7B80: ; 0x021D7B80 ldr r0, [r5, #0x38] add r1, r4, #0 add r2, r6, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x20 str r0, [sp] mov r1, #0 |