diff options
Diffstat (limited to 'arm9/modules/06/asm/module_06.s')
| -rw-r--r-- | arm9/modules/06/asm/module_06.s | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index ee5fe56a..4b2128f2 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -5042,7 +5042,7 @@ _0223BBDA: cmp r0, #0xc blt _0223BBDA add r0, r5, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024DA0 bl FUN_02024CA4 add r6, r0, #0 @@ -5479,7 +5479,7 @@ _0223BF7E: cmp r0, #0xc blt _0223BF7E add r0, r5, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024DA0 bl FUN_02024CA4 add r6, r0, #0 @@ -5789,7 +5789,7 @@ _0223C222: cmp r0, #0xc blt _0223C222 add r0, r5, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024DA0 bl FUN_02024CA4 add r6, r0, #0 @@ -5930,7 +5930,7 @@ _0223C350: cmp r0, #1 bne _0223C38C add r0, r5, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr bl PlayerProfile_GetTrainerID str r0, [sp] @@ -11442,7 +11442,7 @@ _0223EF28: str r0, [r2, #0x74] ldr r0, [r1] ldr r0, [r0, #0x68] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr ldr r1, _0223EFF4 ; =0x02252420 ldr r1, [r1] @@ -15699,7 +15699,7 @@ MOD06_02241230: ; 0x02241230 cmp r0, #0 beq _022412E0 add r0, r4, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #1 bl FUN_020254A0 @@ -16188,7 +16188,7 @@ MOD06_02241670: ; 0x02241670 push {r4, r5, r6, r7, lr} sub sp, #0x2c add r4, r0, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #1 bl FUN_020254A0 @@ -16412,7 +16412,7 @@ MOD06_0224186C: ; 0x0224186C push {r3, r4, r5, r6, lr} sub sp, #0x24 add r5, r0, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #2 bl FUN_020254A0 @@ -16499,7 +16499,7 @@ MOD06_02241914: ; 0x02241914 mov r0, #0 str r0, [r6] add r0, r5, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #2 bl FUN_020254A0 @@ -16820,7 +16820,7 @@ MOD06_02241BB0: ; 0x02241BB0 add r5, r0, #0 ldr r0, [r5] add r4, r1, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #3 bl FUN_020254A0 @@ -17604,7 +17604,7 @@ MOD06_02242224: ; 0x02242224 push {r4, r5, r6, r7, lr} sub sp, #0x5c add r6, r0, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #3 bl FUN_020254A0 @@ -17830,7 +17830,7 @@ _02242400: .word 0x000076A0 MOD06_02242404: ; 0x02242404 push {r4, lr} add r4, r0, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 bl FUN_020254B4 cmp r0, #3 @@ -17989,7 +17989,7 @@ MOD06_0224252C: ; 0x0224252C add r5, r0, #0 ldr r0, [r5] add r4, r1, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #4 bl FUN_020254A0 @@ -18060,7 +18060,7 @@ MOD06_022425C8: ; 0x022425C8 push {r4, r5, r6, r7, lr} sub sp, #0x24 str r0, [sp, #8] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #4 bl FUN_020254A0 @@ -18173,7 +18173,7 @@ MOD06_02242698: ; 0x02242698 MOD06_022426AC: ; 0x022426AC push {r3, r4, r5, lr} add r5, r0, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 bl FUN_020254B4 cmp r0, #4 @@ -18472,7 +18472,7 @@ MOD06_022428D8: ; 0x022428D8 push {r4, r5, r6, r7, lr} sub sp, #0x2c add r5, r0, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #5 bl FUN_020254A0 @@ -18652,7 +18652,7 @@ MOD06_02242A38: ; 0x02242A38 push {r3, r4, r5, r6, r7, lr} add r7, r0, #0 add r5, r1, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #5 bl FUN_020254A0 @@ -23652,7 +23652,7 @@ _02245098: cmp r0, #0xc blo _02245098 add r0, r5, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024DA0 bl FUN_02024CA4 add r6, r0, #0 @@ -23816,7 +23816,7 @@ MOD06_022451F4: ; 0x022451F4 push {r3, r4, lr} sub sp, #0x14 add r4, r0, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #6 bl FUN_020254A0 @@ -23871,7 +23871,7 @@ MOD06_0224525C: ; 0x0224525C add r7, r0, #0 add r6, r1, #0 str r2, [sp] - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #6 bl FUN_020254A0 @@ -23989,7 +23989,7 @@ _0224533C: .word MOD06_02245360 MOD06_02245340: ; 0x02245340 push {r4, lr} add r4, r1, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr bl FUN_02024ED8 mov r1, #6 bl FUN_020254A0 @@ -40845,7 +40845,7 @@ MOD06_0224D46C: ; 0x0224D46C bl FUN_020377A8 add r5, r0, #0 add r0, r4, #0 - bl FUN_020377AC + bl ScriptEnvironment_GetSav2Ptr str r0, [sp, #0x1c] mov r0, #0xb mov r1, #0x18 |