diff options
-rw-r--r-- | arm9/asm/scrcmd.s | 370 | ||||
-rw-r--r-- | arm9/asm/scrcmd_10.s | 24 | ||||
-rw-r--r-- | arm9/asm/scrcmd_11.s | 10 | ||||
-rw-r--r-- | arm9/asm/scrcmd_12.s | 14 | ||||
-rw-r--r-- | arm9/asm/scrcmd_13.s | 4 | ||||
-rw-r--r-- | arm9/asm/scrcmd_14.s | 12 | ||||
-rw-r--r-- | arm9/asm/scrcmd_15.s | 4 | ||||
-rw-r--r-- | arm9/asm/scrcmd_16.s | 18 | ||||
-rw-r--r-- | arm9/asm/scrcmd_17.s | 4 | ||||
-rw-r--r-- | arm9/asm/scrcmd_18.s | 64 | ||||
-rw-r--r-- | arm9/asm/scrcmd_19.s | 8 | ||||
-rw-r--r-- | arm9/asm/scrcmd_20.s | 4 | ||||
-rw-r--r-- | arm9/asm/scrcmd_21.s | 22 | ||||
-rw-r--r-- | arm9/asm/scrcmd_22.s | 12 | ||||
-rw-r--r-- | arm9/asm/scrcmd_23.s | 32 | ||||
-rw-r--r-- | arm9/asm/scrcmd_24.s | 8 | ||||
-rw-r--r-- | arm9/asm/scrcmd_3.s | 28 | ||||
-rw-r--r-- | arm9/asm/scrcmd_5.s | 8 | ||||
-rw-r--r-- | arm9/asm/scrcmd_6.s | 6 | ||||
-rw-r--r-- | arm9/asm/scrcmd_7.s | 30 | ||||
-rw-r--r-- | arm9/asm/scrcmd_8.s | 6 | ||||
-rw-r--r-- | arm9/asm/scrcmd_9.s | 24 | ||||
-rw-r--r-- | arm9/asm/unk_02038C78.s | 134 | ||||
-rw-r--r-- | arm9/asm/unk_0205FA2C.s | 4 | ||||
-rw-r--r-- | arm9/global.inc | 20 |
25 files changed, 435 insertions, 435 deletions
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 54004fe3..1853bbd6 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -48,7 +48,7 @@ ScrCmd_delay: ; 0x020399B4 add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 - bl FUN_020394B8 + bl GetVarPointer strh r7, [r0, #0x0] ldr r1, _020399E4 ; =FUN_020399E8 add r0, r5, #0x0 @@ -68,7 +68,7 @@ FUN_020399E8: ; 0x020399E8 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer ldrh r1, [r0, #0x0] sub r1, r1, #0x1 strh r1, [r0, #0x0] @@ -204,8 +204,8 @@ FUN_02039ACC: ; 0x02039ACC mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039AE4 -FUN_02039AE4: ; 0x02039AE4 + thumb_func_start compare_012 +compare_012: ; 0x02039AE4 cmp r0, r1 bhs _02039AEC mov r0, #0x0 @@ -219,8 +219,8 @@ _02039AF4: mov r0, #0x2 bx lr - thumb_func_start FUN_02039AF8 -FUN_02039AF8: ; 0x02039AF8 + thumb_func_start ScrCmd_compare_local_to_local +ScrCmd_compare_local_to_local: ; 0x02039AF8 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x8] @@ -240,13 +240,13 @@ FUN_02039AF8: ; 0x02039AF8 ldr r1, [r1, #0x64] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_02039B28 -FUN_02039B28: ; 0x02039B28 + thumb_func_start ScrCmd_compare_local_to_value +ScrCmd_compare_local_to_value: ; 0x02039B28 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x8] @@ -261,14 +261,14 @@ FUN_02039B28: ; 0x02039B28 ldrb r1, [r1, #0x0] lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r4, pc} .balign 4 - thumb_func_start FUN_02039B50 -FUN_02039B50: ; 0x02039B50 + thumb_func_start ScrCmd_compare_local_to_addr +ScrCmd_compare_local_to_addr: ; 0x02039B50 push {r3-r5, lr} add r4, r0, #0x0 ldr r2, [r4, #0x8] @@ -283,13 +283,13 @@ FUN_02039B50: ; 0x02039B50 bl ScriptReadWord ldrb r1, [r0, #0x0] add r0, r5, #0x0 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02039B78 -FUN_02039B78: ; 0x02039B78 + thumb_func_start ScrCmd_compare_addr_to_local +ScrCmd_compare_addr_to_local: ; 0x02039B78 push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -303,14 +303,14 @@ FUN_02039B78: ; 0x02039B78 ldr r1, [r1, #0x64] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r4, pc} .balign 4 - thumb_func_start FUN_02039BA0 -FUN_02039BA0: ; 0x02039BA0 + thumb_func_start ScrCmd_compare_addr_to_value +ScrCmd_compare_addr_to_value: ; 0x02039BA0 push {r4, lr} add r4, r0, #0x0 bl ScriptReadWord @@ -319,13 +319,13 @@ FUN_02039BA0: ; 0x02039BA0 add r1, r2, #0x1 str r1, [r4, #0x8] ldrb r1, [r2, #0x0] - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_02039BBC -FUN_02039BBC: ; 0x02039BBC + thumb_func_start ScrCmd_compare_addr_to_addr +ScrCmd_compare_addr_to_addr: ; 0x02039BBC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadWord @@ -334,14 +334,14 @@ FUN_02039BBC: ; 0x02039BBC bl ScriptReadWord ldrb r1, [r0, #0x0] add r0, r4, #0x0 - bl FUN_02039AE4 + bl compare_012 strb r0, [r5, #0x2] mov r0, #0x0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02039BDC -FUN_02039BDC: ; 0x02039BDC + thumb_func_start ScrCmd_compare_var_to_value +ScrCmd_compare_var_to_value: ; 0x02039BDC push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -349,20 +349,20 @@ FUN_02039BDC: ; 0x02039BDC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldrh r5, [r0, #0x0] add r0, r4, #0x0 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02039AE4 + bl compare_012 strb r0, [r4, #0x2] mov r0, #0x0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02039C08 -FUN_02039C08: ; 0x02039C08 + thumb_func_start ScrCmd_compare_var_to_var +ScrCmd_compare_var_to_var: ; 0x02039C08 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -370,7 +370,7 @@ FUN_02039C08: ; 0x02039C08 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -378,11 +378,11 @@ FUN_02039C08: ; 0x02039C08 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldrh r0, [r4, #0x0] ldrh r1, [r1, #0x0] - bl FUN_02039AE4 + bl compare_012 strb r0, [r5, #0x2] mov r0, #0x0 pop {r3-r5, pc} @@ -405,7 +405,7 @@ FUN_02039C40: ; 0x02039C40 bl ScriptReadHalfword add r1, r0, #0x0 add r0, r5, #0x0 - bl FUN_02038EB0 + bl CreateScriptContext str r0, [r6, #0x0] ldrb r0, [r4, #0x0] add r0, r0, #0x1 @@ -438,7 +438,7 @@ FUN_02039C78: ; 0x02039C78 mov r0, #0x1 strb r0, [r6, #0x0] add r0, r5, #0x0 - bl FUN_02038EB0 + bl CreateScriptContext str r0, [r7, #0x0] ldrb r0, [r4, #0x0] ldr r1, _02039CC4 ; =FUN_02039CC8 @@ -704,14 +704,14 @@ FUN_02039E84: ; 0x02039E84 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldrh r1, [r6, #0x0] add r0, r5, #0x0 @@ -731,7 +731,7 @@ FUN_02039EC0: ; 0x02039EC0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldrh r1, [r1, #0x0] add r0, r4, #0x0 @@ -805,7 +805,7 @@ FUN_02039F58: ; 0x02039F58 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -828,7 +828,7 @@ FUN_02039F88: ; 0x02039F88 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -851,7 +851,7 @@ FUN_02039FB8: ; 0x02039FB8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -869,14 +869,14 @@ FUN_02039FDC: ; 0x02039FDC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldrh r0, [r0, #0x0] strh r0, [r4, #0x0] mov r0, #0x0 @@ -892,7 +892,7 @@ FUN_0203A00C: ; 0x0203A00C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -2053,7 +2053,7 @@ FUN_0203A94C: ; 0x0203A94C lsl r1, r1, #0x10 add r0, r5, #0x0 lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0x60] bl MOD05_021E8144 @@ -2146,7 +2146,7 @@ FUN_0203AA0C: ; 0x0203AA0C lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, _0203AA88 ; =gMain ldr r1, _0203AA8C ; =0x0000FFFF @@ -2276,7 +2276,7 @@ FUN_0203AB00: ; 0x0203AB00 lsl r1, r1, #0x10 add r0, r6, #0x0 lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] mov r1, #0x4 @@ -2370,7 +2370,7 @@ FUN_0203AB8C: ; 0x0203AB8C str r0, [sp, #0x24] ldr r1, [sp, #0x24] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x28] add r0, r5, #0x0 add r0, #0x80 @@ -2435,7 +2435,7 @@ FUN_0203AC14: ; 0x0203AC14 str r0, [sp, #0x24] ldr r1, [sp, #0x24] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x28] add r0, r5, #0x0 add r0, #0x80 @@ -2544,7 +2544,7 @@ FUN_0203AD2C: ; 0x0203AD2C lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer ldrh r1, [r0, #0x0] ldr r0, _0203AD50 ; =0x0000EEEE cmp r1, r0 @@ -2585,7 +2585,7 @@ FUN_0203AD78: ; 0x0203AD78 lsl r1, r1, #0x10 add r0, r5, #0x0 lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x0 @@ -2649,7 +2649,7 @@ FUN_0203ADC4: ; 0x0203ADC4 str r0, [sp, #0x24] ldr r1, [sp, #0x24] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x28] add r0, r5, #0x0 add r0, #0x80 @@ -2714,7 +2714,7 @@ FUN_0203AE4C: ; 0x0203AE4C str r0, [sp, #0x24] ldr r1, [sp, #0x24] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x28] add r0, r5, #0x0 add r0, #0x80 @@ -3571,14 +3571,14 @@ FUN_0203B574: ; 0x0203B574 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0x38] bl FUN_02055320 @@ -3613,14 +3613,14 @@ FUN_0203B5B8: ; 0x0203B5B8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02058B2C @@ -3641,7 +3641,7 @@ FUN_0203B618: ; 0x0203B618 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -3811,7 +3811,7 @@ FUN_0203B790: ; 0x0203B790 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x0] @@ -3858,7 +3858,7 @@ FUN_0203B7F0: ; 0x0203B7F0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -3887,7 +3887,7 @@ FUN_0203B81C: ; 0x0203B81C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -3947,7 +3947,7 @@ FUN_0203B8A0: ; 0x0203B8A0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -4034,7 +4034,7 @@ FUN_0203B968: ; 0x0203B968 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -4131,7 +4131,7 @@ FUN_0203BA3C: ; 0x0203BA3C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -4139,7 +4139,7 @@ FUN_0203BA3C: ; 0x0203BA3C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -4218,7 +4218,7 @@ FUN_0203BAF4: ; 0x0203BAF4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -4262,7 +4262,7 @@ FUN_0203BB34: ; 0x0203BB34 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -4487,7 +4487,7 @@ FUN_0203BCD8: ; 0x0203BCD8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldr r1, [r4, #0x0] ldr r1, [r1, #0x4] strh r1, [r0, #0x0] @@ -4504,7 +4504,7 @@ FUN_0203BD08: ; 0x0203BD08 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 bl FUN_02031190 strh r0, [r4, #0x0] @@ -4706,7 +4706,7 @@ FUN_0203BE9C: ; 0x0203BE9C lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer ldr r0, [r4, #0x0] ldrb r0, [r0, #0x0] cmp r0, #0x3 @@ -4733,7 +4733,7 @@ FUN_0203BECC: ; 0x0203BECC add r0, #0x80 ldr r0, [r0, #0x0] add r1, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer add r2, r0, #0x0 ldr r0, [r5, #0x74] ldr r1, [r4, #0x0] @@ -4786,7 +4786,7 @@ FUN_0203BF2C: ; 0x0203BF2C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -4826,7 +4826,7 @@ FUN_0203BF84: ; 0x0203BF84 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r5, #0x0 add r1, #0x80 add r6, r0, #0x0 @@ -4875,7 +4875,7 @@ FUN_0203BFEC: ; 0x0203BFEC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r5, #0x0 add r1, #0x80 add r6, r0, #0x0 @@ -4918,7 +4918,7 @@ FUN_0203C054: ; 0x0203C054 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -4948,7 +4948,7 @@ FUN_0203C090: ; 0x0203C090 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -5084,7 +5084,7 @@ FUN_0203C1AC: ; 0x0203C1AC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -5312,7 +5312,7 @@ FUN_0203C368: ; 0x0203C368 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -5350,7 +5350,7 @@ FUN_0203C3C8: ; 0x0203C3C8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldr r0, [r4, #0x74] bl FUN_0206F3D8 @@ -5464,7 +5464,7 @@ FUN_0203C4B0: ; 0x0203C4B0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -5495,7 +5495,7 @@ FUN_0203C4F0: ; 0x0203C4F0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r1, #0x0 str r1, [sp, #0x0] str r1, [sp, #0x4] @@ -5538,7 +5538,7 @@ FUN_0203C520: ; 0x0203C520 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r7, #0x0 mov r1, #0x5 @@ -5567,7 +5567,7 @@ FUN_0203C58C: ; 0x0203C58C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r2, #0x0 str r2, [sp, #0x0] str r2, [sp, #0x4] @@ -5597,7 +5597,7 @@ FUN_0203C5BC: ; 0x0203C5BC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5605,7 +5605,7 @@ FUN_0203C5BC: ; 0x0203C5BC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r2, r0, #0x0 ldr r0, _0203C610 ; =0x0000FFFF add r5, #0x80 @@ -5636,7 +5636,7 @@ FUN_0203C614: ; 0x0203C614 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5644,7 +5644,7 @@ FUN_0203C614: ; 0x0203C614 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -5652,7 +5652,7 @@ FUN_0203C614: ; 0x0203C614 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r3, r0, #0x0 ldr r0, _0203C67C ; =0x0000FFFF add r5, #0x80 @@ -5859,7 +5859,7 @@ FUN_0203C7F4: ; 0x0203C7F4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldr r1, [r5, #0x0] strh r1, [r0, #0x0] mov r0, #0x0 @@ -5874,7 +5874,7 @@ FUN_0203C820: ; 0x0203C820 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 ldr r1, [r4, #0x0] ldr r1, [r1, #0x1c] @@ -6125,7 +6125,7 @@ FUN_0203CA2C: ; 0x0203CA2C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -6248,7 +6248,7 @@ FUN_0203CB20: ; 0x0203CB20 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -6297,14 +6297,14 @@ FUN_0203CB70: ; 0x0203CB70 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x2 @@ -6325,7 +6325,7 @@ FUN_0203CBBC: ; 0x0203CBBC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -6463,7 +6463,7 @@ FUN_0203CCF8: ; 0x0203CCF8 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 bl MOD06_022407DC cmp r0, #0x0 @@ -6534,7 +6534,7 @@ FUN_0203CD90: ; 0x0203CD90 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 bl MOD06_02240844 cmp r0, #0x0 @@ -6659,7 +6659,7 @@ FUN_0203CE8C: ; 0x0203CE8C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -6695,7 +6695,7 @@ FUN_0203CEBC: ; 0x0203CEBC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r3, r0, #0x0 ldr r0, [r7, #0x0] add r1, r6, #0x0 @@ -6721,7 +6721,7 @@ FUN_0203CF04: ; 0x0203CF04 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_020244A4 @@ -6744,7 +6744,7 @@ FUN_0203CF34: ; 0x0203CF34 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0202445C @@ -6767,7 +6767,7 @@ FUN_0203CF64: ; 0x0203CF64 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02024404 @@ -6790,7 +6790,7 @@ FUN_0203CF94: ; 0x0203CF94 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_020243C8 @@ -6829,7 +6829,7 @@ FUN_0203CFC8: ; 0x0203CFC8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 cmp r6, #0x0 bne _0203D02E @@ -7001,7 +7001,7 @@ FUN_0203D150: ; 0x0203D150 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl MOD05_021F4D80 @@ -7062,7 +7062,7 @@ FUN_0203D1C0: ; 0x0203D1C0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0202280C @@ -7105,7 +7105,7 @@ FUN_0203D214: ; 0x0203D214 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl MOD05_021E85FC @@ -7136,7 +7136,7 @@ FUN_0203D248: ; 0x0203D248 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0204BEC8 @@ -7185,7 +7185,7 @@ FUN_0203D2A4: ; 0x0203D2A4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0204C1A8 @@ -7255,7 +7255,7 @@ FUN_0203D33C: ; 0x0203D33C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_0205296C @@ -7273,7 +7273,7 @@ FUN_0203D36C: ; 0x0203D36C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7429,7 +7429,7 @@ FUN_0203D490: ; 0x0203D490 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7460,7 +7460,7 @@ FUN_0203D4E8: ; 0x0203D4E8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7497,7 +7497,7 @@ FUN_0203D528: ; 0x0203D528 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r6, #0x0] bl FUN_02058448 @@ -7531,7 +7531,7 @@ FUN_0203D560: ; 0x0203D560 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r6, #0x0] bl FUN_02058448 @@ -7571,7 +7571,7 @@ FUN_0203D5CC: ; 0x0203D5CC lsl r1, r1, #0x10 add r0, r5, #0x0 lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer cmp r4, #0x0 bne _0203D5F0 mov r0, #0x0 @@ -7664,7 +7664,7 @@ FUN_0203D688: ; 0x0203D688 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7709,7 +7709,7 @@ FUN_0203D6E0: ; 0x0203D6E0 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -7797,7 +7797,7 @@ FUN_0203D774: ; 0x0203D774 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_020239BC @@ -7841,7 +7841,7 @@ FUN_0203D7DC: ; 0x0203D7DC add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_020239BC @@ -7924,7 +7924,7 @@ FUN_0203D8A0: ; 0x0203D8A0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_020239CC @@ -8027,7 +8027,7 @@ FUN_0203D958: ; 0x0203D958 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -8575,7 +8575,7 @@ FUN_0203DDC0: ; 0x0203DDC0 lsl r1, r1, #0x10 ldr r0, [r0, #0x0] lsr r1, r1, #0x10 - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl MOD18_0224CA2C @@ -8762,7 +8762,7 @@ FUN_0203DF38: ; 0x0203DF38 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0xc] bl FUN_02025838 @@ -8797,7 +8797,7 @@ FUN_0203DF84: ; 0x0203DF84 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -8815,7 +8815,7 @@ FUN_0203DFA8: ; 0x0203DFA8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8840,7 +8840,7 @@ FUN_0203DFE0: ; 0x0203DFE0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -8868,7 +8868,7 @@ FUN_0203E018: ; 0x0203E018 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -9185,7 +9185,7 @@ FUN_0203E29C: ; 0x0203E29C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9225,7 +9225,7 @@ FUN_0203E2F8: ; 0x0203E2F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9285,7 +9285,7 @@ FUN_0203E38C: ; 0x0203E38C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9312,7 +9312,7 @@ FUN_0203E3D0: ; 0x0203E3D0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x0] @@ -9340,7 +9340,7 @@ FUN_0203E408: ; 0x0203E408 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x0] @@ -9421,7 +9421,7 @@ FUN_0203E4B0: ; 0x0203E4B0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9440,7 +9440,7 @@ FUN_0203E4D8: ; 0x0203E4D8 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -9477,13 +9477,13 @@ FUN_0203E510: ; 0x0203E510 add r0, #0x80 ldr r0, [r0, #0x0] add r1, r4, #0x0 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] add r1, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -9651,7 +9651,7 @@ FUN_0203E684: ; 0x0203E684 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -9681,7 +9681,7 @@ FUN_0203E6C4: ; 0x0203E6C4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -9710,7 +9710,7 @@ FUN_0203E6FC: ; 0x0203E6FC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9749,7 +9749,7 @@ FUN_0203E744: ; 0x0203E744 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F688 @@ -9772,7 +9772,7 @@ FUN_0203E774: ; 0x0203E774 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r7, #0x0 bl FUN_020244A4 @@ -9849,7 +9849,7 @@ FUN_0203E81C: ; 0x0203E81C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -9918,7 +9918,7 @@ FUN_0203E894: ; 0x0203E894 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl MOD06_022488EC @@ -9941,7 +9941,7 @@ FUN_0203E8C4: ; 0x0203E8C4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl MOD06_022488F4 @@ -10023,7 +10023,7 @@ FUN_0203E968: ; 0x0203E968 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 mov r0, #0x0 strh r0, [r6, #0x0] @@ -10067,7 +10067,7 @@ FUN_0203E9CC: ; 0x0203E9CC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -10135,7 +10135,7 @@ FUN_0203EA68: ; 0x0203EA68 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, sp, #0x0 bl FUN_020126B4 @@ -10155,7 +10155,7 @@ FUN_0203EA90: ; 0x0203EA90 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldr r0, [r4, #0x74] bl MOD06_022411F4 @@ -10171,7 +10171,7 @@ FUN_0203EAB0: ; 0x0203EAB0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10179,7 +10179,7 @@ FUN_0203EAB0: ; 0x0203EAB0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -10299,7 +10299,7 @@ FUN_0203EBC8: ; 0x0203EBC8 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r1, #GAME_VERSION strh r1, [r0, #0x0] mov r0, #0x0 @@ -10323,7 +10323,7 @@ FUN_0203EBE4: ; 0x0203EBE4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r6, #0xc] bl FUN_02022510 @@ -10409,7 +10409,7 @@ FUN_0203ECAC: ; 0x0203ECAC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02026CB4 @@ -10506,7 +10506,7 @@ FUN_0203ED70: ; 0x0203ED70 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -10603,7 +10603,7 @@ FUN_0203EE28: ; 0x0203EE28 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -10673,7 +10673,7 @@ FUN_0203EE98: ; 0x0203EE98 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -10755,7 +10755,7 @@ FUN_0203EF58: ; 0x0203EF58 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 str r0, [sp, #0x0] ldr r0, [r4, #0x0] @@ -10886,7 +10886,7 @@ FUN_0203F058: ; 0x0203F058 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -11014,7 +11014,7 @@ FUN_0203F174: ; 0x0203F174 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -11035,7 +11035,7 @@ FUN_0203F19C: ; 0x0203F19C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 str r0, [sp, #0x0] ldr r0, [r4, #0x0] @@ -11110,7 +11110,7 @@ FUN_0203F234: ; 0x0203F234 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldr r1, _0203F250 ; =gUnk021C4918 ldrb r1, [r1, #0x6] strh r1, [r0, #0x0] @@ -11205,7 +11205,7 @@ FUN_0203F2E4: ; 0x0203F2E4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0205F6C8 @@ -11229,7 +11229,7 @@ FUN_0203F31C: ; 0x0203F31C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -11300,7 +11300,7 @@ FUN_0203F3AC: ; 0x0203F3AC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -11348,7 +11348,7 @@ FUN_0203F418: ; 0x0203F418 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -11380,7 +11380,7 @@ FUN_0203F44C: ; 0x0203F44C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0205F710 @@ -11404,7 +11404,7 @@ FUN_0203F484: ; 0x0203F484 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 ldr r5, [r5, #0x0] add r4, r0, #0x0 @@ -11449,7 +11449,7 @@ FUN_0203F4D8: ; 0x0203F4D8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0202471C @@ -11576,7 +11576,7 @@ FUN_0203F5D4: ; 0x0203F5D4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F720 @@ -11599,7 +11599,7 @@ FUN_0203F604: ; 0x0203F604 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F740 @@ -11622,7 +11622,7 @@ FUN_0203F634: ; 0x0203F634 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F760 @@ -11641,7 +11641,7 @@ FUN_0203F664: ; 0x0203F664 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 mov r2, #0x0 @@ -11703,7 +11703,7 @@ FUN_0203F6E4: ; 0x0203F6E4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -11737,7 +11737,7 @@ FUN_0203F720: ; 0x0203F720 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -11764,7 +11764,7 @@ FUN_0203F760: ; 0x0203F760 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -11847,7 +11847,7 @@ FUN_0203F80C: ; 0x0203F80C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -11855,7 +11855,7 @@ FUN_0203F80C: ; 0x0203F80C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -11906,7 +11906,7 @@ FUN_0203F880: ; 0x0203F880 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 cmp r4, #0x64 bls _0203F8A2 @@ -11945,7 +11945,7 @@ FUN_0203F8C0: ; 0x0203F8C0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] @@ -11992,7 +11992,7 @@ FUN_0203F924: ; 0x0203F924 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F6A8 @@ -12037,7 +12037,7 @@ FUN_0203F988: ; 0x0203F988 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -12057,7 +12057,7 @@ FUN_0203F9B0: ; 0x0203F9B0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -12113,7 +12113,7 @@ FUN_0203FA14: ; 0x0203FA14 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r1, #0x0 strh r1, [r0, #0x0] ldr r1, _0203FA54 ; =0x0000012A @@ -12140,7 +12140,7 @@ FUN_0203FA58: ; 0x0203FA58 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -12257,7 +12257,7 @@ FUN_0203FB64: ; 0x0203FB64 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0xf @@ -12378,7 +12378,7 @@ FUN_0203FC58: ; 0x0203FC58 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02065078 diff --git a/arm9/asm/scrcmd_10.s b/arm9/asm/scrcmd_10.s index b61cd5b8..74a353a9 100644 --- a/arm9/asm/scrcmd_10.s +++ b/arm9/asm/scrcmd_10.s @@ -98,7 +98,7 @@ FUN_020423B0: ; 0x020423B0 add r0, #0x80 ldr r0, [r0, #0x0] ldr r1, [sp, #0x4] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r7, #0x0 add r0, #0x80 @@ -532,14 +532,14 @@ FUN_02042700: ; 0x02042700 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer lsl r2, r6, #0x4 add r2, r6, r2 mov r1, #0x38 @@ -570,7 +570,7 @@ FUN_02042780: ; 0x02042780 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -590,7 +590,7 @@ FUN_020427A8: ; 0x020427A8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -704,7 +704,7 @@ FUN_02042894: ; 0x02042894 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -712,7 +712,7 @@ FUN_02042894: ; 0x02042894 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -738,7 +738,7 @@ FUN_020428E0: ; 0x020428E0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -859,7 +859,7 @@ FUN_020429B8: ; 0x020429B8 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0202A8D8 @@ -936,7 +936,7 @@ FUN_02042A48: ; 0x02042A48 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_0202A8D8 @@ -980,14 +980,14 @@ FUN_02042A98: ; 0x02042A98 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer cmp r7, #0x1 bne _02042AEE mov r1, #0x1a diff --git a/arm9/asm/scrcmd_11.s b/arm9/asm/scrcmd_11.s index ac6f7c2b..87a35776 100644 --- a/arm9/asm/scrcmd_11.s +++ b/arm9/asm/scrcmd_11.s @@ -12,7 +12,7 @@ FUN_02042B0C: ; 0x02042B0C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r0, #0x80 @@ -43,7 +43,7 @@ FUN_02042B40: ; 0x02042B40 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -68,7 +68,7 @@ FUN_02042B74: ; 0x02042B74 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -93,7 +93,7 @@ FUN_02042BA8: ; 0x02042BA8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -118,7 +118,7 @@ FUN_02042BDC: ; 0x02042BDC add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 8c9b6a15..ddd96a2e 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -101,7 +101,7 @@ _02042D74: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -122,7 +122,7 @@ _02042DA0: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -136,7 +136,7 @@ _02042DC0: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 add r0, #0x80 @@ -200,7 +200,7 @@ _02042E2E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -208,7 +208,7 @@ _02042E2E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 add r0, #0x80 @@ -247,7 +247,7 @@ _02042E9A: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -255,7 +255,7 @@ _02042E9A: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 add r0, #0x80 diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s index 46e1fbda..7d46976a 100644 --- a/arm9/asm/scrcmd_13.s +++ b/arm9/asm/scrcmd_13.s @@ -60,7 +60,7 @@ FUN_020438D0: ; 0x020438D0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r6, #0x0 bl FUN_0202C000 @@ -165,7 +165,7 @@ FUN_020439B4: ; 0x020439B4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 cmp r6, #0x3 bhi _02043A40 diff --git a/arm9/asm/scrcmd_14.s b/arm9/asm/scrcmd_14.s index 10c89335..62ef3126 100644 --- a/arm9/asm/scrcmd_14.s +++ b/arm9/asm/scrcmd_14.s @@ -84,7 +84,7 @@ FUN_02043ACC: ; 0x02043ACC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02028930 @@ -149,7 +149,7 @@ FUN_02043B54: ; 0x02043B54 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r1, r0, #0x0 ldrh r1, [r1, #0x0] add r0, r4, #0x0 @@ -176,7 +176,7 @@ FUN_02043B84: ; 0x02043B84 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord @@ -212,14 +212,14 @@ FUN_02043BD0: ; 0x02043BD0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldrh r5, [r0, #0x0] add r0, r6, #0x0 bl FUN_02028930 @@ -250,7 +250,7 @@ FUN_02043C28: ; 0x02043C28 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_15.s b/arm9/asm/scrcmd_15.s index d933672e..de83d43a 100644 --- a/arm9/asm/scrcmd_15.s +++ b/arm9/asm/scrcmd_15.s @@ -74,7 +74,7 @@ FUN_02043CE4: ; 0x02043CE4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadWord @@ -107,7 +107,7 @@ FUN_02043D28: ; 0x02043D28 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_16.s b/arm9/asm/scrcmd_16.s index 8e9b20ba..dcb07b2a 100644 --- a/arm9/asm/scrcmd_16.s +++ b/arm9/asm/scrcmd_16.s @@ -31,7 +31,7 @@ FUN_02043E20: ; 0x02043E20 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x8 @@ -96,7 +96,7 @@ FUN_02043E9C: ; 0x02043E9C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 bl ScriptReadHalfword @@ -139,7 +139,7 @@ FUN_02043EFC: ; 0x02043EFC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -176,7 +176,7 @@ FUN_02043F50: ; 0x02043F50 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -221,7 +221,7 @@ FUN_02043FA0: ; 0x02043FA0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206BB1C @@ -337,7 +337,7 @@ FUN_020440C0: ; 0x020440C0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x8 @@ -360,7 +360,7 @@ FUN_020440F0: ; 0x020440F0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x8 @@ -379,7 +379,7 @@ FUN_02044120: ; 0x02044120 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -402,7 +402,7 @@ FUN_02044140: ; 0x02044140 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 diff --git a/arm9/asm/scrcmd_17.s b/arm9/asm/scrcmd_17.s index 0e333870..4113e1de 100644 --- a/arm9/asm/scrcmd_17.s +++ b/arm9/asm/scrcmd_17.s @@ -36,7 +36,7 @@ FUN_0204416C: ; 0x0204416C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -57,7 +57,7 @@ FUN_02044198: ; 0x02044198 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index 468cd321..9e7941a8 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -46,7 +46,7 @@ FUN_020442BC: ; 0x020442BC add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206BB1C @@ -79,14 +79,14 @@ FUN_0204434C: ; 0x0204434C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206BB1C @@ -126,14 +126,14 @@ FUN_020443A8: ; 0x020443A8 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206BB1C @@ -269,7 +269,7 @@ FUN_020444F4: ; 0x020444F4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -346,7 +346,7 @@ FUN_02044598: ; 0x02044598 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 bl ScriptReadHalfword @@ -429,7 +429,7 @@ FUN_02044658: ; 0x02044658 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -463,7 +463,7 @@ FUN_0204469C: ; 0x0204469C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword @@ -532,7 +532,7 @@ FUN_02044730: ; 0x02044730 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -574,7 +574,7 @@ FUN_0204478C: ; 0x0204478C add r0, r6, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r6, #0x0 bl ScriptReadHalfword @@ -628,7 +628,7 @@ FUN_02044800: ; 0x02044800 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword @@ -692,7 +692,7 @@ FUN_0204488C: ; 0x0204488C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -883,7 +883,7 @@ FUN_02044A0C: ; 0x02044A0C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r6, r0, #0x0 ldr r0, [r5, #0x0] @@ -909,7 +909,7 @@ FUN_02044A6C: ; 0x02044A6C add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -932,7 +932,7 @@ FUN_02044A94: ; 0x02044A94 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -940,7 +940,7 @@ FUN_02044A94: ; 0x02044A94 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -978,7 +978,7 @@ FUN_02044B00: ; 0x02044B00 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0xc] bl FUN_0206BB1C @@ -999,7 +999,7 @@ FUN_02044B2C: ; 0x02044B2C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r6, #0xc] bl FUN_0206BB1C @@ -1044,7 +1044,7 @@ FUN_02044B84: ; 0x02044B84 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword @@ -1107,7 +1107,7 @@ FUN_02044C0C: ; 0x02044C0C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r7, #0xc] bl FUN_02022510 @@ -1164,7 +1164,7 @@ FUN_02044C88: ; 0x02044C88 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r6, #0xc] bl FUN_0206BB1C @@ -1207,7 +1207,7 @@ FUN_02044CE0: ; 0x02044CE0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r5, #0xc] bl FUN_0206BB1C @@ -1262,7 +1262,7 @@ FUN_02044D44: ; 0x02044D44 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -1289,7 +1289,7 @@ FUN_02044D8C: ; 0x02044D8C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -1400,7 +1400,7 @@ FUN_02044E78: ; 0x02044E78 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -1442,7 +1442,7 @@ FUN_02044ED8: ; 0x02044ED8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -1501,7 +1501,7 @@ FUN_02044F58: ; 0x02044F58 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword @@ -1565,7 +1565,7 @@ FUN_02044FE8: ; 0x02044FE8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r5, #0x0 bl ScriptReadHalfword @@ -1621,7 +1621,7 @@ FUN_0204505C: ; 0x0204505C add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 add r0, #0x80 @@ -1702,7 +1702,7 @@ FUN_02045104: ; 0x02045104 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -1793,7 +1793,7 @@ FUN_020451D0: ; 0x020451D0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r0, r4, #0x0 add r0, #0x80 diff --git a/arm9/asm/scrcmd_19.s b/arm9/asm/scrcmd_19.s index 3ce88b39..4b56e4fd 100644 --- a/arm9/asm/scrcmd_19.s +++ b/arm9/asm/scrcmd_19.s @@ -25,7 +25,7 @@ FUN_02045268: ; 0x02045268 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r4, #0x0 ldr r7, _020452B0 ; =UNK_020F450C str r0, [sp, #0x0] @@ -61,7 +61,7 @@ FUN_020452B4: ; 0x020452B4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -107,7 +107,7 @@ FUN_02045308: ; 0x02045308 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x8] add r0, r4, #0x0 bl ScriptReadHalfword @@ -115,7 +115,7 @@ FUN_02045308: ; 0x02045308 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_20.s b/arm9/asm/scrcmd_20.s index 448950f1..626a6617 100644 --- a/arm9/asm/scrcmd_20.s +++ b/arm9/asm/scrcmd_20.s @@ -34,14 +34,14 @@ FUN_020453A0: ; 0x020453A0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldr r1, _020453EC ; =UNK_020F4528 lsl r2, r4, #0x2 ldrh r1, [r1, r2] diff --git a/arm9/asm/scrcmd_21.s b/arm9/asm/scrcmd_21.s index a32ada8f..1eb36e3b 100644 --- a/arm9/asm/scrcmd_21.s +++ b/arm9/asm/scrcmd_21.s @@ -23,7 +23,7 @@ FUN_020453F4: ; 0x020453F4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02024D64 @@ -52,7 +52,7 @@ FUN_02045438: ; 0x02045438 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -96,7 +96,7 @@ FUN_02045484: ; 0x02045484 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 cmp r4, #0x8 blo _020454B6 @@ -146,7 +146,7 @@ FUN_02045500: ; 0x02045500 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -167,7 +167,7 @@ FUN_0204552C: ; 0x0204552C add r0, r6, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r4, #0x0 ldr r7, _02045578 ; =UNK_020F4574 str r0, [sp, #0x0] @@ -218,7 +218,7 @@ FUN_02045590: ; 0x02045590 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -261,7 +261,7 @@ FUN_020455E4: ; 0x020455E4 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -304,7 +304,7 @@ FUN_02045638: ; 0x02045638 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -361,7 +361,7 @@ _020456AE: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x2 @@ -406,7 +406,7 @@ _02045706: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F294 @@ -451,7 +451,7 @@ _0204575E: add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F2C4 diff --git a/arm9/asm/scrcmd_22.s b/arm9/asm/scrcmd_22.s index de61ca49..274880d3 100644 --- a/arm9/asm/scrcmd_22.s +++ b/arm9/asm/scrcmd_22.s @@ -30,7 +30,7 @@ FUN_02045784: ; 0x02045784 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -69,7 +69,7 @@ FUN_020457DC: ; 0x020457DC add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -108,7 +108,7 @@ FUN_02045834: ; 0x02045834 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -147,7 +147,7 @@ FUN_0204588C: ; 0x0204588C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206F158 @@ -175,7 +175,7 @@ FUN_020458E4: ; 0x020458E4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_02054CB0 @@ -199,7 +199,7 @@ FUN_02045918: ; 0x02045918 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x5 diff --git a/arm9/asm/scrcmd_23.s b/arm9/asm/scrcmd_23.s index 040971f8..77100912 100644 --- a/arm9/asm/scrcmd_23.s +++ b/arm9/asm/scrcmd_23.s @@ -30,7 +30,7 @@ FUN_02045958: ; 0x02045958 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02026CC4 @@ -62,7 +62,7 @@ FUN_020459AC: ; 0x020459AC add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -94,7 +94,7 @@ FUN_020459E8: ; 0x020459E8 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02026CC4 @@ -126,7 +126,7 @@ FUN_02045A3C: ; 0x02045A3C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -158,7 +158,7 @@ FUN_02045A78: ; 0x02045A78 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02026CC4 @@ -190,7 +190,7 @@ FUN_02045ACC: ; 0x02045ACC add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -217,7 +217,7 @@ FUN_02045B08: ; 0x02045B08 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -244,7 +244,7 @@ FUN_02045B44: ; 0x02045B44 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -275,7 +275,7 @@ FUN_02045B80: ; 0x02045B80 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r0, r4, #0x0 bl FUN_02026CC4 mov r0, #0x0 @@ -303,7 +303,7 @@ FUN_02045BC8: ; 0x02045BC8 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -330,7 +330,7 @@ FUN_02045C04: ; 0x02045C04 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -357,7 +357,7 @@ FUN_02045C40: ; 0x02045C40 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -390,7 +390,7 @@ FUN_02045C7C: ; 0x02045C7C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02026CC4 @@ -423,7 +423,7 @@ FUN_02045CD4: ; 0x02045CD4 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -450,7 +450,7 @@ FUN_02045D10: ; 0x02045D10 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 @@ -477,7 +477,7 @@ FUN_02045D4C: ; 0x02045D4C add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r0, #0x0 pop {r4, pc} .balign 4 diff --git a/arm9/asm/scrcmd_24.s b/arm9/asm/scrcmd_24.s index 85f03ebe..396b4842 100644 --- a/arm9/asm/scrcmd_24.s +++ b/arm9/asm/scrcmd_24.s @@ -45,7 +45,7 @@ FUN_02045DD0: ; 0x02045DD0 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -87,7 +87,7 @@ FUN_02045E20: ; 0x02045E20 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -254,7 +254,7 @@ FUN_02045F88: ; 0x02045F88 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -289,7 +289,7 @@ FUN_02045FCC: ; 0x02045FCC add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 04d35396..75d058db 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -518,7 +518,7 @@ FUN_020402D4: ; 0x020402D4 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_0208213C @@ -569,7 +569,7 @@ FUN_02040340: ; 0x02040340 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_0208217C @@ -592,7 +592,7 @@ FUN_02040370: ; 0x02040370 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_02082190 @@ -615,7 +615,7 @@ FUN_020403A0: ; 0x020403A0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020821B4 @@ -646,7 +646,7 @@ FUN_020403D0: ; 0x020403D0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0x0] add r1, r6, #0x0 @@ -677,7 +677,7 @@ FUN_02040414: ; 0x02040414 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldr r0, [r5, #0x0] add r1, r6, #0x0 @@ -700,7 +700,7 @@ FUN_02040458: ; 0x02040458 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020821F0 @@ -725,7 +725,7 @@ FUN_02040488: ; 0x02040488 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -733,7 +733,7 @@ FUN_02040488: ; 0x02040488 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -741,14 +741,14 @@ FUN_02040488: ; 0x02040488 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] ldr r0, [r4, #0x0] ldr r3, [sp, #0x4] @@ -774,7 +774,7 @@ FUN_020404FC: ; 0x020404FC add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_02082254 @@ -827,7 +827,7 @@ FUN_0204056C: ; 0x0204056C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020822F0 @@ -956,7 +956,7 @@ FUN_02040660: ; 0x02040660 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, sp, #0xc str r0, [sp, #0x0] diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index bb5b7be6..f554a4dd 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -23,7 +23,7 @@ FUN_02041194: ; 0x02041194 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl FUN_0205F5D8 @@ -48,7 +48,7 @@ FUN_020411C4: ; 0x020411C4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0xc] add r0, r4, #0x0 bl ScriptReadHalfword @@ -56,7 +56,7 @@ FUN_020411C4: ; 0x020411C4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x8] add r0, r4, #0x0 bl ScriptReadHalfword @@ -64,7 +64,7 @@ FUN_020411C4: ; 0x020411C4 add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x4] add r0, r4, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_6.s b/arm9/asm/scrcmd_6.s index 84bd89b2..5d0ae66c 100644 --- a/arm9/asm/scrcmd_6.s +++ b/arm9/asm/scrcmd_6.s @@ -14,7 +14,7 @@ FUN_020413C0: ; 0x020413C0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_02005410 @@ -303,7 +303,7 @@ FUN_020415E0: ; 0x020415E0 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] @@ -330,7 +330,7 @@ FUN_02041618: ; 0x02041618 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 bl FUN_02005E28 cmp r0, #0x0 diff --git a/arm9/asm/scrcmd_7.s b/arm9/asm/scrcmd_7.s index c17c563a..e093cb1f 100644 --- a/arm9/asm/scrcmd_7.s +++ b/arm9/asm/scrcmd_7.s @@ -108,7 +108,7 @@ FUN_02041770: ; 0x02041770 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x0] @@ -160,7 +160,7 @@ FUN_020417E0: ; 0x020417E0 add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer ldrh r1, [r5, #0x0] strh r1, [r0, #0x0] mov r0, #0x0 @@ -194,7 +194,7 @@ FUN_02041808: ; 0x02041808 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer cmp r7, #0x0 bne _02041852 ldrh r1, [r4, #0x0] @@ -221,7 +221,7 @@ FUN_0204185C: ; 0x0204185C add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldrh r0, [r4, #0x0] bl FUN_020395F4 @@ -347,7 +347,7 @@ FUN_02041970: ; 0x02041970 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -355,14 +355,14 @@ FUN_02041970: ; 0x02041970 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldrh r0, [r4, #0x0] bl FUN_020395F4 @@ -411,7 +411,7 @@ FUN_020419F8: ; 0x020419F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -419,14 +419,14 @@ FUN_020419F8: ; 0x020419F8 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldrh r0, [r4, #0x0] bl FUN_020395F4 @@ -474,7 +474,7 @@ FUN_02041A80: ; 0x02041A80 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldrh r0, [r4, #0x0] bl FUN_020395F4 @@ -521,7 +521,7 @@ FUN_02041AE0: ; 0x02041AE0 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020480B8 @@ -544,7 +544,7 @@ FUN_02041B10: ; 0x02041B10 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020480C8 @@ -567,7 +567,7 @@ FUN_02041B40: ; 0x02041B40 add r5, #0x80 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 ldr r0, [r4, #0x0] bl FUN_020480D8 @@ -585,7 +585,7 @@ FUN_02041B70: ; 0x02041B70 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] diff --git a/arm9/asm/scrcmd_8.s b/arm9/asm/scrcmd_8.s index d5a1a525..374a2db4 100644 --- a/arm9/asm/scrcmd_8.s +++ b/arm9/asm/scrcmd_8.s @@ -57,7 +57,7 @@ _02041C86: add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -80,7 +80,7 @@ _02041CBC: add r4, #0x80 add r1, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -147,7 +147,7 @@ _02041D5E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer mov r2, #0x0 str r2, [sp, #0x0] str r5, [sp, #0x4] diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index ab9a501c..38ef38fb 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -63,7 +63,7 @@ _02041E68: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -80,7 +80,7 @@ _02041E88: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -88,7 +88,7 @@ _02041E88: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 ldr r0, _02041FD8 ; =0x00000233 add r4, #0x80 @@ -119,7 +119,7 @@ _02041ECA: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -127,7 +127,7 @@ _02041ECA: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer str r0, [sp, #0x0] add r4, #0x80 ldr r0, [r4, #0x0] @@ -148,7 +148,7 @@ _02041F2E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, r0, #0x0 add r0, r4, #0x0 bl ScriptReadHalfword @@ -156,7 +156,7 @@ _02041F2E: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 mov r0, #0x8d lsl r0, r0, #0x2 @@ -189,7 +189,7 @@ _02041F68: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -205,7 +205,7 @@ _02041FB4: add r0, r4, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r4, #0x80 add r5, r0, #0x0 ldr r0, [r4, #0x0] @@ -292,7 +292,7 @@ _02042058: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r6, r0, #0x0 add r0, r5, #0x0 bl ScriptReadHalfword @@ -300,7 +300,7 @@ _02042058: add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r7, r0, #0x0 ldr r0, _0204210C ; =0x00000232 add r5, #0x80 @@ -373,7 +373,7 @@ FUN_02042110: ; 0x02042110 add r0, r5, #0x0 add r0, #0x80 ldr r0, [r0, #0x0] - bl FUN_020394B8 + bl GetVarPointer add r5, #0x80 add r4, r0, #0x0 ldr r0, [r5, #0x0] diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 51e97ffe..2adc2a8c 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -121,8 +121,8 @@ UNK_020F2DB4: ; 0x020F2DB4 .byte 0x5C, 0x00, 0x01, 0x01, 0x00, 0x00, 0x92, 0x00, 0x30, 0x00, 0x01, 0x01, 0x00, 0x00, 0x93, 0x00 .byte 0x2D, 0x00, 0x01, 0x01, 0x00, 0x00, 0x94, 0x00 - .global UNK_020F34DC -UNK_020F34DC: ; 0x020F34DC + .global sNumScriptCmds +sNumScriptCmds: ; 0x020F34DC .word 721 ; NELEMS(gScriptCmdTable) .global UNK_020F34E0 @@ -160,14 +160,14 @@ gScriptCmdTable: ; 0x020F355C .word FUN_02039A90 .word FUN_02039AAC .word FUN_02039ACC - .word FUN_02039AF8 - .word FUN_02039B28 - .word FUN_02039B50 - .word FUN_02039B78 - .word FUN_02039BA0 - .word FUN_02039BBC - .word FUN_02039BDC - .word FUN_02039C08 + .word ScrCmd_compare_local_to_local + .word ScrCmd_compare_local_to_value + .word ScrCmd_compare_local_to_addr + .word ScrCmd_compare_addr_to_local + .word ScrCmd_compare_addr_to_value + .word ScrCmd_compare_addr_to_addr + .word ScrCmd_compare_var_to_value + .word ScrCmd_compare_var_to_var .word FUN_02039C40 .word FUN_02039C78 .word FUN_02039CE4 @@ -994,7 +994,7 @@ FUN_02038D48: ; 0x02038D48 b _02038E1A _02038D68: ldrh r1, [r4, #0xa] - bl FUN_02038EB0 + bl CreateScriptContext str r0, [r4, #0x38] mov r0, #0x1 strb r0, [r4, #0x9] @@ -1154,8 +1154,8 @@ _02038EA8: nop _02038EAC: .word 0x0000225F - thumb_func_start FUN_02038EB0 -FUN_02038EB0: ; 0x02038EB0 + thumb_func_start CreateScriptContext +CreateScriptContext: ; 0x02038EB0 push {r4-r6, lr} add r5, r0, #0x0 add r6, r1, #0x0 @@ -1166,7 +1166,7 @@ FUN_02038EB0: ; 0x02038EB0 bne _02038EC6 bl ErrorHandling _02038EC6: - ldr r2, _02038EE4 ; =UNK_020F34DC + ldr r2, _02038EE4 ; =sNumScriptCmds ldr r1, _02038EE8 ; =gScriptCmdTable ldr r2, [r2, #0x0] add r0, r4, #0x0 @@ -1175,36 +1175,36 @@ _02038EC6: add r1, r4, #0x0 add r2, r6, #0x0 mov r3, #0x0 - bl FUN_02038EEC + bl SetUpScriptContextForMap add r0, r4, #0x0 pop {r4-r6, pc} nop -_02038EE4: .word UNK_020F34DC +_02038EE4: .word sNumScriptCmds _02038EE8: .word gScriptCmdTable - thumb_func_start FUN_02038EEC -FUN_02038EEC: ; 0x02038EEC + thumb_func_start SetUpScriptContextForMap +SetUpScriptContextForMap: ; 0x02038EEC push {r4-r6, lr} add r4, r1, #0x0 add r3, r4, #0x0 add r5, r0, #0x0 add r3, #0x80 str r5, [r3, #0x0] - bl FUN_02038F18 + bl LoadScriptsAndMessagesByMapId add r6, r0, #0x0 ldr r1, [r4, #0x7c] add r0, r4, #0x0 bl SetupBytecodeScript add r0, r4, #0x0 add r1, r6, #0x0 - bl FUN_02039484 + bl ScriptRunByIndex ldr r1, [r5, #0x10] add r0, r4, #0x0 bl FUN_02038B6C pop {r4-r6, pc} - thumb_func_start FUN_02038F18 -FUN_02038F18: ; 0x02038F18 + thumb_func_start LoadScriptsAndMessagesByMapId +LoadScriptsAndMessagesByMapId: ; 0x02038F18 push {r3-r5, lr} ldr r3, _02039210 ; =0x0000283C add r4, r2, #0x0 @@ -1213,7 +1213,7 @@ FUN_02038F18: ; 0x02038F18 mov r3, #0x1f ldr r2, _02039214 ; =0x000003D1 lsl r3, r3, #0x4 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039210 ; =0x0000283C sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1227,7 +1227,7 @@ _02038F36: ldr r2, _02039218 ; =0x00000175 add r3, r2, #0x0 sub r3, #0x29 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203921C ; =0x000027D8 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1240,7 +1240,7 @@ _02038F52: blo _02038F6C ldr r2, _02039220 ; =0x00000412 ldr r3, _02039224 ; =0x00000232 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039228 ; =0x000027A6 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1252,7 +1252,7 @@ _02038F6C: blo _02038F84 ldr r2, _0203922C ; =0x00000411 ldr r3, _02039230 ; =0x00000233 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039234 ; =0x00002774 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1265,7 +1265,7 @@ _02038F84: ldr r2, _0203923C ; =0x00000177 add r3, r2, #0x0 sub r3, #0x29 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039238 ; =0x00002710 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1280,7 +1280,7 @@ _02038F9E: lsl r2, r2, #0x2 add r3, r2, #0x0 sub r3, #0x29 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039240 ; =0x000026DE sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1293,7 +1293,7 @@ _02038FBC: blo _02038FD6 ldr r2, _02039244 ; =0x0000016D mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039248 ; =0x000026AC sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1306,7 +1306,7 @@ _02038FD6: blo _02038FF0 mov r2, #0xce mov r3, #0xcb - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203924C ; =0x00002648 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1319,7 +1319,7 @@ _02038FF0: ldr r2, _02039254 ; =0x00000183 add r3, r2, #0x0 sub r3, #0x9 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1332,7 +1332,7 @@ _0203900A: blo _02039026 ldr r2, _02039258 ; =0x00000179 mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, #0x64 sub r0, r4, r0 @@ -1347,7 +1347,7 @@ _02039026: lsl r2, r2, #0x4 add r3, r2, #0x0 add r3, #0x1c - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203925C ; =0x0000251C sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1360,7 +1360,7 @@ _02039042: ldr r2, _02039264 ; =0x00000187 add r3, r2, #0x0 sub r3, #0xa - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1375,7 +1375,7 @@ _0203905C: lsl r2, r2, #0x2 add r3, r2, #0x0 sub r3, #0x2b - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, #0x64 sub r0, r4, r0 @@ -1390,7 +1390,7 @@ _0203907C: lsl r2, r2, #0x2 add r3, r2, #0x0 sub r3, #0x9 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039268 ; =0x000023F0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1402,7 +1402,7 @@ _02039098: blo _020390B0 mov r2, #0x0 mov r3, #0x9 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203926C ; =0x0000238C sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1415,7 +1415,7 @@ _020390B0: blo _020390CA mov r2, #0xcf add r3, r2, #0x0 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039270 ; =0x00002328 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1428,7 +1428,7 @@ _020390CA: blo _020390E4 ldr r2, _02039274 ; =0x00000186 mov r3, #0x7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039278 ; =0x0000230A sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1442,7 +1442,7 @@ _020390E4: ldr r2, _0203927C ; =0x000001CF add r3, r2, #0x0 add r3, #0x17 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039280 ; =0x000022F6 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1455,7 +1455,7 @@ _02039100: ldr r2, _02039284 ; =0x00000185 add r3, r2, #0x0 sub r3, #0x9 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _02039288 ; =0x000022C4 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1468,7 +1468,7 @@ _0203911A: ldr r2, _02039290 ; =0x000001CE add r3, r2, #0x0 add r3, #0x17 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _0203928C ; =0x00002260 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1482,7 +1482,7 @@ _02039134: ldr r2, _02039294 ; =0x00000176 add r3, r2, #0x0 sub r3, #0x29 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized mov r0, #0x7d lsl r0, r0, #0x6 sub r0, r4, r0 @@ -1496,7 +1496,7 @@ _02039152: ldr r2, _0203929C ; =0x00000172 add r3, r2, #0x0 sub r3, #0x2d - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1509,7 +1509,7 @@ _0203916C: mov r2, #0x41 lsl r2, r2, #0x4 mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _020392A0 ; =0x00001388 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1522,7 +1522,7 @@ _02039186: mov r2, #0x41 lsl r2, r2, #0x4 mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized add r0, r5, #0x0 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1535,7 +1535,7 @@ _020391A0: ldr r2, _020392A8 ; =0x0000017A add r3, r2, #0x0 sub r3, #0x1c - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized mov r0, #0xaf lsl r0, r0, #0x4 sub r0, r4, r0 @@ -1548,7 +1548,7 @@ _020391BC: blo _020391D4 mov r2, #0x1 mov r3, #0xd - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized ldr r0, _020392AC ; =0x000009C4 sub r0, r4, r0 lsl r0, r0, #0x10 @@ -1560,7 +1560,7 @@ _020391D4: blo _020391EE mov r2, #0xcd mov r3, #0xc7 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized mov r0, #0x7d lsl r0, r0, #0x4 sub r0, r4, r0 @@ -1570,7 +1570,7 @@ _020391D4: _020391EE: cmp r4, #0x1 blo _020391FE - bl FUN_020392D8 + bl LoadScriptsAndMessagesForCurrentMap sub r0, r4, #0x1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -1579,7 +1579,7 @@ _020391FE: ldr r2, _020392B0 ; =0x00000171 add r3, r2, #0x0 sub r3, #0x34 - bl FUN_020392B4 + bl LoadScriptsAndMessagesParameterized mov r4, #0x0 _0203920A: add r0, r4, #0x0 @@ -1627,8 +1627,8 @@ _020392A8: .word 0x0000017A _020392AC: .word 0x000009C4 _020392B0: .word 0x00000171 - thumb_func_start FUN_020392B4 -FUN_020392B4: ; 0x020392B4 + thumb_func_start LoadScriptsAndMessagesParameterized +LoadScriptsAndMessagesParameterized: ; 0x020392B4 push {r3-r5, lr} add r5, r1, #0x0 add r1, r2, #0x0 @@ -1646,18 +1646,18 @@ FUN_020392B4: ; 0x020392B4 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_020392D8 -FUN_020392D8: ; 0x020392D8 + thumb_func_start LoadScriptsAndMessagesForCurrentMap +LoadScriptsAndMessagesForCurrentMap: ; 0x020392D8 push {r3-r5, lr} add r5, r0, #0x0 ldr r0, [r5, #0x1c] add r4, r1, #0x0 ldr r0, [r0, #0x0] - bl FUN_0203949C + bl LoadScriptsForCurrentMap str r0, [r4, #0x7c] ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] - bl FUN_020394B0 + bl GetCurrentMapMessageBank add r2, r0, #0x0 mov r0, #0x1 mov r1, #0x1a @@ -1908,8 +1908,8 @@ _0203947C: nop _02039480: .word FUN_020351A0 - thumb_func_start FUN_02039484 -FUN_02039484: ; 0x02039484 + thumb_func_start ScriptRunByIndex +ScriptRunByIndex: ; 0x02039484 push {r4, lr} add r4, r0, #0x0 ldr r2, [r4, #0x8] @@ -1922,8 +1922,8 @@ FUN_02039484: ; 0x02039484 str r0, [r4, #0x8] pop {r4, pc} - thumb_func_start FUN_0203949C -FUN_0203949C: ; 0x0203949C + thumb_func_start LoadScriptsForCurrentMap +LoadScriptsForCurrentMap: ; 0x0203949C push {r3, lr} bl MapHeader_GetScrSeqReleaseNo add r1, r0, #0x0 @@ -1933,15 +1933,15 @@ FUN_0203949C: ; 0x0203949C pop {r3, pc} .balign 4 - thumb_func_start FUN_020394B0 -FUN_020394B0: ; 0x020394B0 + thumb_func_start GetCurrentMapMessageBank +GetCurrentMapMessageBank: ; 0x020394B0 ldr r3, _020394B4 ; =MapHeader_GetMsgBank bx r3 .balign 4 _020394B4: .word MapHeader_GetMsgBank - thumb_func_start FUN_020394B8 -FUN_020394B8: ; 0x020394B8 + thumb_func_start GetVarPointer +GetVarPointer: ; 0x020394B8 push {r3-r5, lr} add r5, r0, #0x0 ldr r0, [r5, #0xc] @@ -1973,7 +1973,7 @@ _020394EC: .word 0x00007FD7 FUN_020394F0: ; 0x020394F0 push {r4, lr} add r4, r1, #0x0 - bl FUN_020394B8 + bl GetVarPointer cmp r0, #0x0 beq _020394FE ldrh r4, [r0, #0x0] @@ -2455,7 +2455,7 @@ _0203987C: .word FUN_02039880 thumb_func_start FUN_02039880 FUN_02039880: ; 0x02039880 push {r4, lr} - bl FUN_02038EB0 + bl CreateScriptContext add r4, r0, #0x0 _02039888: add r0, r4, #0x0 diff --git a/arm9/asm/unk_0205FA2C.s b/arm9/asm/unk_0205FA2C.s index c06deaff..18304f39 100644 --- a/arm9/asm/unk_0205FA2C.s +++ b/arm9/asm/unk_0205FA2C.s @@ -389,7 +389,7 @@ _0205FD14: _0205FD1E: ldrh r1, [r4, #0x10] add r0, r5, #0x0 - bl FUN_020394B8 + bl GetVarPointer ldr r1, [r4, #0x0] strh r1, [r0, #0x0] add r0, r4, #0x0 @@ -447,7 +447,7 @@ FUN_0205FD70: ; 0x0205FD70 _0205FD96: ldrh r1, [r5, #0x2] add r0, r6, #0x0 - bl FUN_020394B8 + bl GetVarPointer add r4, r0, #0x0 ldrh r0, [r5, #0x0] cmp r0, #0x0 diff --git a/arm9/global.inc b/arm9/global.inc index f0fd87df..21dd38d9 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2677,10 +2677,10 @@ .extern FUN_02038CA8 .extern FUN_02038CD8 .extern FUN_02038D10 -.extern FUN_02038EB0 +.extern CreateScriptContext .extern FUN_02039438 .extern FUN_02039460 -.extern FUN_020394B8 +.extern GetVarPointer .extern FUN_020394F0 .extern FUN_02039504 .extern FUN_02039528 @@ -2711,14 +2711,14 @@ .extern FUN_02039A90 .extern FUN_02039AAC .extern FUN_02039ACC -.extern FUN_02039AF8 -.extern FUN_02039B28 -.extern FUN_02039B50 -.extern FUN_02039B78 -.extern FUN_02039BA0 -.extern FUN_02039BBC -.extern FUN_02039BDC -.extern FUN_02039C08 +.extern ScrCmd_compare_local_to_local +.extern ScrCmd_compare_local_to_value +.extern ScrCmd_compare_local_to_addr +.extern ScrCmd_compare_addr_to_local +.extern ScrCmd_compare_addr_to_value +.extern ScrCmd_compare_addr_to_addr +.extern ScrCmd_compare_var_to_value +.extern ScrCmd_compare_var_to_var .extern FUN_02039C40 .extern FUN_02039C78 .extern FUN_02039CE4 |