diff options
62 files changed, 84 insertions, 85 deletions
diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index 1ff53c51..a5439dfe 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -130,7 +130,7 @@ _02033FA4: and r1, r2 str r1, [r0, #0x0] ldr r0, _02034170 ; =UNK_020EECD0 - bl FUN_0201E66C + bl GX_SetBanks add r0, r4, #0x0 bl FUN_02016B94 add r6, r0, #0x0 diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index 10c67e5a..44144564 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -78,7 +78,7 @@ FUN_02034188: ; 0x02034188 and r0, r1 str r0, [r2, #0x0] ldr r0, _02034380 ; =UNK_020EED2C - bl FUN_0201E66C + bl GX_SetBanks add r0, r4, #0x0 bl FUN_02016B94 str r0, [sp, #0x10] diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 3c92ba05..6f303045 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -32,7 +32,7 @@ FUN_02048120: ; 0x02048120 sub sp, #0x8 add r4, r0, #0x0 ldr r0, _02048158 ; =UNK_020F465C - bl FUN_0201E66C + bl GX_SetBanks ldr r0, _0204815C ; =UNK_020F4630 bl FUN_02016BBC ldr r2, _02048160 ; =UNK_020F4640 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 833d62c0..4750c7ea 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -345,7 +345,7 @@ FUN_02048764: ; 0x02048764 add r0, r1, #0x0 bl FUN_0201901C ldr r0, _020487D4 ; =UNK_020F46B0 - bl FUN_0201E66C + bl GX_SetBanks ldr r2, _020487D8 ; =0x04000304 ldrh r1, [r2, #0x0] lsr r0, r2, #0xb diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 9d542d37..879f7f48 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2247,7 +2247,7 @@ _0206D9C6: sub r2, r2, #0x1 bne _0206D9C6 add r0, sp, #0x3c - bl FUN_0201E66C + bl GX_SetBanks mov r1, #0x6 mov r2, #0x2 mov r0, #0x0 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 9c619fea..b7b79b0e 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1064,7 +1064,7 @@ _0206FB8A: sub r2, r2, #0x1 bne _0206FB8A add r0, sp, #0x0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 2586d0f5..a5d7b26d 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1697,7 +1697,7 @@ _02077B2E: sub r2, r2, #0x1 bne _02077B2E add r0, sp, #0x0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index ec9c64ac..722c8144 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -381,7 +381,7 @@ _02079F62: sub r2, r2, #0x1 bne _02079F62 add r0, sp, #0x0 - bl FUN_0201E66C + bl GX_SetBanks add sp, #0x28 pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index ca93020a..7e7745fe 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -261,7 +261,7 @@ _0208655C: sub r2, r2, #0x1 bne _0208655C add r0, sp, #0x2c - bl FUN_0201E66C + bl GX_SetBanks mov r1, #0x6 mov r2, #0x2 mov r0, #0x0 diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 4d0675a9..b4c7a133 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -225,7 +225,7 @@ _02089628: sub r2, r2, #0x1 bne _02089628 add r0, sp, #0x34 - bl FUN_0201E66C + bl GX_SetBanks ldr r0, [r4, #0x0] bl FUN_02016B94 add r3, sp, #0x24 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index c0b5f4d0..4502d1f9 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -165,7 +165,7 @@ _02089A78: sub r2, r2, #0x1 bne _02089A78 add r0, sp, #0x34 - bl FUN_0201E66C + bl GX_SetBanks ldr r0, [r4, #0x0] bl FUN_02016B94 add r3, sp, #0x24 diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index 0b5c5774..92b9e987 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -77,7 +77,7 @@ FUN_02089D90: ; 0x02089D90 and r0, r1 str r0, [r2, #0x0] ldr r0, _02089F0C ; =UNK_020FF418 - bl FUN_0201E66C + bl GX_SetBanks add r0, r4, #0x0 bl FUN_02016B94 add r5, r0, #0x0 diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index 340fa64d..b678254c 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -81,7 +81,7 @@ FUN_02089F24: ; 0x02089F24 and r0, r1 str r0, [r2, #0x0] ldr r0, _0208A0A0 ; =UNK_020FF418 - bl FUN_0201E66C + bl GX_SetBanks add r0, r4, #0x0 bl FUN_02016B94 add r5, r0, #0x0 @@ -250,7 +250,7 @@ _0208A0C8: and r1, r2 str r1, [r0, #0x0] ldr r0, _0208A240 ; =UNK_020FF474 - bl FUN_0201E66C + bl GX_SetBanks add r0, r4, #0x0 bl FUN_02016B94 add r5, r0, #0x0 diff --git a/arm9/global.inc b/arm9/global.inc index 186131be..d45b7243 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1230,7 +1230,7 @@ .extern FUN_0201E230 .extern FUN_0201E258 .extern FUN_0201E28C -.extern FUN_0201E66C +.extern GX_SetBanks .extern GX_DisableEngineALayers .extern GX_EngineAToggleLayers .extern GX_SetEngineALayers diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 5fb56ea8..8488759b 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -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 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index e6113936..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 @@ -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 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index bd4fab74..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 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 95320fb1..32981b60 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -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 @@ -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 580ec810..3e416af6 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -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 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index aaa6b90c..f717789a 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 3c2e533d..edbb6d86 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -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 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 339be333..560be120 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -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 a320f179..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 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 910aa687..82398e6b 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -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 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 58f1c9a6..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 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index cac73593..b4fd4d80 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -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 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index fa7d0581..904d1c7f 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -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 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 3e673f3d..0d96ce13 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -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 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index b01ccefe..d1046c7b 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -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 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 3d600303..39e977cc 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -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 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index f1b48055..93c1c39d 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -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 diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 45f744de..c86d2c94 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -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 f115dd71..6d2d6e6b 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -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 816328a0..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 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index fb7d1bec..3afc1e03 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -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 12f7f3bb..d65fb117 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -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 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index 6aa32be7..a323b642 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -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 diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index e4ec2bcf..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 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index f65c4f78..0ade6b6c 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -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 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index e2741c41..229a9214 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -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 @@ -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 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index dc3ae898..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 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 379ba223..60757798 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -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 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index a227032e..5c2c1740 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -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 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index a7c2807d..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] diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 30f38fe4..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 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 42be4647..ac2559a6 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -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 cadaa246..d5105d7e 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -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 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 0a07e4b4..1fce128e 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -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 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index c05b6059..1a9861c9 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -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 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 9d86b835..13ddf00c 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -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 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 8c158d12..a5eaa94b 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -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 2f4531da..5d9f4625 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -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 3b2cdd0d..f0b34ee0 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -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 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index f8dca2fd..94767f70 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -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] @@ -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] @@ -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] @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 79cead66..b9d0df31 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -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 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 05e58fb2..7e36aa68 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -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 @@ -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 @@ -17524,7 +17524,7 @@ _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 diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index f1a8e8a2..53dfe036 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -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] diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 18fd473f..adb49508 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -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 4b697f92..08651acb 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -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 diff --git a/arm9/src/GX_layers.c b/arm9/src/GX_layers.c index a43a2277..ce188876 100644 --- a/arm9/src/GX_layers.c +++ b/arm9/src/GX_layers.c @@ -3,7 +3,7 @@ struct GX_LayerData layer_data; -THUMB_FUNC void FUN_0201E66C(const struct GraphicsBanks *banks) +THUMB_FUNC void GX_SetBanks(const struct GraphicsBanks *banks) { GX_ResetBankForBG(); GX_ResetBankForBGExtPltt(); @@ -107,4 +107,4 @@ THUMB_FUNC void GX_SwapDisplay() THUMB_FUNC u32 GX_GetEngineALayers() { return layer_data.EngineA_DISPCNT_LayerMask; -}
\ No newline at end of file +} diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index dfd7a91f..3a727924 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -14,7 +14,6 @@ const struct GraphicsBanks UNK_020FF4D8 = { bg : 3 }; u32 sErrorMessagePrinterLock; extern void FUN_0200E3A0(PMLCDTarget, int); -extern void FUN_0201E66C(const struct GraphicsBanks *banks); extern u32 *FUN_02016B94(u32 param0); extern void FUN_02016BBC(const struct GraphicsModes *modes); extern void FUN_02016C18(u32 *param0, u32 param1, void *param2, u32 param3); @@ -79,7 +78,7 @@ THUMB_FUNC void PrintErrorMessageAndReset() reg_GX_DISPCNT &= 0xFFFF1FFF; reg_GXS_DB_DISPCNT &= 0xFFFF1FFF; - FUN_0201E66C(&UNK_020FF4D8); + GX_SetBanks(&UNK_020FF4D8); ptr = FUN_02016B94(0); FUN_02016BBC(&UNK_020FF4AC); diff --git a/include/GX_layers.h b/include/GX_layers.h index a4601853..e94fb4ec 100644 --- a/include/GX_layers.h +++ b/include/GX_layers.h @@ -20,7 +20,7 @@ typedef enum { } GX_LayerToggle; - +THUMB_FUNC void GX_SetBanks(const struct GraphicsBanks *banks); THUMB_FUNC void GX_DisableEngineALayers(); THUMB_FUNC void GX_EngineAToggleLayers(u32 layer_mask, GX_LayerToggle layer_toggle); THUMB_FUNC void GX_SetEngineALayers(u32 layer_mask); @@ -30,4 +30,4 @@ THUMB_FUNC void GX_BothDispOn(); THUMB_FUNC void GX_SwapDisplay(); THUMB_FUNC u32 GX_GetEngineALayers(); -#endif //POKEDIAMOND_GX_LAYERS_H
\ No newline at end of file +#endif //POKEDIAMOND_GX_LAYERS_H |