diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 10:01:13 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 10:01:13 -0400 |
| commit | d5446788d822324d58b5a814fe6ca7aaaf6fa6d2 (patch) | |
| tree | 29f21fc278c47d864d99a69559e6e0a3677a6ecd | |
| parent | 63b86e7eccca4887515549f6e3ad8029010cd422 (diff) | |
Rename scrcmds related to flags
96 files changed, 815 insertions, 815 deletions
diff --git a/arm9/asm/save.s b/arm9/asm/save.s index f4fe3815..7f02ab02 100644 --- a/arm9/asm/save.s +++ b/arm9/asm/save.s @@ -22,7 +22,7 @@ UNK_020EE700: ; 0x020EE700 .word 0x01, 0x00, FUN_020238C4, FUN_020238C8 .word 0x02, 0x00, FUN_0206B8A4, FUN_0206B8C0 .word 0x03, 0x00, FUN_0206EB80, FUN_0206EBA0 - .word 0x04, 0x00, FUN_02046294, FUN_0204629C + .word 0x04, 0x00, SavArray_Flags_sizeof, SavArray_Flags_memclear .word 0x05, 0x00, FUN_0204BE14, FUN_0204BE18 .word 0x06, 0x00, FUN_02034D7C, FUN_02034D98 .word 0x07, 0x00, FUN_02023D64, FUN_02024378 @@ -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 diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 1853bbd6..28154fc5 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -90,7 +90,7 @@ 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 @@ -595,8 +595,8 @@ ScrCmd_return: ; 0x02039DC4 pop {r3, pc} .balign 4 - thumb_func_start ScrCmd_gotoif -ScrCmd_gotoif: ; 0x02039DD0 + thumb_func_start ScrCmd_goto_if +ScrCmd_goto_if: ; 0x02039DD0 push {r3-r5, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -623,8 +623,8 @@ _02039DFC: .balign 4 _02039E00: .word sScriptConditionTable - thumb_func_start ScrCmd_callif -ScrCmd_callif: ; 0x02039E04 + thumb_func_start ScrCmd_call_if +ScrCmd_call_if: ; 0x02039E04 push {r3-r5, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -651,8 +651,8 @@ _02039E30: .balign 4 _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 @@ -660,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 @@ -673,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 @@ -687,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} @@ -715,7 +715,7 @@ FUN_02039E84: ; 0x02039E84 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} @@ -735,7 +735,7 @@ FUN_02039EC0: ; 0x02039EC0 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 @@ -751,7 +751,7 @@ 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 @@ -769,7 +769,7 @@ 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 @@ -788,7 +788,7 @@ 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 @@ -796,8 +796,8 @@ FUN_02039F30: ; 0x02039F30 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 @@ -812,15 +812,15 @@ FUN_02039F58: ; 0x02039F58 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 @@ -835,15 +835,15 @@ FUN_02039F88: ; 0x02039F88 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 @@ -860,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 @@ -883,8 +883,8 @@ FUN_02039FDC: ; 0x02039FDC 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 @@ -899,7 +899,7 @@ FUN_0203A00C: ; 0x0203A00C 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} @@ -925,7 +925,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 @@ -933,7 +933,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 @@ -960,7 +960,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 @@ -968,7 +968,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 @@ -1141,7 +1141,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 @@ -1252,7 +1252,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] @@ -1281,7 +1281,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 @@ -1315,7 +1315,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] @@ -1440,7 +1440,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 @@ -2501,14 +2501,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 @@ -2759,7 +2759,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 @@ -2767,14 +2767,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 @@ -2870,7 +2870,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 @@ -2915,7 +2915,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 @@ -2923,7 +2923,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 @@ -2931,7 +2931,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 @@ -3306,7 +3306,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 @@ -3396,7 +3396,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 @@ -3429,7 +3429,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 @@ -3447,7 +3447,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 @@ -3455,7 +3455,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 @@ -3602,7 +3602,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 @@ -3662,7 +3662,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 @@ -3670,7 +3670,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 @@ -3678,7 +3678,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 @@ -3760,7 +3760,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 @@ -3785,7 +3785,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 @@ -3821,7 +3821,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] @@ -3879,7 +3879,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 @@ -3908,7 +3908,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 @@ -3916,7 +3916,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] @@ -3939,7 +3939,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 @@ -4078,7 +4078,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 @@ -4086,7 +4086,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 @@ -4094,7 +4094,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 @@ -4102,7 +4102,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] @@ -4193,7 +4193,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 @@ -4254,7 +4254,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 @@ -4528,7 +4528,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 @@ -4536,7 +4536,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] @@ -4595,7 +4595,7 @@ 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 @@ -4778,7 +4778,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 @@ -4794,7 +4794,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 @@ -4975,7 +4975,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] @@ -5125,7 +5125,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 @@ -5133,7 +5133,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 @@ -5304,7 +5304,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 @@ -5402,7 +5402,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 @@ -5522,7 +5522,7 @@ 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 @@ -5590,7 +5590,7 @@ 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 @@ -5629,7 +5629,7 @@ 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 @@ -5683,14 +5683,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 @@ -5769,7 +5769,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 @@ -5777,7 +5777,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 @@ -5808,7 +5808,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 @@ -5816,7 +5816,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 @@ -5893,7 +5893,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 @@ -5922,7 +5922,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 @@ -5946,7 +5946,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 @@ -5973,7 +5973,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 @@ -5981,7 +5981,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] @@ -6056,7 +6056,7 @@ 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 @@ -6330,7 +6330,7 @@ FUN_0203CBBC: ; 0x0203CBBC 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 @@ -6363,7 +6363,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 @@ -6371,7 +6371,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] @@ -6418,7 +6418,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 @@ -6426,7 +6426,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 @@ -6434,7 +6434,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 @@ -6489,7 +6489,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 @@ -6497,7 +6497,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 @@ -6505,7 +6505,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 @@ -6605,7 +6605,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 @@ -6613,7 +6613,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 @@ -6621,7 +6621,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 @@ -6629,7 +6629,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 @@ -6637,7 +6637,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] @@ -6839,7 +6839,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 @@ -6882,7 +6882,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 @@ -6890,7 +6890,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] @@ -6921,7 +6921,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 @@ -6929,7 +6929,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] @@ -6953,7 +6953,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 @@ -6961,7 +6961,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] @@ -7156,7 +7156,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 @@ -7178,7 +7178,7 @@ 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 @@ -7204,7 +7204,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 @@ -7524,7 +7524,7 @@ 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 @@ -7625,14 +7625,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 @@ -7790,7 +7790,7 @@ 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 @@ -7834,7 +7834,7 @@ 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 @@ -7871,7 +7871,7 @@ FUN_0203D834: ; 0x0203D834 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 @@ -7898,7 +7898,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] @@ -8019,7 +8019,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 @@ -8048,7 +8048,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 @@ -8056,7 +8056,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 @@ -8064,7 +8064,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] @@ -8085,7 +8085,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 @@ -8093,7 +8093,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 @@ -8101,7 +8101,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 @@ -8109,7 +8109,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 @@ -8117,7 +8117,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] @@ -8146,7 +8146,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 @@ -8154,7 +8154,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] @@ -8172,7 +8172,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 @@ -8180,7 +8180,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] @@ -8198,7 +8198,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 @@ -8206,7 +8206,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 @@ -8214,7 +8214,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] @@ -8234,7 +8234,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 @@ -8242,7 +8242,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 @@ -8250,7 +8250,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] @@ -8270,7 +8270,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 @@ -8278,7 +8278,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] @@ -8310,7 +8310,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 @@ -8334,7 +8334,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 @@ -8342,7 +8342,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 @@ -8538,7 +8538,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 @@ -8607,7 +8607,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 @@ -8649,7 +8649,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 @@ -8669,7 +8669,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 @@ -8704,7 +8704,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 @@ -8729,7 +8729,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 @@ -8781,7 +8781,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 @@ -8822,7 +8822,7 @@ FUN_0203DFA8: ; 0x0203DFA8 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 @@ -8847,7 +8847,7 @@ FUN_0203DFE0: ; 0x0203DFE0 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 @@ -8875,7 +8875,7 @@ FUN_0203E018: ; 0x0203E018 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 @@ -8895,7 +8895,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 @@ -8914,7 +8914,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 @@ -8922,14 +8922,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 @@ -8952,7 +8952,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 @@ -8960,14 +8960,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 @@ -8984,7 +8984,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 @@ -8997,7 +8997,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] @@ -9022,7 +9022,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 @@ -9030,7 +9030,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 @@ -9038,21 +9038,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] @@ -9139,7 +9139,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 @@ -9147,7 +9147,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] @@ -9169,7 +9169,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 @@ -9177,7 +9177,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 @@ -9209,7 +9209,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 @@ -9217,7 +9217,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 @@ -9255,7 +9255,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] @@ -9277,7 +9277,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 @@ -9571,7 +9571,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 @@ -9742,7 +9742,7 @@ 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 @@ -9828,12 +9828,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 @@ -9854,7 +9854,7 @@ FUN_0203E81C: ; 0x0203E81C 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 @@ -9965,7 +9965,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] @@ -10075,7 +10075,7 @@ 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] @@ -10187,7 +10187,7 @@ 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] @@ -10219,7 +10219,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 @@ -10239,7 +10239,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 @@ -10247,7 +10247,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 @@ -10334,7 +10334,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 @@ -10342,7 +10342,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 @@ -10350,14 +10350,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] @@ -10563,7 +10563,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 @@ -10665,7 +10665,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 @@ -10695,7 +10695,7 @@ 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 @@ -10843,7 +10843,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} @@ -10854,7 +10854,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} @@ -10868,7 +10868,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] @@ -10905,7 +10905,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 @@ -10913,7 +10913,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 @@ -10921,7 +10921,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 @@ -10929,7 +10929,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 @@ -10937,7 +10937,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 @@ -10969,7 +10969,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 @@ -10977,7 +10977,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 @@ -10985,7 +10985,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 @@ -11125,7 +11125,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 @@ -11141,7 +11141,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 @@ -11150,7 +11150,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 @@ -11182,7 +11182,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 @@ -11198,7 +11198,7 @@ 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 @@ -11234,7 +11234,7 @@ FUN_0203F31C: ; 0x0203F31C 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 @@ -11250,7 +11250,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 @@ -11258,7 +11258,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] @@ -11308,7 +11308,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 @@ -11373,7 +11373,7 @@ 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 @@ -11467,7 +11467,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 @@ -11475,7 +11475,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] @@ -11569,7 +11569,7 @@ 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 @@ -11592,7 +11592,7 @@ 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 @@ -11615,7 +11615,7 @@ 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 @@ -11742,7 +11742,7 @@ FUN_0203F720: ; 0x0203F720 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 @@ -11815,7 +11815,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 @@ -11937,7 +11937,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 @@ -11985,7 +11985,7 @@ 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 @@ -12010,7 +12010,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 @@ -12078,7 +12078,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] @@ -12106,7 +12106,7 @@ 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 @@ -12148,7 +12148,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 @@ -12156,7 +12156,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 @@ -12164,14 +12164,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 @@ -12304,7 +12304,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 @@ -12312,7 +12312,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 @@ -12320,7 +12320,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] @@ -12347,7 +12347,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 diff --git a/arm9/asm/scrcmd_10.s b/arm9/asm/scrcmd_10.s index 74a353a9..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 @@ -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 @@ -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 @@ -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,7 +929,7 @@ 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 @@ -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 diff --git a/arm9/asm/scrcmd_11.s b/arm9/asm/scrcmd_11.s index 87a35776..5612284f 100644 --- a/arm9/asm/scrcmd_11.s +++ b/arm9/asm/scrcmd_11.s @@ -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 ddd96a2e..beedb7f2 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -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 @@ -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 @@ -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 diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s index 7d46976a..c554aeae 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 @@ -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 diff --git a/arm9/asm/scrcmd_14.s b/arm9/asm/scrcmd_14.s index 62ef3126..2411d031 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 @@ -107,7 +107,7 @@ FUN_02043AFC: ; 0x02043AFC 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 @@ -128,7 +128,7 @@ FUN_02043B28: ; 0x02043B28 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 @@ -257,7 +257,7 @@ FUN_02043C28: ; 0x02043C28 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 diff --git a/arm9/asm/scrcmd_15.s b/arm9/asm/scrcmd_15.s index de83d43a..6553953b 100644 --- a/arm9/asm/scrcmd_15.s +++ b/arm9/asm/scrcmd_15.s @@ -51,7 +51,7 @@ FUN_02043CB4: ; 0x02043CB4 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 @@ -114,7 +114,7 @@ FUN_02043D28: ; 0x02043D28 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 @@ -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 dcb07b2a..60549188 100644 --- a/arm9/asm/scrcmd_16.s +++ b/arm9/asm/scrcmd_16.s @@ -35,7 +35,7 @@ FUN_02043E20: ; 0x02043E20 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,7 +63,7 @@ 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 @@ -103,11 +103,11 @@ FUN_02043E9C: ; 0x02043E9C 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 @@ -146,11 +146,11 @@ FUN_02043EFC: ; 0x02043EFC 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 @@ -183,11 +183,11 @@ FUN_02043F50: ; 0x02043F50 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,7 +214,7 @@ 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 @@ -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 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 @@ -341,7 +341,7 @@ FUN_020440C0: ; 0x020440C0 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 @@ -364,7 +364,7 @@ FUN_020440F0: ; 0x020440F0 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 diff --git a/arm9/asm/scrcmd_17.s b/arm9/asm/scrcmd_17.s index 4113e1de..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} @@ -41,7 +41,7 @@ FUN_0204416C: ; 0x0204416C 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 @@ -64,7 +64,7 @@ FUN_02044198: ; 0x02044198 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 9e7941a8..e85d33b2 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,7 +39,7 @@ 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 @@ -175,14 +175,14 @@ 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 @@ -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,7 +243,7 @@ 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] @@ -277,14 +277,14 @@ 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 @@ -353,7 +353,7 @@ FUN_02044598: ; 0x02044598 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] @@ -437,7 +437,7 @@ 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] @@ -470,7 +470,7 @@ FUN_0204469C: ; 0x0204469C 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 @@ -539,7 +539,7 @@ FUN_02044730: ; 0x02044730 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 @@ -581,7 +581,7 @@ FUN_0204478C: ; 0x0204478C 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 @@ -635,7 +635,7 @@ FUN_02044800: ; 0x02044800 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 @@ -699,7 +699,7 @@ FUN_0204488C: ; 0x0204488C 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 @@ -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] @@ -822,14 +822,14 @@ 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 @@ -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 @@ -947,7 +947,7 @@ FUN_02044A94: ; 0x02044A94 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 @@ -1051,7 +1051,7 @@ FUN_02044B84: ; 0x02044B84 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 @@ -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 @@ -1296,7 +1296,7 @@ FUN_02044D8C: ; 0x02044D8C 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 @@ -1370,14 +1370,14 @@ 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 @@ -1408,14 +1408,14 @@ 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 @@ -1449,7 +1449,7 @@ FUN_02044ED8: ; 0x02044ED8 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 @@ -1473,7 +1473,7 @@ 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 @@ -1508,7 +1508,7 @@ FUN_02044F58: ; 0x02044F58 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 @@ -1573,7 +1573,7 @@ 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] @@ -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,7 +1718,7 @@ 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] @@ -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 diff --git a/arm9/asm/scrcmd_19.s b/arm9/asm/scrcmd_19.s index 4b56e4fd..0e036f08 100644 --- a/arm9/asm/scrcmd_19.s +++ b/arm9/asm/scrcmd_19.s @@ -68,7 +68,7 @@ FUN_020452B4: ; 0x020452B4 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] @@ -122,7 +122,7 @@ FUN_02045308: ; 0x02045308 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..56edda7a 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 @@ -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 626a6617..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 diff --git a/arm9/asm/scrcmd_21.s b/arm9/asm/scrcmd_21.s index 1eb36e3b..82be9edb 100644 --- a/arm9/asm/scrcmd_21.s +++ b/arm9/asm/scrcmd_21.s @@ -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 @@ -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 @@ -151,7 +151,7 @@ FUN_02045500: ; 0x02045500 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 @@ -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} @@ -223,7 +223,7 @@ FUN_02045590: ; 0x02045590 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} @@ -266,7 +266,7 @@ FUN_020455E4: ; 0x020455E4 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} @@ -309,7 +309,7 @@ FUN_02045638: ; 0x02045638 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 @@ -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 @@ -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 diff --git a/arm9/asm/scrcmd_22.s b/arm9/asm/scrcmd_22.s index 274880d3..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,7 +23,7 @@ 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 @@ -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,7 +62,7 @@ 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 @@ -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,7 +101,7 @@ 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 @@ -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,7 +140,7 @@ 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 @@ -168,7 +168,7 @@ 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 @@ -192,7 +192,7 @@ 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 diff --git a/arm9/asm/scrcmd_23.s b/arm9/asm/scrcmd_23.s index 77100912..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,7 +24,7 @@ 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 @@ -49,14 +49,14 @@ 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 @@ -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,7 +88,7 @@ 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 @@ -113,14 +113,14 @@ 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 @@ -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,7 +152,7 @@ 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 @@ -177,14 +177,14 @@ 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 @@ -204,14 +204,14 @@ 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 @@ -231,14 +231,14 @@ 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 @@ -262,14 +262,14 @@ 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 @@ -290,14 +290,14 @@ 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 @@ -317,14 +317,14 @@ 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 @@ -344,14 +344,14 @@ 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 @@ -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,7 +383,7 @@ 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 @@ -410,14 +410,14 @@ 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 @@ -437,14 +437,14 @@ 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 @@ -464,14 +464,14 @@ 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 diff --git a/arm9/asm/scrcmd_24.s b/arm9/asm/scrcmd_24.s index 396b4842..21d69bf9 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 @@ -95,7 +95,7 @@ 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] @@ -177,7 +177,7 @@ 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 @@ -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,7 +214,7 @@ 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 diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 75d058db..94f3a29e 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 @@ -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,7 +111,7 @@ 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 @@ -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] @@ -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] @@ -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] @@ -639,7 +639,7 @@ 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 @@ -670,7 +670,7 @@ 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 @@ -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] @@ -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 diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index 16052c26..01a329ac 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -87,7 +87,7 @@ 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 @@ -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,7 +310,7 @@ 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 @@ -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 @@ -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,14 +931,14 @@ 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 @@ -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 f554a4dd..7236adb1 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -16,7 +16,7 @@ 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 @@ -71,7 +71,7 @@ FUN_020411C4: ; 0x020411C4 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 @@ -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 5d0ae66c..71037451 100644 --- a/arm9/asm/scrcmd_6.s +++ b/arm9/asm/scrcmd_6.s @@ -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,14 +226,14 @@ 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 @@ -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 e093cb1f..a49b7e4f 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 @@ -187,7 +187,7 @@ 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 @@ -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] @@ -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 diff --git a/arm9/asm/scrcmd_8.s b/arm9/asm/scrcmd_8.s index 374a2db4..66812dad 100644 --- a/arm9/asm/scrcmd_8.s +++ b/arm9/asm/scrcmd_8.s @@ -50,7 +50,7 @@ _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 @@ -73,7 +73,7 @@ _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 @@ -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] @@ -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 diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index 38ef38fb..5237dbff 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -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 @@ -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 @@ -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] @@ -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 @@ -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 @@ -414,7 +414,7 @@ _02042170: 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 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_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_020238C4.s b/arm9/asm/unk_020238C4.s index 70e0d568..4fce0bc3 100644 --- a/arm9/asm/unk_020238C4.s +++ b/arm9/asm/unk_020238C4.s @@ -32,23 +32,23 @@ FUN_020238C8: ; 0x020238C8 FUN_020238F4: ; 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 + 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 push {r3, lr} mov r1, #0x1 - bl FUN_02022610 + bl SavArray_get add r0, #0x24 pop {r3, pc} @@ -56,7 +56,7 @@ FUN_0202390C: ; 0x0202390C FUN_02023918: ; 0x02023918 push {r3, lr} mov r1, #0x1 - bl FUN_02022610 + bl SavArray_get add r0, #0x26 pop {r3, pc} 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..4b843054 100644 --- a/arm9/asm/unk_02025658.s +++ b/arm9/asm/unk_02025658.s @@ -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..acc65fb4 100644 --- a/arm9/asm/unk_02025954.s +++ b/arm9/asm/unk_02025954.s @@ -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_02028980.s b/arm9/asm/unk_02028980.s index d57c7ccd..17a80dc8 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 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_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..aec30280 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 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_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 5a8b5870..92b5c194 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 @@ -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 @@ -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 @@ -1669,7 +1669,7 @@ FUN_02035D34: ; 0x02035D34 bl FUN_020238F4 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] @@ -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 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..e275d614 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -1382,7 +1382,7 @@ FUN_02038144: ; 0x02038144 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 @@ -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 @@ -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 diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 2adc2a8c..4a5d0abb 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -177,21 +177,21 @@ gScriptCmdTable: ; 0x020F355C .word FUN_02039D78 .word ScrCmd_call .word ScrCmd_return - .word ScrCmd_gotoif - .word ScrCmd_callif - .word FUN_02039E38 - .word FUN_02039E50 - .word FUN_02039E68 + .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 ScrCmd_addvar + .word ScrCmd_subvar + .word ScrCmd_setvar + .word ScrCmd_copyvar + .word ScrCmd_setorcopyvar .word FUN_0203A038 .word FUN_0203A2C4 .word FUN_0203A304 @@ -1946,7 +1946,7 @@ GetVarPointer: ; 0x020394B8 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 @@ -1969,8 +1969,8 @@ _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 GetVarPointer @@ -1996,41 +1996,41 @@ _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 @@ -2038,10 +2038,10 @@ FUN_02039550: ; 0x02039550 FUN_02039564: ; 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] @@ -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: @@ -2157,13 +2157,13 @@ FUN_02039640: ; 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 @@ -2172,13 +2172,13 @@ FUN_0203965C: ; 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 @@ -2187,13 +2187,13 @@ FUN_02039678: ; 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] @@ -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 index c3840e61..ca4a05c3 100644 --- a/arm9/asm/unk_02046294.s +++ b/arm9/asm/unk_02046294.s @@ -9,15 +9,15 @@ UNK_021C5A14: ; 0x021C5A14 .text - thumb_func_start FUN_02046294 -FUN_02046294: ; 0x02046294 + thumb_func_start SavArray_Flags_sizeof +SavArray_Flags_sizeof: ; 0x02046294 mov r0, #0xeb lsl r0, r0, #0x2 bx lr .balign 4 - thumb_func_start FUN_0204629C -FUN_0204629C: ; 0x0204629C + thumb_func_start SavArray_Flags_memclear +SavArray_Flags_memclear: ; 0x0204629C ldr r3, _020462A8 ; =memset mov r2, #0xeb mov r1, #0x0 @@ -26,19 +26,19 @@ FUN_0204629C: ; 0x0204629C nop _020462A8: .word memset - thumb_func_start FUN_020462AC -FUN_020462AC: ; 0x020462AC - ldr r3, _020462B4 ; =FUN_02022610 + thumb_func_start SavArray_Flags_get +SavArray_Flags_get: ; 0x020462AC + ldr r3, _020462B4 ; =SavArray_get mov r1, #0x4 bx r3 nop -_020462B4: .word FUN_02022610 +_020462B4: .word SavArray_get - thumb_func_start FUN_020462B8 -FUN_020462B8: ; 0x020462B8 + thumb_func_start CheckFlagInArray +CheckFlagInArray: ; 0x020462B8 push {r3-r5, lr} add r4, r1, #0x0 - bl FUN_02046338 + bl GetFlagAddr cmp r0, #0x0 beq _020462DE lsr r3, r4, #0x1f @@ -60,11 +60,11 @@ _020462E0: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_020462E4 -FUN_020462E4: ; 0x020462E4 + thumb_func_start SetFlagInArray +SetFlagInArray: ; 0x020462E4 push {r4-r6, lr} add r4, r1, #0x0 - bl FUN_02046338 + bl GetFlagAddr cmp r0, #0x0 beq _02046308 lsr r5, r4, #0x1f @@ -83,11 +83,11 @@ _02046308: pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0204630C -FUN_0204630C: ; 0x0204630C + thumb_func_start ClearFlagInArray +ClearFlagInArray: ; 0x0204630C push {r4-r6, lr} add r4, r1, #0x0 - bl FUN_02046338 + bl GetFlagAddr cmp r0, #0x0 beq _02046334 lsr r5, r4, #0x1f @@ -108,8 +108,8 @@ _02046334: pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_02046338 -FUN_02046338: ; 0x02046338 + thumb_func_start GetFlagAddr +GetFlagAddr: ; 0x02046338 push {r3-r5, lr} add r5, r0, #0x0 cmp r1, #0x0 diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s index 8a0cf5cd..d8e5f610 100644 --- a/arm9/asm/unk_0204653C.s +++ b/arm9/asm/unk_0204653C.s @@ -197,7 +197,7 @@ _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 @@ -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,7 +765,7 @@ _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 diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 4e65221d..f8f5f1af 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -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] @@ -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 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 4fd3babb..09dafdbb 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -265,7 +265,7 @@ 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 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index a9dc8bae..0d97ea59 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -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 @@ -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 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..4ac82dfe 100644 --- a/arm9/asm/unk_0204B0A0.s +++ b/arm9/asm/unk_0204B0A0.s @@ -151,7 +151,7 @@ FUN_0204B1DC: ; 0x0204B1DC 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..010bec23 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -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 @@ -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] diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s index 6c8271dc..bb050ce7 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 diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s index 50e499bf..59dd489a 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] 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_0205CE48.s b/arm9/asm/unk_0205CE48.s index 65e31220..68b5eb85 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] @@ -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 @@ -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 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..40cdba15 100644 --- a/arm9/asm/unk_0205F314.s +++ b/arm9/asm/unk_0205F314.s @@ -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..8580b994 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] @@ -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_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_02060CCC.s b/arm9/asm/unk_02060CCC.s index cd102e3a..84bc9deb 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -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 @@ -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_0206367C.s b/arm9/asm/unk_0206367C.s index 1fa7aeb0..57e5b43a 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 diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s index 79c9b817..94a4ffde 100644 --- a/arm9/asm/unk_02063948.s +++ b/arm9/asm/unk_02063948.s @@ -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 @@ -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 @@ -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_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..ae175ec8 100644 --- a/arm9/asm/unk_02064E90.s +++ b/arm9/asm/unk_02064E90.s @@ -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 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_02079C70.s b/arm9/asm/unk_02079C70.s index 403f1cc1..15d30776 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} diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index e61283e8..30769699 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -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_02085338.s b/arm9/asm/unk_02085338.s index 303ad31a..410774f4 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 diff --git a/arm9/global.inc b/arm9/global.inc index 21dd38d9..dfec2af6 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1435,7 +1435,7 @@ .extern FUN_02022540 .extern FUN_0202254C .extern FUN_020225F8 -.extern FUN_02022610 +.extern SavArray_get .extern FUN_02022634 .extern FUN_0202263C .extern FUN_020226FC @@ -2681,11 +2681,11 @@ .extern FUN_02039438 .extern FUN_02039460 .extern GetVarPointer -.extern FUN_020394F0 +.extern VarGet .extern FUN_02039504 -.extern FUN_02039528 -.extern FUN_0203953C -.extern FUN_02039550 +.extern FlagCheck +.extern FlagSet +.extern FlagClear .extern FUN_02039564 .extern FUN_0203959C .extern FUN_020395BC @@ -2728,21 +2728,21 @@ .extern FUN_02039D78 .extern ScrCmd_call .extern ScrCmd_return -.extern ScrCmd_gotoif -.extern ScrCmd_callif -.extern FUN_02039E38 -.extern FUN_02039E50 -.extern FUN_02039E68 +.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 ScrCmd_addvar +.extern ScrCmd_subvar +.extern ScrCmd_setvar +.extern ScrCmd_copyvar +.extern ScrCmd_setorcopyvar .extern FUN_0203A038 .extern FUN_0203A04C .extern FUN_0203A098 @@ -3422,13 +3422,13 @@ .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 SavArray_Flags_sizeof +.extern SavArray_Flags_memclear +.extern SavArray_Flags_get +.extern CheckFlagInArray +.extern SetFlagInArray +.extern ClearFlagInArray +.extern GetFlagAddr .extern FUN_02046380 .extern FUN_020463CC .extern FUN_020463EC diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index 39ef4e7b..14425f2d 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 @@ -322,7 +322,7 @@ _021D8342: 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 @@ -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 @@ -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} @@ -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 @@ -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..fe98e120 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 @@ -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/module_05.s b/arm9/modules/05/asm/module_05.s index c3d8b34d..36dd0461 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -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 @@ -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] @@ -34831,7 +34831,7 @@ MOD05_021F3AB4: ; 0x021F3AB4 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] diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 349d6008..cdc23ba3 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -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 @@ -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] @@ -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 @@ -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 @@ -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] @@ -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 @@ -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 @@ -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 @@ -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/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 6013cb5d..78d31086 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 @@ -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 @@ -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 @@ -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 @@ -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 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/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 7d33bbfb..eb64cd58 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -236,7 +236,7 @@ MOD52_021D769C: ; 0x021D769C ldr r1, _021D76C4 ; =0x00000BB8 bl FUN_02023A14 add r0, r4, #0 - bl FUN_020462AC + bl SavArray_Flags_get bl FUN_0205ECD4 pop {r4, pc} .align 2, 0 diff --git a/arm9/src/party.c b/arm9/src/party.c index d7799fe2..e0eb2a93 100644 --- a/arm9/src/party.c +++ b/arm9/src/party.c @@ -123,5 +123,5 @@ BOOL PartyHasMon(struct PlayerParty * party, u16 species) struct PlayerParty * FUN_0206BB1C(void * ptr) { - return (struct PlayerParty *)FUN_02022610(ptr, 2); + return (struct PlayerParty *)SavArray_get(ptr, 2); } diff --git a/include/proto.h b/include/proto.h index c52b26ac..506d0992 100644 --- a/include/proto.h +++ b/include/proto.h @@ -16,7 +16,7 @@ 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 * SavArray_get(void *, int); void StringExpandPlaceholders(u32 *, struct String *, struct String *); #endif //POKEDIAMOND_PROTO_H |