diff options
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/unk_0200CABC.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02016B94.s | 40 | ||||
-rw-r--r-- | arm9/asm/unk_0201B1A8.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0201E66C.s | 197 | ||||
-rw-r--r-- | arm9/asm/unk_02022318.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02033F50.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02034188.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02035068.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02053750.s | 12 | ||||
-rw-r--r-- | arm9/asm/unk_0206C700.s | 12 | ||||
-rw-r--r-- | arm9/asm/unk_0206DE24.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_0206F3FC.s | 10 | ||||
-rw-r--r-- | arm9/asm/unk_02073710.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_020772F0.s | 28 | ||||
-rw-r--r-- | arm9/asm/unk_02079C70.s | 10 | ||||
-rw-r--r-- | arm9/asm/unk_0207C328.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0207EF6C.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020859C0.s | 16 | ||||
-rw-r--r-- | arm9/asm/unk_02086084.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02086414.s | 14 | ||||
-rw-r--r-- | arm9/asm/unk_02086FA8.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02089498.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_02089960.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_02089D90.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02089F24.s | 16 |
25 files changed, 117 insertions, 314 deletions
diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s index 0920c2fb..6d593845 100644 --- a/arm9/asm/unk_0200CABC.s +++ b/arm9/asm/unk_0200CABC.s @@ -2463,7 +2463,7 @@ _0200DE40: bl FUN_0201FDEC mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add sp, #0x34 pop {r4-r7, pc} nop diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s index 61fc9de5..3c92650d 100644 --- a/arm9/asm/unk_02016B94.s +++ b/arm9/asm/unk_02016B94.s @@ -89,8 +89,8 @@ FUN_02016BBC: ; 0x02016BBC asr r0, r0, #0x3 and r0, r1 str r0, [r2, #0x0] - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers pop {r4, pc} nop _02016BF0: .word 0xC7FFFFFF @@ -105,12 +105,12 @@ FUN_02016BF4: ; 0x02016BF4 ldr r1, [r2, #0x4] ldr r2, [r2, #0xc] bl GX_SetGraphicsMode - bl FUN_0201E6D8 + bl GX_DisableEngineALayers pop {r3, pc} _02016C0C: ldr r0, [r2, #0x8] bl GXS_SetGraphicsMode - bl FUN_0201E740 + bl GX_DisableEngineBLayers pop {r3, pc} thumb_func_start FUN_02016C18 @@ -148,7 +148,7 @@ _02016C42: ; jump table (using 16-bit offset) _02016C52: mov r0, #0x1 add r1, r0, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldrb r3, [r4, #0x14] ldrb r1, [r4, #0x12] ldrb r0, [r4, #0x11] @@ -193,7 +193,7 @@ _02016CA0: _02016CAA: mov r0, #0x2 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldrb r3, [r4, #0x14] ldrb r1, [r4, #0x12] ldrb r0, [r4, #0x11] @@ -238,7 +238,7 @@ _02016CF8: _02016D02: mov r0, #0x4 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [sp, #0x8] cmp r0, #0x0 beq _02016D18 @@ -324,7 +324,7 @@ _02016D9A: _02016DA4: mov r0, #0x8 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [sp, #0x8] cmp r0, #0x0 beq _02016DBA @@ -410,7 +410,7 @@ _02016E3C: _02016E46: mov r0, #0x1 add r1, r0, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldrb r3, [r4, #0x14] ldrb r1, [r4, #0x12] ldrb r0, [r4, #0x11] @@ -455,7 +455,7 @@ _02016E94: _02016E9E: mov r0, #0x2 mov r1, #0x1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldrb r2, [r4, #0x13] ldrb r1, [r4, #0x12] ldrb r0, [r4, #0x11] @@ -500,7 +500,7 @@ _02016EEC: _02016EF6: mov r0, #0x4 mov r1, #0x1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, [sp, #0x8] cmp r0, #0x0 beq _02016F0C @@ -586,7 +586,7 @@ _02016F8E: _02016F98: mov r0, #0x8 mov r1, #0x1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, [sp, #0x8] cmp r0, #0x0 beq _02016FAE @@ -1958,35 +1958,35 @@ _0201798E: ; jump table (using 16-bit offset) .short _020179D6 - _0201798E - 2; case 7 _0201799E: mov r0, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r3, pc} _020179A6: mov r0, #0x2 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r3, pc} _020179AE: mov r0, #0x4 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r3, pc} _020179B6: mov r0, #0x8 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r3, pc} _020179BE: mov r0, #0x1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r3, pc} _020179C6: mov r0, #0x2 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r3, pc} _020179CE: mov r0, #0x4 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r3, pc} _020179D6: mov r0, #0x8 - bl FUN_0201E74C + bl GX_EngineBToggleLayers _020179DC: pop {r3, pc} .balign 4 diff --git a/arm9/asm/unk_0201B1A8.s b/arm9/asm/unk_0201B1A8.s index baf31fcb..05245bc6 100644 --- a/arm9/asm/unk_0201B1A8.s +++ b/arm9/asm/unk_0201B1A8.s @@ -199,7 +199,7 @@ FUN_0201B314: ; 0x0201B314 push {r3, lr} mov r0, #0x1 add r1, r0, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _0201B380 ; =0x04000008 mov r1, #0x3 ldrh r2, [r0, #0x0] diff --git a/arm9/asm/unk_0201E66C.s b/arm9/asm/unk_0201E66C.s deleted file mode 100644 index 5f5dcb68..00000000 --- a/arm9/asm/unk_0201E66C.s +++ /dev/null @@ -1,197 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .extern gMain - - .section .bss - - .global UNK_021C599C -UNK_021C599C: ; 0x021C599C - .space 0x8 - - .text - - thumb_func_start FUN_0201E66C -FUN_0201E66C: ; 0x0201E66C - push {r4, lr} - add r4, r0, #0x0 - bl GX_ResetBankForBG - bl GX_ResetBankForBGExtPltt - bl GX_ResetBankForSubBG - bl FUN_020C6034 - bl GX_ResetBankForOBJ - bl GX_ResetBankForOBJExtPltt - bl FUN_020C605C - bl GX_ResetBankForSubOBJ - bl GX_ResetBankForTex - bl GX_ResetBankForTexPltt - ldr r0, [r4, #0x0] - bl GX_SetBankForBG - ldr r0, [r4, #0x4] - bl GX_SetBankForBGExtPltt - ldr r0, [r4, #0x8] - bl GX_SetBankForSubBG - ldr r0, [r4, #0xc] - bl GX_SetBankForSubBGExtPltt - ldr r0, [r4, #0x10] - bl GX_SetBankForOBJ - ldr r0, [r4, #0x14] - bl GX_SetBankForOBJExtPltt - ldr r0, [r4, #0x18] - bl GX_SetBankForSubOBJ - ldr r0, [r4, #0x1c] - bl GX_SetBankForSubOBJExtPltt - ldr r0, [r4, #0x20] - bl GX_SetBankForTex - ldr r0, [r4, #0x24] - bl GX_SetBankForTexPltt - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_0201E6D8 -FUN_0201E6D8: ; 0x0201E6D8 - ldr r0, _0201E6E0 ; =UNK_021C599C - mov r1, #0x0 - str r1, [r0, #0x4] - bx lr - .balign 4 -_0201E6E0: .word UNK_021C599C - - thumb_func_start FUN_0201E6E4 -FUN_0201E6E4: ; 0x0201E6E4 - cmp r1, #0x1 - bne _0201E6F2 - ldr r1, _0201E718 ; =UNK_021C599C - ldr r1, [r1, #0x4] - tst r1, r0 - beq _0201E6FA - bx lr -_0201E6F2: - ldr r1, _0201E718 ; =UNK_021C599C - ldr r1, [r1, #0x4] - tst r1, r0 - beq _0201E714 -_0201E6FA: - ldr r1, _0201E718 ; =UNK_021C599C - ldr r2, [r1, #0x4] - add r3, r2, #0x0 - eor r3, r0 - mov r2, #0x1 - lsl r2, r2, #0x1a - str r3, [r1, #0x4] - ldr r1, [r2, #0x0] - ldr r0, _0201E71C ; =0xFFFFE0FF - and r1, r0 - lsl r0, r3, #0x8 - orr r0, r1 - str r0, [r2, #0x0] -_0201E714: - bx lr - nop -_0201E718: .word UNK_021C599C -_0201E71C: .word 0xFFFFE0FF - - thumb_func_start FUN_0201E720 -FUN_0201E720: ; 0x0201E720 - ldr r1, _0201E738 ; =UNK_021C599C - mov r3, #0x1 - str r0, [r1, #0x4] - lsl r3, r3, #0x1a - ldr r2, [r3, #0x0] - ldr r1, _0201E73C ; =0xFFFFE0FF - lsl r0, r0, #0x8 - and r1, r2 - orr r0, r1 - str r0, [r3, #0x0] - bx lr - nop -_0201E738: .word UNK_021C599C -_0201E73C: .word 0xFFFFE0FF - - thumb_func_start FUN_0201E740 -FUN_0201E740: ; 0x0201E740 - ldr r0, _0201E748 ; =UNK_021C599C - mov r1, #0x0 - str r1, [r0, #0x0] - bx lr - .balign 4 -_0201E748: .word UNK_021C599C - - thumb_func_start FUN_0201E74C -FUN_0201E74C: ; 0x0201E74C - cmp r1, #0x1 - bne _0201E75A - ldr r1, _0201E77C ; =UNK_021C599C - ldr r1, [r1, #0x0] - tst r1, r0 - beq _0201E762 - bx lr -_0201E75A: - ldr r1, _0201E77C ; =UNK_021C599C - ldr r1, [r1, #0x0] - tst r1, r0 - beq _0201E77A -_0201E762: - ldr r1, _0201E77C ; =UNK_021C599C - ldr r2, [r1, #0x0] - add r3, r2, #0x0 - eor r3, r0 - ldr r2, _0201E780 ; =0x04001000 - str r3, [r1, #0x0] - ldr r1, [r2, #0x0] - ldr r0, _0201E784 ; =0xFFFFE0FF - and r1, r0 - lsl r0, r3, #0x8 - orr r0, r1 - str r0, [r2, #0x0] -_0201E77A: - bx lr - .balign 4 -_0201E77C: .word UNK_021C599C -_0201E780: .word 0x04001000 -_0201E784: .word 0xFFFFE0FF - - thumb_func_start FUN_0201E788 -FUN_0201E788: ; 0x0201E788 - push {r3, lr} - bl GX_DispOn - ldr r2, _0201E79C ; =0x04001000 - mov r0, #0x1 - ldr r1, [r2, #0x0] - lsl r0, r0, #0x10 - orr r0, r1 - str r0, [r2, #0x0] - pop {r3, pc} - .balign 4 -_0201E79C: .word 0x04001000 - - thumb_func_start FUN_0201E7A0 -FUN_0201E7A0: ; 0x0201E7A0 - ldr r0, _0201E7C0 ; =gMain + 0x60 - ldr r2, _0201E7C4 ; =0x04000304 - ldrb r0, [r0, #0x5] - cmp r0, #0x0 - bne _0201E7B4 - ldrh r1, [r2, #0x0] - lsr r0, r2, #0xb - orr r0, r1 - strh r0, [r2, #0x0] - bx lr -_0201E7B4: - ldrh r1, [r2, #0x0] - ldr r0, _0201E7C8 ; =0xFFFF7FFF - and r0, r1 - strh r0, [r2, #0x0] - bx lr - nop -_0201E7C0: .word gMain + 0x60 -_0201E7C4: .word 0x04000304 -_0201E7C8: .word 0xFFFF7FFF - - thumb_func_start FUN_0201E7CC -FUN_0201E7CC: ; 0x0201E7CC - ldr r0, _0201E7D4 ; =UNK_021C599C - ldr r0, [r0, #0x4] - bx lr - nop -_0201E7D4: .word UNK_021C599C diff --git a/arm9/asm/unk_02022318.s b/arm9/asm/unk_02022318.s index 7f8590a6..cf87cdb9 100644 --- a/arm9/asm/unk_02022318.s +++ b/arm9/asm/unk_02022318.s @@ -99,7 +99,7 @@ FUN_020223D4: ; 0x020223D4 push {r3, lr} mov r0, #0x1 add r1, r0, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _02022438 ; =0x04000008 mov r1, #0x3 ldrh r2, [r0, #0x0] diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index cf84285f..1ff53c51 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -96,8 +96,8 @@ _02033FA4: mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -114,7 +114,7 @@ _02033FA4: ldr r0, _02034160 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] - bl FUN_0201E7A0 + bl GX_SwapDisplay ldr r3, _02034164 ; =0x04000050 mov r1, #0x0 strh r1, [r3, #0x0] @@ -231,7 +231,7 @@ _02033FA4: bl AddTextPrinterParameterized add r0, r7, #0x0 bl String_dtor - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x0 bl FUN_0200E394 mov r0, #0x1 diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index d8b35c57..10c67e5a 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -44,8 +44,8 @@ FUN_02034188: ; 0x02034188 mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -62,7 +62,7 @@ FUN_02034188: ; 0x02034188 ldr r0, _02034370 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] - bl FUN_0201E7A0 + bl GX_SwapDisplay ldr r3, _02034374 ; =0x04000050 mov r0, #0x0 strh r0, [r3, #0x0] @@ -158,7 +158,7 @@ FUN_02034188: ; 0x02034188 bl AddTextPrinterParameterized add r0, r4, #0x0 bl String_dtor - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x0 bl FUN_0200E394 mov r0, #0x1 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 95c1867f..810faa41 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -1406,7 +1406,7 @@ _02035B2C: str r2, [r0, r1] mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0xb4 pop {r4-r7, pc} .balign 4 diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s index 73072399..6ab54142 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -308,10 +308,10 @@ _02053912: bl FUN_02017FB4 mov r0, #0x1 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x2 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r1, #0x57 lsl r1, r1, #0x2 add r0, r4, #0x0 @@ -488,7 +488,7 @@ _02053A78: bge _02053B30 mov r0, #0x1 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x6 lsl r0, r0, #0x6 ldr r1, [r4, r0] @@ -559,7 +559,7 @@ _02053B00: _02053B16: mov r0, #0x2 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x62 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -878,10 +878,10 @@ FUN_02053D70: ; 0x02053D70 str r0, [r4, #0x0] mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r4, pc} thumb_func_start FUN_02053D94 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 8e89581c..9d542d37 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2237,7 +2237,7 @@ FUN_0206D9B4: ; 0x0206D9B4 sub sp, #0xb8 add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers ldr r6, _0206DC28 ; =UNK_020F8354 add r3, sp, #0x3c mov r2, #0x5 @@ -2323,7 +2323,7 @@ _0206DA26: orr r2, r0 strh r2, [r1, #0x0] add r1, r0, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r6, _0206DC38 ; =UNK_020F8338 add r3, sp, #0x10 ldmia r6!, {r0-r1} @@ -2507,10 +2507,10 @@ _0206DA26: mov r1, #0xa0 add r0, #0x75 strb r1, [r0, #0x0] - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _0206DC44 ; =FUN_0206DD08 add r1, r5, #0x0 bl Main_SetVBlankIntrCB @@ -2532,10 +2532,10 @@ FUN_0206DC48: ; 0x0206DC48 add r4, r0, #0x0 mov r0, #0x1 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x2 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0x0 mov r1, #0x1 bl FUN_020178A0 diff --git a/arm9/asm/unk_0206DE24.s b/arm9/asm/unk_0206DE24.s index 41eab63c..0bc45eb2 100644 --- a/arm9/asm/unk_0206DE24.s +++ b/arm9/asm/unk_0206DE24.s @@ -9,8 +9,8 @@ thumb_func_start FUN_0206DE24 FUN_0206DE24: ; 0x0206DE24 push {r3, lr} - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -69,7 +69,7 @@ FUN_0206DE94: ; 0x0206DE94 push {r3, lr} mov r0, #0x1 add r1, r0, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _0206DF00 ; =0x04000008 mov r1, #0x3 ldrh r2, [r0, #0x0] diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index e09b1ec4..9c619fea 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -124,8 +124,8 @@ FUN_0206F3FC: ; 0x0206F3FC add r1, r0, #0x0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r0, #0x1 lsl r0, r0, #0x1a ldr r2, [r0, #0x0] @@ -289,7 +289,7 @@ _0206F564: bne _0206F582 mov r0, #0x1 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers _0206F582: ldr r0, _0206F5A8 ; =FUN_0206FB58 add r1, r4, #0x0 @@ -1213,10 +1213,10 @@ FUN_0206FCD4: ; 0x0206FCD4 add r4, r0, #0x0 mov r0, #0x1f mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x13 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0x0 mov r1, #0x5 bl FUN_020178A0 diff --git a/arm9/asm/unk_02073710.s b/arm9/asm/unk_02073710.s index 93309503..8aac6df0 100644 --- a/arm9/asm/unk_02073710.s +++ b/arm9/asm/unk_02073710.s @@ -129,10 +129,10 @@ FUN_02073710: ; 0x02073710 add r4, r0, #0x0 mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x20 mov r1, #0xc bl FUN_0201C24C diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index ecca3742..2586d0f5 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -714,8 +714,8 @@ _020772FE: add r1, r0, #0x0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -846,7 +846,7 @@ _020772FE: ldr r0, _020774A8 ; =gMain + 0x60 mov r1, #0x1 strb r1, [r0, #0x5] - bl FUN_0201E7A0 + bl GX_SwapDisplay ldr r0, [r5, #0x0] add r0, r0, #0x1 str r0, [r5, #0x0] @@ -1587,7 +1587,7 @@ _02077A0C: ldr r0, _02077A80 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] - bl FUN_0201E7A0 + bl GX_SwapDisplay mov r0, #0x1 add sp, #0x14 pop {r4-r7, pc} @@ -1855,32 +1855,32 @@ FUN_02077C84: ; 0x02077C84 lsl r1, r4, #0x18 mov r0, #0x1 lsr r1, r1, #0x18 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers lsl r1, r4, #0x18 mov r0, #0x2 lsr r1, r1, #0x18 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers lsl r1, r4, #0x18 mov r0, #0x4 lsr r1, r1, #0x18 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x8 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers lsl r1, r4, #0x18 mov r0, #0x10 lsr r1, r1, #0x18 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers lsl r1, r4, #0x18 mov r0, #0x1 lsr r1, r1, #0x18 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x2 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x10 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r4, pc} thumb_func_start FUN_02077CD4 @@ -2875,10 +2875,10 @@ _020784FA: bl FUN_02078530 mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add sp, #0x5c pop {r4-r7, pc} nop diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 3562d2e7..ec9c64ac 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -61,8 +61,8 @@ FUN_02079C7C: ; 0x02079C7C add r1, r0, #0x0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r1, #0x1 lsl r1, r1, #0x1a ldr r0, [r1, #0x0] @@ -157,7 +157,7 @@ FUN_02079C7C: ; 0x02079C7C ldr r0, _02079DB0 ; =FUN_02079F24 add r1, r5, #0x0 bl Main_SetVBlankIntrCB - bl FUN_0201E788 + bl GX_BothDispOn mov r1, #0x0 mov r0, #0x3d add r2, r1, #0x0 @@ -514,8 +514,8 @@ _0207A088: .word UNK_020FA634 FUN_0207A08C: ; 0x0207A08C push {r4, lr} add r4, r0, #0x0 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers add r0, r4, #0x0 mov r1, #0x5 bl FUN_020178A0 diff --git a/arm9/asm/unk_0207C328.s b/arm9/asm/unk_0207C328.s index bf0bb784..ba0e57e6 100644 --- a/arm9/asm/unk_0207C328.s +++ b/arm9/asm/unk_0207C328.s @@ -274,10 +274,10 @@ FUN_0207C328: ; 0x0207C328 add r4, r0, #0x0 mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x20 mov r1, #0x13 bl FUN_0201C24C diff --git a/arm9/asm/unk_0207EF6C.s b/arm9/asm/unk_0207EF6C.s index 0ef763b0..8fcaed0c 100644 --- a/arm9/asm/unk_0207EF6C.s +++ b/arm9/asm/unk_0207EF6C.s @@ -145,7 +145,7 @@ FUN_0207EF6C: ; 0x0207EF6C str r0, [r1, #0x40] mov r0, #0x1 add r1, r0, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r1, _0207F004 ; =0x04000008 mov r0, #0x3 ldrh r2, [r1, #0x0] diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index a299f623..2e98e9cf 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -445,28 +445,28 @@ FUN_02085C08: ; 0x02085C08 add r4, r0, #0x0 mov r0, #0x1 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x2 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x4 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x8 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x1 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x2 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x4 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x8 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 4d8fa9a4..9d8276fd 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -171,16 +171,16 @@ FUN_020861DC: ; 0x020861DC bl FUN_020223BC mov r0, #0x1 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x2 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x3 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x4 mov r1, #0x0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, [r4, #0x8] mov r1, #0x0 bl FUN_02003038 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index de7be3b2..ca93020a 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -97,8 +97,8 @@ UNK_020FD078: ; 0x020FD078 thumb_func_start FUN_02086414 FUN_02086414: ; 0x02086414 push {r3, lr} - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -158,7 +158,7 @@ FUN_02086488: ; 0x02086488 push {r3, lr} mov r0, #0x1 add r1, r0, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _020864F4 ; =0x04000008 mov r1, #0x3 ldrh r2, [r0, #0x0] @@ -251,7 +251,7 @@ FUN_0208654C: ; 0x0208654C push {r3-r5, lr} sub sp, #0xa8 add r4, r0, #0x0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers ldr r5, _02086650 ; =UNK_020FCEBC add r3, sp, #0x2c mov r2, #0x5 @@ -337,11 +337,11 @@ _020865BC: orr r2, r0 strh r2, [r1, #0x0] add r1, r0, #0x0 - bl FUN_0201E6E4 - bl FUN_0201E788 + bl GX_EngineAToggleLayers + bl GX_BothDispOn mov r0, #0x10 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r5, _02086660 ; =UNK_020FCE60 add r3, sp, #0x0 ldmia r5!, {r0-r1} diff --git a/arm9/asm/unk_02086FA8.s b/arm9/asm/unk_02086FA8.s index 8cc246e9..2ccd040d 100644 --- a/arm9/asm/unk_02086FA8.s +++ b/arm9/asm/unk_02086FA8.s @@ -850,7 +850,7 @@ _02087636: bl FUN_0200C61C mov r0, #0x2 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0x64] add r0, r0, #0x1 str r0, [r4, #0x64] @@ -984,7 +984,7 @@ _0208774C: bne _02087810 mov r0, #0x2 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0x0 mov r1, #0x0 bl FUN_02086F98 @@ -1105,7 +1105,7 @@ _02087844: bl FUN_02086B70 mov r0, #0x2 mov r1, #0x0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0x64] add r0, r0, #0x1 str r0, [r4, #0x64] @@ -1232,7 +1232,7 @@ _0208794C: bl FUN_02086F98 mov r0, #0x2 mov r1, #0x1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0x6c] mov r1, #0x0 bl FUN_0200C644 diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index e4ce48cf..4d0675a9 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -105,8 +105,8 @@ _020894FC: add r0, r6, #0x0 add r1, r0, #0x0 bl FUN_02015F34 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -127,7 +127,7 @@ _020894FC: ldr r0, _020895EC ; =FUN_02089610 add r1, r4, #0x0 bl Main_SetVBlankIntrCB - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x6 mov r1, #0x1 str r0, [sp, #0x0] diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 575eade7..c0b5f4d0 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -87,8 +87,8 @@ _020899B8: add r0, r4, #0x0 add r1, r0, #0x0 bl FUN_02015F34 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -106,7 +106,7 @@ _020899B8: bl FUN_02089A6C add r0, r6, #0x0 bl FUN_02089B80 - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x1 str r0, [r5, #0x0] b _02089A34 diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index b8c341df..0b5c5774 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -43,8 +43,8 @@ FUN_02089D90: ; 0x02089D90 mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -61,7 +61,7 @@ FUN_02089D90: ; 0x02089D90 ldr r0, _02089EFC ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] - bl FUN_0201E7A0 + bl GX_SwapDisplay ldr r3, _02089F00 ; =0x04000050 mov r0, #0x0 strh r0, [r3, #0x0] @@ -157,7 +157,7 @@ FUN_02089D90: ; 0x02089D90 bl AddTextPrinterParameterized add r0, r4, #0x0 bl String_dtor - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x0 bl FUN_0200E394 mov r0, #0x1 diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index 5c84eabc..340fa64d 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -47,8 +47,8 @@ FUN_02089F24: ; 0x02089F24 mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -65,7 +65,7 @@ FUN_02089F24: ; 0x02089F24 ldr r0, _0208A090 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] - bl FUN_0201E7A0 + bl GX_SwapDisplay ldr r3, _0208A094 ; =0x04000050 mov r0, #0x0 strh r0, [r3, #0x0] @@ -161,7 +161,7 @@ FUN_02089F24: ; 0x02089F24 bl AddTextPrinterParameterized add r0, r4, #0x0 bl String_dtor - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x0 bl FUN_0200E394 mov r0, #0x1 @@ -216,8 +216,8 @@ _0208A0C8: mov r0, #0x0 add r1, r0, #0x0 bl FUN_02015F34 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #0x1 lsl r2, r2, #0x1a ldr r1, [r2, #0x0] @@ -234,7 +234,7 @@ _0208A0C8: ldr r0, _0208A230 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] - bl FUN_0201E7A0 + bl GX_SwapDisplay ldr r3, _0208A234 ; =0x04000050 mov r1, #0x0 strh r1, [r3, #0x0] @@ -330,7 +330,7 @@ _0208A0C8: bl AddTextPrinterParameterized add r0, r4, #0x0 bl String_dtor - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x0 bl FUN_0200E394 mov r0, #0x1 |