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/05 | |
parent | 63b86e7eccca4887515549f6e3ad8029010cd422 (diff) |
Rename scrcmds related to flags
Diffstat (limited to 'arm9/modules/05')
-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 |
3 files changed, 18 insertions, 18 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] |