summaryrefslogtreecommitdiff
path: root/arm9/modules/63
diff options
context:
space:
mode:
authorRémi Calixte <remicalixte.rmc@gmail.com>2021-03-23 09:47:13 +0100
committerRémi Calixte <remicalixte.rmc@gmail.com>2021-03-23 09:47:13 +0100
commit3c88114bc0597d92585c7ab663724f799038d175 (patch)
tree53670b0098b2410f4a815ef4d34d12fd41ce42b5 /arm9/modules/63
parent11fdf1d630a743f3236135028ea51e818331210f (diff)
Decompile unk_0201E66C.s to GX_layers.c
Diffstat (limited to 'arm9/modules/63')
-rw-r--r--arm9/modules/63/asm/mod63_021D74E0.s76
-rw-r--r--arm9/modules/63/asm/mod63_021D8890.s54
-rw-r--r--arm9/modules/63/asm/mod63_021DA640.s2
-rw-r--r--arm9/modules/63/asm/mod63_021DAE5C.s4
4 files changed, 68 insertions, 68 deletions
diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s
index df0624f9..6aa32be7 100644
--- a/arm9/modules/63/asm/mod63_021D74E0.s
+++ b/arm9/modules/63/asm/mod63_021D74E0.s
@@ -23,8 +23,8 @@ MOD63_021D74E0: ; 0x021D74E0
mov r0, #0
add r1, r0, #0
bl FUN_02015F34
- bl FUN_0201E6D8
- bl FUN_0201E740
+ bl GX_DisableEngineALayers
+ bl GX_DisableEngineBLayers
mov r2, #1
lsl r2, r2, #0x1a
ldr r1, [r2]
@@ -69,7 +69,7 @@ MOD63_021D74E0: ; 0x021D74E0
ldr r0, _021D7598 ; =MOD63_021D782C
add r1, r4, #0
bl Main_SetVBlankIntrCB
- bl FUN_0201E788
+ bl GX_BothDispOn
mov r0, #1
pop {r4, pc}
.align 2, 0
@@ -251,7 +251,7 @@ _021D76D4:
strh r3, [r4, r1]
mov r1, #0
str r0, [r2, #0x6c]
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #0
mov r1, #0x3c
bl FUN_020053CC
@@ -795,28 +795,28 @@ MOD63_021D7A48: ; 0x021D7A48
bl FUN_02016C18
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
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
mov r0, #1
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #2
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #4
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #8
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #0
add r1, r0, #0
bl FUN_02017FE4
@@ -841,28 +841,28 @@ MOD63_021D7B9C: ; 0x021D7B9C
add r4, r0, #0
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
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
mov r0, #1
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #2
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #4
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #8
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
ldr r0, [r4, #4]
mov r1, #4
bl FUN_020178A0
@@ -1031,7 +1031,7 @@ _021D7C52:
ldr r0, _021D7D70 ; =gMain + 0x60
mov r1, #1
strb r1, [r0, #5]
- bl FUN_0201E7A0
+ bl GX_SwapDisplay
mov r0, #2
str r0, [r5, #4]
mov r0, #1
@@ -1085,13 +1085,13 @@ _021D7DA4: ; jump table
_021D7DB8:
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #8
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #2
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
ldr r1, _021D80F0 ; =0x00000116
add r0, r6, #0
strh r0, [r4, r1]
@@ -1663,16 +1663,16 @@ _021D81DC:
bne _021D824E
mov r0, #4
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #2
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #2
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #8
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
add r0, r4, #0
mov r1, #0x5a
add r0, #0xa8
@@ -1736,22 +1736,22 @@ _021D8272:
bl FUN_0201F05C
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #8
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #8
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #4
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #2
add r1, r4, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #2
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add r0, r4, #0
bl FUN_0200E394
mov r0, #1
@@ -1791,19 +1791,19 @@ _021D82FC:
bne _021D831A
mov r0, #1
add r1, r0, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
b _021D8330
_021D831A:
cmp r0, #0x10
bne _021D8330
mov r0, #1
add r1, r4, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
b _021D8330
_021D8328:
mov r0, #1
add r1, r4, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
_021D8330:
add r0, r5, #0
add r0, #0xa8
@@ -1855,7 +1855,7 @@ MOD63_021D8360: ; 0x021D8360
strh r0, [r2]
ldr r0, _021D83A4 ; =gMain + 0x60
strb r3, [r0, #5]
- bl FUN_0201E7A0
+ bl GX_SwapDisplay
mov r0, #1
pop {r4, r5, r6, pc}
.align 2, 0
diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s
index 9c8b1d22..e4ec2bcf 100644
--- a/arm9/modules/63/asm/mod63_021D8890.s
+++ b/arm9/modules/63/asm/mod63_021D8890.s
@@ -578,8 +578,8 @@ MOD63_021D8D10: ; 0x021D8D10
mov r0, #0
add r1, r0, #0
bl FUN_02015F34
- bl FUN_0201E6D8
- bl FUN_0201E740
+ bl GX_DisableEngineALayers
+ bl GX_DisableEngineBLayers
mov r0, #4
mov r1, #8
bl FUN_0201669C
@@ -606,7 +606,7 @@ MOD63_021D8D10: ; 0x021D8D10
strb r1, [r4, r0]
ldr r0, _021D8D94 ; =gMain + 0x60
strb r1, [r0, #5]
- bl FUN_0201E7A0
+ bl GX_SwapDisplay
bl GetLCRNGSeed
str r0, [r4, #0x14]
mov r0, #0
@@ -985,10 +985,10 @@ MOD63_021D8F38: ; 0x021D8F38
bl FUN_02006930
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #0x10
str r0, [sp]
ldr r0, _021D90C8 ; =0x04000050
@@ -1010,7 +1010,7 @@ MOD63_021D8F38: ; 0x021D8F38
bl FUN_0200E394
mov r0, #1
bl FUN_0200E394
- bl FUN_0201E788
+ bl GX_BothDispOn
add sp, #0x10
pop {r4, pc}
nop
@@ -1089,10 +1089,10 @@ _021D9148:
blt _021D9208
mov r0, #2
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #2
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #0x10
str r0, [sp]
ldr r0, _021D9220 ; =0x04000050
@@ -1109,10 +1109,10 @@ _021D9148:
bl G2x_SetBlendAlpha_
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #4
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r2, #0
strb r2, [r4, #7]
strb r2, [r4, #6]
@@ -1546,7 +1546,7 @@ MOD63_021D9498: ; 0x021D9498
str r0, [r5, #0x40]
ldr r0, _021D9588 ; =gMain + 0x60
strb r1, [r0, #5]
- bl FUN_0201E7A0
+ bl GX_SwapDisplay
ldr r6, _021D958C ; =MOD63_021DBDE8
ldr r7, _021D9590 ; =MOD63_021DBAD0
mov r4, #0
@@ -1886,10 +1886,10 @@ _021D96F8:
bl MOD63_021DABCC
mov r0, #0xe
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #1
mov r1, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #0
bl FUN_0200E394
mov r0, #1
@@ -2171,7 +2171,7 @@ _021D9A42:
blt _021D9B0C
mov r0, #1
add r1, r0, #0
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
mov r0, #2
str r0, [sp]
mov r0, #8
@@ -2197,14 +2197,14 @@ _021D9A7A:
bne _021D9A88
mov r0, #0x10
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
_021D9A88:
ldr r0, _021D9DD0 ; =0x000003C5
cmp r5, r0
blt _021D9B0C
mov r0, #7
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #0x12
str r0, [sp]
mov r1, #1
@@ -2319,13 +2319,13 @@ _021D9B72:
bl G2x_SetBlendAlpha_
mov r0, #6
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #8
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #1
add r1, r0, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r1, #0
ldr r0, [r4, #0x10]
add r2, r1, #0
@@ -2526,7 +2526,7 @@ _021D9D48:
bl MOD63_021DAD18
mov r0, #4
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
ldr r0, [r4, #0x10]
mov r1, #0
mov r2, #1
@@ -2610,7 +2610,7 @@ _021D9DF8:
bl MOD63_021D9EA8
mov r0, #4
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #4
str r0, [sp]
mov r1, #1
@@ -3172,13 +3172,13 @@ _021DA192:
bl FUN_020068C8
mov r0, #0xe
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
mov r0, #2
mov r1, #1
- bl FUN_0201E74C
+ bl GX_EngineBToggleLayers
ldr r0, [r4, #0xc]
mov r1, #3
mov r2, #1
@@ -3532,11 +3532,11 @@ MOD63_021DA588: ; 0x021DA588
strb r2, [r0, #3]
mov r2, #0
strb r2, [r0, #1]
- ldr r3, _021DA59C ; =FUN_0201E6E4
+ ldr r3, _021DA59C ; =GX_EngineAToggleLayers
add r0, r1, #0
bx r3
nop
-_021DA59C: .word FUN_0201E6E4
+_021DA59C: .word GX_EngineAToggleLayers
thumb_func_end MOD63_021DA588
thumb_func_start MOD63_021DA5A0
@@ -3610,7 +3610,7 @@ _021DA618:
blo _021DA630
mov r0, #1
mov r1, #0
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
_021DA630:
add sp, #4
pop {r3, r4, r5, r6, pc}
diff --git a/arm9/modules/63/asm/mod63_021DA640.s b/arm9/modules/63/asm/mod63_021DA640.s
index dbfc4e75..6095d832 100644
--- a/arm9/modules/63/asm/mod63_021DA640.s
+++ b/arm9/modules/63/asm/mod63_021DA640.s
@@ -460,7 +460,7 @@ _021DA9DC:
blt _021DA9DC
mov r0, #0x10
mov r1, #1
- bl FUN_0201E6E4
+ bl GX_EngineAToggleLayers
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
diff --git a/arm9/modules/63/asm/mod63_021DAE5C.s b/arm9/modules/63/asm/mod63_021DAE5C.s
index 81d1816a..52b453e2 100644
--- a/arm9/modules/63/asm/mod63_021DAE5C.s
+++ b/arm9/modules/63/asm/mod63_021DAE5C.s
@@ -338,10 +338,10 @@ _021DB040:
bl FUN_02009CF0
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, #0x14
pop {r4, r5, r6, r7, pc}
nop