diff options
Diffstat (limited to 'arm9/asm')
32 files changed, 91 insertions, 91 deletions
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 6c2d8674..876bd329 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -7344,12 +7344,12 @@ FUN_0203D3DC: ; 0x0203D3DC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r5, #0x80 str r0, [sp, #0x4] ldr r0, [r5, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02013B5C add r5, r0, #0x0 cmp r4, #0x0 @@ -7755,7 +7755,7 @@ FUN_0203D738: ; 0x0203D738 add r4, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r4, #0x80 add r5, r0, #0x0 @@ -7782,7 +7782,7 @@ FUN_0203D774: ; 0x0203D774 add r4, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 @@ -7826,7 +7826,7 @@ FUN_0203D7DC: ; 0x0203D7DC add r4, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 @@ -7864,7 +7864,7 @@ FUN_0203D834: ; 0x0203D834 add r5, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 @@ -7917,7 +7917,7 @@ FUN_0203D8A0: ; 0x0203D8A0 add r5, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 @@ -10292,8 +10292,8 @@ FUN_0203EB88: ; 0x0203EB88 add sp, #0xc pop {r4-r7, pc} - thumb_func_start FUN_0203EBC8 -FUN_0203EBC8: ; 0x0203EBC8 + thumb_func_start ScrCmd_gameversion +ScrCmd_gameversion: ; 0x0203EBC8 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -10307,15 +10307,15 @@ FUN_0203EBC8: ; 0x0203EBC8 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203EBE4 -FUN_0203EBE4: ; 0x0203EBE4 + thumb_func_start ScrCmd_givewallpaper +ScrCmd_givewallpaper: ; 0x0203EBE4 push {r3-r7, lr} sub sp, #0x10 add r5, r0, #0x0 add r0, #0x80 ldr r6, [r0, #0x0] add r0, r6, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr str r0, [sp, #0x4] add r0, r5, #0x0 @@ -10327,7 +10327,7 @@ FUN_0203EBE4: ; 0x0203EBE4 bl GetVarPointer add r4, r0, #0x0 ldr r0, [r6, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10498,8 +10498,8 @@ FUN_0203ED2C: ; 0x0203ED2C pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203ED70 -FUN_0203ED70: ; 0x0203ED70 + thumb_func_start ScrCmd_pcfreespace +ScrCmd_pcfreespace: ; 0x0203ED70 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -10512,7 +10512,7 @@ FUN_0203ED70: ; 0x0203ED70 add r4, r0, #0x0 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer bl PCStorage_CountMonsAndEggsInAllBoxes lsl r0, r0, #0x10 lsr r1, r0, #0x10 diff --git a/arm9/asm/scrcmd_10.s b/arm9/asm/scrcmd_10.s index 0831797b..ea5903d8 100644 --- a/arm9/asm/scrcmd_10.s +++ b/arm9/asm/scrcmd_10.s @@ -49,7 +49,7 @@ FUN_02042364: ; 0x02042364 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr add r1, r4, #0x0 add r2, r6, #0x0 bl MOD06_022434D0 diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s index 57061f8b..0a7c9697 100644 --- a/arm9/asm/scrcmd_13.s +++ b/arm9/asm/scrcmd_13.s @@ -92,7 +92,7 @@ FUN_02043918: ; 0x02043918 add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer str r0, [sp, #0x8] mov r0, #0x20 bl AllocMonZeroed diff --git a/arm9/asm/scrcmd_14.s b/arm9/asm/scrcmd_14.s index e37228c6..1fd34357 100644 --- a/arm9/asm/scrcmd_14.s +++ b/arm9/asm/scrcmd_14.s @@ -165,7 +165,7 @@ FUN_02043B84: ; 0x02043B84 add r0, #0x80 ldr r5, [r0, #0x0] add r0, r5, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr ldr r0, [r5, #0xc] bl Sav2_PlayerData_GetCoinsAddr @@ -201,7 +201,7 @@ FUN_02043BD0: ; 0x02043BD0 add r0, #0x80 ldr r4, [r0, #0x0] add r0, r4, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr ldr r0, [r4, #0xc] bl Sav2_PlayerData_GetCoinsAddr diff --git a/arm9/asm/scrcmd_15.s b/arm9/asm/scrcmd_15.s index d33d857b..e5630b08 100644 --- a/arm9/asm/scrcmd_15.s +++ b/arm9/asm/scrcmd_15.s @@ -9,7 +9,7 @@ FUN_02043C6C: ; 0x02043C6C add r4, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 @@ -26,7 +26,7 @@ FUN_02043C90: ; 0x02043C90 add r4, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 @@ -43,7 +43,7 @@ FUN_02043CB4: ; 0x02043CB4 add r4, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r5, r0, #0x0 add r0, r4, #0x0 @@ -65,7 +65,7 @@ FUN_02043CE4: ; 0x02043CE4 add r4, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 add r0, r4, #0x0 @@ -98,7 +98,7 @@ FUN_02043D28: ; 0x02043D28 add r4, r0, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r6, r0, #0x0 add r0, r4, #0x0 diff --git a/arm9/asm/scrcmd_16.s b/arm9/asm/scrcmd_16.s index 9b188d47..dba4514e 100644 --- a/arm9/asm/scrcmd_16.s +++ b/arm9/asm/scrcmd_16.s @@ -70,7 +70,7 @@ FUN_02043E68: ; 0x02043E68 add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 add r0, r6, #0x0 diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index f37a8c62..09cb74b0 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -120,7 +120,7 @@ ScrCmd_checkpartymonotid: ; 0x020443A8 add r0, #0x80 ldr r5, [r0, #0x0] add r0, r5, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 add r0, r4, #0x0 @@ -1113,7 +1113,7 @@ FUN_02044C0C: ; 0x02044C0C bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r7, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer str r0, [sp, #0x4] ldr r0, [r7, #0xc] bl SavArray_PlayerParty_get diff --git a/arm9/asm/scrcmd_24.s b/arm9/asm/scrcmd_24.s index 5685ce24..b9569382 100644 --- a/arm9/asm/scrcmd_24.s +++ b/arm9/asm/scrcmd_24.s @@ -137,7 +137,7 @@ FUN_02045E74: ; 0x02045E74 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr str r0, [r4, #0x4] add r0, r5, #0x0 diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index a7879525..475edde8 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -78,7 +78,7 @@ FUN_0203FF10: ; 0x0203FF10 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index e5e930b2..aede6782 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -20,7 +20,7 @@ FUN_020406CC: ; 0x020406CC str r0, [r5, #0x8] ldrb r5, [r1, #0x0] add r0, r6, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r4, #0x0] @@ -331,7 +331,7 @@ FUN_02040964: ; 0x02040964 add r0, #0x80 ldr r4, [r0, #0x0] ldr r0, [r4, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer str r0, [sp, #0x0] add r0, r4, #0x0 mov r1, #0xf @@ -426,7 +426,7 @@ FUN_02040A30: ; 0x02040A30 add r0, #0x80 ldr r5, [r0, #0x0] add r0, r5, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r4, r0, #0x0 add r0, r5, #0x0 diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index d001fb33..a1aa5216 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -40,7 +40,7 @@ FUN_020411C4: ; 0x020411C4 add r0, #0x80 ldr r7, [r0, #0x0] ldr r0, [r7, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer str r0, [sp, #0x20] add r0, r4, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/unk_02022504.s b/arm9/asm/unk_02022504.s index 6e6c0d06..7f851622 100644 --- a/arm9/asm/unk_02022504.s +++ b/arm9/asm/unk_02022504.s @@ -11,8 +11,8 @@ FUN_02022504: ; 0x02022504 nop _0202250C: .word SavArray_get - thumb_func_start FUN_02022510 -FUN_02022510: ; 0x02022510 + thumb_func_start GetStoragePCPointer +GetStoragePCPointer: ; 0x02022510 ldr r3, _02022518 ; =SavArray_get mov r1, #0x23 bx r3 diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index cb831ada..c2bab3d0 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -632,7 +632,7 @@ FUN_020377A8: ; 0x020377A8 ldr r0, [r0, #0x8] bx lr - thumb_func_start FUN_020377AC -FUN_020377AC: ; 0x020377AC + thumb_func_start ScriptEnvironment_GetSav2Ptr +ScriptEnvironment_GetSav2Ptr: ; 0x020377AC ldr r0, [r0, #0xc] bx lr diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 3c5fc486..ca4520b6 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -1115,7 +1115,7 @@ FUN_02037EF8: ; 0x02037EF8 bl AllocFromHeapAtEnd add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetOptionsAddr add r1, r0, #0x0 add r0, r5, #0x0 @@ -1140,7 +1140,7 @@ FUN_02037F2C: ; 0x02037F2C add r4, r1, #0x0 add r6, r2, #0x0 add r7, r3, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr mov r1, #0xb str r1, [sp, #0x0] add r1, r4, #0x0 @@ -1164,13 +1164,13 @@ FUN_02037F58: ; 0x02037F58 add r6, r3, #0x0 cmp r5, #0x3 bne _02037F74 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr add r1, r4, #0x0 add r2, r6, #0x0 bl FUN_020855B0 b _02037F82 _02037F74: - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr add r1, r5, #0x0 add r2, r4, #0x0 add r3, r6, #0x0 @@ -1189,7 +1189,7 @@ FUN_02037F90: ; 0x02037F90 add r4, r1, #0x0 add r6, r2, #0x0 add r5, r0, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr add r1, r4, #0x0 add r2, r6, #0x0 bl FUN_02085578 @@ -1216,7 +1216,7 @@ FUN_02037FC4: ; 0x02037FC4 push {r3-r5, lr} add r5, r1, #0x0 add r4, r0, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr add r1, r5, #0x0 bl FUN_02087D00 add r5, r0, #0x0 @@ -2127,7 +2127,7 @@ FUN_020386E0: ; 0x020386E0 bl SavArray_get str r0, [r4, #0x8] ldr r0, [r5, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer str r0, [r4, #0xc] ldr r0, [r5, #0xc] bl FUN_02024DA0 diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 352c4094..acb9fd0b 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -731,10 +731,10 @@ gScriptCmdTable: ; 0x020F355C .word FUN_0203C5BC .word FUN_0203C614 .word FUN_0203C680 - .word FUN_0203EBC8 + .word ScrCmd_gameversion .word FUN_02044A6C .word FUN_02044A94 - .word FUN_0203EBE4 + .word ScrCmd_givewallpaper .word FUN_0203ECAC .word FUN_0203ECD8 .word FUN_0203ECF4 @@ -743,7 +743,7 @@ gScriptCmdTable: ; 0x020F355C .word FUN_020411C4 .word FUN_02041340 .word FUN_02040964 - .word FUN_0203ED70 + .word ScrCmd_pcfreespace .word FUN_0204387C .word FUN_020438D0 .word FUN_02043918 diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s index eaeb9036..15eacf44 100644 --- a/arm9/asm/unk_0204653C.s +++ b/arm9/asm/unk_0204653C.s @@ -1015,7 +1015,7 @@ _02046D4E: b _02046D8C _02046D5C: ldr r0, [r6, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer str r0, [sp, #0x8] ldr r0, [r6, #0xc] bl SavArray_PlayerParty_get diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 39b89324..2d2d2b2d 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -285,7 +285,7 @@ FUN_02047814: ; 0x02047814 add r0, r6, #0x0 bl FreeToHeap ldr r0, [r5, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r4, r1] @@ -519,7 +519,7 @@ FUN_02047A78: ; 0x02047A78 mov r2, #0x0 bl FUN_02047A64 ldr r0, [r4, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r5, r1] @@ -719,7 +719,7 @@ _02047C98: bl FUN_02047A64 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r6, r1] @@ -903,7 +903,7 @@ _02047E2C: bl FUN_02047A64 ldr r0, [sp, #0x0] ldr r0, [r0, #0xc] - bl FUN_02022510 + bl GetStoragePCPointer mov r1, #0x45 lsl r1, r1, #0x2 str r0, [r5, r1] diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 3aa16280..d94329c4 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -96,7 +96,7 @@ _0204817A: add r1, #0xc bl FUN_02019150 add r0, r5, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0x0 ldr r0, [r4, #0x20] diff --git a/arm9/asm/unk_0204B0A0.s b/arm9/asm/unk_0204B0A0.s index 1495eb48..4b658c2b 100644 --- a/arm9/asm/unk_0204B0A0.s +++ b/arm9/asm/unk_0204B0A0.s @@ -125,7 +125,7 @@ FUN_0204B1DC: ; 0x0204B1DC push {r4-r6, lr} add r4, r1, #0x0 add r5, r0, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr add r1, r4, #0x0 bl FUN_02025A60 add r0, r5, #0x0 diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index f4d8b81a..e95b8c81 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -2315,13 +2315,13 @@ FUN_0204DCB4: ; 0x0204DCB4 ldr r0, _0204DD10 ; =UNK_021C5A68 ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02026CC4 add r4, r0, #0x0 ldr r0, _0204DD10 ; =UNK_021C5A68 ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02026CB4 ldr r0, _0204DD10 ; =UNK_021C5A68 ldr r1, [r0, #0x0] @@ -4108,7 +4108,7 @@ _0204E9B8: cmp r0, #0x0 bne _0204EA7C ldr r0, [r1, #0x54] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02026CB4 add r1, r4, #0x0 bl FUN_02026908 @@ -4644,7 +4644,7 @@ _0204EE36: str r2, [r3, r0] ldr r5, [r1, #0x0] ldr r0, [r5, #0x54] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02026CC4 mov r1, #0x29 add r2, r5, r4 @@ -5229,7 +5229,7 @@ FUN_0204F2D8: ; 0x0204F2D8 add r5, r2, #0x0 ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02026CB4 add r4, r0, #0x0 ldrb r0, [r5, #0x0] @@ -5466,7 +5466,7 @@ _0204F4D2: ldr r0, _0204F5E0 ; =UNK_021C5A68 ldr r0, [r0, #0x0] ldr r0, [r0, #0x54] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02026CB4 add r4, r0, #0x0 bl FUN_020269A0 diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s index 43c89f86..32c2e3c1 100644 --- a/arm9/asm/unk_0204FBA8.s +++ b/arm9/asm/unk_0204FBA8.s @@ -146,7 +146,7 @@ FUN_0204FC5C: ; 0x0204FC5C ldr r1, [r1, #0x0] cmp r1, #0x0 bne _0204FC9A - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02031824 add r0, r4, #0x0 bl FUN_0204FBB0 @@ -444,7 +444,7 @@ FUN_0204FEB0: ; 0x0204FEB0 cmp r0, #0x0 bne _0204FEE8 add r0, r5, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr mov r1, #0x0 add r3, r5, #0x0 str r1, [sp, #0x0] @@ -475,7 +475,7 @@ FUN_0204FEF0: ; 0x0204FEF0 cmp r0, #0x0 bne _0204FF28 add r0, r5, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr mov r1, #0x0 add r3, r5, #0x0 str r1, [sp, #0x0] diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index f620cb87..4ae557da 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -181,7 +181,7 @@ FUN_02052110: ; 0x02052110 mov r0, #0x0 pop {r4-r6, pc} _0205211E: - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr add r6, r0, #0x0 bl FUN_02031A7C mov r1, #0x19 diff --git a/arm9/asm/unk_0205CDB4.s b/arm9/asm/unk_0205CDB4.s index c12eb45a..65a38f16 100644 --- a/arm9/asm/unk_0205CDB4.s +++ b/arm9/asm/unk_0205CDB4.s @@ -24,7 +24,7 @@ UNK_020F7240: ; 0x020F7240 FUN_0205CDB4: ; 0x0205CDB4 push {r4, lr} add r4, r0, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 bl FUN_020254B4 add r1, r0, #0x0 @@ -43,7 +43,7 @@ _0205CDD4: .word UNK_020F7220 FUN_0205CDD8: ; 0x0205CDD8 push {r4, lr} add r4, r0, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 bl FUN_020254B4 cmp r0, #0x0 @@ -68,7 +68,7 @@ FUN_0205CE00: ; 0x0205CE00 add r4, r1, #0x0 add r7, r2, #0x0 str r3, [sp, #0x4] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 bl FUN_020254B4 cmp r0, #0x0 diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s index 73dc567c..43358f72 100644 --- a/arm9/asm/unk_0205F7A0.s +++ b/arm9/asm/unk_0205F7A0.s @@ -70,7 +70,7 @@ _0205F806: str r0, [r5, #0x4] _0205F812: ldr r0, [sp, #0x0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr bl PlayerProfile_GetTrainerGender str r0, [r5, #0xc] diff --git a/arm9/asm/unk_020647A4.s b/arm9/asm/unk_020647A4.s index 1abe1353..cba18409 100644 --- a/arm9/asm/unk_020647A4.s +++ b/arm9/asm/unk_020647A4.s @@ -47,7 +47,7 @@ FUN_020647A4: ; 0x020647A4 push {r3-r7, lr} sub sp, #0x30 add r4, r0, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #0x7 bl FUN_020254A0 @@ -137,7 +137,7 @@ _02064868: .word UNK_020F7D4C FUN_0206486C: ; 0x0206486C push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 add r5, r0, #0x0 mov r1, #0x7 @@ -325,7 +325,7 @@ _020649AC: .word 0x00000125 thumb_func_start FUN_020649B0 FUN_020649B0: ; 0x020649B0 push {r3, lr} - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #0x7 bl FUN_020254A0 @@ -346,7 +346,7 @@ _020649CC: FUN_020649D4: ; 0x020649D4 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #0x7 bl FUN_020254A0 diff --git a/arm9/asm/unk_02064CA8.s b/arm9/asm/unk_02064CA8.s index 3af0633e..851aec52 100644 --- a/arm9/asm/unk_02064CA8.s +++ b/arm9/asm/unk_02064CA8.s @@ -17,7 +17,7 @@ UNK_020F7E54: ; 0x020F7E54 thumb_func_start FUN_02064CA8 FUN_02064CA8: ; 0x02064CA8 push {r4, lr} - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 add r4, r0, #0x0 mov r1, #0x1 @@ -33,7 +33,7 @@ FUN_02064CA8: ; 0x02064CA8 FUN_02064CC8: ; 0x02064CC8 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 add r4, r0, #0x0 mov r1, #0x2 @@ -67,7 +67,7 @@ _02064D08: thumb_func_start FUN_02064D10 FUN_02064D10: ; 0x02064D10 push {r4-r6, lr} - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 add r4, r0, #0x0 mov r1, #0x3 @@ -95,7 +95,7 @@ _02064D48: .word UNK_020F7E54 thumb_func_start FUN_02064D4C FUN_02064D4C: ; 0x02064D4C push {r4-r6, lr} - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 add r4, r0, #0x0 mov r1, #0x4 @@ -130,7 +130,7 @@ FUN_02064D88: ; 0x02064D88 bl ErrorHandling _02064D96: add r0, r7, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 add r4, r0, #0x0 mov r1, #0x5 diff --git a/arm9/asm/unk_02064E20.s b/arm9/asm/unk_02064E20.s index c3b7b4bc..0665d211 100644 --- a/arm9/asm/unk_02064E20.s +++ b/arm9/asm/unk_02064E20.s @@ -6,7 +6,7 @@ thumb_func_start FUN_02064E20 FUN_02064E20: ; 0x02064E20 push {r4, lr} - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 add r4, r0, #0x0 bl FUN_020254B4 diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s index e645d179..319e816e 100644 --- a/arm9/asm/unk_02064E90.s +++ b/arm9/asm/unk_02064E90.s @@ -14,7 +14,7 @@ FUN_02064E90: ; 0x02064E90 add r0, r6, #0x0 str r3, [sp, #0x1c] ldr r5, [sp, #0xbc] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr str r0, [sp, #0x20] bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 @@ -218,7 +218,7 @@ _02065074: .word FreeToHeap thumb_func_start FUN_02065078 FUN_02065078: ; 0x02065078 push {r3-r7, lr} - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr add r7, r0, #0x0 bl FUN_02029FC8 add r6, r0, #0x0 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index edeab8fa..22b20ee4 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -55,7 +55,7 @@ FUN_020653EC: ; 0x020653EC bl MI_CpuFill8 add r0, r5, #0x0 str r6, [r4, #0x4] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr mov r1, #0x5b lsl r1, r1, #0x2 str r5, [r4, r1] @@ -1807,7 +1807,7 @@ FUN_020661F8: ; 0x020661F8 mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl SavArray_PlayerParty_get add r1, r7, #0x0 bl GetPartyMonByIndex @@ -2376,19 +2376,19 @@ _02066676: mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl SavArray_PlayerParty_get str r0, [r4, #0x0] mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_Bag_get str r0, [r4, #0x4] mov r0, #0x5b lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0xc] mov r0, #0x5b diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 8eb1213d..51dec0d5 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -111,7 +111,7 @@ _02080CB4: bl GetPartyMonByIndex add r7, r0, #0x0 add r0, r6, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr mov r1, #0xb str r0, [sp, #0x0] diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index c83c9aff..9e58b5cc 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -274,7 +274,7 @@ _020862D6: bl FUN_02046528 add r6, r0, #0x0 ldr r5, [r4, #0xc] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr add r7, r0, #0x0 ldr r0, [r6, #0x1c] @@ -299,7 +299,7 @@ _020862D6: mov r2, #0x0 bl SetMonData add r0, r6, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr ldr r1, [r4, #0xc] bl FUN_0202C144 ldr r0, [r4, #0x4] @@ -322,7 +322,7 @@ _0208633A: bl GetMonData add r7, r0, #0x0 add r0, r6, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x0] mov r0, #0xb diff --git a/arm9/asm/unk_0208890C.s b/arm9/asm/unk_0208890C.s index 58ffb9d8..d27130c9 100644 --- a/arm9/asm/unk_0208890C.s +++ b/arm9/asm/unk_0208890C.s @@ -56,7 +56,7 @@ FUN_02088960: ; 0x02088960 add r5, r0, #0x0 add r4, r1, #0x0 add r6, r2, #0x0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr add r3, r5, #0x0 add r3, #0x98 add r1, r0, #0x0 |