summaryrefslogtreecommitdiff
path: root/arm9/modules/84
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/84')
-rw-r--r--arm9/modules/84/asm/module_84_thumb1.s10
-rw-r--r--arm9/modules/84/asm/module_84_thumb2.s22
2 files changed, 16 insertions, 16 deletions
diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s
index 405c33ef..f1a8e8a2 100644
--- a/arm9/modules/84/asm/module_84_thumb1.s
+++ b/arm9/modules/84/asm/module_84_thumb1.s
@@ -38,8 +38,8 @@ _021D7516:
add r1, r0, #0
bl Main_SetVBlankIntrCB
bl FUN_02015F1C
- bl FUN_0201E6D8
- bl FUN_0201E740
+ bl GX_DisableEngineALayers
+ bl GX_DisableEngineBLayers
mov r2, #1
lsl r2, r2, #0x1a
ldr r1, [r2]
@@ -768,7 +768,7 @@ MOD84_021D7AC8: ; 0x021D7AC8
bl FUN_020AEDF4
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r1, _021D7B50 ; =0x04000008
mov r0, #3
ldrh r2, [r1]
@@ -1348,10 +1348,10 @@ MOD84_021D7F94: ; 0x021D7F94
bl FUN_020200D8
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #0x10
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
add sp, #0x30
pop {r4, pc}
thumb_func_end MOD84_021D7F94
diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s
index 048adbf9..66e7a196 100644
--- a/arm9/modules/84/asm/module_84_thumb2.s
+++ b/arm9/modules/84/asm/module_84_thumb2.s
@@ -1314,7 +1314,7 @@ _021D8AEC: ; jump table
_021D8AF4:
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r1, #0
mov r0, #3
add r2, r1, #0
@@ -1362,7 +1362,7 @@ _021D8B4E:
beq _021D8B66
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add sp, #4
mov r0, #1
pop {r3, r4, pc}
@@ -1611,10 +1611,10 @@ _021D8D24: ; jump table
_021D8D2C:
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #0x10
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r1, #0
mov r0, #3
add r2, r1, #0
@@ -1692,10 +1692,10 @@ _021D8DC8:
beq _021D8DE6
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #0x10
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #1
pop {r3, r4, r5, pc}
_021D8DE6:
@@ -2473,7 +2473,7 @@ _021D93F4: ; jump table
_021D93FC:
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r1, #0
mov r0, #3
add r2, r1, #0
@@ -2521,7 +2521,7 @@ _021D9456:
beq _021D946E
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add sp, #4
mov r0, #1
pop {r3, r4, pc}
@@ -3346,7 +3346,7 @@ _021D9AB4: ; jump table
_021D9ABC:
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r1, #0
mov r0, #3
add r2, r1, #0
@@ -3394,7 +3394,7 @@ _021D9B16:
beq _021D9B2E
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add sp, #4
mov r0, #1
pop {r3, r4, pc}
@@ -3989,7 +3989,7 @@ _021D9FBE:
beq _021DA068
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r4, #0x10]
mov r1, #0
bl FUN_020200A0