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 /arm9/modules | |
parent | 63b86e7eccca4887515549f6e3ad8029010cd422 (diff) |
Rename scrcmds related to flags
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/05/asm/mod05_021D80E8.s | 16 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E1374.s | 8 | ||||
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 12 | ||||
-rw-r--r-- | arm9/modules/06/asm/module_06.s | 42 | ||||
-rw-r--r-- | arm9/modules/18/asm/module_18.s | 16 | ||||
-rw-r--r-- | arm9/modules/42/asm/module_42.s | 2 | ||||
-rw-r--r-- | arm9/modules/43/asm/module_43.s | 2 | ||||
-rw-r--r-- | arm9/modules/52/asm/module_52.s | 2 |
8 files changed, 50 insertions, 50 deletions
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 |