summaryrefslogtreecommitdiff
path: root/arm9/modules/05/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/05/asm')
-rw-r--r--arm9/modules/05/asm/mod05_021D74E0.s12
-rw-r--r--arm9/modules/05/asm/mod05_021DC0B8.s60
-rw-r--r--arm9/modules/05/asm/mod05_021E3444.s8
-rw-r--r--arm9/modules/05/asm/module_05.s60
4 files changed, 70 insertions, 70 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index 24743c4b..8488759b 100644
--- a/arm9/modules/05/asm/mod05_021D74E0.s
+++ b/arm9/modules/05/asm/mod05_021D74E0.s
@@ -99,7 +99,7 @@ _021D757A:
bl FUN_0201B2EC
bl MOD05_021D7BA0
bl MOD05_021D7B38
- bl FUN_0201E7A0
+ bl GX_SwapDisplay
mov r0, #4
bl FUN_02016B94
str r0, [r4, #8]
@@ -584,7 +584,7 @@ _021D7A0A:
sub r2, r2, #1
bne _021D7A0A
add r0, sp, #0
- bl FUN_0201E66C
+ bl GX_SetBanks
add sp, #0x28
pop {r4, pc}
.balign 4, 0
@@ -710,7 +710,7 @@ MOD05_021D7B10: ; 0x021D7B10
add r4, r0, #0
mov r0, #0xf
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add r0, r4, #0
mov r1, #1
bl FUN_020178A0
@@ -942,7 +942,7 @@ MOD05_021D7CF0: ; 0x021D7CF0
add r5, r0, #0
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021D7D44 ; =UNK_02105BB8
ldr r0, [r0]
lsl r1, r0, #1
@@ -1097,8 +1097,8 @@ MOD05_021D7E4C: ; 0x021D7E4C
add r4, r0, #0
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
- bl FUN_0201E788
+ bl GX_EngineAToggleLayers
+ bl GX_BothDispOn
bl MOD05_021DBABC
str r0, [r4, #0x40]
bl MOD05_021D7B64
diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s
index 5e07b24d..ab06fed1 100644
--- a/arm9/modules/05/asm/mod05_021DC0B8.s
+++ b/arm9/modules/05/asm/mod05_021DC0B8.s
@@ -32,7 +32,7 @@ _021DC0CC:
str r0, [r4, #0x10]
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add r0, r4, #0
pop {r3, r4, r5, pc}
@@ -681,7 +681,7 @@ _021DC5A2:
strh r0, [r1]
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r4]
add r0, #8
bl MOD05_021DC4AC
@@ -1252,7 +1252,7 @@ _021DCA04:
beq _021DCA30
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r2, _021DCA40 ; =0x0400000C
mov r1, #3
ldrh r3, [r2]
@@ -1336,7 +1336,7 @@ MOD05_021DCA94: ; 0x021DCA94
beq _021DCAD2
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021DCB5C ; =0x0400000C
mov r2, #3
ldrh r3, [r0]
@@ -1436,7 +1436,7 @@ MOD05_021DCB6C: ; 0x021DCB6C
beq _021DCBA2
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021DCBD4 ; =0x0400000C
mov r2, #3
ldrh r3, [r0]
@@ -1967,7 +1967,7 @@ MOD05_021DCF68: ; 0x021DCF68
beq _021DD00A
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r1, #0xc
mov r0, #0x42
lsl r0, r0, #2
@@ -5337,7 +5337,7 @@ _021DE8EE:
strh r0, [r1]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021DEA68 ; =0x00000F62
mov r1, #1
add sp, #0x10
@@ -5395,7 +5395,7 @@ _021DE9A0:
strh r0, [r1]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021DEA68 ; =0x00000F62
mov r1, #3
add sp, #0x10
@@ -6061,7 +6061,7 @@ _021DEF00:
strh r1, [r5, r0]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021DF08A
_021DEF10:
mov r2, #8
@@ -6119,7 +6119,7 @@ _021DEF54:
strh r1, [r5, r0]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021DF08A
_021DEF8A:
mov r0, #6
@@ -6192,7 +6192,7 @@ _021DF008:
mov r0, #4
strh r0, [r5, r1]
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021DF08A
_021DF01E:
add r0, r4, #0
@@ -6425,7 +6425,7 @@ _021DF1EC:
strh r1, [r5, r0]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021DF366
_021DF1FC:
mov r2, #0xa
@@ -6480,7 +6480,7 @@ _021DF240:
strh r1, [r5, r0]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021DF366
_021DF270:
mov r1, #6
@@ -6548,7 +6548,7 @@ _021DF2E2:
mov r0, #4
strh r0, [r5, r1]
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021DF366
_021DF2F8:
add r0, r4, #0
@@ -7339,7 +7339,7 @@ _021DF934:
str r1, [r0]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021DFAA0 ; =0x00000F62
mov r1, #1
strh r1, [r5, r0]
@@ -8366,7 +8366,7 @@ _021E0180:
strh r1, [r5, r0]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021E02E8
_021E0190:
mov r2, #1
@@ -8428,7 +8428,7 @@ _021E01EE:
strh r1, [r5, r0]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021E02E8
_021E0212:
mov r0, #6
@@ -8479,7 +8479,7 @@ _021E025C:
add r1, #0xc8
str r2, [r1]
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021E02E8
_021E027A:
add r0, r4, #0
@@ -8918,7 +8918,7 @@ _021E05D4:
bl MOD05_021DC6D4
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E06F0 ; =0x00000F62
mov r1, #3
strh r1, [r5, r0]
@@ -9452,7 +9452,7 @@ _021E0A02:
strh r0, [r1]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E0AC4 ; =0x00000F62
mov r1, #1
strh r1, [r4, r0]
@@ -9484,7 +9484,7 @@ _021E0A52:
strh r0, [r1]
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E0AC4 ; =0x00000F62
mov r1, #3
strh r1, [r4, r0]
@@ -9562,7 +9562,7 @@ _021E0AF2:
bl MOD05_021DC6D4
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E0B94 ; =0x00000F62
mov r1, #1
strh r1, [r4, r0]
@@ -9587,7 +9587,7 @@ _021E0B34:
bl MOD05_021DC6D4
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E0B94 ; =0x00000F62
mov r1, #3
strh r1, [r4, r0]
@@ -9687,7 +9687,7 @@ _021E0BC6:
bl MOD05_021DC6D4
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E0D1C ; =0x00000F62
mov r1, #1
add sp, #0x10
@@ -9738,7 +9738,7 @@ _021E0C6A:
bl MOD05_021DC6D4
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E0D1C ; =0x00000F62
mov r1, #3
add sp, #0x10
@@ -9880,7 +9880,7 @@ _021E0D4E:
bl MOD05_021DC6D4
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E0EA8 ; =0x00000F62
mov r1, #1
add sp, #0x10
@@ -9931,7 +9931,7 @@ _021E0DF2:
bl MOD05_021DC6D4
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E0EA8 ; =0x00000F62
mov r1, #3
add sp, #0x10
@@ -10072,7 +10072,7 @@ _021E0F0A:
bne _021E0F98
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add r0, r5, #0
bl MOD05_021E1290
ldr r0, _021E0FA0 ; =0x00000F62
@@ -10083,7 +10083,7 @@ _021E0F0A:
_021E0F2C:
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021E0FA0 ; =0x00000F62
mov r1, #3
add sp, #8
@@ -10116,7 +10116,7 @@ _021E0F3E:
_021E0F70:
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add r0, r5, #0
bl MOD05_021E11EC
cmp r0, #1
diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s
index fa3acfc5..27446591 100644
--- a/arm9/modules/05/asm/mod05_021E3444.s
+++ b/arm9/modules/05/asm/mod05_021E3444.s
@@ -1058,7 +1058,7 @@ MOD05_021E3C14: ; 0x021E3C14
bl FUN_02016BBC
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r3, _021E3D14 ; =UNK05_021F74AC
add r2, sp, #0x38
ldmia r3!, {r0, r1}
@@ -1087,7 +1087,7 @@ MOD05_021E3C14: ; 0x021E3C14
bl FUN_02018744
mov r0, #2
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r3, _021E3D18 ; =UNK05_021F7490
add r2, sp, #0x1c
ldmia r3!, {r0, r1}
@@ -1116,7 +1116,7 @@ MOD05_021E3C14: ; 0x021E3C14
bl FUN_02018744
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r3, _021E3D1C ; =UNK05_021F7474
add r2, sp, #0
ldmia r3!, {r0, r1}
@@ -1145,7 +1145,7 @@ MOD05_021E3C14: ; 0x021E3C14
bl FUN_02018744
mov r0, #8
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add r0, r5, #0
bl FUN_0200CAB4
add sp, #0x64
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index ad35672e..104c1b87 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -286,13 +286,13 @@ MOD05_021E8860: ; 0x021E8860
add r4, r1, #0
mov r0, #2
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #8
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
bl GX_ResetBankForBG
mov r0, #4
add r1, r0, #0
@@ -336,7 +336,7 @@ MOD05_021E88C0: ; 0x021E88C0
bl GX_SetBankForBG
mov r0, #0xe
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r1, [r4]
mov r0, #4
bl FUN_02016A8C
@@ -1511,7 +1511,7 @@ _021E91D4:
blt _021E91D4
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r7]
add r0, r0, #1
str r0, [r7]
@@ -1911,7 +1911,7 @@ _021E9536:
blt _021E9536
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r6]
add r0, r0, #1
str r0, [r6]
@@ -2278,7 +2278,7 @@ _021E9844:
blt _021E9844
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r7]
add r0, r0, #1
str r0, [r7]
@@ -2734,7 +2734,7 @@ _021E9C02:
blt _021E9C02
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #1
bl FUN_02018FF4
@@ -3369,7 +3369,7 @@ _021EA110:
bl FUN_020200A0
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r5]
add r0, r0, #1
str r0, [r5]
@@ -3706,7 +3706,7 @@ _021EA430:
blt _021EA430
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #1
bl FUN_02018FF4
@@ -4287,7 +4287,7 @@ _021EA8B2:
bl FUN_02020398
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r4]
add r0, r0, #1
str r0, [r4]
@@ -4573,7 +4573,7 @@ _021EAB5A:
blt _021EAB5A
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r6]
add r0, r0, #1
str r0, [r6]
@@ -4880,7 +4880,7 @@ _021EADDC:
blt _021EADDC
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [sp, #0x14]
ldr r0, [r0]
add r1, r0, #1
@@ -5374,7 +5374,7 @@ _021EB18E:
bl FUN_02020238
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #4
bl MOD05_021E4688
str r0, [r4, #4]
@@ -5671,13 +5671,13 @@ _021EB484:
bne _021EB484
mov r0, #2
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #8
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r4]
add sp, #0xc
add r0, r0, #1
@@ -5849,13 +5849,13 @@ _021EB5E4:
bl memset
mov r0, #2
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #8
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r4]
add sp, #0xc
add r0, r0, #1
@@ -6180,7 +6180,7 @@ _021EB86A:
bl MOD05_021E35EC
mov r0, #8
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r5]
add r0, r0, #1
str r0, [r5]
@@ -6276,7 +6276,7 @@ _021EB8E8:
bl FUN_02020238
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r2, #0x11
ldr r1, [r4]
add r0, sp, #0x24
@@ -6930,7 +6930,7 @@ _021EBE60:
bl FUN_02020064
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r5]
add r0, r0, #1
str r0, [r5]
@@ -26509,7 +26509,7 @@ MOD05_021F5518: ; 0x021F5518
bl FUN_020178BC
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021F5560 ; =0x00000648
bl FUN_020054C8
add sp, #4
@@ -26721,7 +26721,7 @@ MOD05_021F56B8: ; 0x021F56B8
strh r1, [r0]
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r1, _021F5714 ; =0x0400000C
mov r0, #3
ldrh r2, [r1]
@@ -26746,7 +26746,7 @@ MOD05_021F56B8: ; 0x021F56B8
bl FUN_02018768
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add r0, r4, #0
bl MOD05_021F569C
add sp, #8
@@ -26766,7 +26766,7 @@ MOD05_021F571C: ; 0x021F571C
strh r1, [r0]
mov r0, #8
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r1, _021F5778 ; =0x0400000E
mov r0, #3
ldrh r2, [r1]
@@ -26790,7 +26790,7 @@ MOD05_021F571C: ; 0x021F571C
bl FUN_02018768
mov r0, #8
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add r0, r4, #0
bl MOD05_021F569C
add sp, #8
@@ -26931,7 +26931,7 @@ _021F5856:
bl FUN_020178BC
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
b _021F5980
_021F5872:
ldr r0, [r4]
@@ -27001,7 +27001,7 @@ _021F58EE:
beq _021F5980
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, _021F5984 ; =0x04000050
mov r1, #0
strh r1, [r0]
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 16:51:34 +0000