diff options
Diffstat (limited to 'arm9/modules')
54 files changed, 638 insertions, 638 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] diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 1dd5e52a..18de2954 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -126,7 +126,7 @@ _0223977A: sub r2, r2, #1 bne _0223977A add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -148,7 +148,7 @@ MOD06_02239790: ; 0x02239790 bl FUN_02016BBC mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r5, _022397F0 ; =0x0224F1D8 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -225,7 +225,7 @@ MOD06_02239840: ; 0x02239840 add r4, r1, #0 add r5, r0, #0 add r0, r4, #4 - bl FUN_0201E66C + bl GX_SetBanks ldr r0, [r4] ldr r0, [r0, #8] bl MOD06_02239864 @@ -249,7 +249,7 @@ MOD06_0223986C: ; 0x0223986C bl MOD05_021D7A20 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r3, pc} thumb_func_start MOD06_0223987C @@ -8949,7 +8949,7 @@ _0223DA88: .word 0x00000241 MOD06_0223DA8C: ; 0x0223DA8C push {r4, lr} add r4, r0, #0 - bl FUN_0201E7CC + bl GX_GetEngineALayers mov r1, #0x8e lsl r1, r1, #2 str r0, [r4, r1] @@ -8988,16 +8988,16 @@ MOD06_0223DA8C: ; 0x0223DA8C bl FUN_020178BC mov r0, #0 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #3 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r4, pc} nop _0223DB10: .word 0x00000235 @@ -9028,7 +9028,7 @@ MOD06_0223DB1C: ; 0x0223DB1C mov r0, #0x8e lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_0201E720 + bl GX_SetEngineALayers pop {r4, pc} nop _0223DB58: .word 0x00000235 @@ -10997,7 +10997,7 @@ _0223EBA8: blo _0223EBA8 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r3, r4, r5, r6, r7, pc} nop _0223EBCC: .word MOD6_0224F370 @@ -27738,7 +27738,7 @@ MOD06_02246F0C: ; 0x02246F0C strh r0, [r2, #4] mov r0, #8 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r2, r5, #0 add r0, r4, #0 mov r1, #2 @@ -27771,7 +27771,7 @@ MOD06_02246F0C: ; 0x02246F0C str r0, [r5, r1] mov r0, #8 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r3, r4, r5, pc} .align 2, 0 _02246FB4: .word 0x0400000A @@ -27782,7 +27782,7 @@ MOD06_02246FB8: ; 0x02246FB8 add r4, r0, #0 mov r0, #8 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x1e lsl r0, r0, #4 ldr r0, [r4, r0] @@ -27809,7 +27809,7 @@ MOD06_02246FB8: ; 0x02246FB8 bl FUN_02054590 mov r0, #8 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r4, pc} nop _02247008: .word 0x04000008 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 1a91192a..3cef2d24 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -110,7 +110,7 @@ _02211F1E: sub r2, r2, #1 bne _02211F1E add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -126,8 +126,8 @@ MOD07_02211F34: ; 0x02211F34 add r1, r0, #0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r0, #1 lsl r0, r0, #0x1a ldr r2, [r0] @@ -1358,7 +1358,7 @@ MOD07_02212968: ; 0x02212968 bne _022129AC mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #1 lsl r0, r0, #0x1a add r3, r0, #0 @@ -1750,7 +1750,7 @@ MOD07_02212C04: ; 0x02212C04 bl FUN_0200BF60 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x38 pop {r3, r4, r5, r6, r7, pc} nop @@ -1966,7 +1966,7 @@ MOD07_02212D98: ; 0x02212D98 bl FUN_02018744 mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x64 pop {r4, r5, pc} nop @@ -1981,7 +1981,7 @@ MOD07_02212E64: ; 0x02212E64 add r4, r0, #0 mov r0, #0x1f mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0xc] mov r1, #3 bl FUN_020178A0 @@ -3269,7 +3269,7 @@ MOD07_022138F8: ; 0x022138F8 add r4, r0, #0 mov r0, #0x1e mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0xc] mov r1, #3 bl FUN_020178A0 diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index e98eadea..55a90a71 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2143,7 +2143,7 @@ MOD09_02212F5C: ; 0x02212F5C add r4, r0, #0 mov r0, #0x1f mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 bl FUN_020178A0 @@ -8759,7 +8759,7 @@ MOD09_02216734: ; 0x02216734 bl MOD09_02217750 mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r4, pc} thumb_func_start MOD09_02216770 @@ -13962,7 +13962,7 @@ MOD09_02219198: ; 0x02219198 add r4, r0, #0 mov r0, #0x17 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 bl FUN_020178A0 @@ -15495,7 +15495,7 @@ MOD09_02219DC8: ; 0x02219DC8 bl MOD09_0221A244 mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 30ee9995..32981b60 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -386,7 +386,7 @@ MOD11_0222D88C: ; 0x0222D88C bl MOD11_02258450 mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x67 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -427,10 +427,10 @@ MOD11_0222D944: ; 0x0222D944 bl FUN_02019178 mov r0, #1 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #4] mov r1, #1 bl FUN_020178A0 @@ -499,7 +499,7 @@ _0222D99A: orr r2, r0 strh r2, [r1] add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r5, #0 bl MOD11_02230E44 add r4, r0, #0 @@ -602,13 +602,13 @@ _0222D99A: ldrh r2, [r0] bic r2, r1 strh r2, [r0] - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, _0222DB4C ; =MOD11_0222F01C add r1, r5, #0 bl Main_SetVBlankIntrCB @@ -1420,7 +1420,7 @@ MOD11_0222E264: ; 0x0222E264 sub sp, #0x9c add r5, r0, #0 add r4, r1, #0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers mov r0, #0 bl FUN_0200E394 mov r0, #1 @@ -1434,7 +1434,7 @@ _0222E282: sub r2, r2, #1 bne _0222E282 add r0, sp, #0x20 - bl FUN_0201E66C + bl GX_SetBanks mov r1, #6 mov r2, #2 mov r0, #0 @@ -1517,7 +1517,7 @@ _0222E2F0: orr r2, r0 strh r2, [r1] add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 bl MOD11_02258450 add r0, r5, #0 @@ -1622,13 +1622,13 @@ _0222E2F0: ldrh r2, [r0] bic r2, r1 strh r2, [r0] - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, _0222E46C ; =MOD11_0222F01C add r1, r5, #0 bl Main_SetVBlankIntrCB @@ -1706,10 +1706,10 @@ MOD11_0222E4E8: ; 0x0222E4E8 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 add r0, r4, #0 mov r1, #1 bl FUN_020178A0 @@ -2995,7 +2995,7 @@ MOD11_0222EF50: ; 0x0222EF50 push {r3, lr} mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _0222EFBC ; =0x04000008 mov r1, #3 ldrh r2, [r0] @@ -3127,7 +3127,7 @@ _0222F056: sub r2, r2, #1 bne _0222F056 add r0, sp, #0x28 - bl FUN_0201E66C + bl GX_SetBanks _0222F064: ldr r1, _0222F0B8 ; =0x000023FB ldrb r2, [r4, r1] @@ -3146,7 +3146,7 @@ _0222F07A: sub r2, r2, #1 bne _0222F07A add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks _0222F088: add r0, r4, #0 add r0, #0x88 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index f04e67da..3e416af6 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -49,7 +49,7 @@ MOD11_0222F29C: ; 0x0222F29C str r0, [r5, #8] add r0, r5, #0 bl FUN_0206BFF0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers ldr r6, _0222F4C8 ; =MOD11_0225DA40 add r3, sp, #0x40 mov r2, #5 @@ -59,7 +59,7 @@ _0222F30E: sub r2, r2, #1 bne _0222F30E add r0, sp, #0x40 - bl FUN_0201E66C + bl GX_SetBanks mov r1, #6 mov r2, #2 mov r0, #0 @@ -165,10 +165,10 @@ _0222F30E: add r2, r1, #0 add r3, r1, #0 bl FUN_02003914 - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -813,7 +813,7 @@ MOD11_0222F93C: ; 0x0222F93C bl FUN_020191A4 mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #4] mov r1, #1 bl FUN_020178A0 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 4f1ef252..f717789a 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -12,8 +12,8 @@ MOD12_0222D5C0: ; 0x0222D5C0 add r1, r0, #0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r1, #1 lsl r1, r1, #0x1a ldr r0, [r1] @@ -255,13 +255,13 @@ _0222D7BC: ldr r0, _0222D88C ; =0x00000824 mov r1, #1 strb r1, [r4, r0] - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r1, _0222D890 ; =0x0000046F mov r0, #6 mov r2, #1 @@ -448,10 +448,10 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl FUN_02019178 mov r0, #1 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0x30] mov r1, #1 bl FUN_020178A0 @@ -589,7 +589,7 @@ MOD12_0222DB50: ; 0x0222DB50 push {r4, r5, lr} sub sp, #0x8c add r4, r0, #0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers ldr r5, _0222DC70 ; =MOD12_022449E8 add r3, sp, #0x10 mov r2, #5 @@ -599,7 +599,7 @@ _0222DB60: sub r2, r2, #1 bne _0222DB60 add r0, sp, #0x10 - bl FUN_0201E66C + bl GX_SetBanks mov r1, #6 mov r2, #2 mov r0, #0 @@ -706,7 +706,7 @@ _0222DBC0: strh r0, [r1] mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 bl MOD12_022319A4 add sp, #0x8c @@ -1079,7 +1079,7 @@ MOD12_0222DF30: ; 0x0222DF30 bne _0222DFBE mov r0, #4 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x10 pop {r3, r4, r5, pc} _0222DF9A: @@ -3147,8 +3147,8 @@ MOD12_0222EF04: ; 0x0222EF04 add r1, r0, #0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r1, #1 lsl r1, r1, #0x1a ldr r0, [r1] @@ -3357,13 +3357,13 @@ MOD12_0222EF04: ; 0x0222EF04 ldr r0, _0222F188 ; =0x000004F8 mov r1, #1 strb r1, [r5, r0] - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0 bl FUN_0200415C ldr r1, _0222F18C ; =0x0000046F @@ -3604,10 +3604,10 @@ MOD12_0222F324: ; 0x0222F324 bl FUN_02019178 mov r0, #1 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0x30] mov r1, #1 bl FUN_020178A0 @@ -3818,7 +3818,7 @@ MOD12_0222F548: ; 0x0222F548 push {r3, r4, r5, lr} sub sp, #0xa8 add r4, r0, #0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers ldr r5, _0222F6A0 ; =MOD12_02244B1C add r3, sp, #0x2c mov r2, #5 @@ -3828,7 +3828,7 @@ _0222F558: sub r2, r2, #1 bne _0222F558 add r0, sp, #0x2c - bl FUN_0201E66C + bl GX_SetBanks mov r1, #6 mov r2, #2 mov r0, #0 @@ -3934,7 +3934,7 @@ _0222F5B8: orr r2, r0 strh r2, [r1] add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r5, _0222F6B0 ; =MOD12_02244AE0 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -4987,8 +4987,8 @@ MOD12_0222FE4C: ; 0x0222FE4C add r1, r0, #0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r1, #1 lsl r1, r1, #0x1a ldr r0, [r1] @@ -5219,13 +5219,13 @@ MOD12_0222FE4C: ; 0x0222FE4C ldr r0, _02230110 ; =0x00001154 mov r1, #1 strb r1, [r5, r0] - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r1, _02230114 ; =0x0000046F mov r0, #6 mov r2, #1 @@ -5442,10 +5442,10 @@ _02230296: blt _02230296 mov r0, #1 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0x74] mov r1, #1 bl FUN_020178A0 @@ -5764,7 +5764,7 @@ MOD12_02230574: ; 0x02230574 push {r4, r5, lr} sub sp, #0x8c add r4, r0, #0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers ldr r5, _02230694 ; =MOD12_02244C38 add r3, sp, #0x10 mov r2, #5 @@ -5774,7 +5774,7 @@ _02230584: sub r2, r2, #1 bne _02230584 add r0, sp, #0x10 - bl FUN_0201E66C + bl GX_SetBanks mov r1, #6 mov r2, #2 mov r0, #0 @@ -5881,7 +5881,7 @@ _022305E4: strh r0, [r1] mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 bl MOD12_0223B41C add sp, #0x8c @@ -7479,7 +7479,7 @@ MOD12_022312F4: ; 0x022312F4 push {r3, lr} mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _02231360 ; =0x04000008 mov r1, #3 ldrh r2, [r0] @@ -41074,8 +41074,8 @@ MOD12_02241210: ; 0x02241210 add r1, r0, #0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r1, #1 lsl r1, r1, #0x1a ldr r0, [r1] @@ -41276,13 +41276,13 @@ MOD12_02241210: ; 0x02241210 mov r1, #1 lsl r0, r0, #4 strb r1, [r5, r0] - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r1, _0224147C ; =0x0000046F mov r0, #6 mov r2, #1 @@ -41479,10 +41479,10 @@ _022415D4: blt _022415D4 mov r0, #1 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0x30] mov r1, #1 bl FUN_020178A0 @@ -41754,7 +41754,7 @@ MOD12_02241864: ; 0x02241864 push {r3, r4, r5, lr} sub sp, #0xa8 add r4, r0, #0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers ldr r5, _022419BC ; =MOD12_0224656C add r3, sp, #0x2c mov r2, #5 @@ -41764,7 +41764,7 @@ _02241874: sub r2, r2, #1 bne _02241874 add r0, sp, #0x2c - bl FUN_0201E66C + bl GX_SetBanks mov r1, #6 mov r2, #2 mov r0, #0 @@ -41870,7 +41870,7 @@ _022418D4: orr r2, r0 strh r2, [r1] add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r5, _022419CC ; =MOD12_02246530 add r3, sp, #0 ldmia r5!, {r0, r1} diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 824cb507..edbb6d86 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -10495,8 +10495,8 @@ _021DC79C: mov r5, #1 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r1, #1 lsl r1, r1, #0x1a ldr r0, [r1] @@ -12835,7 +12835,7 @@ MOD14_021DDA38: ; 0x021DDA38 add r5, r0, #0 ldr r0, _021DDB20 ; =MOD14_021E63A4 add r4, r1, #0 - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _021DDB24 ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb @@ -13061,10 +13061,10 @@ _021DDBF2: _021DDC48: mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers bl GX_DispOn add sp, #0x10 pop {r3, r4, r5, pc} @@ -13083,7 +13083,7 @@ MOD14_021DDC78: ; 0x021DDC78 bl G3X_InitMtxStack mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _021DDCDC ; =0x04000008 mov r1, #3 ldrh r2, [r0] diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index f7f9881d..560be120 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2817,8 +2817,8 @@ MOD15_021D8998: ; 0x021D8998 MOD15_021D89C0: ; 0x021D89C0 push {r3, r4, r5, lr} add r4, r1, #0 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r1, #1 lsl r1, r1, #0x1a ldr r0, [r1] @@ -2903,10 +2903,10 @@ MOD15_021D89C0: ; 0x021D89C0 bl MOD15_021DAEB4 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers bl GX_DispOn add r0, r4, #0 bl MOD15_021D8998 @@ -3110,7 +3110,7 @@ MOD15_021D8C30: ; 0x021D8C30 add r2, r0, #0 bl GX_SetGraphicsMode ldr r0, _021D8C98 ; =0x021DB964 - bl FUN_0201E66C + bl GX_SetBanks ldr r0, _021D8C9C ; =0x021DB8C8 bl FUN_02016BBC mov r1, #0 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index cfff4a29..26ae4fbf 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -1984,7 +1984,7 @@ _021D840E: sub r2, r2, #1 bne _021D840E add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -2207,10 +2207,10 @@ MOD16_021D8534: ; 0x021D8534 str r0, [r5, r1] mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x4f lsl r0, r0, #2 ldr r0, [r5, r0] @@ -3372,7 +3372,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 bl FUN_020178BC mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r6, _021D8F1C ; =0x021FF4D8 add r3, sp, #0x54 ldmia r6!, {r0, r1} @@ -25839,7 +25839,7 @@ _021E3288: _021E329E: mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _021E32D0 ; =0x00000804 ldr r0, [r5, r0] bl FreeToHeap @@ -27619,7 +27619,7 @@ MOD16_021E4094: ; 0x021E4094 add r0, r0, #4 str r1, [r6, r0] mov r0, #2 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r6, #0 add r0, #0xc4 ldr r0, [r0] @@ -27658,7 +27658,7 @@ MOD16_021E40D4: ; 0x021E40D4 bl G2x_SetBlendAlpha_ mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r6, #0 add r0, #0xc4 ldr r0, [r0] @@ -27725,7 +27725,7 @@ _021E4158: _021E4162: mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x81 add r1, r4, #0 lsl r0, r0, #4 @@ -27773,7 +27773,7 @@ _021E417E: bne _021E41CC mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r3, r4, r5, r6, r7, pc} _021E41CC: add r0, r5, #0 @@ -51397,7 +51397,7 @@ MOD16_021EF218: ; 0x021EF218 bl FUN_020178BC mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r5, #0 mov r1, #0 bl FUN_020178A0 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 3615681b..82398e6b 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -414,7 +414,7 @@ MOD17_021D7794: ; 0x021D7794 ldr r0, _021D77B0 ; =gMain + 0x60 mov r1, #1 strb r1, [r0, #5] - bl FUN_0201E7A0 + bl GX_SwapDisplay pop {r3, pc} nop _021D77B0: .word gMain + 0x60 @@ -426,7 +426,7 @@ MOD17_021D77B4: ; 0x021D77B4 ldr r0, _021D77D0 ; =gMain + 0x60 mov r1, #0 strb r1, [r0, #5] - bl FUN_0201E7A0 + bl GX_SwapDisplay bl MOD17_021D7E0C bl MOD17_021D7E00 bl GX_ResetBankForTex @@ -1163,7 +1163,7 @@ _021D7D12: sub r2, r2, #1 bne _021D7D12 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -1177,7 +1177,7 @@ MOD17_021D7D28: ; 0x021D7D28 bl G3X_InitMtxStack mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _021D7D9C ; =0x04000008 mov r1, #3 ldrh r2, [r0] @@ -1254,14 +1254,14 @@ MOD17_021D7DB0: ; 0x021D7DB0 orr r0, r1 str r0, [r2] bl FUN_020B0FC0 - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r0, #0x1f mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x13 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -1280,8 +1280,8 @@ MOD17_021D7E00: ; 0x021D7E00 thumb_func_start MOD17_021D7E0C MOD17_021D7E0C: ; 0x021D7E0C push {r3, lr} - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers bl FUN_020B0FC0 pop {r3, pc} thumb_func_end MOD17_021D7E0C @@ -4497,19 +4497,19 @@ MOD17_021D9778: ; 0x021D9778 bic r2, r3 strh r2, [r1, #6] 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, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0 bl FUN_0200E394 pop {r4, pc} @@ -4535,16 +4535,16 @@ MOD17_021D9800: ; 0x021D9800 bl FUN_0201FD98 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers pop {r4, pc} thumb_func_end MOD17_021D9800 @@ -13824,7 +13824,7 @@ _021DDBBC: ldr r0, _021DDC2C ; =gMain + 0x60 mov r1, #0 strb r1, [r0, #5] - bl FUN_0201E7A0 + bl GX_SwapDisplay add r0, r4, #0 add r0, #0x14 mov r1, #0xe diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 233dbc05..d0f6db33 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1467,7 +1467,7 @@ _0223A194: sub r2, r2, #1 bne _0223A194 add r0, sp, #0x80 - bl FUN_0201E66C + bl GX_SetBanks ldr r5, _0223A2A8 ; =0x02250000 add r3, sp, #0x70 add r2, r3, #0 @@ -1733,16 +1733,16 @@ MOD18_0223A3D4: ; 0x0223A3D4 bl MOD18_022396A0 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 r2, #5 mov r0, #3 mov r1, #0x1d @@ -2128,16 +2128,16 @@ _0223A73A: bl FUN_0200E1D0 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #8 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4] add sp, #0xc add r0, r0, #1 @@ -6124,10 +6124,10 @@ _0223C634: blt _0223C57A 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, #0x64 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -14393,7 +14393,7 @@ _022404A4: bl FUN_020178BC mov r0, #4 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 bl FUN_0204F774 ldr r0, _022404EC ; =0x022513A0 @@ -14652,7 +14652,7 @@ _02240672: ; jump table _0224068C: mov r0, #4 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers bl MOD18_022400A0 str r0, [r4, #4] ldr r0, [r4] @@ -14793,7 +14793,7 @@ _0224079E: bl FUN_0200A208 mov r0, #4 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #7 str r0, [r4] bl MOD18_0223D638 @@ -17110,10 +17110,10 @@ _0224195E: _022419BE: 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, #0x5c pop {r4, r5, r6, r7, pc} nop @@ -18293,10 +18293,10 @@ _0224227A: _02242308: 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, #0x60 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -18857,10 +18857,10 @@ _02242704: blt _02242704 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, #0x5c pop {r4, r5, r6, r7, pc} nop @@ -20398,10 +20398,10 @@ MOD18_022432B4: ; 0x022432B4 bl FUN_02020238 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, #0x5c pop {pc} nop @@ -21585,10 +21585,10 @@ _02243CBE: blt _02243C60 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, #0x5c pop {r4, r5, r6, r7, pc} nop @@ -22580,7 +22580,7 @@ _02244460: blt _02244460 mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, [r4] add sp, #0x60 add r0, r0, #1 @@ -22594,16 +22594,16 @@ _022444A4: _022444AC: mov r0, #8 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #4 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #2 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #1 add r1, r0, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #4 mov r1, #0 bl FUN_02017FE4 @@ -23101,7 +23101,7 @@ MOD18_0224486C: ; 0x0224486C bl FUN_02016C18 mov r0, #1 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r6, _02244990 ; =0x02250498 add r3, sp, #0x2c ldmia r6!, {r0, r1} @@ -23119,7 +23119,7 @@ MOD18_0224486C: ; 0x0224486C bl FUN_02016C18 mov r0, #2 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r6, _02244994 ; =0x0225047C add r3, sp, #0x10 ldmia r6!, {r0, r1} @@ -23137,7 +23137,7 @@ MOD18_0224486C: ; 0x0224486C bl FUN_02016C18 mov r0, #8 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r5, #0 mov r1, #7 bl FUN_02018744 @@ -32427,7 +32427,7 @@ _02249184: str r2, [r0, r1] mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0xb4 pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index a42eeb6f..67f4c29a 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -1560,10 +1560,10 @@ MOD20_02252ED0: ; 0x02252ED0 mov r0, #0x10 orr r0, r1 str r0, [r2] - bl FUN_0201E740 + bl GX_DisableEngineBLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 848caed1..60bdd016 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -49,19 +49,19 @@ _0225487A: bl MOD51_02254944 mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #1 add r1, r0, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #4 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #8 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0 bl MOD51_0225571C ldr r0, [r4] @@ -409,7 +409,7 @@ MOD51_02254B54: ; 0x02254B54 bl FUN_02018744 mov r0, #1 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r5, _02254C74 ; =0x0225578C add r3, sp, #0x48 ldmia r5!, {r0, r1} @@ -430,7 +430,7 @@ MOD51_02254B54: ; 0x02254B54 bl FUN_02018744 mov r0, #2 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r5, _02254C78 ; =0x022557C4 add r3, sp, #0x2c ldmia r5!, {r0, r1} @@ -451,7 +451,7 @@ MOD51_02254B54: ; 0x02254B54 bl FUN_02018744 mov r0, #4 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r5, _02254C7C ; =0x02255754 add r3, sp, #0x10 ldmia r5!, {r0, r1} @@ -469,7 +469,7 @@ MOD51_02254B54: ; 0x02254B54 bl FUN_02016C18 mov r0, #8 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x60 mov r1, #0 str r0, [sp] diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index f55e7c99..b4fd4d80 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -22,8 +22,8 @@ _021D74F6: 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] @@ -462,7 +462,7 @@ _021D78DA: sub r2, r2, #1 bne _021D78DA add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -1289,10 +1289,10 @@ _021D7F74: blt _021D7F74 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, #0x64 pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 2091a0c6..904d1c7f 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -22,8 +22,8 @@ _021D74F6: 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] @@ -428,7 +428,7 @@ _021D787E: sub r2, r2, #1 bne _021D787E add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -1045,10 +1045,10 @@ _021D7D4C: str r0, [sp, #0x38] 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, #0x5c pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index b6f57d67..0d96ce13 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -29,8 +29,8 @@ MOD55_021D7504: ; 0x021D7504 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] @@ -385,11 +385,11 @@ _021D7808: .word 0x00003FF8 thumb_func_start MOD55_021D780C MOD55_021D780C: ; 0x021D780C - ldr r3, _021D7814 ; =FUN_0201E66C + ldr r3, _021D7814 ; =GX_SetBanks ldr r0, _021D7818 ; =0x021DA458 bx r3 nop -_021D7814: .word FUN_0201E66C +_021D7814: .word GX_SetBanks _021D7818: .word MOD55_021DA458 thumb_func_end MOD55_021D780C @@ -1198,7 +1198,7 @@ _021D7EB8: blt _021D7E56 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x5c pop {r4, r5, r6, r7, pc} thumb_func_end MOD55_021D7DA0 @@ -4017,7 +4017,7 @@ MOD55_021D9574: ; 0x021D9574 bl G3X_InitMtxStack mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _021D95D8 ; =0x04000008 mov r1, #3 ldrh r2, [r0] @@ -5576,11 +5576,11 @@ MOD55_021DA27C: ; 0x021DA27C lsl r1, r4, #0x18 mov r0, #0xf lsr r1, r1, #0x18 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers lsl r1, r4, #0x18 mov r0, #1 lsr r1, r1, #0x18 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r4, pc} .align 2, 0 thumb_func_end MOD55_021DA27C diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 97d746da..d1046c7b 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -253,8 +253,8 @@ MOD56_02211FD4: ; 0x02211FD4 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] @@ -385,10 +385,10 @@ _022120BE: str r2, [r4, r1] mov r0, #0xf mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0xf mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0 bl MOD56_0221244C add r0, r4, #0 @@ -603,7 +603,7 @@ _022122BE: sub r2, r2, #1 bne _022122BE add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -930,19 +930,19 @@ MOD56_0221257C: ; 0x0221257C ldr r4, [r0] mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #1 - 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_0201E74C + bl GX_EngineBToggleLayers mov r2, #0 str r2, [sp] mov r0, #0x36 @@ -1293,7 +1293,7 @@ _02212848: blt _02212848 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x5c pop {r4, r5, r6, r7, pc} thumb_func_end MOD56_022127D4 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 2e0c7acd..39e977cc 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -14,8 +14,8 @@ MOD57_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] @@ -635,7 +635,7 @@ _021D7A1E: sub r2, r2, #1 bne _021D7A1E add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -1208,10 +1208,10 @@ MOD57_021D7EDC: ; 0x021D7EDC add r4, r0, #0 mov r0, #0x1f mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x13 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #7 bl FUN_020178A0 @@ -3730,7 +3730,7 @@ _021D92CE: bl NARC_dtor mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x3c pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 3e04165c..93c1c39d 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -28,8 +28,8 @@ _021D9A36: 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] @@ -315,7 +315,7 @@ _021D9CE6: sub r2, r2, #1 bne _021D9CE6 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -1008,10 +1008,10 @@ MOD58_021DA1C4: ; 0x021DA1C4 bl FUN_02020238 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, #0x5c pop {r3, r4, pc} .align 2, 0 diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 447b763f..c86d2c94 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -42,8 +42,8 @@ _021D7592: add r0, r6, #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] @@ -66,7 +66,7 @@ _021D7592: ldr r0, _021D76BC ; =MOD59_021D7724 add r1, r4, #0 bl Main_SetVBlankIntrCB - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #1 str r0, [r5] b _021D76AC @@ -278,7 +278,7 @@ _021D7798: sub r2, r2, #1 bne _021D7798 add r0, sp, #0x50 - bl FUN_0201E66C + bl GX_SetBanks ldr r0, [r4] bl FUN_02016B94 add r3, sp, #0x40 diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index 3a2ba4ad..6d2d6e6b 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -67,8 +67,8 @@ _021D98C6: add r0, r6, #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] @@ -89,7 +89,7 @@ _021D98C6: ldr r0, _021D99F0 ; =MOD59_021D9A14 add r1, r4, #0 bl Main_SetVBlankIntrCB - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x3c str r0, [r4, #0x24] mov r0, #1 @@ -229,7 +229,7 @@ _021D9A2C: sub r2, r2, #1 bne _021D9A2C add r0, sp, #0x90 - bl FUN_0201E66C + bl GX_SetBanks ldr r0, [r4] bl FUN_02016B94 add r3, sp, #0x80 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index d55b37fc..418fa446 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -369,7 +369,7 @@ _021D77BE: sub r2, r2, #1 bne _021D77BE add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -438,8 +438,8 @@ _021D7848: 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] @@ -478,7 +478,7 @@ _021D78A2: bl FUN_0201C24C mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers bl FUN_02033F20 ldr r0, _021D78E4 ; =MOD60_021D77D4 add r1, r4, #0 @@ -551,8 +551,8 @@ _021D7946: 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] diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index bcb6e9b6..3afc1e03 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -557,8 +557,8 @@ _021D78FA: 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] @@ -593,7 +593,7 @@ _021D794E: bl Main_SetVBlankIntrCB mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0 bl FUN_0200E394 mov r1, #4 @@ -681,8 +681,8 @@ _021D79FC: mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -907,7 +907,7 @@ _021D7BBA: sub r2, r2, #1 bne _021D7BBA add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 86eebba7..d65fb117 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1755,7 +1755,7 @@ MOD62_0222E2DC: ; 0x0222E2DC push {r3, lr} mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _0222E348 ; =0x04000008 mov r1, #3 ldrh r2, [r0] @@ -3734,13 +3734,13 @@ _0222F26C: .word 0x0000FFFF thumb_func_start MOD62_0222F270 MOD62_0222F270: ; 0x0222F270 push {r3, lr} - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r3, pc} thumb_func_end MOD62_0222F270 @@ -6022,10 +6022,10 @@ _0223042E: bl FUN_02003210 mov r0, #0x10 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #7 mov r1, #1 bl FUN_020178BC @@ -6111,7 +6111,7 @@ _0223050A: ; jump table _0223051A: mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r3, #0 str r3, [sp] mov r0, #0xa @@ -6296,7 +6296,7 @@ _02230692: bl MOD08_02229A2C mov r0, #0x10 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 bl MOD62_0223021C mov r0, #0x3e @@ -6395,7 +6395,7 @@ _0223072C: bl MOD62_0222F7E0 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0xf7 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -6462,7 +6462,7 @@ _0223081A: _0223081C: mov r0, #0x10 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #1 bl MOD62_022300DC @@ -6582,7 +6582,7 @@ _022308E4: bl MOD62_022300DC mov r0, #1 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0xf7 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -6655,7 +6655,7 @@ _0223093E: _022309B4: mov r0, #1 add r1, r0, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0xf7 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -6791,7 +6791,7 @@ _02230AC2: _02230AD4: mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r3, #0 str r3, [sp] mov r0, #0x10 @@ -6850,7 +6850,7 @@ _02230B40: bl FUN_020178BC mov r0, #4 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #0 bl MOD62_0222F738 @@ -7322,8 +7322,8 @@ MOD62_02230F3C: ; 0x02230F3C 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] @@ -7355,7 +7355,7 @@ MOD62_02230F80: ; 0x02230F80 push {r4, r5, lr} sub sp, #0xfc add r4, r0, #0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers ldr r5, _022310B8 ; =MOD62_02231238 add r3, sp, #0x10 mov r2, #5 @@ -7365,7 +7365,7 @@ _02230F90: sub r2, r2, #1 bne _02230F90 add r0, sp, #0x10 - bl FUN_0201E66C + bl GX_SetBanks mov r1, #6 mov r2, #2 mov r0, #0 @@ -7441,7 +7441,7 @@ _02230FF0: orr r2, r0 strh r2, [r1] add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r5, _022310C8 ; =MOD62_022312E8 add r3, sp, #0x38 mov r2, #0xe @@ -7484,7 +7484,7 @@ _02231052: bl FUN_02018744 mov r0, #4 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add sp, #0xfc pop {r4, r5, pc} nop diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index df0624f9..a323b642 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 @@ -420,7 +420,7 @@ _021D7842: sub r2, r2, #1 bne _021D7842 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -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..e501157b 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -16,7 +16,7 @@ _021D889A: sub r2, r2, #1 bne _021D889A add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -36,7 +36,7 @@ _021D88BA: sub r2, r2, #1 bne _021D88BA add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -56,7 +56,7 @@ _021D88DA: sub r2, r2, #1 bne _021D88DA add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -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 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 645c9569..0ade6b6c 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -79,10 +79,10 @@ _021D755E: bl MOD64_021D7970 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r5, #0 mov r1, #0x2f bl MOD64_021D7A54 @@ -404,7 +404,7 @@ _021D7846: sub r2, r2, #1 bne _021D7846 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -962,10 +962,10 @@ MOD64_021D7C74: ; 0x021D7C74 str r0, [r5, r1] mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD64_021D7C74 @@ -1940,7 +1940,7 @@ _021D8400: bl MOD64_021D8864 mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #4] add sp, #0xc add r0, r0, #1 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 890b3348..229a9214 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -114,8 +114,8 @@ _021D75A4: 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] @@ -221,8 +221,8 @@ _021D7684: mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -740,7 +740,7 @@ _021D7A76: sub r2, r2, #1 bne _021D7A76 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -2574,10 +2574,10 @@ MOD65_021D8850: ; 0x021D8850 _021D8908: 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, #0x54 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -2771,8 +2771,8 @@ _021D8A88: 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] @@ -2882,8 +2882,8 @@ _021D8B68: mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -3055,7 +3055,7 @@ _021D8CC2: sub r2, r2, #1 bne _021D8CC2 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -3491,7 +3491,7 @@ MOD65_021D8FB0: ; 0x021D8FB0 _021D9040: mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x44 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -5354,7 +5354,7 @@ MOD65_021D9E98: ; 0x021D9E98 bl MOD65_021DA000 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r1, _021D9F4C ; =0x04000008 mov r0, #3 ldrh r2, [r1] diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 65c5c857..e0b21bf2 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -169,7 +169,7 @@ _021D7612: sub r2, r2, #1 bne _021D7612 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -193,8 +193,8 @@ _021D763C: 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] @@ -319,10 +319,10 @@ MOD66_021D7750: ; 0x021D7750 bl FUN_0201CD04 mov r0, #0x1f mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x1f mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0 add r1, r0, #0 bl Main_SetVBlankIntrCB @@ -3630,10 +3630,10 @@ MOD66_021D913C: ; 0x021D913C add r4, r0, #0 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r1, [r4, #4] mov r0, #0x20 bl FUN_0201C24C diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index a72ccebc..60757798 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -11,8 +11,8 @@ MOD67_021D74E0: ; 0x021D74E0 add r1, r0, #0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r0, #1 lsl r0, r0, #0x1a ldr r2, [r0] @@ -80,11 +80,11 @@ MOD67_021D74E0: ; 0x021D74E0 ldr r0, _021D75CC ; =MOD67_021D7660 add r1, r4, #0 bl Main_SetVBlankIntrCB - bl FUN_0201E788 + bl GX_BothDispOn bl FUN_02033E74 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r1, #0 mov r0, #0x43 add r2, r1, #0 @@ -201,7 +201,7 @@ _021D768A: sub r2, r2, #1 bne _021D768A add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -312,7 +312,7 @@ _021D7778: .word MOD67_021D9794 MOD67_021D777C: ; 0x021D777C push {r4, lr} add r4, r0, #0 - bl FUN_0201E6D8 + bl GX_DisableEngineALayers add r0, r4, #0 mov r1, #3 bl FUN_020178A0 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index dfab7ef8..5c2c1740 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -11,8 +11,8 @@ MOD68_021D74E0: ; 0x021D74E0 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] @@ -93,7 +93,7 @@ MOD68_021D74E0: ; 0x021D74E0 bl FUN_02033F20 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -213,7 +213,7 @@ _021D76AA: sub r2, r2, #1 bne _021D76AA add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -308,7 +308,7 @@ MOD68_021D7774: ; 0x021D7774 add r4, r0, #0 mov r0, #0xf mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #3 bl FUN_020178A0 @@ -1447,7 +1447,7 @@ MOD68_021D7FD8: ; 0x021D7FD8 str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r1, _021D8068 ; =0x04000008 mov r0, #3 ldrh r2, [r1] diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 0e218fd3..33fafb4f 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -738,7 +738,7 @@ MOD69_0222DBAC: ; 0x0222DBAC bl FUN_02016B94 str r0, [r4, #0x10] ldr r0, _0222DCF4 ; =0x0222F8CC - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _0222DCF8 ; =0x04000304 ldr r0, _0222DCFC ; =0xFFFF7FFF ldrh r1, [r2] @@ -964,7 +964,7 @@ MOD69_0222DD54: ; 0x0222DD54 bl FUN_020AEDF4 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _0222DDF8 ; =0x04000008 mov r1, #3 ldrh r2, [r0] @@ -1115,7 +1115,7 @@ MOD69_0222DE98: ; 0x0222DE98 bl MOD69_0222DF0C mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x1c pop {r3, r4, pc} .align 2, 0 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index ef7b18bd..a0966fec 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -803,7 +803,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 sub sp, #0x10 add r5, r0, #0 ldr r0, _021D7BF8 ; =0x021D8284 - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _021D7BFC ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb @@ -909,7 +909,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 bl G2x_SetBlendAlpha_ mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index e7f0b24d..ac2559a6 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -12,8 +12,8 @@ MOD71_0222D5C0: ; 0x0222D5C0 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] @@ -131,7 +131,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 bl FUN_0201797C mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r1, #0x5d lsl r1, r1, #2 ldr r1, [r4, r1] @@ -323,7 +323,7 @@ MOD71_0222D820: ; 0x0222D820 bl FUN_0201797C mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0 mov r1, #1 bl FUN_0201797C @@ -338,7 +338,7 @@ MOD71_0222D820: ; 0x0222D820 bl FUN_0201797C mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers bl MOD71_0222EA38 add r0, r4, #0 bl MOD71_0222EA68 @@ -1175,7 +1175,7 @@ _0222DF92: str r0, [r4, #0x4c] mov r0, #0x10 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _0222E0F8 ; =0x00002218 mov r1, #0 ldr r0, [r4, r0] @@ -1220,7 +1220,7 @@ _0222DFD6: bl FUN_0201797C mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0x4c] add r0, r0, #1 str r0, [r4, #0x4c] @@ -1276,7 +1276,7 @@ _0222E054: bl FUN_0201797C mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, [r4, #0x4c] add r0, r0, #1 str r0, [r4, #0x4c] @@ -1856,7 +1856,7 @@ _0222E562: sub r2, r2, #1 bne _0222E562 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index b4e14758..d5105d7e 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -325,7 +325,7 @@ _021D76D4: bl FUN_02033E74 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _021D7804 ; =0x00001420 ldr r0, [r5, r0] cmp r0, #1 @@ -968,13 +968,13 @@ _021D7CD2: bl MOD73_021DA730 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, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0xae mov r1, #0 lsl r0, r0, #2 @@ -2233,7 +2233,7 @@ MOD73_021D8630: ; 0x021D8630 ldr r0, _021D8758 ; =gMain + 0x60 mov r1, #1 strb r1, [r0, #5] - bl FUN_0201E7A0 + bl GX_SwapDisplay add sp, #8 pop {r4, pc} .align 2, 0 @@ -2302,7 +2302,7 @@ MOD73_021D875C: ; 0x021D875C ldr r0, _021D880C ; =gMain + 0x60 mov r1, #0 strb r1, [r0, #5] - bl FUN_0201E7A0 + bl GX_SwapDisplay pop {r4, pc} .align 2, 0 _021D87EC: .word 0x0000063C @@ -2425,7 +2425,7 @@ _021D88CE: sub r2, r2, #1 bne _021D88CE add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -2453,7 +2453,7 @@ MOD73_021D88E4: ; 0x021D88E4 bl FUN_02016BBC mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0 mov r1, #2 bl FUN_020178BC @@ -2537,10 +2537,10 @@ MOD73_021D89AC: ; 0x021D89AC bl MOD73_021D92EC mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers pop {r3, pc} .align 2, 0 thumb_func_end MOD73_021D89AC @@ -5857,10 +5857,10 @@ _021DA266: bl MOD73_021DA374 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, #1 str r0, [r5, #0x28] pop {r4, r5, r6, pc} @@ -6067,10 +6067,10 @@ MOD73_021DA408: ; 0x021DA408 blt _021DA432 mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r5, #0 bl FUN_0200CAB4 mov r0, #0 @@ -6117,10 +6117,10 @@ _021DA446: bl CopyWindowToVram mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -6150,10 +6150,10 @@ MOD73_021DA4AC: ; 0x021DA4AC beq _021DA4D0 mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #0x2c] bl FUN_0200CAB4 mov r0, #0 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 14dc995b..1fce128e 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -190,8 +190,8 @@ _021D7644: 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] @@ -289,8 +289,8 @@ _021D7722: 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] @@ -329,7 +329,7 @@ _021D776E: sub r2, r2, #1 bne _021D776E add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -1746,7 +1746,7 @@ MOD74_021D8200: ; 0x021D8200 bl FUN_0200BD20 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x50 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 87c9c55a..1a9861c9 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -12,8 +12,8 @@ MOD75_021E6BA0: ; 0x021E6BA0 add r1, r0, #0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r0, #1 lsl r0, r0, #0x1a ldr r2, [r0] @@ -558,7 +558,7 @@ _021E703E: sub r2, r2, #1 bne _021E703E add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -732,10 +732,10 @@ MOD75_021E71BC: ; 0x021E71BC add r4, r0, #0 mov r0, #0x1f mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x1b mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #7 bl FUN_020178A0 @@ -9844,10 +9844,10 @@ MOD75_021EB9B4: ; 0x021EB9B4 add r4, r0, #0 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x20 mov r1, #6 bl FUN_0201C24C diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index d81a7697..13ddf00c 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -179,8 +179,8 @@ MOD76_021D7638: ; 0x021D7638 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] @@ -275,7 +275,7 @@ _021D771A: sub r2, r2, #1 bne _021D771A add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -370,7 +370,7 @@ MOD76_021D77E4: ; 0x021D77E4 add r4, r0, #0 mov r0, #0x17 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #2 bl FUN_020178A0 @@ -2397,7 +2397,7 @@ MOD76_021D8758: ; 0x021D8758 bl FUN_0200BF60 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x4c pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 8ed82bcb..a5eaa94b 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -13,8 +13,8 @@ MOD77_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] @@ -79,7 +79,7 @@ _021D7540: bl FUN_02016B94 ldr r1, _021D75F4 ; =0x0000C010 str r0, [r5, r1] - bl FUN_0201E788 + bl GX_BothDispOn bl FUN_0201BD5C ldr r2, [r5] mov r0, #8 @@ -97,7 +97,7 @@ _021D7540: ldr r0, _021D7600 ; =gMain + 0x60 mov r1, #1 strb r1, [r0, #5] - bl FUN_0201E7A0 + bl GX_SwapDisplay mov r0, #4 mov r1, #8 bl FUN_0201669C @@ -185,16 +185,16 @@ _021D764C: bl FUN_0200E1D0 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 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, #1 str r0, [r5] b _021D7B66 @@ -805,16 +805,16 @@ MOD77_021D7BAC: ; 0x021D7BAC mov r0, #4 mov r1, #0 ldr r5, [r4] - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #8 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #8 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, _021D7C14 ; =0x0000C2CC ldr r0, [r4, r0] bl FUN_0201EB70 @@ -857,7 +857,7 @@ _021D7C2E: sub r2, r2, #1 bne _021D7C2E add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s index 6a0d80b3..5d9f4625 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -271,8 +271,8 @@ MOD78_021D7708: ; 0x021D7708 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] @@ -295,7 +295,7 @@ MOD78_021D7708: ; 0x021D7708 strh r0, [r2] ldr r0, _021D7768 ; =0x021D7888 bl G3X_SetEdgeColorTable - bl FUN_0201E7A0 + bl GX_SwapDisplay pop {r3, pc} nop _021D7758: .word 0xFFFFE0FF @@ -318,7 +318,7 @@ _021D7776: sub r2, r2, #1 bne _021D7776 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 128c6280..f0b34ee0 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1375,8 +1375,8 @@ _0222DFE4: 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] @@ -1739,7 +1739,7 @@ _0222E322: sub r2, r2, #1 bne _0222E322 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -2162,10 +2162,10 @@ MOD80_0222E614: ; 0x0222E614 bl FUN_02008AA4 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, #0x2c pop {r3, r4, pc} thumb_func_end MOD80_0222E614 @@ -2725,10 +2725,10 @@ MOD80_0222EA04: ; 0x0222EA04 bl FUN_02017F18 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, #0x9c pop {r4, r5, pc} nop @@ -2767,13 +2767,13 @@ MOD80_0222EB40: ; 0x0222EB40 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 ldr r0, _0222EB68 ; =0x00000D5C mov r1, #0 ldr r0, [r4, r0] @@ -3128,13 +3128,13 @@ MOD80_0222EE24: ; 0x0222EE24 beq _0222EE5A 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 add r0, r4, #0 mov r1, #7 mov r2, #0xb @@ -8739,10 +8739,10 @@ MOD80_02231AB0: ; 0x02231AB0 bl FUN_02017F18 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, #0x9c pop {r4, r5, pc} nop @@ -14322,10 +14322,10 @@ MOD80_02234780: ; 0x02234780 bl FUN_02017F18 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, #0x9c pop {r4, r5, pc} nop @@ -14411,7 +14411,7 @@ MOD80_022348CC: ; 0x022348CC bl FUN_0201797C mov r0, #0x10 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers _02234944: ldr r0, [r5, #0x20] cmp r0, #9 @@ -17776,16 +17776,16 @@ MOD80_02236284: ; 0x02236284 bl MOD80_02236580 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #1 add r1, r0, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, [r4] ldr r0, [r0, #0x20] bl FUN_02033288 @@ -17889,7 +17889,7 @@ MOD80_02236378: ; 0x02236378 bl FUN_02016C18 mov r0, #1 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #0 bl FUN_02018744 @@ -17910,7 +17910,7 @@ MOD80_02236378: ; 0x02236378 bl FUN_02016C18 mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r5, _0223645C ; =0x02237654 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -17928,7 +17928,7 @@ MOD80_02236378: ; 0x02236378 bl FUN_02016C18 mov r0, #1 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 bl FUN_02018744 @@ -17949,7 +17949,7 @@ MOD80_02236378: ; 0x02236378 bl FUN_02016C18 mov r0, #2 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -17962,7 +17962,7 @@ MOD80_02236378: ; 0x02236378 bl FUN_02017F18 mov r0, #0x10 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add sp, #0x70 pop {r3, r4, r5, pc} nop diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index b7492d39..94767f70 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -153,8 +153,8 @@ _02237F22: 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] @@ -2151,7 +2151,7 @@ MOD81_02238E44: ; 0x02238E44 sub sp, #0x1c add r4, r0, #0 ldr r0, _02239040 ; =0x0223D054 - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _02239044 ; =0x04000304 ldr r0, _02239048 ; =0xFFFF7FFF ldrh r1, [r2] @@ -2176,7 +2176,7 @@ MOD81_02238E44: ; 0x02238E44 bl FUN_02016C18 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r2, _02239058 ; =0x04000008 mov r0, #3 ldrh r3, [r2] @@ -2344,10 +2344,10 @@ MOD81_02238E44: ; 0x02238E44 bl MOD81_02238B40 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 r0, r4, #0 bl MOD81_022393F4 ldr r0, _02239064 ; =0x04000050 @@ -3634,7 +3634,7 @@ MOD81_022399FC: ; 0x022399FC sub sp, #0x10 add r4, r0, #0 ldr r0, _02239C78 ; =0x0223D0EC - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _02239C7C ; =0x04000304 ldr r0, _02239C80 ; =0xFFFF7FFF ldrh r1, [r2] @@ -3872,10 +3872,10 @@ _02239C02: bl FUN_0201797C 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 r0, r4, #0 add r0, #0xc0 mov r1, #3 @@ -4013,7 +4013,7 @@ MOD81_02239CDC: ; 0x02239CDC bl FUN_020AEDF4 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r1, _02239DDC ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -5703,7 +5703,7 @@ MOD81_0223AA68: ; 0x0223AA68 sub sp, #0x14 add r4, r0, #0 ldr r0, _0223ABAC ; =0x0223D158 - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _0223ABB0 ; =0x04000304 ldr r0, _0223ABB4 ; =0xFFFF7FFF ldrh r1, [r2] @@ -5846,10 +5846,10 @@ _0223AAE8: bl FUN_020179E0 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} .align 2, 0 @@ -5930,7 +5930,7 @@ MOD81_0223ABD8: ; 0x0223ABD8 bl FUN_020AEDF4 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r1, _0223ACCC ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -6725,7 +6725,7 @@ MOD81_0223B264: ; 0x0223B264 sub sp, #0x10 add r4, r0, #0 ldr r0, _0223B45C ; =0x0223D1EC - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _0223B460 ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb @@ -6936,10 +6936,10 @@ MOD81_0223B264: ; 0x0223B264 bl MOD81_0223B4B0 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, #0x10 pop {r4, pc} .align 2, 0 @@ -7212,7 +7212,7 @@ MOD81_0223B670: ; 0x0223B670 sub sp, #0x14 add r4, r0, #0 ldr r0, _0223B7C0 ; =0x0223D258 - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _0223B7C4 ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb @@ -7355,10 +7355,10 @@ _0223B6F0: bl FUN_020179E0 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers bl FUN_02033E74 mov r0, #1 mov r1, #0x39 @@ -7442,7 +7442,7 @@ MOD81_0223B7E8: ; 0x0223B7E8 bl FUN_020AEDF4 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r1, _0223B8E8 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -8374,7 +8374,7 @@ MOD81_0223BF74: ; 0x0223BF74 sub sp, #0x10 add r4, r0, #0 ldr r0, _0223C18C ; =0x0223D2EC - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _0223C190 ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb @@ -8596,10 +8596,10 @@ _0223C14A: bl FUN_0201797C 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, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -8694,7 +8694,7 @@ MOD81_0223C1DC: ; 0x0223C1DC bl FUN_020AEDF4 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r1, _0223C2E0 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -9208,7 +9208,7 @@ MOD81_0223C658: ; 0x0223C658 sub sp, #0x1c add r4, r0, #0 ldr r0, _0223C808 ; =0x0223D374 - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _0223C80C ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb @@ -9228,7 +9228,7 @@ MOD81_0223C658: ; 0x0223C658 bl FUN_02016C18 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r2, _0223C81C ; =0x04000008 mov r0, #3 ldrh r3, [r2] @@ -9369,10 +9369,10 @@ MOD81_0223C658: ; 0x0223C658 bl MOD81_0223CBE0 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0 str r0, [sp] ldr r0, _0223C824 ; =0x04000050 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 925315fb..b9d0df31 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -625,8 +625,8 @@ _0222DA48: 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] @@ -926,7 +926,7 @@ _0222DCEE: sub r2, r2, #1 bne _0222DCEE add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -1194,10 +1194,10 @@ _0222DED4: blt _0222DED4 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers bl FUN_02033E74 add sp, #0x5c pop {r4, r5, r6, r7, pc} @@ -1382,16 +1382,16 @@ MOD82_0222E050: ; 0x0222E050 bl MOD82_0222E35C mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #1 add r1, r0, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, [r4] ldr r0, [r0, #0xc] bl FUN_02033288 @@ -1506,7 +1506,7 @@ MOD82_0222E15C: ; 0x0222E15C bl FUN_02016C18 mov r0, #1 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #0 bl FUN_02018744 @@ -1527,7 +1527,7 @@ MOD82_0222E15C: ; 0x0222E15C bl FUN_02016C18 mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r5, _0222E238 ; =0x0222F8B0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -1545,7 +1545,7 @@ MOD82_0222E15C: ; 0x0222E15C bl FUN_02016C18 mov r0, #1 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 bl FUN_02018744 @@ -1566,7 +1566,7 @@ MOD82_0222E15C: ; 0x0222E15C bl FUN_02016C18 mov r0, #2 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0 mov r1, #0x20 add r2, r0, #0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 92b5807e..7e36aa68 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -449,13 +449,13 @@ _0222D8B2: bl FUN_020186B4 mov r0, #1 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r1, #0x1e add r0, r1, #0 add r0, #0xfe @@ -500,13 +500,13 @@ _0222D94A: _0222D974: mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x45 mov r1, #0xf lsl r0, r0, #2 @@ -624,7 +624,7 @@ _0222DA5C: ldmia r3!, {r0, r1} stmia r2!, {r0, r1} add r0, sp, #0x18 - bl FUN_0201E66C + bl GX_SetBanks add r0, sp, #8 bl FUN_02016BBC mov r1, #0 @@ -2511,7 +2511,7 @@ _0222E960: ldmia r3!, {r0, r1} stmia r2!, {r0, r1} add r0, sp, #0x20 - bl FUN_0201E66C + bl GX_SetBanks add r0, sp, #0x10 bl FUN_02016BBC mov r1, #0 @@ -3250,10 +3250,10 @@ _0222EFC2: bl MOD83_0222EA88 mov r0, #1 add r1, r0, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #2 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r1, #0xc6 lsl r1, r1, #6 ldr r0, [r4, #4] @@ -3453,7 +3453,7 @@ MOD83_0222F074: ; 0x0222F074 bl FUN_0202AC98 mov r0, #1 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, [r5, #4] add r1, r4, #0 bl MOD83_022391EC @@ -6306,7 +6306,7 @@ MOD83_022307B4: ; 0x022307B4 _022307C8: mov r0, #0x10 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r5] mov r1, #0 bl FUN_02018744 @@ -6517,8 +6517,8 @@ MOD83_02230954: ; 0x02230954 mov r0, #0x56 bl FUN_02016B94 str r0, [r4] - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers bl MOD83_022331C0 ldr r0, [r4] bl MOD83_02230258 @@ -7606,10 +7606,10 @@ _022312EC: bl MOD83_022302B4 mov r0, #1 mov r1, #0 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers add r1, r4, #0 ldr r0, [r4] add r1, #0xdc @@ -10478,7 +10478,7 @@ _0223299E: bl FUN_020054C8 mov r0, #0x10 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _02232B7C ; =0x00002B70 mov r1, #0 add r0, r4, r0 @@ -10544,7 +10544,7 @@ _02232A20: bl MOD83_0223243C mov r0, #0x10 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0xa str r0, [r5] b _02232CF4 @@ -10570,7 +10570,7 @@ _02232A56: bl FUN_0200CCA4 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 bl MOD83_022324A0 mov r0, #5 @@ -11433,7 +11433,7 @@ _022331CA: sub r2, r2, #1 bne _022331CA add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 @@ -15840,7 +15840,7 @@ MOD83_022351F8: ; 0x022351F8 bl FUN_02008AA4 mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add sp, #0x2c pop {pc} thumb_func_end MOD83_022351F8 @@ -17524,13 +17524,13 @@ _02235F48: sub r2, r2, #1 bne _02235F48 add r0, sp, #0x10 - bl FUN_0201E66C + bl GX_SetBanks ldr r0, [r4, #0x20] bl MOD83_02235E68 ldr r0, _02235FB8 ; =gMain + 0x60 mov r1, #1 strb r1, [r0, #5] - bl FUN_0201E7A0 + bl GX_SwapDisplay bl FUN_0201BD5C mov r1, #0x1e mov r0, #0 @@ -17865,7 +17865,7 @@ _02236148: bl FUN_02017CD0 mov r0, #2 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r1, #7 mov r0, #0 lsl r1, r1, #6 @@ -17945,7 +17945,7 @@ _022362C2: blt _022362C2 mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, _0223632C ; =0x00000498 add r0, r6, r0 bl MOD83_02236298 @@ -18094,7 +18094,7 @@ _022363E2: ldr r0, _0223644C ; =gMain + 0x60 mov r1, #0 strb r1, [r0, #5] - bl FUN_0201E7A0 + bl GX_SwapDisplay ldr r0, [r6, #0x20] mov r1, #0 bl FUN_020178A0 @@ -18671,7 +18671,7 @@ _022368BA: bl Main_SetVBlankIntrCB mov r0, #0x10 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers ldr r0, [r4, #4] cmp r0, #1 bne _022368FA @@ -18898,7 +18898,7 @@ _02236A88: bl Main_SetVBlankIntrCB mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #0 bl MOD83_02235C4C @@ -23555,12 +23555,12 @@ _02238CA8: bne _02238D1A mov r0, #0x10 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers b _02238D22 _02238D1A: mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers _02238D22: ldr r0, _02238D34 ; =MOD83_02238F00 mov r1, #0 diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index 405c33ef..53dfe036 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] @@ -565,7 +565,7 @@ MOD84_021D7968: ; 0x021D7968 bl FUN_02016B94 str r0, [r4, #4] ldr r0, _021D7A60 ; =0x021DA68C - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _021D7A64 ; =0x04000304 ldr r0, _021D7A68 ; =0xFFFF7FFF ldrh 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 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 2fe33d18..adb49508 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -12,8 +12,8 @@ MOD85_021D74E0: ; 0x021D74E0 add r1, r0, #0 bl Main_SetVBlankIntrCB bl FUN_02015F1C - bl FUN_0201E6D8 - bl FUN_0201E740 + bl GX_DisableEngineALayers + bl GX_DisableEngineBLayers mov r2, #2 mov r0, #3 mov r1, #0x4f @@ -273,34 +273,34 @@ MOD85_021D76FC: ; 0x021D76FC bl MOD85_021D7930 mov r0, #1 add r1, r0, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #2 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #4 mov r1, #1 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #8 mov r1, #0 - bl FUN_0201E6E4 + bl GX_EngineAToggleLayers mov r0, #0x10 mov r1, #1 - 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, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers mov r0, #0x10 mov r1, #1 - bl FUN_0201E74C + bl GX_EngineBToggleLayers ldr r0, _021D77D0 ; =0x04000008 mov r2, #3 ldrh r1, [r0] @@ -383,7 +383,7 @@ _021D7802: sub r2, r2, #1 bne _021D7802 add r0, sp, #0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index e3a93e0f..08651acb 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -43,8 +43,8 @@ MOD86_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] @@ -65,7 +65,7 @@ MOD86_021D74E0: ; 0x021D74E0 ldr r0, _021D7588 ; =MOD86_021D76E0 add r1, r4, #0 bl Main_SetVBlankIntrCB - bl FUN_0201E788 + bl GX_BothDispOn mov r0, #1 pop {r3, r4, r5, pc} nop @@ -262,7 +262,7 @@ _021D76F8: sub r2, r2, #1 bne _021D76F8 add r0, sp, #0x2c - bl FUN_0201E66C + bl GX_SetBanks ldr r0, [r4] bl FUN_02016B94 add r3, sp, #0x1c |