diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-08-13 19:12:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 19:12:12 +0300 |
| commit | a82d0d55a67b12757b185fd149d6a14dcc7cad02 (patch) | |
| tree | 829d21a866de69dc92e1b8e5bb1857a21104027c | |
| parent | c259e6ed18294c001033fed62d924d379276021a (diff) | |
| parent | ddd20f2c76a34b4fc46503c8bf88d53a755453a8 (diff) | |
Merge pull request #261 from PikalaxALT/pikalax_work
Name some scrcmds; save block 2 struct resolution
198 files changed, 3020 insertions, 3097 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 27d530ed..2265303b 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -84,11 +84,11 @@ Static arm9 Object unk_02022504.o Object save.o Object unk_0202376C.o - Object unk_020238C4.o + Object player_data.o Object unk_02023AC4.o Object unk_02023C40.o Object unk_02024E64.o - Object unk_02024F30.o + Object options.o Object unk_020250A4.o Object unk_02025484.o Object unk_020254B8.o @@ -98,13 +98,13 @@ Static arm9 Object unk_02027E30.o Object unk_020281E0.o Object unk_020286F8.o - Object unk_02028910.o + Object coins.o Object unk_02028980.o Object unk_02029A84.o Object unk_02029AE0.o Object unk_02029C58.o Object unk_02029CEC.o - Object unk_02029E48.o + Object igt.o Object unk_02029EC4.o Object unk_02029FB0.o Object unk_0202A1E0.o @@ -175,7 +175,7 @@ Static arm9 Object scrcmd_24.o Object scrcmd_25.o Object unk_02046030.o - Object unk_02046294.o + Object event_data.o Object unk_0204639C.o Object unk_0204653C.o Object unk_02047500.o diff --git a/arm9/asm/unk_02024F30.s b/arm9/asm/options.s index 0ee173aa..14d2a449 100644 --- a/arm9/asm/unk_02024F30.s +++ b/arm9/asm/options.s @@ -11,7 +11,7 @@ FUN_02024F30: ; 0x02024F30 mov r1, #0x2 bl AllocFromHeap add r4, r0, #0x0 - bl FUN_02024F50 + bl Options_init add r0, r4, #0x0 pop {r4, pc} .balign 4 @@ -24,8 +24,8 @@ FUN_02024F44: ; 0x02024F44 nop _02024F4C: .word MI_CpuCopy8 - thumb_func_start FUN_02024F50 -FUN_02024F50: ; 0x02024F50 + thumb_func_start Options_init +Options_init: ; 0x02024F50 push {r4, lr} add r4, r0, #0x0 mov r1, #0x0 @@ -67,7 +67,7 @@ FUN_02024F9C: ; 0x02024F9C push {r3, lr} cmp r0, #0x0 beq _02024FAC - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025064 add r1, r0, #0x0 _02024FAC: diff --git a/arm9/asm/unk_020238C4.s b/arm9/asm/player_data.s index 70e0d568..9761eb48 100644 --- a/arm9/asm/unk_020238C4.s +++ b/arm9/asm/player_data.s @@ -3,13 +3,13 @@ .text - thumb_func_start FUN_020238C4 -FUN_020238C4: ; 0x020238C4 + thumb_func_start Sav2_PlayerData_sizeof +Sav2_PlayerData_sizeof: ; 0x020238C4 mov r0, #0x2c bx lr - thumb_func_start FUN_020238C8 -FUN_020238C8: ; 0x020238C8 + thumb_func_start Sav2_PlayerData_init +Sav2_PlayerData_init: ; 0x020238C8 push {r4, lr} add r4, r0, #0x0 mov r0, #0x0 @@ -17,75 +17,75 @@ FUN_020238C8: ; 0x020238C8 mov r2, #0x2c bl MIi_CpuClearFast add r0, r4, #0x0 - bl FUN_02024F50 + bl Options_init add r0, r4, #0x4 - bl FUN_02023948 + bl PlayerProfile_Clear add r0, r4, #0x0 add r0, #0x24 - bl FUN_02028910 + bl InitCoins add r4, #0x26 add r0, r4, #0x0 - bl FUN_02029E48 + bl InitIGT pop {r4, pc} - thumb_func_start FUN_020238F4 -FUN_020238F4: ; 0x020238F4 + thumb_func_start Sav2_PlayerData_GetProfileAddr +Sav2_PlayerData_GetProfileAddr: ; 0x020238F4 push {r3, lr} mov r1, #0x1 - bl FUN_02022610 + bl SavArray_get add r0, r0, #0x4 pop {r3, pc} - thumb_func_start LoadPlayerDataAddress -LoadPlayerDataAddress: ; 0x02023900 - ldr r3, _02023908 ; =FUN_02022610 + thumb_func_start Sav2_PlayerData_GetOptionsAddr +Sav2_PlayerData_GetOptionsAddr: ; 0x02023900 + ldr r3, _02023908 ; =SavArray_get mov r1, #0x1 bx r3 nop -_02023908: .word FUN_02022610 +_02023908: .word SavArray_get - thumb_func_start FUN_0202390C -FUN_0202390C: ; 0x0202390C + thumb_func_start Sav2_PlayerData_GetCoinsAddr +Sav2_PlayerData_GetCoinsAddr: ; 0x0202390C push {r3, lr} mov r1, #0x1 - bl FUN_02022610 + bl SavArray_get add r0, #0x24 pop {r3, pc} - thumb_func_start FUN_02023918 -FUN_02023918: ; 0x02023918 + thumb_func_start Sav2_PlayerData_GetIGTAddr +Sav2_PlayerData_GetIGTAddr: ; 0x02023918 push {r3, lr} mov r1, #0x1 - bl FUN_02022610 + bl SavArray_get add r0, #0x26 pop {r3, pc} - thumb_func_start FUN_02023924 -FUN_02023924: ; 0x02023924 + thumb_func_start PlayerProfile_sizeof +PlayerProfile_sizeof: ; 0x02023924 mov r0, #0x20 bx lr - thumb_func_start FUN_02023928 -FUN_02023928: ; 0x02023928 + thumb_func_start PlayerProfile_init +PlayerProfile_init: ; 0x02023928 push {r4, lr} mov r1, #0x20 bl AllocFromHeap add r4, r0, #0x0 - bl FUN_02023948 + bl PlayerProfile_Clear add r0, r4, #0x0 pop {r4, pc} .balign 4 - thumb_func_start FUN_0202393C -FUN_0202393C: ; 0x0202393C + thumb_func_start PlayerProfile_Copy +PlayerProfile_Copy: ; 0x0202393C ldr r3, _02023944 ; =MI_CpuCopy8 mov r2, #0x20 bx r3 nop _02023944: .word MI_CpuCopy8 - thumb_func_start FUN_02023948 -FUN_02023948: ; 0x02023948 + thumb_func_start PlayerProfile_Clear +PlayerProfile_Clear: ; 0x02023948 push {r4, lr} mov r1, #0x0 mov r2, #0x20 @@ -96,8 +96,8 @@ FUN_02023948: ; 0x02023948 pop {r4, pc} .balign 4 - thumb_func_start FUN_0202395C -FUN_0202395C: ; 0x0202395C + thumb_func_start CopyPlayerName +CopyPlayerName: ; 0x0202395C push {r3-r5, lr} add r4, r1, #0x0 add r5, r0, #0x0 @@ -113,8 +113,8 @@ _02023970: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0202397C -FUN_0202397C: ; 0x0202397C + thumb_func_start PlayerName_StringToFlat +PlayerName_StringToFlat: ; 0x0202397C ldr r3, _02023988 ; =CopyStringToU16Array add r2, r0, #0x0 add r0, r1, #0x0 @@ -124,13 +124,13 @@ FUN_0202397C: ; 0x0202397C .balign 4 _02023988: .word CopyStringToU16Array - thumb_func_start FUN_0202398C -FUN_0202398C: ; 0x0202398C + thumb_func_start PlayerProfile_GetNamePtr +PlayerProfile_GetNamePtr: ; 0x0202398C bx lr .balign 4 - thumb_func_start FUN_02023990 -FUN_02023990: ; 0x02023990 + thumb_func_start PlayerName_FlatToString +PlayerName_FlatToString: ; 0x02023990 ldr r3, _0202399C ; =CopyU16ArrayToString add r2, r0, #0x0 add r0, r1, #0x0 @@ -139,8 +139,8 @@ FUN_02023990: ; 0x02023990 nop _0202399C: .word CopyU16ArrayToString - thumb_func_start FUN_020239A0 -FUN_020239A0: ; 0x020239A0 + thumb_func_start PlayerProfile_GetPlayerName_NewString +PlayerProfile_GetPlayerName_NewString: ; 0x020239A0 push {r3-r5, lr} add r5, r0, #0x0 mov r0, #0x8 @@ -148,39 +148,39 @@ FUN_020239A0: ; 0x020239A0 add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_02023990 + bl PlayerName_FlatToString add r0, r4, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_020239B8 -FUN_020239B8: ; 0x020239B8 + thumb_func_start PlayerProfile_SetTrainerID +PlayerProfile_SetTrainerID: ; 0x020239B8 str r1, [r0, #0x10] bx lr - thumb_func_start FUN_020239BC -FUN_020239BC: ; 0x020239BC + thumb_func_start PlayerProfile_GetTrainerID +PlayerProfile_GetTrainerID: ; 0x020239BC ldr r0, [r0, #0x10] bx lr - thumb_func_start FUN_020239C0 -FUN_020239C0: ; 0x020239C0 + thumb_func_start PlayerProfile_GetTrainerID_VisibleHalf +PlayerProfile_GetTrainerID_VisibleHalf: ; 0x020239C0 ldr r0, [r0, #0x10] lsl r0, r0, #0x10 lsr r0, r0, #0x10 bx lr - thumb_func_start FUN_020239C8 -FUN_020239C8: ; 0x020239C8 + thumb_func_start PlayerProfile_SetTrainerGender +PlayerProfile_SetTrainerGender: ; 0x020239C8 strb r1, [r0, #0x18] bx lr - thumb_func_start FUN_020239CC -FUN_020239CC: ; 0x020239CC + thumb_func_start PlayerProfile_GetTrainerGender +PlayerProfile_GetTrainerGender: ; 0x020239CC ldrb r0, [r0, #0x18] bx lr - thumb_func_start FUN_020239D0 -FUN_020239D0: ; 0x020239D0 + thumb_func_start PlayerProfile_TestBadgeFlag +PlayerProfile_TestBadgeFlag: ; 0x020239D0 ldrb r3, [r0, #0x1a] mov r0, #0x1 add r2, r0, #0x0 @@ -193,8 +193,8 @@ _020239E0: bx lr .balign 4 - thumb_func_start FUN_020239E4 -FUN_020239E4: ; 0x020239E4 + thumb_func_start PlayerProfile_SetBadgeFlag +PlayerProfile_SetBadgeFlag: ; 0x020239E4 ldrb r3, [r0, #0x1a] mov r2, #0x1 lsl r2, r1 @@ -204,8 +204,8 @@ FUN_020239E4: ; 0x020239E4 bx lr .balign 4 - thumb_func_start FUN_020239F4 -FUN_020239F4: ; 0x020239F4 + thumb_func_start PlayerProfile_CountBadges +PlayerProfile_CountBadges: ; 0x020239F4 ldrb r3, [r0, #0x1a] mov r2, #0x0 cmp r3, #0x0 @@ -224,13 +224,13 @@ _02023A0A: bx lr .balign 4 - thumb_func_start FUN_02023A10 -FUN_02023A10: ; 0x02023A10 + thumb_func_start PlayerProfile_GetMoney +PlayerProfile_GetMoney: ; 0x02023A10 ldr r0, [r0, #0x14] bx lr - thumb_func_start FUN_02023A14 -FUN_02023A14: ; 0x02023A14 + thumb_func_start PlayerProfile_SetMoney +PlayerProfile_SetMoney: ; 0x02023A14 ldr r2, _02023A24 ; =0x000F423F cmp r1, r2 bls _02023A1C @@ -252,8 +252,8 @@ FUN_02023A2C: ; 0x02023A2C strb r1, [r0, #0x1b] bx lr - thumb_func_start FUN_02023A30 -FUN_02023A30: ; 0x02023A30 + thumb_func_start PlayerProfile_AddMoney +PlayerProfile_AddMoney: ; 0x02023A30 ldr r2, _02023A50 ; =0x000F423F cmp r1, r2 bls _02023A3A @@ -275,8 +275,8 @@ _02023A4A: nop _02023A50: .word 0x000F423F - thumb_func_start FUN_02023A54 -FUN_02023A54: ; 0x02023A54 + thumb_func_start PlayerProfile_SubMoney +PlayerProfile_SubMoney: ; 0x02023A54 ldr r2, [r0, #0x14] cmp r2, r1 bhs _02023A5E @@ -344,8 +344,8 @@ FUN_02023A9C: ; 0x02023A9C lsr r0, r0, #0x1f bx lr - thumb_func_start FUN_02023AA4 -FUN_02023AA4: ; 0x02023AA4 + thumb_func_start PlayerProfile_NameAndOTIDMatchPlayer +PlayerProfile_NameAndOTIDMatchPlayer: ; 0x02023AA4 push {r3-r5, lr} mov r2, #0x7 add r5, r0, #0x0 diff --git a/arm9/asm/save.s b/arm9/asm/save.s index f4fe3815..4278bd36 100644 --- a/arm9/asm/save.s +++ b/arm9/asm/save.s @@ -19,10 +19,10 @@ UNK_020EE6E0: ; 0x020EE6E0 .global UNK_020EE700 UNK_020EE700: ; 0x020EE700 .word 0x00, 0x00, FUN_0202376C, FUN_02023770 - .word 0x01, 0x00, FUN_020238C4, FUN_020238C8 - .word 0x02, 0x00, FUN_0206B8A4, FUN_0206B8C0 + .word 0x01, 0x00, Sav2_PlayerData_sizeof, Sav2_PlayerData_init + .word 0x02, 0x00, SavArray_Party_sizeof, SavArray_Party_init .word 0x03, 0x00, FUN_0206EB80, FUN_0206EBA0 - .word 0x04, 0x00, FUN_02046294, FUN_0204629C + .word 0x04, 0x00, SavArray_Flags_sizeof, SavArray_Flags_init .word 0x05, 0x00, FUN_0204BE14, FUN_0204BE18 .word 0x06, 0x00, FUN_02034D7C, FUN_02034D98 .word 0x07, 0x00, FUN_02023D64, FUN_02024378 @@ -129,7 +129,7 @@ _020225C4: b _020225DA _020225D4: add r0, r4, #0x0 - bl FUN_020227DC + bl Sav2_InitDynamicRegion _020225DA: add r0, r4, #0x0 pop {r4, pc} @@ -156,8 +156,8 @@ _02022606: .balign 4 _0202260C: .word UNK_021C59C8 - thumb_func_start FUN_02022610 -FUN_02022610: ; 0x02022610 + thumb_func_start SavArray_get +SavArray_get: ; 0x02022610 push {r3-r5, lr} add r4, r1, #0x0 add r5, r0, #0x0 @@ -179,10 +179,10 @@ _02022630: .word 0x0002022C thumb_func_start FUN_02022634 FUN_02022634: ; 0x02022634 - ldr r3, _02022638 ; =FUN_02022610 + ldr r3, _02022638 ; =SavArray_get bx r3 .balign 4 -_02022638: .word FUN_02022610 +_02022638: .word SavArray_get thumb_func_start FUN_0202263C FUN_0202263C: ; 0x0202263C @@ -263,7 +263,7 @@ _020226B4: add r0, r6, #0x0 bl FreeToHeap ldr r0, [sp, #0x0] - bl FUN_020227DC + bl Sav2_InitDynamicRegion ldr r0, [sp, #0x0] mov r1, #0x0 str r1, [r0, #0x4] @@ -395,8 +395,8 @@ _020227CA: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_020227DC -FUN_020227DC: ; 0x020227DC + thumb_func_start Sav2_InitDynamicRegion +Sav2_InitDynamicRegion: ; 0x020227DC add r2, r0, #0x0 mov r0, #0x1 str r0, [r2, #0x8] @@ -404,13 +404,13 @@ FUN_020227DC: ; 0x020227DC mov r0, #0x85 ldr r1, _020227F4 ; =0x00020224 lsl r0, r0, #0x2 - ldr r3, _020227F8 ; =FUN_020231F4 + ldr r3, _020227F8 ; =Sav2_InitDynamicRegion_Internal add r0, r2, r0 add r1, r2, r1 bx r3 nop _020227F4: .word 0x00020224 -_020227F8: .word FUN_020231F4 +_020227F8: .word Sav2_InitDynamicRegion_Internal thumb_func_start FUN_020227FC FUN_020227FC: ; 0x020227FC @@ -1609,8 +1609,8 @@ FUN_02023074: ; 0x02023074 .balign 4 _020230A8: .word 0x00020464 - thumb_func_start FUN_020230AC -FUN_020230AC: ; 0x020230AC + thumb_func_start SavArray_sizeof +SavArray_sizeof: ; 0x020230AC push {r3-r5, lr} add r5, r0, #0x0 ldr r0, _020230DC ; =UNK_020EE6DC @@ -1667,7 +1667,7 @@ _02023112: ldr r0, [r4, #0x0] str r0, [r5, #0x0] add r0, r6, #0x0 - bl FUN_020230AC + bl SavArray_sizeof str r0, [r5, #0x4] str r7, [r5, #0x8] mov r0, #0x0 @@ -1784,8 +1784,10 @@ _020231E6: _020231EC: .word UNK_020EE6DC _020231F0: .word 0x00000FFF - thumb_func_start FUN_020231F4 -FUN_020231F4: ; 0x020231F4 + thumb_func_start Sav2_InitDynamicRegion_Internal +Sav2_InitDynamicRegion_Internal: ; 0x020231F4 + ; r0: &sav2->dynamic_region + ; r1: &sav2->arraySpecs push {r3-r7, lr} sub sp, #0x8 add r6, r0, #0x0 diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index e979c01d..7ffad1f7 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -2,7 +2,7 @@ .include "global.inc" .extern UNK_020F34E0 - .extern UNK_020F34E8 + .extern sScriptConditionTable .extern UNK_020F34FC .extern UNK_020F3538 .extern gMain @@ -16,26 +16,26 @@ UNK_021C5A0C: ; 0x021C5A0C .text - thumb_func_start FUN_020399A0 -FUN_020399A0: ; 0x020399A0 + thumb_func_start ScrCmd_nop +ScrCmd_nop: ; 0x020399A0 mov r0, #0x0 bx lr - thumb_func_start FUN_020399A4 -FUN_020399A4: ; 0x020399A4 + thumb_func_start ScrCmd_nop2 +ScrCmd_nop2: ; 0x020399A4 mov r0, #0x0 bx lr - thumb_func_start FUN_020399A8 -FUN_020399A8: ; 0x020399A8 + thumb_func_start ScrCmd_end +ScrCmd_end: ; 0x020399A8 push {r3, lr} bl StopScript mov r0, #0x0 pop {r3, pc} .balign 4 - thumb_func_start FUN_020399B4 -FUN_020399B4: ; 0x020399B4 + thumb_func_start ScrCmd_delay +ScrCmd_delay: ; 0x020399B4 push {r3-r7, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -48,19 +48,19 @@ FUN_020399B4: ; 0x020399B4 add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 - bl FUN_020394B8 + bl GetVarPointer strh r7, [r0, #0x0] - ldr r1, _020399E4 ; =FUN_020399E8 + ldr r1, _020399E4 ; =RunPauseTimer add r0, r5, #0x0 str r4, [r5, #0x64] bl SetupNativeScript mov r0, #0x1 pop {r3-r7, pc} .balign 4 -_020399E4: .word FUN_020399E8 +_020399E4: .word RunPauseTimer - thumb_func_start FUN_020399E8 -FUN_020399E8: ; 0x020399E8 + thumb_func_start RunPauseTimer +RunPauseTimer: ; 0x020399E8 push {r3, lr} add r1, r0, #0x0 ldr r1, [r1, #0x64] @@ -68,7 +68,7 @@ FUN_020399E8: ; 0x020399E8 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer ldrh r1, [r0, #0x0] sub r1, r1, #0x1 strh r1, [r0, #0x0] @@ -90,13 +90,13 @@ FUN_02039A10: ; 0x02039A10 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet mov r0, #0x0 pop {r4, pc} .balign 4 - thumb_func_start FUN_02039A28 -FUN_02039A28: ; 0x02039A28 + thumb_func_start ScrCmd_loadbyte +ScrCmd_loadbyte: ; 0x02039A28 ldr r1, [r0, #0x8] add r2, r1, #0x1 str r2, [r0, #0x8] @@ -110,8 +110,8 @@ FUN_02039A28: ; 0x02039A28 mov r0, #0x0 bx lr - thumb_func_start FUN_02039A40 -FUN_02039A40: ; 0x02039A40 + thumb_func_start ScrCmd_loadword +ScrCmd_loadword: ; 0x02039A40 push {r3-r5, lr} add r4, r0, #0x0 ldr r2, [r4, #0x8] @@ -126,8 +126,8 @@ FUN_02039A40: ; 0x02039A40 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02039A5C -FUN_02039A5C: ; 0x02039A5C + thumb_func_start ScrCmd_loadbytefromaddr +ScrCmd_loadbytefromaddr: ; 0x02039A5C push {r3-r5, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -142,8 +142,8 @@ FUN_02039A5C: ; 0x02039A5C mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039A78 -FUN_02039A78: ; 0x02039A78 + thumb_func_start ScrCmd_writebytetoaddr +ScrCmd_writebytetoaddr: ; 0x02039A78 push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -156,8 +156,8 @@ FUN_02039A78: ; 0x02039A78 pop {r4, pc} .balign 4 - thumb_func_start FUN_02039A90 -FUN_02039A90: ; 0x02039A90 + thumb_func_start ScrCmd_setptrbyte +ScrCmd_setptrbyte: ; 0x02039A90 push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -172,8 +172,8 @@ FUN_02039A90: ; 0x02039A90 mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_02039AAC -FUN_02039AAC: ; 0x02039AAC + thumb_func_start ScrCmd_copylocal +ScrCmd_copylocal: ; 0x02039AAC ldr r1, [r0, #0x8] add r2, r1, #0x1 str r2, [r0, #0x8] @@ -191,8 +191,8 @@ FUN_02039AAC: ; 0x02039AAC bx lr .balign 4 - thumb_func_start FUN_02039ACC -FUN_02039ACC: ; 0x02039ACC + thumb_func_start ScrCmd_copybyte +ScrCmd_copybyte: ; 0x02039ACC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadWord @@ -204,8 +204,8 @@ FUN_02039ACC: ; 0x02039ACC mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039AE4 -FUN_02039AE4: ; 0x02039AE4 + thumb_func_start compare_012 +compare_012: ; 0x02039AE4 cmp r0, r1 bhs _02039AEC mov r0, #0x0 @@ -219,8 +219,8 @@ _02039AF4: mov r0, #0x2 bx lr - thumb_func_start FUN_02039AF8 -FUN_02039AF8: ; 0x02039AF8 + thumb_func_start ScrCmd_compare_local_to_local +ScrCmd_compare_local_to_local: ; 0x02039AF8 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x8] @@ -240,13 +240,13 @@ FUN_02039AF8: ; 0x02039AF8 ldr r1, [r1, #0x64] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_02039B28 -FUN_02039B28: ; 0x02039B28 + thumb_func_start ScrCmd_compare_local_to_value +ScrCmd_compare_local_to_value: ; 0x02039B28 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x8] @@ -261,14 +261,14 @@ FUN_02039B28: ; 0x02039B28 ldrb r1, [r1, #0x0] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r4, pc} .balign 4 - thumb_func_start FUN_02039B50 -FUN_02039B50: ; 0x02039B50 + thumb_func_start ScrCmd_compare_local_to_addr +ScrCmd_compare_local_to_addr: ; 0x02039B50 push {r3-r5, lr} add r4, r0, #0x0 ldr r2, [r4, #0x8] @@ -283,13 +283,13 @@ FUN_02039B50: ; 0x02039B50 bl ScriptReadWord ldrb r1, [r0, #0x0] add r0, r5, #0x0 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039B78 -FUN_02039B78: ; 0x02039B78 + thumb_func_start ScrCmd_compare_addr_to_local +ScrCmd_compare_addr_to_local: ; 0x02039B78 push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -303,14 +303,14 @@ FUN_02039B78: ; 0x02039B78 ldr r1, [r1, #0x64] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r4, pc} .balign 4 - thumb_func_start FUN_02039BA0 -FUN_02039BA0: ; 0x02039BA0 + thumb_func_start ScrCmd_compare_addr_to_value +ScrCmd_compare_addr_to_value: ; 0x02039BA0 push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -319,13 +319,13 @@ FUN_02039BA0: ; 0x02039BA0 add r1, r2, #0x1 str r1, [r4, #0x8] ldrb r1, [r2, #0x0] - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_02039BBC -FUN_02039BBC: ; 0x02039BBC + thumb_func_start ScrCmd_compare_addr_to_addr +ScrCmd_compare_addr_to_addr: ; 0x02039BBC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadWord @@ -334,14 +334,14 @@ FUN_02039BBC: ; 0x02039BBC bl ScriptReadWord ldrb r1, [r0, #0x0] add r0, r4, #0x0 - bl FUN_02039AE4 + bl compare_012 strb r0, [r5, #0x2] mov r0, #0x0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02039BDC -FUN_02039BDC: ; 0x02039BDC + thumb_func_start ScrCmd_compare_var_to_value +ScrCmd_compare_var_to_value: ; 0x02039BDC push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -349,20 +349,20 @@ FUN_02039BDC: ; 0x02039BDC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldrh r5, [r0, #0x0] add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02039C08 -FUN_02039C08: ; 0x02039C08 + thumb_func_start ScrCmd_compare_var_to_var +ScrCmd_compare_var_to_var: ; 0x02039C08 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -370,7 +370,7 @@ FUN_02039C08: ; 0x02039C08 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -378,11 +378,11 @@ FUN_02039C08: ; 0x02039C08 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldrh r0, [r4, #0x0] ldrh r1, [r1, #0x0] - bl FUN_02039AE4 + bl compare_012 strb r0, [r5, #0x2] mov r0, #0x0 pop {r3-r5, pc} @@ -405,7 +405,7 @@ FUN_02039C40: ; 0x02039C40 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02038EB0 + bl CreateScriptContext str r0, [r6, #0x0] ldrb r0, [r4, #0x0] add r0, r0, #0x1 @@ -438,7 +438,7 @@ FUN_02039C78: ; 0x02039C78 mov r0, #0x1 strb r0, [r6, #0x0] add r0, r5, #0x0 - bl FUN_02038EB0 + bl CreateScriptContext str r0, [r7, #0x0] ldrb r0, [r4, #0x0] ldr r1, _02039CC4 ; =FUN_02039CC8 @@ -480,8 +480,9 @@ FUN_02039CE4: ; 0x02039CE4 add r0, r1, #0x0 pop {r3, pc} - thumb_func_start FUN_02039CF8 -FUN_02039CF8: ; 0x02039CF8 + thumb_func_start ScrCmd_goto +ScrCmd_goto: ; 0x02039CF8 + ; relative jump push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -573,8 +574,8 @@ _02039DA8: mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_02039DAC -FUN_02039DAC: ; 0x02039DAC + thumb_func_start ScrCmd_call +ScrCmd_call: ; 0x02039DAC push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -586,16 +587,16 @@ FUN_02039DAC: ; 0x02039DAC mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_02039DC4 -FUN_02039DC4: ; 0x02039DC4 + thumb_func_start ScrCmd_return +ScrCmd_return: ; 0x02039DC4 push {r3, lr} bl ScriptReturn mov r0, #0x0 pop {r3, pc} .balign 4 - thumb_func_start FUN_02039DD0 -FUN_02039DD0: ; 0x02039DD0 + thumb_func_start ScrCmd_goto_if +ScrCmd_goto_if: ; 0x02039DD0 push {r3-r5, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -606,7 +607,7 @@ FUN_02039DD0: ; 0x02039DD0 add r1, r0, #0x0 lsl r0, r4, #0x1 add r3, r4, r0 - ldr r0, _02039E00 ; =UNK_020F34E8 + ldr r0, _02039E00 ; =sScriptConditionTable ldrb r2, [r5, #0x2] add r0, r0, r3 ldrb r0, [r2, r0] @@ -620,10 +621,10 @@ _02039DFC: mov r0, #0x0 pop {r3-r5, pc} .balign 4 -_02039E00: .word UNK_020F34E8 +_02039E00: .word sScriptConditionTable - thumb_func_start FUN_02039E04 -FUN_02039E04: ; 0x02039E04 + thumb_func_start ScrCmd_call_if +ScrCmd_call_if: ; 0x02039E04 push {r3-r5, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -634,7 +635,7 @@ FUN_02039E04: ; 0x02039E04 add r1, r0, #0x0 lsl r0, r4, #0x1 add r3, r4, r0 - ldr r0, _02039E34 ; =UNK_020F34E8 + ldr r0, _02039E34 ; =sScriptConditionTable ldrb r2, [r5, #0x2] add r0, r0, r3 ldrb r0, [r2, r0] @@ -648,10 +649,10 @@ _02039E30: mov r0, #0x0 pop {r3-r5, pc} .balign 4 -_02039E34: .word UNK_020F34E8 +_02039E34: .word sScriptConditionTable - thumb_func_start FUN_02039E38 -FUN_02039E38: ; 0x02039E38 + thumb_func_start ScrCmd_setflag +ScrCmd_setflag: ; 0x02039E38 push {r4, lr} add r1, r0, #0x0 add r1, #0x80 @@ -659,12 +660,12 @@ FUN_02039E38: ; 0x02039E38 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 - bl FUN_0203953C + bl FlagSet mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_02039E50 -FUN_02039E50: ; 0x02039E50 + thumb_func_start ScrCmd_clearflag +ScrCmd_clearflag: ; 0x02039E50 push {r4, lr} add r1, r0, #0x0 add r1, #0x80 @@ -672,12 +673,12 @@ FUN_02039E50: ; 0x02039E50 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 - bl FUN_02039550 + bl FlagClear mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_02039E68 -FUN_02039E68: ; 0x02039E68 + thumb_func_start ScrCmd_checkflag +ScrCmd_checkflag: ; 0x02039E68 push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -686,7 +687,7 @@ FUN_02039E68: ; 0x02039E68 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02039528 + bl FlagCheck strb r0, [r4, #0x2] mov r0, #0x0 pop {r3-r5, pc} @@ -703,18 +704,18 @@ FUN_02039E84: ; 0x02039E84 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldrh r1, [r6, #0x0] add r0, r5, #0x0 - bl FUN_02039528 + bl FlagCheck strh r0, [r4, #0x0] mov r0, #0x0 pop {r4-r6, pc} @@ -730,17 +731,17 @@ FUN_02039EC0: ; 0x02039EC0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldrh r1, [r1, #0x0] add r0, r4, #0x0 - bl FUN_0203953C + bl FlagSet mov r0, #0x0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02039EE8 -FUN_02039EE8: ; 0x02039EE8 + thumb_func_start ScrCmd_settrainerflag +ScrCmd_settrainerflag: ; 0x02039EE8 push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -750,15 +751,15 @@ FUN_02039EE8: ; 0x02039EE8 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_0203965C + bl TrainerFlagSet mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039F0C -FUN_02039F0C: ; 0x02039F0C + thumb_func_start ScrCmd_cleartrainerflag +ScrCmd_cleartrainerflag: ; 0x02039F0C push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -768,15 +769,15 @@ FUN_02039F0C: ; 0x02039F0C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02039678 + bl TrainerFlagClear mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039F30 -FUN_02039F30: ; 0x02039F30 + thumb_func_start ScrCmd_checktrainerflag +ScrCmd_checktrainerflag: ; 0x02039F30 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -787,16 +788,16 @@ FUN_02039F30: ; 0x02039F30 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r4, #0x0 - bl FUN_02039640 + bl TrainerFlagCheck strb r0, [r5, #0x2] mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039F58 -FUN_02039F58: ; 0x02039F58 + thumb_func_start ScrCmd_addvar +ScrCmd_addvar: ; 0x02039F58 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -804,22 +805,22 @@ FUN_02039F58: ; 0x02039F58 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet ldrh r1, [r4, #0x0] add r0, r1, r0 strh r0, [r4, #0x0] mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039F88 -FUN_02039F88: ; 0x02039F88 + thumb_func_start ScrCmd_subvar +ScrCmd_subvar: ; 0x02039F88 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -827,22 +828,22 @@ FUN_02039F88: ; 0x02039F88 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet ldrh r1, [r4, #0x0] sub r0, r1, r0 strh r0, [r4, #0x0] mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039FB8 -FUN_02039FB8: ; 0x02039FB8 + thumb_func_start ScrCmd_setvar +ScrCmd_setvar: ; 0x02039FB8 push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -850,7 +851,7 @@ FUN_02039FB8: ; 0x02039FB8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -859,8 +860,8 @@ FUN_02039FB8: ; 0x02039FB8 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02039FDC -FUN_02039FDC: ; 0x02039FDC + thumb_func_start ScrCmd_copyvar +ScrCmd_copyvar: ; 0x02039FDC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -868,22 +869,22 @@ FUN_02039FDC: ; 0x02039FDC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldrh r0, [r0, #0x0] strh r0, [r4, #0x0] mov r0, #0x0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203A00C -FUN_0203A00C: ; 0x0203A00C + thumb_func_start ScrCmd_setorcopyvar +ScrCmd_setorcopyvar: ; 0x0203A00C push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -891,32 +892,33 @@ FUN_0203A00C: ; 0x0203A00C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet strh r0, [r5, #0x0] mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203A038 -FUN_0203A038: ; 0x0203A038 + thumb_func_start ScrCmd_message +ScrCmd_message: ; 0x0203A038 push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 str r1, [r0, #0x8] ldrb r2, [r2, #0x0] ldr r1, [r0, #0x78] - bl MOD05_021E2C24 + bl MOD05_ShowMessageInField mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203A04C -FUN_0203A04C: ; 0x0203A04C + thumb_func_start ScrCmd_message_from +ScrCmd_message_from: ; 0x0203A04C + ; message_from bank, id push {r4-r6, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -924,7 +926,7 @@ FUN_0203A04C: ; 0x0203A04C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -932,7 +934,7 @@ FUN_0203A04C: ; 0x0203A04C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 mov r0, #0x1 mov r1, #0x1a @@ -943,7 +945,7 @@ FUN_0203A04C: ; 0x0203A04C add r0, r4, #0x0 add r1, r5, #0x0 add r2, r6, #0x0 - bl MOD05_021E2C24 + bl MOD05_ShowMessageInField add r0, r5, #0x0 bl DestroyMsgData mov r0, #0x0 @@ -959,7 +961,7 @@ FUN_0203A098: ; 0x0203A098 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -967,7 +969,7 @@ FUN_0203A098: ; 0x0203A098 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 mov r0, #0x1 mov r1, #0x1a @@ -1140,7 +1142,7 @@ FUN_0203A210: ; 0x0203A210 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -1251,7 +1253,7 @@ FUN_0203A304: ; 0x0203A304 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -1280,7 +1282,7 @@ FUN_0203A340: ; 0x0203A340 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, sp, #0x4 add r1, r5, #0x0 @@ -1314,7 +1316,7 @@ FUN_0203A388: ; 0x0203A388 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 mov r3, #0x0 str r3, [sp, #0x0] @@ -1439,7 +1441,7 @@ FUN_0203A484: ; 0x0203A484 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [r4, #0x64] ldr r1, _0203A4A8 ; =FUN_0203A4AC add r0, r4, #0x0 @@ -1604,7 +1606,7 @@ FUN_0203A590: ; 0x0203A590 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02054608 @@ -1883,7 +1885,7 @@ _0203A7E0: ldr r0, [r0, #0x0] ldr r1, [r7, #0x0] ldr r2, [r2, #0x0] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r4, #0x60] bl MOD05_021E8140 mov r3, #0x0 @@ -2011,7 +2013,7 @@ FUN_0203A8B8: ; 0x0203A8B8 ldr r1, [r7, #0x0] ldr r0, [r0, #0x0] ldr r2, [r6, #0x0] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [r4, #0x60] bl MOD05_021E8140 add r4, r0, #0x0 @@ -2019,7 +2021,7 @@ FUN_0203A8B8: ; 0x0203A8B8 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 ldr r1, [r7, #0x0] add r0, r4, #0x0 @@ -2052,7 +2054,7 @@ FUN_0203A94C: ; 0x0203A94C lsl r1, r1, #0x10 add r0, r5, #0x0 lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0x60] bl MOD05_021E8144 @@ -2145,7 +2147,7 @@ FUN_0203AA0C: ; 0x0203AA0C lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, _0203AA88 ; =gMain ldr r1, _0203AA8C ; =0x0000FFFF @@ -2275,7 +2277,7 @@ FUN_0203AB00: ; 0x0203AB00 lsl r1, r1, #0x10 add r0, r6, #0x0 lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] mov r1, #0x4 @@ -2369,7 +2371,7 @@ FUN_0203AB8C: ; 0x0203AB8C str r0, [sp, #0x24] ldr r1, [sp, #0x24] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x28] add r0, r5, #0x0 add r0, #0x80 @@ -2434,7 +2436,7 @@ FUN_0203AC14: ; 0x0203AC14 str r0, [sp, #0x24] ldr r1, [sp, #0x24] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x28] add r0, r5, #0x0 add r0, #0x80 @@ -2500,14 +2502,14 @@ FUN_0203ACC4: ; 0x0203ACC4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] add r1, r6, #0x0 @@ -2543,7 +2545,7 @@ FUN_0203AD2C: ; 0x0203AD2C lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer ldrh r1, [r0, #0x0] ldr r0, _0203AD50 ; =0x0000EEEE cmp r1, r0 @@ -2584,7 +2586,7 @@ FUN_0203AD78: ; 0x0203AD78 lsl r1, r1, #0x10 add r0, r5, #0x0 lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x0 @@ -2648,7 +2650,7 @@ FUN_0203ADC4: ; 0x0203ADC4 str r0, [sp, #0x24] ldr r1, [sp, #0x24] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x28] add r0, r5, #0x0 add r0, #0x80 @@ -2713,7 +2715,7 @@ FUN_0203AE4C: ; 0x0203AE4C str r0, [sp, #0x24] ldr r1, [sp, #0x24] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x28] add r0, r5, #0x0 add r0, #0x80 @@ -2758,7 +2760,7 @@ FUN_0203AED4: ; 0x0203AED4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -2766,14 +2768,14 @@ FUN_0203AED4: ; 0x0203AED4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r3, r0, #0x0 lsl r1, r6, #0x18 lsl r2, r7, #0x18 @@ -2869,7 +2871,7 @@ FUN_0203AFC4: ; 0x0203AFC4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadWord @@ -2914,7 +2916,7 @@ FUN_0203B024: ; 0x0203B024 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -2922,7 +2924,7 @@ FUN_0203B024: ; 0x0203B024 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -2930,7 +2932,7 @@ FUN_0203B024: ; 0x0203B024 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -3305,7 +3307,7 @@ _0203B34E: cmp r7, #0x0 beq _0203B37A ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0x1 bne _0203B37A @@ -3395,7 +3397,7 @@ FUN_0203B3F8: ; 0x0203B3F8 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02034B64 @@ -3428,7 +3430,7 @@ FUN_0203B440: ; 0x0203B440 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 ldr r0, [r5, #0x34] bl FUN_02058060 @@ -3446,7 +3448,7 @@ FUN_0203B468: ; 0x0203B468 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -3454,7 +3456,7 @@ FUN_0203B468: ; 0x0203B468 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -3570,14 +3572,14 @@ FUN_0203B574: ; 0x0203B574 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0x38] bl FUN_02055320 @@ -3601,7 +3603,7 @@ FUN_0203B5B8: ; 0x0203B5B8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 ldr r0, [r5, #0x34] bl FUN_02058060 @@ -3612,14 +3614,14 @@ FUN_0203B5B8: ; 0x0203B5B8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02058B2C @@ -3640,7 +3642,7 @@ FUN_0203B618: ; 0x0203B618 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -3661,7 +3663,7 @@ FUN_0203B640: ; 0x0203B640 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -3669,7 +3671,7 @@ FUN_0203B640: ; 0x0203B640 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -3677,7 +3679,7 @@ FUN_0203B640: ; 0x0203B640 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 cmp r7, #0x0 beq _0203B696 @@ -3759,7 +3761,7 @@ FUN_0203B724: ; 0x0203B724 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 @@ -3784,7 +3786,7 @@ FUN_0203B758: ; 0x0203B758 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 @@ -3810,7 +3812,7 @@ FUN_0203B790: ; 0x0203B790 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x0] @@ -3820,7 +3822,7 @@ FUN_0203B790: ; 0x0203B790 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] @@ -3857,7 +3859,7 @@ FUN_0203B7F0: ; 0x0203B7F0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -3878,7 +3880,7 @@ FUN_0203B81C: ; 0x0203B81C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -3886,7 +3888,7 @@ FUN_0203B81C: ; 0x0203B81C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -3907,7 +3909,7 @@ FUN_0203B85C: ; 0x0203B85C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -3915,7 +3917,7 @@ FUN_0203B85C: ; 0x0203B85C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -3938,7 +3940,7 @@ FUN_0203B8A0: ; 0x0203B8A0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -3946,12 +3948,12 @@ FUN_0203B8A0: ; 0x0203B8A0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex bl FUN_020690CC @@ -4033,7 +4035,7 @@ FUN_0203B968: ; 0x0203B968 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -4077,7 +4079,7 @@ FUN_0203B9B4: ; 0x0203B9B4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -4085,7 +4087,7 @@ FUN_0203B9B4: ; 0x0203B9B4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -4093,7 +4095,7 @@ FUN_0203B9B4: ; 0x0203B9B4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r5, #0x0 bl ScriptReadHalfword @@ -4101,7 +4103,7 @@ FUN_0203B9B4: ; 0x0203B9B4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r1, r5, #0x0 str r6, [sp, #0x4] @@ -4130,7 +4132,7 @@ FUN_0203BA3C: ; 0x0203BA3C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -4138,7 +4140,7 @@ FUN_0203BA3C: ; 0x0203BA3C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -4192,7 +4194,7 @@ FUN_0203BAB0: ; 0x0203BAB0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r5, #0x0 add r1, #0x80 add r2, r0, #0x0 @@ -4217,7 +4219,7 @@ FUN_0203BAF4: ; 0x0203BAF4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -4253,7 +4255,7 @@ FUN_0203BB34: ; 0x0203BB34 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -4261,7 +4263,7 @@ FUN_0203BB34: ; 0x0203BB34 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -4486,7 +4488,7 @@ FUN_0203BCD8: ; 0x0203BCD8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldr r1, [r4, #0x0] ldr r1, [r1, #0x4] strh r1, [r0, #0x0] @@ -4503,7 +4505,7 @@ FUN_0203BD08: ; 0x0203BD08 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 bl FUN_02031190 strh r0, [r4, #0x0] @@ -4527,7 +4529,7 @@ FUN_0203BD28: ; 0x0203BD28 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -4535,7 +4537,7 @@ FUN_0203BD28: ; 0x0203BD28 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -4594,13 +4596,13 @@ FUN_0203BDB8: ; 0x0203BDB8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl GetPartyMonByIndex add r4, r0, #0x0 @@ -4705,7 +4707,7 @@ FUN_0203BE9C: ; 0x0203BE9C lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer ldr r0, [r4, #0x0] ldrb r0, [r0, #0x0] cmp r0, #0x3 @@ -4732,7 +4734,7 @@ FUN_0203BECC: ; 0x0203BECC add r0, #0x80 ldr r0, [r0, #0x0] add r1, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer add r2, r0, #0x0 ldr r0, [r5, #0x74] ldr r1, [r4, #0x0] @@ -4777,7 +4779,7 @@ FUN_0203BF2C: ; 0x0203BF2C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -4785,7 +4787,7 @@ FUN_0203BF2C: ; 0x0203BF2C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -4793,7 +4795,7 @@ FUN_0203BF2C: ; 0x0203BF2C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 ldr r2, [r5, #0x0] add r1, r6, #0x0 @@ -4825,7 +4827,7 @@ FUN_0203BF84: ; 0x0203BF84 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r5, #0x0 add r1, #0x80 add r6, r0, #0x0 @@ -4874,7 +4876,7 @@ FUN_0203BFEC: ; 0x0203BFEC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r5, #0x0 add r1, #0x80 add r6, r0, #0x0 @@ -4917,7 +4919,7 @@ FUN_0203C054: ; 0x0203C054 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -4947,7 +4949,7 @@ FUN_0203C090: ; 0x0203C090 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -4974,7 +4976,7 @@ FUN_0203C0CC: ; 0x0203C0CC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -5083,7 +5085,7 @@ FUN_0203C1AC: ; 0x0203C1AC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -5124,7 +5126,7 @@ FUN_0203C200: ; 0x0203C200 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5132,7 +5134,7 @@ FUN_0203C200: ; 0x0203C200 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r0, r5, #0x0 add r0, #0x80 @@ -5303,7 +5305,7 @@ FUN_0203C368: ; 0x0203C368 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5311,7 +5313,7 @@ FUN_0203C368: ; 0x0203C368 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -5349,7 +5351,7 @@ FUN_0203C3C8: ; 0x0203C3C8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldr r0, [r4, #0x74] bl FUN_0206F3D8 @@ -5374,7 +5376,7 @@ FUN_0203C3E8: ; 0x0203C3E8 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r6, #0x4] add r0, r5, #0x0 add r0, #0x80 @@ -5401,7 +5403,7 @@ FUN_0203C430: ; 0x0203C430 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldr r1, [r4, #0x0] ldr r1, [r1, #0x0] lsl r1, r1, #0x10 @@ -5463,7 +5465,7 @@ FUN_0203C4B0: ; 0x0203C4B0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -5494,7 +5496,7 @@ FUN_0203C4F0: ; 0x0203C4F0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r1, #0x0 str r1, [sp, #0x0] str r1, [sp, #0x4] @@ -5521,10 +5523,10 @@ FUN_0203C520: ; 0x0203C520 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex mov r1, #0x74 @@ -5537,7 +5539,7 @@ FUN_0203C520: ; 0x0203C520 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r7, #0x0 mov r1, #0x5 @@ -5566,7 +5568,7 @@ FUN_0203C58C: ; 0x0203C58C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r2, #0x0 str r2, [sp, #0x0] str r2, [sp, #0x4] @@ -5589,14 +5591,14 @@ FUN_0203C5BC: ; 0x0203C5BC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r5, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5604,7 +5606,7 @@ FUN_0203C5BC: ; 0x0203C5BC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r2, r0, #0x0 ldr r0, _0203C610 ; =0x0000FFFF add r5, #0x80 @@ -5628,14 +5630,14 @@ FUN_0203C614: ; 0x0203C614 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r5, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5643,7 +5645,7 @@ FUN_0203C614: ; 0x0203C614 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5651,7 +5653,7 @@ FUN_0203C614: ; 0x0203C614 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r3, r0, #0x0 ldr r0, _0203C67C ; =0x0000FFFF add r5, #0x80 @@ -5682,14 +5684,14 @@ FUN_0203C680: ; 0x0203C680 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] add r1, r6, #0x0 @@ -5768,7 +5770,7 @@ FUN_0203C730: ; 0x0203C730 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5776,7 +5778,7 @@ FUN_0203C730: ; 0x0203C730 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5807,7 +5809,7 @@ FUN_0203C788: ; 0x0203C788 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5815,7 +5817,7 @@ FUN_0203C788: ; 0x0203C788 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5858,7 +5860,7 @@ FUN_0203C7F4: ; 0x0203C7F4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldr r1, [r5, #0x0] strh r1, [r0, #0x0] mov r0, #0x0 @@ -5873,7 +5875,7 @@ FUN_0203C820: ; 0x0203C820 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 ldr r1, [r4, #0x0] ldr r1, [r1, #0x1c] @@ -5892,7 +5894,7 @@ FUN_0203C844: ; 0x0203C844 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -5921,7 +5923,7 @@ FUN_0203C874: ; 0x0203C874 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -5945,7 +5947,7 @@ FUN_0203C8B4: ; 0x0203C8B4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -5972,7 +5974,7 @@ FUN_0203C8E4: ; 0x0203C8E4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5980,7 +5982,7 @@ FUN_0203C8E4: ; 0x0203C8E4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] mov r2, #0x1 str r2, [sp, #0x4] @@ -6055,13 +6057,13 @@ FUN_0203C990: ; 0x0203C990 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex add r6, r0, #0x0 @@ -6124,7 +6126,7 @@ FUN_0203CA2C: ; 0x0203CA2C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -6247,7 +6249,7 @@ FUN_0203CB20: ; 0x0203CB20 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -6296,14 +6298,14 @@ FUN_0203CB70: ; 0x0203CB70 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x2 @@ -6324,12 +6326,12 @@ FUN_0203CBBC: ; 0x0203CBBC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F388 strh r0, [r4, #0x0] mov r0, #0x0 @@ -6362,7 +6364,7 @@ FUN_0203CBE8: ; 0x0203CBE8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -6370,7 +6372,7 @@ FUN_0203CBE8: ; 0x0203CBE8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 ldr r0, [sp, #0x0] ldr r2, [r6, #0x0] @@ -6389,7 +6391,7 @@ FUN_0203CBE8: ; 0x0203CBE8 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 ldr r1, [r6, #0x0] add r0, r4, #0x0 @@ -6417,7 +6419,7 @@ FUN_0203CC88: ; 0x0203CC88 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -6425,7 +6427,7 @@ FUN_0203CC88: ; 0x0203CC88 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -6433,7 +6435,7 @@ FUN_0203CC88: ; 0x0203CC88 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x4] add r0, r5, #0x0 bl ScriptReadHalfword @@ -6462,7 +6464,7 @@ FUN_0203CCF8: ; 0x0203CCF8 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 bl MOD06_022407DC cmp r0, #0x0 @@ -6488,7 +6490,7 @@ FUN_0203CD20: ; 0x0203CD20 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -6496,7 +6498,7 @@ FUN_0203CD20: ; 0x0203CD20 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -6504,7 +6506,7 @@ FUN_0203CD20: ; 0x0203CD20 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x4] add r0, r5, #0x0 bl ScriptReadHalfword @@ -6533,7 +6535,7 @@ FUN_0203CD90: ; 0x0203CD90 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 bl MOD06_02240844 cmp r0, #0x0 @@ -6604,7 +6606,7 @@ FUN_0203CE0C: ; 0x0203CE0C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r0, r4, #0x0 bl ScriptReadHalfword @@ -6612,7 +6614,7 @@ FUN_0203CE0C: ; 0x0203CE0C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword @@ -6620,7 +6622,7 @@ FUN_0203CE0C: ; 0x0203CE0C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r4, #0x0 bl ScriptReadHalfword @@ -6628,7 +6630,7 @@ FUN_0203CE0C: ; 0x0203CE0C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0xc] add r0, r4, #0x0 bl ScriptReadHalfword @@ -6636,7 +6638,7 @@ FUN_0203CE0C: ; 0x0203CE0C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, #0x80 str r0, [sp, #0x10] ldr r0, [r4, #0x0] @@ -6658,7 +6660,7 @@ FUN_0203CE8C: ; 0x0203CE8C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -6694,7 +6696,7 @@ FUN_0203CEBC: ; 0x0203CEBC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r3, r0, #0x0 ldr r0, [r7, #0x0] add r1, r6, #0x0 @@ -6720,7 +6722,7 @@ FUN_0203CF04: ; 0x0203CF04 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_020244A4 @@ -6743,7 +6745,7 @@ FUN_0203CF34: ; 0x0203CF34 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0202445C @@ -6766,7 +6768,7 @@ FUN_0203CF64: ; 0x0203CF64 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02024404 @@ -6789,7 +6791,7 @@ FUN_0203CF94: ; 0x0203CF94 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_020243C8 @@ -6816,7 +6818,7 @@ FUN_0203CFC8: ; 0x0203CFC8 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r1, [r5, #0x8] str r0, [sp, #0x0] add r0, r1, #0x1 @@ -6828,7 +6830,7 @@ FUN_0203CFC8: ; 0x0203CFC8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 cmp r6, #0x0 bne _0203D02E @@ -6838,7 +6840,7 @@ FUN_0203CFC8: ; 0x0203CFC8 add r6, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x2 mov r2, #0xa bl FUN_0205F2E4 @@ -6853,7 +6855,7 @@ _0203D02E: bl FUN_02024518 add r5, r0, #0x0 ldr r0, [sp, #0x0] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 lsl r1, r1, #0x10 add r0, r5, #0x0 @@ -6881,7 +6883,7 @@ FUN_0203D050: ; 0x0203D050 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -6889,7 +6891,7 @@ FUN_0203D050: ; 0x0203D050 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -6920,7 +6922,7 @@ FUN_0203D0A4: ; 0x0203D0A4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -6928,7 +6930,7 @@ FUN_0203D0A4: ; 0x0203D0A4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 mov r0, #0x1 str r0, [sp, #0x0] @@ -6952,7 +6954,7 @@ FUN_0203D0F8: ; 0x0203D0F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -6960,7 +6962,7 @@ FUN_0203D0F8: ; 0x0203D0F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 lsl r2, r2, #0x18 ldr r0, [r5, #0x74] @@ -7000,7 +7002,7 @@ FUN_0203D150: ; 0x0203D150 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl MOD05_021F4D80 @@ -7061,7 +7063,7 @@ FUN_0203D1C0: ; 0x0203D1C0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0202280C @@ -7104,7 +7106,7 @@ FUN_0203D214: ; 0x0203D214 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl MOD05_021E85FC @@ -7135,7 +7137,7 @@ FUN_0203D248: ; 0x0203D248 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0204BEC8 @@ -7155,7 +7157,7 @@ FUN_0203D278: ; 0x0203D278 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r4, #0xc] bl FUN_0204C1A8 @@ -7177,14 +7179,14 @@ FUN_0203D2A4: ; 0x0203D2A4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0204C1A8 @@ -7203,7 +7205,7 @@ FUN_0203D2E4: ; 0x0203D2E4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [r4, #0x64] lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -7254,7 +7256,7 @@ FUN_0203D33C: ; 0x0203D33C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_0205296C @@ -7272,7 +7274,7 @@ FUN_0203D36C: ; 0x0203D36C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7343,7 +7345,7 @@ FUN_0203D3DC: ; 0x0203D3DC add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r5, #0x80 str r0, [sp, #0x4] ldr r0, [r5, #0x0] @@ -7428,7 +7430,7 @@ FUN_0203D490: ; 0x0203D490 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7459,7 +7461,7 @@ FUN_0203D4E8: ; 0x0203D4E8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7496,7 +7498,7 @@ FUN_0203D528: ; 0x0203D528 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r6, #0x0] bl FUN_02058448 @@ -7523,14 +7525,14 @@ FUN_0203D560: ; 0x0203D560 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r6, #0x0] bl FUN_02058448 @@ -7570,7 +7572,7 @@ FUN_0203D5CC: ; 0x0203D5CC lsl r1, r1, #0x10 add r0, r5, #0x0 lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer cmp r4, #0x0 bne _0203D5F0 mov r0, #0x0 @@ -7624,14 +7626,14 @@ FUN_0203D630: ; 0x0203D630 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r4, #0x78] add r1, r6, #0x0 @@ -7663,7 +7665,7 @@ FUN_0203D688: ; 0x0203D688 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7708,7 +7710,7 @@ FUN_0203D6E0: ; 0x0203D6E0 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7754,7 +7756,7 @@ FUN_0203D738: ; 0x0203D738 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -7762,10 +7764,10 @@ FUN_0203D738: ; 0x0203D738 bl FUN_02039438 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 ldr r2, [r4, #0x0] add r0, r6, #0x0 @@ -7781,7 +7783,7 @@ FUN_0203D774: ; 0x0203D774 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -7789,27 +7791,27 @@ FUN_0203D774: ; 0x0203D774 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 add r0, r6, #0x0 add r2, r7, #0x0 bl FUN_02053678 strh r0, [r4, #0x0] add r0, r5, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender ldrh r1, [r4, #0x0] mov r2, #0x2 bl FUN_020536D0 @@ -7825,7 +7827,7 @@ FUN_0203D7DC: ; 0x0203D7DC add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -7833,20 +7835,20 @@ FUN_0203D7DC: ; 0x0203D7DC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 add r0, r6, #0x0 add r2, r7, #0x0 @@ -7863,14 +7865,14 @@ FUN_0203D834: ; 0x0203D834 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 lsl r1, r1, #0x18 add r0, r4, #0x0 @@ -7897,7 +7899,7 @@ FUN_0203D874: ; 0x0203D874 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -7916,17 +7918,17 @@ FUN_0203D8A0: ; 0x0203D8A0 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender strh r0, [r5, #0x0] mov r0, #0x0 pop {r3-r5, pc} @@ -7937,7 +7939,7 @@ FUN_0203D8D0: ; 0x0203D8D0 ldr r0, [r0, #0x74] bl FUN_02046528 ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_02085140 mov r0, #0x0 pop {r3, pc} @@ -8018,7 +8020,7 @@ FUN_0203D958: ; 0x0203D958 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8026,7 +8028,7 @@ FUN_0203D958: ; 0x0203D958 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -8047,7 +8049,7 @@ FUN_0203D998: ; 0x0203D998 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8055,7 +8057,7 @@ FUN_0203D998: ; 0x0203D998 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8063,7 +8065,7 @@ FUN_0203D998: ; 0x0203D998 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r3, r0, #0x0 ldr r0, [r5, #0x0] @@ -8084,7 +8086,7 @@ FUN_0203D9E8: ; 0x0203D9E8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8092,7 +8094,7 @@ FUN_0203D9E8: ; 0x0203D9E8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8100,7 +8102,7 @@ FUN_0203D9E8: ; 0x0203D9E8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x4] add r0, r5, #0x0 bl ScriptReadHalfword @@ -8108,7 +8110,7 @@ FUN_0203D9E8: ; 0x0203D9E8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r5, #0x0 bl ScriptReadHalfword @@ -8116,7 +8118,7 @@ FUN_0203D9E8: ; 0x0203D9E8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -8145,7 +8147,7 @@ FUN_0203DA78: ; 0x0203DA78 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8153,7 +8155,7 @@ FUN_0203DA78: ; 0x0203DA78 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r2, r0, #0x0 ldr r0, [r5, #0x0] @@ -8171,7 +8173,7 @@ FUN_0203DAB0: ; 0x0203DAB0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8179,7 +8181,7 @@ FUN_0203DAB0: ; 0x0203DAB0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r2, r0, #0x0 ldr r0, [r5, #0x0] @@ -8197,7 +8199,7 @@ FUN_0203DAE8: ; 0x0203DAE8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8205,7 +8207,7 @@ FUN_0203DAE8: ; 0x0203DAE8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8213,7 +8215,7 @@ FUN_0203DAE8: ; 0x0203DAE8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r3, r0, #0x0 ldr r0, [r5, #0x0] @@ -8233,7 +8235,7 @@ FUN_0203DB38: ; 0x0203DB38 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8241,7 +8243,7 @@ FUN_0203DB38: ; 0x0203DB38 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8249,7 +8251,7 @@ FUN_0203DB38: ; 0x0203DB38 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r3, r0, #0x0 ldr r0, [r5, #0x0] @@ -8269,7 +8271,7 @@ FUN_0203DB88: ; 0x0203DB88 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8277,7 +8279,7 @@ FUN_0203DB88: ; 0x0203DB88 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -8309,7 +8311,7 @@ FUN_0203DBD4: ; 0x0203DBD4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet ldr r1, [r5, #0x0] cmp r1, #0x0 beq _0203DBFC @@ -8333,7 +8335,7 @@ FUN_0203DC00: ; 0x0203DC00 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8341,7 +8343,7 @@ FUN_0203DC00: ; 0x0203DC00 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet lsl r1, r4, #0x5 ldr r3, [r5, #0x8] add r2, r0, #0x0 @@ -8537,7 +8539,7 @@ FUN_0203DD60: ; 0x0203DD60 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8574,7 +8576,7 @@ FUN_0203DDC0: ; 0x0203DDC0 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl MOD18_0224CA2C @@ -8606,7 +8608,7 @@ FUN_0203DE00: ; 0x0203DE00 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet bl MOD18_0224CA58 strb r0, [r4, #0x0] ldr r1, _0203DE34 ; =FUN_0203DE38 @@ -8648,7 +8650,7 @@ FUN_0203DE58: ; 0x0203DE58 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 bl MOD18_0224CAA0 @@ -8668,7 +8670,7 @@ FUN_0203DE80: ; 0x0203DE80 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 bl MOD18_0224CAB4 @@ -8703,7 +8705,7 @@ FUN_0203DEC4: ; 0x0203DEC4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 ldr r0, [r5, #0x34] bl FUN_02058060 @@ -8728,7 +8730,7 @@ FUN_0203DEF8: ; 0x0203DEF8 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 ldr r0, [r5, #0x34] bl FUN_02058060 @@ -8761,7 +8763,7 @@ FUN_0203DF38: ; 0x0203DF38 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0xc] bl FUN_02025838 @@ -8780,7 +8782,7 @@ FUN_0203DF64: ; 0x0203DF64 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 ldr r0, [r4, #0x74] bl FUN_02063650 @@ -8796,7 +8798,7 @@ FUN_0203DF84: ; 0x0203DF84 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -8814,14 +8816,14 @@ FUN_0203DFA8: ; 0x0203DFA8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 bl LCRandom add r1, r5, #0x0 @@ -8839,14 +8841,14 @@ FUN_0203DFE0: ; 0x0203DFE0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 bl LCRandom add r1, r5, #0x0 @@ -8867,14 +8869,14 @@ FUN_0203E018: ; 0x0203E018 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r4, #0x0 bl MOD05_021F3A18 @@ -8894,7 +8896,7 @@ FUN_0203E054: ; 0x0203E054 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 bl MOD05_021F3AB4 @@ -8913,7 +8915,7 @@ FUN_0203E078: ; 0x0203E078 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8921,14 +8923,14 @@ FUN_0203E078: ; 0x0203E078 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet lsl r1, r6, #0x18 lsl r2, r7, #0x18 add r3, r0, #0x0 @@ -8951,7 +8953,7 @@ FUN_0203E0CC: ; 0x0203E0CC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8959,14 +8961,14 @@ FUN_0203E0CC: ; 0x0203E0CC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet lsl r1, r6, #0x18 lsl r2, r7, #0x18 add r3, r0, #0x0 @@ -8983,7 +8985,7 @@ FUN_0203E120: ; 0x0203E120 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x82 lsl r1, r1, #0x8 bl FUN_0205F3F8 @@ -8996,7 +8998,7 @@ FUN_0203E138: ; 0x0203E138 add r0, #0x80 ldr r4, [r0, #0x0] ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x1 bl FUN_0205F2D4 ldr r0, [r4, #0xc] @@ -9021,7 +9023,7 @@ FUN_0203E168: ; 0x0203E168 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -9029,7 +9031,7 @@ FUN_0203E168: ; 0x0203E168 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r0, r4, #0x0 bl ScriptReadHalfword @@ -9037,21 +9039,21 @@ FUN_0203E168: ; 0x0203E168 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] @@ -9138,7 +9140,7 @@ FUN_0203E258: ; 0x0203E258 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -9146,7 +9148,7 @@ FUN_0203E258: ; 0x0203E258 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -9168,7 +9170,7 @@ FUN_0203E29C: ; 0x0203E29C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -9176,7 +9178,7 @@ FUN_0203E29C: ; 0x0203E29C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -9184,7 +9186,7 @@ FUN_0203E29C: ; 0x0203E29C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9208,7 +9210,7 @@ FUN_0203E2F8: ; 0x0203E2F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -9216,7 +9218,7 @@ FUN_0203E2F8: ; 0x0203E2F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -9224,7 +9226,7 @@ FUN_0203E2F8: ; 0x0203E2F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9254,7 +9256,7 @@ FUN_0203E35C: ; 0x0203E35C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9276,7 +9278,7 @@ FUN_0203E38C: ; 0x0203E38C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -9284,7 +9286,7 @@ FUN_0203E38C: ; 0x0203E38C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9311,7 +9313,7 @@ FUN_0203E3D0: ; 0x0203E3D0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x0] @@ -9339,7 +9341,7 @@ FUN_0203E408: ; 0x0203E408 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x0] @@ -9420,7 +9422,7 @@ FUN_0203E4B0: ; 0x0203E4B0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9439,7 +9441,7 @@ FUN_0203E4D8: ; 0x0203E4D8 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -9476,13 +9478,13 @@ FUN_0203E510: ; 0x0203E510 add r0, #0x80 ldr r0, [r0, #0x0] add r1, r4, #0x0 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] add r1, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -9570,7 +9572,7 @@ FUN_0203E5DC: ; 0x0203E5DC add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get str r0, [sp, #0x0] add r0, r5, #0x0 add r0, #0x80 @@ -9650,7 +9652,7 @@ FUN_0203E684: ; 0x0203E684 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -9680,7 +9682,7 @@ FUN_0203E6C4: ; 0x0203E6C4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -9709,7 +9711,7 @@ FUN_0203E6FC: ; 0x0203E6FC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9741,14 +9743,14 @@ FUN_0203E744: ; 0x0203E744 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F688 @@ -9771,7 +9773,7 @@ FUN_0203E774: ; 0x0203E774 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r7, #0x0 bl FUN_020244A4 @@ -9827,12 +9829,12 @@ FUN_0203E7F0: ; 0x0203E7F0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r1, r4, #0x0 bl FUN_0205F5A4 mov r0, #0x0 @@ -9848,12 +9850,12 @@ FUN_0203E81C: ; 0x0203E81C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F594 strh r0, [r4, #0x0] mov r0, #0x0 @@ -9917,7 +9919,7 @@ FUN_0203E894: ; 0x0203E894 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl MOD06_022488EC @@ -9940,7 +9942,7 @@ FUN_0203E8C4: ; 0x0203E8C4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl MOD06_022488F4 @@ -9964,7 +9966,7 @@ FUN_0203E8F4: ; 0x0203E8F4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r5, #0x74] ldr r1, [r4, #0x0] @@ -10022,7 +10024,7 @@ FUN_0203E968: ; 0x0203E968 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 mov r0, #0x0 strh r0, [r6, #0x0] @@ -10037,7 +10039,7 @@ FUN_0203E968: ; 0x0203E968 add r5, #0x80 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr bl FUN_02023A90 b _0203E9C8 _0203E9AE: @@ -10066,7 +10068,7 @@ FUN_0203E9CC: ; 0x0203E9CC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -10074,12 +10076,12 @@ FUN_0203E9CC: ; 0x0203E9CC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl GetPartyMonByIndex add r5, r0, #0x0 @@ -10134,7 +10136,7 @@ FUN_0203EA68: ; 0x0203EA68 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, sp, #0x0 bl FUN_020126B4 @@ -10154,7 +10156,7 @@ FUN_0203EA90: ; 0x0203EA90 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldr r0, [r4, #0x74] bl MOD06_022411F4 @@ -10170,7 +10172,7 @@ FUN_0203EAB0: ; 0x0203EAB0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10178,7 +10180,7 @@ FUN_0203EAB0: ; 0x0203EAB0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10186,12 +10188,12 @@ FUN_0203EAB0: ; 0x0203EAB0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r7, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r7, #0x0 bl GetPartyMonByIndex mov r1, #0x5 @@ -10218,7 +10220,7 @@ FUN_0203EB20: ; 0x0203EB20 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r4, #0x80 lsl r1, r1, #0x18 @@ -10238,7 +10240,7 @@ FUN_0203EB48: ; 0x0203EB48 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10246,7 +10248,7 @@ FUN_0203EB48: ; 0x0203EB48 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 add r5, #0x80 lsl r1, r4, #0x18 @@ -10298,7 +10300,7 @@ FUN_0203EBC8: ; 0x0203EBC8 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r1, #GAME_VERSION strh r1, [r0, #0x0] mov r0, #0x0 @@ -10314,7 +10316,7 @@ FUN_0203EBE4: ; 0x0203EBE4 ldr r6, [r0, #0x0] add r0, r6, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x4] add r0, r5, #0x0 bl ScriptReadHalfword @@ -10322,7 +10324,7 @@ FUN_0203EBE4: ; 0x0203EBE4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r6, #0xc] bl FUN_02022510 @@ -10333,7 +10335,7 @@ FUN_0203EBE4: ; 0x0203EBE4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10341,7 +10343,7 @@ FUN_0203EBE4: ; 0x0203EBE4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r5, #0x0 bl ScriptReadHalfword @@ -10349,14 +10351,14 @@ FUN_0203EBE4: ; 0x0203EBE4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0xc] add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] ldr r0, [sp, #0x4] ldr r2, [sp, #0x8] @@ -10408,7 +10410,7 @@ FUN_0203ECAC: ; 0x0203ECAC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02026CB4 @@ -10505,7 +10507,7 @@ FUN_0203ED70: ; 0x0203ED70 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -10562,7 +10564,7 @@ FUN_0203EDE0: ; 0x0203EDE0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r4, #0x80 lsl r1, r1, #0x18 @@ -10602,7 +10604,7 @@ FUN_0203EE28: ; 0x0203EE28 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -10664,7 +10666,7 @@ FUN_0203EE98: ; 0x0203EE98 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10672,12 +10674,12 @@ FUN_0203EE98: ; 0x0203EE98 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl PartyHasMon strh r0, [r4, #0x0] @@ -10694,14 +10696,14 @@ FUN_0203EED8: ; 0x0203EED8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, sp, #0x4 strh r0, [r1, #0x0] add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0x0] bl GetPartyCount add r4, #0x80 @@ -10754,12 +10756,12 @@ FUN_0203EF58: ; 0x0203EF58 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 str r0, [sp, #0x0] ldr r0, [r4, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0xc] bl GetPartyCount add r2, sp, #0x18 @@ -10842,7 +10844,7 @@ FUN_0203F00C: ; 0x0203F00C add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F1C4 mov r0, #0x0 pop {r3, pc} @@ -10853,7 +10855,7 @@ FUN_0203F020: ; 0x0203F020 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F1D4 mov r0, #0x0 pop {r3, pc} @@ -10867,7 +10869,7 @@ FUN_0203F034: ; 0x0203F034 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] @@ -10885,7 +10887,7 @@ FUN_0203F058: ; 0x0203F058 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -10904,7 +10906,7 @@ FUN_0203F07C: ; 0x0203F07C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10912,7 +10914,7 @@ FUN_0203F07C: ; 0x0203F07C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0xc] add r0, r5, #0x0 bl ScriptReadHalfword @@ -10920,7 +10922,7 @@ FUN_0203F07C: ; 0x0203F07C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r5, #0x0 bl ScriptReadHalfword @@ -10928,7 +10930,7 @@ FUN_0203F07C: ; 0x0203F07C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10936,7 +10938,7 @@ FUN_0203F07C: ; 0x0203F07C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -10968,7 +10970,7 @@ FUN_0203F110: ; 0x0203F110 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -10976,7 +10978,7 @@ FUN_0203F110: ; 0x0203F110 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -10984,7 +10986,7 @@ FUN_0203F110: ; 0x0203F110 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 @@ -11013,7 +11015,7 @@ FUN_0203F174: ; 0x0203F174 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -11034,7 +11036,7 @@ FUN_0203F19C: ; 0x0203F19C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 str r0, [sp, #0x0] ldr r0, [r4, #0x0] @@ -11109,7 +11111,7 @@ FUN_0203F234: ; 0x0203F234 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldr r1, _0203F250 ; =gUnk021C4918 ldrb r1, [r1, #0x6] strh r1, [r0, #0x0] @@ -11124,7 +11126,7 @@ FUN_0203F254: ; 0x0203F254 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x0 bl FUN_0205F698 mov r0, #0x0 @@ -11140,7 +11142,7 @@ FUN_0203F26C: ; 0x0203F26C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet ldr r1, [r5, #0x8] add r6, r0, #0x0 add r0, r1, #0x1 @@ -11149,7 +11151,7 @@ FUN_0203F26C: ; 0x0203F26C ldr r0, [r5, #0x0] ldrb r4, [r1, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get cmp r4, #0x0 beq _0203F2A0 add r1, r6, #0x0 @@ -11181,7 +11183,7 @@ FUN_0203F2AC: ; 0x0203F2AC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -11197,14 +11199,14 @@ FUN_0203F2E4: ; 0x0203F2E4 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0205F6C8 @@ -11228,12 +11230,12 @@ FUN_0203F31C: ; 0x0203F31C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F648 strh r0, [r4, #0x0] mov r0, #0x0 @@ -11249,7 +11251,7 @@ FUN_0203F348: ; 0x0203F348 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -11257,7 +11259,7 @@ FUN_0203F348: ; 0x0203F348 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -11299,7 +11301,7 @@ FUN_0203F3AC: ; 0x0203F3AC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -11307,7 +11309,7 @@ FUN_0203F3AC: ; 0x0203F3AC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -11347,7 +11349,7 @@ FUN_0203F418: ; 0x0203F418 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -11372,14 +11374,14 @@ FUN_0203F44C: ; 0x0203F44C add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0205F710 @@ -11403,7 +11405,7 @@ FUN_0203F484: ; 0x0203F484 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 ldr r5, [r5, #0x0] add r4, r0, #0x0 @@ -11448,7 +11450,7 @@ FUN_0203F4D8: ; 0x0203F4D8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0202471C @@ -11466,7 +11468,7 @@ FUN_0203F508: ; 0x0203F508 add r0, r6, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r6, #0x0 bl ScriptReadHalfword @@ -11474,7 +11476,7 @@ FUN_0203F508: ; 0x0203F508 add r0, r6, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r6, #0x0 add r1, #0x80 ldr r1, [r1, #0x0] @@ -11568,14 +11570,14 @@ FUN_0203F5D4: ; 0x0203F5D4 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F720 @@ -11591,14 +11593,14 @@ FUN_0203F604: ; 0x0203F604 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F740 @@ -11614,14 +11616,14 @@ FUN_0203F634: ; 0x0203F634 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F760 @@ -11640,7 +11642,7 @@ FUN_0203F664: ; 0x0203F664 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 mov r2, #0x0 @@ -11702,7 +11704,7 @@ FUN_0203F6E4: ; 0x0203F6E4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -11736,12 +11738,12 @@ FUN_0203F720: ; 0x0203F720 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r5, r0, #0x0 cmp r4, #0x3 bls _0203F752 @@ -11763,7 +11765,7 @@ FUN_0203F760: ; 0x0203F760 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -11814,7 +11816,7 @@ FUN_0203F7C8: ; 0x0203F7C8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -11846,7 +11848,7 @@ FUN_0203F80C: ; 0x0203F80C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -11854,7 +11856,7 @@ FUN_0203F80C: ; 0x0203F80C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -11905,7 +11907,7 @@ FUN_0203F880: ; 0x0203F880 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 cmp r4, #0x64 bls _0203F8A2 @@ -11936,7 +11938,7 @@ FUN_0203F8C0: ; 0x0203F8C0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -11944,7 +11946,7 @@ FUN_0203F8C0: ; 0x0203F8C0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] @@ -11984,14 +11986,14 @@ FUN_0203F924: ; 0x0203F924 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F6A8 @@ -12009,7 +12011,7 @@ FUN_0203F954: ; 0x0203F954 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet cmp r0, #0x0 bne _0203F978 add r4, #0x80 @@ -12036,7 +12038,7 @@ FUN_0203F988: ; 0x0203F988 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -12056,7 +12058,7 @@ FUN_0203F9B0: ; 0x0203F9B0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -12077,7 +12079,7 @@ FUN_0203F9DC: ; 0x0203F9DC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -12105,14 +12107,14 @@ FUN_0203FA14: ; 0x0203FA14 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r1, #0x0 strh r1, [r0, #0x0] ldr r1, _0203FA54 ; =0x0000012A @@ -12139,7 +12141,7 @@ FUN_0203FA58: ; 0x0203FA58 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -12147,7 +12149,7 @@ FUN_0203FA58: ; 0x0203FA58 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword @@ -12155,7 +12157,7 @@ FUN_0203FA58: ; 0x0203FA58 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r4, #0x0 bl ScriptReadHalfword @@ -12163,14 +12165,14 @@ FUN_0203FA58: ; 0x0203FA58 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0xc] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 mov r0, #0x20 bl FUN_0200AA80 @@ -12256,7 +12258,7 @@ FUN_0203FB64: ; 0x0203FB64 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0xf @@ -12303,7 +12305,7 @@ FUN_0203FBBC: ; 0x0203FBBC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -12311,7 +12313,7 @@ FUN_0203FBBC: ; 0x0203FBBC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -12319,7 +12321,7 @@ FUN_0203FBBC: ; 0x0203FBBC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r7, r0, #0x0 ldr r0, [r5, #0x0] @@ -12346,7 +12348,7 @@ FUN_0203FC1C: ; 0x0203FC1C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet ldr r2, [r5, #0x8] add r1, r0, #0x0 add r0, r2, #0x1 @@ -12377,7 +12379,7 @@ FUN_0203FC58: ; 0x0203FC58 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02065078 diff --git a/arm9/asm/scrcmd_10.s b/arm9/asm/scrcmd_10.s index b61cd5b8..0831797b 100644 --- a/arm9/asm/scrcmd_10.s +++ b/arm9/asm/scrcmd_10.s @@ -89,7 +89,7 @@ FUN_020423B0: ; 0x020423B0 add r0, r7, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r7, #0x0 bl ScriptReadHalfword @@ -98,7 +98,7 @@ FUN_020423B0: ; 0x020423B0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r1, [sp, #0x4] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r7, #0x0 add r0, #0x80 @@ -516,7 +516,7 @@ FUN_02042700: ; 0x02042700 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -524,7 +524,7 @@ FUN_02042700: ; 0x02042700 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -532,14 +532,14 @@ FUN_02042700: ; 0x02042700 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer lsl r2, r6, #0x4 add r2, r6, r2 mov r1, #0x38 @@ -570,7 +570,7 @@ FUN_02042780: ; 0x02042780 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -590,7 +590,7 @@ FUN_020427A8: ; 0x020427A8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -610,7 +610,7 @@ FUN_020427D0: ; 0x020427D0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -618,7 +618,7 @@ FUN_020427D0: ; 0x020427D0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -680,7 +680,7 @@ FUN_02042864: ; 0x02042864 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -704,7 +704,7 @@ FUN_02042894: ; 0x02042894 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -712,7 +712,7 @@ FUN_02042894: ; 0x02042894 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -738,7 +738,7 @@ FUN_020428E0: ; 0x020428E0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -859,7 +859,7 @@ FUN_020429B8: ; 0x020429B8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0202A8D8 @@ -882,7 +882,7 @@ FUN_020429E8: ; 0x020429E8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0202A8D8 @@ -905,7 +905,7 @@ FUN_02042A18: ; 0x02042A18 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0202A8D8 @@ -929,14 +929,14 @@ FUN_02042A48: ; 0x02042A48 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0202A8D8 @@ -964,7 +964,7 @@ FUN_02042A98: ; 0x02042A98 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -972,7 +972,7 @@ FUN_02042A98: ; 0x02042A98 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -980,14 +980,14 @@ FUN_02042A98: ; 0x02042A98 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer cmp r7, #0x1 bne _02042AEE mov r1, #0x1a diff --git a/arm9/asm/scrcmd_11.s b/arm9/asm/scrcmd_11.s index ac6f7c2b..5612284f 100644 --- a/arm9/asm/scrcmd_11.s +++ b/arm9/asm/scrcmd_11.s @@ -12,7 +12,7 @@ FUN_02042B0C: ; 0x02042B0C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -43,7 +43,7 @@ FUN_02042B40: ; 0x02042B40 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -68,7 +68,7 @@ FUN_02042B74: ; 0x02042B74 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -93,7 +93,7 @@ FUN_02042BA8: ; 0x02042BA8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -118,7 +118,7 @@ FUN_02042BDC: ; 0x02042BDC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -143,7 +143,7 @@ FUN_02042C10: ; 0x02042C10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r2, r0, #0x0 ldr r0, [r5, #0x0] @@ -174,7 +174,7 @@ FUN_02042C44: ; 0x02042C44 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r2, r0, #0x0 ldr r0, [r5, #0x0] diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 95f2fa63..2566edfd 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -5,17 +5,17 @@ .global UNK_020F43E4 UNK_020F43E4: ; 0x020F43E4 - .byte 0x11, 0x2F, 0x04, 0x02, 0x6D, 0x2F, 0x04, 0x02, 0x75, 0x32, 0x04, 0x02, 0xB5, 0x32, 0x04, 0x02 - .byte 0x11, 0x2F, 0x04, 0x02, 0xC1, 0x32, 0x04, 0x02, 0xC9, 0x32, 0x04, 0x02, 0xB5, 0x32, 0x04, 0x02 - .byte 0x09, 0x33, 0x04, 0x02, 0x31, 0x33, 0x04, 0x02, 0x59, 0x33, 0x04, 0x02, 0x95, 0x33, 0x04, 0x02 - .byte 0xC5, 0x33, 0x04, 0x02, 0xC9, 0x33, 0x04, 0x02, 0xDD, 0x33, 0x04, 0x02, 0x31, 0x34, 0x04, 0x02 - .byte 0x3D, 0x34, 0x04, 0x02, 0x55, 0x34, 0x04, 0x02, 0x6D, 0x34, 0x04, 0x02, 0xA5, 0x34, 0x04, 0x02 - .byte 0xB1, 0x34, 0x04, 0x02, 0xE9, 0x34, 0x04, 0x02, 0x39, 0x35, 0x04, 0x02, 0x95, 0x35, 0x04, 0x02 - .byte 0x11, 0x2F, 0x04, 0x02, 0x29, 0x2F, 0x04, 0x02, 0x49, 0x2F, 0x04, 0x02, 0xB5, 0x32, 0x04, 0x02 - .byte 0xA1, 0x35, 0x04, 0x02, 0xC5, 0x35, 0x04, 0x02, 0xF9, 0x35, 0x04, 0x02, 0x35, 0x36, 0x04, 0x02 - .byte 0x61, 0x36, 0x04, 0x02, 0x85, 0x36, 0x04, 0x02, 0xB9, 0x36, 0x04, 0x02, 0xF1, 0x36, 0x04, 0x02 - .byte 0x1D, 0x37, 0x04, 0x02, 0x41, 0x37, 0x04, 0x02, 0x75, 0x37, 0x04, 0x02, 0xB1, 0x37, 0x04, 0x02 - .byte 0xDD, 0x37, 0x04, 0x02, 0xF9, 0x37, 0x04, 0x02, 0x19, 0x38, 0x04, 0x02, 0x51, 0x38, 0x04, 0x02 + .word FUN_02042F10, FUN_02042F6C, FUN_02043274, FUN_020432B4 + .word FUN_02042F10, FUN_020432C0, FUN_020432C8, FUN_020432B4 + .word FUN_02043308, FUN_02043330, FUN_02043358, FUN_02043394 + .word FUN_020433C4, FUN_020433C8, FUN_020433DC, FUN_02043430 + .word FUN_0204343C, FUN_02043454, FUN_0204346C, FUN_020434A4 + .word FUN_020434B0, FUN_020434E8, FUN_02043538, FUN_02043594 + .word FUN_02042F10, FUN_02042F28, FUN_02042F48, FUN_020432B4 + .word FUN_020435A0, FUN_020435C4, FUN_020435F8, FUN_02043634 + .word FUN_02043660, FUN_02043684, FUN_020436B8, FUN_020436F0 + .word FUN_0204371C, FUN_02043740, FUN_02043774, FUN_020437B0 + .word FUN_020437DC, FUN_020437F8, FUN_02043818, FUN_02043850 .text @@ -101,7 +101,7 @@ _02042D74: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -122,7 +122,7 @@ _02042DA0: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -136,7 +136,7 @@ _02042DC0: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 @@ -200,7 +200,7 @@ _02042E2E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -208,7 +208,7 @@ _02042E2E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 add r0, #0x80 @@ -247,7 +247,7 @@ _02042E9A: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -255,7 +255,7 @@ _02042E9A: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 add r0, #0x80 @@ -283,7 +283,7 @@ _02042F0C: .word UNK_020F43E4 FUN_02042F10: ; 0x02042F10 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount cmp r0, #0x6 bge _02042F24 @@ -322,7 +322,7 @@ FUN_02042F48: ; 0x02042F48 strh r0, [r2, #0x0] ldr r0, [r4, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r4, #0x4] mov r1, #0x0 @@ -339,7 +339,7 @@ FUN_02042F6C: ; 0x02042F6C str r0, [sp, #0x10] ldr r0, [sp, #0x4] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0xc] ldr r0, [sp, #0x10] mov r7, #0x0 @@ -612,13 +612,13 @@ _020431D4: bne _0204322C ldr r0, [sp, #0xc] mov r1, #0x20 - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r5, r0, #0x0 ldr r0, [sp, #0xc] - bl FUN_020239BC + bl PlayerProfile_GetTrainerID str r0, [sp, #0x2c] ldr r0, [sp, #0xc] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender str r0, [sp, #0x28] mov r0, #0x20 bl AllocMonZeroed @@ -656,9 +656,9 @@ _0204322C: bl CalcMonLevelAndStats ldr r0, [sp, #0x4] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 - bl FUN_0206B900 + bl AddMonToParty cmp r0, #0x0 beq _02043266 ldr r0, [sp, #0x4] @@ -690,7 +690,7 @@ FUN_02043274: ; 0x02043274 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -736,7 +736,7 @@ FUN_020432C8: ; 0x020432C8 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -808,7 +808,7 @@ FUN_02043358: ; 0x02043358 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -876,7 +876,7 @@ FUN_020433DC: ; 0x020433DC strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -949,7 +949,7 @@ FUN_0204346C: ; 0x0204346C strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1077,7 +1077,7 @@ _02043574: strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1122,7 +1122,7 @@ FUN_020435C4: ; 0x020435C4 add r0, r4, #0x0 bl FUN_02042D04 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 ldr r1, _020435F4 ; =0x000001C6 add r0, r5, #0x0 @@ -1151,7 +1151,7 @@ FUN_020435F8: ; 0x020435F8 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1214,7 +1214,7 @@ FUN_02043684: ; 0x02043684 add r0, r4, #0x0 bl FUN_02042D04 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x71 add r4, r0, #0x0 add r0, r5, #0x0 @@ -1243,7 +1243,7 @@ FUN_020436B8: ; 0x020436B8 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1305,7 +1305,7 @@ FUN_02043740: ; 0x02043740 add r0, r4, #0x0 bl FUN_02042D04 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 ldr r1, _02043770 ; =0x000001C7 add r0, r5, #0x0 @@ -1334,7 +1334,7 @@ FUN_02043774: ; 0x02043774 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1415,7 +1415,7 @@ FUN_02043818: ; 0x02043818 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 @@ -1441,7 +1441,7 @@ FUN_02043850: ; 0x02043850 strh r0, [r6, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r5, #0x4] mov r1, #0x0 diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s index 46e1fbda..c9a5bc2d 100644 --- a/arm9/asm/scrcmd_13.s +++ b/arm9/asm/scrcmd_13.s @@ -10,7 +10,7 @@ FUN_0204387C: ; 0x0204387C add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -18,7 +18,7 @@ FUN_0204387C: ; 0x0204387C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet cmp r0, #0x0 bne _020438B2 add r0, r4, #0x0 @@ -60,7 +60,7 @@ FUN_020438D0: ; 0x020438D0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r6, #0x0 bl FUN_0202C000 @@ -101,7 +101,7 @@ FUN_02043918: ; 0x02043918 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x4] add r0, r6, #0x0 add r0, #0x80 @@ -157,7 +157,7 @@ FUN_020439B4: ; 0x020439B4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -165,7 +165,7 @@ FUN_020439B4: ; 0x020439B4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 cmp r6, #0x3 bhi _02043A40 diff --git a/arm9/asm/scrcmd_14.s b/arm9/asm/scrcmd_14.s index 10c89335..e37228c6 100644 --- a/arm9/asm/scrcmd_14.s +++ b/arm9/asm/scrcmd_14.s @@ -15,7 +15,7 @@ FUN_02043A44: ; 0x02043A44 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -23,7 +23,7 @@ FUN_02043A44: ; 0x02043A44 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 mov r1, #0x26 @@ -77,17 +77,17 @@ FUN_02043ACC: ; 0x02043ACC add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 - bl FUN_02028930 + bl CheckCoins strh r0, [r5, #0x0] mov r0, #0x0 pop {r3-r5, pc} @@ -100,17 +100,17 @@ FUN_02043AFC: ; 0x02043AFC add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02028934 + bl GiveCoins mov r0, #0x0 pop {r3-r5, pc} @@ -121,17 +121,17 @@ FUN_02043B28: ; 0x02043B28 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_0202896C + bl TakeCoins mov r0, #0x0 pop {r3-r5, pc} @@ -142,18 +142,18 @@ FUN_02043B54: ; 0x02043B54 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldrh r1, [r1, #0x0] add r0, r4, #0x0 - bl FUN_0202896C + bl TakeCoins mov r0, #0x0 pop {r3-r5, pc} .balign 4 @@ -166,9 +166,9 @@ FUN_02043B84: ; 0x02043B84 ldr r5, [r0, #0x0] add r0, r5, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r0, [r5, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -176,13 +176,13 @@ FUN_02043B84: ; 0x02043B84 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r4, r0, #0x0 add r0, r6, #0x0 - bl FUN_02028930 + bl CheckCoins cmp r0, r4 bhs _02043BC8 mov r0, #0x0 @@ -202,9 +202,9 @@ FUN_02043BD0: ; 0x02043BD0 ldr r4, [r0, #0x0] add r0, r4, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r0, [r4, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -212,17 +212,17 @@ FUN_02043BD0: ; 0x02043BD0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldrh r5, [r0, #0x0] add r0, r6, #0x0 - bl FUN_02028930 + bl CheckCoins cmp r0, r5 bhs _02043C1E mov r0, #0x0 @@ -242,7 +242,7 @@ FUN_02043C28: ; 0x02043C28 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -250,17 +250,17 @@ FUN_02043C28: ; 0x02043C28 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r6, #0x0 - bl FUN_02028954 + bl CanGiveCoins strh r0, [r4, #0x0] mov r0, #0x0 pop {r4-r6, pc} diff --git a/arm9/asm/scrcmd_15.s b/arm9/asm/scrcmd_15.s index d933672e..d33d857b 100644 --- a/arm9/asm/scrcmd_15.s +++ b/arm9/asm/scrcmd_15.s @@ -10,13 +10,13 @@ FUN_02043C6C: ; 0x02043C6C add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02023A30 + bl PlayerProfile_AddMoney mov r0, #0x0 pop {r3-r5, pc} @@ -27,13 +27,13 @@ FUN_02043C90: ; 0x02043C90 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02023A54 + bl PlayerProfile_SubMoney mov r0, #0x0 pop {r3-r5, pc} @@ -44,17 +44,17 @@ FUN_02043CB4: ; 0x02043CB4 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02023A54 + bl PlayerProfile_SubMoney mov r0, #0x0 pop {r3-r5, pc} .balign 4 @@ -66,7 +66,7 @@ FUN_02043CE4: ; 0x02043CE4 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -74,13 +74,13 @@ FUN_02043CE4: ; 0x02043CE4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord add r4, r0, #0x0 add r0, r6, #0x0 - bl FUN_02023A10 + bl PlayerProfile_GetMoney cmp r0, r4 bhs _02043D20 mov r0, #0x0 @@ -99,7 +99,7 @@ FUN_02043D28: ; 0x02043D28 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -107,17 +107,17 @@ FUN_02043D28: ; 0x02043D28 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r6, #0x0 - bl FUN_02023A10 + bl PlayerProfile_GetMoney cmp r0, r4 bhs _02043D6E mov r0, #0x0 @@ -142,7 +142,7 @@ FUN_02043D78: ; 0x02043D78 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -150,7 +150,7 @@ FUN_02043D78: ; 0x02043D78 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 mov r1, #0x27 diff --git a/arm9/asm/scrcmd_16.s b/arm9/asm/scrcmd_16.s index 8e9b20ba..9b188d47 100644 --- a/arm9/asm/scrcmd_16.s +++ b/arm9/asm/scrcmd_16.s @@ -31,11 +31,11 @@ FUN_02043E20: ; 0x02043E20 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x8 - bl FUN_02022610 + bl SavArray_get bl MOD05_021ED5EC strh r0, [r5, #0x0] mov r0, #0x0 @@ -49,7 +49,7 @@ FUN_02043E50: ; 0x02043E50 ldr r0, [r0, #0x0] mov r1, #0x8 ldr r0, [r0, #0xc] - bl FUN_02022610 + bl SavArray_get bl MOD05_021ECD64 mov r0, #0x0 pop {r3, pc} @@ -63,15 +63,15 @@ FUN_02043E68: ; 0x02043E68 ldr r5, [r0, #0x0] mov r1, #0x8 ldr r0, [r5, #0xc] - bl FUN_02022610 + bl SavArray_get add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 add r0, r6, #0x0 add r1, r5, #0x0 @@ -96,21 +96,21 @@ FUN_02043E9C: ; 0x02043E9C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r6, #0x0 mov r1, #0x8 - bl FUN_02022610 + bl SavArray_get add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get lsl r3, r4, #0x18 ldr r1, [r7, #0x0] add r2, r6, #0x0 @@ -139,18 +139,18 @@ FUN_02043EFC: ; 0x02043EFC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x8 - bl FUN_02022610 + bl SavArray_get lsl r1, r4, #0x18 ldr r2, [r7, #0x0] lsr r1, r1, #0x18 @@ -176,18 +176,18 @@ FUN_02043F50: ; 0x02043F50 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x8 - bl FUN_02022610 + bl SavArray_get ldr r2, [r6, #0x0] add r1, r5, #0x0 bl MOD05_021EC864 @@ -214,17 +214,17 @@ FUN_02043FA0: ; 0x02043FA0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldr r2, [r6, #0x0] add r1, r7, #0x0 bl MOD05_021ED5C4 @@ -245,14 +245,14 @@ FUN_02043FF4: ; 0x02043FF4 add r6, #0x80 add r1, r0, #0x0 ldr r0, [r6, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x8 - bl FUN_02022610 + bl SavArray_get lsl r1, r6, #0x18 add r2, r0, #0x0 add r0, r4, #0x0 @@ -280,7 +280,7 @@ FUN_02044034: ; 0x02044034 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -288,7 +288,7 @@ FUN_02044034: ; 0x02044034 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r4, #0x0 bl ScriptReadHalfword @@ -296,14 +296,14 @@ FUN_02044034: ; 0x02044034 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0xc] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02023D58 @@ -337,11 +337,11 @@ FUN_020440C0: ; 0x020440C0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x8 - bl FUN_02022610 + bl SavArray_get bl MOD05_021ED644 strh r0, [r5, #0x0] mov r0, #0x0 @@ -360,11 +360,11 @@ FUN_020440F0: ; 0x020440F0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x8 - bl FUN_02022610 + bl SavArray_get bl FUN_02023C90 strh r0, [r5, #0x0] mov r0, #0x0 @@ -379,7 +379,7 @@ FUN_02044120: ; 0x02044120 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -402,7 +402,7 @@ FUN_02044140: ; 0x02044140 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 diff --git a/arm9/asm/scrcmd_17.s b/arm9/asm/scrcmd_17.s index 0e333870..f0e027ed 100644 --- a/arm9/asm/scrcmd_17.s +++ b/arm9/asm/scrcmd_17.s @@ -22,7 +22,7 @@ FUN_02044158: ; 0x02044158 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F54C mov r0, #0x0 pop {r3, pc} @@ -36,12 +36,12 @@ FUN_0204416C: ; 0x0204416C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F55C strh r0, [r4, #0x0] mov r0, #0x0 @@ -57,14 +57,14 @@ FUN_02044198: ; 0x02044198 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 bl LCRandom mov r1, #0x64 diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index 468cd321..c4fa299c 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -23,7 +23,7 @@ FUN_020442BC: ; 0x020442BC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0xc] add r0, r4, #0x0 bl ScriptReadHalfword @@ -31,7 +31,7 @@ FUN_020442BC: ; 0x020442BC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -39,17 +39,17 @@ FUN_020442BC: ; 0x020442BC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x10] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldr r0, [sp, #0x10] lsl r3, r7, #0x18 str r0, [sp, #0x0] @@ -79,17 +79,17 @@ FUN_0204434C: ; 0x0204434C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldrh r1, [r6, #0x0] bl GetPartyMonByIndex mov r1, #0x4c @@ -118,7 +118,7 @@ FUN_020443A8: ; 0x020443A8 ldr r5, [r0, #0x0] add r0, r5, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -126,17 +126,17 @@ FUN_020443A8: ; 0x020443A8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldrh r1, [r6, #0x0] bl GetPartyMonByIndex mov r1, #0x7 @@ -145,7 +145,7 @@ FUN_020443A8: ; 0x020443A8 lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r7, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID lsl r0, r0, #0x10 lsr r0, r0, #0x10 cmp r5, r0 @@ -167,7 +167,7 @@ FUN_02044414: ; 0x02044414 add r0, #0x80 ldr r4, [r0, #0x0] ldr r0, [r4, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -175,17 +175,17 @@ FUN_02044414: ; 0x02044414 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r6, r0, #0x0 bl GetPartyCount lsl r0, r0, #0x18 @@ -209,7 +209,7 @@ FUN_02044414: ; 0x02044414 bl MOD05_021ECF14 add r0, r6, #0x0 add r1, r4, #0x0 - bl FUN_0206B900 + bl AddMonToParty add r0, r4, #0x0 bl FreeToHeap _02044494: @@ -227,7 +227,7 @@ FUN_0204449C: ; 0x0204449C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -235,7 +235,7 @@ FUN_0204449C: ; 0x0204449C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -243,12 +243,12 @@ FUN_0204449C: ; 0x0204449C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r7, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 add r2, r6, #0x0 add r3, r7, #0x0 @@ -269,7 +269,7 @@ FUN_020444F4: ; 0x020444F4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -277,17 +277,17 @@ FUN_020444F4: ; 0x020444F4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl GetPartyMonByIndex mov r2, #0x0 @@ -346,18 +346,18 @@ FUN_02044598: ; 0x02044598 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [sp, #0x4] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x18 lsr r7, r0, #0x18 @@ -369,7 +369,7 @@ FUN_02044598: ; 0x02044598 _020445E4: ldr r0, [sp, #0x4] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -429,7 +429,7 @@ FUN_02044658: ; 0x02044658 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -437,12 +437,12 @@ FUN_02044658: ; 0x02044658 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex bl FUN_0204A32C @@ -463,17 +463,17 @@ FUN_0204469C: ; 0x0204469C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -487,7 +487,7 @@ FUN_0204469C: ; 0x0204469C bls _02044726 _020446EA: ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -532,17 +532,17 @@ FUN_02044730: ; 0x02044730 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r2, #0x0 @@ -574,17 +574,17 @@ FUN_0204478C: ; 0x0204478C add r0, r6, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r6, #0x0 bl ScriptReadHalfword add r6, #0x80 add r1, r0, #0x0 ldr r0, [r6, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -595,7 +595,7 @@ FUN_0204478C: ; 0x0204478C pop {r4-r6, pc} _020447D2: ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -628,17 +628,17 @@ FUN_02044800: ; 0x02044800 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x18 lsr r6, r0, #0x18 @@ -649,7 +649,7 @@ FUN_02044800: ; 0x02044800 beq _0204487E _02044848: ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -692,17 +692,17 @@ FUN_0204488C: ; 0x0204488C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x9 @@ -725,7 +725,7 @@ FUN_020448D4: ; 0x020448D4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -733,7 +733,7 @@ FUN_020448D4: ; 0x020448D4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 str r0, [sp, #0x0] ldr r0, [r5, #0x0] @@ -742,7 +742,7 @@ FUN_020448D4: ; 0x020448D4 bl FUN_02034824 add r7, r0, #0x0 ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldr r1, [sp, #0x0] bl GetPartyMonByIndex mov r1, #0x9 @@ -822,17 +822,17 @@ FUN_020449A4: ; 0x020449A4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x9 @@ -867,7 +867,7 @@ FUN_02044A0C: ; 0x02044A0C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -875,7 +875,7 @@ FUN_02044A0C: ; 0x02044A0C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -883,12 +883,12 @@ FUN_02044A0C: ; 0x02044A0C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r7, #0x0 bl GetPartyMonByIndex add r4, #0x13 @@ -909,7 +909,7 @@ FUN_02044A6C: ; 0x02044A6C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -932,7 +932,7 @@ FUN_02044A94: ; 0x02044A94 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -940,17 +940,17 @@ FUN_02044A94: ; 0x02044A94 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex add r4, r0, #0x0 @@ -978,10 +978,10 @@ FUN_02044B00: ; 0x02044B00 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount strh r0, [r5, #0x0] mov r0, #0x0 @@ -999,10 +999,10 @@ FUN_02044B2C: ; 0x02044B2C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount mov r5, #0x0 add r7, r0, #0x0 @@ -1011,7 +1011,7 @@ FUN_02044B2C: ; 0x02044B2C ble _02044B7A _02044B5A: ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -1044,17 +1044,17 @@ FUN_02044B84: ; 0x02044B84 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount mov r5, #0x0 add r4, r5, #0x0 @@ -1066,7 +1066,7 @@ _02044BC8: cmp r5, r0 beq _02044BF8 ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -1107,13 +1107,13 @@ FUN_02044C0C: ; 0x02044C0C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl FUN_02022510 str r0, [sp, #0x4] ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount mov r5, #0x0 add r4, r5, #0x0 @@ -1122,7 +1122,7 @@ FUN_02044C0C: ; 0x02044C0C ble _02044C76 _02044C44: ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -1164,10 +1164,10 @@ FUN_02044C88: ; 0x02044C88 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount mov r5, #0x0 add r7, r0, #0x0 @@ -1176,7 +1176,7 @@ FUN_02044C88: ; 0x02044C88 ble _02044CD6 _02044CB6: ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -1207,10 +1207,10 @@ FUN_02044CE0: ; 0x02044CE0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x10 lsr r6, r0, #0x10 @@ -1221,7 +1221,7 @@ FUN_02044CE0: ; 0x02044CE0 mov r7, #0x99 _02044D12: ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl GetPartyMonByIndex add r1, r7, #0x0 @@ -1254,7 +1254,7 @@ FUN_02044D44: ; 0x02044D44 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -1262,12 +1262,12 @@ FUN_02044D44: ; 0x02044D44 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex mov r1, #0x6f @@ -1289,17 +1289,17 @@ FUN_02044D8C: ; 0x02044D8C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -1370,17 +1370,17 @@ FUN_02044E34: ; 0x02044E34 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex add r1, r4, #0x0 @@ -1400,7 +1400,7 @@ FUN_02044E78: ; 0x02044E78 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -1408,17 +1408,17 @@ FUN_02044E78: ; 0x02044E78 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r7, #0x0 bl GetPartyMonByIndex add r4, #0x36 @@ -1442,17 +1442,17 @@ FUN_02044ED8: ; 0x02044ED8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x6 @@ -1473,10 +1473,10 @@ FUN_02044F20: ; 0x02044F20 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r2, #0x0 @@ -1501,17 +1501,17 @@ FUN_02044F58: ; 0x02044F58 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x18 lsr r6, r0, #0x18 @@ -1521,7 +1521,7 @@ FUN_02044F58: ; 0x02044F58 beq _02044FDE _02044F9E: ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -1565,7 +1565,7 @@ FUN_02044FE8: ; 0x02044FE8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -1573,12 +1573,12 @@ FUN_02044FE8: ; 0x02044FE8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl GetPartyMonByIndex mov r4, #0x0 @@ -1621,20 +1621,20 @@ FUN_0204505C: ; 0x0204505C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x10 add r4, #0x80 lsr r6, r0, #0x10 ldr r0, [r4, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0xc] mov r0, #0x0 str r0, [sp, #0x8] @@ -1702,7 +1702,7 @@ FUN_02045104: ; 0x02045104 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -1710,7 +1710,7 @@ FUN_02045104: ; 0x02045104 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -1718,12 +1718,12 @@ FUN_02045104: ; 0x02045104 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r7, #0x0 bl GetPartyMonByIndex add r5, r0, #0x0 @@ -1750,7 +1750,7 @@ FUN_02045170: ; 0x02045170 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -1758,7 +1758,7 @@ FUN_02045170: ; 0x02045170 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 mov r1, #0x1 add r0, sp, #0x0 @@ -1766,7 +1766,7 @@ FUN_02045170: ; 0x02045170 strb r1, [r0, #0x0] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex add r5, r0, #0x0 @@ -1793,20 +1793,20 @@ FUN_020451D0: ; 0x020451D0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x10 add r4, #0x80 lsr r6, r0, #0x10 ldr r0, [r4, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r7, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x4] diff --git a/arm9/asm/scrcmd_19.s b/arm9/asm/scrcmd_19.s index 3ce88b39..0e036f08 100644 --- a/arm9/asm/scrcmd_19.s +++ b/arm9/asm/scrcmd_19.s @@ -25,7 +25,7 @@ FUN_02045268: ; 0x02045268 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r4, #0x0 ldr r7, _020452B0 ; =UNK_020F450C str r0, [sp, #0x0] @@ -61,14 +61,14 @@ FUN_020452B4: ; 0x020452B4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet mov r5, #0x0 ldr r2, _02045300 ; =UNK_020F450C strh r5, [r4, #0x0] @@ -107,7 +107,7 @@ FUN_02045308: ; 0x02045308 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x8] add r0, r4, #0x0 bl ScriptReadHalfword @@ -115,14 +115,14 @@ FUN_02045308: ; 0x02045308 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] mov r4, #0x0 ldr r0, [sp, #0x8] diff --git a/arm9/asm/scrcmd_2.s b/arm9/asm/scrcmd_2.s index dc91f836..d7d98c66 100644 --- a/arm9/asm/scrcmd_2.s +++ b/arm9/asm/scrcmd_2.s @@ -179,7 +179,7 @@ FUN_0203FCF4: ; 0x0203FCF4 add r0, r7, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet mov r4, #0x0 add r6, r4, #0x0 add r5, r4, #0x0 @@ -188,9 +188,9 @@ _0203FD10: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r5, #0x0 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x1 bne _0203FD2C add r0, r6, #0x1 @@ -289,7 +289,7 @@ FUN_0203FDBC: ; 0x0203FDBC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, _0203FE00 ; =0x0000FFF8 add r0, r2, r0 @@ -328,7 +328,7 @@ FUN_0203FE08: ; 0x0203FE08 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 cmp r2, #0x1 bhi _0203FE28 @@ -362,7 +362,7 @@ FUN_0203FE48: ; 0x0203FE48 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 mov r0, #0x0 lsl r3, r2, #0x2 diff --git a/arm9/asm/scrcmd_20.s b/arm9/asm/scrcmd_20.s index 448950f1..31de1e77 100644 --- a/arm9/asm/scrcmd_20.s +++ b/arm9/asm/scrcmd_20.s @@ -26,7 +26,7 @@ FUN_020453A0: ; 0x020453A0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -34,14 +34,14 @@ FUN_020453A0: ; 0x020453A0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldr r1, _020453EC ; =UNK_020F4528 lsl r2, r4, #0x2 ldrh r1, [r1, r2] diff --git a/arm9/asm/scrcmd_21.s b/arm9/asm/scrcmd_21.s index a32ada8f..900a2f2b 100644 --- a/arm9/asm/scrcmd_21.s +++ b/arm9/asm/scrcmd_21.s @@ -23,7 +23,7 @@ FUN_020453F4: ; 0x020453F4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02024D64 @@ -52,7 +52,7 @@ FUN_02045438: ; 0x02045438 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -88,7 +88,7 @@ FUN_02045484: ; 0x02045484 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -96,7 +96,7 @@ FUN_02045484: ; 0x02045484 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 cmp r4, #0x8 blo _020454B6 @@ -105,9 +105,9 @@ _020454B6: add r5, #0x80 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r4, #0x0 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag strh r0, [r6, #0x0] mov r0, #0x0 pop {r4-r6, pc} @@ -121,7 +121,7 @@ FUN_020454CC: ; 0x020454CC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 cmp r4, #0x8 blo _020454EA @@ -130,9 +130,9 @@ _020454EA: add r5, #0x80 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r4, #0x0 - bl FUN_020239E4 + bl PlayerProfile_SetBadgeFlag mov r0, #0x0 pop {r3-r5, pc} .balign 4 @@ -146,12 +146,12 @@ FUN_02045500: ; 0x02045500 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ECE0 strh r0, [r4, #0x0] mov r0, #0x0 @@ -167,7 +167,7 @@ FUN_0204552C: ; 0x0204552C add r0, r6, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r4, #0x0 ldr r7, _02045578 ; =UNK_020F4574 str r0, [sp, #0x0] @@ -177,9 +177,9 @@ _02045548: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldrb r1, [r7, r4] - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x1 bne _02045564 add r0, r5, #0x1 @@ -204,7 +204,7 @@ FUN_0204557C: ; 0x0204557C add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ECD4 mov r0, #0x0 pop {r3, pc} @@ -218,12 +218,12 @@ FUN_02045590: ; 0x02045590 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C strh r0, [r4, #0x0] mov r0, #0x0 @@ -236,7 +236,7 @@ FUN_020455BC: ; 0x020455BC add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED1C mov r0, #0x0 pop {r3, pc} @@ -247,7 +247,7 @@ FUN_020455D0: ; 0x020455D0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED2C mov r0, #0x0 pop {r3, pc} @@ -261,12 +261,12 @@ FUN_020455E4: ; 0x020455E4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED6C strh r0, [r4, #0x0] mov r0, #0x0 @@ -279,7 +279,7 @@ FUN_02045610: ; 0x02045610 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED4C mov r0, #0x0 pop {r3, pc} @@ -290,7 +290,7 @@ FUN_02045624: ; 0x02045624 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED5C mov r0, #0x0 pop {r3, pc} @@ -304,12 +304,12 @@ FUN_02045638: ; 0x02045638 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED0C strh r0, [r4, #0x0] mov r0, #0x0 @@ -322,7 +322,7 @@ FUN_02045664: ; 0x02045664 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ECFC mov r0, #0x0 pop {r3, pc} @@ -334,7 +334,7 @@ FUN_02045678: ; 0x02045678 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldr r2, [r5, #0x8] add r4, r0, #0x0 add r1, r2, #0x1 @@ -361,7 +361,7 @@ _020456AE: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x2 @@ -381,7 +381,7 @@ FUN_020456D4: ; 0x020456D4 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldr r2, [r5, #0x8] add r4, r0, #0x0 add r1, r2, #0x1 @@ -406,7 +406,7 @@ _02045706: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F294 @@ -426,7 +426,7 @@ FUN_0204572C: ; 0x0204572C add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldr r2, [r5, #0x8] add r4, r0, #0x0 add r1, r2, #0x1 @@ -451,7 +451,7 @@ _0204575E: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F2C4 diff --git a/arm9/asm/scrcmd_22.s b/arm9/asm/scrcmd_22.s index de61ca49..d0563546 100644 --- a/arm9/asm/scrcmd_22.s +++ b/arm9/asm/scrcmd_22.s @@ -15,7 +15,7 @@ FUN_02045784: ; 0x02045784 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -23,14 +23,14 @@ FUN_02045784: ; 0x02045784 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -54,7 +54,7 @@ FUN_020457DC: ; 0x020457DC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -62,14 +62,14 @@ FUN_020457DC: ; 0x020457DC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -93,7 +93,7 @@ FUN_02045834: ; 0x02045834 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -101,14 +101,14 @@ FUN_02045834: ; 0x02045834 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -132,7 +132,7 @@ FUN_0204588C: ; 0x0204588C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -140,14 +140,14 @@ FUN_0204588C: ; 0x0204588C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -168,14 +168,14 @@ FUN_020458E4: ; 0x020458E4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02054CB0 @@ -192,14 +192,14 @@ FUN_02045918: ; 0x02045918 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x5 diff --git a/arm9/asm/scrcmd_23.s b/arm9/asm/scrcmd_23.s index 040971f8..3d38b510 100644 --- a/arm9/asm/scrcmd_23.s +++ b/arm9/asm/scrcmd_23.s @@ -16,7 +16,7 @@ FUN_02045958: ; 0x02045958 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -24,13 +24,13 @@ FUN_02045958: ; 0x02045958 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02026CC4 @@ -49,20 +49,20 @@ FUN_020459AC: ; 0x020459AC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -80,7 +80,7 @@ FUN_020459E8: ; 0x020459E8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -88,13 +88,13 @@ FUN_020459E8: ; 0x020459E8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02026CC4 @@ -113,20 +113,20 @@ FUN_02045A3C: ; 0x02045A3C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -144,7 +144,7 @@ FUN_02045A78: ; 0x02045A78 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -152,13 +152,13 @@ FUN_02045A78: ; 0x02045A78 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02026CC4 @@ -177,20 +177,20 @@ FUN_02045ACC: ; 0x02045ACC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -204,20 +204,20 @@ FUN_02045B08: ; 0x02045B08 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -231,20 +231,20 @@ FUN_02045B44: ; 0x02045B44 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -262,20 +262,20 @@ FUN_02045B80: ; 0x02045B80 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r5, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r0, r4, #0x0 bl FUN_02026CC4 mov r0, #0x0 @@ -290,20 +290,20 @@ FUN_02045BC8: ; 0x02045BC8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -317,20 +317,20 @@ FUN_02045C04: ; 0x02045C04 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -344,20 +344,20 @@ FUN_02045C40: ; 0x02045C40 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -375,7 +375,7 @@ FUN_02045C7C: ; 0x02045C7C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -383,14 +383,14 @@ FUN_02045C7C: ; 0x02045C7C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02026CC4 @@ -410,20 +410,20 @@ FUN_02045CD4: ; 0x02045CD4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -437,20 +437,20 @@ FUN_02045D10: ; 0x02045D10 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -464,20 +464,20 @@ FUN_02045D4C: ; 0x02045D4C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 diff --git a/arm9/asm/scrcmd_24.s b/arm9/asm/scrcmd_24.s index 85f03ebe..5685ce24 100644 --- a/arm9/asm/scrcmd_24.s +++ b/arm9/asm/scrcmd_24.s @@ -12,7 +12,7 @@ FUN_02045D88: ; 0x02045D88 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -45,7 +45,7 @@ FUN_02045DD0: ; 0x02045DD0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -87,7 +87,7 @@ FUN_02045E20: ; 0x02045E20 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -95,12 +95,12 @@ FUN_02045E20: ; 0x02045E20 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex mov r1, #0x20 @@ -138,13 +138,13 @@ FUN_02045E74: ; 0x02045E74 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x4] add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x8] str r6, [r4, #0xc] add r0, r5, #0x0 @@ -177,13 +177,13 @@ FUN_02045EE4: ; 0x02045EE4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl GetPartyMonByIndex add r4, r0, #0x0 @@ -206,7 +206,7 @@ FUN_02045F24: ; 0x02045F24 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -214,13 +214,13 @@ FUN_02045F24: ; 0x02045F24 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex add r6, r0, #0x0 @@ -254,7 +254,7 @@ FUN_02045F88: ; 0x02045F88 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -289,7 +289,7 @@ FUN_02045FCC: ; 0x02045FCC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 04d35396..a7879525 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -17,7 +17,7 @@ FUN_0203FE90: ; 0x0203FE90 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 lsl r1, r1, #0x18 ldr r0, [r4, #0x0] @@ -40,7 +40,7 @@ FUN_0203FEC0: ; 0x0203FEC0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [r4, #0x64] ldr r1, _0203FEF0 ; =FUN_0203FEF4 add r0, r4, #0x0 @@ -79,7 +79,7 @@ FUN_0203FF10: ; 0x0203FF10 add r0, #0x80 ldr r0, [r0, #0x0] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -87,7 +87,7 @@ FUN_0203FF10: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x4] add r0, r5, #0x0 bl ScriptReadHalfword @@ -95,7 +95,7 @@ FUN_0203FF10: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r5, #0x0 bl ScriptReadHalfword @@ -103,7 +103,7 @@ FUN_0203FF10: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0xc] add r0, r5, #0x0 bl ScriptReadHalfword @@ -111,19 +111,19 @@ FUN_0203FF10: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 bl GetPartyMonByIndex str r0, [sp, #0x10] add r0, r4, #0x0 mov r1, #0x4 - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r7, r0, #0x0 ldr r1, [sp, #0x8] add r0, sp, #0x14 @@ -136,7 +136,7 @@ FUN_0203FF10: ; 0x0203FF10 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED0C add r1, sp, #0x14 strb r0, [r1, #0x3] @@ -163,7 +163,7 @@ FUN_0203FF10: ; 0x0203FF10 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x2c] add r0, r5, #0x0 add r0, #0x80 @@ -200,7 +200,7 @@ FUN_02040028: ; 0x02040028 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] @@ -241,14 +241,14 @@ FUN_02040074: ; 0x02040074 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r3, r0, #0x0 ldr r0, [r4, #0x0] ldr r2, [r6, #0x0] @@ -279,14 +279,14 @@ FUN_020400C8: ; 0x020400C8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r3, r0, #0x0 ldr r0, [r4, #0x0] ldr r2, [r6, #0x0] @@ -317,14 +317,14 @@ FUN_0204011C: ; 0x0204011C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r3, r0, #0x0 ldr r0, [r4, #0x0] ldr r2, [r6, #0x0] @@ -355,14 +355,14 @@ FUN_02040170: ; 0x02040170 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -440,7 +440,7 @@ FUN_02040220: ; 0x02040220 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -468,7 +468,7 @@ FUN_0204025C: ; 0x0204025C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -496,7 +496,7 @@ FUN_02040298: ; 0x02040298 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -518,7 +518,7 @@ FUN_020402D4: ; 0x020402D4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_0208213C @@ -547,7 +547,7 @@ FUN_02040304: ; 0x02040304 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -569,7 +569,7 @@ FUN_02040340: ; 0x02040340 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_0208217C @@ -592,7 +592,7 @@ FUN_02040370: ; 0x02040370 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_02082190 @@ -615,7 +615,7 @@ FUN_020403A0: ; 0x020403A0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020821B4 @@ -639,14 +639,14 @@ FUN_020403D0: ; 0x020403D0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0x0] add r1, r6, #0x0 @@ -670,14 +670,14 @@ FUN_02040414: ; 0x02040414 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0x0] add r1, r6, #0x0 @@ -700,7 +700,7 @@ FUN_02040458: ; 0x02040458 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020821F0 @@ -725,7 +725,7 @@ FUN_02040488: ; 0x02040488 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -733,7 +733,7 @@ FUN_02040488: ; 0x02040488 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -741,14 +741,14 @@ FUN_02040488: ; 0x02040488 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r4, #0x0] ldr r3, [sp, #0x4] @@ -774,7 +774,7 @@ FUN_020404FC: ; 0x020404FC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_02082254 @@ -803,7 +803,7 @@ FUN_0204052C: ; 0x0204052C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r4, #0x0] ldr r1, [r6, #0x0] @@ -827,7 +827,7 @@ FUN_0204056C: ; 0x0204056C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020822F0 @@ -876,7 +876,7 @@ FUN_020405CC: ; 0x020405CC add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 ldr r0, [r5, #0x0] bl FUN_02082444 @@ -956,7 +956,7 @@ FUN_02040660: ; 0x02040660 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, sp, #0xc str r0, [sp, #0x0] diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index 16052c26..d7e850ab 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -21,7 +21,7 @@ FUN_020406CC: ; 0x020406CC ldrb r5, [r1, #0x0] add r0, r6, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r4, #0x0] add r1, r5, #0x0 @@ -87,10 +87,10 @@ FUN_02040748: ; 0x02040748 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex add r2, r0, #0x0 @@ -119,7 +119,7 @@ FUN_02040790: ; 0x02040790 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -146,7 +146,7 @@ FUN_020407C8: ; 0x020407C8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -173,7 +173,7 @@ FUN_02040800: ; 0x02040800 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet bl TMHMGetMove add r2, r0, #0x0 ldr r0, [r6, #0x0] @@ -201,7 +201,7 @@ FUN_0204083C: ; 0x0204083C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -229,7 +229,7 @@ FUN_02040874: ; 0x02040874 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 bl FUN_02054C14 add r3, r0, #0x0 @@ -264,7 +264,7 @@ FUN_020408BC: ; 0x020408BC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] ldr r1, [r5, #0x8] add r2, r1, #0x1 @@ -310,10 +310,10 @@ FUN_0204091C: ; 0x0204091C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex add r2, r0, #0x0 @@ -346,7 +346,7 @@ FUN_02040964: ; 0x02040964 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 mov r1, #0x1e bl _s32_div_f @@ -383,7 +383,7 @@ FUN_020409C0: ; 0x020409C0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -410,7 +410,7 @@ FUN_020409F8: ; 0x020409F8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -427,7 +427,7 @@ FUN_02040A30: ; 0x02040A30 ldr r5, [r0, #0x0] add r0, r5, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0xf @@ -438,7 +438,7 @@ FUN_02040A30: ; 0x02040A30 str r0, [r7, #0x8] add r0, r4, #0x0 ldrb r5, [r1, #0x0] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r7, r0, #0x0 add r0, r4, #0x0 bl FUN_02023A28 @@ -473,7 +473,7 @@ FUN_02040A7C: ; 0x02040A7C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -538,7 +538,7 @@ FUN_02040B0C: ; 0x02040B0C ldr r0, [r4, #0x0] ldrb r5, [r1, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F388 mov r1, #0x4 bl FUN_02040AE4 @@ -575,7 +575,7 @@ FUN_02040B5C: ; 0x02040B5C ldr r0, [r4, #0x0] ldrb r5, [r1, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F398 mov r1, #0x4 bl FUN_02040AE4 @@ -612,7 +612,7 @@ FUN_02040BAC: ; 0x02040BAC ldr r0, [r4, #0x0] ldrb r5, [r1, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F3C0 mov r1, #0x4 bl FUN_02040AE4 @@ -650,7 +650,7 @@ FUN_02040BFC: ; 0x02040BFC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -677,7 +677,7 @@ FUN_02040C34: ; 0x02040C34 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -704,7 +704,7 @@ FUN_02040C6C: ; 0x02040C6C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -737,7 +737,7 @@ FUN_02040CA4: ; 0x02040CA4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet mov r1, #0x4 add r2, r4, #0x0 bl FUN_02064E60 @@ -777,14 +777,14 @@ FUN_02040D04: ; 0x02040D04 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet sub r5, #0x95 add r4, r0, #0x0 lsl r0, r5, #0x10 @@ -832,7 +832,7 @@ FUN_02040D7C: ; 0x02040D7C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -859,7 +859,7 @@ FUN_02040DB4: ; 0x02040DB4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -931,17 +931,17 @@ FUN_02040E4C: ; 0x02040E4C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r4, r0, #0x0 ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldr r1, [sp, #0x0] bl GetPartyMonByIndex add r4, #0x36 @@ -975,7 +975,7 @@ FUN_02040EB4: ; 0x02040EB4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r1, #0x3 @@ -1007,7 +1007,7 @@ FUN_02040EF8: ; 0x02040EF8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 sub r2, r2, #0x1 lsl r2, r2, #0x10 @@ -1036,7 +1036,7 @@ FUN_02040F34: ; 0x02040F34 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -1063,7 +1063,7 @@ FUN_02040F6C: ; 0x02040F6C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -1090,7 +1090,7 @@ FUN_02040FA4: ; 0x02040FA4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -1117,7 +1117,7 @@ FUN_02040FDC: ; 0x02040FDC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -1144,7 +1144,7 @@ FUN_02041014: ; 0x02041014 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -1172,7 +1172,7 @@ FUN_0204104C: ; 0x0204104C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -1203,7 +1203,7 @@ FUN_02041094: ; 0x02041094 ldr r0, [r5, #0x0] ldrb r4, [r1, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F3C0 add r2, r0, #0x0 ldr r0, [r6, #0x0] @@ -1230,7 +1230,7 @@ FUN_020410C8: ; 0x020410C8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -1257,7 +1257,7 @@ FUN_02041100: ; 0x02041100 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 @@ -1284,7 +1284,7 @@ FUN_02041138: ; 0x02041138 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 sub r2, r2, #0x1 lsl r2, r2, #0x10 diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index bb5b7be6..e69b3a3e 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -16,14 +16,14 @@ FUN_02041194: ; 0x02041194 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F5D8 @@ -48,7 +48,7 @@ FUN_020411C4: ; 0x020411C4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0xc] add r0, r4, #0x0 bl ScriptReadHalfword @@ -56,7 +56,7 @@ FUN_020411C4: ; 0x020411C4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x8] add r0, r4, #0x0 bl ScriptReadHalfword @@ -64,17 +64,17 @@ FUN_020411C4: ; 0x020411C4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x10 lsr r6, r0, #0x10 @@ -85,7 +85,7 @@ FUN_020411C4: ; 0x020411C4 beq _02041286 _0204123C: ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex mov r1, #0x4c @@ -219,7 +219,7 @@ FUN_02041340: ; 0x02041340 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F5FC mov r0, #0x0 pop {r3, pc} diff --git a/arm9/asm/scrcmd_6.s b/arm9/asm/scrcmd_6.s index 84bd89b2..10b41ff7 100644 --- a/arm9/asm/scrcmd_6.s +++ b/arm9/asm/scrcmd_6.s @@ -14,7 +14,7 @@ FUN_020413C0: ; 0x020413C0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02005410 @@ -163,7 +163,7 @@ FUN_020414E0: ; 0x020414E0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet bl FUN_020054C8 mov r0, #0x0 pop {r4, pc} @@ -177,7 +177,7 @@ FUN_020414FC: ; 0x020414FC add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet mov r1, #0x0 bl FUN_020054F0 mov r0, #0x0 @@ -192,7 +192,7 @@ FUN_02041518: ; 0x02041518 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [r4, #0x64] ldr r1, _0204153C ; =FUN_02041540 add r0, r4, #0x0 @@ -226,21 +226,21 @@ FUN_02041558: ; 0x02041558 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r0, r5, #0x0 bl FUN_02005578 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02041588 -FUN_02041588: ; 0x02041588 + thumb_func_start ScrCmd_waitcry +ScrCmd_waitcry: ; 0x02041588 push {r3, lr} ldr r1, _02041594 ; =FUN_02041598 bl SetupNativeScript @@ -262,11 +262,11 @@ _020415A6: pop {r3, pc} .balign 4 - thumb_func_start FUN_020415AC -FUN_020415AC: ; 0x020415AC + thumb_func_start ScrCmd_playbgm +ScrCmd_playbgm: ; 0x020415AC push {r3, lr} bl ScriptReadHalfword - bl FUN_02005C28 + bl PlayBGM mov r0, #0x0 pop {r3, pc} .balign 4 @@ -303,7 +303,7 @@ FUN_020415E0: ; 0x020415E0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -330,7 +330,7 @@ FUN_02041618: ; 0x02041618 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 bl FUN_02005E28 cmp r0, #0x0 @@ -383,14 +383,14 @@ FUN_02041674: ; 0x02041674 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r5, #0x0 bl FUN_0200488C diff --git a/arm9/asm/scrcmd_7.s b/arm9/asm/scrcmd_7.s index c17c563a..1a6a6584 100644 --- a/arm9/asm/scrcmd_7.s +++ b/arm9/asm/scrcmd_7.s @@ -15,7 +15,7 @@ FUN_020416A8: ; 0x020416A8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 bne _02041708 add r0, r4, #0x0 @@ -100,7 +100,7 @@ FUN_02041770: ; 0x02041770 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -108,7 +108,7 @@ FUN_02041770: ; 0x02041770 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x0] @@ -160,7 +160,7 @@ FUN_020417E0: ; 0x020417E0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldrh r1, [r5, #0x0] strh r1, [r0, #0x0] mov r0, #0x0 @@ -187,14 +187,14 @@ FUN_02041808: ; 0x02041808 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer cmp r7, #0x0 bne _02041852 ldrh r1, [r4, #0x0] @@ -221,7 +221,7 @@ FUN_0204185C: ; 0x0204185C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldrh r0, [r4, #0x0] bl FUN_020395F4 @@ -250,7 +250,7 @@ FUN_0204188C: ; 0x0204188C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0xc] add r0, r5, #0x0 bl ScriptReadHalfword @@ -258,19 +258,19 @@ FUN_0204188C: ; 0x0204188C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x8] add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] mov r6, #0x0 ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0x1 bne _020418F2 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F368 add r6, r0, #0x0 _020418F2: @@ -303,7 +303,7 @@ FUN_0204190C: ; 0x0204190C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -311,7 +311,7 @@ FUN_0204190C: ; 0x0204190C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -319,7 +319,7 @@ FUN_0204190C: ; 0x0204190C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r2, r0, #0x0 mov r0, #0xb str r0, [sp, #0x0] @@ -347,7 +347,7 @@ FUN_02041970: ; 0x02041970 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -355,14 +355,14 @@ FUN_02041970: ; 0x02041970 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldrh r0, [r4, #0x0] bl FUN_020395F4 @@ -411,7 +411,7 @@ FUN_020419F8: ; 0x020419F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -419,14 +419,14 @@ FUN_020419F8: ; 0x020419F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldrh r0, [r4, #0x0] bl FUN_020395F4 @@ -474,7 +474,7 @@ FUN_02041A80: ; 0x02041A80 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldrh r0, [r4, #0x0] bl FUN_020395F4 @@ -492,7 +492,7 @@ FUN_02041AB4: ; 0x02041AB4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet bl FUN_0204AD0C bl FUN_02004724 mov r0, #0x1 @@ -521,7 +521,7 @@ FUN_02041AE0: ; 0x02041AE0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020480B8 @@ -544,7 +544,7 @@ FUN_02041B10: ; 0x02041B10 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020480C8 @@ -567,7 +567,7 @@ FUN_02041B40: ; 0x02041B40 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020480D8 @@ -585,12 +585,12 @@ FUN_02041B70: ; 0x02041B70 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_0204A248 strh r0, [r4, #0x0] mov r0, #0x0 @@ -635,7 +635,7 @@ FUN_02041BC4: ; 0x02041BC4 lsl r1, r1, #0x10 add r0, r4, #0x0 lsr r1, r1, #0x10 - bl FUN_0203965C + bl TrainerFlagSet mov r0, #0x0 pop {r3-r5, pc} @@ -660,7 +660,7 @@ FUN_02041BF0: ; 0x02041BF0 lsl r1, r1, #0x10 add r0, r7, #0x0 lsr r1, r1, #0x10 - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0x1 bne _02041C34 ldr r1, [r6, #0x8] diff --git a/arm9/asm/scrcmd_8.s b/arm9/asm/scrcmd_8.s index d5a1a525..84b2eb30 100644 --- a/arm9/asm/scrcmd_8.s +++ b/arm9/asm/scrcmd_8.s @@ -50,14 +50,14 @@ _02041C86: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -73,14 +73,14 @@ _02041CBC: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -96,14 +96,14 @@ _02041CF2: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r3, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -119,14 +119,14 @@ _02041D28: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394F0 + bl VarGet add r3, r0, #0x0 mov r0, #0x1 str r0, [sp, #0x0] @@ -147,7 +147,7 @@ _02041D5E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r2, #0x0 str r2, [sp, #0x0] str r5, [sp, #0x4] @@ -166,7 +166,7 @@ _02041D94: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 mov r1, #0x1 @@ -194,17 +194,17 @@ _02041DCE: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r6, #0x0 add r7, r0, #0x0 - bl FUN_02023990 + bl PlayerName_FlatToString add r0, r5, #0x0 mov r1, #0x0 mov r2, #0x1 add r3, r6, #0x0 bl FUN_020287C0 add r0, r7, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x0 diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index ab9a501c..944243af 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -63,7 +63,7 @@ _02041E68: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -80,7 +80,7 @@ _02041E88: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -88,7 +88,7 @@ _02041E88: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 ldr r0, _02041FD8 ; =0x00000233 add r4, #0x80 @@ -111,7 +111,7 @@ _02041ECA: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -119,7 +119,7 @@ _02041ECA: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -127,7 +127,7 @@ _02041ECA: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r4, #0x80 ldr r0, [r4, #0x0] @@ -148,7 +148,7 @@ _02041F2E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -156,7 +156,7 @@ _02041F2E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 mov r0, #0x8d lsl r0, r0, #0x2 @@ -173,7 +173,7 @@ _02041F68: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -181,7 +181,7 @@ _02041F68: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -189,7 +189,7 @@ _02041F68: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -205,7 +205,7 @@ _02041FB4: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -226,7 +226,7 @@ FUN_02041FDC: ; 0x02041FDC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] @@ -242,7 +242,7 @@ FUN_02042000: ; 0x02042000 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -250,7 +250,7 @@ FUN_02042000: ; 0x02042000 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r4, #0x0 bl GetPartyMonByIndex @@ -284,7 +284,7 @@ _02042058: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -292,7 +292,7 @@ _02042058: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -300,7 +300,7 @@ _02042058: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 ldr r0, _0204210C ; =0x00000232 add r5, #0x80 @@ -324,7 +324,7 @@ _020420A8: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -332,7 +332,7 @@ _020420A8: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -340,7 +340,7 @@ _020420A8: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r5, #0x80 add r3, r0, #0x0 ldr r0, [r5, #0x0] @@ -365,7 +365,7 @@ FUN_02042110: ; 0x02042110 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394F0 + bl VarGet add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -373,7 +373,7 @@ FUN_02042110: ; 0x02042110 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -407,14 +407,14 @@ _02042170: add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r6, #0x0 bl GetPartyMonByIndex @@ -429,7 +429,7 @@ _020421A2: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02060F9C @@ -440,7 +440,7 @@ _020421BC: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394F0 + bl VarGet add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02060F88 @@ -548,7 +548,7 @@ FUN_02042288: ; 0x02042288 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_0204A20C bl FUN_020690E4 add r2, r0, #0x0 diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s index 0e71ba6f..ccb8d272 100644 --- a/arm9/asm/unk_020051F4.s +++ b/arm9/asm/unk_020051F4.s @@ -1216,8 +1216,8 @@ FUN_02005BF8: ; 0x02005BF8 pop {r3-r6, pc} .balign 4 - thumb_func_start FUN_02005C28 -FUN_02005C28: ; 0x02005C28 + thumb_func_start PlayBGM +PlayBGM: ; 0x02005C28 push {r3-r5, lr} add r5, r0, #0x0 bl FUN_020048F4 diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s index a054a19f..c5065adc 100644 --- a/arm9/asm/unk_0200AA80.s +++ b/arm9/asm/unk_0200AA80.s @@ -203,7 +203,7 @@ FUN_0200ABC0: ; 0x0200ABC0 add r5, r0, #0x0 add r0, r2, #0x0 add r4, r1, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 ldr r0, [r5, #0xc] bl CopyU16ArrayToString @@ -240,7 +240,7 @@ FUN_0200AC0C: ; 0x0200AC0C add r5, r0, #0x0 add r0, r2, #0x0 add r6, r1, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r2, _0200AC5C ; =0x000001F1 ldr r3, [r5, #0x4] @@ -249,7 +249,7 @@ FUN_0200AC0C: ; 0x0200AC0C bl NewMsgDataFromNarc add r4, r0, #0x0 add r0, r7, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender cmp r0, #0x0 bne _0200AC3E ldr r2, [r5, #0xc] @@ -1719,8 +1719,8 @@ FUN_0200B7A8: ; 0x0200B7A8 .balign 4 _0200B7B4: .word StrUpperFirstChar - thumb_func_start FUN_0200B7B8 -FUN_0200B7B8: ; 0x0200B7B8 + thumb_func_start StringExpandPlaceholders +StringExpandPlaceholders: ; 0x0200B7B8 push {r3-r7, lr} add r7, r0, #0x0 add r6, r1, #0x0 diff --git a/arm9/asm/unk_020139D8.s b/arm9/asm/unk_020139D8.s index a799de27..45d3119d 100644 --- a/arm9/asm/unk_020139D8.s +++ b/arm9/asm/unk_020139D8.s @@ -309,11 +309,11 @@ _02013B58: .word UNK_020ED5B5 thumb_func_start FUN_02013B5C FUN_02013B5C: ; 0x02013B5C - ldr r3, _02013B64 ; =FUN_02022610 + ldr r3, _02013B64 ; =SavArray_get mov r1, #0x22 bx r3 nop -_02013B64: .word FUN_02022610 +_02013B64: .word SavArray_get thumb_func_start FUN_02013B68 FUN_02013B68: ; 0x02013B68 diff --git a/arm9/asm/unk_02015E30.s b/arm9/asm/unk_02015E30.s index 7a147859..9ca09399 100644 --- a/arm9/asm/unk_02015E30.s +++ b/arm9/asm/unk_02015E30.s @@ -62,7 +62,7 @@ FUN_02015E60: ; 0x02015E60 bhs _02015E9A ldr r0, [r1, #0x4] sub r1, r4, r3 - bl FUN_02029E54 + bl AddIGTSeconds ldr r0, _02015E9C ; =UNK_021C4898 str r4, [r0, #0x8] str r5, [r0, #0xc] diff --git a/arm9/asm/unk_02022504.s b/arm9/asm/unk_02022504.s index 9ffcb7b9..8aa31ef0 100644 --- a/arm9/asm/unk_02022504.s +++ b/arm9/asm/unk_02022504.s @@ -5,35 +5,35 @@ thumb_func_start FUN_02022504 FUN_02022504: ; 0x02022504 - ldr r3, _0202250C ; =FUN_02022610 + ldr r3, _0202250C ; =SavArray_get mov r1, #0x1b bx r3 nop -_0202250C: .word FUN_02022610 +_0202250C: .word SavArray_get thumb_func_start FUN_02022510 FUN_02022510: ; 0x02022510 - ldr r3, _02022518 ; =FUN_02022610 + ldr r3, _02022518 ; =SavArray_get mov r1, #0x23 bx r3 nop -_02022518: .word FUN_02022610 +_02022518: .word SavArray_get thumb_func_start FUN_0202251C FUN_0202251C: ; 0x0202251C - ldr r3, _02022524 ; =FUN_02022610 + ldr r3, _02022524 ; =SavArray_get mov r1, #0x1f bx r3 nop -_02022524: .word FUN_02022610 +_02022524: .word SavArray_get thumb_func_start FUN_02022528 FUN_02022528: ; 0x02022528 - ldr r3, _02022530 ; =FUN_02022610 + ldr r3, _02022530 ; =SavArray_get mov r1, #0x20 bx r3 nop -_02022530: .word FUN_02022610 +_02022530: .word SavArray_get thumb_func_start FUN_02022534 FUN_02022534: ; 0x02022534 diff --git a/arm9/asm/unk_0202376C.s b/arm9/asm/unk_0202376C.s index 4aa49ace..ef333080 100644 --- a/arm9/asm/unk_0202376C.s +++ b/arm9/asm/unk_0202376C.s @@ -23,11 +23,11 @@ FUN_02023770: ; 0x02023770 thumb_func_start FUN_02023788 FUN_02023788: ; 0x02023788 - ldr r3, _02023790 ; =FUN_02022610 + ldr r3, _02023790 ; =SavArray_get mov r1, #0x0 bx r3 nop -_02023790: .word FUN_02022610 +_02023790: .word SavArray_get thumb_func_start FUN_02023794 FUN_02023794: ; 0x02023794 diff --git a/arm9/asm/unk_02023AC4.s b/arm9/asm/unk_02023AC4.s index 7470de58..31d23446 100644 --- a/arm9/asm/unk_02023AC4.s +++ b/arm9/asm/unk_02023AC4.s @@ -175,7 +175,7 @@ FUN_02023BA4: ; 0x02023BA4 _02023BB2: add r0, r4, #0x0 mov r1, #0xd - bl FUN_02022610 + bl SavArray_get add r4, r0, #0x0 lsl r5, r5, #0x5 add r0, r4, r5 @@ -195,7 +195,7 @@ FUN_02023BD4: ; 0x02023BD4 push {r4, lr} add r4, r1, #0x0 mov r1, #0xd - bl FUN_02022610 + bl SavArray_get add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02023ACC @@ -212,7 +212,7 @@ FUN_02023BE8: ; 0x02023BE8 pop {r3, pc} _02023BF6: mov r1, #0xd - bl FUN_02022610 + bl SavArray_get pop {r3, pc} nop _02023C00: .word UNK_02105BD4 diff --git a/arm9/asm/unk_02023C40.s b/arm9/asm/unk_02023C40.s index d4276bce..a759c10a 100644 --- a/arm9/asm/unk_02023C40.s +++ b/arm9/asm/unk_02023C40.s @@ -200,11 +200,11 @@ FUN_02023D3C: ; 0x02023D3C thumb_func_start FUN_02023D58 FUN_02023D58: ; 0x02023D58 - ldr r3, _02023D60 ; =FUN_02022610 + ldr r3, _02023D60 ; =SavArray_get mov r1, #0x8 bx r3 nop -_02023D60: .word FUN_02022610 +_02023D60: .word SavArray_get thumb_func_start FUN_02023D64 FUN_02023D64: ; 0x02023D64 @@ -2458,11 +2458,11 @@ _02024D9C: .word 0xBEEFCAFE thumb_func_start FUN_02024DA0 FUN_02024DA0: ; 0x02024DA0 - ldr r3, _02024DA8 ; =FUN_02022610 + ldr r3, _02024DA8 ; =SavArray_get mov r1, #0x7 bx r3 nop -_02024DA8: .word FUN_02022610 +_02024DA8: .word SavArray_get thumb_func_start FUN_02024DAC FUN_02024DAC: ; 0x02024DAC diff --git a/arm9/asm/unk_02024E64.s b/arm9/asm/unk_02024E64.s index f48042bb..0234a504 100644 --- a/arm9/asm/unk_02024E64.s +++ b/arm9/asm/unk_02024E64.s @@ -43,11 +43,11 @@ _02024EB0: .word 0x00000734 thumb_func_start FUN_02024EB4 FUN_02024EB4: ; 0x02024EB4 - ldr r3, _02024EBC ; =FUN_02022610 + ldr r3, _02024EBC ; =SavArray_get mov r1, #0xa bx r3 nop -_02024EBC: .word FUN_02022610 +_02024EBC: .word SavArray_get thumb_func_start FUN_02024EC0 FUN_02024EC0: ; 0x02024EC0 @@ -59,17 +59,17 @@ _02024EC8: .word FUN_02022634 thumb_func_start FUN_02024ECC FUN_02024ECC: ; 0x02024ECC - ldr r3, _02024ED4 ; =FUN_02022610 + ldr r3, _02024ED4 ; =SavArray_get mov r1, #0xa bx r3 nop -_02024ED4: .word FUN_02022610 +_02024ED4: .word SavArray_get thumb_func_start FUN_02024ED8 FUN_02024ED8: ; 0x02024ED8 push {r3, lr} mov r1, #0xa - bl FUN_02022610 + bl SavArray_get mov r1, #0x7 lsl r1, r1, #0x8 add r0, r0, r1 diff --git a/arm9/asm/unk_020254B8.s b/arm9/asm/unk_020254B8.s index 65b3ddb1..1d7159d1 100644 --- a/arm9/asm/unk_020254B8.s +++ b/arm9/asm/unk_020254B8.s @@ -12,11 +12,11 @@ FUN_020254B8: ; 0x020254B8 thumb_func_start FUN_020254C0 FUN_020254C0: ; 0x020254C0 - ldr r3, _020254C8 ; =FUN_02022610 + ldr r3, _020254C8 ; =SavArray_get mov r1, #0x9 bx r3 nop -_020254C8: .word FUN_02022610 +_020254C8: .word SavArray_get thumb_func_start FUN_020254CC FUN_020254CC: ; 0x020254CC diff --git a/arm9/asm/unk_02025658.s b/arm9/asm/unk_02025658.s index f793f121..4c6c4960 100644 --- a/arm9/asm/unk_02025658.s +++ b/arm9/asm/unk_02025658.s @@ -91,21 +91,21 @@ FUN_020256DC: ; 0x020256DC bl InitSealsObject add r0, r7, #0x0 strb r6, [r5, #0x7] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0x0] add r0, r7, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 add r0, r5, #0x0 add r0, #0x8 bl CopyU16StringArray add r0, r6, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender strb r0, [r5, #0x4] add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID str r0, [r5, #0x0] ldr r0, [sp, #0x0] mov r6, #0x0 @@ -279,11 +279,11 @@ _02025834: thumb_func_start FUN_02025838 FUN_02025838: ; 0x02025838 - ldr r3, _02025840 ; =FUN_02022610 + ldr r3, _02025840 ; =SavArray_get mov r1, #0xf bx r3 nop -_02025840: .word FUN_02022610 +_02025840: .word SavArray_get thumb_func_start FUN_02025844 FUN_02025844: ; 0x02025844 diff --git a/arm9/asm/unk_02025954.s b/arm9/asm/unk_02025954.s index eb1d3969..8495ddab 100644 --- a/arm9/asm/unk_02025954.s +++ b/arm9/asm/unk_02025954.s @@ -469,7 +469,7 @@ FUN_02025C40: ; 0x02025C40 str r0, [sp, #0x0] _02025C50: add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r1, r5, #0x0 add r1, #0xa0 ldr r1, [r1, #0x0] @@ -485,7 +485,7 @@ _02025C50: bl ErrorHandling _02025C72: add r0, r6, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr ldr r1, [sp, #0x0] add r2, r7, #0x0 add r2, #0xb4 @@ -494,7 +494,7 @@ _02025C72: mov r2, #0x10 bl MI_CpuCopy8 add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID ldr r1, [sp, #0x0] lsl r1, r1, #0x2 add r1, r7, r1 @@ -549,11 +549,11 @@ _02025CE8: cmp r0, #0x0 beq _02025D32 add r0, r1, #0x0 - bl FUN_02023928 + bl PlayerProfile_init ldr r1, [sp, #0x0] add r6, r0, #0x0 add r1, r7, r1 - bl FUN_0202395C + bl CopyPlayerName ldr r1, _02025D3C ; =0x00000109 add r2, r5, r4 ldrb r1, [r2, r1] @@ -570,7 +570,7 @@ _02025CE8: add r1, #0xa0 ldr r1, [r1, #0x0] add r0, r6, #0x0 - bl FUN_020239B8 + bl PlayerProfile_SetTrainerID add r0, r6, #0x0 pop {r3-r7, pc} _02025D32: @@ -2887,17 +2887,17 @@ FUN_02026CA0: ; 0x02026CA0 thumb_func_start FUN_02026CA8 FUN_02026CA8: ; 0x02026CA8 - ldr r3, _02026CB0 ; =FUN_02022610 + ldr r3, _02026CB0 ; =SavArray_get mov r1, #0xc bx r3 nop -_02026CB0: .word FUN_02022610 +_02026CB0: .word SavArray_get thumb_func_start FUN_02026CB4 FUN_02026CB4: ; 0x02026CB4 push {r3, lr} mov r1, #0xc - bl FUN_02022610 + bl SavArray_get add r0, #0x50 pop {r3, pc} @@ -2908,8 +2908,8 @@ FUN_02026CC0: ; 0x02026CC0 thumb_func_start FUN_02026CC4 FUN_02026CC4: ; 0x02026CC4 - ldr r3, _02026CCC ; =FUN_02022610 + ldr r3, _02026CCC ; =SavArray_get mov r1, #0xc bx r3 nop -_02026CCC: .word FUN_02022610 +_02026CCC: .word SavArray_get diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s index 75016f0b..ed87943a 100644 --- a/arm9/asm/unk_02026CD0.s +++ b/arm9/asm/unk_02026CD0.s @@ -2479,8 +2479,8 @@ _02027E1E: thumb_func_start FUN_02027E24 FUN_02027E24: ; 0x02027E24 - ldr r3, _02027E2C ; =FUN_02022610 + ldr r3, _02027E2C ; =SavArray_get mov r1, #0xe bx r3 nop -_02027E2C: .word FUN_02022610 +_02027E2C: .word SavArray_get diff --git a/arm9/asm/unk_02027E30.s b/arm9/asm/unk_02027E30.s index 0f0e329a..8116a83c 100644 --- a/arm9/asm/unk_02027E30.s +++ b/arm9/asm/unk_02027E30.s @@ -333,11 +333,11 @@ _02028044: thumb_func_start FUN_02028048 FUN_02028048: ; 0x02028048 - ldr r3, _02028050 ; =FUN_02022610 + ldr r3, _02028050 ; =SavArray_get mov r1, #0x10 bx r3 nop -_02028050: .word FUN_02022610 +_02028050: .word SavArray_get thumb_func_start FUN_02028054 FUN_02028054: ; 0x02028054 diff --git a/arm9/asm/unk_020281E0.s b/arm9/asm/unk_020281E0.s index b55e419f..b0f0a5f2 100644 --- a/arm9/asm/unk_020281E0.s +++ b/arm9/asm/unk_020281E0.s @@ -704,8 +704,8 @@ _020286E8: .word 0x0000FFFF thumb_func_start FUN_020286EC FUN_020286EC: ; 0x020286EC - ldr r3, _020286F4 ; =FUN_02022610 + ldr r3, _020286F4 ; =SavArray_get mov r1, #0x1d bx r3 nop -_020286F4: .word FUN_02022610 +_020286F4: .word SavArray_get diff --git a/arm9/asm/unk_020286F8.s b/arm9/asm/unk_020286F8.s index ffb1a935..2d75f824 100644 --- a/arm9/asm/unk_020286F8.s +++ b/arm9/asm/unk_020286F8.s @@ -197,11 +197,11 @@ FUN_02028810: ; 0x02028810 thumb_func_start FUN_0202881C FUN_0202881C: ; 0x0202881C - ldr r3, _02028824 ; =FUN_02022610 + ldr r3, _02028824 ; =SavArray_get mov r1, #0x11 bx r3 nop -_02028824: .word FUN_02022610 +_02028824: .word SavArray_get thumb_func_start FUN_02028828 FUN_02028828: ; 0x02028828 diff --git a/arm9/asm/unk_02028910.s b/arm9/asm/unk_02028910.s deleted file mode 100644 index 7dd124e0..00000000 --- a/arm9/asm/unk_02028910.s +++ /dev/null @@ -1,81 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - thumb_func_start FUN_02028910 -FUN_02028910: ; 0x02028910 - mov r1, #0x0 - strh r1, [r0, #0x0] - bx lr - .balign 4 - - thumb_func_start FUN_02028918 -FUN_02028918: ; 0x02028918 - push {r3-r5, lr} - add r5, r0, #0x0 - ldr r0, _0202892C ; =0x0000C350 - add r4, r1, #0x0 - cmp r4, r0 - bls _02028928 - bl ErrorHandling -_02028928: - strh r4, [r5, #0x0] - pop {r3-r5, pc} - .balign 4 -_0202892C: .word 0x0000C350 - - thumb_func_start FUN_02028930 -FUN_02028930: ; 0x02028930 - ldrh r0, [r0, #0x0] - bx lr - - thumb_func_start FUN_02028934 -FUN_02028934: ; 0x02028934 - ldrh r3, [r0, #0x0] - ldr r2, _02028950 ; =0x0000C350 - cmp r3, r2 - blo _02028940 - mov r0, #0x0 - bx lr -_02028940: - add r1, r3, r1 - strh r1, [r0, #0x0] - ldrh r1, [r0, #0x0] - cmp r1, r2 - bls _0202894C - strh r2, [r0, #0x0] -_0202894C: - mov r0, #0x1 - bx lr - .balign 4 -_02028950: .word 0x0000C350 - - thumb_func_start FUN_02028954 -FUN_02028954: ; 0x02028954 - ldrh r0, [r0, #0x0] - add r1, r1, r0 - ldr r0, _02028968 ; =0x0000C350 - cmp r1, r0 - bhi _02028962 - mov r0, #0x1 - bx lr -_02028962: - mov r0, #0x0 - bx lr - nop -_02028968: .word 0x0000C350 - - thumb_func_start FUN_0202896C -FUN_0202896C: ; 0x0202896C - ldrh r2, [r0, #0x0] - cmp r2, r1 - bhs _02028976 - mov r0, #0x0 - bx lr -_02028976: - sub r1, r2, r1 - strh r1, [r0, #0x0] - mov r0, #0x1 - bx lr - .balign 4 diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s index d57c7ccd..6c44488d 100644 --- a/arm9/asm/unk_02028980.s +++ b/arm9/asm/unk_02028980.s @@ -65,11 +65,11 @@ _020289A0: .word memset thumb_func_start FUN_020289A4 FUN_020289A4: ; 0x020289A4 - ldr r3, _020289AC ; =FUN_02022610 + ldr r3, _020289AC ; =SavArray_get mov r1, #0x12 bx r3 nop -_020289AC: .word FUN_02022610 +_020289AC: .word SavArray_get thumb_func_start FUN_020289B0 FUN_020289B0: ; 0x020289B0 @@ -1248,7 +1248,7 @@ FUN_0202918C: ; 0x0202918C orr r0, r1 strb r0, [r4, #0x1] ldr r0, [sp, #0x0] - bl FUN_02029EC0 + bl GetIGTMinutes mov r1, #0xa bl _s32_div_f lsl r0, r0, #0x18 @@ -1317,7 +1317,7 @@ FUN_0202920C: ; 0x0202920C orr r0, r1 strb r0, [r4, #0x1] ldr r0, [sp, #0x0] - bl FUN_02029EC0 + bl GetIGTMinutes mov r1, #0xa bl _s32_div_f lsl r0, r0, #0x18 @@ -2337,7 +2337,7 @@ _0202998E: bne _020299A8 ldr r1, _020299BC ; =UNK_020EE96A ldrh r1, [r1, r3] - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _020299B2 add r0, r4, #0x0 diff --git a/arm9/asm/unk_02029A84.s b/arm9/asm/unk_02029A84.s index 0fd818b9..c0382834 100644 --- a/arm9/asm/unk_02029A84.s +++ b/arm9/asm/unk_02029A84.s @@ -37,11 +37,11 @@ _02029AA6: thumb_func_start FUN_02029ABC FUN_02029ABC: ; 0x02029ABC - ldr r3, _02029AC4 ; =FUN_02022610 + ldr r3, _02029AC4 ; =SavArray_get mov r1, #0x13 bx r3 nop -_02029AC4: .word FUN_02022610 +_02029AC4: .word SavArray_get thumb_func_start FUN_02029AC8 FUN_02029AC8: ; 0x02029AC8 diff --git a/arm9/asm/unk_02029AE0.s b/arm9/asm/unk_02029AE0.s index 9661a02a..9e318412 100644 --- a/arm9/asm/unk_02029AE0.s +++ b/arm9/asm/unk_02029AE0.s @@ -23,11 +23,11 @@ _02029AF8: .word 0x00000FF8 thumb_func_start FUN_02029AFC FUN_02029AFC: ; 0x02029AFC - ldr r3, _02029B04 ; =FUN_02022610 + ldr r3, _02029B04 ; =SavArray_get mov r1, #0x1e bx r3 nop -_02029B04: .word FUN_02022610 +_02029B04: .word SavArray_get thumb_func_start FUN_02029B08 FUN_02029B08: ; 0x02029B08 diff --git a/arm9/asm/unk_02029C58.s b/arm9/asm/unk_02029C58.s index dd972a95..bc21a139 100644 --- a/arm9/asm/unk_02029C58.s +++ b/arm9/asm/unk_02029C58.s @@ -31,11 +31,11 @@ _02029C7C: .word MI_CpuCopy8 thumb_func_start FUN_02029C80 FUN_02029C80: ; 0x02029C80 - ldr r3, _02029C88 ; =FUN_02022610 + ldr r3, _02029C88 ; =SavArray_get mov r1, #0x15 bx r3 nop -_02029C88: .word FUN_02022610 +_02029C88: .word SavArray_get thumb_func_start FUN_02029C8C FUN_02029C8C: ; 0x02029C8C diff --git a/arm9/asm/unk_02029E48.s b/arm9/asm/unk_02029E48.s deleted file mode 100644 index c54c2176..00000000 --- a/arm9/asm/unk_02029E48.s +++ /dev/null @@ -1,76 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - thumb_func_start FUN_02029E48 -FUN_02029E48: ; 0x02029E48 - mov r1, #0x0 - strh r1, [r0, #0x0] - strb r1, [r0, #0x2] - strb r1, [r0, #0x3] - bx lr - .balign 4 - - thumb_func_start FUN_02029E54 -FUN_02029E54: ; 0x02029E54 - push {r3-r7, lr} - add r5, r0, #0x0 - ldrh r6, [r5, #0x0] - ldr r0, _02029EB8 ; =0x000003E7 - cmp r6, r0 - bne _02029E6C - ldrb r0, [r5, #0x2] - cmp r0, #0x3b - bne _02029E6C - ldrb r0, [r5, #0x3] - cmp r0, #0x3b - beq _02029EB4 -_02029E6C: - ldrb r0, [r5, #0x3] - ldrb r4, [r5, #0x2] - add r7, r0, r1 - cmp r7, #0x3b - bls _02029EAE - add r0, r7, #0x0 - mov r1, #0x3c - bl _u32_div_f - add r4, r4, r0 - add r0, r7, #0x0 - mov r1, #0x3c - bl _u32_div_f - add r7, r1, #0x0 - cmp r4, #0x3b - bls _02029EAE - add r0, r4, #0x0 - mov r1, #0x3c - bl _u32_div_f - add r6, r6, r0 - add r0, r4, #0x0 - mov r1, #0x3c - bl _u32_div_f - ldr r0, _02029EB8 ; =0x000003E7 - add r4, r1, #0x0 - cmp r6, r0 - blo _02029EAE - mov r4, #0x3b - add r6, r0, #0x0 - add r7, r4, #0x0 -_02029EAE: - strh r6, [r5, #0x0] - strb r4, [r5, #0x2] - strb r7, [r5, #0x3] -_02029EB4: - pop {r3-r7, pc} - nop -_02029EB8: .word 0x000003E7 - - thumb_func_start FUN_02029EBC -FUN_02029EBC: ; 0x02029EBC - ldrh r0, [r0, #0x0] - bx lr - - thumb_func_start FUN_02029EC0 -FUN_02029EC0: ; 0x02029EC0 - ldrb r0, [r0, #0x2] - bx lr diff --git a/arm9/asm/unk_02029EC4.s b/arm9/asm/unk_02029EC4.s index 78411f78..03893fab 100644 --- a/arm9/asm/unk_02029EC4.s +++ b/arm9/asm/unk_02029EC4.s @@ -37,11 +37,11 @@ FUN_02029EE4: ; 0x02029EE4 thumb_func_start FUN_02029EF8 FUN_02029EF8: ; 0x02029EF8 - ldr r3, _02029F00 ; =FUN_02022610 + ldr r3, _02029F00 ; =SavArray_get mov r1, #0x16 bx r3 nop -_02029F00: .word FUN_02022610 +_02029F00: .word SavArray_get thumb_func_start FUN_02029F04 FUN_02029F04: ; 0x02029F04 diff --git a/arm9/asm/unk_02029FB0.s b/arm9/asm/unk_02029FB0.s index f5dcdd43..c6053422 100644 --- a/arm9/asm/unk_02029FB0.s +++ b/arm9/asm/unk_02029FB0.s @@ -46,11 +46,11 @@ _02029FC4: .word MIi_CpuClear32 thumb_func_start FUN_02029FC8 FUN_02029FC8: ; 0x02029FC8 - ldr r3, _02029FD0 ; =FUN_02022610 + ldr r3, _02029FD0 ; =SavArray_get mov r1, #0x14 bx r3 nop -_02029FD0: .word FUN_02022610 +_02029FD0: .word SavArray_get thumb_func_start FUN_02029FD4 FUN_02029FD4: ; 0x02029FD4 diff --git a/arm9/asm/unk_0202A1E0.s b/arm9/asm/unk_0202A1E0.s index de15c8f9..355666bb 100644 --- a/arm9/asm/unk_0202A1E0.s +++ b/arm9/asm/unk_0202A1E0.s @@ -622,7 +622,7 @@ FUN_0202A5D4: ; 0x0202A5D4 add r5, r1, #0x0 mov r1, #0x17 add r4, r2, #0x0 - bl FUN_02022610 + bl SavArray_get mov r1, #0x69 lsl r1, r1, #0x2 add r1, r0, r1 @@ -638,7 +638,7 @@ FUN_0202A5F4: ; 0x0202A5F4 push {r4, lr} add r4, r1, #0x0 mov r1, #0x17 - bl FUN_02022610 + bl SavArray_get mov r1, #0x69 lsl r1, r1, #0x2 add r1, r0, r1 @@ -1028,17 +1028,17 @@ FUN_0202A8A4: ; 0x0202A8A4 thumb_func_start FUN_0202A8CC FUN_0202A8CC: ; 0x0202A8CC - ldr r3, _0202A8D4 ; =FUN_02022610 + ldr r3, _0202A8D4 ; =SavArray_get mov r1, #0x17 bx r3 nop -_0202A8D4: .word FUN_02022610 +_0202A8D4: .word SavArray_get thumb_func_start FUN_0202A8D8 FUN_0202A8D8: ; 0x0202A8D8 push {r3, lr} mov r1, #0x17 - bl FUN_02022610 + bl SavArray_get add r0, #0x3c pop {r3, pc} @@ -1046,7 +1046,7 @@ FUN_0202A8D8: ; 0x0202A8D8 FUN_0202A8E4: ; 0x0202A8E4 push {r3, lr} mov r1, #0x17 - bl FUN_02022610 + bl SavArray_get mov r1, #0x71 lsl r1, r1, #0x2 add r0, r0, r1 diff --git a/arm9/asm/unk_0202A8F4.s b/arm9/asm/unk_0202A8F4.s index 164601c4..ea063dd7 100644 --- a/arm9/asm/unk_0202A8F4.s +++ b/arm9/asm/unk_0202A8F4.s @@ -29,8 +29,8 @@ FUN_0202A8F8: ; 0x0202A8F8 thumb_func_start FUN_0202A918 FUN_0202A918: ; 0x0202A918 - ldr r3, _0202A920 ; =FUN_02022610 + ldr r3, _0202A920 ; =SavArray_get mov r1, #0x18 bx r3 nop -_0202A920: .word FUN_02022610 +_0202A920: .word SavArray_get diff --git a/arm9/asm/unk_0202A924.s b/arm9/asm/unk_0202A924.s index c6af7b91..d1dffcaf 100644 --- a/arm9/asm/unk_0202A924.s +++ b/arm9/asm/unk_0202A924.s @@ -88,11 +88,11 @@ FUN_0202A9AC: ; 0x0202A9AC thumb_func_start FUN_0202A9B0 FUN_0202A9B0: ; 0x0202A9B0 - ldr r3, _0202A9B8 ; =FUN_02022610 + ldr r3, _0202A9B8 ; =SavArray_get mov r1, #0x19 bx r3 nop -_0202A9B8: .word FUN_02022610 +_0202A9B8: .word SavArray_get thumb_func_start FUN_0202A9BC FUN_0202A9BC: ; 0x0202A9BC diff --git a/arm9/asm/unk_0202ABBC.s b/arm9/asm/unk_0202ABBC.s index d85d5e2b..e8225116 100644 --- a/arm9/asm/unk_0202ABBC.s +++ b/arm9/asm/unk_0202ABBC.s @@ -5,11 +5,11 @@ thumb_func_start FUN_0202ABBC FUN_0202ABBC: ; 0x0202ABBC - ldr r3, _0202ABC4 ; =FUN_02022610 + ldr r3, _0202ABC4 ; =SavArray_get mov r1, #0x1a bx r3 nop -_0202ABC4: .word FUN_02022610 +_0202ABC4: .word SavArray_get thumb_func_start FUN_0202ABC8 FUN_0202ABC8: ; 0x0202ABC8 diff --git a/arm9/asm/unk_0202B870.s b/arm9/asm/unk_0202B870.s index eb4d094a..ad45d567 100644 --- a/arm9/asm/unk_0202B870.s +++ b/arm9/asm/unk_0202B870.s @@ -97,11 +97,11 @@ _0202B8CC: thumb_func_start FUN_0202B8E4 FUN_0202B8E4: ; 0x0202B8E4 - ldr r3, _0202B8EC ; =FUN_02022610 + ldr r3, _0202B8EC ; =SavArray_get mov r1, #0x1c bx r3 nop -_0202B8EC: .word FUN_02022610 +_0202B8EC: .word SavArray_get thumb_func_start FUN_0202B8F0 FUN_0202B8F0: ; 0x0202B8F0 @@ -243,7 +243,7 @@ FUN_0202B9EC: ; 0x0202B9EC sub sp, #0xc add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x4e add r6, r0, #0x0 add r0, r4, #0x0 @@ -261,7 +261,7 @@ FUN_0202B9EC: ; 0x0202B9EC str r0, [sp, #0x8] add r0, r6, #0x0 add r1, r4, #0x0 - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r7, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -718,7 +718,7 @@ FUN_0202BD6C: ; 0x0202BD6C str r2, [sp, #0x0] add r4, r0, #0x0 add r5, r1, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x4] ldr r0, [sp, #0x0] mov r1, #0x4c @@ -756,7 +756,7 @@ _0202BDC4: ldr r0, [r5, #0x0] str r0, [r4, #0x8] ldr r0, [sp, #0x4] - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString str r0, [r4, #0xc] ldr r0, [r7, #0x0] add r6, r6, #0x1 diff --git a/arm9/asm/unk_0202C0E0.s b/arm9/asm/unk_0202C0E0.s index ad57476c..5f489515 100644 --- a/arm9/asm/unk_0202C0E0.s +++ b/arm9/asm/unk_0202C0E0.s @@ -37,7 +37,7 @@ FUN_0202C108: ; 0x0202C108 add r5, r1, #0x0 mov r1, #0x21 add r4, r2, #0x0 - bl FUN_02022610 + bl SavArray_get lsl r1, r5, #0x3 add r3, r0, r1 lsl r2, r4, #0x1 @@ -58,7 +58,7 @@ FUN_0202C12C: ; 0x0202C12C add r5, r1, #0x0 mov r1, #0x21 add r4, r2, #0x0 - bl FUN_02022610 + bl SavArray_get lsl r2, r5, #0x3 lsl r1, r4, #0x1 add r0, r0, r2 diff --git a/arm9/asm/unk_0202DB14.s b/arm9/asm/unk_0202DB14.s index d8604c93..a725a6c0 100644 --- a/arm9/asm/unk_0202DB14.s +++ b/arm9/asm/unk_0202DB14.s @@ -15,7 +15,7 @@ FUN_0202DB14: ; 0x0202DB14 sub sp, #0xc str r0, [sp, #0x0] str r1, [sp, #0x4] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x8] ldr r0, _0202DBA0 ; =UNK_021C59E4 ldr r0, [r0, #0x0] @@ -73,7 +73,7 @@ _0202DB4A: ldr r2, [r2, #0x0] ldr r0, [sp, #0x8] ldr r1, [r2, r1] - bl FUN_0202393C + bl PlayerProfile_Copy _0202DB9A: add sp, #0xc pop {r4-r7, pc} @@ -137,7 +137,7 @@ FUN_0202DBE0: ; 0x0202DBE0 ldr r0, _0202DCD8 ; =UNK_021C59E4 ldr r0, [r0, #0x0] ldr r0, [r0, #0x4] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r1, _0202DCD8 ; =UNK_021C59E4 ldr r2, [r1, #0x0] lsl r1, r4, #0x2 @@ -145,7 +145,7 @@ FUN_0202DBE0: ; 0x0202DBE0 mov r1, #0xd2 lsl r1, r1, #0x2 ldr r1, [r2, r1] - bl FUN_0202393C + bl PlayerProfile_Copy mov r0, #0x68 add r5, r4, #0x0 mul r5, r0 @@ -401,7 +401,7 @@ _0202DE0A: strb r4, [r0, #0x0] ldr r0, _0202DE70 ; =UNK_021C59E4 ldr r6, [r0, #0x0] - bl FUN_02023924 + bl PlayerProfile_sizeof add r2, r0, #0x0 mov r0, #0xd2 add r1, r6, r7 @@ -452,7 +452,7 @@ FUN_0202DE78: ; 0x0202DE78 mov r0, #0xd2 lsl r0, r0, #0x2 ldr r0, [r1, r0] - bl FUN_02023948 + bl PlayerProfile_Clear ldr r0, _0202DEA0 ; =UNK_021C59E4 mov r2, #0x0 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_0202E29C.s b/arm9/asm/unk_0202E29C.s index 0b3f7256..06da82b7 100644 --- a/arm9/asm/unk_0202E29C.s +++ b/arm9/asm/unk_0202E29C.s @@ -968,7 +968,7 @@ _0202E9BA: add r0, r3, #0x0 bl FUN_0202EF84 add r1, r4, #0x0 - bl FUN_0202393C + bl PlayerProfile_Copy pop {r4-r6, pc} _0202E9D2: add r5, r5, #0x1 @@ -1092,12 +1092,12 @@ FUN_0202EA9C: ; 0x0202EA9C ble _0202EAC2 bl ErrorHandling _0202EAC2: - bl FUN_02023924 + bl PlayerProfile_sizeof cmp r0, #0x20 beq _0202EACE bl ErrorHandling _0202EACE: - bl FUN_02023924 + bl PlayerProfile_sizeof add r1, r5, #0x0 add r2, r0, #0x0 add r0, r4, #0x0 @@ -1113,7 +1113,7 @@ _0202EACE: add r1, #0x30 bl MI_CpuCopy8 add r0, r4, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID str r0, [r5, #0x0] bl FUN_02033534 strb r0, [r5, #0x4] @@ -1136,7 +1136,7 @@ _0202EB24: ldr r4, [r1, #0x8] ldr r1, _0202EB70 ; =0x00000CC4 add r5, r4, r1 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID ldr r1, _0202EB70 ; =0x00000CC4 str r0, [r4, r1] bl FUN_02033534 diff --git a/arm9/asm/unk_02031734.s b/arm9/asm/unk_02031734.s index 57f7aacc..e28c8c38 100644 --- a/arm9/asm/unk_02031734.s +++ b/arm9/asm/unk_02031734.s @@ -69,7 +69,7 @@ FUN_02031734: ; 0x02031734 ldr r0, [r0, #0x0] str r5, [r0, #0x28] add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r1, _020317BC ; =UNK_021C5A00 ldr r2, [r1, #0x0] str r0, [r2, #0x2c] @@ -3810,7 +3810,7 @@ FUN_0203346C: ; 0x0203346C push {r3-r5, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr bl FUN_02030F40 cmp r0, #0x0 beq _02033482 diff --git a/arm9/asm/unk_02033874.s b/arm9/asm/unk_02033874.s index 648cf799..e48fdc8a 100644 --- a/arm9/asm/unk_02033874.s +++ b/arm9/asm/unk_02033874.s @@ -278,7 +278,7 @@ _02033AA6: bne _02033AEC ldr r1, [sp, #0x4] add r0, r6, #0x0 - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString str r0, [sp, #0xc] ldr r2, [sp, #0xc] add r0, r4, #0x0 @@ -287,14 +287,14 @@ _02033AA6: ldr r0, [sp, #0xc] bl String_dtor add r0, r6, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 mov r2, #0x8 bl FUN_020282E8 add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 @@ -311,14 +311,14 @@ _02033AEC: cmp r0, #0x2 bne _02033B22 add r0, r6, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 mov r2, #0x8 bl FUN_020282E8 add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r3, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index acf3edeb..d514a9d6 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -220,7 +220,7 @@ _02033FA4: ldr r2, [sp, #0x14] add r0, r4, #0x0 add r1, r7, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r1, #0x0 str r1, [sp, #0x0] str r1, [sp, #0x4] diff --git a/arm9/asm/unk_02034D7C.s b/arm9/asm/unk_02034D7C.s index 5e8aeca0..c179bd14 100644 --- a/arm9/asm/unk_02034D7C.s +++ b/arm9/asm/unk_02034D7C.s @@ -157,19 +157,19 @@ FUN_02034E2C: ; 0x02034E2C thumb_func_start FUN_02034E30 FUN_02034E30: ; 0x02034E30 - ldr r3, _02034E38 ; =FUN_02022610 + ldr r3, _02034E38 ; =SavArray_get mov r1, #0x6 bx r3 nop -_02034E38: .word FUN_02022610 +_02034E38: .word SavArray_get thumb_func_start FUN_02034E3C FUN_02034E3C: ; 0x02034E3C - ldr r3, _02034E44 ; =FUN_02022610 + ldr r3, _02034E44 ; =SavArray_get mov r1, #0xb bx r3 nop -_02034E44: .word FUN_02022610 +_02034E44: .word SavArray_get thumb_func_start FUN_02034E48 FUN_02034E48: ; 0x02034E48 diff --git a/arm9/asm/unk_02034E84.s b/arm9/asm/unk_02034E84.s index f9c569d9..2a2e5e37 100644 --- a/arm9/asm/unk_02034E84.s +++ b/arm9/asm/unk_02034E84.s @@ -238,7 +238,7 @@ _02034F8E: cmp r2, #0x0 beq _02034FAE ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldr r2, _02034FBC ; =UNK_020F2224 + 14 lsl r3, r4, #0x4 ldrh r2, [r2, r3] @@ -263,7 +263,7 @@ FUN_02034FC0: ; 0x02034FC0 bl FUN_02034E78 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldr r2, _02034FE0 ; =UNK_020F2224 + 14 lsl r3, r4, #0x4 ldrh r2, [r2, r3] diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 09b94b57..093c06e6 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -83,7 +83,7 @@ FUN_02035080: ; 0x02035080 bl FUN_02035254 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x1 bne _020350A6 @@ -95,7 +95,7 @@ FUN_02035080: ; 0x02035080 b _020350E6 _020350A6: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #0x1 bne _020350C2 @@ -222,7 +222,7 @@ FUN_020351A0: ; 0x020351A0 lsl r0, r0, #0x2 str r1, [r4, r0] ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x1 bne _020351D4 @@ -234,7 +234,7 @@ FUN_020351A0: ; 0x020351A0 b _02035240 _020351D4: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #0x1 bne _020351F0 @@ -323,7 +323,7 @@ FUN_02035270: ; 0x02035270 orr r4, r0 _02035288: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F388 cmp r0, #0x0 bne _0203529A @@ -331,7 +331,7 @@ _02035288: orr r4, r0 _0203529A: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ECE0 cmp r0, #0x0 bne _020352AC @@ -669,7 +669,7 @@ _02035526: str r0, [sp, #0x20] ldr r0, [sp, #0x1c] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 add r0, r6, #0x0 mov r1, #0x0 @@ -677,7 +677,7 @@ _02035526: ldr r2, [sp, #0x20] add r0, r6, #0x0 add r1, r7, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r2, r4, r5 add r2, #0x30 ldrb r2, [r2, #0x0] @@ -775,8 +775,8 @@ _02035614: bl FUN_02019220 ldr r0, [sp, #0x1c] ldr r0, [r0, #0xc] - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender add r3, r0, #0x0 add r0, r4, #0x0 add r4, #0x30 @@ -917,7 +917,7 @@ FUN_02035734: ; 0x02035734 bl FUN_0204652C add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x1 bne _0203575A @@ -925,7 +925,7 @@ FUN_02035734: ; 0x02035734 b _0203576C _0203575A: ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #0x1 beq _0203576A @@ -1035,7 +1035,7 @@ _0203584C: ldr r1, [sp, #0x18] ldr r2, [sp, #0x14] add r0, r7, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x10 str r0, [sp, #0x0] mov r0, #0xff @@ -1076,12 +1076,12 @@ FUN_020358A0: ; 0x020358A0 bl FUN_0204652C add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x0 bne _020358CE ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #0x0 beq _020358E0 @@ -1666,10 +1666,10 @@ FUN_02035D34: ; 0x02035D34 bl FUN_02024DA0 str r0, [sp, #0x0] ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x4] ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r7, r0, #0x0 ldr r0, [sp, #0x0] str r0, [r4, #0x0] @@ -1848,10 +1848,10 @@ _02035ECC: bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r7, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r7, #0x4] mov r0, #0x1 strb r0, [r7, #0x11] @@ -1880,7 +1880,7 @@ _02035ECC: add r0, r7, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r7, #0x0 bl FUN_0207C2A4 @@ -1900,10 +1900,10 @@ _02035F4A: bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r7, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r7, #0x4] mov r1, #0x1 add r0, r6, #0x0 @@ -1928,7 +1928,7 @@ _02035F4A: add r0, r7, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r7, #0x0 bl FUN_0207C2A4 @@ -1957,10 +1957,10 @@ _02035FD0: bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r7, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r7, #0x4] mov r1, #0x1 add r0, r6, #0x0 @@ -1985,7 +1985,7 @@ _02035FD0: add r0, r7, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r7, #0x0 bl FUN_0207C2A4 @@ -2051,7 +2051,7 @@ _0203609C: b _0203625E _020360AC: ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r6, #0x0 add r1, #0x22 ldrb r1, [r1, #0x0] @@ -2091,7 +2091,7 @@ _020360EA: bl FUN_0206F158 add r7, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r1, _0203627C ; =UNK_020F2A90 add r0, r7, #0x0 mov r2, #0xb @@ -2399,7 +2399,7 @@ _0203638A: add r5, r0, #0x0 bl memset ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r5, #0x0] ldr r0, [r6, #0xc] bl FUN_0206F158 @@ -2408,7 +2408,7 @@ _0203638A: bl FUN_02025838 str r0, [r5, #0x8] ldr r0, [r6, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r5, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -2438,7 +2438,7 @@ _0203638A: b _020364F8 _020363F6: ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0x4] mov r0, #0x7f lsl r0, r0, #0x2 @@ -2507,7 +2507,7 @@ _02036474: bl FUN_02025838 str r0, [r5, #0x8] ldr r0, [r6, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r5, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -2932,7 +2932,7 @@ FUN_020367E8: ; 0x020367E8 add r0, r5, #0x0 bl FUN_020358A0 ldr r0, [r6, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x1 bne _02036834 @@ -2991,7 +2991,7 @@ FUN_0203684C: ; 0x0203684C add r5, r0, #0x0 bl memset ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r5, #0x0] ldr r0, [r6, #0xc] bl FUN_0206F158 @@ -3000,7 +3000,7 @@ FUN_0203684C: ; 0x0203684C bl FUN_02025838 str r0, [r5, #0x8] ldr r0, [r6, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r5, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -3280,7 +3280,7 @@ FUN_02036AB8: ; 0x02036AB8 b _02036B82 _02036B0E: ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r7, #0x0 bl GetPartyMonByIndex add r2, r0, #0x0 @@ -3520,7 +3520,7 @@ FUN_02036CEC: ; 0x02036CEC add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -3529,7 +3529,7 @@ FUN_02036CEC: ; 0x02036CEC bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -3650,7 +3650,7 @@ FUN_02036E08: ; 0x02036E08 lsl r2, r0, #0x10 bl FUN_0201681C ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldrb r1, [r5, #0x0] str r0, [sp, #0x20] bl GetPartyMonByIndex @@ -3659,7 +3659,7 @@ FUN_02036E08: ; 0x02036E08 cmp r0, #0x0 ldr r0, [r4, #0xc] bne _02036E9E - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x28] ldr r0, [r4, #0xc] bl FUN_02079C70 @@ -3696,7 +3696,7 @@ FUN_02036E08: ; 0x02036E08 bl FUN_0206C700 b _02036EF2 _02036E9E: - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x38] ldr r0, [r4, #0xc] bl FUN_02079C70 diff --git a/arm9/asm/unk_02037024.s b/arm9/asm/unk_02037024.s index 1ccac0c3..6a0b7ff8 100644 --- a/arm9/asm/unk_02037024.s +++ b/arm9/asm/unk_02037024.s @@ -166,7 +166,7 @@ _0203714A: bl FUN_02039694 add r1, r0, #0x0 add r0, r4, #0x0 - bl FUN_02039528 + bl FlagCheck cmp r0, #0x1 beq _02037160 mov r0, #0x1 @@ -359,7 +359,7 @@ _0203728A: bge _020372BE ldrh r1, [r5, #0xe] ldr r0, [sp, #0x0] - bl FUN_020394F0 + bl VarGet ldrh r1, [r5, #0xc] cmp r1, r0 bne _020372BE diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 6056f12f..48d33a87 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -397,7 +397,7 @@ FUN_0203797C: ; 0x0203797C mov r2, #0x40 bl MIi_CpuClearFast ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -406,7 +406,7 @@ FUN_0203797C: ; 0x0203797C bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] add r0, r4, #0x0 add r0, #0x21 @@ -723,10 +723,10 @@ FUN_02037C00: ; 0x02037C00 bl AllocFromHeap add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] mov r0, #0x1 strb r0, [r4, #0x11] @@ -752,7 +752,7 @@ FUN_02037C00: ; 0x02037C00 add r0, r4, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -779,10 +779,10 @@ FUN_02037C7C: ; 0x02037C7C add r4, r0, #0x0 bl MI_CpuFill8 add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] add r0, r5, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] mov r0, #0x1 strb r0, [r4, #0x11] @@ -807,7 +807,7 @@ FUN_02037C7C: ; 0x02037C7C add r0, r4, #0x0 bl FUN_0207B000 add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -828,10 +828,10 @@ FUN_02037CF0: ; 0x02037CF0 add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] mov r0, #0x1 strb r0, [r4, #0x11] @@ -851,7 +851,7 @@ FUN_02037CF0: ; 0x02037CF0 add r0, r4, #0x0 bl FUN_0207B000 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -1084,7 +1084,7 @@ FUN_02037EF8: ; 0x02037EF8 add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_020377AC - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r5, #0x0 bl FUN_02037EE8 @@ -1229,7 +1229,7 @@ FUN_0203800C: ; 0x0203800C add r4, r0, #0x0 bl memset add r0, r5, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r7, #0x0 bl GetPartyMonByIndex str r0, [r4, #0x0] @@ -1244,13 +1244,13 @@ FUN_0203800C: ; 0x0203800C str r7, [r4, #0x4] str r0, [r4, #0x8] add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] add r0, r5, #0x0 bl FUN_02029FC8 str r0, [r4, #0x10] add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x14] ldr r0, [sp, #0x18] str r6, [r4, #0x18] @@ -1375,20 +1375,20 @@ FUN_02038144: ; 0x02038144 add r4, r1, #0x0 add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [r5, #0x4] ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r5, #0x8] ldr r0, [r4, #0xc] mov r1, #0x9 - bl FUN_02022610 + bl SavArray_get str r0, [r5, #0xc] ldr r0, [r4, #0xc] bl FUN_02029AFC str r0, [r5, #0x14] ldr r0, [r4, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r5, #0x18] ldr r0, [r4, #0xc] bl FUN_02024DA0 @@ -1405,7 +1405,7 @@ FUN_02038144: ; 0x02038144 ldr r0, [r4, #0xc] bl FUN_02029FC8 str r0, [r5, #0x20] - bl FUN_02023924 + bl PlayerProfile_sizeof add r1, r0, #0x0 mov r0, #0x20 bl AllocFromHeap @@ -1535,7 +1535,7 @@ _02038288: bl FUN_020690E4 str r0, [r4, #0x4c] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x5c] mov r0, #0x1 str r0, [r4, #0x58] @@ -1603,7 +1603,7 @@ _020382F6: lsl r2, r0, #0x10 bl FUN_0201681C ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x24] ldr r0, [r5, #0xc] bl FUN_02079C70 @@ -1713,7 +1713,7 @@ FUN_020383F8: ; 0x020383F8 ldr r0, [r0, #0x0] str r0, [r4, #0x4] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x8] ldr r1, _02038428 ; =UNK_020F2C94 add r0, r5, #0x0 @@ -1736,7 +1736,7 @@ FUN_0203842C: ; 0x0203842C ldr r0, [r5, #0x7c] str r0, [r4, #0x4] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x8] ldr r0, [r5, #0xc] bl FUN_02029FC8 @@ -1897,14 +1897,14 @@ _02038572: ; jump table (using 16-bit offset) .short _020385BC - _02038572 - 2; case 6 _02038580: ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r1, [r4, #0xc] add r1, #0x1c - bl FUN_0202395C + bl CopyPlayerName pop {r3-r5, pc} _02038590: ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldr r1, [r4, #0x4] bl GetPartyMonByIndex ldr r2, [r4, #0xc] @@ -1952,7 +1952,7 @@ FUN_020385CC: ; 0x020385CC ldr r0, [sp, #0x30] str r0, [r4, #0x8] ldr r0, [r7, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x0] ldr r2, [sp, #0x8] ldr r3, [sp, #0xc] @@ -1971,7 +1971,7 @@ FUN_020385CC: ; 0x020385CC b _02038660 _02038620: ldr r0, [r7, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldr r1, [r4, #0x4] bl GetPartyMonByIndex mov r1, #0x6f @@ -2092,7 +2092,7 @@ FUN_020386E0: ; 0x020386E0 str r0, [r4, #0x4] ldr r0, [r5, #0xc] mov r1, #0x2 - bl FUN_02022610 + bl SavArray_get str r0, [r4, #0x8] ldr r0, [r5, #0xc] bl FUN_02022510 @@ -2107,10 +2107,10 @@ FUN_020386E0: ; 0x020386E0 bl FUN_02029AFC str r0, [r4, #0x18] ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x1c] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x24] ldr r0, [r5, #0xc] bl FUN_02029FC8 @@ -2170,7 +2170,7 @@ FUN_02038790: ; 0x02038790 bl FUN_02023788 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x10] ldr r0, [r5, #0xc] bl FUN_020286EC @@ -2297,7 +2297,7 @@ FUN_020388B4: ; 0x020388B4 sub sp, #0x10 add r4, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl MOD05_021ED49C add r5, r0, #0x0 bne _020388CC @@ -2308,10 +2308,10 @@ _020388CC: bl FUN_020613CC str r5, [sp, #0x0] ldr r0, [r4, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x4] ldr r0, [r4, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x8] ldr r1, [r4, #0x1c] add r0, r4, #0x0 @@ -2344,7 +2344,7 @@ FUN_02038914: ; 0x02038914 bl FUN_02046528 add r4, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r7, r0, #0x0 add r0, r6, #0x0 bl FUN_0204652C @@ -2373,13 +2373,13 @@ _02038956: cmp r0, #0x0 bne _020389C6 ldr r0, [r4, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr str r0, [sp, #0x0] bl FUN_020126FC str r0, [sp, #0x4] ldr r0, [sp, #0x0] add r6, r1, #0x0 - bl FUN_02028930 + bl CheckCoins str r0, [sp, #0x8] ldr r0, [r5, #0x4] ldr r1, [r5, #0x8] @@ -2395,9 +2395,9 @@ _02038956: add r0, r4, #0x0 bl FUN_02061A8C ldr r0, [r4, #0xc] - bl FUN_0202390C + bl Sav2_PlayerData_GetCoinsAddr ldr r1, [r5, #0x0] - bl FUN_02028918 + bl SetCoins add r0, r7, #0x0 bl FUN_0205F6C8 ldr r1, [r5, #0x18] @@ -2426,7 +2426,7 @@ FUN_020389CC: ; 0x020389CC bl FUN_02046528 add r5, r0, #0x0 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x0] mov r0, #0x20 add r1, r0, #0x0 @@ -2434,8 +2434,8 @@ FUN_020389CC: ; 0x020389CC add r4, r0, #0x0 str r4, [r4, #0xc] ldr r0, [r5, #0xc] - bl FUN_0202390C - bl FUN_02028930 + bl Sav2_PlayerData_GetCoinsAddr + bl CheckCoins str r0, [r4, #0x0] bl FUN_020126FC str r0, [r4, #0x4] diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 3445febe..8eb56920 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -121,16 +121,16 @@ UNK_020F2DB4: ; 0x020F2DB4 .byte 0x5C, 0x00, 0x01, 0x01, 0x00, 0x00, 0x92, 0x00, 0x30, 0x00, 0x01, 0x01, 0x00, 0x00, 0x93, 0x00 .byte 0x2D, 0x00, 0x01, 0x01, 0x00, 0x00, 0x94, 0x00 - .global UNK_020F34DC -UNK_020F34DC: ; 0x020F34DC + .global sNumScriptCmds +sNumScriptCmds: ; 0x020F34DC .word 721 ; NELEMS(gScriptCmdTable) .global UNK_020F34E0 UNK_020F34E0: ; 0x020F34E0 .byte 0x03, 0x19, 0x0D, 0x06, 0x04, 0x0D, 0x15, 0x03 - .global UNK_020F34E8 -UNK_020F34E8: ; 0x020F34E8 + .global sScriptConditionTable +sScriptConditionTable: ; 0x020F34E8 .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01 .byte 0x00, 0x01, 0x00, 0x00 @@ -149,50 +149,50 @@ UNK_020F3538: ; 0x020F3538 .global gScriptCmdTable gScriptCmdTable: ; 0x020F355C - .word FUN_020399A0 - .word FUN_020399A4 - .word FUN_020399A8 - .word FUN_020399B4 - .word FUN_02039A28 - .word FUN_02039A40 - .word FUN_02039A5C - .word FUN_02039A78 - .word FUN_02039A90 - .word FUN_02039AAC - .word FUN_02039ACC - .word FUN_02039AF8 - .word FUN_02039B28 - .word FUN_02039B50 - .word FUN_02039B78 - .word FUN_02039BA0 - .word FUN_02039BBC - .word FUN_02039BDC - .word FUN_02039C08 + .word ScrCmd_nop + .word ScrCmd_nop2 + .word ScrCmd_end + .word ScrCmd_delay + .word ScrCmd_loadbyte + .word ScrCmd_loadword + .word ScrCmd_loadbytefromaddr + .word ScrCmd_writebytetoaddr + .word ScrCmd_setptrbyte + .word ScrCmd_copylocal + .word ScrCmd_copybyte + .word ScrCmd_compare_local_to_local + .word ScrCmd_compare_local_to_value + .word ScrCmd_compare_local_to_addr + .word ScrCmd_compare_addr_to_local + .word ScrCmd_compare_addr_to_value + .word ScrCmd_compare_addr_to_addr + .word ScrCmd_compare_var_to_value + .word ScrCmd_compare_var_to_var .word FUN_02039C40 .word FUN_02039C78 .word FUN_02039CE4 - .word FUN_02039CF8 + .word ScrCmd_goto .word FUN_02039D10 .word FUN_02039D48 .word FUN_02039D78 - .word FUN_02039DAC - .word FUN_02039DC4 - .word FUN_02039DD0 - .word FUN_02039E04 - .word FUN_02039E38 - .word FUN_02039E50 - .word FUN_02039E68 + .word ScrCmd_call + .word ScrCmd_return + .word ScrCmd_goto_if + .word ScrCmd_call_if + .word ScrCmd_setflag + .word ScrCmd_clearflag + .word ScrCmd_checkflag .word FUN_02039E84 .word FUN_02039EC0 - .word FUN_02039EE8 - .word FUN_02039F0C - .word FUN_02039F30 - .word FUN_02039F58 - .word FUN_02039F88 - .word FUN_02039FB8 - .word FUN_02039FDC - .word FUN_0203A00C - .word FUN_0203A038 + .word ScrCmd_settrainerflag + .word ScrCmd_cleartrainerflag + .word ScrCmd_checktrainerflag + .word ScrCmd_addvar + .word ScrCmd_subvar + .word ScrCmd_setvar + .word ScrCmd_copyvar + .word ScrCmd_setorcopyvar + .word ScrCmd_message .word FUN_0203A2C4 .word FUN_0203A304 .word FUN_0203A388 @@ -226,8 +226,8 @@ gScriptCmdTable: ; 0x020F355C .word FUN_020414FC .word FUN_02041518 .word FUN_02041558 - .word FUN_02041588 - .word FUN_020415AC + .word ScrCmd_waitcry + .word ScrCmd_playbgm .word FUN_020415BC .word FUN_020413E8 .word FUN_020413F8 @@ -655,7 +655,7 @@ gScriptCmdTable: ; 0x020F355C .word FUN_02044658 .word FUN_0203BC2C .word FUN_02039A10 - .word FUN_0203A04C + .word ScrCmd_message_from .word FUN_0203A098 .word FUN_0203A0FC .word FUN_0203A13C @@ -994,7 +994,7 @@ FUN_02038D48: ; 0x02038D48 b _02038E1A _02038D68: ldrh r1, [r4, #0xa] - bl FUN_02038EB0 + bl CreateScriptContext str r0, [r4, #0x38] mov r0, #0x1 strb r0, [r4, #0x9] @@ -1154,8 +1154,8 @@ _02038EA8: nop _02038EAC: .word 0x0000225F - thumb_func_start FUN_02038EB0 -FUN_02038EB0: ; 0x02038EB0 + thumb_func_start CreateScriptContext +CreateScriptContext: ; 0x02038EB0 push {r4-r6, lr} add r5, r0, #0x0 add r6, r1, #0x0 @@ -1166,7 +1166,7 @@ FUN_02038EB0: ; 0x02038EB0 bne _02038EC6 bl ErrorHandling _02038EC6: - ldr r2, _02038EE4 ; =UNK_020F34DC + ldr r2, _02038EE4 ; =sNumScriptCmds ldr r1, _02038EE8 ; =gScriptCmdTable ldr r2, [r2, #0x0] add r0, r4, #0x0 @@ -1175,36 +1175,36 @@ _02038EC6: add r1, r4, #0x0 add r2, r6, #0x0 mov r3, #0x0 - bl FUN_02038EEC + bl SetUpScriptContextForMap add r0, r4, #0x0 pop {r4-r6, pc} nop -_02038EE4: .word UNK_020F34DC +_02038EE4: .word sNumScriptCmds _02038EE8: .word gScriptCmdTable - thumb_func_start FUN_02038EEC -FUN_02038EEC: ; 0x02038EEC + thumb_func_start SetUpScriptContextForMap +SetUpScriptContextForMap: ; 0x02038EEC push {r4-r6, lr} add r4, r1, #0x0 add r3, r4, #0x0 add r5, r0, #0x0 add r3, #0x80 str r5, [r3, #0x0] - bl FUN_02038F18 + bl LoadScriptsAndMessagesByMapId add r6, r0, #0x0 ldr r1, [r4, #0x7c] add r0, r4, #0x0 bl SetupBytecodeScript add r0, r4, #0x0 add r1, r6, #0x0 - bl FUN_02039484 + bl ScriptRunByIndex ldr r1, [r5, #0x10] add r0, r4, #0x0 bl FUN_02038B6C pop {r4-r6, pc} - thumb_func_start FUN_02038F18 -FUN_02038F18: ; 0x02038F18 + thumb_func_start LoadScriptsAndMessagesByMapId +LoadScriptsAndMessagesByMapId: ; 0x02038F18 push {r3-r5, lr} ldr r3, _02039210 ; =0x0000283C add r4, r2, #0x0 @@ -1213,7 +1213,7 @@ FUN_02038F18: ; 0x02038F18 mov r3, #0x1f ldr r2, _02039214 ; =0x000003D1 lsl r3, r3, #0x4 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039210 ; =0x0000283C sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1227,7 +1227,7 @@ _02038F36: ldr r2, _02039218 ; =0x00000175 add r3, r2, #0x0 sub r3, #0x29 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203921C ; =0x000027D8 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1240,7 +1240,7 @@ _02038F52: blo _02038F6C ldr r2, _02039220 ; =0x00000412 ldr r3, _02039224 ; =0x00000232 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039228 ; =0x000027A6 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1252,7 +1252,7 @@ _02038F6C: blo _02038F84 ldr r2, _0203922C ; =0x00000411 ldr r3, _02039230 ; =0x00000233 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039234 ; =0x00002774 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1265,7 +1265,7 @@ _02038F84: ldr r2, _0203923C ; =0x00000177 add r3, r2, #0x0 sub r3, #0x29 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039238 ; =0x00002710 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1280,7 +1280,7 @@ _02038F9E: lsl r2, r2, #0x2 add r3, r2, #0x0 sub r3, #0x29 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039240 ; =0x000026DE sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1293,7 +1293,7 @@ _02038FBC: blo _02038FD6 ldr r2, _02039244 ; =0x0000016D mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039248 ; =0x000026AC sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1306,7 +1306,7 @@ _02038FD6: blo _02038FF0 mov r2, #0xce mov r3, #0xcb - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203924C ; =0x00002648 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1319,7 +1319,7 @@ _02038FF0: ldr r2, _02039254 ; =0x00000183 add r3, r2, #0x0 sub r3, #0x9 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1332,7 +1332,7 @@ _0203900A: blo _02039026 ldr r2, _02039258 ; =0x00000179 mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, #0x64 sub r0, r4, r0 @@ -1347,7 +1347,7 @@ _02039026: lsl r2, r2, #0x4 add r3, r2, #0x0 add r3, #0x1c - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203925C ; =0x0000251C sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1360,7 +1360,7 @@ _02039042: ldr r2, _02039264 ; =0x00000187 add r3, r2, #0x0 sub r3, #0xa - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1375,7 +1375,7 @@ _0203905C: lsl r2, r2, #0x2 add r3, r2, #0x0 sub r3, #0x2b - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, #0x64 sub r0, r4, r0 @@ -1390,7 +1390,7 @@ _0203907C: lsl r2, r2, #0x2 add r3, r2, #0x0 sub r3, #0x9 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039268 ; =0x000023F0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1402,7 +1402,7 @@ _02039098: blo _020390B0 mov r2, #0x0 mov r3, #0x9 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203926C ; =0x0000238C sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1415,7 +1415,7 @@ _020390B0: blo _020390CA mov r2, #0xcf add r3, r2, #0x0 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039270 ; =0x00002328 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1428,7 +1428,7 @@ _020390CA: blo _020390E4 ldr r2, _02039274 ; =0x00000186 mov r3, #0x7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039278 ; =0x0000230A sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1442,7 +1442,7 @@ _020390E4: ldr r2, _0203927C ; =0x000001CF add r3, r2, #0x0 add r3, #0x17 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039280 ; =0x000022F6 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1455,7 +1455,7 @@ _02039100: ldr r2, _02039284 ; =0x00000185 add r3, r2, #0x0 sub r3, #0x9 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039288 ; =0x000022C4 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1468,7 +1468,7 @@ _0203911A: ldr r2, _02039290 ; =0x000001CE add r3, r2, #0x0 add r3, #0x17 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203928C ; =0x00002260 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1482,7 +1482,7 @@ _02039134: ldr r2, _02039294 ; =0x00000176 add r3, r2, #0x0 sub r3, #0x29 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized mov r0, #0x7d lsl r0, r0, #0x6 sub r0, r4, r0 @@ -1496,7 +1496,7 @@ _02039152: ldr r2, _0203929C ; =0x00000172 add r3, r2, #0x0 sub r3, #0x2d - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1509,7 +1509,7 @@ _0203916C: mov r2, #0x41 lsl r2, r2, #0x4 mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _020392A0 ; =0x00001388 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1522,7 +1522,7 @@ _02039186: mov r2, #0x41 lsl r2, r2, #0x4 mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1535,7 +1535,7 @@ _020391A0: ldr r2, _020392A8 ; =0x0000017A add r3, r2, #0x0 sub r3, #0x1c - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized mov r0, #0xaf lsl r0, r0, #0x4 sub r0, r4, r0 @@ -1548,7 +1548,7 @@ _020391BC: blo _020391D4 mov r2, #0x1 mov r3, #0xd - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _020392AC ; =0x000009C4 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1560,7 +1560,7 @@ _020391D4: blo _020391EE mov r2, #0xcd mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized mov r0, #0x7d lsl r0, r0, #0x4 sub r0, r4, r0 @@ -1570,7 +1570,7 @@ _020391D4: _020391EE: cmp r4, #0x1 blo _020391FE - bl FUN_020392D8 + bl LoadScriptsAndMessagesForCurrentMap sub r0, r4, #0x1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -1579,7 +1579,7 @@ _020391FE: ldr r2, _020392B0 ; =0x00000171 add r3, r2, #0x0 sub r3, #0x34 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized mov r4, #0x0 _0203920A: add r0, r4, #0x0 @@ -1627,8 +1627,8 @@ _020392A8: .word 0x0000017A _020392AC: .word 0x000009C4 _020392B0: .word 0x00000171 - thumb_func_start FUN_020392B4 -FUN_020392B4: ; 0x020392B4 + thumb_func_start LoadScriptsAndMessagesParameterized +LoadScriptsAndMessagesParameterized: ; 0x020392B4 push {r3-r5, lr} add r5, r1, #0x0 add r1, r2, #0x0 @@ -1646,18 +1646,18 @@ FUN_020392B4: ; 0x020392B4 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_020392D8 -FUN_020392D8: ; 0x020392D8 + thumb_func_start LoadScriptsAndMessagesForCurrentMap +LoadScriptsAndMessagesForCurrentMap: ; 0x020392D8 push {r3-r5, lr} add r5, r0, #0x0 ldr r0, [r5, #0x1c] add r4, r1, #0x0 ldr r0, [r0, #0x0] - bl FUN_0203949C + bl LoadScriptsForCurrentMap str r0, [r4, #0x7c] ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] - bl FUN_020394B0 + bl GetCurrentMapMessageBank add r2, r0, #0x0 mov r0, #0x1 mov r1, #0x1a @@ -1908,8 +1908,8 @@ _0203947C: nop _02039480: .word FUN_020351A0 - thumb_func_start FUN_02039484 -FUN_02039484: ; 0x02039484 + thumb_func_start ScriptRunByIndex +ScriptRunByIndex: ; 0x02039484 push {r4, lr} add r4, r0, #0x0 ldr r2, [r4, #0x8] @@ -1922,8 +1922,8 @@ FUN_02039484: ; 0x02039484 str r0, [r4, #0x8] pop {r4, pc} - thumb_func_start FUN_0203949C -FUN_0203949C: ; 0x0203949C + thumb_func_start LoadScriptsForCurrentMap +LoadScriptsForCurrentMap: ; 0x0203949C push {r3, lr} bl MapHeader_GetScrSeqReleaseNo add r1, r0, #0x0 @@ -1933,20 +1933,20 @@ FUN_0203949C: ; 0x0203949C pop {r3, pc} .balign 4 - thumb_func_start FUN_020394B0 -FUN_020394B0: ; 0x020394B0 + thumb_func_start GetCurrentMapMessageBank +GetCurrentMapMessageBank: ; 0x020394B0 ldr r3, _020394B4 ; =MapHeader_GetMsgBank bx r3 .balign 4 _020394B4: .word MapHeader_GetMsgBank - thumb_func_start FUN_020394B8 -FUN_020394B8: ; 0x020394B8 + thumb_func_start GetVarPointer +GetVarPointer: ; 0x020394B8 push {r3-r5, lr} add r5, r0, #0x0 ldr r0, [r5, #0xc] add r4, r1, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x1 lsl r1, r1, #0xe cmp r4, r1 @@ -1958,7 +1958,7 @@ _020394D0: cmp r4, r1 bhs _020394DE add r1, r4, #0x0 - bl FUN_02046380 + bl GetVarAddr pop {r3-r5, pc} _020394DE: ldr r1, _020394EC ; =0x00007FD7 @@ -1969,11 +1969,11 @@ _020394DE: nop _020394EC: .word 0x00007FD7 - thumb_func_start FUN_020394F0 -FUN_020394F0: ; 0x020394F0 + thumb_func_start VarGet +VarGet: ; 0x020394F0 push {r4, lr} add r4, r1, #0x0 - bl FUN_020394B8 + bl GetVarPointer cmp r0, #0x0 beq _020394FE ldrh r4, [r0, #0x0] @@ -1996,52 +1996,52 @@ _02039512: add r1, r4, r1 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_020394F0 + bl VarGet pop {r3-r5, pc} nop _02039524: .word 0x00004020 - thumb_func_start FUN_02039528 -FUN_02039528: ; 0x02039528 + thumb_func_start FlagCheck +FlagCheck: ; 0x02039528 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get add r1, r4, #0x0 - bl FUN_020462B8 + bl CheckFlagInArray pop {r4, pc} .balign 4 - thumb_func_start FUN_0203953C -FUN_0203953C: ; 0x0203953C + thumb_func_start FlagSet +FlagSet: ; 0x0203953C push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get add r1, r4, #0x0 - bl FUN_020462E4 + bl SetFlagInArray pop {r4, pc} .balign 4 - thumb_func_start FUN_02039550 -FUN_02039550: ; 0x02039550 + thumb_func_start FlagClear +FlagClear: ; 0x02039550 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get add r1, r4, #0x0 - bl FUN_0204630C + bl ClearFlagInArray pop {r4, pc} .balign 4 - thumb_func_start FUN_02039564 -FUN_02039564: ; 0x02039564 + thumb_func_start ResetTempFlagsAndVars +ResetTempFlagsAndVars: ; 0x02039564 push {r4, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x1 add r4, r0, #0x0 - bl FUN_02046338 + bl GetFlagAddr mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -2054,7 +2054,7 @@ FUN_02039564: ; 0x02039564 mov r1, #0x1 add r0, r4, #0x0 lsl r1, r1, #0xe - bl FUN_02046380 + bl GetVarAddr mov r1, #0x0 mov r2, #0x40 bl memset @@ -2065,10 +2065,10 @@ FUN_02039564: ; 0x02039564 FUN_0203959C: ; 0x0203959C push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0xaa lsl r1, r1, #0x4 - bl FUN_02046338 + bl GetFlagAddr mov r2, #0x18 mov r1, #0x0 _020395B0: @@ -2152,48 +2152,48 @@ _0203963C: mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_02039640 -FUN_02039640: ; 0x02039640 + thumb_func_start TrainerFlagCheck +TrainerFlagCheck: ; 0x02039640 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x55 lsl r1, r1, #0x4 add r1, r4, r1 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_020462B8 + bl CheckFlagInArray pop {r4, pc} .balign 4 - thumb_func_start FUN_0203965C -FUN_0203965C: ; 0x0203965C + thumb_func_start TrainerFlagSet +TrainerFlagSet: ; 0x0203965C push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x55 lsl r1, r1, #0x4 add r1, r4, r1 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_020462E4 + bl SetFlagInArray pop {r4, pc} .balign 4 - thumb_func_start FUN_02039678 -FUN_02039678: ; 0x02039678 + thumb_func_start TrainerFlagClear +TrainerFlagClear: ; 0x02039678 push {r4, lr} ldr r0, [r0, #0xc] add r4, r1, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x55 lsl r1, r1, #0x4 add r1, r4, r1 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_0204630C + bl ClearFlagInArray pop {r4, pc} .balign 4 @@ -2385,7 +2385,7 @@ _020397EC: bl FUN_02039694 add r1, r0, #0x0 ldr r0, [sp, #0x0] - bl FUN_02039528 + bl FlagCheck cmp r0, #0x0 bne _0203984C ldr r1, [r4, #0x4] @@ -2455,7 +2455,7 @@ _0203987C: .word FUN_02039880 thumb_func_start FUN_02039880 FUN_02039880: ; 0x02039880 push {r4, lr} - bl FUN_02038EB0 + bl CreateScriptContext add r4, r0, #0x0 _02039888: add r0, r4, #0x0 @@ -2592,11 +2592,11 @@ _02039968: lsl r0, r0, #0x10 lsr r6, r0, #0x10 add r0, r5, #0x0 - bl FUN_020394F0 + bl VarGet add r7, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 - bl FUN_020394F0 + bl VarGet cmp r7, r0 bne _02039996 ldrb r0, [r4, #0x5] diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s index 3ca3d7e7..88b5529e 100644 --- a/arm9/asm/unk_02046030.s +++ b/arm9/asm/unk_02046030.s @@ -44,7 +44,7 @@ FUN_02046068: ; 0x02046068 bl FUN_0204652C add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldrb r1, [r4, #0x8] cmp r1, #0xb bls _0204608A diff --git a/arm9/asm/unk_02046294.s b/arm9/asm/unk_02046294.s deleted file mode 100644 index c3840e61..00000000 --- a/arm9/asm/unk_02046294.s +++ /dev/null @@ -1,167 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .bss - - .global UNK_021C5A14 -UNK_021C5A14: ; 0x021C5A14 - .space 0x8 - - .text - - thumb_func_start FUN_02046294 -FUN_02046294: ; 0x02046294 - mov r0, #0xeb - lsl r0, r0, #0x2 - bx lr - .balign 4 - - thumb_func_start FUN_0204629C -FUN_0204629C: ; 0x0204629C - ldr r3, _020462A8 ; =memset - mov r2, #0xeb - mov r1, #0x0 - lsl r2, r2, #0x2 - bx r3 - nop -_020462A8: .word memset - - thumb_func_start FUN_020462AC -FUN_020462AC: ; 0x020462AC - ldr r3, _020462B4 ; =FUN_02022610 - mov r1, #0x4 - bx r3 - nop -_020462B4: .word FUN_02022610 - - thumb_func_start FUN_020462B8 -FUN_020462B8: ; 0x020462B8 - push {r3-r5, lr} - add r4, r1, #0x0 - bl FUN_02046338 - cmp r0, #0x0 - beq _020462DE - lsr r3, r4, #0x1f - lsl r2, r4, #0x1d - ldrb r5, [r0, #0x0] - sub r2, r2, r3 - mov r1, #0x1d - ror r2, r1 - mov r0, #0x1 - add r1, r3, r2 - add r2, r0, #0x0 - lsl r2, r1 - add r1, r5, #0x0 - tst r1, r2 - bne _020462E0 -_020462DE: - mov r0, #0x0 -_020462E0: - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_020462E4 -FUN_020462E4: ; 0x020462E4 - push {r4-r6, lr} - add r4, r1, #0x0 - bl FUN_02046338 - cmp r0, #0x0 - beq _02046308 - lsr r5, r4, #0x1f - lsl r3, r4, #0x1d - sub r3, r3, r5 - mov r2, #0x1d - ror r3, r2 - mov r6, #0x1 - add r2, r5, r3 - add r3, r6, #0x0 - ldrb r1, [r0, #0x0] - lsl r3, r2 - orr r1, r3 - strb r1, [r0, #0x0] -_02046308: - pop {r4-r6, pc} - .balign 4 - - thumb_func_start FUN_0204630C -FUN_0204630C: ; 0x0204630C - push {r4-r6, lr} - add r4, r1, #0x0 - bl FUN_02046338 - cmp r0, #0x0 - beq _02046334 - lsr r5, r4, #0x1f - lsl r3, r4, #0x1d - sub r3, r3, r5 - mov r2, #0x1d - ror r3, r2 - mov r6, #0x1 - add r2, r5, r3 - add r3, r6, #0x0 - lsl r3, r2 - mov r2, #0xff - ldrb r1, [r0, #0x0] - eor r2, r3 - and r1, r2 - strb r1, [r0, #0x0] -_02046334: - pop {r4-r6, pc} - .balign 4 - - thumb_func_start FUN_02046338 -FUN_02046338: ; 0x02046338 - push {r3-r5, lr} - add r5, r0, #0x0 - cmp r1, #0x0 - bne _02046344 - mov r0, #0x0 - pop {r3-r5, pc} -_02046344: - mov r0, #0x1 - lsl r0, r0, #0xe - cmp r1, r0 - bhs _02046364 - mov r0, #0x5b - lsr r4, r1, #0x3 - lsl r0, r0, #0x2 - cmp r4, r0 - blt _0204635A - bl ErrorHandling -_0204635A: - mov r0, #0x9 - lsl r0, r0, #0x6 - add r0, r5, r0 - add r0, r0, r4 - pop {r3-r5, pc} -_02046364: - sub r1, r1, r0 - asr r0, r1, #0x2 - lsr r0, r0, #0x1d - add r0, r1, r0 - asr r4, r0, #0x3 - cmp r4, #0x8 - blt _02046376 - bl ErrorHandling -_02046376: - ldr r0, _0204637C ; =UNK_021C5A14 - add r0, r0, r4 - pop {r3-r5, pc} - .balign 4 -_0204637C: .word UNK_021C5A14 - - thumb_func_start FUN_02046380 -FUN_02046380: ; 0x02046380 - push {r3-r5, lr} - add r5, r0, #0x0 - mov r0, #0x1 - lsl r0, r0, #0xe - sub r4, r1, r0 - mov r0, #0x12 - lsl r0, r0, #0x4 - cmp r4, r0 - blt _02046396 - bl ErrorHandling -_02046396: - lsl r0, r4, #0x1 - add r0, r5, r0 - pop {r3-r5, pc} diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s index 8a0cf5cd..33ce011d 100644 --- a/arm9/asm/unk_0204653C.s +++ b/arm9/asm/unk_0204653C.s @@ -197,12 +197,12 @@ _02046690: pop {r3-r7, pc} _020466A4: ldr r0, [r6, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0x0 beq _020466BC ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_02085140 _020466BC: ldr r1, [r5, #0x10] @@ -594,7 +594,7 @@ FUN_020469B8: ; 0x020469B8 add r5, r0, #0x0 ldr r0, [r5, #0xc] add r4, r1, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x0 beq _020469F2 @@ -639,7 +639,7 @@ FUN_02046A20: ; 0x02046A20 ldr r0, [r0, #0xc] add r5, r1, #0x0 add r4, r2, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x0 beq _02046A5A @@ -765,12 +765,12 @@ _02046AFE: pop {r4-r6, pc} _02046B3E: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0x0 beq _02046B56 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_02085140 _02046B56: ldr r1, [r4, #0x10] @@ -1018,7 +1018,7 @@ _02046D5C: bl FUN_02022510 str r0, [sp, #0x8] ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r5, r0, #0x0 ldr r0, [sp, #0x8] bl FUN_0206B334 @@ -1830,7 +1830,7 @@ _02047400: bl GetPartyMonByIndex add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [sp, #0x4] add r0, r6, #0x0 mov r1, #0x5 @@ -1874,7 +1874,7 @@ _02047470: bl GetPartyMonByIndex add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [sp, #0x8] add r0, r6, #0x0 mov r1, #0x5 diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 4e65221d..0936ad10 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -75,7 +75,7 @@ _020476FA: add r4, r7, #0x0 _02047748: add r0, r5, #0x0 - bl FUN_0206B8AC + bl SavArray_Party_alloc str r0, [r4, #0x4] add r6, r6, #0x1 add r4, r4, #0x4 @@ -85,7 +85,7 @@ _02047748: add r4, r7, #0x0 _0204775C: add r0, r5, #0x0 - bl FUN_02023928 + bl PlayerProfile_init add r1, r4, #0x0 add r1, #0xf8 add r6, r6, #0x1 @@ -182,10 +182,10 @@ FUN_02047814: ; 0x02047814 add r5, r1, #0x0 add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x10] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr mov r1, #0x1 str r0, [sp, #0x14] add r0, r6, #0x0 @@ -203,7 +203,7 @@ FUN_02047814: ; 0x02047814 bl String_ctor add r7, r0, #0x0 ldr r0, [sp, #0x10] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r2, r0, #0x0 mov r1, #0x1 eor r1, r2 @@ -216,20 +216,20 @@ FUN_02047814: ; 0x02047814 add r0, r4, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_0202395C + bl CopyPlayerName add r0, r7, #0x0 bl String_dtor ldr r0, [sp, #0x18] bl DestroyMsgData ldr r0, [sp, #0x10] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r2, r0, #0x0 add r0, r4, #0x0 add r0, #0xf8 mov r1, #0x1 ldr r0, [r0, #0x0] eor r1, r2 - bl FUN_020239C8 + bl PlayerProfile_SetTrainerGender add r0, r4, #0x0 add r1, r5, #0x0 bl FUN_0204806C @@ -253,7 +253,7 @@ FUN_02047814: ; 0x02047814 bl AllocMonZeroed add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F3C0 mov r2, #0x0 str r2, [sp, #0x0] @@ -268,7 +268,7 @@ FUN_02047814: ; 0x02047814 bl CreateMon ldr r0, [r4, #0x4] add r1, r6, #0x0 - bl FUN_0206B900 + bl AddMonToParty mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -281,7 +281,7 @@ FUN_02047814: ; 0x02047814 bl CreateMon ldr r0, [r4, #0x8] add r1, r6, #0x0 - bl FUN_0206B900 + bl AddMonToParty add r0, r6, #0x0 bl FreeToHeap ldr r0, [r5, #0xc] @@ -405,7 +405,7 @@ _02047A0C: add r0, r5, r0 ldr r0, [r0, #0x4] add r1, r6, #0x0 - bl FUN_0206B900 + bl AddMonToParty cmp r0, #0x0 bne _02047A20 bl ErrorHandling @@ -427,7 +427,7 @@ _02047A34: add r1, r5, r1 ldr r1, [r1, #0x4] add r0, r6, #0x0 - bl FUN_0206BAD0 + bl CopyPlayerParty pop {r4-r6, pc} .balign 4 @@ -446,7 +446,7 @@ _02047A54: add r1, #0xf8 ldr r1, [r1, #0x0] add r0, r6, #0x0 - bl FUN_0202393C + bl PlayerProfile_Copy pop {r4-r6, pc} thumb_func_start FUN_02047A64 @@ -468,10 +468,10 @@ FUN_02047A78: ; 0x02047A78 add r4, r1, #0x0 add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r7, r0, #0x0 ldr r0, [r4, #0xc] bl FUN_0206F158 @@ -483,7 +483,7 @@ FUN_02047A78: ; 0x02047A78 bl FUN_02029EF8 str r0, [sp, #0x8] ldr r0, [r4, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0xc] ldr r0, [r4, #0xc] bl FUN_02034E30 @@ -546,7 +546,7 @@ FUN_02047A78: ; 0x02047A78 lsl r1, r1, #0x2 str r0, [r5, r1] ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F1B4 mov r1, #0x5b lsl r1, r1, #0x2 @@ -612,11 +612,11 @@ FUN_02047BC0: ; 0x02047BC0 ldr r0, [r0, #0xc] str r1, [sp, #0x0] add r7, r2, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0x14] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] @@ -632,7 +632,7 @@ FUN_02047BC0: ; 0x02047BC0 str r0, [sp, #0x8] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x4] mov r0, #0x15 mov r1, #0x6 @@ -652,7 +652,7 @@ FUN_02047BC0: ; 0x02047BC0 bl GetPartyCount add r1, r0, #0x0 ldr r0, [r6, #0x4] - bl FUN_0206B8CC + bl InitPartyWithMaxSize ldr r0, [sp, #0x14] mov r4, #0x0 bl GetPartyCount @@ -783,7 +783,7 @@ FUN_02047D48: ; 0x02047D48 str r1, [sp, #0x0] str r2, [sp, #0x4] add r7, r3, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x20] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] @@ -799,7 +799,7 @@ FUN_02047D48: ; 0x02047D48 str r0, [sp, #0x14] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x10] ldr r0, [sp, #0x0] mov r1, #0x6 @@ -848,7 +848,7 @@ _02047DD8: str r0, [sp, #0x8] ldr r0, [r5, #0x4] add r1, r4, #0x0 - bl FUN_0206B8CC + bl InitPartyWithMaxSize mov r6, #0x0 cmp r4, #0x0 ble _02047E0E @@ -953,7 +953,7 @@ _02047E2C: bl FUN_02023A28 add r4, r0, #0x0 ldr r0, [sp, #0x20] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r4, #0x0 mov r2, #0x1 bl FUN_020536D0 @@ -963,7 +963,7 @@ _02047E2C: add r0, r5, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 add r0, r5, #0x0 add r0, #0x3c @@ -995,7 +995,7 @@ FUN_02047F1C: ; 0x02047F1C add r5, r0, #0x0 ldr r0, [r4, #0xc] add r6, r2, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r2, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -1010,10 +1010,10 @@ FUN_02047F38: ; 0x02047F38 add r5, r1, #0x0 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r7, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -1029,10 +1029,10 @@ FUN_02047F38: ; 0x02047F38 add r0, #0xf8 ldr r0, [r0, #0x0] add r1, r6, #0x0 - bl FUN_0202393C + bl PlayerProfile_Copy ldr r0, [r4, #0x4] add r1, r7, #0x0 - bl FUN_0206BAD0 + bl CopyPlayerParty mov r0, #0x42 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1056,9 +1056,9 @@ FUN_02047FA4: ; 0x02047FA4 add r5, r1, #0x0 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get ldr r0, [r5, #0xc] bl FUN_0206F158 ldr r0, [r5, #0xc] @@ -1233,14 +1233,14 @@ FUN_020480E4: ; 0x020480E4 add r4, r0, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r4, #0x0 add r1, #0x29 strb r0, [r1, #0x0] add r0, r4, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x3c diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 79bb65c1..3aa16280 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -97,7 +97,7 @@ _0204817A: bl FUN_02019150 add r0, r5, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r4, #0x20] mov r1, #0x0 @@ -271,7 +271,7 @@ FUN_020482F4: ; 0x020482F4 ldr r0, [r5, #0x20] add r1, r4, #0x0 add r2, r6, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x0 add r1, r4, #0x0 add r2, r0, #0x0 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 4fd3babb..36b0d359 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -41,7 +41,7 @@ _020484C6: bl FUN_0202B03C _020484CC: ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r6, r0, #0x0 add r0, sp, #0x4 bl FUN_020126B4 @@ -158,7 +158,7 @@ _020485AE: b _02048688 _020485C0: ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_02085140 bl FUN_02022830 ldr r0, [r6, #0xc] @@ -265,10 +265,10 @@ FUN_02048694: ; 0x02048694 bl AllocFromHeap add r5, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x0] ldr r0, [r4, #0xc] bl FUN_02034E30 @@ -282,17 +282,17 @@ FUN_02048694: ; 0x02048694 bl FUN_0205ED0C str r0, [r5, #0x0] ldr r0, [r4, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [r5, #0x4] ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r5, #0x8] ldr r0, [r4, #0xc] - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [r5, #0xc] ldr r0, [r4, #0xc] - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender str r0, [r5, #0x10] add r0, r6, #0x0 bl FUN_0205ED0C @@ -308,7 +308,7 @@ FUN_02048694: ; 0x02048694 bl FUN_0204B328 _0204871E: ldr r0, [r4, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_0204A25C ldr r0, [sp, #0x8] bl FUN_020377B0 @@ -394,7 +394,7 @@ FUN_020487E4: ; 0x020487E4 add r5, r0, #0x0 ldr r0, [r5, #0xc] add r4, r1, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r6, r0, #0x0 mov r0, #0x1a mov r1, #0xc7 @@ -469,7 +469,7 @@ FUN_02048864: ; 0x02048864 bl FUN_0200AA80 add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 add r0, r6, #0x0 mov r1, #0x0 @@ -491,7 +491,7 @@ _020488B4: add r0, r7, #0x0 bl DestroyMsgData ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 add r0, r4, #0x0 ldr r1, [r4, #0x2c] diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index a9dc8bae..4f852dbe 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -166,7 +166,7 @@ FUN_020489FC: ; 0x020489FC add r0, r5, #0x0 bl FUN_0204AB44 add r0, r5, #0x0 - bl FUN_02039564 + bl ResetTempFlagsAndVars cmp r4, #0x0 bne _02048A28 add r0, r5, #0x0 @@ -177,7 +177,7 @@ _02048A28: bl FUN_02063684 _02048A2E: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F408 cmp r4, #0x0 bne _02048A42 @@ -191,7 +191,7 @@ _02048A42: bl FUN_02025484 _02048A50: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get str r0, [sp, #0x0] add r0, r5, #0x0 add r1, r7, #0x0 @@ -268,8 +268,8 @@ FUN_02048AE4: ; 0x02048AE4 bl FUN_02057380 str r0, [r5, #0x34] ldr r0, [r5, #0xc] - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_02034E30 @@ -321,8 +321,8 @@ FUN_02048B50: ; 0x02048B50 bl FUN_02034E20 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender add r2, r0, #0x0 ldr r0, [r5, #0x34] add r1, r4, #0x0 @@ -348,7 +348,7 @@ _02048BA2: ldr r0, [r0, #0x0] bl FUN_020344AC ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x3 bl FUN_0205F524 cmp r0, #0x0 @@ -357,7 +357,7 @@ _02048BA2: bl FUN_020346CC _02048BC2: ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x2 bl FUN_0205F524 cmp r0, #0x0 @@ -532,7 +532,7 @@ FUN_02048D04: ; 0x02048D04 bl FUN_02034DD0 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] str r0, [r4, #0x0] @@ -615,7 +615,7 @@ FUN_02048DAC: ; 0x02048DAC bl FUN_02046528 add r4, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0x0 add r0, r7, #0x0 bl FUN_02046530 @@ -755,7 +755,7 @@ FUN_02048EDC: ; 0x02048EDC bl FUN_0204652C add r6, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get str r0, [sp, #0x0] add r0, r7, #0x0 bl FUN_02046530 @@ -868,7 +868,7 @@ FUN_02048FC8: ; 0x02048FC8 cmp r0, #0x0 beq _02048FF8 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02048D04 @@ -1999,13 +1999,13 @@ _02049884: mov r2, #0x3 bl FUN_020545B8 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x24 bl FUN_02054608 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 add r0, r4, #0x0 ldr r1, [r4, #0x34] diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s index 10664314..d66ec174 100644 --- a/arm9/asm/unk_0204A01C.s +++ b/arm9/asm/unk_0204A01C.s @@ -37,10 +37,10 @@ FUN_0204A048: ; 0x0204A048 add r0, r6, #0x0 add r7, r2, #0x0 str r3, [sp, #0x10] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x14] add r0, r6, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0x18] add r0, r5, #0x0 bl AllocMonZeroed @@ -73,7 +73,7 @@ FUN_0204A048: ; 0x0204A048 bl SetMonData ldr r0, [sp, #0x18] add r1, r4, #0x0 - bl FUN_0206B900 + bl AddMonToParty add r5, r0, #0x0 beq _0204A0BC add r0, r6, #0x0 @@ -94,10 +94,10 @@ FUN_0204A0C8: ; 0x0204A0C8 add r0, r4, #0x0 add r5, r2, #0x0 add r7, r3, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x8] add r0, r4, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r6, r0, #0x0 mov r0, #0x20 bl AllocMonZeroed @@ -116,7 +116,7 @@ FUN_0204A0C8: ; 0x0204A0C8 bl MOD05_021ECF14 add r0, r6, #0x0 add r1, r4, #0x0 - bl FUN_0206B900 + bl AddMonToParty add r5, r0, #0x0 add r0, r4, #0x0 bl FreeToHeap diff --git a/arm9/asm/unk_0204AB0C.s b/arm9/asm/unk_0204AB0C.s index f078e422..5da6e8d4 100644 --- a/arm9/asm/unk_0204AB0C.s +++ b/arm9/asm/unk_0204AB0C.s @@ -129,7 +129,7 @@ _0204ABBE: _0204ABC4: add r6, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r1, r4, #0x0 bl FUN_0205EF20 cmp r0, #0x0 diff --git a/arm9/asm/unk_0204B0A0.s b/arm9/asm/unk_0204B0A0.s index e7787996..1495eb48 100644 --- a/arm9/asm/unk_0204B0A0.s +++ b/arm9/asm/unk_0204B0A0.s @@ -147,11 +147,11 @@ FUN_0204B1DC: ; 0x0204B1DC add r0, r6, #0x0 bl FUN_0202A988 ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl FUN_02069D50 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0x0 bl FUN_0205F594 cmp r0, r4 diff --git a/arm9/asm/unk_0204BE14.s b/arm9/asm/unk_0204BE14.s index 0e8be8cc..3234ea05 100644 --- a/arm9/asm/unk_0204BE14.s +++ b/arm9/asm/unk_0204BE14.s @@ -558,8 +558,8 @@ _0204C196: thumb_func_start FUN_0204C1A8 FUN_0204C1A8: ; 0x0204C1A8 - ldr r3, _0204C1B0 ; =FUN_02022610 + ldr r3, _0204C1B0 ; =SavArray_get mov r1, #0x5 bx r3 nop -_0204C1B0: .word FUN_02022610 +_0204C1B0: .word SavArray_get diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index 610901c6..f4d8b81a 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -773,7 +773,7 @@ FUN_0204D040: ; 0x0204D040 mov r2, #0x22 mul r2, r1 add r1, r3, r2 - bl FUN_0202393C + bl PlayerProfile_Copy _0204D0F8: ldr r1, _0204D110 ; =UNK_021C5A68 mov r0, #0xff @@ -1110,7 +1110,7 @@ _0204D37C: lsl r4, r5, #0x3 ldr r7, [r0, #0x0] ldr r0, [sp, #0xc] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender mov r1, #0x0 str r1, [sp, #0x0] str r0, [sp, #0x4] @@ -4018,7 +4018,7 @@ FUN_0204E96C: ; 0x0204E96C ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0x0 ldrb r0, [r5, #0x1] cmp r0, #0x8 @@ -4714,7 +4714,7 @@ FUN_0204EEBC: ; 0x0204EEBC beq _0204EF44 mov r0, #0xf lsl r4, r5, #0x2 - bl FUN_02023928 + bl PlayerProfile_init mov r3, #0x29 ldr r1, _0204EF48 ; =UNK_021C5A68 add r2, r0, #0x0 @@ -4726,7 +4726,7 @@ FUN_0204EEBC: ; 0x0204EEBC add r0, r7, #0x0 add r1, r1, r4 ldr r1, [r1, r3] - bl FUN_0202393C + bl PlayerProfile_Copy ldr r1, _0204EF48 ; =UNK_021C5A68 mov r2, #0x1 ldr r0, [r1, #0x0] @@ -4745,7 +4745,7 @@ FUN_0204EEBC: ; 0x0204EEBC add r1, r1, r3 add r0, r7, #0x0 add r1, r1, r2 - bl FUN_0202393C + bl PlayerProfile_Copy bl FUN_02031190 cmp r6, r0 bne _0204EF40 @@ -4818,7 +4818,7 @@ FUN_0204EF50: ; 0x0204EF50 add r2, r2, r5 ldr r0, [r0, r7] add r1, r2, r1 - bl FUN_0202393C + bl PlayerProfile_Copy mov r0, #0x1 pop {r3-r7, pc} _0204EFBE: @@ -5338,7 +5338,7 @@ _0204F3AC: mov r0, #0x29 lsl r0, r0, #0x4 ldr r0, [r2, r0] - bl FUN_02023AA4 + bl PlayerProfile_NameAndOTIDMatchPlayer cmp r0, #0x1 bne _0204F41A ldrb r0, [r5, #0x2] @@ -5478,7 +5478,7 @@ _0204F4D2: ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205EDF8 ldr r0, _0204F5E0 ; =UNK_021C5A68 ldrb r1, [r5, #0x1] @@ -5552,7 +5552,7 @@ _0204F58C: mov r0, #0x29 lsl r0, r0, #0x4 ldr r0, [r2, r0] - bl FUN_02023AA4 + bl PlayerProfile_NameAndOTIDMatchPlayer cmp r0, #0x1 bne _0204F5D4 ldrb r0, [r5, #0x1] @@ -6044,7 +6044,7 @@ FUN_0204F930: ; 0x0204F930 pop {r3-r5, pc} _0204F96E: mov r0, #0xf - bl FUN_02023928 + bl PlayerProfile_init add r4, r0, #0x0 mov r0, #0x14 mov r1, #0xf @@ -6060,7 +6060,7 @@ _0204F988: _0204F990: add r0, r4, #0x0 add r1, r5, #0x0 - bl FUN_0202397C + bl PlayerName_StringToFlat mov r0, #0x5b add r1, r4, #0x0 bl FUN_020311D0 @@ -6097,10 +6097,10 @@ FUN_0204F9BC: ; 0x0204F9BC add r1, r2, r1 add r0, r6, #0x0 add r1, r1, r4 - bl FUN_0202393C + bl PlayerProfile_Copy add r0, r6, #0x0 mov r1, #0xf - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString str r0, [sp, #0x0] bl StringGetLength cmp r0, #0x0 @@ -6190,7 +6190,7 @@ FUN_0204FA78: ; 0x0204FA78 _0204FA98: mov r0, #0xf lsl r4, r5, #0x2 - bl FUN_02023928 + bl PlayerProfile_init ldr r2, _0204FAC8 ; =UNK_021C5A68 ldr r1, [r2, #0x0] add r3, r1, r4 @@ -6201,7 +6201,7 @@ _0204FA98: add r0, r6, #0x0 add r2, r2, r4 ldr r1, [r2, r1] - bl FUN_0202393C + bl PlayerProfile_Copy ldr r0, _0204FAC8 ; =UNK_021C5A68 mov r1, #0x1 ldr r0, [r0, #0x0] @@ -6318,7 +6318,7 @@ _0204FB62: ldr r1, _0204FBA0 ; =0x0000014A add r0, r4, #0x0 add r1, r2, r1 - bl FUN_0202393C + bl PlayerProfile_Copy ldr r0, _0204FB9C ; =UNK_021C5A68 mov r2, #0x0 ldr r1, [r0, #0x0] diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s index 6c8271dc..43c89f86 100644 --- a/arm9/asm/unk_0204FBA8.s +++ b/arm9/asm/unk_0204FBA8.s @@ -159,7 +159,7 @@ FUN_0204FC5C: ; 0x0204FC5C ldr r0, [r0, #0x0] ldr r0, [r0, #0x18] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F194 cmp r0, #0x0 bne _0204FC9A @@ -712,7 +712,7 @@ _020500B6: ldr r0, [r0, #0x0] ldr r0, [r0, #0x18] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F194 cmp r0, #0x0 bne _020500F8 @@ -739,7 +739,7 @@ FUN_02050114: ; 0x02050114 ldr r0, [r0, #0x0] ldr r0, [r0, #0x18] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F194 cmp r0, #0x0 beq _0205013A @@ -1755,14 +1755,14 @@ FUN_02050968: ; 0x02050968 add r4, r1, #0x0 beq _02050986 mov r0, #0xb - bl FUN_0206B8AC + bl SavArray_Party_alloc ldr r1, _020509AC ; =UNK_021C5A6C ldr r2, [r1, #0x0] str r0, [r2, #0x44] ldr r1, [r1, #0x0] add r0, r4, #0x0 ldr r1, [r1, #0x44] - bl FUN_0206BAD0 + bl CopyPlayerParty _02050986: cmp r5, #0x0 beq _02050994 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 6971b088..74026711 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -30,7 +30,7 @@ FUN_02050E48: ; 0x02050E48 add r4, r0, #0x0 bl MI_CpuFill8 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -41,7 +41,7 @@ FUN_02050E48: ; 0x02050E48 bl FUN_02079C70 str r0, [r4, #0x2c] add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] ldr r0, [sp, #0x0] str r0, [r4, #0x0] @@ -86,7 +86,7 @@ FUN_02050ED4: ; 0x02050ED4 bl MI_CpuFill8 ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] ldr r0, [r5, #0x24] add r0, #0xac @@ -94,7 +94,7 @@ FUN_02050ED4: ; 0x02050ED4 str r0, [r4, #0x14] ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] @@ -627,7 +627,7 @@ _02051308: _0205130E: ldr r0, [r4, #0x24] ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r2, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -791,7 +791,7 @@ _0205142C: ldr r0, [r4, #0x28] ldr r1, [r4, #0x10] ldr r2, [r4, #0xc] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, [r4, #0x10] add r0, r4, #0x0 bl FUN_020517C0 @@ -970,7 +970,7 @@ _020515BA: ldr r0, [r4, #0x28] ldr r1, [r4, #0x10] ldr r2, [r4, #0xc] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, [r4, #0x10] add r0, r4, #0x0 bl FUN_020517C0 @@ -1025,7 +1025,7 @@ _02051642: ldr r0, [r4, #0x28] ldr r1, [r4, #0x10] ldr r2, [r4, #0xc] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, [r4, #0x10] add r0, r4, #0x0 bl FUN_020517C0 @@ -1211,7 +1211,7 @@ FUN_020517C0: ; 0x020517C0 bl FUN_020545B8 ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02054608 @@ -1222,7 +1222,7 @@ _020517F2: _020517F8: ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 add r0, r4, #0x0 add r1, r6, #0x0 @@ -1377,10 +1377,10 @@ _02051938: bl AllocFromHeapAtEnd str r0, [r4, #0x48] mov r0, #0xb - bl FUN_0206B8AC + bl SavArray_Party_alloc mov r1, #0x3 str r0, [r4, #0x50] - bl FUN_0206B8CC + bl InitPartyWithMaxSize add r0, r4, #0x0 mov r1, #0x5 add r0, #0x44 @@ -1464,7 +1464,7 @@ FUN_020519F0: ; 0x020519F0 ldr r0, [r7, #0x24] add r5, r1, #0x0 ldr r0, [r0, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0x0] ldr r4, [r7, #0x4c] bl FUN_020690C4 @@ -1611,7 +1611,7 @@ FUN_02051AF0: ; 0x02051AF0 add r6, r0, #0x0 ldr r0, [r5, #0x50] mov r1, #0x3 - bl FUN_0206B8CC + bl InitPartyWithMaxSize mov r4, #0x0 _02051B04: add r1, r4, #0x0 @@ -1619,7 +1619,7 @@ _02051B04: mul r1, r6 ldr r0, [r5, #0x50] add r1, r2, r1 - bl FUN_0206B900 + bl AddMonToParty add r4, r4, #0x1 cmp r4, #0x3 blt _02051B04 @@ -1650,7 +1650,7 @@ FUN_02051B1C: ; 0x02051B1C bl MI_CpuCopy8 ldr r0, [r6, #0x50] mov r1, #0x3 - bl FUN_0206B8CC + bl InitPartyWithMaxSize mov r5, #0x0 _02051B52: add r1, r5, #0x0 @@ -1658,7 +1658,7 @@ _02051B52: mul r1, r4 ldr r0, [r6, #0x50] add r1, r2, r1 - bl FUN_0206B900 + bl AddMonToParty add r5, r5, #0x1 cmp r5, #0x3 blt _02051B52 @@ -2154,20 +2154,20 @@ _02051EF2: ldr r0, [r4, #0x18] ldr r1, [r4, #0x4] ldr r2, [r4, #0x0] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r1, r4, #0x0 ldr r0, [r5, #0x8] add r1, #0x8 mov r2, #0x3 bl FUN_020545B8 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0x8 bl FUN_02054608 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 add r0, r4, #0x0 ldr r1, [r4, #0x4] diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index f7eeac55..f620cb87 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -205,7 +205,7 @@ _0205211E: str r5, [r4, #0x0] str r6, [r4, #0x4] add r0, r6, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x8] add r0, r4, #0x0 bl FUN_02052E1C @@ -1025,10 +1025,10 @@ FUN_02052734: ; 0x02052734 cmp r5, r0 beq _02052780 add r0, r7, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r5, r0, #0x0 add r0, r7, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 lsl r1, r1, #0x18 add r0, r5, #0x0 @@ -1177,7 +1177,7 @@ _02052852: asr r4, r0, #0x7 b _02052872 _0205286C: - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r4, r0, #0x0 _02052872: ldrb r0, [r5, #0x1c] @@ -1400,7 +1400,7 @@ FUN_02052A10: ; 0x02052A10 _02052A24: sub r0, r1, #0x1 bl FUN_0202EF84 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 cmp r4, #0x18 bhi _02052AFA @@ -1542,14 +1542,14 @@ _02052B32: bl FUN_0202DFA4 add r7, r0, #0x0 beq _02052B60 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID lsl r1, r4, #0x2 str r0, [r5, r1] add r0, r7, #0x0 bl FUN_02023A28 str r0, [sp, #0x0] add r0, r7, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender lsl r1, r0, #0x7 ldr r0, [sp, #0x0] orr r1, r0 @@ -1691,7 +1691,7 @@ _02052C46: bl FUN_02023A28 add r4, r0, #0x0 ldr r0, [r5, #0x8] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r4, #0x0 mov r2, #0x2 bl FUN_020536D0 @@ -1964,7 +1964,7 @@ FUN_02052E38: ; 0x02052E38 lsl r1, r1, #0x2 str r0, [r4, r1] ldr r0, [r4, #0x8] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r5, r0, #0x0 ldr r0, [r4, #0x8] bl FUN_02023A28 diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s index 50e499bf..d46e356e 100644 --- a/arm9/asm/unk_02052EE8.s +++ b/arm9/asm/unk_02052EE8.s @@ -40,7 +40,7 @@ FUN_02052EE8: ; 0x02052EE8 ldr r0, [r4, r1] mov r1, #0x9 ldr r0, [r0, #0xc] - bl FUN_02022610 + bl SavArray_get ldr r1, _02052F64 ; =0x000004D8 ldr r2, _02052F68 ; =0x00002710 str r0, [r4, r1] @@ -345,7 +345,7 @@ _02053166: bl FUN_02023A28 strb r0, [r5, #0x14] ldr r0, [sp, #0xc] - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r1, r0, #0x0 ldr r0, [sp, #0x8] bl FUN_02025614 diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s index 46b1ef06..73072399 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -826,8 +826,8 @@ FUN_02053D0C: ; 0x02053D0C bl FUN_0201B6C8 add r4, r0, #0x0 ldr r0, [r5, #0xc] - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender add r1, r0, #0x0 add r0, r4, #0x4 add r2, r6, #0x0 diff --git a/arm9/asm/unk_02054C14.s b/arm9/asm/unk_02054C14.s index cdf629de..c8085b1a 100644 --- a/arm9/asm/unk_02054C14.s +++ b/arm9/asm/unk_02054C14.s @@ -288,7 +288,7 @@ _02054DE8: .word 0x0000010D FUN_02054DEC: ; 0x02054DEC push {r3-r7, lr} add r6, r0, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl GetPartyCount lsl r0, r0, #0x10 lsr r5, r0, #0x10 @@ -297,7 +297,7 @@ FUN_02054DEC: ; 0x02054DEC mov r7, #0x4c _02054E02: add r0, r6, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r4, #0x0 bl GetPartyMonByIndex add r1, r7, #0x0 @@ -324,7 +324,7 @@ FUN_02054E30: ; 0x02054E30 push {r3-r7, lr} sub sp, #0x10 mov r7, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [sp, #0x0] bl GetPartyCount add r4, r0, #0x0 diff --git a/arm9/asm/unk_02057380.s b/arm9/asm/unk_02057380.s index 1e79f8c0..c6a25876 100644 --- a/arm9/asm/unk_02057380.s +++ b/arm9/asm/unk_02057380.s @@ -292,7 +292,7 @@ FUN_020575D4: ; 0x020575D4 bl FUN_020583E8 lsl r1, r6, #0x10 lsr r1, r1, #0x10 - bl FUN_02039528 + bl FlagCheck cmp r0, #0x0 bne _02057610 ldr r1, [sp, #0x0] @@ -368,7 +368,7 @@ FUN_02057688: ; 0x02057688 bl FUN_02058738 lsl r1, r5, #0x10 lsr r1, r1, #0x10 - bl FUN_0203953C + bl FlagSet add r0, r4, #0x0 bl FUN_02057654 pop {r3-r5, pc} @@ -1013,7 +1013,7 @@ _02057C1A: beq _02057C30 ldrh r1, [r4, #0x8] add r0, r7, #0x0 - bl FUN_02039528 + bl FlagCheck cmp r0, #0x0 bne _02057C42 _02057C30: diff --git a/arm9/asm/unk_0205C598.s b/arm9/asm/unk_0205C598.s index 51030e32..8429979f 100644 --- a/arm9/asm/unk_0205C598.s +++ b/arm9/asm/unk_0205C598.s @@ -200,7 +200,7 @@ _0205C6E8: lsl r1, r1, #0x10 add r0, r6, #0x0 lsr r1, r1, #0x10 - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0x0 bne _0205C724 ldr r0, [sp, #0x28] diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index 65e31220..631cedd6 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -75,7 +75,7 @@ FUN_0205CE80: ; 0x0205CE80 ldr r0, [r0, #0x0] str r0, [r5, #0x0] ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C str r0, [r5, #0x4] ldr r0, [r4, #0x38] @@ -288,7 +288,7 @@ FUN_0205D024: ; 0x0205D024 add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -297,7 +297,7 @@ FUN_0205D024: ; 0x0205D024 bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] ldr r0, [r5, #0xc] bl FUN_02022504 @@ -457,13 +457,13 @@ _0205D194: _0205D1A4: ldr r0, [r5, #0x18] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x1 beq _0205D1C4 ldr r0, [r5, #0x18] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #0x1 bne _0205D1CA @@ -771,7 +771,7 @@ FUN_0205D400: ; 0x0205D400 add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -780,7 +780,7 @@ FUN_0205D400: ; 0x0205D400 bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] mov r0, #0x7a lsl r0, r0, #0x2 @@ -1433,7 +1433,7 @@ _0205D926: mov r2, #0x3 bl FUN_020545B8 ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r5, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 @@ -1502,7 +1502,7 @@ FUN_0205D9A8: ; 0x0205D9A8 add r4, r0, #0x0 bl memset ldr r0, [r5, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -1511,7 +1511,7 @@ FUN_0205D9A8: ; 0x0205D9A8 bl FUN_02025838 str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] ldr r0, [r5, #0xc] bl FUN_02022504 @@ -1646,7 +1646,7 @@ FUN_0205DAEC: ; 0x0205DAEC add r4, r0, #0x0 ldr r0, [r4, #0x18] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r5, r0, #0x0 bl FUN_0205ED0C cmp r0, #0x0 @@ -1696,7 +1696,7 @@ FUN_0205DB44: ; 0x0205DB44 pop {r3-r7, pc} _0205DB54: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #0x1 bne _0205DB66 @@ -1786,7 +1786,7 @@ FUN_0205DBF0: ; 0x0205DBF0 str r0, [r4, #0x10] ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0xb str r1, [sp, #0x0] ldrh r2, [r5, #0x28] diff --git a/arm9/asm/unk_0205EC84.s b/arm9/asm/unk_0205EC84.s index 93afcc59..74662b87 100644 --- a/arm9/asm/unk_0205EC84.s +++ b/arm9/asm/unk_0205EC84.s @@ -5,24 +5,24 @@ thumb_func_start FUN_0205EC84 FUN_0205EC84: ; 0x0205EC84 - ldr r3, _0205EC88 ; =FUN_020462E4 + ldr r3, _0205EC88 ; =SetFlagInArray bx r3 .balign 4 -_0205EC88: .word FUN_020462E4 +_0205EC88: .word SetFlagInArray thumb_func_start FUN_0205EC8C FUN_0205EC8C: ; 0x0205EC8C - ldr r3, _0205EC90 ; =FUN_0204630C + ldr r3, _0205EC90 ; =ClearFlagInArray bx r3 .balign 4 -_0205EC90: .word FUN_0204630C +_0205EC90: .word ClearFlagInArray thumb_func_start FUN_0205EC94 FUN_0205EC94: ; 0x0205EC94 - ldr r3, _0205EC98 ; =FUN_020462B8 + ldr r3, _0205EC98 ; =CheckFlagInArray bx r3 .balign 4 -_0205EC98: .word FUN_020462B8 +_0205EC98: .word CheckFlagInArray thumb_func_start FUN_0205EC9C FUN_0205EC9C: ; 0x0205EC9C diff --git a/arm9/asm/unk_0205F314.s b/arm9/asm/unk_0205F314.s index 8c2f6e55..d6c97ced 100644 --- a/arm9/asm/unk_0205F314.s +++ b/arm9/asm/unk_0205F314.s @@ -18,7 +18,7 @@ FUN_0205F314: ; 0x0205F314 push {r3-r5, lr} add r5, r1, #0x0 add r4, r2, #0x0 - bl FUN_02046380 + bl GetVarAddr mov r1, #0x1 lsl r1, r1, #0xe cmp r5, r1 @@ -44,7 +44,7 @@ _0205F33C: thumb_func_start FUN_0205F344 FUN_0205F344: ; 0x0205F344 push {r3, lr} - bl FUN_02046380 + bl GetVarAddr cmp r0, #0x0 bne _0205F352 mov r0, #0x0 @@ -448,7 +448,7 @@ FUN_0205F5FC: ; 0x0205F5FC FUN_0205F618: ; 0x0205F618 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0202881C @@ -487,7 +487,7 @@ _0205F664: .word 0x00004041 thumb_func_start FUN_0205F668 FUN_0205F668: ; 0x0205F668 push {r4, lr} - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 bl LCRandom mov r1, #0x62 diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s index 0634d08d..73dc567c 100644 --- a/arm9/asm/unk_0205F7A0.s +++ b/arm9/asm/unk_0205F7A0.s @@ -24,7 +24,7 @@ FUN_0205F7A0: ; 0x0205F7A0 ldr r0, [r0, #0xc] add r5, r1, #0x0 str r2, [sp, #0x4] - bl FUN_020462AC + bl SavArray_Flags_get add r7, r0, #0x0 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] @@ -71,8 +71,8 @@ _0205F806: _0205F812: ldr r0, [sp, #0x0] bl FUN_020377AC - bl FUN_020238F4 - bl FUN_020239CC + bl Sav2_PlayerData_GetProfileAddr + bl PlayerProfile_GetTrainerGender str r0, [r5, #0xc] ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] @@ -164,7 +164,7 @@ FUN_0205F8CC: ; 0x0205F8CC ldr r0, [r7, #0xc] add r5, r1, #0x0 add r4, r2, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get str r0, [sp, #0x0] add r0, sp, #0x28 bl FS_InitFile @@ -251,7 +251,7 @@ _0205F962: _0205F98C: ldrb r1, [r6, #0x1] add r0, r7, #0x0 - bl FUN_02039528 + bl FlagCheck lsl r0, r0, #0x18 lsr r0, r0, #0x18 lsl r0, r0, #0x1e @@ -298,7 +298,7 @@ _0205F9BE: _0205F9E8: ldrb r1, [r6, #0x3] add r0, r7, #0x0 - bl FUN_02039528 + bl FlagCheck lsl r0, r0, #0x18 lsr r0, r0, #0x18 lsl r0, r0, #0x1e diff --git a/arm9/asm/unk_0205FA2C.s b/arm9/asm/unk_0205FA2C.s index c06deaff..fc7d7a17 100644 --- a/arm9/asm/unk_0205FA2C.s +++ b/arm9/asm/unk_0205FA2C.s @@ -26,10 +26,10 @@ FUN_0205FA2C: ; 0x0205FA2C add r4, r0, #0x0 bl MI_CpuFill8 add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] add r0, r6, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] add r0, r6, #0x0 bl FUN_0206F158 @@ -159,10 +159,10 @@ FUN_0205FB34: ; 0x0205FB34 add r4, r0, #0x0 bl MI_CpuFill8 add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x4] add r0, r5, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] add r0, r5, #0x0 bl FUN_0206BB28 @@ -188,7 +188,7 @@ FUN_0205FB34: ; 0x0205FB34 add r0, r4, #0x0 bl FUN_0207B000 add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_0207C2A4 @@ -389,7 +389,7 @@ _0205FD14: _0205FD1E: ldrh r1, [r4, #0x10] add r0, r5, #0x0 - bl FUN_020394B8 + bl GetVarPointer ldr r1, [r4, #0x0] strh r1, [r0, #0x0] add r0, r4, #0x0 @@ -447,7 +447,7 @@ FUN_0205FD70: ; 0x0205FD70 _0205FD96: ldrh r1, [r5, #0x2] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldrh r0, [r5, #0x0] cmp r0, #0x0 diff --git a/arm9/asm/unk_0206015C.s b/arm9/asm/unk_0206015C.s index a0436e35..296e65c5 100644 --- a/arm9/asm/unk_0206015C.s +++ b/arm9/asm/unk_0206015C.s @@ -85,7 +85,7 @@ _020601F2: b _02060332 _020601FE: ldr r0, [r6, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldrb r1, [r4, #0xd] cmp r1, #0x0 bne _02060210 diff --git a/arm9/asm/unk_02060344.s b/arm9/asm/unk_02060344.s index 89d2f88e..8f67bca3 100644 --- a/arm9/asm/unk_02060344.s +++ b/arm9/asm/unk_02060344.s @@ -14,7 +14,7 @@ FUN_02060344: ; 0x02060344 bl FUN_02029ACC add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r0, [sp, #0x0] mov r1, #0xa @@ -24,7 +24,7 @@ FUN_02060344: ; 0x02060344 _0206036A: add r0, r7, #0x0 add r1, r5, #0x0 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 beq _020603A4 add r0, r5, #0x0 diff --git a/arm9/asm/unk_020603B0.s b/arm9/asm/unk_020603B0.s index 5788ef4f..7550dc1d 100644 --- a/arm9/asm/unk_020603B0.s +++ b/arm9/asm/unk_020603B0.s @@ -219,14 +219,14 @@ _020604D0: add r2, r6, #0x0 bl FUN_0202AAFC ldr r0, [sp, #0x10] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x18] mov r0, #0x4 bl AllocMonZeroed str r0, [sp, #0x1c] bl ZeroMonData ldr r0, [sp, #0x18] - bl FUN_020239C0 + bl PlayerProfile_GetTrainerID_VisibleHalf mov r1, #0x0 str r1, [sp, #0x0] str r1, [sp, #0x4] diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index cd102e3a..11145e7b 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -1643,11 +1643,11 @@ FUN_02061850: ; 0x02061850 push {r3-r5, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_02023924 + bl PlayerProfile_sizeof str r0, [r5, #0x0] add r0, r4, #0x0 add r1, r5, #0x4 - bl FUN_0202393C + bl PlayerProfile_Copy pop {r3-r5, pc} .balign 4 @@ -1659,7 +1659,7 @@ FUN_02061868: ; 0x02061868 add r5, r1, #0x0 bl MOD06_02248B60 add r4, r0, #0x0 - bl FUN_02023924 + bl PlayerProfile_sizeof ldr r1, [r4, #0x0] cmp r1, r0 beq _02061884 @@ -1823,7 +1823,7 @@ FUN_02061990: ; 0x02061990 pop {r3-r5, pc} _020619B0: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x2 mov r2, #0x11 bl FUN_0205F2E4 @@ -2158,7 +2158,7 @@ _02061C42: FUN_02061C48: ; 0x02061C48 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x2 mov r2, #0x11 bl FUN_0205F2E4 @@ -2172,7 +2172,7 @@ FUN_02061C5C: ; 0x02061C5C add r5, r0, #0x0 ldr r0, [r5, #0xc] add r4, r1, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get bl FUN_0204A20C add r1, sp, #0x8 add r2, sp, #0x4 @@ -3081,7 +3081,7 @@ FUN_0206234C: ; 0x0206234C push {r3-r7, lr} sub sp, #0x88 ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get ldr r4, _020623E8 ; =UNK_020F7658 add r7, r0, #0x0 mov r6, #0x0 @@ -3221,7 +3221,7 @@ _0206245C: .word UNK_020F79EE FUN_02062460: ; 0x02062460 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x2 mov r2, #0x9 bl FUN_0205F2E4 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 618ef08b..5179b667 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -100,11 +100,11 @@ FUN_020625EC: ; 0x020625EC lsl r1, r1, #0x4 str r0, [r4, r1] add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02024FF4 strh r0, [r4, #0x1a] add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025084 strh r0, [r4, #0x1c] str r4, [r7, #0x8] @@ -1734,7 +1734,7 @@ _02063318: ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x44] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x30] mov r1, #0x0 str r0, [sp, #0x0] @@ -1764,7 +1764,7 @@ _02063318: lsl r2, r2, #0x2 add r2, r4, r2 ldr r2, [r2, #0xc] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x0 ldr r1, [r4, #0x34] add r2, r0, #0x0 diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s index 1fa7aeb0..431828e8 100644 --- a/arm9/asm/unk_0206367C.s +++ b/arm9/asm/unk_0206367C.s @@ -16,7 +16,7 @@ FUN_02063684: ; 0x02063684 add r5, r0, #0x0 bl FUN_02063818 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x0 bl FUN_0205F264 ldr r1, [r5, #0x1c] @@ -32,7 +32,7 @@ FUN_02063684: ; 0x02063684 add r0, #0x74 strh r1, [r0, #0x0] ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x0 bne _020636DA @@ -63,10 +63,10 @@ FUN_020636DC: ; 0x020636DC bl FUN_0206384C _020636F8: ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F254 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get mov r1, #0x0 bl FUN_0205F264 ldr r1, [r5, #0x1c] @@ -92,7 +92,7 @@ _020636F8: cmp r0, #0x0 bne _02063758 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 bl FUN_0205F284 add r0, r4, #0x0 @@ -140,7 +140,7 @@ FUN_020637A8: ; 0x020637A8 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F204 ldr r0, [r4, #0xc] bl FUN_0202A9B0 @@ -153,7 +153,7 @@ FUN_020637C4: ; 0x020637C4 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F204 ldr r0, [r4, #0xc] bl FUN_0202A9B0 @@ -165,7 +165,7 @@ FUN_020637C4: ; 0x020637C4 FUN_020637E0: ; 0x020637E0 push {r3, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F204 pop {r3, pc} .balign 4 @@ -174,7 +174,7 @@ FUN_020637E0: ; 0x020637E0 FUN_020637F0: ; 0x020637F0 push {r4, lr} ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get add r4, r0, #0x0 bl FUN_0205ED2C add r0, r4, #0x0 @@ -232,7 +232,7 @@ FUN_0206384C: ; 0x0206384C cmp r6, r4 beq _02063882 ldr r0, [r5, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x20 add r5, #0x98 str r1, [sp, #0x0] diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s index 79c9b817..28b6db5b 100644 --- a/arm9/asm/unk_02063948.s +++ b/arm9/asm/unk_02063948.s @@ -210,9 +210,9 @@ FUN_02063A9C: ; 0x02063A9C pop {r4, pc} _02063AAE: ldr r0, [r1, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x1 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063AC2 mov r0, #0x2 @@ -294,9 +294,9 @@ FUN_02063B40: ; 0x02063B40 pop {r4, pc} _02063B52: ldr r0, [r1, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x2 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063B66 mov r0, #0x2 @@ -311,7 +311,7 @@ _02063B66: _02063B74: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0x1 bne _02063B88 @@ -320,13 +320,13 @@ _02063B74: _02063B88: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x1 beq _02063BA8 ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #0x1 bne _02063BAC @@ -398,9 +398,9 @@ FUN_02063C14: ; 0x02063C14 pop {r4, pc} _02063C26: ldr r0, [r1, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x4 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063C3A mov r0, #0x2 @@ -423,7 +423,7 @@ _02063C4A: _02063C56: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0x1 bne _02063C6A @@ -501,9 +501,9 @@ FUN_02063CE0: ; 0x02063CE0 pop {r4, pc} _02063CF2: ldr r0, [r1, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x5 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063D06 mov r0, #0x2 @@ -587,9 +587,9 @@ FUN_02063D88: ; 0x02063D88 pop {r4, pc} _02063D9A: ldr r0, [r1, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x3 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063DAE mov r0, #0x2 @@ -673,9 +673,9 @@ FUN_02063E30: ; 0x02063E30 pop {r4, pc} _02063E42: ldr r0, [r1, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x0 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063E56 mov r0, #0x2 @@ -759,9 +759,9 @@ FUN_02063ED8: ; 0x02063ED8 pop {r4, pc} _02063EEA: ldr r0, [r1, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x7 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063EFE mov r0, #0x2 @@ -845,9 +845,9 @@ FUN_02063F80: ; 0x02063F80 pop {r4, pc} _02063F92: ldr r0, [r1, #0xc] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0x6 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 bne _02063FA6 mov r0, #0x2 @@ -862,7 +862,7 @@ _02063FA6: _02063FB2: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0x1 bne _02063FC6 @@ -1023,7 +1023,7 @@ _020640DE: _020640EC: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0x1 bne _02064100 @@ -1032,13 +1032,13 @@ _020640EC: _02064100: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F214 cmp r0, #0x1 beq _02064120 ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #0x1 bne _02064124 @@ -1138,7 +1138,7 @@ _020641D2: _020641D6: ldr r0, [r4, #0x4] ldr r0, [r0, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED3C cmp r0, #0x1 bne _020641EA @@ -1228,7 +1228,7 @@ FUN_02064284: ; 0x02064284 pop {r3, pc} _02064294: ldr r0, [r1, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F244 cmp r0, #0x1 bne _020642A6 diff --git a/arm9/asm/unk_0206439C.s b/arm9/asm/unk_0206439C.s index 76ea9f7f..4cc91f4f 100644 --- a/arm9/asm/unk_0206439C.s +++ b/arm9/asm/unk_0206439C.s @@ -12,7 +12,7 @@ FUN_0206439C: ; 0x0206439C bl AllocFromHeapAtEnd add r4, r0, #0x0 add r0, r6, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r5, #0x0 bl GetPartyMonByIndex str r0, [r4, #0x0] diff --git a/arm9/asm/unk_02064CA8.s b/arm9/asm/unk_02064CA8.s index 849b9597..3af0633e 100644 --- a/arm9/asm/unk_02064CA8.s +++ b/arm9/asm/unk_02064CA8.s @@ -47,7 +47,7 @@ FUN_02064CC8: ; 0x02064CC8 cmp r0, #0x16 bne _02064D08 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ECEC cmp r0, #0x0 beq _02064D02 diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s index 52f5e4c1..e645d179 100644 --- a/arm9/asm/unk_02064E90.s +++ b/arm9/asm/unk_02064E90.s @@ -16,7 +16,7 @@ FUN_02064E90: ; 0x02064E90 ldr r5, [sp, #0xbc] bl FUN_020377AC str r0, [sp, #0x20] - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r0, [sp, #0x20] bl FUN_02029FC8 @@ -36,16 +36,16 @@ FUN_02064E90: ; 0x02064E90 mov r1, #GAME_VERSION bl FUN_02065154 add r0, r7, #0x0 - bl FUN_020239C0 + bl PlayerProfile_GetTrainerID_VisibleHalf str r0, [sp, #0x28] add r0, r7, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender str r0, [sp, #0x2c] add r0, r7, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr str r0, [sp, #0x30] add r0, r7, #0x0 - bl FUN_02023A10 + bl PlayerProfile_GetMoney str r0, [sp, #0x34] ldr r0, [r6, #0xc] bl FUN_02024DA0 @@ -71,7 +71,7 @@ FUN_02064E90: ; 0x02064E90 str r5, [sp, #0xc] bl FUN_02065178 ldr r0, [sp, #0x20] - bl FUN_02023918 + bl Sav2_PlayerData_GetIGTAddr str r0, [sp, #0x40] add r0, r6, #0x0 add r1, sp, #0x90 @@ -82,7 +82,7 @@ FUN_02064E90: ; 0x02064E90 add r2, sp, #0x74 bl FUN_0204B30C ldr r0, [r6, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED0C add r1, sp, #0x74 str r1, [sp, #0x0] @@ -223,7 +223,7 @@ FUN_02065078: ; 0x02065078 bl FUN_02029FC8 add r6, r0, #0x0 add r0, r7, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get add r5, r0, #0x0 add r0, r7, #0x0 bl FUN_02026CB4 @@ -385,10 +385,10 @@ FUN_020651BC: ; 0x020651BC add r5, r2, #0x0 add r6, r3, #0x0 ldr r7, [sp, #0x20] - bl FUN_02029EBC + bl GetIGTHours strh r0, [r4, #0x2a] ldr r0, [sp, #0x4] - bl FUN_02029EC0 + bl GetIGTMinutes add r1, r4, #0x0 add r1, #0x2e strb r0, [r1, #0x0] @@ -520,7 +520,7 @@ FUN_020652AC: ; 0x020652AC _020652CA: ldr r0, [sp, #0x0] add r1, r4, #0x0 - bl FUN_020239D0 + bl PlayerProfile_TestBadgeFlag cmp r0, #0x0 beq _020652E6 lsl r0, r4, #0x2 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 7dab8c17..452513ab 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -66,11 +66,11 @@ FUN_020653EC: ; 0x020653EC mov r1, #0xff add r6, r0, #0x0 strb r1, [r4, #0x1a] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02024FF4 strb r0, [r4, #0x16] add r0, r6, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025084 strh r0, [r4, #0x14] add r0, r4, #0x0 @@ -1808,7 +1808,7 @@ FUN_020661F8: ; 0x020661F8 lsl r0, r0, #0x2 ldr r0, [r5, r0] bl FUN_020377AC - bl FUN_0206BB1C + bl SavArray_PlayerParty_get add r1, r7, #0x0 bl GetPartyMonByIndex add r2, r0, #0x0 @@ -2101,7 +2101,7 @@ _02066426: add r2, #0x10 ldr r1, [r5, r1] ldr r2, [r3, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r0, #0x45 lsl r0, r0, #0x2 ldr r2, [r5, r0] @@ -2377,7 +2377,7 @@ _02066676: lsl r0, r0, #0x2 ldr r0, [r5, r0] bl FUN_020377AC - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r4, #0x0] mov r0, #0x5b lsl r0, r0, #0x2 @@ -2389,7 +2389,7 @@ _02066676: lsl r0, r0, #0x2 ldr r0, [r5, r0] bl FUN_020377AC - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] mov r0, #0x5b lsl r0, r0, #0x2 diff --git a/arm9/asm/unk_02066840.s b/arm9/asm/unk_02066840.s index a7031b20..52fefe54 100644 --- a/arm9/asm/unk_02066840.s +++ b/arm9/asm/unk_02066840.s @@ -13,7 +13,7 @@ FUN_02066840: ; 0x02066840 add r6, r0, #0x0 str r1, [sp, #0x0] add r7, r2, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r6, #0x0 bl FUN_02029AFC @@ -26,13 +26,13 @@ FUN_02066840: ; 0x02066840 mov r2, #0xe4 bl MI_CpuFill8 add r0, r4, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r7, #0x0 add r1, #0xa8 mov r2, #0x10 bl MI_CpuCopy8 add r0, r4, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID add r1, r7, #0x0 add r1, #0xbc str r0, [r1, #0x0] @@ -57,7 +57,7 @@ FUN_02066840: ; 0x02066840 add r1, #0xbb strb r0, [r1, #0x0] add r0, r4, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r7, #0x0 add r1, #0xc8 lsl r0, r0, #0x18 diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s index cd1030b7..ddce6b39 100644 --- a/arm9/asm/unk_0206ABC4.s +++ b/arm9/asm/unk_0206ABC4.s @@ -334,7 +334,7 @@ FUN_0206AE0C: ; 0x0206AE0C add r0, r4, r6 ldr r0, [r0, #0x4] mov r1, #0x6 - bl FUN_0206B8CC + bl InitPartyWithMaxSize add r0, r5, #0x0 mov r1, #0x60 bl AllocFromHeap @@ -447,7 +447,7 @@ _0206AECE: ldr r0, [sp, #0x24] ldr r1, [sp, #0x40] ldr r0, [r0, #0x4] - bl FUN_0206B900 + bl AddMonToParty ldr r0, [sp, #0x28] add r0, r0, #0x6 str r0, [sp, #0x28] @@ -543,7 +543,7 @@ _0206AFB0: ldr r0, [sp, #0x2c] ldr r1, [sp, #0x40] ldr r0, [r0, #0x4] - bl FUN_0206B900 + bl AddMonToParty ldr r0, [sp, #0x30] add r0, #0xe str r0, [sp, #0x30] @@ -626,7 +626,7 @@ _0206B030: ldr r0, [sp, #0x34] ldr r1, [sp, #0x40] ldr r0, [r0, #0x4] - bl FUN_0206B900 + bl AddMonToParty ldr r0, [sp, #0x1c] add r7, #0x8 add r0, r0, #0x1 @@ -725,7 +725,7 @@ _0206B120: ldr r0, [sp, #0x38] ldr r1, [sp, #0x40] ldr r0, [r0, #0x4] - bl FUN_0206B900 + bl AddMonToParty ldr r0, [sp, #0x3c] add r0, #0x10 str r0, [sp, #0x3c] diff --git a/arm9/asm/unk_0206BF90.s b/arm9/asm/unk_0206BF90.s index bab339f2..b6551933 100644 --- a/arm9/asm/unk_0206BF90.s +++ b/arm9/asm/unk_0206BF90.s @@ -76,17 +76,17 @@ FUN_0206C004: ; 0x0206C004 thumb_func_start FUN_0206C008 FUN_0206C008: ; 0x0206C008 - ldr r3, _0206C00C ; =FUN_02023924 + ldr r3, _0206C00C ; =PlayerProfile_sizeof bx r3 .balign 4 -_0206C00C: .word FUN_02023924 +_0206C00C: .word PlayerProfile_sizeof thumb_func_start FUN_0206C010 FUN_0206C010: ; 0x0206C010 - ldr r3, _0206C014 ; =FUN_0206B8A4 + ldr r3, _0206C014 ; =SavArray_Party_sizeof bx r3 .balign 4 -_0206C014: .word FUN_0206B8A4 +_0206C014: .word SavArray_Party_sizeof thumb_func_start FUN_0206C018 FUN_0206C018: ; 0x0206C018 @@ -394,7 +394,7 @@ _0206C210: add r0, #0xf8 ldr r0, [r0, #0x0] add r1, r4, #0x0 - bl FUN_0202393C + bl PlayerProfile_Copy mov r0, #0x1 pop {r4, pc} .balign 4 @@ -418,7 +418,7 @@ _0206C238: mov r0, #0x0 pop {r4, pc} _0206C246: - bl FUN_02023924 + bl PlayerProfile_sizeof add r4, #0x20 add r2, r0, #0x0 mov r0, #0x19 @@ -514,7 +514,7 @@ _0206C2E8: add r4, #0x20 ldr r0, [r0, #0x4] add r1, r4, #0x0 - bl FUN_0206BAD0 + bl CopyPlayerParty mov r0, #0x1 pop {r4, pc} @@ -537,7 +537,7 @@ _0206C30C: mov r0, #0x0 pop {r4, pc} _0206C31A: - bl FUN_0206B8A4 + bl SavArray_Party_sizeof add r4, #0x20 add r2, r0, #0x0 mov r0, #0x1b @@ -788,7 +788,7 @@ _0206C4DA: add r5, #0x20 ldr r0, [r0, #0x4] add r1, r5, #0x0 - bl FUN_0206BAD0 + bl CopyPlayerParty mov r0, #0x1 pop {r3-r5, pc} .balign 4 @@ -817,7 +817,7 @@ _0206C508: _0206C518: cmp r4, #0x1 bne _0206C52E - bl FUN_0206B8A4 + bl SavArray_Party_sizeof add r5, #0x20 add r2, r0, #0x0 mov r0, #0x1f @@ -825,7 +825,7 @@ _0206C518: bl FUN_02030A78 pop {r4-r6, pc} _0206C52E: - bl FUN_0206B8A4 + bl SavArray_Party_sizeof add r5, #0x20 add r2, r0, #0x0 mov r0, #0x20 @@ -990,12 +990,12 @@ FUN_0206C66C: ; 0x0206C66C add r4, r2, #0x0 add r6, r0, #0x0 add r5, r1, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr add r1, r0, #0x0 add r0, r4, #0x0 bl CopyU16StringArray add r0, r6, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID str r0, [r4, #0x10] add r0, r6, #0x0 bl FUN_02023A70 @@ -1004,7 +1004,7 @@ FUN_0206C66C: ; 0x0206C66C bl FUN_02023A68 strb r0, [r4, #0x15] add r0, r6, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender strb r0, [r4, #0x16] mov r0, #0x0 add r1, r4, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 52e88375..94b4217b 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2195,7 +2195,7 @@ _0206D8EA: bl CalcMonLevelAndStats ldr r0, [r4, #0x24] add r1, r5, #0x0 - bl FUN_0206B900 + bl AddMonToParty ldr r0, [r4, #0x48] add r1, r5, #0x0 bl FUN_02024AF0 @@ -2668,7 +2668,7 @@ FUN_0206DD6C: ; 0x0206DD6C ldr r0, [r4, #0xc] ldr r1, [r4, #0x10] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl FreeToHeap ldr r0, [r4, #0x4] @@ -2719,7 +2719,7 @@ _0206DDDC: b _0206DDFA _0206DDE4: ldr r0, _0206DE00 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM b _0206DDFA _0206DDEC: ldr r0, _0206DE04 ; =0x000005E6 @@ -2727,7 +2727,7 @@ _0206DDEC: b _0206DDFA _0206DDF4: ldr r0, _0206DE08 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM _0206DDFA: add r0, r4, #0x0 pop {r4, pc} diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s index d46ad82e..264f9294 100644 --- a/arm9/asm/unk_0206E2F0.s +++ b/arm9/asm/unk_0206E2F0.s @@ -127,8 +127,8 @@ FUN_0206E394: ; 0x0206E394 thumb_func_start FUN_0206E39C FUN_0206E39C: ; 0x0206E39C push {r3, lr} - bl FUN_0202390C - bl FUN_02028930 + bl Sav2_PlayerData_GetCoinsAddr + bl CheckCoins pop {r3, pc} thumb_func_start FUN_0206E3A8 @@ -295,7 +295,7 @@ _0206E4FA: ldr r1, [sp, #0x8] add r0, r4, #0x0 add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor add r0, r4, #0x0 @@ -364,7 +364,7 @@ _0206E56A: add r0, r4, #0x0 add r1, r5, #0x0 add r2, r6, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0x0 bl String_dtor add r0, r4, #0x0 diff --git a/arm9/asm/unk_0206EB80.s b/arm9/asm/unk_0206EB80.s index 26e15f21..bca18f77 100644 --- a/arm9/asm/unk_0206EB80.s +++ b/arm9/asm/unk_0206EB80.s @@ -849,11 +849,11 @@ _0206F154: .word 0x000004EC thumb_func_start FUN_0206F158 FUN_0206F158: ; 0x0206F158 - ldr r3, _0206F160 ; =FUN_02022610 + ldr r3, _0206F160 ; =SavArray_get mov r1, #0x3 bx r3 nop -_0206F160: .word FUN_02022610 +_0206F160: .word SavArray_get thumb_func_start FUN_0206F164 FUN_0206F164: ; 0x0206F164 diff --git a/arm9/asm/unk_0206F1F0.s b/arm9/asm/unk_0206F1F0.s index 3c1bc967..cdb5db18 100644 --- a/arm9/asm/unk_0206F1F0.s +++ b/arm9/asm/unk_0206F1F0.s @@ -82,7 +82,7 @@ _0206F26C: cmp r0, #0x0 beq _0206F280 ldr r0, [r5, #0xc] - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F304 _0206F280: ldr r0, [r4, #0x0] diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index d5e109fb..4dc1be07 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -4404,7 +4404,7 @@ _02071630: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -5065,7 +5065,7 @@ _02071B34: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -5586,7 +5586,7 @@ _02071FA0: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r4, #0xb b _02072054 _02071FF2: @@ -5623,7 +5623,7 @@ _02071FF2: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r4, #0x9 b _02072054 _02072044: @@ -5893,7 +5893,7 @@ _02072246: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders _02072282: mov r0, #0x89 lsl r0, r0, #0x2 @@ -6014,7 +6014,7 @@ FUN_0207230C: ; 0x0207230C add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders b _020723D6 _02072388: ldr r0, _02072410 ; =0x000005A4 @@ -6050,7 +6050,7 @@ _02072388: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders _020723D6: mov r0, #0x89 lsl r0, r0, #0x2 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index e4f28bfe..3479c659 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -416,7 +416,7 @@ FUN_020727FC: ; 0x020727FC add r1, #0xc ldr r1, [r2, r1] add r2, r6, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0x0 bl String_dtor pop {r3-r7, pc} @@ -603,7 +603,7 @@ _0207297E: add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor pop {r4-r6, pc} @@ -667,7 +667,7 @@ FUN_02072A00: ; 0x02072A00 add r2, #0x60 ldr r1, [r1, r2] add r2, r6, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0x0 bl String_dtor pop {r3-r7, pc} @@ -1717,7 +1717,7 @@ _020732A6: b _020732BE _020732AE: ldr r0, _020732C8 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM b _020732BE _020732B6: ldr r0, _020732C4 ; =0x000005E6 @@ -2097,7 +2097,7 @@ _0207356C: ldr r0, [r5, r0] ldr r1, [r5, r1] ldr r2, [sp, #0x1c] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r0, [sp, #0x1c] bl String_dtor ldr r1, _02073638 ; =0x000006A4 @@ -2187,7 +2187,7 @@ _0207366E: ldr r0, [r5, r0] ldr r1, [r5, r1] ldr r2, [sp, #0xc] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, _020736F0 ; =0x000006A4 mov r0, #0x0 ldr r1, [r5, r1] diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 98d5417f..cf11907a 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -222,7 +222,7 @@ FUN_02073EEC: ; 0x02073EEC add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders b _02074018 _02073F66: ldr r0, [r5, r0] @@ -280,7 +280,7 @@ _02073F66: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r1, _0207404C ; =0x00000B25 mov r2, #0x2c ldrb r3, [r5, r1] @@ -1226,7 +1226,7 @@ _020747CE: ldrb r1, [r4, r1] ldrb r2, [r4, r2] ldr r0, [r0, #0x0] - bl FUN_0206BA38 + bl SwapSlotsInParty ldr r0, _02074840 ; =0x000005C8 mov r1, #0x1 ldr r0, [r5, r0] diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index a17d5fd5..d2c20b95 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -426,7 +426,7 @@ _0207586C: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -442,7 +442,7 @@ _02075890: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -458,7 +458,7 @@ _020758B4: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -474,7 +474,7 @@ _020758D8: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -490,7 +490,7 @@ _020758FC: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -506,7 +506,7 @@ _02075920: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -522,7 +522,7 @@ _02075944: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -538,7 +538,7 @@ _02075968: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -560,7 +560,7 @@ _0207598C: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -582,7 +582,7 @@ _020759BE: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -604,7 +604,7 @@ _020759F0: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -626,7 +626,7 @@ _02075A22: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -648,7 +648,7 @@ _02075A54: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -670,7 +670,7 @@ _02075A86: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -693,7 +693,7 @@ _02075AB8: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -716,7 +716,7 @@ _02075AEC: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -739,7 +739,7 @@ _02075B20: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -762,7 +762,7 @@ _02075B54: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -791,7 +791,7 @@ _02075B98: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -814,7 +814,7 @@ _02075BCA: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -836,7 +836,7 @@ _02075BFE: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r6, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0x0 bl String_dtor pop {r4-r6, pc} @@ -1311,7 +1311,7 @@ _02075FDA: add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r7, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r7, #0x0 bl String_dtor ldr r0, [sp, #0x8] @@ -1594,7 +1594,7 @@ _02076212: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r6, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0x0 bl String_dtor ldr r7, _020763E0 ; =0x00000B25 @@ -1901,7 +1901,7 @@ FUN_0207640C: ; 0x0207640C add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r7, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r7, #0x0 bl String_dtor add r0, r4, #0x0 @@ -2109,7 +2109,7 @@ _020766BA: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2156,7 +2156,7 @@ _02076724: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2223,7 +2223,7 @@ _020767A4: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2353,7 +2353,7 @@ _020768E6: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2390,7 +2390,7 @@ FUN_02076950: ; 0x02076950 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2428,7 +2428,7 @@ FUN_020769A4: ; 0x020769A4 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2468,7 +2468,7 @@ FUN_020769FC: ; 0x020769FC add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2503,7 +2503,7 @@ FUN_02076A48: ; 0x02076A48 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2650,7 +2650,7 @@ _02076B68: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2679,7 +2679,7 @@ _02076BB2: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2708,7 +2708,7 @@ _02076BF2: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2738,7 +2738,7 @@ _02076C34: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2821,7 +2821,7 @@ _02076CDC: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2881,7 +2881,7 @@ FUN_02076D3C: ; 0x02076D3C add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2924,7 +2924,7 @@ FUN_02076DD4: ; 0x02076DD4 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2962,7 +2962,7 @@ FUN_02076E28: ; 0x02076E28 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -3002,7 +3002,7 @@ FUN_02076E80: ; 0x02076E80 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -3040,7 +3040,7 @@ FUN_02076ED4: ; 0x02076ED4 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -3163,7 +3163,7 @@ FUN_02076FB0: ; 0x02076FB0 add r1, #0x8 ldr r1, [r5, r1] add r2, r7, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r7, #0x0 bl String_dtor cmp r4, #0x0 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 32848371..5dd4a4a5 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -49,7 +49,7 @@ UNK_020FA6E8: ; 0x020FA6E8 thumb_func_start FUN_02079C70 FUN_02079C70: ; 0x02079C70 push {r3, lr} - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205F184 pop {r3, pc} @@ -1871,7 +1871,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r2, r2, #0x4 ldr r1, [r7, r1] ldr r2, [r7, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r2, _0207AEAC ; =0x00000674 mov r1, #0x0 ldr r0, [r7, r2] @@ -1890,7 +1890,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r2, r2, #0x4 ldr r1, [r7, r1] ldr r2, [r7, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders ldr r2, _0207AEAC ; =0x00000674 mov r1, #0xe ldr r0, [r7, r2] @@ -1909,7 +1909,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r2, r2, #0x4 ldr r1, [r7, r1] ldr r2, [r7, r2] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0x0 mov r1, #0x6 mov r2, #0x0 @@ -4778,13 +4778,13 @@ FUN_0207C2A4: ; 0x0207C2A4 add r4, r1, #0x0 add r5, r0, #0x0 add r0, r4, #0x0 - bl FUN_0202398C + bl PlayerProfile_GetNamePtr str r0, [r5, #0x8] add r0, r4, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID str r0, [r5, #0xc] add r0, r4, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender strb r0, [r5, #0x10] pop {r3-r5, pc} diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 28f9597d..3163b4c6 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -410,7 +410,7 @@ FUN_0207D800: ; 0x0207D800 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -463,7 +463,7 @@ FUN_0207D8A0: ; 0x0207D8A0 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor b _0207D8F2 @@ -672,7 +672,7 @@ FUN_0207DA48: ; 0x0207DA48 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor add sp, #0x8 @@ -1767,7 +1767,7 @@ FUN_0207E200: ; 0x0207E200 ldr r0, [r4, r1] add r1, r1, #0x4 ldr r1, [r4, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor mov r1, #0x91 @@ -2299,7 +2299,7 @@ FUN_0207E840: ; 0x0207E840 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor mov r1, #0x1a @@ -2386,7 +2386,7 @@ FUN_0207E840: ; 0x0207E840 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r6, #0x0 bl String_dtor mov r1, #0x1a diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 7269a626..496486d7 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -606,7 +606,7 @@ FUN_02080108: ; 0x02080108 ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor add sp, #0x8 @@ -764,7 +764,7 @@ _0208036E: ldr r0, [r4, #0x8] ldr r1, [r4, #0x20] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 bl String_dtor add sp, #0x8 @@ -881,7 +881,7 @@ _02080478: ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 bl String_dtor add sp, #0x8 @@ -1711,14 +1711,14 @@ FUN_02080AE4: ; 0x02080AE4 add r5, r0, #0x0 add r0, r4, #0x0 add r6, r2, #0x0 - bl FUN_020239BC + bl PlayerProfile_GetTrainerID str r0, [sp, #0x4] add r0, r4, #0x0 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender str r0, [sp, #0x0] add r0, r4, #0x0 add r1, r6, #0x0 - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x7 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index e61283e8..55901920 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -106,16 +106,16 @@ _02080CA6: b _02080DF2 _02080CB4: ldr r0, [r6, #0xc] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get mov r1, #0x0 bl GetPartyMonByIndex add r7, r0, #0x0 add r0, r6, #0x0 bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr mov r1, #0xb str r0, [sp, #0x0] - bl FUN_020239A0 + bl PlayerProfile_GetPlayerName_NewString add r5, r0, #0x0 mov r1, #0x0 add r0, sp, #0x4 @@ -131,7 +131,7 @@ _02080CB4: bl FUN_02027E24 str r0, [sp, #0x18] ldr r0, [r6, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x1c] add r0, sp, #0x4 bl FUN_02081214 @@ -899,7 +899,7 @@ _020812B6: mov r1, #0xb bl FUN_02082ED0 mov r0, #0x14 - bl FUN_0206B8AC + bl SavArray_Party_alloc mov r1, #0x56 lsl r1, r1, #0x2 str r0, [r4, r1] @@ -943,7 +943,7 @@ _02081304: ldr r1, [r6, #0xc] bl StringCopy ldr r0, [r6, #0x10] - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender mov r1, #0x42 lsl r1, r1, #0x2 strb r0, [r4, r1] @@ -962,7 +962,7 @@ _02081304: cmp r0, #0x0 ldr r0, [r6, #0x10] bne _0208138E - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender cmp r0, #0x0 bne _02081384 mov r1, #0xba @@ -977,7 +977,7 @@ _02081384: strh r1, [r4, r0] b _020813A8 _0208138E: - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender cmp r0, #0x0 bne _020813A0 mov r0, #0x45 @@ -1792,7 +1792,7 @@ _020819A2: add r1, #0xe8 ldr r1, [r1, #0x0] add r0, r7, #0x0 - bl FUN_02023990 + bl PlayerName_FlatToString ldr r0, _020819F0 ; =0x00000127 add r5, r5, #0x1 ldrb r0, [r4, r0] @@ -2262,7 +2262,7 @@ _02081D3C: _02081D4C: add r0, r5, #0x0 bl FUN_0202DFA4 - bl FUN_020239CC + bl PlayerProfile_GetTrainerGender add r1, r4, r5 strb r0, [r1, r7] ldrb r0, [r4, r6] @@ -3547,7 +3547,7 @@ _02082666: b _02082774 _02082672: ldr r0, [r4, r0] - bl FUN_020462AC + bl SavArray_Flags_get add r6, r0, #0x0 ldr r0, _02082840 ; =0x00000121 ldrb r1, [r4, r0] diff --git a/arm9/asm/unk_02083B84.s b/arm9/asm/unk_02083B84.s index a0e5d7ca..9049ff02 100644 --- a/arm9/asm/unk_02083B84.s +++ b/arm9/asm/unk_02083B84.s @@ -64,7 +64,7 @@ FUN_02083BAC: ; 0x02083BAC ldr r0, [r4, #0x58] add r0, r0, #0x1 str r0, [r4, #0x58] - bl FUN_0206B8A4 + bl SavArray_Party_sizeof mov r1, #0x59 ldr r2, [r4, #0x58] lsl r1, r1, #0x4 diff --git a/arm9/asm/unk_02085338.s b/arm9/asm/unk_02085338.s index 303ad31a..22c3f7ab 100644 --- a/arm9/asm/unk_02085338.s +++ b/arm9/asm/unk_02085338.s @@ -22,7 +22,7 @@ FUN_02085338: ; 0x02085338 bl FUN_02013B5C str r0, [r4, #0x10] add r0, r6, #0x0 - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ED0C strb r0, [r4, #0x4] mov r1, #0x0 @@ -31,7 +31,7 @@ FUN_02085338: ; 0x02085338 strb r0, [r4, #0x2] add r0, r6, #0x0 strb r1, [r4, #0x3] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr bl FUN_02025084 str r0, [r4, #0x8] cmp r5, #0x2 diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index 959d633f..b783b730 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -433,7 +433,7 @@ FUN_020857F8: ; 0x020857F8 bl FUN_020856F0 str r0, [r4, #0x10] ldr r0, [r5, #0x10] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr ldr r1, [r4, #0x10] str r0, [r1, #0x4] ldrh r0, [r5, #0x0] diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index e810dde1..410345d4 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -571,7 +571,7 @@ _02085DDC: mov r1, #0x0 bl FUN_02085D8C ldr r0, [r6, #0x10] - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r7, #0x1c] bl GetPartyCount mov r4, #0x0 @@ -756,7 +756,7 @@ _02085F5E: str r0, [r4, #0x8] bl memset add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr ldr r1, [r4, #0x8] str r0, [r1, #0x24] ldr r0, [r4, #0x8] diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 98f5d44f..4945183c 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -275,7 +275,7 @@ _020862D6: add r6, r0, #0x0 ldr r5, [r4, #0xc] bl FUN_020377AC - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r0, [r6, #0x1c] ldr r0, [r0, #0x0] @@ -323,7 +323,7 @@ _0208633A: add r7, r0, #0x0 add r0, r6, #0x0 bl FUN_020377AC - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x0] mov r0, #0xb mov r1, #0x1 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 7c862646..598bb827 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -594,7 +594,7 @@ FUN_020867EC: ; 0x020867EC ldr r2, [sp, #0x14] add r0, r5, #0x0 add r1, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders mov r3, #0x0 str r3, [sp, #0x0] str r6, [sp, #0x4] diff --git a/arm9/asm/unk_02086FA8.s b/arm9/asm/unk_02086FA8.s index e728ee4a..8cc246e9 100644 --- a/arm9/asm/unk_02086FA8.s +++ b/arm9/asm/unk_02086FA8.s @@ -185,7 +185,7 @@ _0208710E: cmp r0, #0x0 bne _0208712A ldr r0, _02087244 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM ldr r0, [r4, #0x5c] add r0, r0, #0x1 str r0, [r4, #0x5c] @@ -470,7 +470,7 @@ _02087362: cmp r0, #0x0 bne _0208737E ldr r0, _02087498 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM ldr r0, [r4, #0x5c] add r0, r0, #0x1 str r0, [r4, #0x5c] diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index 644d8dc5..46f48b7a 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -60,16 +60,16 @@ FUN_02087D00: ; 0x02087D00 bl FUN_02028048 str r0, [r7, #0x8] add r0, r4, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [r7, #0xc] add r0, r4, #0x0 - bl FUN_0206BB1C + bl SavArray_PlayerParty_get str r0, [r7, #0x10] add r0, r4, #0x0 bl FUN_0206F158 str r0, [r7, #0x14] add r0, r4, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r7, #0x18] add r0, r5, #0x0 bl FUN_02027E5C diff --git a/arm9/asm/unk_02088814.s b/arm9/asm/unk_02088814.s index 8e6bf6a1..1e955a77 100644 --- a/arm9/asm/unk_02088814.s +++ b/arm9/asm/unk_02088814.s @@ -81,7 +81,7 @@ UNK_020FD1C4: ; 0x020FD1C4 .word FUN_02050A48, FUN_0202DA84, 0x00000000 .word MOD18_02247414, FUN_0202DA84, 0x00000000 .word MOD18_02247428, MOD18_02247470, 0x00000000 - .word FUN_020526B4, FUN_02023924, 0x00000000 + .word FUN_020526B4, PlayerProfile_sizeof, 0x00000000 .word FUN_020526D8, FUN_0202DA84, 0x00000000 .word FUN_020526B8, FUN_0202DA84, 0x00000000 .word FUN_02052798, FUN_0202DA84, 0x00000000 diff --git a/arm9/asm/unk_0208890C.s b/arm9/asm/unk_0208890C.s index 4d274b76..92bfc9b5 100644 --- a/arm9/asm/unk_0208890C.s +++ b/arm9/asm/unk_0208890C.s @@ -27,13 +27,13 @@ FUN_0208890C: ; 0x0208890C bl FUN_02028048 str r0, [r4, #0x8] add r0, r5, #0x0 - bl FUN_020238F4 + bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x10] add r0, r5, #0x0 bl FUN_0206F158 str r0, [r4, #0x14] add r0, r5, #0x0 - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x18] str r7, [r4, #0x1c] str r6, [r4, #0x4] diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 7425416f..d55eaa28 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -448,7 +448,7 @@ FUN_0208A6D4: ; 0x0208A6D4 ldr r0, [r5, #0xc] ldr r1, [r5, #0x8] ldr r2, [r5, #0x4] - bl FUN_0200B7B8 + bl StringExpandPlaceholders b _0208A6FA _0208A6F4: ldr r2, [r5, #0x8] @@ -465,7 +465,7 @@ _0208A6FA: bl FUN_020545B8 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r4, #0x0 bl FUN_02054608 @@ -481,7 +481,7 @@ _0208A722: _0208A734: ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl LoadPlayerDataAddress + bl Sav2_PlayerData_GetOptionsAddr add r2, r0, #0x0 ldr r1, [r5, #0x8] add r0, r4, #0x0 diff --git a/arm9/global.inc b/arm9/global.inc index 931a1bdd..c8eaec71 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -360,7 +360,7 @@ .extern FUN_02005614 .extern FUN_02005670 .extern FUN_020056AC -.extern FUN_02005C28 +.extern PlayBGM .extern FUN_02005CBC .extern FUN_02005CFC .extern FUN_02005D20 @@ -597,7 +597,7 @@ .extern FUN_0200B708 .extern FUN_0200B764 .extern FUN_0200B7A8 -.extern FUN_0200B7B8 +.extern StringExpandPlaceholders .extern FUN_0200B84C .extern FUN_0200B870 .extern FUN_0200B990 @@ -1435,13 +1435,13 @@ .extern FUN_02022540 .extern FUN_0202254C .extern FUN_020225F8 -.extern FUN_02022610 +.extern SavArray_get .extern FUN_02022634 .extern FUN_0202263C .extern FUN_020226FC .extern FUN_02022720 .extern FUN_020227A0 -.extern FUN_020227DC +.extern Sav2_InitDynamicRegion .extern FUN_020227FC .extern FUN_02022800 .extern FUN_02022804 @@ -1470,34 +1470,34 @@ .extern FUN_02023874 .extern FUN_02023884 .extern FUN_020238A4 -.extern FUN_020238C4 -.extern FUN_020238C8 -.extern FUN_020238F4 -.extern FUN_0202390C -.extern FUN_02023918 -.extern FUN_02023924 -.extern FUN_02023928 -.extern FUN_0202393C -.extern FUN_02023948 -.extern FUN_0202395C -.extern FUN_0202397C -.extern FUN_0202398C -.extern FUN_02023990 -.extern FUN_020239A0 -.extern FUN_020239B8 -.extern FUN_020239BC -.extern FUN_020239C0 -.extern FUN_020239C8 -.extern FUN_020239CC -.extern FUN_020239D0 -.extern FUN_020239E4 -.extern FUN_020239F4 -.extern FUN_02023A10 -.extern FUN_02023A14 +.extern Sav2_PlayerData_sizeof +.extern Sav2_PlayerData_init +.extern Sav2_PlayerData_GetProfileAddr +.extern Sav2_PlayerData_GetCoinsAddr +.extern Sav2_PlayerData_GetIGTAddr +.extern PlayerProfile_sizeof +.extern PlayerProfile_init +.extern PlayerProfile_Copy +.extern PlayerProfile_Clear +.extern CopyPlayerName +.extern PlayerName_StringToFlat +.extern PlayerProfile_GetNamePtr +.extern PlayerName_FlatToString +.extern PlayerProfile_GetPlayerName_NewString +.extern PlayerProfile_SetTrainerID +.extern PlayerProfile_GetTrainerID +.extern PlayerProfile_GetTrainerID_VisibleHalf +.extern PlayerProfile_SetTrainerGender +.extern PlayerProfile_GetTrainerGender +.extern PlayerProfile_TestBadgeFlag +.extern PlayerProfile_SetBadgeFlag +.extern PlayerProfile_CountBadges +.extern PlayerProfile_GetMoney +.extern PlayerProfile_SetMoney .extern FUN_02023A28 .extern FUN_02023A2C -.extern FUN_02023A30 -.extern FUN_02023A54 +.extern PlayerProfile_AddMoney +.extern PlayerProfile_SubMoney .extern FUN_02023A68 .extern FUN_02023A6C .extern FUN_02023A70 @@ -1506,7 +1506,7 @@ .extern FUN_02023A88 .extern FUN_02023A90 .extern FUN_02023A9C -.extern FUN_02023AA4 +.extern PlayerProfile_NameAndOTIDMatchPlayer .extern FUN_02023AC4 .extern FUN_02023AC8 .extern FUN_02023ACC @@ -1588,7 +1588,7 @@ .extern FUN_02024F18 .extern FUN_02024F30 .extern FUN_02024F44 -.extern FUN_02024F50 +.extern Options_init .extern FUN_02024F9C .extern FUN_02024FD8 .extern FUN_02024FE0 @@ -1897,12 +1897,12 @@ .extern FUN_02028854 .extern FUN_0202888C .extern FUN_020288AC -.extern FUN_02028910 -.extern FUN_02028918 -.extern FUN_02028930 -.extern FUN_02028934 -.extern FUN_02028954 -.extern FUN_0202896C +.extern InitCoins +.extern SetCoins +.extern CheckCoins +.extern GiveCoins +.extern CanGiveCoins +.extern TakeCoins .extern FUN_02028980 .extern FUN_02028994 .extern FUN_020289A4 @@ -1978,10 +1978,10 @@ .extern FUN_02029DD4 .extern FUN_02029E0C .extern FUN_02029E2C -.extern FUN_02029E48 -.extern FUN_02029E54 -.extern FUN_02029EBC -.extern FUN_02029EC0 +.extern InitIGT +.extern AddIGTSeconds +.extern GetIGTHours +.extern GetIGTMinutes .extern FUN_02029EC4 .extern FUN_02029ECC .extern FUN_02029EE4 @@ -2677,74 +2677,74 @@ .extern FUN_02038CA8 .extern FUN_02038CD8 .extern FUN_02038D10 -.extern FUN_02038EB0 +.extern CreateScriptContext .extern FUN_02039438 .extern FUN_02039460 -.extern FUN_020394B8 -.extern FUN_020394F0 +.extern GetVarPointer +.extern VarGet .extern FUN_02039504 -.extern FUN_02039528 -.extern FUN_0203953C -.extern FUN_02039550 -.extern FUN_02039564 +.extern FlagCheck +.extern FlagSet +.extern FlagClear +.extern ResetTempFlagsAndVars .extern FUN_0203959C .extern FUN_020395BC .extern FUN_020395F4 .extern FUN_02039618 .extern FUN_0203962C -.extern FUN_02039640 -.extern FUN_0203965C -.extern FUN_02039678 +.extern TrainerFlagCheck +.extern TrainerFlagSet +.extern TrainerFlagClear .extern FUN_02039694 .extern FUN_02039754 .extern FUN_02039874 .extern FUN_0203989C -.extern FUN_020399A0 -.extern FUN_020399A4 -.extern FUN_020399A8 -.extern FUN_020399B4 +.extern ScrCmd_nop +.extern ScrCmd_nop2 +.extern ScrCmd_end +.extern ScrCmd_delay .extern FUN_02039A10 -.extern FUN_02039A28 -.extern FUN_02039A40 -.extern FUN_02039A5C -.extern FUN_02039A78 -.extern FUN_02039A90 -.extern FUN_02039AAC -.extern FUN_02039ACC -.extern FUN_02039AF8 -.extern FUN_02039B28 -.extern FUN_02039B50 -.extern FUN_02039B78 -.extern FUN_02039BA0 -.extern FUN_02039BBC -.extern FUN_02039BDC -.extern FUN_02039C08 +.extern ScrCmd_loadbyte +.extern ScrCmd_loadword +.extern ScrCmd_loadbytefromaddr +.extern ScrCmd_writebytetoaddr +.extern ScrCmd_setptrbyte +.extern ScrCmd_copylocal +.extern ScrCmd_copybyte +.extern ScrCmd_compare_local_to_local +.extern ScrCmd_compare_local_to_value +.extern ScrCmd_compare_local_to_addr +.extern ScrCmd_compare_addr_to_local +.extern ScrCmd_compare_addr_to_value +.extern ScrCmd_compare_addr_to_addr +.extern ScrCmd_compare_var_to_value +.extern ScrCmd_compare_var_to_var .extern FUN_02039C40 .extern FUN_02039C78 .extern FUN_02039CE4 -.extern FUN_02039CF8 +.extern ScrCmd_goto .extern FUN_02039D10 .extern FUN_02039D48 .extern FUN_02039D78 -.extern FUN_02039DAC -.extern FUN_02039DC4 -.extern FUN_02039DD0 -.extern FUN_02039E04 -.extern FUN_02039E38 -.extern FUN_02039E50 -.extern FUN_02039E68 +.extern ScrCmd_call +.extern ScrCmd_return +.extern ScrCmd_goto_if +.extern ScrCmd_call_if +.extern ScrCmd_setflag +.extern ScrCmd_clearflag +.extern ScrCmd_checkflag .extern FUN_02039E84 .extern FUN_02039EC0 -.extern FUN_02039EE8 -.extern FUN_02039F0C -.extern FUN_02039F30 -.extern FUN_02039F58 -.extern FUN_02039F88 -.extern FUN_02039FB8 -.extern FUN_02039FDC -.extern FUN_0203A00C -.extern FUN_0203A038 -.extern FUN_0203A04C +.extern ScrCmd_settrainerflag +.extern ScrCmd_cleartrainerflag +.extern ScrCmd_checktrainerflag +.extern ScrCmd_addvar +.extern ScrCmd_subvar +.extern ScrCmd_setvar +.extern ScrCmd_copyvar +.extern ScrCmd_setorcopyvar +.extern ScrCmd_message +.extern ScrCmd_message_from .extern FUN_0203A098 .extern FUN_0203A0FC .extern FUN_0203A13C @@ -3215,8 +3215,8 @@ .extern FUN_020414FC .extern FUN_02041518 .extern FUN_02041558 -.extern FUN_02041588 -.extern FUN_020415AC +.extern ScrCmd_waitcry +.extern ScrCmd_playbgm .extern FUN_020415BC .extern FUN_020415E0 .extern FUN_02041618 @@ -3422,14 +3422,14 @@ .extern FUN_02046028 .extern FUN_0204602C .extern FUN_02046030 -.extern FUN_02046294 -.extern FUN_0204629C -.extern FUN_020462AC -.extern FUN_020462B8 -.extern FUN_020462E4 -.extern FUN_0204630C -.extern FUN_02046338 -.extern FUN_02046380 +.extern SavArray_Flags_sizeof +.extern SavArray_Flags_init +.extern SavArray_Flags_get +.extern CheckFlagInArray +.extern SetFlagInArray +.extern ClearFlagInArray +.extern GetFlagAddr +.extern GetVarAddr .extern FUN_020463CC .extern FUN_020463EC .extern FUN_0204640C @@ -4879,19 +4879,19 @@ .extern FUN_0206B898 .extern FUN_0206B89C .extern FUN_0206B8A0 -.extern FUN_0206B8A4 -.extern FUN_0206B8AC -.extern FUN_0206B8C0 -.extern FUN_0206B8CC -.extern FUN_0206B900 -.extern FUN_0206B938 +.extern SavArray_Party_sizeof +.extern SavArray_Party_alloc +.extern SavArray_Party_init +.extern InitPartyWithMaxSize +.extern AddMonToParty +.extern RemoveMonFromParty .extern GetPartyCount .extern GetPartyMonByIndex -.extern FUN_0206B9DC -.extern FUN_0206BA38 -.extern FUN_0206BAD0 +.extern ReplacePartySlotWithMon +.extern SwapSlotsInParty +.extern CopyPlayerParty .extern PartyHasMon -.extern FUN_0206BB1C +.extern SavArray_PlayerParty_get .extern FUN_0206BB28 .extern FUN_0206BB34 .extern FUN_0206BB48 @@ -5990,7 +5990,7 @@ .extern GetNarcMemberSizeByIdPair .extern AllocAndReadWholeNarcMemberByIdPair .extern LoadOverlay_MODULE_05 -.extern LoadPlayerDataAddress +.extern Sav2_PlayerData_GetOptionsAddr .extern MATH_CalcCRC16 .extern MATH_CalcCRC16CCITT .extern MATH_CalcCRC32 @@ -6382,7 +6382,7 @@ .extern MOD05_021E2B9C .extern MOD05_021E2BB8 .extern MOD05_021E2BD0 -.extern MOD05_021E2C24 +.extern MOD05_ShowMessageInField .extern MOD05_021E2C58 .extern MOD05_021E2CBC .extern MOD05_021E320C 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 diff --git a/arm9/src/coins.c b/arm9/src/coins.c new file mode 100644 index 00000000..80efb768 --- /dev/null +++ b/arm9/src/coins.c @@ -0,0 +1,44 @@ +#include "global.h" +#include "coins.h" + +#pragma thumb on + +void InitCoins(u16 * coins) +{ + *coins = 0; +} + +void SetCoins(u16 * coins, u16 value) +{ + GF_ASSERT(value <= MAX_COINS); + *coins = value; +} + +u16 CheckCoins(u16 * coins) +{ + return *coins; +} + +BOOL GiveCoins(u16 * coins, u16 amount) +{ + if (*coins >= MAX_COINS) + return FALSE; + *coins += amount; + if (*coins > MAX_COINS) + *coins = MAX_COINS; + return TRUE; +} + +BOOL CanGiveCoins(u16 * coins, u16 amount) +{ + + return (u32)(amount + *coins) <= MAX_COINS; +} + +BOOL TakeCoins(u16 * coins, u16 amount) +{ + if (*coins < amount) + return FALSE; + *coins -= amount; + return TRUE; +} diff --git a/arm9/src/event_data.c b/arm9/src/event_data.c new file mode 100644 index 00000000..cf33b201 --- /dev/null +++ b/arm9/src/event_data.c @@ -0,0 +1,78 @@ +#include "global.h" +#include "save_block_2.h" +#include "event_data.h" + +#pragma thumb on + +u8 UNK_021C5A14[8]; + +u8 * GetFlagAddr(struct ScriptState * state, u16 flag_id); + +u32 SavArray_Flags_sizeof(void) +{ + return sizeof(struct ScriptState); +} + +void SavArray_Flags_init(struct ScriptState * state) +{ + memset(state, 0, sizeof(struct ScriptState)); +} + +struct ScriptState * SavArray_Flags_get(struct SaveBlock2 * sav2) +{ + return (struct ScriptState *)SavArray_get(sav2, 4); +} + +BOOL CheckFlagInArray(struct ScriptState * state, u16 flag_id) +{ + u8 * ptr = GetFlagAddr(state, flag_id); + if (ptr != NULL) + { + int mask = 1 << (flag_id % 8); + if (*ptr & mask) + return TRUE; + } + return FALSE; +} + +void SetFlagInArray(struct ScriptState * state, u16 flag_id) +{ + u8 * ptr = GetFlagAddr(state, flag_id); + if (ptr != NULL) + { + int mask = 1 << (flag_id % 8); + *ptr |= mask; + } +} + +void ClearFlagInArray(struct ScriptState * state, u16 flag_id) +{ + u8 * ptr = GetFlagAddr(state, flag_id); + if (ptr != NULL) + { + int mask = 1 << (flag_id % 8); + *ptr &= 0xFF ^ mask; + } +} + +u8 * GetFlagAddr(struct ScriptState * state, u16 flag_id) +{ + if (flag_id == 0) + return 0; + if (flag_id < 0x4000) + { + GF_ASSERT((flag_id / 8) < 364); + return &state->flags[flag_id / 8]; + } + else + { + GF_ASSERT(((flag_id - 0x4000) / 8) < 8); + return &UNK_021C5A14[(flag_id - 0x4000) / 8]; + } +} + +u16 * GetVarAddr(struct ScriptState * state, u16 var_id) +{ + GF_ASSERT((var_id - 0x4000) < 288); + return &state->vars[var_id - 0x4000]; +} diff --git a/arm9/src/igt.c b/arm9/src/igt.c new file mode 100644 index 00000000..843ef396 --- /dev/null +++ b/arm9/src/igt.c @@ -0,0 +1,50 @@ +#include "global.h" +#include "igt.h" + +#pragma thumb on + +void InitIGT(struct IGT * igt) +{ + igt->hours = 0; + igt->minutes = 0; + igt->seconds = 0; +} + +void AddIGTSeconds(struct IGT * igt, u32 to_add) +{ + u32 hours, minutes, seconds; + if (igt->hours == 999 && igt->minutes == 59 && igt->seconds == 59) + return; + seconds = (u32)(igt->seconds + to_add); + minutes = (u32)igt->minutes; + hours = (u32)igt->hours; + if (seconds > 59) + { + minutes += seconds / 60; + seconds %= 60; + if (minutes > 59) + { + hours += minutes / 60; + minutes %= 60; + if (hours >= 999) + { + hours = 999; + minutes = 59; + seconds = 59; + } + } + } + igt->hours = (u16)hours; + igt->minutes = (u8)minutes; + igt->seconds = (u8)seconds; +} + +u16 GetIGTHours(struct IGT * igt) +{ + return igt->hours; +} + +u8 GetIGTMinutes(struct IGT * igt) +{ + return igt->minutes; +} diff --git a/arm9/src/main.c b/arm9/src/main.c index ac2d9ca9..3de65c45 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -6,7 +6,7 @@ #include "PAD_pad.h" #include "main.h" #include "poke_overlay.h" -#include "options.h" +#include "save_block_2.h" #include "sound.h" FS_EXTERN_OVERLAY(MODULE_52); @@ -32,12 +32,12 @@ extern void FUN_02022294(void); extern void FUN_0201259C(void); extern void FUN_02002C14(void); extern void FUN_02002C50(int, int); -extern struct UnkStruct_021C59C8 * FUN_0202254C(void); -extern u32 FUN_02029EF8(struct UnkStruct_021C59C8 *); +extern struct SaveBlock2 * FUN_0202254C(void); +extern u32 FUN_02029EF8(struct SaveBlock2 *); extern void FUN_02020AFC(void); extern int FUN_020337E8(int); extern void FUN_02034188(int, int); -extern int FUN_020227FC(struct UnkStruct_021C59C8 *); +extern int FUN_020227FC(struct SaveBlock2 *); extern void FUN_02089D90(int); extern void FUN_0200A2AC(void); extern void FUN_02015E30(void); @@ -74,7 +74,7 @@ THUMB_FUNC void NitroMain(void) FUN_02002C50(3, 3); gBacklightTop.unk18 = -1; gBacklightTop.unk20 = FUN_0202254C(); - InitSoundData(FUN_02029EF8(gBacklightTop.unk20), LoadPlayerDataAddress(gBacklightTop.unk20)); + InitSoundData(FUN_02029EF8(gBacklightTop.unk20), Sav2_PlayerData_GetOptionsAddr(gBacklightTop.unk20)); FUN_02020AFC(); if (FUN_020337E8(3) == 3) FUN_02034188(3, 0); diff --git a/arm9/src/msgdata.c b/arm9/src/msgdata.c index e90c7122..13d1a9da 100644 --- a/arm9/src/msgdata.c +++ b/arm9/src/msgdata.c @@ -360,7 +360,7 @@ struct String * ReadMsgData_ExpandPlaceholders(u32 * a0, struct MsgData * msgDat r5 = NewString_ReadMsgData(msgData, msgno); if (r5 != NULL) { - FUN_0200B7B8(a0, r4, r5); + StringExpandPlaceholders(a0, r4, r5); ret = StringDup(r4, a3); String_dtor(r5); } diff --git a/arm9/src/party.c b/arm9/src/party.c index d7799fe2..1b9c505f 100644 --- a/arm9/src/party.c +++ b/arm9/src/party.c @@ -1,42 +1,41 @@ #include "global.h" #include "party.h" #include "heap.h" -#include "proto.h" #pragma thumb on -void FUN_0206B8C0(struct PlayerParty * party); -void FUN_0206B8CC(struct PlayerParty * party, int count); +void SavArray_Party_init(struct PlayerParty * party); +void InitPartyWithMaxSize(struct PlayerParty * party, int count); -u32 FUN_0206B8A4(void) +u32 SavArray_Party_sizeof(void) { return sizeof(struct PlayerParty); } -struct PlayerParty * FUN_0206B8AC(u32 heap_id) +struct PlayerParty * SavArray_Party_alloc(u32 heap_id) { struct PlayerParty * ret = (struct PlayerParty *)AllocFromHeap(heap_id, sizeof(struct PlayerParty)); - FUN_0206B8C0(ret); + SavArray_Party_init(ret); return ret; } -void FUN_0206B8C0(struct PlayerParty * party) +void SavArray_Party_init(struct PlayerParty * party) { - FUN_0206B8CC(party, PARTY_SIZE); + InitPartyWithMaxSize(party, PARTY_SIZE); } -void FUN_0206B8CC(struct PlayerParty * party, int count) +void InitPartyWithMaxSize(struct PlayerParty * party, int count) { int i; GF_ASSERT(count <= PARTY_SIZE); memset(party, 0, sizeof(struct PlayerParty)); party->curCount = 0; party->maxCount = count; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) ZeroMonData(&party->mons[i]); } -BOOL FUN_0206B900(struct PlayerParty * party, struct Pokemon * pokemon) +BOOL AddMonToParty(struct PlayerParty * party, struct Pokemon * pokemon) { if (party->curCount >= party->maxCount) return FALSE; @@ -45,7 +44,7 @@ BOOL FUN_0206B900(struct PlayerParty * party, struct Pokemon * pokemon) return TRUE; } -BOOL FUN_0206B938(struct PlayerParty * party, int pos) +BOOL RemoveMonFromParty(struct PlayerParty * party, int pos) { int i; @@ -77,7 +76,7 @@ struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party, int pos) return &party->mons[pos]; } -void FUN_0206B9DC(struct PlayerParty * party, int pos, struct Pokemon * pokemon) +void ReplacePartySlotWithMon(struct PlayerParty * party, int pos, struct Pokemon * pokemon) { int r2; GF_ASSERT(pos >= 0); @@ -88,7 +87,7 @@ void FUN_0206B9DC(struct PlayerParty * party, int pos, struct Pokemon * pokemon) party->curCount += r2; } -BOOL FUN_0206BA38(struct PlayerParty * party, int pos1, int pos2) +BOOL SwapSlotsInParty(struct PlayerParty * party, int pos1, int pos2) { struct Pokemon * buffer; GF_ASSERT(pos1 >= 0); @@ -105,7 +104,7 @@ BOOL FUN_0206BA38(struct PlayerParty * party, int pos1, int pos2) return FALSE; } -void FUN_0206BAD0(struct PlayerParty * src, struct PlayerParty * dest) +void CopyPlayerParty(struct PlayerParty * src, struct PlayerParty * dest) { *dest = *src; } @@ -121,7 +120,7 @@ BOOL PartyHasMon(struct PlayerParty * party, u16 species) return i != party->curCount; } -struct PlayerParty * FUN_0206BB1C(void * ptr) +struct PlayerParty * SavArray_PlayerParty_get(struct SaveBlock2 * ptr) { - return (struct PlayerParty *)FUN_02022610(ptr, 2); + return (struct PlayerParty *)SavArray_get(ptr, 2); } diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index eb51d5fb..05df8811 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -3676,13 +3676,13 @@ BOOL FUN_0206A998(struct Pokemon * pokemon) return IsPokemonLegendaryOrMythical(species); } -BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct SaveBlock2 * sb2, u32 heap_id) +BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct PlayerData * sb2, u32 heap_id) { - u32 myId = FUN_020239BC(sb2); + u32 myId = PlayerProfile_GetTrainerID(sb2); u32 otId = GetBoxMonData(boxmon, MON_DATA_OTID, NULL); - u32 myGender = FUN_020239CC(sb2); + u32 myGender = PlayerProfile_GetTrainerGender(sb2); u32 otGender = GetBoxMonData(boxmon, MON_DATA_MET_GENDER, NULL); - struct String * r7 = FUN_020239A0(sb2, heap_id); + struct String * r7 = PlayerProfile_GetPlayerName_NewString(sb2, heap_id); struct String * r6 = String_ctor(OT_NAME_LENGTH + 1, heap_id); BOOL ret = FALSE; GetBoxMonData(boxmon, MON_DATA_OT_NAME_2, r6); diff --git a/include/coins.h b/include/coins.h new file mode 100644 index 00000000..f68d44a0 --- /dev/null +++ b/include/coins.h @@ -0,0 +1,13 @@ +#ifndef POKEDIAMOND_COINS_H +#define POKEDIAMOND_COINS_H + +#define MAX_COINS 50000 + +void InitCoins(u16 * coins); +void SetCoins(u16 * coins, u16 value); +u16 CheckCoins(u16 * coins); +BOOL GiveCoins(u16 * coins, u16 amount); +BOOL CanGiveCoins(u16 * coins, u16 amount); +BOOL TakeCoins(u16 * coins, u16 amount); + +#endif //POKEDIAMOND_COINS_H diff --git a/include/event_data.h b/include/event_data.h new file mode 100644 index 00000000..e1d46348 --- /dev/null +++ b/include/event_data.h @@ -0,0 +1,19 @@ +#ifndef GUARD_SCRIPT_STATE_H +#define GUARD_SCRIPT_STATE_H + +struct ScriptState +{ + u16 vars[288]; + u8 flags[364]; +}; + +u32 SavArray_Flags_sizeof(void); +void SavArray_Flags_init(struct ScriptState * state); +struct ScriptState * SavArray_Flags_get(struct SaveBlock2 * sav2); +BOOL CheckFlagInArray(struct ScriptState * state, u16 flag_id); +void SetFlagInArray(struct ScriptState * state, u16 flag_id); +void ClearFlagInArray(struct ScriptState * state, u16 flag_id); +u8 * GetFlagAddr(struct ScriptState * state, u16 flag_id); +u16 * GetVarAddr(struct ScriptState * state, u16 var_id); + +#endif //GUARD_SCRIPT_STATE_H diff --git a/include/igt.h b/include/igt.h new file mode 100644 index 00000000..bf5e5a63 --- /dev/null +++ b/include/igt.h @@ -0,0 +1,16 @@ +#ifndef POKEDIAMOND_IGT_H +#define POKEDIAMOND_IGT_H + +struct IGT +{ + u16 hours; + u8 minutes; + u8 seconds; +}; + +void InitIGT(struct IGT * igt); +void AddIGTSeconds(struct IGT * igt, u32 seconds); +u16 GetIGTHours(struct IGT * igt); +u8 GetIGTMinutes(struct IGT * igt); + +#endif //POKEDIAMOND_IGT_H diff --git a/include/main.h b/include/main.h index ec3fca46..b61e68b9 100644 --- a/include/main.h +++ b/include/main.h @@ -3,7 +3,7 @@ #include "FS_overlay.h" #include "SPI_pm.h" -#include "structs.h" +#include "save_block_2.h" struct UnkStruct_02006234; @@ -36,7 +36,7 @@ struct Unk2106FA0 struct Unk21DBE18 * unk14; s32 unk18; s32 unk1C; - struct UnkStruct_021C59C8 * unk20; + struct SaveBlock2 * unk20; }; struct Unk21C4818 diff --git a/include/options.h b/include/options.h index 730cbaa5..4ed466df 100644 --- a/include/options.h +++ b/include/options.h @@ -1,15 +1,13 @@ #ifndef POKEDIAMOND_OPTIONS_H #define POKEDIAMOND_OPTIONS_H -#include "main.h" - struct Options { u16 unk0_0:4; u16 unk0_4:2; - u16 unk0_6:10; - u8 padding[2]; // TODO: finish me + u16 unk0_6:1; + u16 unk0_7:1; + u16 unk0_8:2; + u16 unk0_A:5; }; -struct Options * LoadPlayerDataAddress(struct UnkStruct_021C59C8 *); - #endif //POKEDIAMOND_OPTIONS_H diff --git a/include/party.h b/include/party.h index eca62239..2d06705c 100644 --- a/include/party.h +++ b/include/party.h @@ -2,19 +2,20 @@ #define POKEDIAMOND_PARTY_H #include "pokemon.h" +#include "save_block_2.h" BOOL PartyHasMon(struct PlayerParty * party_p, u16 species); int GetPartyCount(struct PlayerParty * party_p); struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party_p, int idx); -u32 FUN_0206B8A4(void); -struct PlayerParty * FUN_0206B8AC(u32 heap_id); -void FUN_0206B8C0(struct PlayerParty * party); -void FUN_0206B8CC(struct PlayerParty * party, int count); -BOOL FUN_0206B900(struct PlayerParty * party, struct Pokemon * pokemon); -BOOL FUN_0206B938(struct PlayerParty * party, int pos); -void FUN_0206B9DC(struct PlayerParty * party, int pos, struct Pokemon * pokemon); -BOOL FUN_0206BA38(struct PlayerParty * party, int pos1, int pos2); -void FUN_0206BAD0(struct PlayerParty * src, struct PlayerParty * dest); -struct PlayerParty * FUN_0206BB1C(void * ptr); +u32 SavArray_Party_sizeof(void); +struct PlayerParty * SavArray_Party_alloc(u32 heap_id); +void SavArray_Party_init(struct PlayerParty * party); +void InitPartyWithMaxSize(struct PlayerParty * party, int count); +BOOL AddMonToParty(struct PlayerParty * party, struct Pokemon * pokemon); +BOOL RemoveMonFromParty(struct PlayerParty * party, int pos); +void ReplacePartySlotWithMon(struct PlayerParty * party, int pos, struct Pokemon * pokemon); +BOOL SwapSlotsInParty(struct PlayerParty * party, int pos1, int pos2); +void CopyPlayerParty(struct PlayerParty * src, struct PlayerParty * dest); +struct PlayerParty * SavArray_PlayerParty_get(struct SaveBlock2 * ptr); #endif //POKEDIAMOND_PARTY_H diff --git a/include/player_data.h b/include/player_data.h new file mode 100644 index 00000000..28133f43 --- /dev/null +++ b/include/player_data.h @@ -0,0 +1,40 @@ +#ifndef POKEDIAMOND_PLAYER_DATA_H +#define POKEDIAMOND_PLAYER_DATA_H + +#include "options.h" +#include "igt.h" + +struct SaveBlock2; + +struct PlayerData +{ + /* 0x00 */ u16 playerName[OT_NAME_LENGTH + 1]; + /* 0x10 */ u32 playerId; + /* 0x14 */ u32 money; + /* 0x18 */ u8 gender; + /* 0x19 */ u8 language; + /* 0x1A */ u8 badges; + /* 0x1B */ u8 avatar; + /* 0x1C */ u8 field_1C; + /* 0x1D */ u8 field_1D_0:1; + u8 field_1D_1:1; + u8 field_1D_pad:6; + /* 0x1E */ u8 padding_1E[2]; +}; + +struct PlayerDataSav +{ + struct Options options; + u8 padding[2]; + struct PlayerData data; + u16 coins; + struct IGT igt; + u8 padding2[2]; +}; + +struct Options * Sav2_PlayerData_GetOptionsAddr(struct SaveBlock2 *); +struct String * PlayerProfile_GetPlayerName_NewString(struct PlayerData *, u32 heap_id); +u32 PlayerProfile_GetTrainerID(struct PlayerData *); +u32 PlayerProfile_GetTrainerGender(struct PlayerData *); + +#endif //POKEDIAMOND_PLAYER_DATA_H diff --git a/include/pokemon.h b/include/pokemon.h index 2387ef78..1ab3c401 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -303,7 +303,7 @@ int LowestFlagNo(u32 mask); BOOL IsPokemonLegendaryOrMythical(u16 species); u16 GetLegendaryMon(u32 idx); BOOL FUN_0206A998(struct Pokemon * pokemon); -BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct SaveBlock2 * sb2, u32 heap_id); +BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct PlayerData * sb2, u32 heap_id); void FUN_0206AA84(struct Pokemon * pokemon); void FUN_0206AAB4(struct BoxPokemon * boxmon); diff --git a/include/proto.h b/include/proto.h index b45c2b48..fb2f8a78 100644 --- a/include/proto.h +++ b/include/proto.h @@ -16,7 +16,6 @@ void FUN_02005E80(int); void FUN_02005E90(int, int, int, int); void FUN_020056AC(int, int, int, int, int); void FUN_020808AC(struct BoxPokemon *, int, int, int, int); -void * FUN_02022610(void *, int); -void FUN_0200B7B8(u32 *, struct String *, struct String *); +void StringExpandPlaceholders(u32 *, struct String *, struct String *); #endif //POKEDIAMOND_PROTO_H diff --git a/include/save_block_2.h b/include/save_block_2.h index 38e11de4..fe052b1d 100644 --- a/include/save_block_2.h +++ b/include/save_block_2.h @@ -1,18 +1,47 @@ #ifndef POKEDIAMOND_SAVE_BLOCK_2_H #define POKEDIAMOND_SAVE_BLOCK_2_H -struct SaveBlock2 +#include "MATH_crc.h" +#include "player_data.h" + +struct SavArrayHeader { - u16 playerName[OT_NAME_LENGTH + 1]; - u32 playerId; - u8 filler_14[4]; - u8 gender; + u32 id; + u32 size; + u32 offset; + u16 field_C; + u16 field_E; +}; + +struct SaveBlock2_Sub_20464 { + u8 unk_0; u8 padding[3]; - // TODO: finish this struct + int unk_4; + int unk_8; + u8 unk_C; + u8 unk_D; + u8 unk_E; + u8 padding2; }; -struct String * FUN_020239A0(struct SaveBlock2 *, u32 heap_id); -u32 FUN_020239BC(struct SaveBlock2 *); -u32 FUN_020239CC(struct SaveBlock2 *); +struct SaveBlock2 +{ + /* 0x00000 */ int unk_00000; + /* 0x00004 */ int unk_00004; + /* 0x00008 */ int unk_00008; + /* 0x0000C */ int unk_0000C; + /* 0x00010 */ int unk_00010; + /* 0x00014 */ struct MATHCRC16Table unk_00014; + /* 0x00214 */ u8 dynamic_region[0x20000]; + /* 0x20214 */ int unk_20214; + /* 0x20218 */ u8 unk_20218[8]; + /* 0x20220 */ int unk_20220; + /* 0x20224 */ struct SavArrayHeader arrayHeaders[36]; + /* 0x20464 */ struct SaveBlock2_Sub_20464 unk_20464[4]; + /* 0x204A4 */ int unk_204A4; + // TODO: finish this struct +}; // size: 0x204A8 + +void * SavArray_get(struct SaveBlock2 *, int); #endif //POKEDIAMOND_SAVE_BLOCK_2_H diff --git a/include/script.h b/include/script.h index 494a9d9f..7c4dae6d 100644 --- a/include/script.h +++ b/include/script.h @@ -3,6 +3,7 @@ #include "global.h"
#include "msgdata.h"
+#include "save_block_2.h"
struct ScriptContext;
@@ -23,7 +24,7 @@ struct ScriptContext u32 unk74;
struct MsgData * unk78;
u8 *unk7C;
- void * unk80;
+ struct SaveBlock2 * unk80;
};
#define ScriptReadByte(ctx) (*(ctx->scriptPtr++))
diff --git a/include/sound.h b/include/sound.h index a79e6ecf..6e78bfa4 100644 --- a/include/sound.h +++ b/include/sound.h @@ -3,7 +3,7 @@ #include "FS_file.h" #include "sdat.h" -#include "options.h" +#include "save_block_2.h" struct SoundData { diff --git a/include/structs.h b/include/structs.h deleted file mode 100644 index fbcf6e0c..00000000 --- a/include/structs.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef POKEDIAMOND_STRUCTS_H -#define POKEDIAMOND_STRUCTS_H - -#include "pokemon.h" -#include "map.h" - -// MATH -typedef u16 MATHCRC16Table[256]; - -struct UnkStruct_021C59C8_Sub20224 { - int unk_0; - int unk_4; - int unk_8; - u16 unk_C; - u16 unk_E; -}; - -struct UnkStruct_021C59C8_Sub_20464 { - u8 unk_0; - u8 padding[3]; - int unk_4; - int unk_8; - u8 unk_C; - u8 unk_D; - u8 unk_E; - u8 padding2; -}; - -struct UnkStruct_021C59C8 { - /* 0x00000 */ int unk_00000; - /* 0x00004 */ int unk_00004; - /* 0x00008 */ int unk_00008; - /* 0x0000C */ int unk_0000C; - /* 0x00010 */ int unk_00010; - /* 0x00014 */ MATHCRC16Table unk_00014; - /* 0x00214 */ u8 filler_00214[0x2004]; - /* 0x20218 */ u8 unk_20218[8]; - /* 0x20220 */ int unk_20220; - /* 0x20224 */ struct UnkStruct_021C59C8_Sub20224 unk_20224[36]; - /* 0x20464 */ struct UnkStruct_021C59C8_Sub_20464 unk_20464[4]; - /* 0x204A4 */ int unk_204A4; -}; - -#endif //POKEDIAMOND_STRUCTS_H |