diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 18:27:52 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 18:27:52 -0400 |
| commit | 94eb56526428935ea1f49d2b8912b5b3022d99b7 (patch) | |
| tree | 8aeb29623e5160c304da993439f488b54254d23e | |
| parent | d9562dc1675e93f565e63eeba35369688bb70742 (diff) | |
Rename window-related structs; port g2 reg inlines
90 files changed, 1660 insertions, 1144 deletions
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index 103b59f4..a8cd984f 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -804,7 +804,7 @@ CreateYesNoMenu: ; 0x020020EC strb r0, [r3, #0xb] ldr r2, [sp, #0x8] add r0, r7, #0x0 - bl FUN_02019150 + bl AddWindow ldr r0, [sp, #0x18] ldr r2, [sp, #0xc] ldr r3, [sp, #0x10] @@ -883,7 +883,7 @@ FUN_020021EC: ; 0x020021EC mov r1, #0x0 bl FUN_0200CCF8 ldr r0, [r5, #0x4] - bl FUN_02019178 + bl RemoveWindow ldr r1, [r5, #0x4] add r0, r4, #0x0 bl FreeToHeapExplicit diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index 985c0e82..be45149a 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -189,7 +189,7 @@ _02033FA4: ldr r2, _02034184 ; =UNK_020EEC9C add r0, r6, #0x0 add r1, sp, #0x18 - bl FUN_02019150 + bl AddWindow mov r0, #0xd0 str r0, [sp, #0x0] mov r0, #0x90 @@ -241,7 +241,7 @@ _02033FA4: mov r2, #0x3 bl FUN_0200A274 add r0, sp, #0x18 - bl FUN_02019178 + bl RemoveWindow ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r4, #0x0 diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index 0e9dbb92..358c38be 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -129,7 +129,7 @@ FUN_02034188: ; 0x02034188 ldr r0, [sp, #0x10] ldr r2, _02034398 ; =UNK_020EECF8 add r1, sp, #0x14 - bl FUN_02019150 + bl AddWindow mov r0, #0xd0 str r0, [sp, #0x0] mov r0, #0x90 @@ -189,7 +189,7 @@ _020342E4: b _020342E4 _02034308: add r0, sp, #0x14 - bl FUN_02019178 + bl RemoveWindow ldr r0, [sp, #0xc] bl DestroyMsgData mov r0, #0x0 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 03a16da6..11335b6e 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -552,7 +552,7 @@ _02035440: mov r1, #0x1 bl FUN_0200CCF8 add r0, r4, #0x0 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0x0 bl FUN_020358A0 ldr r0, [r5, #0x8] @@ -616,7 +616,7 @@ FUN_0203549C: ; 0x0203549C ldr r0, [sp, #0x1c] mov r3, #0x14 ldr r0, [r0, #0x8] - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x1 str r0, [sp, #0x0] mov r3, #0xb @@ -948,7 +948,7 @@ _0203576C: ldr r0, [r4, #0x8] add r1, #0x10 mov r2, #0x3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x1 str r0, [sp, #0x0] mov r3, #0xb @@ -1093,7 +1093,7 @@ _020358CE: bl FUN_0200CCF8 add r5, #0x10 add r0, r5, #0x0 - bl FUN_02019178 + bl RemoveWindow _020358E0: pop {r3-r5, pc} .balign 4 @@ -1587,7 +1587,7 @@ FUN_02035CA0: ; 0x02035CA0 add r4, r0, #0x0 bl FUN_02035718 add r0, r4, #0x0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0x0 bl FUN_020358A0 mov r1, #0x72 @@ -2659,7 +2659,7 @@ FUN_020365BC: ; 0x020365BC ldr r0, [r4, #0x0] bl FUN_0201AC68 add r0, r4, #0x0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0x0 bl FUN_020358A0 mov r0, #0x4 @@ -2929,7 +2929,7 @@ FUN_020367E8: ; 0x020367E8 ldr r0, [r4, #0x0] bl FUN_0201AC68 add r0, r4, #0x0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0x0 bl FUN_020358A0 ldr r0, [r6, #0xc] diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index fcee180d..61cb11db 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -94,7 +94,7 @@ _0204817A: ldr r0, [r4, #0x8] ldr r2, _02048208 ; =UNK_020F4628 add r1, #0xc - bl FUN_02019150 + bl AddWindow add r0, r5, #0x0 bl ScriptEnvironment_GetSav2Ptr bl Sav2_PlayerData_GetProfileAddr @@ -221,7 +221,7 @@ _020482B2: bl FUN_0200D0E0 add r0, r4, #0x0 add r0, #0xc - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x20] bl ScrStrBufs_delete ldr r0, [r4, #0x1c] diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 47b2c109..aabd3376 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -514,12 +514,12 @@ FUN_020488D4: ; 0x020488D4 _020488E4: add r0, r4, #0x0 add r0, #0x1c - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 beq _020488F8 add r4, #0x1c add r0, r4, #0x0 - bl FUN_02019178 + bl RemoveWindow _020488F8: ldr r0, [r5, #0x8] mov r1, #0x3 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 48c9a801..501432c0 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -2064,7 +2064,7 @@ _0204992E: bl FUN_0200D0E0 add r0, r4, #0x0 add r0, #0x24 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x3 str r0, [r4, #0x0] b _02049AB2 @@ -2075,7 +2075,7 @@ _02049946: bl FUN_0200D0E0 add r0, r4, #0x0 add r0, #0x24 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x5 str r0, [r4, #0x0] b _02049AB2 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index b4b0d845..8407e4a3 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -1201,7 +1201,7 @@ FUN_020517C0: ; 0x020517C0 add r4, #0x14 add r0, r4, #0x0 add r6, r1, #0x0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 bne _020517F2 ldr r0, [r5, #0x24] @@ -1237,7 +1237,7 @@ FUN_02051810: ; 0x02051810 add r5, r0, #0x0 add r0, #0x14 add r4, r1, #0x0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 beq _02051846 cmp r4, #0x0 @@ -1252,31 +1252,31 @@ FUN_02051810: ; 0x02051810 _02051836: add r0, r5, #0x0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0x0 add r0, #0x14 bl InitWindow _02051846: add r0, r5, #0x0 add r0, #0x54 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 beq _02051862 add r0, r5, #0x0 add r0, #0x54 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0x0 add r0, #0x54 bl InitWindow _02051862: add r0, r5, #0x0 add r0, #0x64 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 beq _0205187E add r0, r5, #0x0 add r0, #0x64 - bl FUN_02019178 + bl RemoveWindow add r5, #0x64 add r0, r5, #0x0 bl InitWindow @@ -1673,7 +1673,7 @@ FUN_02051B68: ; 0x02051B68 add r0, #0x54 str r1, [sp, #0x14] str r0, [sp, #0x20] - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 bne _02051C34 ldr r2, _02051C84 ; =0x0000016A @@ -1698,7 +1698,7 @@ FUN_02051B68: ; 0x02051B68 ldr r0, [r0, #0x8] mov r2, #0x3 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x4 @@ -1807,7 +1807,7 @@ FUN_02051C88: ; 0x02051C88 add r7, #0x64 add r0, r7, #0x0 str r1, [sp, #0x14] - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 bne _02051D0A mov r0, #0xb @@ -1824,7 +1824,7 @@ FUN_02051C88: ; 0x02051C88 ldr r0, [r0, #0x8] mov r2, #0x3 mov r3, #0x14 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x4 @@ -2205,7 +2205,7 @@ _02051F7C: bl FUN_0200D0E0 add r0, r4, #0x0 add r0, #0x8 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x0 bl MOD05_021D7CA4 ldr r0, [r4, #0x28] diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index 5eaebfb2..ba92a404 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -1471,7 +1471,7 @@ _0205D984: ldr r0, [r5, #0x34] bl FUN_020587B0 add r0, r4, #0x0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] bl String_dtor add r0, r4, #0x0 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index c84a9409..d33d8e85 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1169,7 +1169,7 @@ FUN_02062DB0: ; 0x02062DB0 add r1, #0xe4 mov r2, #0x3 mov r3, #0x2 - bl FUN_02019064 + bl AddWindowParameterized add r4, #0xe4 add r0, r4, #0x0 mov r1, #0xff @@ -1194,7 +1194,7 @@ FUN_02062EC4: ; 0x02062EC4 bl FUN_02019570 add r0, r4, #0x0 add r0, #0xe4 - bl FUN_02019178 + bl RemoveWindow mov r1, #0xad ldr r3, [r4, #0x0] mov r0, #0x1 @@ -1381,7 +1381,7 @@ FUN_02063028: ; 0x02063028 ldr r0, [r0, #0x0] add r1, #0xd4 mov r3, #0x4 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0x0 add r0, #0xd4 mov r1, #0xff @@ -1529,7 +1529,7 @@ FUN_02063178: ; 0x02063178 bl FUN_0200CCF8 add r0, r4, #0x0 add r0, #0xd4 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xa6 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1866,7 +1866,7 @@ FUN_02063430: ; 0x02063430 ldr r0, [r0, #0x0] add r1, #0xd4 mov r3, #0x4 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0x0 ldr r2, _020634D0 ; =0x000003D9 add r0, #0xd4 @@ -1897,7 +1897,7 @@ FUN_02063430: ; 0x02063430 add r0, #0xd0 ldr r0, [r0, #0x0] mov r2, #0x3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0x0 add r0, #0xf4 mov r1, #0x0 @@ -1936,13 +1936,13 @@ FUN_020634DC: ; 0x020634DC bl FUN_0200CCF8 add r0, r4, #0x0 add r0, #0xd4 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0x0 add r0, #0xf4 bl FUN_02019570 add r0, r4, #0x0 add r0, #0xf4 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xa6 lsl r0, r0, #0x2 ldr r0, [r4, r0] diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index a065df73..126fe8f6 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -955,14 +955,14 @@ FUN_02065AF4: ; 0x02065AF4 add r1, r1, #0x4 ldr r2, _02065CD8 ; =UNK_020F7E7C add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r1, #0x17 lsl r1, r1, #0x4 ldr r0, [r5, r1] add r1, #0x24 ldr r2, _02065CDC ; =UNK_020F7E84 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0x5d lsl r0, r0, #0x2 add r0, r5, r0 @@ -1290,7 +1290,7 @@ FUN_02065DD8: ; 0x02065DD8 ldr r0, [r5, r0] ldr r2, _02065EC8 ; =UNK_020F7E74 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0x5d lsl r0, r0, #0x2 add r0, r5, r0 @@ -1435,7 +1435,7 @@ FUN_02065EF8: ; 0x02065EF8 mov r0, #0x65 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x5d lsl r0, r0, #0x2 add r0, r4, r0 @@ -1448,7 +1448,7 @@ FUN_02065EF8: ; 0x02065EF8 mov r0, #0x5d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r0, sp, #0x0 mov r1, #0x4f ldrh r2, [r0, #0x2] @@ -1503,7 +1503,7 @@ FUN_02065F8C: ; 0x02065F8C mov r0, #0x5d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0x0 bl FUN_020664D8 mov r0, #0x17 @@ -2001,7 +2001,7 @@ FUN_02066334: ; 0x02066334 add r1, r4, r1 mov r2, #0x3 mov r3, #0x2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x61 lsl r0, r0, #0x2 add r0, r4, r0 @@ -2025,7 +2025,7 @@ FUN_020663D4: ; 0x020663D4 mov r0, #0x61 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x61 lsl r0, r0, #0x2 add r0, r4, r0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index bb88f0ee..da45d0a0 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -144,7 +144,7 @@ FUN_0206C700: ; 0x0206C700 ldr r1, [r4, #0x4] mov r2, #0x1 mov r3, #0x2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r4, #0x4] mov r1, #0xff bl FillWindowPixelBuffer diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 79a7eb39..cc01c965 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -81,31 +81,31 @@ FUN_02072548: ; 0x02072548 add r5, r1, #0x0 add r4, r2, #0x0 add r6, r0, #0x0 - bl FUN_02019150 + bl AddWindow add r1, r5, #0x0 add r2, r4, #0x0 add r0, r6, #0x0 add r1, #0x10 add r2, #0x8 - bl FUN_02019150 + bl AddWindow add r1, r5, #0x0 add r2, r4, #0x0 add r0, r6, #0x0 add r1, #0x20 add r2, #0x10 - bl FUN_02019150 + bl AddWindow add r1, r5, #0x0 add r2, r4, #0x0 add r0, r6, #0x0 add r1, #0x30 add r2, #0x18 - bl FUN_02019150 + bl AddWindow add r5, #0x40 add r4, #0x20 add r0, r6, #0x0 add r1, r5, #0x0 add r2, r4, #0x0 - bl FUN_02019150 + bl AddWindow pop {r4-r6, pc} .balign 4 @@ -203,7 +203,7 @@ _02072632: lsl r1, r1, #0x2 ldr r0, [r5, #0x0] add r1, r5, r1 - bl FUN_02019150 + bl AddWindow b _02072668 _0207265A: mov r1, #0x7d @@ -211,44 +211,44 @@ _0207265A: ldr r0, [r5, #0x0] ldr r2, _020726D4 ; =UNK_020F9724 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow _02072668: mov r1, #0x79 lsl r1, r1, #0x2 ldr r0, [r5, #0x0] ldr r2, _020726D8 ; =UNK_020F972C add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r1, #0x81 lsl r1, r1, #0x2 ldr r0, [r5, #0x0] ldr r2, _020726DC ; =UNK_020F9734 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r1, #0x85 lsl r1, r1, #0x2 ldr r0, [r5, #0x0] ldr r2, _020726E0 ; =UNK_020F973C add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r1, #0x89 lsl r1, r1, #0x2 ldr r0, [r5, #0x0] ldr r2, _020726E4 ; =UNK_020F9744 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r1, #0x8d lsl r1, r1, #0x2 ldr r0, [r5, #0x0] ldr r2, _020726E8 ; =UNK_020F974C add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r1, #0x91 lsl r1, r1, #0x2 ldr r0, [r5, #0x0] ldr r2, _020726EC ; =UNK_020F9754 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow add sp, #0x8 pop {r3-r5, pc} .balign 4 @@ -274,7 +274,7 @@ FUN_020726F0: ; 0x020726F0 _020726F8: lsl r0, r5, #0x4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0x1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 @@ -283,11 +283,11 @@ _020726F8: mov r4, #0x95 lsl r4, r4, #0x2 add r0, r6, r4 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x1 bne _0207271E add r0, r6, r4 - bl FUN_02019178 + bl RemoveWindow _0207271E: pop {r4-r6, pc} @@ -450,7 +450,7 @@ FUN_02072844: ; 0x02072844 ldr r0, [r5, #0x0] add r1, r5, r1 mov r3, #0x13 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x14] mov r1, #0xc bl ListMenuItems_ctor @@ -2034,7 +2034,7 @@ FUN_020734C0: ; 0x020734C0 add r1, #0x14 ldr r0, [r5, #0x0] add r1, r5, r1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x95 lsl r0, r0, #0x2 mov r1, #0x1 @@ -2240,5 +2240,5 @@ FUN_020736F4: ; 0x020736F4 mov r0, #0x95 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 5dff3066..ff153e99 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -50,7 +50,7 @@ FUN_02073DB4: ; 0x02073DB4 mov r0, #0x95 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .balign 4 _02073DEC: .word 0x000006FC diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index f28e35ea..6a0ff960 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -2231,7 +2231,7 @@ FUN_02077FA8: ; 0x02077FA8 mov r4, #0x0 _02077FB0: add r0, r5, #0x0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #0x1 add r5, #0x10 cmp r4, #0xa @@ -3400,7 +3400,7 @@ FUN_0207890C: ; 0x0207890C add r1, r5, r1 mov r2, #0x0 mov r3, #0x2 - bl FUN_02019064 + bl AddWindowParameterized mov r2, #0x1 mov r1, #0xf2 lsl r1, r1, #0x2 @@ -3417,7 +3417,7 @@ FUN_0207890C: ; 0x0207890C ldr r0, [r5, r0] add r1, r5, r1 mov r3, #0x2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #0x0] cmp r0, #0x4 bne _020789AE @@ -3491,7 +3491,7 @@ _020789D8: ldr r0, [r5, r0] add r1, r5, r1 mov r3, #0x7 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, [r5, #0xc] mov r0, #0xc add r2, r1, #0x0 @@ -3519,7 +3519,7 @@ _020789D8: ldr r0, [r5, r0] add r1, r5, r1 mov r3, #0xa - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xfa lsl r0, r0, #0x2 add r0, r5, r0 @@ -3544,7 +3544,7 @@ _020789D8: ldr r0, [r5, r0] add r1, r5, r1 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02078B74 ; =0x00000438 mov r1, #0x1 add r0, r5, r0 @@ -3577,7 +3577,7 @@ _02078A90: ldr r0, [r5, r0] add r1, r5, r1 mov r3, #0x2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02078B78 ; =0x00000448 mov r1, #0xf add r0, r5, r0 @@ -3637,7 +3637,7 @@ _02078B0E: add r1, r7, r6 mov r2, #0x2 mov r3, #0x0 - bl FUN_02019064 + bl AddWindowParameterized add r0, r7, r6 mov r1, #0x0 bl FillWindowPixelBuffer @@ -3657,7 +3657,7 @@ _02078B0E: add r0, #0xdc ldr r0, [r5, r0] add r1, r5, r1 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02078B84 ; =0x00000428 mov r1, #0x0 add r0, r5, r0 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index d9a67905..7cd9e02e 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -79,7 +79,7 @@ _0207D5C4: ldr r0, [r7, #0x0] add r1, r4, r6 add r2, r2, r3 - bl FUN_02019150 + bl AddWindow add r0, r4, r6 mov r1, #0x0 bl FillWindowPixelBuffer @@ -207,7 +207,7 @@ _0207D6B4: ldr r0, [r4, #0x0] add r1, r1, r7 add r2, r5, #0x0 - bl FUN_02019150 + bl AddWindow mov r0, #0x92 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -284,7 +284,7 @@ FUN_0207D74C: ; 0x0207D74C add r5, r5, #0x4 _0207D758: add r0, r5, #0x0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #0x1 add r5, #0x10 cmp r4, #0x24 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 237ebc91..b3b8bd1d 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -544,7 +544,7 @@ FUN_02086784: ; 0x02086784 lsr r0, r0, #0x10 str r0, [sp, #0x10] add r0, r7, #0x0 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0x0 mov r1, #0x1 mov r2, #0x14 @@ -655,7 +655,7 @@ FUN_02086878: ; 0x02086878 str r0, [sp, #0x10] add r0, r6, #0x0 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x2 mov r1, #0x47 bl ListMenuItems_ctor @@ -739,7 +739,7 @@ FUN_02086960: ; 0x02086960 bl FUN_02019570 add r0, r4, #0x0 add r0, #0x28 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x48] mov r1, #0x0 bl FUN_02001C5C @@ -753,7 +753,7 @@ FUN_0208698C: ; 0x0208698C add r4, r0, #0x0 bl FUN_02019570 add r0, r4, #0x0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_start FUN_0208699C diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index c29136ec..195c9c70 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -350,7 +350,7 @@ FUN_02089734: ; 0x02089734 ldr r0, [r4, #0x14] ldr r2, _02089778 ; =UNK_020FF304 add r1, #0x1c - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp, #0x0] mov r0, #0x20 @@ -371,7 +371,7 @@ FUN_0208977C: ; 0x0208977C push {r4, lr} add r4, r0, #0x0 add r0, #0x1c - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x18] bl DestroyMsgData pop {r4, pc} diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 4e0d2d7f..425d4a82 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -289,7 +289,7 @@ FUN_02089B80: ; 0x02089B80 ldr r0, [r4, #0x18] ldr r2, _02089BC8 ; =UNK_020FF378 add r1, #0x20 - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp, #0x0] mov r0, #0x20 @@ -311,7 +311,7 @@ FUN_02089BCC: ; 0x02089BCC push {r4, lr} add r4, r0, #0x0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x1c] bl DestroyMsgData pop {r4, pc} diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index e78492e3..fb7a7217 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -128,7 +128,7 @@ FUN_02089D90: ; 0x02089D90 ldr r2, _02089F20 ; =UNK_020FF3E4 add r0, r5, #0x0 add r1, sp, #0xc - bl FUN_02019150 + bl AddWindow mov r0, #0xd0 str r0, [sp, #0x0] mov r0, #0x90 diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index 1ffe57ab..31753c3c 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -132,7 +132,7 @@ FUN_02089F24: ; 0x02089F24 ldr r2, _0208A0B4 ; =UNK_020FF3E4 add r0, r5, #0x0 add r1, sp, #0xc - bl FUN_02019150 + bl AddWindow mov r0, #0xd0 str r0, [sp, #0x0] mov r0, #0x90 @@ -301,7 +301,7 @@ _0208A0C8: ldr r2, _0208A254 ; =UNK_020FF440 add r0, r5, #0x0 add r1, sp, #0xc - bl FUN_02019150 + bl AddWindow mov r0, #0xd0 str r0, [sp, #0x0] mov r0, #0x90 diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 05a7d41f..5f6d405f 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -94,36 +94,36 @@ FUN_0208A400: ; 0x0208A400 push {r4, lr} add r4, r0, #0x0 add r0, #0x18 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 beq _0208A41E add r0, r4, #0x0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0x0 add r0, #0x18 bl InitWindow _0208A41E: add r0, r4, #0x0 add r0, #0x28 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 beq _0208A43A add r0, r4, #0x0 add r0, #0x28 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0x0 add r0, #0x28 bl InitWindow _0208A43A: add r0, r4, #0x0 add r0, #0x38 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 beq _0208A456 add r0, r4, #0x0 add r0, #0x38 - bl FUN_02019178 + bl RemoveWindow add r4, #0x38 add r0, r4, #0x0 bl InitWindow @@ -455,7 +455,7 @@ _0208A6F4: bl ReadMsgDataIntoString _0208A6FA: add r0, r4, #0x0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 bne _0208A722 ldr r0, [r5, #0x0] @@ -508,7 +508,7 @@ FUN_0208A760: ; 0x0208A760 add r4, r0, #0x0 add r4, #0x18 add r0, r4, #0x0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 beq _0208A778 add r0, r4, #0x0 @@ -526,7 +526,7 @@ FUN_0208A77C: ; 0x0208A77C add r7, r5, #0x0 add r7, #0x28 add r0, r7, #0x0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 bne _0208A808 mov r0, #0x0 @@ -553,7 +553,7 @@ FUN_0208A77C: ; 0x0208A77C ldr r0, [r0, #0x8] mov r2, #0x3 mov r3, #0x11 - bl FUN_02019064 + bl AddWindowParameterized add r0, r7, #0x0 mov r1, #0xf bl FillWindowPixelBuffer @@ -614,7 +614,7 @@ FUN_0208A82C: ; 0x0208A82C add r7, r5, #0x0 add r7, #0x38 add r0, r7, #0x0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0x0 bne _0208A8B8 mov r0, #0x0 @@ -641,7 +641,7 @@ FUN_0208A82C: ; 0x0208A82C ldr r0, [r0, #0x8] mov r2, #0x3 mov r3, #0x19 - bl FUN_02019064 + bl AddWindowParameterized add r0, r7, #0x0 mov r1, #0xf bl FillWindowPixelBuffer diff --git a/arm9/global.inc b/arm9/global.inc index 828294f1..8640f5ef 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1072,11 +1072,11 @@ .extern FUN_02018F4C .extern AllocWindows .extern InitWindow -.extern FUN_02019048 -.extern FUN_02019064 -.extern FUN_020190EC -.extern FUN_02019150 -.extern FUN_02019178 +.extern WindowIsInUse +.extern AddWindowParameterized +.extern AddTextWindowTopLeftCorner +.extern AddWindow +.extern RemoveWindow .extern WindowArray_dtor .extern CopyWindowToVram .extern FUN_02019220 @@ -1087,9 +1087,9 @@ .extern PutWindowTilemap_AffineMode .extern FUN_020193B4 .extern FUN_02019444 -.extern FUN_0201949C +.extern CopyWindowToVram_TextMode .extern FUN_020194C8 -.extern FUN_020194E0 +.extern CopyWindowToVram_AffineMode .extern FUN_0201951C .extern FUN_02019548 .extern FUN_02019570 diff --git a/arm9/lib/include/GX_bgcnt.h b/arm9/lib/include/GX_bgcnt.h index a581443e..9a604046 100644 --- a/arm9/lib/include/GX_bgcnt.h +++ b/arm9/lib/include/GX_bgcnt.h @@ -285,6 +285,14 @@ typedef enum } GXBGExtPltt; +typedef enum +{ + GX_BG_EXTMODE_256x16PLTT = (0 << REG_G2_BG2CNT_CHARBASE_SHIFT) | (0 << REG_G2_BG2CNT_COLORMODE_SHIFT), + GX_BG_EXTMODE_256BITMAP = (0 << REG_G2_BG2CNT_CHARBASE_SHIFT) | (1 << REG_G2_BG2CNT_COLORMODE_SHIFT), + GX_BG_EXTMODE_DCBITMAP = (1 << REG_G2_BG2CNT_CHARBASE_SHIFT) | (1 << REG_G2_BG2CNT_COLORMODE_SHIFT) +} +GXBGExtMode; + //GX_capture typedef enum { @@ -344,4 +352,280 @@ typedef enum } GXCaptureMode; +static inline void G2_SetBG0Control(GXBGScrSizeText screenSize, GXBGColorMode colorMode, GXBGScrBase screenBase, GXBGCharBase charBase, GXBGExtPltt bgExtPltt) +{ + reg_G2_BG0CNT = (u16)((reg_G2_BG0CNT & (REG_G2_BG0CNT_PRIORITY_MASK | REG_G2_BG0CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG0CNT_SCREENSIZE_SHIFT) | (colorMode << REG_G2_BG0CNT_COLORMODE_SHIFT) | (screenBase << REG_G2_BG0CNT_SCREENBASE_SHIFT) | (charBase << REG_G2_BG0CNT_CHARBASE_SHIFT) | (bgExtPltt << REG_G2_BG0CNT_BGPLTTSLOT_SHIFT)); +} + +static inline void G2S_SetBG0Control(GXBGScrSizeText screenSize, GXBGColorMode colorMode, GXBGScrBase screenBase, GXBGCharBase charBase, GXBGExtPltt bgExtPltt) +{ + reg_G2S_DB_BG0CNT = (u16)((reg_G2S_DB_BG0CNT & (REG_G2S_DB_BG0CNT_PRIORITY_MASK | REG_G2S_DB_BG0CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG0CNT_SCREENSIZE_SHIFT) | (colorMode << REG_G2S_DB_BG0CNT_COLORMODE_SHIFT) | (screenBase << REG_G2S_DB_BG0CNT_SCREENBASE_SHIFT) | (charBase << REG_G2S_DB_BG0CNT_CHARBASE_SHIFT) | (bgExtPltt << REG_G2S_DB_BG0CNT_BGPLTTSLOT_SHIFT)); +} + +static inline void G2_SetBG1Control(GXBGScrSizeText screenSize, GXBGColorMode colorMode, GXBGScrBase screenBase, GXBGCharBase charBase, GXBGExtPltt bgExtPltt) +{ + reg_G2_BG1CNT = (u16)((reg_G2_BG1CNT & (REG_G2_BG1CNT_PRIORITY_MASK | REG_G2_BG1CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG1CNT_SCREENSIZE_SHIFT) | (colorMode << REG_G2_BG1CNT_COLORMODE_SHIFT) | (screenBase << REG_G2_BG1CNT_SCREENBASE_SHIFT) | (charBase << REG_G2_BG1CNT_CHARBASE_SHIFT) | (bgExtPltt << REG_G2_BG1CNT_BGPLTTSLOT_SHIFT)); +} + +static inline void G2S_SetBG1Control(GXBGScrSizeText screenSize, GXBGColorMode colorMode, GXBGScrBase screenBase, GXBGCharBase charBase, GXBGExtPltt bgExtPltt) +{ + reg_G2S_DB_BG1CNT = (u16)((reg_G2S_DB_BG1CNT & (REG_G2S_DB_BG1CNT_PRIORITY_MASK | REG_G2S_DB_BG1CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG1CNT_SCREENSIZE_SHIFT) | (colorMode << REG_G2S_DB_BG1CNT_COLORMODE_SHIFT) | (screenBase << REG_G2S_DB_BG1CNT_SCREENBASE_SHIFT) | (charBase << REG_G2S_DB_BG1CNT_CHARBASE_SHIFT) | (bgExtPltt << REG_G2S_DB_BG1CNT_BGPLTTSLOT_SHIFT)); +} + +static inline void G2_SetBG2ControlText(GXBGScrSizeText screenSize, GXBGColorMode colorMode, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2_BG2CNT = (u16)((reg_G2_BG2CNT & ((REG_G2_BG2CNT_PRIORITY_MASK | REG_G2_BG2CNT_MOSAIC_MASK))) | (screenSize << REG_G2_BG2CNT_SCREENSIZE_SHIFT) | (colorMode << REG_G2_BG2CNT_COLORMODE_SHIFT) | (screenBase << REG_G2_BG2CNT_SCREENBASE_SHIFT) | (charBase << REG_G2_BG2CNT_CHARBASE_SHIFT)); +} + +static inline void G2S_SetBG2ControlText(GXBGScrSizeText screenSize, GXBGColorMode colorMode, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2S_DB_BG2CNT = (u16)((reg_G2S_DB_BG2CNT & ((REG_G2S_DB_BG2CNT_PRIORITY_MASK | REG_G2S_DB_BG2CNT_MOSAIC_MASK))) | (screenSize << REG_G2S_DB_BG2CNT_SCREENSIZE_SHIFT) | (colorMode << REG_G2S_DB_BG2CNT_COLORMODE_SHIFT) | (screenBase << REG_G2S_DB_BG2CNT_SCREENBASE_SHIFT) | (charBase << REG_G2S_DB_BG2CNT_CHARBASE_SHIFT)); +} + +static inline void G2_SetBG2ControlAffine(GXBGScrSizeAffine screenSize, GXBGAreaOver areaOver, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2_BG2CNT = (u16)((reg_G2_BG2CNT & ((REG_G2_BG2CNT_PRIORITY_MASK | REG_G2_BG2CNT_MOSAIC_MASK))) | (screenSize << REG_G2_BG2CNT_SCREENSIZE_SHIFT) | (areaOver << REG_G2_BG2CNT_AREAOVER_SHIFT) | (screenBase << REG_G2_BG2CNT_SCREENBASE_SHIFT) | (charBase << REG_G2_BG2CNT_CHARBASE_SHIFT)); +} + +static inline void G2S_SetBG2ControlAffine(GXBGScrSizeAffine screenSize, GXBGAreaOver areaOver, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2S_DB_BG2CNT = (u16)((reg_G2S_DB_BG2CNT & ((REG_G2S_DB_BG2CNT_PRIORITY_MASK | REG_G2S_DB_BG2CNT_MOSAIC_MASK))) | (screenSize << REG_G2S_DB_BG2CNT_SCREENSIZE_SHIFT) | (areaOver << REG_G2S_DB_BG2CNT_AREAOVER_SHIFT) | (screenBase << REG_G2S_DB_BG2CNT_SCREENBASE_SHIFT) | (charBase << REG_G2S_DB_BG2CNT_CHARBASE_SHIFT)); +} + +static inline void G2_SetBG2Control256x16Pltt(GXBGScrSize256x16Pltt screenSize, GXBGAreaOver areaOver, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2_BG2CNT = (u16)((reg_G2_BG2CNT & (REG_G2_BG2CNT_PRIORITY_MASK | REG_G2_BG2CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG2CNT_SCREENSIZE_SHIFT) | (charBase << REG_G2_BG2CNT_CHARBASE_SHIFT) | GX_BG_EXTMODE_256x16PLTT | (screenBase << REG_G2_BG2CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2_BG2CNT_AREAOVER_SHIFT)); +} + +static inline void G2S_SetBG2Control256x16Pltt(GXBGScrSize256x16Pltt screenSize, GXBGAreaOver areaOver, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2S_DB_BG2CNT = (u16)((reg_G2S_DB_BG2CNT & (REG_G2S_DB_BG2CNT_PRIORITY_MASK | REG_G2S_DB_BG2CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG2CNT_SCREENSIZE_SHIFT) | (charBase << REG_G2S_DB_BG2CNT_CHARBASE_SHIFT) | GX_BG_EXTMODE_256x16PLTT | (screenBase << REG_G2S_DB_BG2CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2S_DB_BG2CNT_AREAOVER_SHIFT)); +} + +static inline void G2_SetBG2Control256Bmp(GXBGScrSize256Bmp screenSize, GXBGAreaOver areaOver, GXBGBmpScrBase screenBase) +{ + reg_G2_BG2CNT = (u16)((reg_G2_BG2CNT & (REG_G2_BG2CNT_PRIORITY_MASK | REG_G2_BG2CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG2CNT_SCREENSIZE_SHIFT) | GX_BG_EXTMODE_256BITMAP | (screenBase << REG_G2_BG2CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2_BG2CNT_AREAOVER_SHIFT)); +} + +static inline void G2S_SetBG2Control256Bmp(GXBGScrSize256Bmp screenSize, GXBGAreaOver areaOver, GXBGBmpScrBase screenBase) +{ + reg_G2S_DB_BG2CNT = (u16)((reg_G2S_DB_BG2CNT & (REG_G2S_DB_BG2CNT_PRIORITY_MASK | REG_G2S_DB_BG2CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG2CNT_SCREENSIZE_SHIFT) | GX_BG_EXTMODE_256BITMAP | (screenBase << REG_G2S_DB_BG2CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2S_DB_BG2CNT_AREAOVER_SHIFT)); +} + +static inline void G2_SetBG2ControlDCBmp(GXBGScrSizeDcBmp screenSize, GXBGAreaOver areaOver, GXBGBmpScrBase screenBase) +{ + reg_G2_BG2CNT = (u16)((reg_G2_BG2CNT & (REG_G2_BG2CNT_PRIORITY_MASK | REG_G2_BG2CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG2CNT_SCREENSIZE_SHIFT) | GX_BG_EXTMODE_DCBITMAP | (screenBase << REG_G2_BG2CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2_BG2CNT_AREAOVER_SHIFT)); +} + +static inline void G2S_SetBG2ControlDCBmp(GXBGScrSizeDcBmp screenSize, GXBGAreaOver areaOver, GXBGBmpScrBase screenBase) +{ + reg_G2S_DB_BG2CNT = (u16)((reg_G2S_DB_BG2CNT & (REG_G2S_DB_BG2CNT_PRIORITY_MASK | REG_G2S_DB_BG2CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG2CNT_SCREENSIZE_SHIFT) | GX_BG_EXTMODE_DCBITMAP | (screenBase << REG_G2S_DB_BG2CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2S_DB_BG2CNT_AREAOVER_SHIFT)); +} + +static inline void G2_SetBG2ControlLargeBmp(GXBGScrSizeLargeBmp screenSize, GXBGAreaOver areaOver) +{ + reg_G2_BG2CNT = (u16)((reg_G2_BG2CNT & (REG_G2_BG2CNT_PRIORITY_MASK | REG_G2_BG2CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG2CNT_SCREENSIZE_SHIFT) | (areaOver << REG_G2_BG2CNT_AREAOVER_SHIFT)); +} + +static inline void G2S_SetBG2ControlLargeBmp(GXBGScrSizeLargeBmp screenSize, GXBGAreaOver areaOver) +{ + reg_G2S_DB_BG2CNT = (u16)((reg_G2S_DB_BG2CNT & (REG_G2S_DB_BG2CNT_PRIORITY_MASK | REG_G2S_DB_BG2CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG2CNT_SCREENSIZE_SHIFT) | (areaOver << REG_G2S_DB_BG2CNT_AREAOVER_SHIFT)); +} + +static inline void G2_SetBG3ControlText(GXBGScrSizeText screenSize, GXBGColorMode colorMode, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2_BG3CNT = (u16)((reg_G2_BG3CNT & ((REG_G2_BG3CNT_PRIORITY_MASK | REG_G2_BG3CNT_MOSAIC_MASK))) | (screenSize << REG_G2_BG3CNT_SCREENSIZE_SHIFT) | (colorMode << REG_G2_BG3CNT_COLORMODE_SHIFT) | (screenBase << REG_G2_BG3CNT_SCREENBASE_SHIFT) | (charBase << REG_G2_BG3CNT_CHARBASE_SHIFT)); +} + +static inline void G2S_SetBG3ControlText(GXBGScrSizeText screenSize, GXBGColorMode colorMode, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2S_DB_BG3CNT = (u16)((reg_G2S_DB_BG3CNT & ((REG_G2S_DB_BG3CNT_PRIORITY_MASK | REG_G2S_DB_BG3CNT_MOSAIC_MASK))) | (screenSize << REG_G2S_DB_BG3CNT_SCREENSIZE_SHIFT) | (colorMode << REG_G2S_DB_BG3CNT_COLORMODE_SHIFT) | (screenBase << REG_G2S_DB_BG3CNT_SCREENBASE_SHIFT) | (charBase << REG_G2S_DB_BG3CNT_CHARBASE_SHIFT)); +} + +static inline void G2_SetBG3ControlAffine(GXBGScrSizeAffine screenSize, GXBGAreaOver areaOver, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2_BG3CNT = (u16)((reg_G2_BG3CNT & ((REG_G2_BG3CNT_PRIORITY_MASK | REG_G2_BG3CNT_MOSAIC_MASK))) | (screenSize << REG_G2_BG3CNT_SCREENSIZE_SHIFT) | (areaOver << REG_G2_BG3CNT_AREAOVER_SHIFT) | (screenBase << REG_G2_BG3CNT_SCREENBASE_SHIFT) | (charBase << REG_G2_BG3CNT_CHARBASE_SHIFT)); +} + +static inline void G2S_SetBG3ControlAffine(GXBGScrSizeAffine screenSize, GXBGAreaOver areaOver, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2S_DB_BG3CNT = (u16)((reg_G2S_DB_BG3CNT & ((REG_G2S_DB_BG3CNT_PRIORITY_MASK | REG_G2S_DB_BG3CNT_MOSAIC_MASK))) | (screenSize << REG_G2S_DB_BG3CNT_SCREENSIZE_SHIFT) | (areaOver << REG_G2S_DB_BG3CNT_AREAOVER_SHIFT) | (screenBase << REG_G2S_DB_BG3CNT_SCREENBASE_SHIFT) | (charBase << REG_G2S_DB_BG3CNT_CHARBASE_SHIFT)); +} + +static inline void G2_SetBG3Control256x16Pltt(GXBGScrSize256x16Pltt screenSize, GXBGAreaOver areaOver, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2_BG3CNT = (u16)((reg_G2_BG3CNT & (REG_G2_BG3CNT_PRIORITY_MASK | REG_G2_BG3CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG3CNT_SCREENSIZE_SHIFT) | (charBase << REG_G2_BG3CNT_CHARBASE_SHIFT) | GX_BG_EXTMODE_256x16PLTT | (screenBase << REG_G2_BG3CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2_BG3CNT_AREAOVER_SHIFT)); +} + +static inline void G2S_SetBG3Control256x16Pltt(GXBGScrSize256x16Pltt screenSize, GXBGAreaOver areaOver, GXBGScrBase screenBase, GXBGCharBase charBase) +{ + reg_G2S_DB_BG3CNT = (u16)((reg_G2S_DB_BG3CNT & (REG_G2S_DB_BG3CNT_PRIORITY_MASK | REG_G2S_DB_BG3CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG3CNT_SCREENSIZE_SHIFT) | (charBase << REG_G2S_DB_BG3CNT_CHARBASE_SHIFT) | GX_BG_EXTMODE_256x16PLTT | (screenBase << REG_G2S_DB_BG3CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2S_DB_BG3CNT_AREAOVER_SHIFT)); +} + +static inline void G2_SetBG3Control256Bmp(GXBGScrSize256Bmp screenSize, GXBGAreaOver areaOver, GXBGBmpScrBase screenBase) +{ + reg_G2_BG3CNT = (u16)((reg_G2_BG3CNT & (REG_G2_BG3CNT_PRIORITY_MASK | REG_G2_BG3CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG3CNT_SCREENSIZE_SHIFT) | GX_BG_EXTMODE_256BITMAP | (screenBase << REG_G2_BG3CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2_BG3CNT_AREAOVER_SHIFT)); +} + +static inline void G2S_SetBG3Control256Bmp(GXBGScrSize256Bmp screenSize, GXBGAreaOver areaOver, GXBGBmpScrBase screenBase) +{ + reg_G2S_DB_BG3CNT = (u16)((reg_G2S_DB_BG3CNT & (REG_G2S_DB_BG3CNT_PRIORITY_MASK | REG_G2S_DB_BG3CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG3CNT_SCREENSIZE_SHIFT) | GX_BG_EXTMODE_256BITMAP | (screenBase << REG_G2S_DB_BG3CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2S_DB_BG3CNT_AREAOVER_SHIFT)); +} + +static inline void G2_SetBG3ControlDCBmp(GXBGScrSizeDcBmp screenSize, GXBGAreaOver areaOver, GXBGBmpScrBase screenBase) +{ + reg_G2_BG3CNT = (u16)((reg_G2_BG3CNT & (REG_G2_BG3CNT_PRIORITY_MASK | REG_G2_BG3CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG3CNT_SCREENSIZE_SHIFT) | GX_BG_EXTMODE_DCBITMAP | (screenBase << REG_G2_BG3CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2_BG3CNT_AREAOVER_SHIFT)); +} + +static inline void G2S_SetBG3ControlDCBmp(GXBGScrSizeDcBmp screenSize, GXBGAreaOver areaOver, GXBGBmpScrBase screenBase) +{ + reg_G2S_DB_BG3CNT = (u16)((reg_G2S_DB_BG3CNT & (REG_G2S_DB_BG3CNT_PRIORITY_MASK | REG_G2S_DB_BG3CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG3CNT_SCREENSIZE_SHIFT) | GX_BG_EXTMODE_DCBITMAP | (screenBase << REG_G2S_DB_BG3CNT_SCREENBASE_SHIFT) | (areaOver << REG_G2S_DB_BG3CNT_AREAOVER_SHIFT)); +} + +static inline void G2_SetBG3ControlLargeBmp(GXBGScrSizeLargeBmp screenSize, GXBGAreaOver areaOver) +{ + reg_G2_BG3CNT = (u16)((reg_G2_BG3CNT & (REG_G2_BG3CNT_PRIORITY_MASK | REG_G2_BG3CNT_MOSAIC_MASK)) | (screenSize << REG_G2_BG3CNT_SCREENSIZE_SHIFT) | (areaOver << REG_G2_BG3CNT_AREAOVER_SHIFT)); +} + +static inline void G2S_SetBG3ControlLargeBmp(GXBGScrSizeLargeBmp screenSize, GXBGAreaOver areaOver) +{ + reg_G2S_DB_BG3CNT = (u16)((reg_G2S_DB_BG3CNT & (REG_G2S_DB_BG3CNT_PRIORITY_MASK | REG_G2S_DB_BG3CNT_MOSAIC_MASK)) | (screenSize << REG_G2S_DB_BG3CNT_SCREENSIZE_SHIFT) | (areaOver << REG_G2S_DB_BG3CNT_AREAOVER_SHIFT)); +} + +static inline void G2_BG0Mosaic(BOOL enable) +{ + if (enable) + { + reg_G2_BG0CNT |= REG_G2_BG0CNT_MOSAIC_MASK; + } + else + { + reg_G2_BG0CNT &= ~REG_G2_BG0CNT_MOSAIC_MASK; + } +} + +static inline void G2S_BG0Mosaic(BOOL enable) +{ + if (enable) + { + reg_G2S_DB_BG0CNT |= REG_G2S_DB_BG0CNT_MOSAIC_MASK; + } + else + { + reg_G2S_DB_BG0CNT &= ~REG_G2S_DB_BG0CNT_MOSAIC_MASK; + } +} + +static inline void G2_BG1Mosaic(BOOL enable) +{ + if (enable) + { + reg_G2_BG1CNT |= REG_G2_BG1CNT_MOSAIC_MASK; + } + else + { + reg_G2_BG1CNT &= ~REG_G2_BG1CNT_MOSAIC_MASK; + } +} + +static inline void G2S_BG1Mosaic(BOOL enable) +{ + if (enable) + { + reg_G2S_DB_BG1CNT |= REG_G2S_DB_BG1CNT_MOSAIC_MASK; + } + else + { + reg_G2S_DB_BG1CNT &= ~REG_G2S_DB_BG1CNT_MOSAIC_MASK; + } +} + +static inline void G2_BG2Mosaic(BOOL enable) +{ + if (enable) + { + reg_G2_BG2CNT |= REG_G2_BG2CNT_MOSAIC_MASK; + } + else + { + reg_G2_BG2CNT &= ~REG_G2_BG2CNT_MOSAIC_MASK; + } +} + +static inline void G2S_BG2Mosaic(BOOL enable) +{ + if (enable) + { + reg_G2S_DB_BG2CNT |= REG_G2S_DB_BG2CNT_MOSAIC_MASK; + } + else + { + reg_G2S_DB_BG2CNT &= ~REG_G2S_DB_BG2CNT_MOSAIC_MASK; + } +} + +static inline void G2_BG3Mosaic(BOOL enable) +{ + if (enable) + { + reg_G2_BG3CNT |= REG_G2_BG3CNT_MOSAIC_MASK; + } + else + { + reg_G2_BG3CNT &= ~REG_G2_BG3CNT_MOSAIC_MASK; + } +} + +static inline void G2S_BG3Mosaic(BOOL enable) +{ + if (enable) + { + reg_G2S_DB_BG3CNT |= REG_G2S_DB_BG3CNT_MOSAIC_MASK; + } + else + { + reg_G2S_DB_BG3CNT &= ~REG_G2S_DB_BG3CNT_MOSAIC_MASK; + } +} + +static inline void G2_SetBG0Priority(int priority) +{ + reg_G2_BG0CNT = (u16)((reg_G2_BG0CNT & ~REG_G2_BG0CNT_PRIORITY_MASK) | (priority << REG_G2_BG0CNT_PRIORITY_SHIFT)); +} + +static inline void G2S_SetBG0Priority(int priority) +{ + reg_G2S_DB_BG0CNT = (u16)((reg_G2S_DB_BG0CNT & ~REG_G2S_DB_BG0CNT_PRIORITY_MASK) | (priority << REG_G2S_DB_BG0CNT_PRIORITY_SHIFT)); +} + +static inline void G2_SetBG1Priority(int priority) +{ + reg_G2_BG1CNT = (u16)((reg_G2_BG1CNT & ~REG_G2_BG1CNT_PRIORITY_MASK) | (priority << REG_G2_BG1CNT_PRIORITY_SHIFT)); +} + +static inline void G2S_SetBG1Priority(int priority) +{ + reg_G2S_DB_BG1CNT = (u16)((reg_G2S_DB_BG1CNT & ~REG_G2S_DB_BG1CNT_PRIORITY_MASK) | (priority << REG_G2S_DB_BG1CNT_PRIORITY_SHIFT)); +} + +static inline void G2_SetBG2Priority(int priority) +{ + reg_G2_BG2CNT = (u16)((reg_G2_BG2CNT & ~REG_G2_BG2CNT_PRIORITY_MASK) | (priority << REG_G2_BG2CNT_PRIORITY_SHIFT)); +} + +static inline void G2S_SetBG2Priority(int priority) +{ + reg_G2S_DB_BG2CNT = (u16)((reg_G2S_DB_BG2CNT & ~REG_G2S_DB_BG2CNT_PRIORITY_MASK) | (priority << REG_G2S_DB_BG2CNT_PRIORITY_SHIFT)); +} + +static inline void G2_SetBG3Priority(int priority) +{ + reg_G2_BG3CNT = (u16)((reg_G2_BG3CNT & ~REG_G2_BG3CNT_PRIORITY_MASK) | (priority << REG_G2_BG3CNT_PRIORITY_SHIFT)); +} + +static inline void G2S_SetBG3Priority(int priority) +{ + reg_G2S_DB_BG3CNT = (u16)((reg_G2S_DB_BG3CNT & ~REG_G2S_DB_BG3CNT_PRIORITY_MASK) | (priority << REG_G2S_DB_BG3CNT_PRIORITY_SHIFT)); +} + #endif //GUARD_GX_BGCNT_H diff --git a/arm9/lib/include/registers.h b/arm9/lib/include/registers.h index 73ae7ccf..f4da59ad 100644 --- a/arm9/lib/include/registers.h +++ b/arm9/lib/include/registers.h @@ -697,4 +697,236 @@ #define REG_GX_DISPSTAT_VBLK_SIZE 1 #define REG_GX_DISPSTAT_VBLK_MASK 0x0001 +// G2_BG0CNT +#define REG_G2_BG0CNT_SCREENSIZE_SHIFT 14 +#define REG_G2_BG0CNT_SCREENSIZE_SIZE 2 +#define REG_G2_BG0CNT_SCREENSIZE_MASK 0xc000 + +#define REG_G2_BG0CNT_BGPLTTSLOT_SHIFT 13 +#define REG_G2_BG0CNT_BGPLTTSLOT_SIZE 1 +#define REG_G2_BG0CNT_BGPLTTSLOT_MASK 0x2000 + +#define REG_G2_BG0CNT_SCREENBASE_SHIFT 8 +#define REG_G2_BG0CNT_SCREENBASE_SIZE 5 +#define REG_G2_BG0CNT_SCREENBASE_MASK 0x1f00 + +#define REG_G2_BG0CNT_COLORMODE_SHIFT 7 +#define REG_G2_BG0CNT_COLORMODE_SIZE 1 +#define REG_G2_BG0CNT_COLORMODE_MASK 0x0080 + +#define REG_G2_BG0CNT_MOSAIC_SHIFT 6 +#define REG_G2_BG0CNT_MOSAIC_SIZE 1 +#define REG_G2_BG0CNT_MOSAIC_MASK 0x0040 + +#define REG_G2_BG0CNT_CHARBASE_SHIFT 2 +#define REG_G2_BG0CNT_CHARBASE_SIZE 4 +#define REG_G2_BG0CNT_CHARBASE_MASK 0x003c + +#define REG_G2_BG0CNT_PRIORITY_SHIFT 0 +#define REG_G2_BG0CNT_PRIORITY_SIZE 2 +#define REG_G2_BG0CNT_PRIORITY_MASK 0x0003 + +// G2_BG1CNT +#define REG_G2_BG1CNT_SCREENSIZE_SHIFT 14 +#define REG_G2_BG1CNT_SCREENSIZE_SIZE 2 +#define REG_G2_BG1CNT_SCREENSIZE_MASK 0xc000 + +#define REG_G2_BG1CNT_BGPLTTSLOT_SHIFT 13 +#define REG_G2_BG1CNT_BGPLTTSLOT_SIZE 1 +#define REG_G2_BG1CNT_BGPLTTSLOT_MASK 0x2000 + +#define REG_G2_BG1CNT_SCREENBASE_SHIFT 8 +#define REG_G2_BG1CNT_SCREENBASE_SIZE 5 +#define REG_G2_BG1CNT_SCREENBASE_MASK 0x1f00 + +#define REG_G2_BG1CNT_COLORMODE_SHIFT 7 +#define REG_G2_BG1CNT_COLORMODE_SIZE 1 +#define REG_G2_BG1CNT_COLORMODE_MASK 0x0080 + +#define REG_G2_BG1CNT_MOSAIC_SHIFT 6 +#define REG_G2_BG1CNT_MOSAIC_SIZE 1 +#define REG_G2_BG1CNT_MOSAIC_MASK 0x0040 + +#define REG_G2_BG1CNT_CHARBASE_SHIFT 2 +#define REG_G2_BG1CNT_CHARBASE_SIZE 4 +#define REG_G2_BG1CNT_CHARBASE_MASK 0x003c + +#define REG_G2_BG1CNT_PRIORITY_SHIFT 0 +#define REG_G2_BG1CNT_PRIORITY_SIZE 2 +#define REG_G2_BG1CNT_PRIORITY_MASK 0x0003 + +// G2_BG2CNT +#define REG_G2_BG2CNT_SCREENSIZE_SHIFT 14 +#define REG_G2_BG2CNT_SCREENSIZE_SIZE 2 +#define REG_G2_BG2CNT_SCREENSIZE_MASK 0xc000 + +#define REG_G2_BG2CNT_AREAOVER_SHIFT 13 +#define REG_G2_BG2CNT_AREAOVER_SIZE 1 +#define REG_G2_BG2CNT_AREAOVER_MASK 0x2000 + +#define REG_G2_BG2CNT_SCREENBASE_SHIFT 8 +#define REG_G2_BG2CNT_SCREENBASE_SIZE 5 +#define REG_G2_BG2CNT_SCREENBASE_MASK 0x1f00 + +#define REG_G2_BG2CNT_COLORMODE_SHIFT 7 +#define REG_G2_BG2CNT_COLORMODE_SIZE 1 +#define REG_G2_BG2CNT_COLORMODE_MASK 0x0080 + +#define REG_G2_BG2CNT_MOSAIC_SHIFT 6 +#define REG_G2_BG2CNT_MOSAIC_SIZE 1 +#define REG_G2_BG2CNT_MOSAIC_MASK 0x0040 + +#define REG_G2_BG2CNT_CHARBASE_SHIFT 2 +#define REG_G2_BG2CNT_CHARBASE_SIZE 4 +#define REG_G2_BG2CNT_CHARBASE_MASK 0x003c + +#define REG_G2_BG2CNT_PRIORITY_SHIFT 0 +#define REG_G2_BG2CNT_PRIORITY_SIZE 2 +#define REG_G2_BG2CNT_PRIORITY_MASK 0x0003 + +// G2_BG3CNT +#define REG_G2_BG3CNT_SCREENSIZE_SHIFT 14 +#define REG_G2_BG3CNT_SCREENSIZE_SIZE 2 +#define REG_G2_BG3CNT_SCREENSIZE_MASK 0xc000 + +#define REG_G2_BG3CNT_AREAOVER_SHIFT 13 +#define REG_G2_BG3CNT_AREAOVER_SIZE 1 +#define REG_G2_BG3CNT_AREAOVER_MASK 0x2000 + +#define REG_G2_BG3CNT_SCREENBASE_SHIFT 8 +#define REG_G2_BG3CNT_SCREENBASE_SIZE 5 +#define REG_G2_BG3CNT_SCREENBASE_MASK 0x1f00 + +#define REG_G2_BG3CNT_COLORMODE_SHIFT 7 +#define REG_G2_BG3CNT_COLORMODE_SIZE 1 +#define REG_G2_BG3CNT_COLORMODE_MASK 0x0080 + +#define REG_G2_BG3CNT_MOSAIC_SHIFT 6 +#define REG_G2_BG3CNT_MOSAIC_SIZE 1 +#define REG_G2_BG3CNT_MOSAIC_MASK 0x0040 + +#define REG_G2_BG3CNT_CHARBASE_SHIFT 2 +#define REG_G2_BG3CNT_CHARBASE_SIZE 4 +#define REG_G2_BG3CNT_CHARBASE_MASK 0x003c + +#define REG_G2_BG3CNT_PRIORITY_SHIFT 0 +#define REG_G2_BG3CNT_PRIORITY_SIZE 2 +#define REG_G2_BG3CNT_PRIORITY_MASK 0x0003 + +// G2S_DB_BG0CNT +#define REG_G2S_DB_BG0CNT_SCREENSIZE_SHIFT 14 +#define REG_G2S_DB_BG0CNT_SCREENSIZE_SIZE 2 +#define REG_G2S_DB_BG0CNT_SCREENSIZE_MASK 0xc000 + +#define REG_G2S_DB_BG0CNT_BGPLTTSLOT_SHIFT 13 +#define REG_G2S_DB_BG0CNT_BGPLTTSLOT_SIZE 1 +#define REG_G2S_DB_BG0CNT_BGPLTTSLOT_MASK 0x2000 + +#define REG_G2S_DB_BG0CNT_SCREENBASE_SHIFT 8 +#define REG_G2S_DB_BG0CNT_SCREENBASE_SIZE 5 +#define REG_G2S_DB_BG0CNT_SCREENBASE_MASK 0x1f00 + +#define REG_G2S_DB_BG0CNT_COLORMODE_SHIFT 7 +#define REG_G2S_DB_BG0CNT_COLORMODE_SIZE 1 +#define REG_G2S_DB_BG0CNT_COLORMODE_MASK 0x0080 + +#define REG_G2S_DB_BG0CNT_MOSAIC_SHIFT 6 +#define REG_G2S_DB_BG0CNT_MOSAIC_SIZE 1 +#define REG_G2S_DB_BG0CNT_MOSAIC_MASK 0x0040 + +#define REG_G2S_DB_BG0CNT_CHARBASE_SHIFT 2 +#define REG_G2S_DB_BG0CNT_CHARBASE_SIZE 4 +#define REG_G2S_DB_BG0CNT_CHARBASE_MASK 0x003c + +#define REG_G2S_DB_BG0CNT_PRIORITY_SHIFT 0 +#define REG_G2S_DB_BG0CNT_PRIORITY_SIZE 2 +#define REG_G2S_DB_BG0CNT_PRIORITY_MASK 0x0003 + +// G2S_DB_BG1CNT +#define REG_G2S_DB_BG1CNT_SCREENSIZE_SHIFT 14 +#define REG_G2S_DB_BG1CNT_SCREENSIZE_SIZE 2 +#define REG_G2S_DB_BG1CNT_SCREENSIZE_MASK 0xc000 + +#define REG_G2S_DB_BG1CNT_BGPLTTSLOT_SHIFT 13 +#define REG_G2S_DB_BG1CNT_BGPLTTSLOT_SIZE 1 +#define REG_G2S_DB_BG1CNT_BGPLTTSLOT_MASK 0x2000 + +#define REG_G2S_DB_BG1CNT_SCREENBASE_SHIFT 8 +#define REG_G2S_DB_BG1CNT_SCREENBASE_SIZE 5 +#define REG_G2S_DB_BG1CNT_SCREENBASE_MASK 0x1f00 + +#define REG_G2S_DB_BG1CNT_COLORMODE_SHIFT 7 +#define REG_G2S_DB_BG1CNT_COLORMODE_SIZE 1 +#define REG_G2S_DB_BG1CNT_COLORMODE_MASK 0x0080 + +#define REG_G2S_DB_BG1CNT_MOSAIC_SHIFT 6 +#define REG_G2S_DB_BG1CNT_MOSAIC_SIZE 1 +#define REG_G2S_DB_BG1CNT_MOSAIC_MASK 0x0040 + +#define REG_G2S_DB_BG1CNT_CHARBASE_SHIFT 2 +#define REG_G2S_DB_BG1CNT_CHARBASE_SIZE 4 +#define REG_G2S_DB_BG1CNT_CHARBASE_MASK 0x003c + +#define REG_G2S_DB_BG1CNT_PRIORITY_SHIFT 0 +#define REG_G2S_DB_BG1CNT_PRIORITY_SIZE 2 +#define REG_G2S_DB_BG1CNT_PRIORITY_MASK 0x0003 + +// G2S_DB_BG2CNT +#define REG_G2S_DB_BG2CNT_SCREENSIZE_SHIFT 14 +#define REG_G2S_DB_BG2CNT_SCREENSIZE_SIZE 2 +#define REG_G2S_DB_BG2CNT_SCREENSIZE_MASK 0xc000 + +#define REG_G2S_DB_BG2CNT_AREAOVER_SHIFT 13 +#define REG_G2S_DB_BG2CNT_AREAOVER_SIZE 1 +#define REG_G2S_DB_BG2CNT_AREAOVER_MASK 0x2000 + +#define REG_G2S_DB_BG2CNT_SCREENBASE_SHIFT 8 +#define REG_G2S_DB_BG2CNT_SCREENBASE_SIZE 5 +#define REG_G2S_DB_BG2CNT_SCREENBASE_MASK 0x1f00 + +#define REG_G2S_DB_BG2CNT_COLORMODE_SHIFT 7 +#define REG_G2S_DB_BG2CNT_COLORMODE_SIZE 1 +#define REG_G2S_DB_BG2CNT_COLORMODE_MASK 0x0080 + +#define REG_G2S_DB_BG2CNT_MOSAIC_SHIFT 6 +#define REG_G2S_DB_BG2CNT_MOSAIC_SIZE 1 +#define REG_G2S_DB_BG2CNT_MOSAIC_MASK 0x0040 + +#define REG_G2S_DB_BG2CNT_CHARBASE_SHIFT 2 +#define REG_G2S_DB_BG2CNT_CHARBASE_SIZE 4 +#define REG_G2S_DB_BG2CNT_CHARBASE_MASK 0x003c + +#define REG_G2S_DB_BG2CNT_PRIORITY_SHIFT 0 +#define REG_G2S_DB_BG2CNT_PRIORITY_SIZE 2 +#define REG_G2S_DB_BG2CNT_PRIORITY_MASK 0x0003 + +// G2S_DB_BG3CNT +#define REG_G2S_DB_BG3CNT_SCREENSIZE_SHIFT 14 +#define REG_G2S_DB_BG3CNT_SCREENSIZE_SIZE 2 +#define REG_G2S_DB_BG3CNT_SCREENSIZE_MASK 0xc000 + +#define REG_G2S_DB_BG3CNT_AREAOVER_SHIFT 13 +#define REG_G2S_DB_BG3CNT_AREAOVER_SIZE 1 +#define REG_G2S_DB_BG3CNT_AREAOVER_MASK 0x2000 + +#define REG_G2S_DB_BG3CNT_SCREENBASE_SHIFT 8 +#define REG_G2S_DB_BG3CNT_SCREENBASE_SIZE 5 +#define REG_G2S_DB_BG3CNT_SCREENBASE_MASK 0x1f00 + +#define REG_G2S_DB_BG3CNT_COLORMODE_SHIFT 7 +#define REG_G2S_DB_BG3CNT_COLORMODE_SIZE 1 +#define REG_G2S_DB_BG3CNT_COLORMODE_MASK 0x0080 + +#define REG_G2S_DB_BG3CNT_MOSAIC_SHIFT 6 +#define REG_G2S_DB_BG3CNT_MOSAIC_SIZE 1 +#define REG_G2S_DB_BG3CNT_MOSAIC_MASK 0x0040 + +#define REG_G2S_DB_BG3CNT_CHARBASE_SHIFT 2 +#define REG_G2S_DB_BG3CNT_CHARBASE_SIZE 4 +#define REG_G2S_DB_BG3CNT_CHARBASE_MASK 0x003c + +#define REG_G2S_DB_BG3CNT_PRIORITY_SHIFT 0 +#define REG_G2S_DB_BG3CNT_PRIORITY_SIZE 2 +#define REG_G2S_DB_BG3CNT_PRIORITY_MASK 0x0003 + #endif //POKEDIAMOND_ARM9_REGISTERS_H diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 3ede4756..8eb66a39 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -274,7 +274,7 @@ _021E1CA8: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -545,7 +545,7 @@ MOD05_021E1ECC: ; 0x021E1ECC add r0, r6, #0 add r0, #0xa8 ldr r0, [r0] - bl FUN_02019178 + bl RemoveWindow mov r4, #0 add r5, r6, #0 _021E1EFC: @@ -685,7 +685,7 @@ _021E1FC8: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized b _021E2032 _021E2002: add r1, r4, #0 @@ -710,7 +710,7 @@ _021E2002: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized _021E2032: mov r0, #0 str r0, [sp] @@ -1142,7 +1142,7 @@ MOD05_021E2368: ; 0x021E2368 bl FUN_0200CCF8 add r0, r6, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow mov r4, #0 add r5, r6, #0 _021E2398: @@ -1291,7 +1291,7 @@ _021E2496: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -1411,7 +1411,7 @@ MOD05_021E25A4: ; 0x021E25A4 add r0, r6, #0 add r0, #0xa8 ldr r0, [r0] - bl FUN_02019178 + bl RemoveWindow mov r4, #0 add r5, r6, #0 _021E25D0: @@ -1626,7 +1626,7 @@ _021E270A: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -1733,7 +1733,7 @@ MOD05_021E27E8: ; 0x021E27E8 add r1, r4, #0 mov r2, #3 add r3, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -1893,7 +1893,7 @@ MOD05_021E2950: ; 0x021E2950 add r1, r4, #0 mov r2, #3 add r3, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -2022,7 +2022,7 @@ MOD05_021E2A70: ; 0x021E2A70 add r1, r4, #0 mov r2, #3 add r3, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index a81ba2f1..99df49cd 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -36,7 +36,7 @@ MOD05_021E2EA4: ; 0x021E2EA4 add r1, #0x20 str r0, [sp, #0x10] ldr r0, [r4, #0x1c] - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] ldr r2, _021E2EE0 ; =0x000003CF @@ -498,7 +498,7 @@ MOD05_021E3248: ; 0x021E3248 bl DestroyMsgData add r0, r4, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x40] bl String_dtor ldr r0, [r4, #0x38] diff --git a/arm9/modules/05/asm/mod05_021E80F8.s b/arm9/modules/05/asm/mod05_021E80F8.s index 82fd7a02..8725af08 100644 --- a/arm9/modules/05/asm/mod05_021E80F8.s +++ b/arm9/modules/05/asm/mod05_021E80F8.s @@ -26,7 +26,7 @@ MOD05_021E8110: ; 0x021E8110 lsl r1, r1, #0x18 lsr r1, r1, #0x1f beq _021E8120 - bl FUN_02019178 + bl RemoveWindow _021E8120: add r0, r4, #0 bl FreeToHeap @@ -179,7 +179,7 @@ MOD05_021E820C: ; 0x021E820C lsl r1, r1, #0x18 lsr r1, r1, #0x1f beq _021E825A - bl FUN_02019178 + bl RemoveWindow mov r0, #0x12 str r0, [sp] mov r0, #0x20 diff --git a/arm9/modules/05/asm/mod05_021E8310.s b/arm9/modules/05/asm/mod05_021E8310.s index 5bf27853..6c9c422b 100644 --- a/arm9/modules/05/asm/mod05_021E8310.s +++ b/arm9/modules/05/asm/mod05_021E8310.s @@ -264,7 +264,7 @@ MOD05_021E84F4: ; 0x021E84F4 ldrb r2, [r4, #8] ldr r0, [r4, #0xc] ldr r1, [r4, #0x10] - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] ldr r0, [r4, #4] @@ -301,7 +301,7 @@ MOD05_021E856C: ; 0x021E856C mov r1, #0 bl FUN_0200CCF8 ldr r0, [r4, #0x10] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] bl FreeToHeap pop {r4, pc} diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index c01bfea2..28a5f8fd 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -2753,7 +2753,7 @@ _021E9C02: ldr r0, [r0, #0x10] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0 add r0, sp, #0x28 strh r1, [r0] @@ -3164,7 +3164,7 @@ _021E9FA4: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3725,7 +3725,7 @@ _021EA430: ldr r0, [r0, #0x10] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0 add r0, sp, #0x28 strh r1, [r0] @@ -4097,7 +4097,7 @@ _021EA76C: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -5393,7 +5393,7 @@ _021EB18E: ldr r1, [r4] ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0 add r0, sp, #0x14 strh r1, [r0] @@ -5568,7 +5568,7 @@ _021EB394: ldr r0, [r4] bl FUN_02019570 ldr r0, [r4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4] mov r1, #1 bl WindowArray_dtor @@ -15215,7 +15215,7 @@ MOD05_021EFEDC: ; 0x021EFEDC ldr r0, [r0, #8] mov r2, #3 mov r3, #0x13 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _021EFFBC ; =0x000003D9 add r0, #0x20 @@ -15362,7 +15362,7 @@ _021F0056: bl FUN_0200CCF8 add r0, r5, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow mov r1, #0 ldr r0, [r5, #4] add r2, r1, #0 @@ -15565,12 +15565,12 @@ MOD05_021F01EC: ; 0x021F01EC add r4, r0, #0 add r0, #0x10 add r5, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021F0204 add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow _021F0204: ldr r0, [r4, #0x3c] ldr r2, [r4, #8] @@ -15648,12 +15648,12 @@ MOD05_021F0290: ; 0x021F0290 bl String_dtor add r0, r4, #0 add r0, #0x10 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021F02C0 add r4, #0x10 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021F02C0: pop {r4, pc} .balign 4, 0 @@ -28181,7 +28181,7 @@ MOD05_021F617C: ; 0x021F617C bl FUN_0200D0E0 add r4, #0x38 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow mov r0, #1 pop {r4, pc} _021F61AA: diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 8e1e98db..e4c3ea0d 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -8472,7 +8472,7 @@ MOD06_0223D63C: ; 0x0223D63C ldr r0, [r5] add r1, #8 add r2, r4, #0 - bl FUN_02019064 + bl AddWindowParameterized b _0223D710 _0223D6B8: mov r4, #2 @@ -8514,7 +8514,7 @@ _0223D6B8: ldr r0, [r5] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized _0223D710: add r0, r5, #0 add r0, #0x84 @@ -8621,7 +8621,7 @@ MOD06_0223D7B8: ; 0x0223D7B8 bl ListMenuItems_dtor add r4, #8 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_start MOD06_0223D7EC @@ -8649,7 +8649,7 @@ _0223D804: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x88 ldr r0, [r0] @@ -8825,13 +8825,13 @@ _0223D984: ldr r0, [r5] ldr r2, _0223D9BC ; =0x0224F350 add r1, r4, #0 - bl FUN_02019150 + bl AddWindow b _0223D9A6 _0223D99C: ldr r0, [r5] add r1, r4, #0 add r2, r7, #0 - bl FUN_02019150 + bl AddWindow _0223D9A6: add r6, r6, #1 add r4, #0x10 @@ -8857,7 +8857,7 @@ _0223D9D0: add r0, r5, #0 bl FUN_02019570 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #6 @@ -10917,7 +10917,7 @@ MOD06_0223EB04: ; 0x0223EB04 _0223EB1A: add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl MOD06_0223D63C mov r0, #1 @@ -11285,7 +11285,7 @@ _0223EE16: ldr r0, _0223EE70 ; =0x02252420 ldr r0, [r0] add r0, #0x40 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223EE34 ldr r0, _0223EE70 ; =0x02252420 @@ -11333,7 +11333,7 @@ MOD06_0223EE74: ; 0x0223EE74 ldr r0, _0223EF10 ; =0x02252420 ldr r0, [r0] add r0, #0x20 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223EEB8 ldr r0, _0223EF10 ; =0x02252420 @@ -11358,7 +11358,7 @@ MOD06_0223EE74: ; 0x0223EE74 ldr r0, [r1, #0x68] add r1, #0x20 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized _0223EEB8: ldr r0, _0223EF10 ; =0x02252420 ldr r2, _0223EF14 ; =0x000003D9 @@ -11570,7 +11570,7 @@ _0223F060: cmp r1, #0 beq _0223F07A add r0, #0x40 - bl FUN_02019178 + bl RemoveWindow _0223F07A: ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] @@ -11820,7 +11820,7 @@ MOD06_0223F270: ; 0x0223F270 ldr r0, _0223F330 ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223F2AA ldr r0, _0223F330 ; =0x02252420 @@ -11840,7 +11840,7 @@ MOD06_0223F270: ; 0x0223F270 add r1, #0x30 ldr r0, [r0, #8] mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0223F2AA: ldr r0, _0223F330 ; =0x02252420 ldr r2, _0223F334 ; =0x000003D9 @@ -12578,7 +12578,7 @@ MOD06_0223F8C8: ; 0x0223F8C8 ldr r0, _0223F950 ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223F910 ldr r0, _0223F950 ; =0x02252420 @@ -12598,7 +12598,7 @@ MOD06_0223F8C8: ; 0x0223F8C8 add r1, #0x30 ldr r0, [r0, #8] mov r3, #0x16 - bl FUN_02019064 + bl AddWindowParameterized _0223F910: ldr r0, _0223F950 ; =0x02252420 ldr r2, _0223F954 ; =0x000003D9 @@ -13859,7 +13859,7 @@ MOD06_02240364: ; 0x02240364 bl FUN_02019570 add r0, r4, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x97 ldrb r0, [r0] @@ -13877,7 +13877,7 @@ MOD06_02240364: ; 0x02240364 ldr r0, _022403DC ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019178 + bl RemoveWindow mov r0, #0 add r4, #0x97 strb r0, [r4] @@ -14468,7 +14468,7 @@ MOD06_02240864: ; 0x02240864 add r5, r0, #0 add r0, #0x54 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0224089E add r0, r5, #0 @@ -14528,7 +14528,7 @@ MOD06_022408D4: ; 0x022408D4 _022408EC: add r4, #0x54 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 @@ -14572,7 +14572,7 @@ MOD06_02240924: ; 0x02240924 add r6, r6, #1 _02240940: add r0, r4, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _022409D2 add r0, r6, #2 @@ -14594,7 +14594,7 @@ _02240940: add r1, r4, #0 ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02240A20 ; =0x000003D9 add r0, #0x34 @@ -14698,7 +14698,7 @@ MOD06_02240A28: ; 0x02240A28 bl FUN_0201AC68 add r0, r4, #0 add r0, #0x34 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #8] bl ListMenuItems_dtor mov r0, #0 @@ -14810,7 +14810,7 @@ MOD06_02240B04: ; 0x02240B04 ldr r0, [r0, #8] mov r2, #3 mov r3, #0x16 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02240BB0 ; =0x000003D9 add r0, #0x44 @@ -14933,7 +14933,7 @@ _02240C1A: bl FUN_0201AC68 add r0, r5, #0 add r0, #0x44 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #0xc] bl ListMenuItems_dtor mov r0, #0 @@ -14984,7 +14984,7 @@ MOD06_02240C58: ; 0x02240C58 ldr r0, [r0, #0x10] mov r3, #4 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x24] ldr r2, _02240F00 ; =0x000003D9 mov r1, #1 @@ -15289,7 +15289,7 @@ MOD06_02240F1C: ; 0x02240F1C bl FUN_0201AC68 add r4, #0x24 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 @@ -19005,7 +19005,7 @@ MOD06_02242CDC: ; 0x02242CDC add r1, r4, #4 mov r2, #3 add r3, r6, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -19433,7 +19433,7 @@ MOD06_02243024: ; 0x02243024 bl FUN_0200D0E0 add r0, r6, #0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 add r0, #0x88 mov r1, #0 @@ -19444,7 +19444,7 @@ MOD06_02243024: ; 0x02243024 mov r1, #0 bl FUN_0200CCF8 add r0, r6, #4 - bl FUN_02019178 + bl RemoveWindow mov r4, #0 add r5, r6, #0 _02243060: @@ -40876,7 +40876,7 @@ MOD06_0224D46C: ; 0x0224D46C add r0, r5, #0 add r1, r4, #0 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r3, #0xb @@ -41095,7 +41095,7 @@ MOD06_0224D6A4: ; 0x0224D6A4 add r0, r4, #0 bl FUN_02019570 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0x14] @@ -41810,7 +41810,7 @@ MOD06_0224DC5C: ; 0x0224DC5C add r0, r4, #0 mov r2, #3 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #4] mov r1, #0xf bl FillWindowPixelBuffer @@ -41836,7 +41836,7 @@ MOD06_0224DCB4: ; 0x0224DCB4 ldr r0, [r4, #4] bl FUN_02019570 ldr r0, [r4, #4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] mov r1, #1 bl WindowArray_dtor @@ -42055,7 +42055,7 @@ MOD06_0224DE60: ; 0x0224DE60 add r0, r4, #0 mov r2, #3 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x14] bl ScrStrBufs_new str r0, [r6, #8] @@ -42108,7 +42108,7 @@ _0224DEE6: ldr r0, [r6, #4] bl FUN_02019570 ldr r0, [r6, #4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r6, #4] mov r1, #1 bl WindowArray_dtor @@ -42230,7 +42230,7 @@ _0224DFC0: add r0, r4, #0 mov r2, #3 mov r3, #0x11 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x14] bl ScrStrBufs_new mov r1, #0x49 @@ -42449,7 +42449,7 @@ _0224E1C0: ldr r0, [r6, #4] bl FUN_02019570 ldr r0, [r6, #4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r6, #4] mov r1, #1 bl WindowArray_dtor diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 80472fdf..e95e23e7 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -2452,7 +2452,7 @@ MOD07_02213220: ; 0x02213220 add r1, r5, #0 mov r2, #8 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -2508,7 +2508,7 @@ MOD07_02213220: ; 0x02213220 mov r1, #0 bl FUN_02011A60 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -4445,7 +4445,7 @@ _02214258: ldr r0, [r7, #0xc] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -4463,7 +4463,7 @@ MOD07_02214274: ; 0x02214274 add r5, #0x10 _0221427C: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0x18 diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index a7342efb..cd43756a 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -3825,7 +3825,7 @@ _02213CC4: ldr r0, [r7, r0] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -3941,7 +3941,7 @@ _02213D90: lsl r2, r5, #3 ldr r0, [r4, r0] add r2, r6, r2 - bl FUN_02019150 + bl AddWindow add r0, r5, #1 lsl r0, r0, #0x18 lsr r5, r0, #0x18 @@ -3990,7 +3990,7 @@ MOD09_02213DF8: ; 0x02213DF8 add r5, r5, r0 _02213E0E: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #2 @@ -14311,7 +14311,7 @@ MOD09_02219474: ; 0x02219474 ldr r0, [r4, #4] ldr r2, _02219490 ; =0x0221BC2C add r1, #0x1c - bl FUN_02019150 + bl AddWindow ldr r1, _02219494 ; =0x0000114C add r0, r4, #0 ldrb r1, [r4, r1] @@ -14370,7 +14370,7 @@ _022194E2: lsl r2, r4, #3 ldr r0, [r5, #4] add r2, r6, r2 - bl FUN_02019150 + bl AddWindow add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -14408,7 +14408,7 @@ MOD09_02219520: ; 0x02219520 bl WindowArray_dtor add r4, #0x1c add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow 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 96c089da..71334e08 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -325,7 +325,7 @@ MOD11_0222D840: ; 0x0222D840 ldr r0, [r4, r0] bl MOD11_02258658 ldr r0, [r4, #8] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] bl MOD11_0222E4E8 add r0, r4, #0 @@ -424,7 +424,7 @@ MOD11_0222D944: ; 0x0222D944 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02019178 + bl RemoveWindow mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers @@ -630,7 +630,7 @@ _0222D99A: str r0, [sp, #0x10] ldr r0, [r5, #4] ldr r1, [r5, #8] - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #8] mov r1, #0xff bl FillWindowPixelBuffer @@ -792,7 +792,7 @@ _0222DC42: ldr r1, [r4, #8] mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r4, #8] mov r1, #0xff bl FillWindowPixelBuffer diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 3f35ee60..40e43938 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -183,7 +183,7 @@ _0222F30E: ldr r1, [r5, #8] mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #8] mov r1, #0xff bl FillWindowPixelBuffer @@ -23859,7 +23859,7 @@ _0223AC50: add r1, r5, #0 mov r2, #2 mov r3, #0x11 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0xff bl FillWindowPixelBuffer @@ -24055,7 +24055,7 @@ _0223AE5E: mov r1, #0 bl FUN_0200CCF8 add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow ldr r1, _0223AF50 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -28107,7 +28107,7 @@ _0223CF5C: add r1, sp, #0x68 mov r2, #0xc mov r3, #4 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -28167,7 +28167,7 @@ _0223CF5C: ldr r0, [r5, #0x14] bl FUN_02011AC0 add r0, sp, #0x68 - bl FUN_02019178 + bl RemoveWindow add sp, #0x78 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -82482,7 +82482,7 @@ MOD11_022574F0: ; 0x022574F0 add r1, sp, #0x24 mov r2, #8 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -82570,7 +82570,7 @@ MOD11_022574F0: ; 0x022574F0 ldrh r2, [r3, r2] bl MIi_CpuCopy16 add r0, sp, #0x24 - bl FUN_02019178 + bl RemoveWindow ldr r0, [sp, #0x18] bl String_dtor ldr r0, [sp, #0x1c] @@ -83055,7 +83055,7 @@ _02257A26: add r1, sp, #0x18 mov r2, #0xd mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -83116,7 +83116,7 @@ _02257A26: mov r2, #0xe0 bl MIi_CpuCopy16 add r0, sp, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r7, #0 bl String_dtor add sp, #0x28 @@ -83181,7 +83181,7 @@ _02257B1E: add r1, sp, #0x24 mov r2, #0xd mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -83241,7 +83241,7 @@ _02257B1E: mov r2, #0xe0 bl MIi_CpuCopy16 add r0, sp, #0x24 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 bl String_dtor ldr r0, [sp, #0x18] @@ -88290,7 +88290,7 @@ _0225A49C: add r1, sp, #0x3c lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -88374,7 +88374,7 @@ _0225A50A: cmp r4, #0 bne _0225A570 add r0, sp, #0x3c - bl FUN_02019178 + bl RemoveWindow _0225A570: str r7, [r5] add r3, sp, #0x30 @@ -88591,7 +88591,7 @@ _0225A6E4: cmp r0, #0 beq _0225A6FE add r0, r7, #0 - bl FUN_02019178 + bl RemoveWindow _0225A6FE: add r0, r4, #0 add r0, #0xec @@ -88599,7 +88599,7 @@ _0225A6FE: cmp r0, #0 beq _0225A70E add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow _0225A70E: mov r0, #0x4f lsl r0, r0, #2 @@ -88607,7 +88607,7 @@ _0225A70E: cmp r0, #0 beq _0225A71E add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _0225A71E: ldr r0, [sp, #4] add r4, #0x14 @@ -88911,7 +88911,7 @@ MOD11_0225A968: ; 0x0225A968 cmp r0, #0 beq _0225A994 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _0225A994: add r0, r4, #0 bl InitWindow @@ -88925,7 +88925,7 @@ _0225A994: lsl r2, r2, #0x18 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 8c91e781..4ccb62ed 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -445,7 +445,7 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl MOD12_0222E0FC add r0, r4, #0 add r0, #0x34 - bl FUN_02019178 + bl RemoveWindow mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers @@ -737,7 +737,7 @@ MOD12_0222DC80: ; 0x0222DC80 add r1, #0x34 mov r2, #1 mov r3, #0xb - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {pc} @@ -3601,7 +3601,7 @@ MOD12_0222F324: ; 0x0222F324 bl MOD12_0222F98C add r0, r4, #0 add r0, #0x34 - bl FUN_02019178 + bl RemoveWindow mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers @@ -3991,7 +3991,7 @@ MOD12_0222F6B4: ; 0x0222F6B4 add r1, #0x34 mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {pc} .align 2, 0 @@ -5435,7 +5435,7 @@ _02230254: add r5, #0x78 _02230296: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r5, #0x10 cmp r6, #2 @@ -5912,7 +5912,7 @@ MOD12_022306A4: ; 0x022306A4 add r1, #0x78 mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb str r0, [sp] mov r0, #0x1b @@ -5927,7 +5927,7 @@ MOD12_022306A4: ; 0x022306A4 add r4, #0x88 add r1, r4, #0 mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} @@ -7577,7 +7577,7 @@ _022313B0: add r1, sp, #0x34 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -7648,7 +7648,7 @@ _02231454: sub r2, #8 bl FUN_020118C4 add r0, sp, #0x34 - bl FUN_02019178 + bl RemoveWindow str r6, [r5] add r3, sp, #0x28 ldmia r3!, {r0, r1} @@ -9550,7 +9550,7 @@ _022322FE: add r1, sp, #0x3c lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -9633,7 +9633,7 @@ _0223236C: cmp r4, #0 bne _022323D0 add r0, sp, #0x3c - bl FUN_02019178 + bl RemoveWindow _022323D0: str r7, [r5] add r3, sp, #0x30 @@ -10680,7 +10680,7 @@ _02232B9A: cmp r0, #0 beq _02232BAA ldr r0, [sp] - bl FUN_02019178 + bl RemoveWindow _02232BAA: mov r0, #2 lsl r0, r0, #8 @@ -10688,7 +10688,7 @@ _02232BAA: cmp r0, #0 beq _02232BBA add r0, r7, #0 - bl FUN_02019178 + bl RemoveWindow _02232BBA: mov r0, #0x25 lsl r0, r0, #4 @@ -10696,7 +10696,7 @@ _02232BBA: cmp r0, #0 beq _02232BCA add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow _02232BCA: ldr r0, [sp] add r4, #0x14 @@ -10720,7 +10720,7 @@ _02232BEC: cmp r0, #0 beq _02232BF8 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _02232BF8: add r6, r6, #1 add r5, #0x14 @@ -10925,7 +10925,7 @@ MOD12_02232D7C: ; 0x02232D7C cmp r0, #0 beq _02232DA8 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _02232DA8: add r0, r4, #0 bl InitWindow @@ -10939,7 +10939,7 @@ _02232DA8: add r1, r4, #0 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -29914,7 +29914,7 @@ _0223BD1C: add r1, sp, #0x38 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -29982,7 +29982,7 @@ _0223BD74: add r2, #0xf8 bl FUN_020118C4 add r0, sp, #0x38 - bl FUN_02019178 + bl RemoveWindow str r6, [r5] add r3, sp, #0x2c ldmia r3!, {r0, r1} @@ -41472,7 +41472,7 @@ MOD12_022415A8: ; 0x022415A8 add r5, #0x34 _022415D4: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r5, #0x10 cmp r6, #9 @@ -41928,7 +41928,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x34 mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r2, #1 add r1, r4, #0 str r2, [sp] @@ -41943,7 +41943,7 @@ MOD12_022419D0: ; 0x022419D0 ldr r0, [r4, #0x30] add r1, #0x44 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #5 str r0, [sp] mov r0, #8 @@ -41959,7 +41959,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x54 mov r2, #1 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #9 str r0, [sp] mov r0, #8 @@ -41975,7 +41975,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x64 mov r2, #1 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0xd str r1, [sp] mov r0, #8 @@ -41990,7 +41990,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x74 mov r2, #1 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r2, #1 add r1, r4, #0 str r2, [sp] @@ -42005,7 +42005,7 @@ MOD12_022419D0: ; 0x022419D0 ldr r0, [r4, #0x30] add r1, #0x84 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #5 str r0, [sp] mov r0, #8 @@ -42021,7 +42021,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x94 mov r2, #1 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #9 str r0, [sp] mov r0, #8 @@ -42037,7 +42037,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0xa4 mov r2, #1 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0xd str r1, [sp] mov r0, #8 @@ -42052,7 +42052,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, r4, #0 mov r2, #1 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} .align 2, 0 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 7e76f5c5..0e5c39da 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -19503,7 +19503,7 @@ MOD14_021E0E44: ; 0x021E0E44 _021E0E58: ldr r0, [r5, #4] add r0, r0, r4 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r4, #0x10 cmp r6, #4 @@ -19646,7 +19646,7 @@ _021E0F5E: ldr r0, [r5, #8] add r1, r1, r4 add r2, r6, #0 - bl FUN_02019150 + bl AddWindow cmp r7, #3 ldr r0, [r5, #4] beq _021E0F78 @@ -20711,7 +20711,7 @@ MOD14_021E17C4: ; 0x021E17C4 _021E17D2: ldr r0, [r5, #0x18] add r0, r0, r4 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r4, #0x10 cmp r6, #2 @@ -20763,7 +20763,7 @@ _021E1832: ldr r0, [r6] add r1, r1, r5 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r7, r7, #1 add r4, #8 add r5, #0x10 @@ -21643,7 +21643,7 @@ _021E1F04: ldr r0, [r7, #4] add r1, r1, r5 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -21703,7 +21703,7 @@ _021E1F6E: _021E1F78: ldr r0, [r5, #0x10] add r0, r0, r4 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r4, #0x10 cmp r6, #3 @@ -24509,7 +24509,7 @@ MOD14_021E34C0: ; 0x021E34C0 add r6, r0, #0 beq _021E3558 add r0, #0x88 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 add r0, #0x98 ldr r0, [r0] @@ -24680,7 +24680,7 @@ MOD14_021E355C: ; 0x021E355C ldr r0, [r4, #8] add r1, #0x88 mov r2, #4 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x88 mov r1, #0 @@ -28640,7 +28640,7 @@ _021E541E: ldr r0, [r7, #0xc] add r1, r4, #0 add r2, r6, #0 - bl FUN_02019150 + bl AddWindow add r0, r4, #0 bl PutWindowTilemap add r5, r5, #1 @@ -28688,7 +28688,7 @@ _021E547E: cmp r0, #0 beq _021E548E add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021E548E: add r6, r6, #1 add r5, #0x10 @@ -28792,7 +28792,7 @@ _021E554C: add r1, r5, r4 ldr r0, [r0, #0xc] add r2, r7, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, r4 bl PutWindowTilemap add r0, r5, r4 @@ -28825,7 +28825,7 @@ _021E5588: add r0, r5, #0 bl FUN_020192B8 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x84 str r7, [r0] @@ -28978,7 +28978,7 @@ _021E56B4: add r1, r5, r4 ldr r0, [r0, #0xc] add r2, r7, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, r4 bl PutWindowTilemap add r0, r5, r4 @@ -29011,7 +29011,7 @@ _021E56F0: add r0, r5, #0 bl FUN_020192B8 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x84 str r7, [r0] diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 015a582d..b5efbd03 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -4388,13 +4388,13 @@ _021D966A: _021D9674: add r0, r4, #0 add r0, #0xc - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x1c - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x2c - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -4446,7 +4446,7 @@ MOD15_021D9694: ; 0x021D9694 add r0, r6, #0 add r1, #0xc mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x15 str r0, [sp] mov r0, #0x1b @@ -4464,7 +4464,7 @@ MOD15_021D9694: ; 0x021D9694 add r0, r6, #0 add r1, #0x1c mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xf str r0, [sp] mov r0, #8 @@ -4483,7 +4483,7 @@ MOD15_021D9694: ; 0x021D9694 add r1, #0x2c mov r2, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0xc2 str r0, [sp] @@ -5645,7 +5645,7 @@ MOD15_021DA044: ; 0x021DA044 add r4, r2, #0 add r1, sp, #0x10 add r2, r5, #0 - bl FUN_02019150 + bl AddWindow add r0, sp, #0x10 bl PutWindowTilemap add r0, sp, #0x10 @@ -5680,7 +5680,7 @@ MOD15_021DA044: ; 0x021DA044 add r0, r4, #0 bl String_dtor add r0, sp, #0x10 - bl FUN_02019178 + bl RemoveWindow add sp, #0x20 pop {r3, r4, r5, pc} nop @@ -6018,7 +6018,7 @@ _021DA31A: add r1, sp, #0x28 mov r2, #1 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, sp, #0x28 mov r1, #0xf bl FillWindowPixelBuffer @@ -6048,7 +6048,7 @@ _021DA31A: add r0, r5, #0 bl String_dtor add r0, sp, #0x28 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r6, #0x12 add r7, #0xa @@ -6095,7 +6095,7 @@ _021DA3CC: add r0, r4, #0 mov r2, #1 mov r3, #0x22 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #4 mov r1, #0x23 bl String_ctor @@ -6149,7 +6149,7 @@ _021DA452: add r0, r4, #0 bl String_dtor add r0, sp, #0x20 - bl FUN_02019178 + bl RemoveWindow ldr r0, [sp, #0x14] add r0, #0xc8 str r0, [sp, #0x14] @@ -6212,7 +6212,7 @@ _021DA4C2: ldr r0, [sp, #0x14] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r6, #0 mov r1, #0xf bl FillWindowPixelBuffer @@ -6234,7 +6234,7 @@ _021DA4C2: add r0, r6, #0 bl FUN_02019548 add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow add r7, r7, #1 add r5, #0x10 add r4, r4, #4 @@ -6684,7 +6684,7 @@ MOD15_021DA828: ; 0x021DA828 add r1, #0x10 mov r2, #2 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized mov r3, #0 str r3, [sp] mov r1, #0xc @@ -6698,7 +6698,7 @@ MOD15_021DA828: ; 0x021DA828 ldr r0, [r4, #0xc] add r1, #0x20 mov r2, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [r4, #0x30] str r0, [r4, #0x34] @@ -6734,10 +6734,10 @@ _021DA8C6: _021DA8D0: add r0, r4, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl FreeToHeap pop {r4, pc} diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 61e584b4..76c5a9b3 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -3515,7 +3515,7 @@ MOD16_021D8F60: ; 0x021D8F60 ldr r0, [r4] add r1, r4, #4 mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #4 mov r1, #0 bl FillWindowPixelBuffer @@ -3531,7 +3531,7 @@ MOD16_021D8F90: ; 0x021D8F90 add r0, r0, #4 bx r3 nop -_021D8F98: .word FUN_02019178 +_021D8F98: .word RemoveWindow thumb_func_end MOD16_021D8F90 thumb_func_start MOD16_021D8F9C @@ -8445,7 +8445,7 @@ MOD16_021DB388: ; 0x021DB388 add r1, r7, #0 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner add r0, r7, #0 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -51470,7 +51470,7 @@ MOD16_021EF318: ; 0x021EF318 add r1, r4, #0 mov r2, #1 str r3, [sp, #0x10] - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -51488,7 +51488,7 @@ MOD16_021EF358: ; 0x021EF358 add r4, r0, #0 bl FUN_02019570 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 mov r1, #1 bl WindowArray_dtor diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index e761b2d7..236cbc5a 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4687,7 +4687,7 @@ MOD17_021D9918: ; 0x021D9918 str r0, [sp, #0x10] ldr r0, [r5, #0x38] ldr r1, [r5, r1] - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _021D99D4 ; =0x000006A8 mov r1, #0xf ldr r0, [r5, r0] @@ -4906,7 +4906,7 @@ MOD17_021D9B30: ; 0x021D9B30 bl FUN_02019570 ldr r0, _021D9B48 ; =0x000006A8 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} nop _021D9B48: .word 0x000006A8 @@ -11279,7 +11279,7 @@ _021DC898: add r1, r4, #0 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -11814,7 +11814,7 @@ MOD17_021DCC68: ; 0x021DCC68 str r0, [sp, #0x10] ldr r1, [r5] add r0, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5] mov r1, #0xf bl FillWindowPixelBuffer @@ -14260,7 +14260,7 @@ MOD17_021DDF1C: ; 0x021DDF1C ldr r1, [r4, r1] mov r2, #3 mov r3, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 mov r1, #0xa0 mov r2, #0xe @@ -14295,7 +14295,7 @@ MOD17_021DDF84: ; 0x021DDF84 mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index e3fbe038..fed1b86a 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -22711,7 +22711,7 @@ _02244588: mov r0, #0x39 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [sp, #0x2c] mov r1, #7 bl FUN_020178A0 @@ -25585,7 +25585,7 @@ MOD18_02245B1C: ; 0x02245B1C strb r0, [r3, #0xb] add r0, r6, #0 add r2, r7, #0 - bl FUN_02019150 + bl AddWindow ldr r0, [sp, #0x14] ldr r2, [sp, #8] ldr r3, [sp, #0xc] @@ -29549,7 +29549,7 @@ MOD18_02247AA8: ; 0x02247AA8 add r1, #0xc ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02247B54 ; =0x000003D9 add r0, #0xc @@ -29675,7 +29675,7 @@ MOD18_02247BB8: ; 0x02247BB8 add r1, #0xc ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02247C8C ; =0x000003D9 add r0, #0xc @@ -29848,7 +29848,7 @@ MOD18_02247D1C: ; 0x02247D1C add r1, #0xc ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02247DCC ; =0x000003D9 add r0, #0xc @@ -30165,7 +30165,7 @@ MOD18_02247FC0: ; 0x02247FC0 bl FUN_02019570 add r0, r4, #0 add r0, #0xc - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x1c] bl ListMenuItems_dtor mov r0, #0 @@ -31141,7 +31141,7 @@ MOD18_02248784: ; 0x02248784 bl FUN_02019570 add r0, r4, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x18] bl ListMenuItems_dtor mov r0, #0 @@ -31219,7 +31219,7 @@ MOD18_02248820: ; 0x02248820 ldr r0, [r5, #4] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _022488E4 ; =0x000003D9 add r0, #8 @@ -32961,7 +32961,7 @@ MOD18_02249564: ; 0x02249564 ldr r0, [r0, #8] mov r2, #3 mov r3, #0x14 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02249678 ; =0x000003D9 add r0, #0x10 @@ -33399,7 +33399,7 @@ _02249916: _02249936: add r0, r4, #0 add r0, #0x10 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02249968 add r0, r4, #0 @@ -33411,7 +33411,7 @@ _02249936: bl FUN_0201AC68 add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x40] bl ListMenuItems_dtor add r0, r4, #0 @@ -33480,7 +33480,7 @@ _022499A2: add r1, #0x20 mov r2, #3 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02249A5C ; =0x000003D9 add r0, #0x20 @@ -33565,7 +33565,7 @@ MOD18_02249A64: ; 0x02249A64 _02249A8C: add r0, r4, #0 add r0, #0x20 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02249AAA add r0, r4, #0 @@ -33574,7 +33574,7 @@ _02249A8C: bl FUN_0200CCF8 add r4, #0x20 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _02249AAA: pop {r4, pc} thumb_func_end MOD18_02249A64 @@ -33746,7 +33746,7 @@ MOD18_02249BA8: ; 0x02249BA8 ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02249CB8 ; =0x000003D9 add r0, #0x10 @@ -34213,7 +34213,7 @@ MOD18_02249F8C: ; 0x02249F8C ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224A0DC ; =0x000003D9 add r0, #0x10 @@ -34662,7 +34662,7 @@ MOD18_0224A360: ; 0x0224A360 ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224A46C ; =0x000003D9 add r0, #0x10 @@ -35600,7 +35600,7 @@ MOD18_0224AB08: ; 0x0224AB08 ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224AC14 ; =0x000003D9 add r0, #0x10 @@ -36646,7 +36646,7 @@ _0224B374: ldr r0, [r5, #0xc] mov r3, #0x11 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224B460 ; =0x000003D9 add r0, #0x10 @@ -36769,7 +36769,7 @@ MOD18_0224B464: ; 0x0224B464 str r0, [sp, #0x10] ldr r0, [r5, #0xc] ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224B55C ; =0x000003D9 add r0, #0x10 @@ -38480,7 +38480,7 @@ _0224C288: ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224C414 ; =0x000003D9 add r0, #0x10 @@ -39102,7 +39102,7 @@ MOD18_0224C7D4: ; 0x0224C7D4 ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224C934 ; =0x000003D9 add r0, #0x10 @@ -39250,7 +39250,7 @@ MOD18_0224C94C: ; 0x0224C94C push {r4, lr} add r4, r0, #0 add r0, #0x20 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0224C96C add r0, r4, #0 @@ -39259,7 +39259,7 @@ MOD18_0224C94C: ; 0x0224C94C bl FUN_0200CCF8 add r0, r4, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow _0224C96C: add r0, r4, #0 bl MOD18_022498EC @@ -39462,7 +39462,7 @@ MOD18_0224CADC: ; 0x0224CADC sub sp, #0x14 add r4, r0, #0 add r0, #0x20 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0224CB1A mov r0, #0xc @@ -39479,7 +39479,7 @@ MOD18_0224CADC: ; 0x0224CADC ldr r0, [r0, #8] add r1, #0x20 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 ldr r2, _0224CB30 ; =0x000003D9 add r0, #0x20 @@ -39521,7 +39521,7 @@ MOD18_0224CB34: ; 0x0224CB34 ldr r0, [r0, #8] add r1, #0x30 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224CBA8 ; =0x000003D9 add r0, #0x30 @@ -39560,7 +39560,7 @@ MOD18_0224CBAC: ; 0x0224CBAC push {r4, lr} add r4, r0, #0 add r0, #0x30 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0224CBCC add r0, r4, #0 @@ -39569,7 +39569,7 @@ MOD18_0224CBAC: ; 0x0224CBAC bl FUN_0200CCF8 add r4, #0x30 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _0224CBCC: pop {r4, pc} .align 2, 0 @@ -40742,7 +40742,7 @@ MOD18_0224D56C: ; 0x0224D56C bl FUN_02019570 add r0, r4, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow ldr r1, [r4] cmp r1, #0 beq _0224D596 @@ -40811,7 +40811,7 @@ MOD18_0224D5CC: ; 0x0224D5CC add r1, #8 mov r2, #3 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 ldr r2, _0224D684 ; =0x000003D9 add r0, #8 @@ -41315,7 +41315,7 @@ MOD18_0224DA00: ; 0x0224DA00 add r1, #8 mov r2, #3 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224DA9C ; =0x000003D9 add r0, #8 @@ -41370,7 +41370,7 @@ MOD18_0224DAA8: ; 0x0224DAA8 bl FUN_02019570 add r0, r4, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow ldr r1, [r4] cmp r1, #0 beq _0224DACE @@ -41568,7 +41568,7 @@ MOD18_0224DC08: ; 0x0224DC08 bl MOD18_0223D688 add r0, r5, #0 add r0, #8 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0224DC4C mov r0, #0x13 @@ -41586,7 +41586,7 @@ MOD18_0224DC08: ; 0x0224DC08 add r1, #8 mov r2, #3 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized _0224DC4C: add r0, r5, #0 add r0, #8 @@ -41735,7 +41735,7 @@ _0224DD4C: bl FUN_02019570 add r0, r5, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow b _0224DD76 _0224DD6C: add r0, r5, #0 @@ -42303,7 +42303,7 @@ MOD18_0224E0CC: ; 0x0224E0CC ldr r0, [r5] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r3, #1 add r1, r5, #0 str r3, [sp] @@ -42319,7 +42319,7 @@ MOD18_0224E0CC: ; 0x0224E0CC ldr r0, [r5] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized ldr r2, _0224E1FC ; =0x000003D9 add r0, r5, #4 mov r1, #1 @@ -42492,10 +42492,10 @@ MOD18_0224E26C: ; 0x0224E26C ldr r0, [r4, #4] bl FUN_0201AC68 add r0, r4, #4 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x24] bl ListMenuItems_dtor pop {r4, pc} @@ -42761,7 +42761,7 @@ _0224E454: ldr r0, [r5] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r3, #1 add r1, r5, #0 str r3, [sp] @@ -42777,7 +42777,7 @@ _0224E454: ldr r0, [r5] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224E688 ; =0x000003D9 add r0, #8 @@ -43021,10 +43021,10 @@ MOD18_0224E6A8: ; 0x0224E6A8 bl FUN_0201AC68 add r0, r4, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x28] bl ListMenuItems_dtor ldr r0, [r4, #4] diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index 577a6ac9..e114f102 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -668,7 +668,7 @@ MOD24_02254D00: ; 0x02254D00 beq _02254D3C ldr r0, [r4, #4] ldr r2, _02254D40 ; =MOD24_0225510C - bl FUN_02019150 + bl AddWindow mov r2, #0xbe ldr r1, [r4] ldr r0, _02254D44 ; =0x000016E8 @@ -715,7 +715,7 @@ _02254D5C: lsl r2, r2, #6 bl FUN_02089444 ldr r0, [r4, #0x70] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x70] bl FreeToHeap _02254D7E: diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 09600b4b..aeea1e9a 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -631,7 +631,7 @@ _02254CE8: lsl r3, r3, #0x18 ldr r0, [r0, #4] lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 bl PutWindowTilemap ldr r1, [sp, #0x14] @@ -1361,7 +1361,7 @@ _02255288: add r4, #0x3c _0225529C: add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #0x38] add r6, r6, #1 add r4, #0x10 diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index 0c92457f..6159d4c9 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -1096,7 +1096,7 @@ MOD36_0225503C: ; 0x0225503C add r1, r4, #0 ldr r0, [r4, #4] add r1, #0x48 - bl FUN_02019150 + bl AddWindow ldr r0, [r4] mov r2, #0xbe ldr r0, [r0, #8] @@ -1151,7 +1151,7 @@ _022550C4: bl FUN_02089444 add r0, r4, #0 add r0, #0x48 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] mov r1, #6 bl FUN_020178A0 diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index 1fa38d02..e95dcc42 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -822,7 +822,7 @@ MOD38_02254E28: ; 0x02254E28 ldr r0, [r5, #4] add r1, #0x74 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #4 str r0, [sp] mov r2, #6 @@ -840,7 +840,7 @@ MOD38_02254E28: ; 0x02254E28 ldr r0, [r5, #4] add r1, #0x84 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #8 str r0, [sp] mov r2, #6 @@ -858,7 +858,7 @@ MOD38_02254E28: ; 0x02254E28 ldr r0, [r5, #4] add r1, #0x94 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x16 @@ -876,7 +876,7 @@ MOD38_02254E28: ; 0x02254E28 add r1, #0xa4 mov r2, #6 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x74 bl PutWindowTilemap @@ -902,16 +902,16 @@ MOD38_02254EF4: ; 0x02254EF4 push {r4, lr} add r4, r0, #0 add r0, #0x74 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x84 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x94 - bl FUN_02019178 + bl RemoveWindow add r4, #0xa4 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_end MOD38_02254EF4 diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index 892a3c08..59d9a752 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -651,7 +651,7 @@ MOD43_02254CD0: ; 0x02254CD0 add r1, sp, #0x14 mov r2, #6 mov r3, #0x12 - bl FUN_02019064 + bl AddWindowParameterized add r0, sp, #0x14 mov r1, #4 bl FillWindowPixelBuffer @@ -671,7 +671,7 @@ MOD43_02254CD0: ; 0x02254CD0 add r0, sp, #0x14 bl FUN_02019548 add r0, sp, #0x14 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 bl String_dtor _02254D44: diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index 69ade0a7..4fd8db1f 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -921,7 +921,7 @@ MOD47_02254E74: ; 0x02254E74 ldr r0, [r5, #4] add r1, #0x20 mov r2, #6 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x20 bl PutWindowTilemap @@ -961,7 +961,7 @@ MOD47_02254F34: ; 0x02254F34 bl MOD20_022538A0 add r4, r0, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] mov r1, #6 bl FUN_020178A0 diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index 2bd21a96..413c6a77 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -418,7 +418,7 @@ MOD49_02254AD4: ; 0x02254AD4 ldr r0, [r5, #4] add r1, sp, #0x1c mov r2, #6 - bl FUN_02019064 + bl AddWindowParameterized add r0, sp, #0x1c mov r1, #4 bl FillWindowPixelBuffer @@ -455,7 +455,7 @@ MOD49_02254AD4: ; 0x02254AD4 bl String_dtor _02254B94: add r0, sp, #0x1c - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #4] mov r1, #6 bl FUN_02017CD0 diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 4642f8c1..6fa1300b 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -162,7 +162,7 @@ _02254960: add r1, r5, #0 lsr r2, r2, #0x18 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -189,7 +189,7 @@ _02254960: add r1, #0x10 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x10 mov r1, #0 @@ -217,7 +217,7 @@ _02254960: add r1, #0x20 lsr r2, r2, #0x18 mov r3, #0xc - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x20 mov r1, #0 @@ -256,12 +256,12 @@ MOD51_02254A40: ; 0x02254A40 _02254A46: add r0, r5, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x38 cmp r4, #3 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 7049c5bb..3966d71a 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -1320,7 +1320,7 @@ MOD53_021D7FDC: ; 0x021D7FDC add r1, r7, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb6 lsl r0, r0, #2 add r0, r7, r0 @@ -1341,7 +1341,7 @@ MOD53_021D7FDC: ; 0x021D7FDC ldr r0, [r7] add r1, r7, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb2 lsl r0, r0, #2 add r0, r7, r0 @@ -1363,7 +1363,7 @@ MOD53_021D7FDC: ; 0x021D7FDC add r1, r7, r1 mov r2, #1 mov r3, #0x19 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xba lsl r0, r0, #2 add r0, r7, r0 @@ -1412,7 +1412,7 @@ _021D80A8: add r1, r5, #0 mov r2, #4 mov r3, #5 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -1449,7 +1449,7 @@ MOD53_021D8104: ; 0x021D8104 add r5, r6, r0 _021D8110: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #5 @@ -1457,15 +1457,15 @@ _021D8110: mov r0, #0xba lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb2 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb6 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD53_021D8104 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index a0d5ce50..c1c294fc 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -1076,7 +1076,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 add r1, r4, r1 mov r2, #5 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xbe lsl r0, r0, #2 add r0, r4, r0 @@ -1098,7 +1098,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xba lsl r0, r0, #2 add r0, r4, r0 @@ -1120,7 +1120,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 add r1, r4, r1 mov r2, #0 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xc2 lsl r0, r0, #2 ldr r1, [r4, #0x48] @@ -1143,7 +1143,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xa6 lsl r0, r0, #2 add r0, r4, r0 @@ -1205,19 +1205,19 @@ MOD54_021D7EDC: ; 0x021D7EDC mov r0, #0xa6 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xc2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xbe lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xba lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 thumb_func_end MOD54_021D7EDC diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 51b82ddf..43c76968 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -1211,13 +1211,13 @@ MOD55_021D7EE4: ; 0x021D7EE4 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D7F02 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D7F02: mov r0, #0 str r0, [sp] @@ -1233,7 +1233,7 @@ _021D7F02: ldr r0, [r5, #4] add r1, r5, r1 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -1274,11 +1274,11 @@ _021D7F02: add r7, r5, #0 _021D7F76: add r0, r4, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D7F86 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021D7F86: ldr r0, [sp, #0x14] ldr r1, [sp, #0x18] @@ -1302,7 +1302,7 @@ _021D7F86: add r1, r4, #0 mov r2, #3 mov r3, #7 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -1512,11 +1512,11 @@ MOD55_021D8140: ; 0x021D8140 add r5, r6, r0 _021D814C: add r0, r5, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D815C add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _021D815C: add r4, r4, #1 add r5, #0x10 @@ -1528,11 +1528,11 @@ _021D815C: add r4, r6, r0 _021D816C: add r0, r4, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D817C add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021D817C: add r5, r5, #1 add r4, #0x10 @@ -1541,35 +1541,35 @@ _021D817C: mov r0, #0xce lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D819C mov r0, #0xce lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow _021D819C: mov r0, #0xe6 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D81B4 mov r0, #0xe6 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow _021D81B4: mov r0, #0xe2 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D81CC mov r0, #0xe2 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow _021D81CC: pop {r4, r5, r6, pc} .align 2, 0 @@ -2748,13 +2748,13 @@ MOD55_021D8A7C: ; 0x021D8A7C mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D8AEE mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D8AEE: mov r0, #0 str r0, [sp] @@ -2770,7 +2770,7 @@ _021D8AEE: ldr r0, [r5, #4] add r1, r5, r1 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -2805,13 +2805,13 @@ _021D8AEE: mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D8B6C mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D8B6C: mov r0, #0x15 str r0, [sp] @@ -2829,7 +2829,7 @@ _021D8B6C: add r1, r5, r1 mov r2, #3 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 @@ -2878,11 +2878,11 @@ _021D8BEE: str r0, [sp, #0x18] _021D8BF2: add r0, r4, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D8C02 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021D8C02: lsr r2, r6, #0x1f lsl r1, r6, #0x1e @@ -2914,7 +2914,7 @@ _021D8C02: add r1, r4, #0 mov r2, #3 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -3259,13 +3259,13 @@ _021D8F02: mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D8F1A mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D8F1A: mov r1, #9 str r1, [sp] @@ -3288,7 +3288,7 @@ _021D8F1A: add r1, r5, r1 mov r2, #2 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe2 lsl r0, r0, #2 ldr r2, _021D8FDC ; =0x000001D9 @@ -3452,7 +3452,7 @@ _021D9098: mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xea lsl r0, r0, #2 mov r1, #0 @@ -3577,13 +3577,13 @@ MOD55_021D9184: ; 0x021D9184 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D91D6 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D91D6: mov r0, #0 str r0, [sp] @@ -3600,7 +3600,7 @@ _021D91D6: str r0, [sp, #0x10] ldr r0, [r5, #4] mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -3649,13 +3649,13 @@ _021D91D6: mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D9278 mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D9278: mov r1, #0xd str r1, [sp] @@ -3672,7 +3672,7 @@ _021D9278: add r1, r5, r1 mov r2, #3 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 @@ -3738,13 +3738,13 @@ _021D92CE: mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D9338 mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D9338: mov r0, #8 str r0, [sp] @@ -3762,7 +3762,7 @@ _021D9338: add r1, r5, r1 mov r2, #3 mov r3, #9 - bl FUN_02019064 + bl AddWindowParameterized add r2, r5, #0 add r2, #0xb8 ldr r0, [r5, #0x10] @@ -4136,13 +4136,13 @@ _021D9618: mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D969A mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _021D969A: mov r0, #0 str r0, [sp] @@ -4159,7 +4159,7 @@ _021D969A: str r0, [sp, #0x10] ldr r0, [r4, #4] mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 @@ -4215,13 +4215,13 @@ _021D969A: mov r0, #0xe2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D974E mov r0, #0xe2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _021D974E: mov r0, #0x12 str r0, [sp] @@ -4238,7 +4238,7 @@ _021D974E: str r0, [sp, #0x10] ldr r0, [r4, #4] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe2 lsl r0, r0, #2 add r0, r4, r0 @@ -4353,13 +4353,13 @@ _021D9864: mov r0, #0xd2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D987C mov r0, #0xd2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _021D987C: mov r0, #4 str r0, [sp] @@ -4377,7 +4377,7 @@ _021D987C: add r1, r4, r1 mov r2, #3 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd2 lsl r0, r0, #2 add r0, r4, r0 @@ -5354,13 +5354,13 @@ MOD55_021DA0A4: ; 0x021DA0A4 mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021DA0D0 mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021DA0D0: mov r0, #0x13 str r0, [sp] @@ -5378,7 +5378,7 @@ _021DA0D0: ldr r0, [r5, #4] add r1, r5, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized add r2, r5, #0 add r2, #0xb8 ldr r0, [r5, #0x10] @@ -5435,13 +5435,13 @@ MOD55_021DA15C: ; 0x021DA15C lsl r0, r0, #2 add r0, r5, r0 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021DA17C mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021DA17C: mov r0, #0x13 str r0, [sp] @@ -5459,7 +5459,7 @@ _021DA17C: ldr r0, [r5, #4] add r1, r5, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized add r2, r5, #0 add r2, #0xb8 ldr r0, [r5, #0x10] diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index ac016f49..06c4e0d6 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -1306,7 +1306,7 @@ MOD56_022128A4: ; 0x022128A4 mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022128CE mov r0, #0xd7 @@ -1317,7 +1317,7 @@ MOD56_022128A4: ; 0x022128A4 mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022128CE: mov r0, #1 str r0, [sp] @@ -1337,7 +1337,7 @@ _022128CE: add r1, r4, r1 mov r2, #3 mov r3, #5 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 @@ -1391,57 +1391,57 @@ MOD56_0221295C: ; 0x0221295C mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02212978 mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02212978: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02212990 mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02212990: mov r0, #0xe7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022129A8 mov r0, #0xe7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022129A8: mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022129C0 mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022129C0: mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022129D8 mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022129D8: add r0, r4, #0 add r0, #0xb4 @@ -1466,13 +1466,13 @@ _02212A00: mov r0, #0xdb lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02212A18 mov r0, #0xdb lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02212A18: pop {r4, pc} .align 2, 0 @@ -1772,7 +1772,7 @@ _02212C74: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow cmp r6, #0 bne _02212CB4 add r0, r5, #0 @@ -1832,7 +1832,7 @@ _02212CEC: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow cmp r6, #0 bne _02212D44 ldr r0, [r5] @@ -1900,7 +1900,7 @@ _02212D74: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow cmp r6, #0 bne _02212DC6 mov r1, #0x3b @@ -2272,7 +2272,7 @@ MOD56_02213048: ; 0x02213048 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0221307C mov r0, #0xdb @@ -2283,7 +2283,7 @@ MOD56_02213048: ; 0x02213048 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _0221307C: mov r0, #0x3b mov r1, #8 @@ -2329,7 +2329,7 @@ MOD56_022130A4: ; 0x022130A4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022130D8 mov r0, #0xdb @@ -2340,7 +2340,7 @@ MOD56_022130A4: ; 0x022130A4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _022130D8: add r0, r5, #0 mov r1, #0x33 @@ -2473,7 +2473,7 @@ MOD56_02213194: ; 0x02213194 mov r0, #0xdf lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 add r0, #0xb4 mov r1, #0 @@ -2740,7 +2740,7 @@ _022133DA: str r1, [r5, r0] sub r0, #0x44 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02213412 mov r0, #0xdb @@ -2751,7 +2751,7 @@ _022133DA: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02213412: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -2774,7 +2774,7 @@ MOD56_0221341C: ; 0x0221341C mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0221344C add r0, r6, #0 @@ -3508,7 +3508,7 @@ MOD56_02213990: ; 0x02213990 mov r0, #0xdf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022139D0 mov r0, #0xdf @@ -3519,7 +3519,7 @@ MOD56_02213990: ; 0x02213990 mov r0, #0xdf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _022139D0: mov r0, #5 str r0, [sp] @@ -3539,7 +3539,7 @@ _022139D0: add r1, r5, r1 mov r2, #3 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized ldr r6, _02213A3C ; =0x022163F4 add r3, sp, #0x14 add r2, r3, #0 @@ -3584,7 +3584,7 @@ MOD56_02213A40: ; 0x02213A40 mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02213A6A mov r0, #0xd3 @@ -3595,7 +3595,7 @@ MOD56_02213A40: ; 0x02213A40 mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02213A6A: mov r0, #0x15 str r0, [sp] @@ -3614,7 +3614,7 @@ _02213A6A: add r1, r4, r1 mov r2, #3 mov r3, #7 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} thumb_func_end MOD56_02213A40 @@ -3648,7 +3648,7 @@ MOD56_02213A94: ; 0x02213A94 mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02213AF0 mov r0, #0xd7 @@ -3659,7 +3659,7 @@ MOD56_02213A94: ; 0x02213A94 mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02213AF0: add r0, r5, #0 add r0, #0xb0 @@ -3669,7 +3669,7 @@ _02213AF0: mov r0, #0xdf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xb4 mov r1, #0 @@ -3707,7 +3707,7 @@ _02213B2C: add r1, r5, r1 mov r2, #3 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 @@ -4093,7 +4093,7 @@ _02213E5C: mov r0, #0xdf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xb4 mov r1, #0 @@ -5082,7 +5082,7 @@ _02214602: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02214642 mov r0, #0xe3 @@ -5093,7 +5093,7 @@ _02214602: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02214642: mov r0, #9 str r0, [sp] @@ -5113,7 +5113,7 @@ _02214642: add r1, r5, r1 mov r2, #2 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe3 lsl r0, r0, #2 ldr r2, _022146C8 ; =0x000001D9 @@ -5249,7 +5249,7 @@ _0221476E: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xbc mov r2, #0xf7 @@ -5290,7 +5290,7 @@ _022147CE: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xbc mov r2, #0xf7 @@ -5363,7 +5363,7 @@ _02214868: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0221488C mov r0, #0xe3 @@ -5374,7 +5374,7 @@ _02214868: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _0221488C: mov r1, #9 str r1, [sp] @@ -5399,7 +5399,7 @@ _0221488C: add r1, r5, r1 mov r2, #2 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe3 lsl r0, r0, #2 ldr r2, _0221491C ; =0x000001D9 @@ -5510,7 +5510,7 @@ _02214994: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r3, _022149D4 ; =0x000003DE add r0, r5, #0 add r2, r5, r3 @@ -5697,7 +5697,7 @@ _02214ADC: add r1, r5, r1 mov r2, #2 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe3 lsl r0, r0, #2 ldr r2, _02214BB8 ; =0x000001D9 @@ -6068,7 +6068,7 @@ _02214DEC: mov r0, #0xe3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0xbc mov r1, #0 @@ -6983,7 +6983,7 @@ MOD56_022154BC: ; 0x022154BC mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02215532 mov r0, #0xe7 @@ -6994,7 +6994,7 @@ MOD56_022154BC: ; 0x022154BC mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02215532: mov r0, #2 str r0, [sp] @@ -7014,7 +7014,7 @@ _02215532: ldr r0, [r0] add r1, r5, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 @@ -7540,7 +7540,7 @@ MOD56_022159B0: ; 0x022159B0 mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xc0 ldr r0, [r0] @@ -8169,7 +8169,7 @@ MOD56_02215EA4: ; 0x02215EA4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02215EE0 mov r0, #0xdb @@ -8180,12 +8180,12 @@ MOD56_02215EA4: ; 0x02215EA4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02215EE0: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02215F04 mov r0, #0xcf @@ -8196,7 +8196,7 @@ _02215EE0: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02215F04: mov r0, #0x5e lsl r0, r0, #2 @@ -8237,7 +8237,7 @@ _02215F30: ldr r0, [r0] add r1, r5, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized cmp r6, #0 beq _02215F70 add r0, r5, #0 @@ -8320,7 +8320,7 @@ MOD56_02215FF4: ; 0x02215FF4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02216024 mov r0, #0xdb @@ -8331,12 +8331,12 @@ MOD56_02215FF4: ; 0x02215FF4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02216024: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02216048 mov r0, #0xcf @@ -8347,7 +8347,7 @@ _02216024: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02216048: mov r3, #4 str r3, [sp] @@ -8366,7 +8366,7 @@ _02216048: ldr r0, [r0] add r1, r5, r1 mov r2, #2 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r2, #0x56 add r0, #0xd0 @@ -8480,7 +8480,7 @@ _02216154: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02216178 mov r0, #0xcf @@ -8491,7 +8491,7 @@ _02216154: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02216178: pop {r4, pc} .align 2, 0 @@ -8663,7 +8663,7 @@ _022162B8: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022162DC mov r0, #0xcf @@ -8674,7 +8674,7 @@ _022162B8: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022162DC: 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 a9163534..cb997572 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -2641,7 +2641,7 @@ _021D89A6: add r0, r5, #0 add r1, r6, r1 add r2, r7, r2 - bl FUN_02019150 + bl AddWindow add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -2666,7 +2666,7 @@ MOD57_021D89D4: ; 0x021D89D4 _021D89DA: lsl r0, r4, #4 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 99967607..afa5321b 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -1072,7 +1072,7 @@ MOD58_021DA30C: ; 0x021DA30C add r1, r5, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb5 lsl r0, r0, #2 add r0, r5, r0 @@ -1092,7 +1092,7 @@ MOD58_021DA30C: ; 0x021DA30C ldr r0, [r5] add r1, r5, r1 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb1 lsl r0, r0, #2 add r0, r5, r0 @@ -1113,7 +1113,7 @@ MOD58_021DA30C: ; 0x021DA30C add r1, r5, r1 mov r2, #1 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb9 lsl r0, r0, #2 add r0, r5, r0 @@ -1179,7 +1179,7 @@ _021DA3C2: ldr r0, [r5] add r1, r5, r1 mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, [r5, #0x30] mov r0, #1 mov r2, #0 @@ -1231,7 +1231,7 @@ _021DA46A: add r1, r4, #0 mov r2, #4 mov r3, #5 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -1269,7 +1269,7 @@ MOD58_021DA4CC: ; 0x021DA4CC add r5, r6, r0 _021DA4D8: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #5 @@ -1277,19 +1277,19 @@ _021DA4D8: mov r0, #0xbd lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb9 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb1 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb5 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, r5, r6, pc} thumb_func_end MOD58_021DA4CC diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index a48cd966..6781b0fb 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -873,7 +873,7 @@ _021D7C5E: ldr r0, [r5, #0x18] ldr r2, _021D7D5C ; =0x021D9DB8 add r1, #0x1c - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x20 @@ -974,7 +974,7 @@ _021D7D36: _021D7D46: add r0, r5, #0 add r0, #0x1c - bl FUN_02019178 + bl RemoveWindow mov r0, #0 str r0, [r5, #0x50] mov r4, #1 @@ -1048,7 +1048,7 @@ _021D7DC4: add r1, r5, #0 ldr r0, [r5, #0x18] add r1, #0x30 - bl FUN_02019150 + bl AddWindow ldr r1, [r5] add r0, r6, #0 bl ListMenuItems_ctor @@ -1129,7 +1129,7 @@ _021D7E66: bl FUN_0200CCF8 add r0, r5, #0 add r0, #0x30 - bl FUN_02019178 + bl RemoveWindow mov r1, #0 ldr r0, [r5, #0x40] add r2, r1, #0 @@ -1225,7 +1225,7 @@ _021D7EFA: ldr r0, [r4, #0x18] add r1, #0x1c add r2, sp, #0x14 - bl FUN_02019150 + bl AddWindow add r1, r5, #0 mov r0, #0xc0 str r0, [sp] @@ -1264,7 +1264,7 @@ _021D7F7C: add r1, r4, #0 ldr r0, [r4, #0x18] add r1, #0x1c - bl FUN_02019150 + bl AddWindow add r1, r5, #0 mov r0, #0xc0 str r0, [sp] @@ -1334,7 +1334,7 @@ _021D8016: b _021D803C _021D8028: add r0, #0x1c - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x18] add r1, r5, #0 bl FUN_02018744 diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index e4325d83..7561b354 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -525,7 +525,7 @@ _021D9C9A: ldr r0, [r4, #4] ldr r2, _021D9D6C ; =0x021DA04C add r1, #0x10 - bl FUN_02019150 + bl AddWindow add r1, r5, #0 mov r0, #1 lsl r0, r0, #8 @@ -597,7 +597,7 @@ _021D9D4A: _021D9D50: add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] mov r1, #2 bl FUN_02018744 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index a30f563f..129f4bed 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -844,7 +844,7 @@ MOD60_021D7BA4: ; 0x021D7BA4 ldr r0, [r4, #0x14] add r1, #0x2c add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #3 str r0, [sp] mov r0, #0x1e @@ -860,7 +860,7 @@ MOD60_021D7BA4: ; 0x021D7BA4 ldr r0, [r4, #0x14] add r1, #0x3c add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -876,7 +876,7 @@ MOD60_021D7BA4: ; 0x021D7BA4 add r1, #0x4c mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] ldr r0, [r4] @@ -984,7 +984,7 @@ _021D7CF0: add r0, r5, r4 bl FUN_020192B8 add r0, r5, r4 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #1 lsl r0, r0, #0x10 lsr r6, r0, #0x10 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index d13a3071..d00ef443 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -1402,7 +1402,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 str r0, [sp, #0x10] ldr r0, [r5, #0x18] add r1, #0x44 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #8 str r0, [sp] mov r0, #0x1a @@ -1417,7 +1417,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 ldr r0, [r5, #0x18] add r1, #0x54 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd str r0, [sp] mov r0, #0x1a @@ -1432,7 +1432,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 ldr r0, [r5, #0x18] add r1, #0x64 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x14 str r0, [sp] mov r0, #8 @@ -1447,7 +1447,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 ldr r0, [r5, #0x18] add r1, #0x74 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x14 str r0, [sp] mov r0, #8 @@ -1462,7 +1462,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 ldr r0, [r5, #0x18] add r1, #0x84 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -1477,7 +1477,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 add r1, #0x94 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r4, #0 add r5, #0x44 add r6, r4, #0 @@ -1515,7 +1515,7 @@ _021D80FC: add r0, r5, #0 bl FUN_02019570 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #6 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 26b7d486..7b8b5bb6 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1162,7 +1162,7 @@ MOD62_0222DE00: ; 0x0222DE00 add r1, sp, #0x1c mov r2, #0xa mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -1238,7 +1238,7 @@ MOD62_0222DE00: ; 0x0222DE00 ldr r0, [sp, #0x14] bl DestroyMsgData add r0, sp, #0x1c - bl FUN_02019178 + bl RemoveWindow add sp, #0x5c pop {r4, r5, r6, r7, pc} nop @@ -1954,7 +1954,7 @@ _0222E442: ldr r1, [sp, #0x18] lsr r2, r2, #0x18 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized add r0, r7, #0 mov r1, #0x35 bl ListMenuItems_ctor @@ -3323,7 +3323,7 @@ MOD62_0222EEE0: ; 0x0222EEE0 str r0, [sp, #0x10] add r0, r7, #0 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized mov r1, #1 add r0, r5, #0 add r2, r1, #0 @@ -3374,7 +3374,7 @@ MOD62_0222EF44: ; 0x0222EF44 lsr r0, r0, #0x10 str r0, [sp, #0x10] add r0, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0xf bl FillWindowPixelBuffer @@ -3675,7 +3675,7 @@ _0222F1F2: add r0, r5, #0 bl FUN_02019570 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xb @@ -4615,7 +4615,7 @@ MOD62_0222F904: ; 0x0222F904 bl ListMenuItems_dtor add r4, #0xfc add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow mov r0, #1 pop {r4, pc} .align 2, 0 @@ -5105,7 +5105,7 @@ _0222FD10: bne _0222FD4C add r0, r4, #0 add r0, #0xec - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl MOD62_0222ED04 add r0, r4, #0 @@ -6701,7 +6701,7 @@ _022309DC: mov r0, #0x43 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xf7 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -7036,7 +7036,7 @@ _02230CEC: bne _02230D26 add r0, r4, #0 add r0, #0xec - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl MOD62_0222ED04 add r0, r4, #0 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index 4f086525..4e6e6d0b 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -2054,7 +2054,7 @@ _021D844C: ldr r2, _021D85D0 ; =MOD63_021DB9A0 add r0, r5, #0 add r1, #0xac - bl FUN_02019150 + bl AddWindow mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -2183,7 +2183,7 @@ MOD63_021D8644: ; 0x021D8644 add r0, r2, #0 bx r3 .align 2, 0 -_021D864C: .word FUN_02019178 +_021D864C: .word RemoveWindow thumb_func_end MOD63_021D8644 thumb_func_start MOD63_021D8650 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 0c56aa30..82afd6d8 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -678,7 +678,7 @@ MOD64_021D7A54: ; 0x021D7A54 ldr r0, [r0] ldr r1, [r1] mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x98 ldr r0, [r0] @@ -724,7 +724,7 @@ MOD64_021D7AEC: ; 0x021D7AEC add r4, r0, #0 add r0, #0x98 ldr r0, [r0] - bl FUN_02019178 + bl RemoveWindow add r4, #0x98 ldr r0, [r4] bl FreeToHeap @@ -3445,7 +3445,7 @@ _021D8F52: ldr r1, [r1] mov r2, #3 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _021D8FA8 ; =0x0001020A mov r2, #5 str r0, [sp] @@ -3476,7 +3476,7 @@ _021D8FB2: add r0, r5, #0 add r0, #0x9c ldr r0, [r0] - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0x9c ldr r0, [r0] diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 1050ff4e..e14e5ac9 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -995,7 +995,7 @@ _021D7C68: ldrb r2, [r4] ldrb r3, [r4, #1] ldr r0, [r6, #0x24] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -1022,7 +1022,7 @@ _021D7CB0: add r0, r5, #0 bl FUN_02019570 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xd @@ -3265,7 +3265,7 @@ MOD65_021D8E68: ; 0x021D8E68 ldr r0, [r4, #0x68] ldr r2, _021D8EAC ; =0x021DA354 add r1, #0x6c - bl FUN_02019150 + bl AddWindow add r0, r4, #0 add r0, #0x6c mov r1, #0 @@ -3299,7 +3299,7 @@ MOD65_021D8EB0: ; 0x021D8EB0 bl FUN_02019570 add r4, #0x6c add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_end MOD65_021D8EB0 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index f8cb1081..84391ba0 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -2147,7 +2147,7 @@ MOD66_021D8554: ; 0x021D8554 ldr r0, [r5, #0x28] add r1, #0x28 mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #3 str r0, [sp] mov r0, #0x15 @@ -2162,7 +2162,7 @@ MOD66_021D8554: ; 0x021D8554 str r0, [sp, #0x10] ldr r0, [r5, #0x28] mov r3, #9 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #3 str r0, [sp] mov r0, #0x1c @@ -2177,7 +2177,7 @@ MOD66_021D8554: ; 0x021D8554 str r0, [sp, #0x10] ldr r0, [r5, #0x28] mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #8 str r0, [sp] mov r0, #0x1c @@ -2192,7 +2192,7 @@ MOD66_021D8554: ; 0x021D8554 add r1, #0x58 mov r2, #4 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #0xa @@ -2208,7 +2208,7 @@ MOD66_021D8554: ; 0x021D8554 add r1, #0x68 mov r2, #4 mov r3, #0xb - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x28 mov r1, #0 @@ -2262,7 +2262,7 @@ MOD66_021D8670: ; 0x021D8670 _021D8678: lsl r0, r5, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index c39f5c7d..d5d4a3d4 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -1077,7 +1077,7 @@ _021D7D6A: ldr r0, [r7] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -1095,7 +1095,7 @@ MOD67_021D7D84: ; 0x021D7D84 add r5, r0, #4 _021D7D8A: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #4 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 6e79c8cf..16c68965 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -482,7 +482,7 @@ _021D78D2: ldr r0, [r7] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -500,7 +500,7 @@ MOD68_021D78EC: ; 0x021D78EC mov r4, #0 _021D78F2: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xc diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index e2fe9788..5f8bd400 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -789,7 +789,7 @@ MOD69_0222DBAC: ; 0x0222DBAC str r2, [sp, #0x10] ldr r0, [r4, #0x10] add r1, #0x14 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x14 mov r1, #0 @@ -900,7 +900,7 @@ MOD69_0222DD18: ; 0x0222DD18 str r0, [r2] add r0, r4, #0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] mov r1, #1 bl FUN_020178A0 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 2f9e4ae0..e8b68f04 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -957,7 +957,7 @@ MOD70_021D7C2C: ; 0x021D7C2C ldr r0, [r5, #0x10] add r1, #0x14 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x1e @@ -976,7 +976,7 @@ MOD70_021D7C2C: ; 0x021D7C2C ldr r0, [r5, #0x10] add r1, #0x24 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x14 bl PutWindowTilemap @@ -998,7 +998,7 @@ MOD70_021D7C98: ; 0x021D7C98 add r5, #0x14 _021D7CA0: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #2 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index d01ea938..ed4eef41 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -4377,7 +4377,7 @@ _0222F9E4: bl FUN_0200CCF8 ldr r0, _0222FA30 ; =0x00003684 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xda lsl r0, r0, #6 mov r1, #0 @@ -6624,7 +6624,7 @@ MOD71_02230C48: ; 0x02230C48 add r5, r1, #0 str r0, [sp, #0x14] str r2, [sp, #0x10] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -6642,7 +6642,7 @@ MOD71_02230C48: ; 0x02230C48 ldr r0, [sp, #0x14] add r1, #0x10 mov r3, #0x14 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x10 mov r1, #0 @@ -6662,7 +6662,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, #0x60 mov r2, #1 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x60 mov r1, #0 @@ -6701,7 +6701,7 @@ MOD71_02230C48: ; 0x02230C48 ldr r0, [sp, #0x14] add r1, r5, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x15 lsl r0, r0, #4 add r0, r5, r0 @@ -6723,7 +6723,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, r5, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x16 lsl r0, r0, #4 add r0, r5, r0 @@ -6745,7 +6745,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, r5, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x17 lsl r0, r0, #4 add r0, r5, r0 @@ -6766,7 +6766,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, r5, r1 mov r2, #0 mov r3, #0x14 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #6 lsl r0, r0, #6 add r0, r5, r0 @@ -6787,7 +6787,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, r5, r1 mov r2, #0 mov r3, #0x14 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x19 lsl r0, r0, #4 add r0, r5, r0 @@ -6820,7 +6820,7 @@ _02230DE2: add r1, r5, r1 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x18] mov r1, #0 add r0, r5, r0 @@ -6858,7 +6858,7 @@ _02230E2C: ldr r0, [sp, #0x14] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, r7 mov r1, #0 bl FillWindowPixelBuffer @@ -6884,7 +6884,7 @@ _02230E8E: add r0, r5, #7 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r5, r5, #1 cmp r5, #0xe blt _02230E8E @@ -6894,38 +6894,38 @@ _02230EA0: add r0, #0x1a lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r5, r5, #1 cmp r5, #8 blt _02230EA0 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x60 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x15 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x16 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x17 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #6 lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x19 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r3, r4, r5, pc} thumb_func_end MOD71_02230E88 @@ -7097,7 +7097,7 @@ MOD71_02231018: ; 0x02231018 add r1, r4, #0 mov r2, #0 mov r3, #0x13 - bl FUN_02019064 + bl AddWindowParameterized ldr r2, _0223108C ; =0x000001F7 add r0, r4, #0 mov r1, #0 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index c1b87cfb..8855a586 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -4966,7 +4966,7 @@ MOD73_021D9BE0: ; 0x021D9BE0 ldr r0, [r5, #4] ldr r1, [r5, #8] add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd str r0, [sp] mov r0, #0x14 @@ -4981,7 +4981,7 @@ MOD73_021D9BE0: ; 0x021D9BE0 ldr r1, [r5, #0xc] mov r2, #4 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #8] mov r1, #0xf bl FillWindowPixelBuffer @@ -5017,12 +5017,12 @@ MOD73_021D9C7C: ; 0x021D9C7C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #8] mov r1, #1 bl WindowArray_dtor ldr r0, [r4, #0xc] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0xc] mov r1, #1 bl WindowArray_dtor @@ -5950,7 +5950,7 @@ _021DA2FA: ldr r1, [r4, #8] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r4, #8] mov r1, #0 bl FillWindowPixelBuffer @@ -5973,7 +5973,7 @@ MOD73_021DA354: ; 0x021DA354 mov r6, #1 _021DA35C: ldr r0, [r5, #8] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #8] add r1, r6, #0 bl WindowArray_dtor diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 75afef9d..9bb33e16 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -768,7 +768,7 @@ _021D7A9A: ldr r0, [r6, #0x10] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -787,7 +787,7 @@ _021D7AC0: ldr r0, [r6, #0x10] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -827,7 +827,7 @@ _021D7B08: add r0, r5, #0 bl FUN_02019570 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, r6 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index a425935f..8e0b0738 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -7424,7 +7424,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, r4, #4 mov r2, #2 mov r3, #0xe - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x12 str r0, [sp] mov r0, #0x20 @@ -7440,7 +7440,7 @@ MOD75_021EA604: ; 0x021EA604 ldr r0, [r4] add r1, #0x14 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd str r0, [sp] mov r0, #0x24 @@ -7455,7 +7455,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x24 mov r2, #2 mov r3, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0xe @@ -7471,7 +7471,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x34 mov r2, #0 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0xd @@ -7487,7 +7487,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x44 mov r2, #0 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb str r0, [sp] mov r0, #0xc @@ -7503,7 +7503,7 @@ MOD75_021EA604: ; 0x021EA604 ldr r0, [r4] add r1, #0x54 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -7519,7 +7519,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x64 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd str r0, [sp] mov r0, #0xc @@ -7535,7 +7535,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x74 mov r2, #0 mov r3, #0x13 - bl FUN_02019064 + bl AddWindowParameterized mov r3, #1 add r1, r4, #0 str r3, [sp] @@ -7550,7 +7550,7 @@ MOD75_021EA604: ; 0x021EA604 str r0, [sp, #0x10] ldr r0, [r4] mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #7 @@ -7566,7 +7566,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x94 mov r2, #0 mov r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xc str r0, [sp] mov r0, #0xb @@ -7582,7 +7582,7 @@ MOD75_021EA604: ; 0x021EA604 add r4, #0xa4 add r1, r4, #0 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} nop @@ -7604,7 +7604,7 @@ MOD75_021EA7A0: ; 0x021EA7A0 _021EA7A6: lsl r0, r4, #4 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -8850,7 +8850,7 @@ MOD75_021EB130: ; 0x021EB130 ldr r0, [r5] add r1, #0xb4 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #4 str r0, [sp, #0x14] b _021EB1B0 @@ -8875,7 +8875,7 @@ _021EB180: add r1, #0xb4 mov r2, #0 mov r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #3 str r0, [sp, #0x14] _021EB1B0: @@ -9115,7 +9115,7 @@ _021EB37A: bl ListMenuItems_dtor add r0, r5, #0 add r0, #0xb4 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0x14 mov r1, #0 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 06e6303e..d3de7545 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -464,7 +464,7 @@ _021D78A8: ldr r0, [r7, #4] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -498,7 +498,7 @@ MOD76_021D78E8: ; 0x021D78E8 add r5, #8 _021D78F0: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xf diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 0b432b90..52e30c10 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -1422,7 +1422,7 @@ MOD77_021D7FAC: ; 0x021D7FAC ldr r0, [r5, r1] add r1, r1, #4 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x20 @@ -1555,7 +1555,7 @@ MOD77_021D7FAC: ; 0x021D7FAC ldr r0, [r5, r1] add r1, #0x24 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x20 @@ -1618,10 +1618,10 @@ MOD77_021D8248: ; 0x021D8248 add r4, r0, #0 ldr r0, _021D8288 ; =0x0000C034 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _021D828C ; =0x0000C014 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _021D8290 ; =0x0000C010 mov r1, #2 ldr r0, [r4, r0] @@ -1764,7 +1764,7 @@ MOD77_021D8370: ; 0x021D8370 add r6, r3, #0 ldr r0, [r5, r0] str r1, [sp] - bl FUN_02019150 + bl AddWindow ldrh r0, [r6, #0x10] ldr r1, [r5] bl ListMenuItems_ctor @@ -1844,7 +1844,7 @@ MOD77_021D8418: ; 0x021D8418 str r3, [sp, #4] ldr r7, [sp, #0x44] ldr r6, [sp, #0x48] - bl FUN_02019150 + bl AddWindow ldr r2, [sp, #0x40] ldr r3, [r5] mov r0, #0 @@ -1932,7 +1932,7 @@ MOD77_021D84D8: ; 0x021D84D8 bl FUN_0200CCF8 ldr r0, _021D8504 ; =0x0000C024 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _021D8508 ; =0x0000C054 mov r1, #0 ldr r0, [r4, r0] @@ -1968,7 +1968,7 @@ MOD77_021D8510: ; 0x021D8510 add r1, #0x34 ldr r2, _021D85C8 ; =0x021D8F28 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x30 @@ -2057,7 +2057,7 @@ MOD77_021D85E0: ; 0x021D85E0 add r1, #0x34 ldr r2, _021D868C ; =0x021D8F28 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x30 @@ -2130,7 +2130,7 @@ MOD77_021D8698: ; 0x021D8698 bl FUN_0200CCF8 ldr r0, _021D86B0 ; =0x0000C044 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 _021D86B0: .word 0x0000C044 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index db04b6c2..0af56956 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -2947,7 +2947,7 @@ MOD80_0222EC98: ; 0x0222EC98 ldr r0, [r7, #4] add r1, r7, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0222ED88 ; =0x00000EB8 mov r1, #0 add r0, r7, r0 @@ -2989,7 +2989,7 @@ _0222ECF2: add r1, r5, #0 mov r2, #1 mov r3, #9 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -3015,7 +3015,7 @@ _0222ECF2: ldr r0, [r7, #4] add r1, r7, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0222ED94 ; =0x00000E98 mov r1, #0xf add r0, r7, r0 @@ -3035,7 +3035,7 @@ _0222ECF2: add r1, r7, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0222ED98 ; =0x00000FB8 mov r1, #0xf add r0, r7, r0 @@ -3056,23 +3056,23 @@ MOD80_0222ED9C: ; 0x0222ED9C add r6, r0, #0 ldr r0, _0222EDD0 ; =0x00000FB8 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0222EDD4 ; =0x00000E98 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0222EDD8 ; =0x00000ED8 mov r4, #0 add r5, r6, r0 _0222EDB6: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #3 blt _0222EDB6 ldr r0, _0222EDDC ; =0x00000EB8 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, r5, r6, pc} nop _0222EDD0: .word 0x00000FB8 @@ -4245,7 +4245,7 @@ MOD80_0222F6EC: ; 0x0222F6EC ldr r0, [r0, #4] add r1, r1, r2 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _0222F7A8 ; =0x00000E98 ldr r0, [sp, #0x14] add r0, r0, r1 @@ -4268,7 +4268,7 @@ MOD80_0222F6EC: ; 0x0222F6EC add r1, r1, r2 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _0222F7B0 ; =0x00000F08 ldr r0, [sp, #0x14] ldr r4, _0222F7B4 ; =0x02236FE4 @@ -4300,7 +4300,7 @@ _0222F754: ldr r0, [r0, #4] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -4328,16 +4328,16 @@ MOD80_0222F7B8: ; 0x0222F7B8 add r5, r0, #0 ldr r0, _0222F7E4 ; =0x00000E98 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0222F7E8 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0222F7EC ; =0x00000F08 mov r4, #0 add r5, r5, r0 _0222F7D2: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xa @@ -5501,7 +5501,7 @@ MOD80_02230128: ; 0x02230128 ldr r0, [r0, #4] add r1, r1, r2 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _022301E4 ; =0x00000E98 ldr r0, [sp, #0x14] add r0, r0, r1 @@ -5524,7 +5524,7 @@ MOD80_02230128: ; 0x02230128 add r1, r1, r2 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _022301EC ; =0x00000F08 ldr r0, [sp, #0x14] ldr r4, _022301F0 ; =0x022370F4 @@ -5556,7 +5556,7 @@ _02230190: ldr r0, [r0, #4] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -5584,16 +5584,16 @@ MOD80_022301F4: ; 0x022301F4 add r5, r0, #0 ldr r0, _02230220 ; =0x00000E98 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02230224 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02230228 ; =0x00000F08 mov r4, #0 add r5, r5, r0 _0223020E: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xa @@ -6511,7 +6511,7 @@ MOD80_02230944: ; 0x02230944 ldr r0, [r0, #4] add r1, r1, r2 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _02230A6C ; =0x00000EB8 ldr r0, [sp, #0x14] add r0, r0, r1 @@ -6546,7 +6546,7 @@ MOD80_02230944: ; 0x02230944 ldr r0, [r0, #4] add r1, r1, r2 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _02230A74 ; =0x00000E98 ldr r0, [sp, #0x14] add r0, r0, r1 @@ -6579,7 +6579,7 @@ _022309D2: lsl r3, r3, #0x18 ldr r0, [r0, #4] lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -6620,7 +6620,7 @@ _02230A20: lsl r3, r3, #0x18 ldr r0, [r0, #4] lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x18] mov r1, #0 add r0, r0, r7 @@ -6648,16 +6648,16 @@ MOD80_02230A88: ; 0x02230A88 add r5, r0, #0 ldr r0, _02230AB4 ; =0x00000E98 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02230AB8 ; =0x00000EB8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02230ABC ; =0x00000F08 mov r4, #0 add r5, r5, r0 _02230AA2: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #8 @@ -7520,7 +7520,7 @@ MOD80_0223113C: ; 0x0223113C add r1, r4, r1 mov r2, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022311BC ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -7539,7 +7539,7 @@ MOD80_0223113C: ; 0x0223113C add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022311C4 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 @@ -7657,10 +7657,10 @@ _02231266: bl FUN_0200D0E0 ldr r0, _022312C0 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _022312C8 ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _022312BC ; =0x000005DC bl FUN_020054C8 mov r0, #0 @@ -7794,10 +7794,10 @@ _0223138C: bl FUN_0200CCF8 ldr r0, _02231474 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223146C ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02231478 ; =0x00000B22 strh r5, [r4, r0] mov r0, #0 @@ -7909,7 +7909,7 @@ MOD80_02231490: ; 0x02231490 add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022314E8 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -7994,7 +7994,7 @@ _0223154A: bl FUN_0200D0E0 ldr r0, _022315F8 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02231600 ; =0x000005DC bl FUN_020054C8 mov r0, #0 @@ -8015,7 +8015,7 @@ _0223158E: bl FUN_0200CCF8 ldr r0, _022315F8 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02231600 ; =0x000005DC bl FUN_020054C8 ldr r0, _02231604 ; =0x00000B24 @@ -8085,7 +8085,7 @@ MOD80_02231614: ; 0x02231614 add r1, r4, r1 mov r2, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0223166C ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -8167,7 +8167,7 @@ _022316D0: bl FUN_0200D0E0 ldr r0, _02231774 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223177C ; =0x000005DC bl FUN_020054C8 mov r0, #0 @@ -8188,7 +8188,7 @@ _0223170C: bl FUN_0200CCF8 ldr r0, _02231774 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223177C ; =0x000005DC bl FUN_020054C8 ldr r0, _02231780 ; =0x00000B22 @@ -9117,7 +9117,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, [r4, #4] add r1, r4, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FDC ; =0x00000EB8 mov r1, #0 add r0, r4, r0 @@ -9146,7 +9146,7 @@ MOD80_02231EA8: ; 0x02231EA8 add r1, r4, r1 mov r2, #0 mov r3, #5 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FE4 ; =0x00000EC8 mov r1, #0 add r0, r4, r0 @@ -9168,7 +9168,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, [r4, #4] add r1, r4, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FE8 ; =0x00000E98 mov r1, #0 add r0, r4, r0 @@ -9188,7 +9188,7 @@ MOD80_02231EA8: ; 0x02231EA8 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FF0 ; =0x00000FB8 mov r1, #0 add r0, r4, r0 @@ -9208,7 +9208,7 @@ MOD80_02231EA8: ; 0x02231EA8 add r1, r4, r1 mov r2, #1 mov r3, #0x19 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FF8 ; =0x00000EE8 mov r1, #6 add r0, r4, r0 @@ -9237,7 +9237,7 @@ MOD80_02231EA8: ; 0x02231EA8 add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} .align 2, 0 @@ -9261,22 +9261,22 @@ MOD80_0223200C: ; 0x0223200C add r4, r0, #0 ldr r0, _02232044 ; =0x00000FB8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02232048 ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223204C ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02232050 ; =0x00000E98 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02232054 ; =0x00000EC8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02232058 ; =0x00000EB8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} nop _02232044: .word 0x00000FB8 @@ -11904,7 +11904,7 @@ MOD80_02233500: ; 0x02233500 ldr r0, [r7, #4] add r1, r7, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022335CC ; =0x00000EB8 mov r1, #0 add r0, r7, r0 @@ -11934,7 +11934,7 @@ MOD80_02233500: ; 0x02233500 ldr r0, [r7, #4] add r1, r7, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022335D4 ; =0x00000E98 mov r1, #0 add r0, r7, r0 @@ -11965,7 +11965,7 @@ _0223357E: ldr r0, [r7, #4] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -11998,17 +11998,17 @@ MOD80_022335E0: ; 0x022335E0 add r5, r6, r0 _022335EA: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #6 blt _022335EA ldr r0, _02233610 ; =0x00000E98 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233614 ; =0x00000EB8 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, r5, r6, pc} nop _0223360C: .word 0x00000F08 @@ -12154,7 +12154,7 @@ _02233714: add r1, r4, r1 mov r2, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02233778 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12173,7 +12173,7 @@ _02233714: add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02233780 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 @@ -12291,10 +12291,10 @@ _02233820: bl FUN_0200D0E0 ldr r0, _02233884 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223388C ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r1, #5 add r0, r4, #0 add r2, r1, #0 @@ -12425,10 +12425,10 @@ _02233932: bl FUN_0200CCF8 ldr r0, _02233A58 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233A54 ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0 str r0, [r4, #0x2c] ldr r0, _02233A5C ; =0x000005DC @@ -12468,10 +12468,10 @@ _0223398C: bl FUN_0200CCF8 ldr r0, _02233A58 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233A54 ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233A60 ; =0x00000B1C strh r5, [r4, r0] ldr r0, _02233A5C ; =0x000005DC @@ -12573,7 +12573,7 @@ MOD80_02233A6C: ; 0x02233A6C add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02233AC4 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12658,7 +12658,7 @@ _02233B26: bl FUN_0200D0E0 ldr r0, _02233BD4 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233BDC ; =0x000005DC bl FUN_020054C8 mov r0, #0 @@ -12679,7 +12679,7 @@ _02233B6A: bl FUN_0200CCF8 ldr r0, _02233BD4 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233BDC ; =0x000005DC bl FUN_020054C8 ldr r3, _02233BE0 ; =0x00000F08 @@ -12748,7 +12748,7 @@ MOD80_02233BE8: ; 0x02233BE8 add r1, r4, r1 mov r2, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02233C40 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12830,7 +12830,7 @@ _02233CA4: bl FUN_0200D0E0 ldr r0, _02233D74 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233D7C ; =0x000005DC bl FUN_020054C8 mov r1, #0xfe @@ -12866,7 +12866,7 @@ _02233CFA: bl FUN_0200CCF8 ldr r0, _02233D74 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233D80 ; =0x00000B1C add r1, r4, #0 add r0, r5, r0 @@ -14445,7 +14445,7 @@ MOD80_02234958: ; 0x02234958 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02234990 ; =0x00000E98 mov r1, #0 add r0, r4, r0 @@ -14464,7 +14464,7 @@ MOD80_02234994: ; 0x02234994 bx r3 .align 2, 0 _0223499C: .word 0x00000E98 -_022349A0: .word FUN_02019178 +_022349A0: .word RemoveWindow thumb_func_end MOD80_02234994 thumb_func_start MOD80_022349A4 @@ -18124,7 +18124,7 @@ MOD80_02236580: ; 0x02236580 ldr r0, [r4, #4] add r1, r4, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02236628 ; =0x00000EC8 mov r1, #0 add r0, r4, r0 @@ -18145,7 +18145,7 @@ MOD80_02236580: ; 0x02236580 add r1, r4, r1 mov r2, #0 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0223662C ; =0x00000EB8 mov r1, #0 add r0, r4, r0 @@ -18176,7 +18176,7 @@ MOD80_02236580: ; 0x02236580 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02236634 ; =0x00000E98 mov r1, #0 add r0, r4, r0 @@ -18196,13 +18196,13 @@ MOD80_02236638: ; 0x02236638 add r4, r0, #0 ldr r0, _02236658 ; =0x00000E98 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223665C ; =0x00000EB8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02236660 ; =0x00000EC8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} nop _02236658: .word 0x00000E98 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 599ede77..2d24e28f 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -2068,7 +2068,7 @@ MOD81_02238D64: ; 0x02238D64 bl FUN_020178A0 add r0, r4, #0 add r0, #0x44 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] cmp r0, #0 beq _02238DB6 @@ -2225,7 +2225,7 @@ MOD81_02238E44: ; 0x02238E44 ldr r0, [r4, #0x40] add r1, #0x44 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x44 mov r1, #0xf @@ -9122,7 +9122,7 @@ _0223C5AC: bl FUN_020178A0 add r0, r4, #0 add r0, #0x48 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x14] cmp r0, #0 beq _0223C5C6 @@ -9277,7 +9277,7 @@ MOD81_0223C658: ; 0x0223C658 ldr r0, [r4, #0x44] add r1, #0x48 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x48 mov r1, #0xf diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 20b82216..055eafaa 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -1739,7 +1739,7 @@ MOD82_0222E35C: ; 0x0222E35C ldr r0, [r4, #4] add r1, r4, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x37 lsl r0, r0, #6 add r0, r4, r0 @@ -1761,7 +1761,7 @@ MOD82_0222E35C: ; 0x0222E35C add r1, r4, r1 mov r2, #0 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xda lsl r0, r0, #4 add r0, r4, r0 @@ -1783,7 +1783,7 @@ MOD82_0222E35C: ; 0x0222E35C add r1, r4, r1 mov r2, #0 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd9 lsl r0, r0, #4 add r0, r4, r0 @@ -1805,7 +1805,7 @@ MOD82_0222E35C: ; 0x0222E35C ldr r0, [r4, #4] add r1, r4, r1 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xdb lsl r0, r0, #4 add r0, r4, r0 @@ -1837,7 +1837,7 @@ MOD82_0222E35C: ; 0x0222E35C add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x36 lsl r0, r0, #6 add r0, r4, r0 @@ -1857,23 +1857,23 @@ MOD82_0222E474: ; 0x0222E474 mov r0, #0x36 lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xdb lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xd9 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xda lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x37 lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_end MOD82_0222E474 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 0527c923..9baa0806 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -18,7 +18,7 @@ MOD83_0222D5C4: ; 0x0222D5C4 mov r0, #5 lsl r0, r0, #6 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0222D63C mov r1, #0x4f @@ -86,7 +86,7 @@ _0222D63C: mov r0, #5 lsl r0, r0, #6 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _0222D662: add sp, #0x5c mov r0, #1 @@ -485,7 +485,7 @@ _0222D94A: beq _0222D994 add r1, #0x10 add r0, r4, r1 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x45 mov r1, #0x13 lsl r0, r0, #2 @@ -1583,7 +1583,7 @@ MOD83_0222E1F8: ; 0x0222E1F8 add r5, #0x5c _0222E206: add r0, r5, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0222E294 ldr r0, [sp, #0xc] @@ -1761,7 +1761,7 @@ MOD83_0222E338: ; 0x0222E338 str r0, [sp, #0xc] _0222E362: add r0, r5, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0222E38E add r0, r5, #0 @@ -1835,7 +1835,7 @@ _0222E3EC: add r0, r5, #0 bl FUN_02019570 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _0222E3FE: add r6, r6, #1 add r4, #0x10 @@ -2698,7 +2698,7 @@ MOD83_0222EB04: ; 0x0222EB04 sub sp, #0x5c add r4, r0, #0 add r0, #0x18 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0222EB4E mov r0, #1 @@ -2739,7 +2739,7 @@ _0222EB4E: bl FUN_0200CCF8 add r4, #0x18 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow add sp, #0x5c mov r0, #0 pop {r3, r4, pc} @@ -2994,7 +2994,7 @@ MOD83_0222ED88: ; 0x0222ED88 bl MOD83_02238E48 add r0, r4, #0 add r0, #0x18 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #1 bne _0222EDD0 add r0, r4, #0 @@ -3002,19 +3002,19 @@ MOD83_0222ED88: ; 0x0222ED88 bl FUN_02019570 add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x28 bl FUN_02019570 add r0, r4, #0 add r0, #0x28 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x38 bl FUN_02019570 add r0, r4, #0 add r0, #0x38 - bl FUN_02019178 + bl RemoveWindow _0222EDD0: ldr r0, [r4, #4] mov r1, #0 @@ -4623,10 +4623,10 @@ _0222FA70: bl FUN_02019570 add r0, r7, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r7, #0 add r0, #0x58 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0222FA9C add r0, r7, #0 @@ -4634,7 +4634,7 @@ _0222FA70: bl FUN_02019570 add r0, r7, #0 add r0, #0x58 - bl FUN_02019178 + bl RemoveWindow _0222FA9C: add r5, r7, #0 mov r6, #0 @@ -4647,7 +4647,7 @@ _0222FAA4: add r0, r5, #0 bl FUN_02019570 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _0222FAB6: add r6, r6, #1 add r4, #0x10 @@ -4726,7 +4726,7 @@ MOD83_0222FB44: ; 0x0222FB44 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #1 bne _0222FB5A add r0, r5, #0 @@ -5044,7 +5044,7 @@ _0222FD9C: ldr r0, [r0] add r1, r4, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FDC6: add r0, r4, #0 mov r1, #1 @@ -5132,7 +5132,7 @@ _0222FE3E: ldr r0, [r5] add r1, r4, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FE76: add r0, r4, #0 mov r1, #1 @@ -5186,7 +5186,7 @@ MOD83_0222FEA0: ; 0x0222FEA0 ldr r0, [r4] add r1, r5, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FEE6: add r0, r5, #0 mov r1, #1 @@ -5241,7 +5241,7 @@ MOD83_0222FF10: ; 0x0222FF10 ldr r0, [r4] add r1, r5, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FF56: add r0, r5, #0 mov r1, #1 @@ -5288,7 +5288,7 @@ MOD83_0222FF80: ; 0x0222FF80 ldr r0, [r0] add r1, r4, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FFB4: add r0, r4, #0 mov r1, #1 @@ -5512,7 +5512,7 @@ _0223013E: ldr r0, [r5] add r1, r4, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized _02230172: add r0, r4, #0 mov r1, #1 @@ -5951,7 +5951,7 @@ _022304A8: ldr r0, [r7] add r1, r4, #0 mov r3, #8 - bl FUN_02019064 + bl AddWindowParameterized _022304E6: add r0, r4, #0 mov r1, #1 @@ -6178,7 +6178,7 @@ MOD83_02230668: ; 0x02230668 strh r1, [r0] add r0, r4, #0 add r0, #0x18 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _022306EC mov r0, #0x13 @@ -6195,7 +6195,7 @@ MOD83_02230668: ; 0x02230668 ldr r0, [r4] add r1, #0x18 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized _022306EC: add r1, r4, #0 add r0, r5, #0 @@ -6270,7 +6270,7 @@ _02230776: bl FUN_02019570 ldr r0, _022307AC ; =0x00002624 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4] mov r1, #0 bl FUN_02018744 @@ -6737,7 +6737,7 @@ _02230B28: _02230B6C: add r0, r4, #0 add r0, #0x58 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _02230B9A mov r0, #2 @@ -6755,7 +6755,7 @@ _02230B6C: ldr r0, [r4] add r1, #0x58 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized _02230B9A: bl MOD83_02239DA0 add r1, r4, #0 @@ -6895,7 +6895,7 @@ _02230CA0: str r0, [r1] add r0, r4, #0 add r0, #0x58 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _02230CFA mov r0, #2 @@ -6913,7 +6913,7 @@ _02230CA0: ldr r0, [r4] add r1, #0x58 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized _02230CFA: add r1, r4, #0 add r2, r4, #0 @@ -7342,7 +7342,7 @@ _02231090: _022310B8: add r0, r4, #0 add r0, #0x58 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _022310E6 mov r0, #2 @@ -7360,7 +7360,7 @@ _022310B8: ldr r0, [r4] add r1, #0x58 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized _022310E6: add r1, r4, #0 add r2, r4, #0 @@ -8105,7 +8105,7 @@ MOD83_022316C0: ; 0x022316C0 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #1 bne _022316D6 add r0, r5, #0 @@ -8120,7 +8120,7 @@ MOD83_022316D8: ; 0x022316D8 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #1 bne _022316EE add r0, r5, #0 @@ -8524,7 +8524,7 @@ MOD83_02231A00: ; 0x02231A00 mov r0, #0xae lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 _02231A40: .word 0x00002B6C @@ -8867,7 +8867,7 @@ _02231CC2: add r0, r7, #0 bl FUN_02019570 add r0, r7, #0 - bl FUN_02019178 + bl RemoveWindow add r1, r4, #1 mov r0, #4 sub r0, r0, r1 @@ -8900,7 +8900,7 @@ _02231CC2: ldr r0, [r5, r0] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r1, sp, #0x14 add r2, r4, #1 @@ -9058,7 +9058,7 @@ _02231E2E: add r0, r6, #0 bl FUN_02019570 add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow _02231E50: ldr r0, [sp, #0x1c] add r7, #0x30 @@ -9114,7 +9114,7 @@ _02231E72: ldr r0, [r5, r0] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized _02231EBE: ldr r0, [r4, #0x14] ldr r1, [r4, #0x1c] @@ -9243,7 +9243,7 @@ MOD83_02231F88: ; 0x02231F88 ldr r0, [r5, r0] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized _02231FD2: ldr r1, [r4, #0x1c] add r0, r6, #0 @@ -10587,7 +10587,7 @@ _02232A88: bl FUN_02019570 ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #3 str r0, [r5] b _02232CF4 @@ -10629,7 +10629,7 @@ _02232AE2: bl FUN_02019570 ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 mov r1, #0 mov r2, #3 @@ -11314,7 +11314,7 @@ _022330B6: add r0, r5, #0 bl FUN_02019570 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _022330CA: add r6, r6, #1 add r4, #0x10 @@ -11329,7 +11329,7 @@ _022330CA: bl FUN_02019570 ldr r0, _02233158 ; =0x00002B70 add r0, r7, r0 - bl FUN_02019178 + bl RemoveWindow _022330EA: mov r0, #0xae lsl r0, r0, #6 @@ -11341,7 +11341,7 @@ _022330EA: mov r0, #0xae lsl r0, r0, #6 add r0, r7, r0 - bl FUN_02019178 + bl RemoveWindow _02233104: ldr r0, _0223315C ; =0x0000299C mov r1, #0 @@ -15502,7 +15502,7 @@ _02234F3C: ldr r0, [r0, #0x20] lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized _02234F7A: mov r0, #2 tst r0, r4 @@ -17923,7 +17923,7 @@ MOD83_02236298: ; 0x02236298 add r0, r4, #0 bl FUN_02019570 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _022362B4: pop {r4, pc} .align 2, 0 @@ -23214,7 +23214,7 @@ MOD83_02238A38: ; 0x02238A38 ldr r2, [r4, #0x2c] lsl r2, r2, #0x18 lsr r2, r2, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, [sp, #0x28] add r0, r4, #0 bl MOD83_0223894C diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s index 44a7d65a..592a2056 100644 --- a/arm9/modules/84/asm/module_84_thumb2.s +++ b/arm9/modules/84/asm/module_84_thumb2.s @@ -574,7 +574,7 @@ MOD84_021D84F8: ; 0x021D84F8 ldr r1, [r4, #0x24] add r0, r6, #0 lsr r2, r2, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r4, #0x24] mov r1, #0 bl FillWindowPixelBuffer @@ -600,7 +600,7 @@ MOD84_021D84F8: ; 0x021D84F8 ldr r1, [r4, #0x28] add r0, r6, #0 lsr r2, r2, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _021D85B4 ; =MOD84_021D8784 add r1, r4, #0 mov r2, #0 @@ -626,9 +626,9 @@ _021D85C6: ldr r0, [r4, #0x30] bl String_dtor ldr r0, [r4, #0x24] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x28] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x24] bl FreeToHeap ldr r0, [r4, #0x28] diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 4ccc0477..85fd8ff5 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -790,7 +790,7 @@ MOD85_021D7B28: ; 0x021D7B28 ldr r0, [r5, r0] ldr r2, _021D7BB4 ; =0x021DECE4 add r1, #8 - bl FUN_02019150 + bl AddWindow mov r0, #1 lsl r0, r0, #8 mov r1, #0x4f @@ -817,7 +817,7 @@ MOD85_021D7BB8: ; 0x021D7BB8 add r0, r6, #0 bl FUN_02019570 add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _021D7BE8 ; =0x00000408 ldr r0, [r5, r0] bl DestroyMsgData diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 0c2e1774..15ec8788 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -493,7 +493,7 @@ MOD86_021D78D4: ; 0x021D78D4 ldr r0, [r4, #0x10] add r1, #0x14 add r2, sp, #8 - bl FUN_02019150 + bl AddWindow mov r1, #0 mov r0, #1 lsl r0, r0, #8 @@ -512,7 +512,7 @@ MOD86_021D78D4: ; 0x021D78D4 ldr r0, [r4, #0x10] add r1, #0x24 add r2, sp, #8 - bl FUN_02019150 + bl AddWindow mov r1, #0 mov r0, #1 lsl r0, r0, #8 @@ -535,10 +535,10 @@ MOD86_021D7964: ; 0x021D7964 push {r4, lr} add r4, r0, #0 add r0, #0x24 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x38] bl ScrStrBufs_delete ldr r0, [r4, #0x34] diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index 07c285a4..0c962d86 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -7,7 +7,7 @@ #include "PAD_pad.h" -const struct UnkStruct_02016B94_4 UNK_020FF49C = { 0, 3, 3, 0x1a, 0x12, 1, 0x23 }; +const struct WindowTemplate UNK_020FF49C = {0, 3, 3, 0x1a, 0x12, 1, 0x23 }; const struct HeapParam UNK_020FF4A4[] = { {0x00020000, OS_ARENA_MAIN} @@ -22,7 +22,7 @@ const struct GraphicsBanks UNK_020FF4D8 = { bg : 3 }; u32 sErrorMessagePrinterLock; extern void FUN_0200E3A0(PMLCDTarget, int); -extern void FUN_0200CB00(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5); +extern void FUN_0200CB00(struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5); extern void FUN_02002ED0(u32 param0, u32 param1, u32 param2); extern void FUN_0200CCA4(struct Window *param0, u32 param1, u32 param2, u32 param3); extern void FUN_0200E394(u32 param0); @@ -38,7 +38,7 @@ THUMB_FUNC void VBlankHandler() THUMB_FUNC void PrintErrorMessageAndReset() { - struct UnkStruct_02016B94_2 *ptr; + struct BgConfig *ptr; struct Window buf; if (sErrorMessagePrinterLock != 1) @@ -92,7 +92,7 @@ THUMB_FUNC void PrintErrorMessageAndReset() struct String *str = String_ctor(6 << 6, 0); FUN_0201BD5C(); - FUN_02019150(ptr, &buf, &UNK_020FF49C); + AddWindow(ptr, &buf, &UNK_020FF49C); FillWindowPixelRect(&buf, 15, 0, 0, 0xd0, 0x90); FUN_0200CCA4(&buf, 0, 0x1f7, 2); @@ -126,7 +126,7 @@ THUMB_FUNC void PrintErrorMessageAndReset() FUN_0200E3A0(PM_LCD_TOP, 0x7FFF); FUN_0200E3A0(PM_LCD_BOTTOM, 0x7FFF); - FUN_02019178(&buf); + RemoveWindow(&buf); DestroyMsgData(msg_data); FreeToHeap(ptr); diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index 769c90d9..66d788e6 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -3,7 +3,7 @@ #include "NNS_g2d.h"
#include "gf_gfx_loader.h"
-THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
+THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
{
NNSG2dCharacterData * pCharData;
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, FALSE);
@@ -20,7 +20,7 @@ THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkS return szByte;
}
-THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
+THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
{
NNSG2dScreenData * pScreenData;
void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, TRUE);
diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 7adb1fe8..34ae6e20 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -779,7 +779,7 @@ THUMB_FUNC BOOL ScrCmd_CloseMessageBox(struct ScriptContext* ctx) struct Window *unk = FUN_02039438(unk80, 0x1); u8 *unk2 = FUN_02039438(unk80, 0x6); FUN_0200D0E0(unk, 0); //clear window? - FUN_02019178(unk); + RemoveWindow(unk); *unk2 = 0; return FALSE; } @@ -789,7 +789,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0035(struct ScriptContext* ctx) struct UnkSavStruct80 *unk80 = ctx->unk80; struct Window *unk = FUN_02039438(unk80, 0x1); u8 *unk2 = FUN_02039438(unk80, 0x6); - FUN_02019178(unk); + RemoveWindow(unk); *unk2 = 0; return FALSE; } diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c index dcbad024..527e03a2 100644 --- a/arm9/src/text_02054590.c +++ b/arm9/src/text_02054590.c @@ -7,14 +7,14 @@ extern void FUN_02002ED0(u32 param0, u32 param1, u32 param2); extern void FUN_02002EEC(u32 param0, u32 param1, u32 param2); extern void FUN_0200CD68( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5); + struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5); extern void FUN_0200D0BC(struct Window *param0, u32 param1, u32 param2, u32 param3); extern void FUN_02002B60(u8 param0); extern void FUN_02002B7C(u32 param0); extern void FUN_02002BB8(u32 param0); -extern void FUN_0200D300(struct UnkStruct_02016B94_2 *param0, +extern void FUN_0200D300(struct BgConfig *param0, u32 param1, u32 param2, u32 param3, @@ -33,21 +33,21 @@ THUMB_FUNC void FUN_02054590(u32 param0, u32 param1) FUN_02002EEC(param0, 384, 4); } -THUMB_FUNC void FUN_020545B8(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2) +THUMB_FUNC void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 param2) { if (param2 == 3) { - FUN_02019064(param0, param1, 3, 2, 19, 27, 4, 12, 813); + AddWindowParameterized(param0, param1, 3, 2, 19, 27, 4, 12, 813); } else { - FUN_02019064(param0, param1, 7, 2, 19, 27, 4, 12, 404); + AddWindowParameterized(param0, param1, 7, 2, 19, 27, 4, 12, 404); } } THUMB_FUNC void FUN_02054608(struct Window *param0, struct Options *options) { - FUN_0200CD68(param0->unk00, FUN_0201AB08(param0), 994, 10, (u8)Options_GetFrame(options), 4); + FUN_0200CD68(param0->bgConfig, FUN_0201AB08(param0), 994, 10, (u8)Options_GetFrame(options), 4); FUN_0205464C(param0); FUN_0200D0BC(param0, 0, 994, 10); } @@ -79,7 +79,7 @@ THUMB_FUNC u8 FUN_020546C8(u32 param0) // bool8? } THUMB_FUNC void FUN_020546E0( - struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2, u32 param3) + struct BgConfig *param0, struct Window *param1, u32 param2, u32 param3) { u32 r4 = 0; u32 r5 = 0; @@ -95,17 +95,17 @@ THUMB_FUNC void FUN_020546E0( } if (param3 == 3) { - FUN_02019064(param0, param1, 3, (u8)r4, 19, (u8)r5, 4, 9, 813); + AddWindowParameterized(param0, param1, 3, (u8) r4, 19, (u8) r5, 4, 9, 813); } else { - FUN_02019064(param0, param1, 7, (u8)r4, 19, (u8)r5, 4, 9, 404); + AddWindowParameterized(param0, param1, 7, (u8) r4, 19, (u8) r5, 4, 9, 404); } } THUMB_FUNC void FUN_02054744(struct Window *param0, u32 param1, u32 param2) { - FUN_0200D300(param0->unk00, FUN_0201AB08(param0), 0x399, 9, (u8)param1, param2, 4); + FUN_0200D300(param0->bgConfig, FUN_0201AB08(param0), 0x399, 9, (u8)param1, param2, 4); FillWindowPixelBuffer(param0, 15); FUN_0200D6F8(param0, 0, 0x399, 9, (u8)param1); } diff --git a/arm9/src/unk_02016B94.c b/arm9/src/unk_02016B94.c index b8bdf158..4a963084 100644 --- a/arm9/src/unk_02016B94.c +++ b/arm9/src/unk_02016B94.c @@ -43,10 +43,10 @@ void (*const sPutWindowTilemapFuncs[])(struct Window *) = { PutWindowTilemap_TextMode, }; -void (*const UNK_020EDB68[])(struct Window *) = { - FUN_0201949C, - FUN_020194E0, - FUN_0201949C, +void (*const sCopyWindowToVramFuncs[])(struct Window *) = { + CopyWindowToVram_TextMode, + CopyWindowToVram_AffineMode, + CopyWindowToVram_TextMode, }; void (*const UNK_020EDB74[])(struct Window *) = { @@ -55,10 +55,10 @@ void (*const UNK_020EDB74[])(struct Window *) = { FUN_020193B4, }; -THUMB_FUNC struct UnkStruct_02016B94_2 *FUN_02016B94(u32 heap_id) +THUMB_FUNC struct BgConfig *FUN_02016B94(u32 heap_id) { - struct UnkStruct_02016B94_2 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_02016B94_2)); - memset(ptr, 0, sizeof(struct UnkStruct_02016B94_2)); + struct BgConfig *ptr = AllocFromHeap(heap_id, sizeof(struct BgConfig)); + memset(ptr, 0, sizeof(struct BgConfig)); ptr->heap_id = heap_id; ptr->unk04 = 0; ptr->unk06 = 0; @@ -98,7 +98,7 @@ THUMB_FUNC void FUN_02016BF4(const struct GraphicsModes *param0, u32 param1) #ifdef NONMATCHING THUMB_FUNC void FUN_02016C18( - struct UnkStruct_02016B94_2 *param0, u8 param1, const struct UnkStruct_02016B94_1 *param2, u8 param3) + struct BgConfig *param0, u8 param1, const struct UnkStruct_02016B94_1 *param2, u8 param3) { u8 res = FUN_020177DC(param2->unk10, param3); switch (param1) @@ -342,7 +342,7 @@ THUMB_FUNC void FUN_02016C18( } #else THUMB_FUNC asm void FUN_02016C18( - struct UnkStruct_02016B94_2 *param0, u8 param1, const struct UnkStruct_02016B94_1 *param2, u8 param3) + struct BgConfig *param0, u8 param1, const struct UnkStruct_02016B94_1 *param2, u8 param3) { // clang-format off push {r3-r7, lr} @@ -990,7 +990,7 @@ _020170D2: #endif #ifdef NONMATCHING -THUMB_FUNC void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3) +THUMB_FUNC void FUN_020170F4(struct BgConfig *param0, u8 param1, u32 param2, u8 param3) { if (param2 == 0) { @@ -1295,7 +1295,7 @@ THUMB_FUNC void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 } #else THUMB_FUNC asm void FUN_020170F4( - struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3) + struct BgConfig *param0, u8 param1, u32 param2, u8 param3) { // clang-format off push {r3-r7, lr} @@ -2329,12 +2329,12 @@ THUMB_FUNC void FUN_02017850(u32 param0, u8 *param1, u8 *param2) } } -THUMB_FUNC void FUN_020178A0(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC void FUN_020178A0(struct BgConfig *param0, u32 param1) { - if (param0->unk08[param1].unk08 != NULL) + if (param0->bgs[param1].unk08 != NULL) { - FreeToHeap(param0->unk08[param1].unk08); - param0->unk08[param1].unk08 = NULL; + FreeToHeap(param0->bgs[param1].unk08); + param0->bgs[param1].unk08 = NULL; } } @@ -2400,12 +2400,12 @@ THUMB_FUNC void FUN_0201797C(u32 param0, GX_LayerToggle toggle) } } -THUMB_FUNC void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 val) +THUMB_FUNC void FUN_020179E0(struct BgConfig *param0, u32 param1, u32 param2, fx32 val) { - FUN_02017B8C(¶m0->unk08[param1], param2, val); + FUN_02017B8C(¶m0->bgs[param1], param2, val); - u32 r1 = (u32)param0->unk08[param1].unk14; - u32 r0 = (u32)param0->unk08[param1].unk18; + u32 r1 = (u32)param0->bgs[param1].unk14; + u32 r0 = (u32)param0->bgs[param1].unk18; switch (param1) { case 0: @@ -2418,7 +2418,7 @@ THUMB_FUNC void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u3 break; case 2: - if (param0->unk08[2].mode == 0) + if (param0->bgs[2].mode == 0) { reg_G2_BG2OFS = (r1 & 0x1FF) | ((r0 << 16) & 0x1FF0000); } @@ -2430,7 +2430,7 @@ THUMB_FUNC void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u3 break; case 3: - if (param0->unk08[3].mode == 0) + if (param0->bgs[3].mode == 0) { reg_G2_BG3OFS = (r1 & 0x1FF) | ((r0 << 16) & 0x1FF0000); } @@ -2451,7 +2451,7 @@ THUMB_FUNC void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u3 break; case 6: - if (param0->unk08[6].mode == 0) + if (param0->bgs[6].mode == 0) { reg_G2S_DB_BG2OFS = (r1 & 0x1FF) | ((r0 << 16) & 0x1FF0000); } @@ -2463,7 +2463,7 @@ THUMB_FUNC void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u3 break; case 7: - if (param0->unk08[7].mode == 0) + if (param0->bgs[7].mode == 0) { reg_G2S_DB_BG3OFS = (r1 & 0x1FF) | ((r0 << 16) & 0x1FF0000); } @@ -2476,17 +2476,17 @@ THUMB_FUNC void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u3 } } -THUMB_FUNC fx32 FUN_02017B48(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC fx32 FUN_02017B48(struct BgConfig *param0, u32 param1) { - return param0->unk08[param1].unk14; + return param0->bgs[param1].unk14; } -THUMB_FUNC fx32 FUN_02017B54(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC fx32 FUN_02017B54(struct BgConfig *param0, u32 param1) { - return param0->unk08[param1].unk18; + return param0->bgs[param1].unk18; } -THUMB_FUNC void FUN_02017B60(struct UnkStruct_02016B94_2 *param0, +THUMB_FUNC void FUN_02017B60(struct BgConfig *param0, u32 param1, u32 param2, fx32 param3, @@ -2494,11 +2494,11 @@ THUMB_FUNC void FUN_02017B60(struct UnkStruct_02016B94_2 *param0, fx32 param5, fx32 param6) { - FUN_02017B8C(¶m0->unk08[param1], param2, param3); + FUN_02017B8C(¶m0->bgs[param1], param2, param3); FUN_02017BD0(param0, param1, param4, param5, param6); } -THUMB_FUNC void FUN_02017B8C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val) +THUMB_FUNC void FUN_02017B8C(struct Bg *param0, u32 param1, fx32 val) { switch (param1) { @@ -2524,7 +2524,7 @@ THUMB_FUNC void FUN_02017B8C(struct UnkStruct_02016B94_2_sub *param0, u32 param1 } THUMB_FUNC void FUN_02017BD0( - struct UnkStruct_02016B94_2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4) + struct BgConfig *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4) { switch (param1) { @@ -2533,37 +2533,37 @@ THUMB_FUNC void FUN_02017BD0( param2, param3, param4, - param0->unk08[param1].unk14, - param0->unk08[param1].unk18); + param0->bgs[param1].unk14, + param0->bgs[param1].unk18); break; case 3: G2x_SetBGyAffine_(reg_G2_BG3P, param2, param3, param4, - param0->unk08[param1].unk14, - param0->unk08[param1].unk18); + param0->bgs[param1].unk14, + param0->bgs[param1].unk18); break; case 6: G2x_SetBGyAffine_(reg_G2S_DB_BG2P, param2, param3, param4, - param0->unk08[param1].unk14, - param0->unk08[param1].unk18); + param0->bgs[param1].unk14, + param0->bgs[param1].unk18); break; case 7: G2x_SetBGyAffine_(reg_G2S_DB_BG3P, param2, param3, param4, - param0->unk08[param1].unk14, - param0->unk08[param1].unk18); + param0->bgs[param1].unk14, + param0->bgs[param1].unk18); break; } } -THUMB_FUNC void FUN_02017C6C(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC void FUN_02017C6C(struct BgConfig *param0, u32 param1) { struct Mtx22 mtx; MTX22_2DAffine(&mtx, 0, 0x1000, 0x1000, 0); @@ -2587,26 +2587,26 @@ THUMB_FUNC void FUN_02017C98(const void *param0, void *param1, u32 param2) MI_CpuCopy16(param0, param1, param2); } -THUMB_FUNC void FUN_02017CD0(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC void FUN_02017CD0(struct BgConfig *param0, u32 param1) { FUN_02017CE8(param0, param1, - param0->unk08[param1].unk08, - param0->unk08[param1].unk0c, - param0->unk08[param1].unk10); + param0->bgs[param1].unk08, + param0->bgs[param1].unk0c, + param0->bgs[param1].unk10); } THUMB_FUNC void FUN_02017CE8( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4) + struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4) { u32 st0 = param3; if (param3 == 0) { - void *st4 = param0->unk08[param1].unk08; + void *st4 = param0->bgs[param1].unk08; if (st4 != 0) { FUN_02017C98(param2, st4, param3); - FUN_02017D68(param1, st4, param0->unk08[param1].unk10 * 2, param0->unk08[param1].unk0c); + FUN_02017D68(param1, st4, param0->bgs[param1].unk10 * 2, param0->bgs[param1].unk0c); return; } @@ -2655,15 +2655,15 @@ THUMB_FUNC void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size) } THUMB_FUNC void FUN_02017DFC( - struct UnkStruct_02016B94_2 *param0, u32 param1, void *param2, u32 param3) + struct BgConfig *param0, u32 param1, void *param2, u32 param3) { - FUN_02017C98(param2, param0->unk08[param1].unk08, param3); + FUN_02017C98(param2, param0->bgs[param1].unk08, param3); } THUMB_FUNC void FUN_02017E14( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4) + struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4) { - if (param0->unk08[param1].unk1e == 0) + if (param0->bgs[param1].unk1e == 0) { FUN_02017E40(param0, param1, param2, param3, param4 << 5); return; @@ -2672,7 +2672,7 @@ THUMB_FUNC void FUN_02017E14( } THUMB_FUNC void FUN_02017E40( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4) + struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4) { u32 st0 = param3; if (param3 == 0) @@ -2732,14 +2732,14 @@ THUMB_FUNC void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id) } THUMB_FUNC void FUN_02017F48( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4) + struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4) { void *st4; - u32 st0 = param3 * param0->unk08[param1].unk1f; + u32 st0 = param3 * param0->bgs[param1].tileSize; u32 r5 = param2; st4 = AllocFromHeapAtEnd(param0->heap_id, st0); - if (param0->unk08[param1].unk1f == 0x20) + if (param0->bgs[param1].tileSize == 0x20) { r5 = (r5 << 0xc | r5 << 0x8 | r5 << 0x4 | r5); r5 |= r5 << 0x10; @@ -2751,7 +2751,7 @@ THUMB_FUNC void FUN_02017F48( MI_CpuFillFast(st4, r5, st0); - FUN_02017E84((u8)param1, st4, param0->unk08[param1].unk1f * param4, st0); + FUN_02017E84((u8)param1, st4, param0->bgs[param1].tileSize * param4, st0); FreeToHeap(st4); } @@ -2855,7 +2855,7 @@ THUMB_FUNC u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3) return r3; } -THUMB_FUNC void FUN_02018148(struct UnkStruct_02016B94_2 *param0, +THUMB_FUNC void FUN_02018148(struct BgConfig *param0, u32 param1, void *param2, u8 param3, @@ -2866,7 +2866,7 @@ THUMB_FUNC void FUN_02018148(struct UnkStruct_02016B94_2 *param0, FUN_02018170(param0, param1, param3, param4, param5, param6, param2, 0, 0, param5, param6); } -THUMB_FUNC void FUN_02018170(struct UnkStruct_02016B94_2 *param0, +THUMB_FUNC void FUN_02018170(struct BgConfig *param0, u32 param1, u8 param2, u8 param3, @@ -2878,9 +2878,9 @@ THUMB_FUNC void FUN_02018170(struct UnkStruct_02016B94_2 *param0, u8 param9, u8 param10) { - if (param0->unk08[param1].mode != 1) + if (param0->bgs[param1].mode != 1) { - FUN_02018268(¶m0->unk08[param1], + FUN_02018268(¶m0->bgs[param1], param2, param3, param4, @@ -2894,7 +2894,7 @@ THUMB_FUNC void FUN_02018170(struct UnkStruct_02016B94_2 *param0, } else { - FUN_020183DC(¶m0->unk08[param1], + FUN_020183DC(¶m0->bgs[param1], param2, param3, param4, @@ -2908,7 +2908,7 @@ THUMB_FUNC void FUN_02018170(struct UnkStruct_02016B94_2 *param0, } } -THUMB_FUNC void FUN_020181EC(struct UnkStruct_02016B94_2 *param0, +THUMB_FUNC void FUN_020181EC(struct BgConfig *param0, u32 param1, u8 param2, u8 param3, @@ -2920,9 +2920,9 @@ THUMB_FUNC void FUN_020181EC(struct UnkStruct_02016B94_2 *param0, u8 param9, u8 param10) { - if (param0->unk08[param1].mode != 1) + if (param0->bgs[param1].mode != 1) { - FUN_02018268(¶m0->unk08[param1], + FUN_02018268(¶m0->bgs[param1], param2, param3, param4, @@ -2936,7 +2936,7 @@ THUMB_FUNC void FUN_020181EC(struct UnkStruct_02016B94_2 *param0, } else { - FUN_020183DC(¶m0->unk08[param1], + FUN_020183DC(¶m0->bgs[param1], param2, param3, param4, @@ -2950,7 +2950,7 @@ THUMB_FUNC void FUN_020181EC(struct UnkStruct_02016B94_2 *param0, } } -THUMB_FUNC void FUN_02018268(struct UnkStruct_02016B94_2_sub *param0, +THUMB_FUNC void FUN_02018268(struct Bg *param0, u8 param1, u8 param2, u8 param3, @@ -3043,7 +3043,7 @@ THUMB_FUNC void FUN_02018268(struct UnkStruct_02016B94_2_sub *param0, } } -THUMB_FUNC void FUN_020183DC(struct UnkStruct_02016B94_2_sub *param0, +THUMB_FUNC void FUN_020183DC(struct Bg *param0, u8 param1, u8 param2, u8 param3, @@ -3136,7 +3136,7 @@ THUMB_FUNC void FUN_020183DC(struct UnkStruct_02016B94_2_sub *param0, } } -THUMB_FUNC void FUN_02018540(struct UnkStruct_02016B94_2 *param0, +THUMB_FUNC void FUN_02018540(struct BgConfig *param0, u32 param1, u16 param2, u8 param3, @@ -3145,18 +3145,18 @@ THUMB_FUNC void FUN_02018540(struct UnkStruct_02016B94_2 *param0, u8 param6, u8 param7) { - if (param0->unk08[param1].mode != 1) + if (param0->bgs[param1].mode != 1) { - FUN_02018590(¶m0->unk08[param1], param2, param3, param4, param5, param6, param7); + FUN_02018590(¶m0->bgs[param1], param2, param3, param4, param5, param6, param7); } else { - FUN_02018640(¶m0->unk08[param1], (u8)param2, param3, param4, param5, param6); + FUN_02018640(¶m0->bgs[param1], (u8)param2, param3, param4, param5, param6); } } -THUMB_FUNC void FUN_02018590(struct UnkStruct_02016B94_2_sub *param0, +THUMB_FUNC void FUN_02018590(struct Bg *param0, u16 param1, u8 param2, u8 param3, @@ -3209,7 +3209,7 @@ THUMB_FUNC void FUN_02018590(struct UnkStruct_02016B94_2_sub *param0, } THUMB_FUNC void FUN_02018640( - struct UnkStruct_02016B94_2_sub *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5) + struct Bg *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5) { void *r4 = param0->unk08; @@ -3242,7 +3242,7 @@ THUMB_FUNC void FUN_02018640( } } -THUMB_FUNC void FUN_020186B4(struct UnkStruct_02016B94_2 *param0, +THUMB_FUNC void FUN_020186B4(struct BgConfig *param0, u32 param1, u8 param2, u8 param3, @@ -3250,13 +3250,13 @@ THUMB_FUNC void FUN_020186B4(struct UnkStruct_02016B94_2 *param0, u8 param5, u8 param6) { - void *r4 = param0->unk08[param1].unk08; + void *r4 = param0->bgs[param1].unk08; if (r4 != NULL) { u8 st11; u8 st10; - FUN_02017850(param0->unk08[param1].unk1d, &st11, &st10); + FUN_02017850(param0->bgs[param1].unk1d, &st11, &st10); u8 i; u8 j; @@ -3274,36 +3274,36 @@ THUMB_FUNC void FUN_020186B4(struct UnkStruct_02016B94_2 *param0, break; } - u16 idx = FUN_02017FFC(j, i, param0->unk08[param1].unk1d); + u16 idx = FUN_02017FFC(j, i, param0->bgs[param1].unk1d); ((u16 *)r4)[idx] = (u16)((((u16 *)r4)[idx] & 0xfff) | (param6 << 0xc)); } } } } -THUMB_FUNC void FUN_02018744(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC void FUN_02018744(struct BgConfig *param0, u32 param1) { - if (param0->unk08[param1].unk08 != NULL) + if (param0->bgs[param1].unk08 != NULL) { - MI_CpuClear16(param0->unk08[param1].unk08, param0->unk08[param1].unk0c); + MI_CpuClear16(param0->bgs[param1].unk08, param0->bgs[param1].unk0c); FUN_02017CD0(param0, param1); } } -THUMB_FUNC void FUN_02018768(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2) +THUMB_FUNC void FUN_02018768(struct BgConfig *param0, u32 param1, u16 param2) { - if (param0->unk08[param1].unk08 != NULL) + if (param0->bgs[param1].unk08 != NULL) { - MI_CpuFill16(param0->unk08[param1].unk08, param2, param0->unk08[param1].unk0c); + MI_CpuFill16(param0->bgs[param1].unk08, param2, param0->bgs[param1].unk0c); FUN_02017CD0(param0, param1); } } -THUMB_FUNC void FUN_0201878C(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2) +THUMB_FUNC void FUN_0201878C(struct BgConfig *param0, u32 param1, u16 param2) { - if (param0->unk08[param1].unk08 != NULL) + if (param0->bgs[param1].unk08 != NULL) { - MI_CpuFill16(param0->unk08[param1].unk08, param2, param0->unk08[param1].unk0c); + MI_CpuFill16(param0->bgs[param1].unk08, param2, param0->bgs[param1].unk0c); FUN_0201AC68(param0, param1); } } @@ -3361,18 +3361,18 @@ THUMB_FUNC u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2] return ptr; } -THUMB_FUNC void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u8 param1) +THUMB_FUNC void *FUN_0201886C(struct BgConfig *param0, u8 param1) { - return param0->unk08[param1].unk08; + return param0->bgs[param1].unk08; } -THUMB_FUNC u16 FUN_02018878(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC u16 FUN_02018878(struct BgConfig *param0, u32 param1) { - return param0->unk08[param1].unk20; + return param0->bgs[param1].unk20; } #ifdef NONMATCHING -THUMB_FUNC u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC u8 FUN_02018884(struct BgConfig *param0, u32 param1) { // the compiler keeps optimizing the stack away :( @@ -3459,7 +3459,7 @@ THUMB_FUNC u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1) return 0; } #else -THUMB_FUNC asm u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC asm u8 FUN_02018884(struct BgConfig *param0, u32 param1) { // clang-format off sub sp, #0x20 @@ -4488,7 +4488,7 @@ THUMB_FUNC void FUN_02018F4C( } } -THUMB_FUNC void *AllocWindows(u32 heap_id, s32 size) +THUMB_FUNC struct Window *AllocWindows(u32 heap_id, s32 size) { struct Window *ptr = AllocFromHeap(heap_id, (u32)(size << 4)); @@ -4500,25 +4500,25 @@ THUMB_FUNC void *AllocWindows(u32 heap_id, s32 size) return ptr; } -THUMB_FUNC void InitWindow(struct Window *param0) +THUMB_FUNC void InitWindow(struct Window *window) { - param0->unk00 = 0; - param0->bgId = 0xff; - param0->tilemapLeft = 0; - param0->tilemapTop = 0; - param0->width = 0; - param0->height = 0; - param0->paletteNum = 0; - - param0->baseTile = 0; - param0->pixelBuffer = 0; - - param0->unk0b_15 = 0; + window->bgConfig = NULL; + window->bgId = 0xff; + window->tilemapLeft = 0; + window->tilemapTop = 0; + window->width = 0; + window->height = 0; + window->paletteNum = 0; + + window->baseTile = 0; + window->pixelBuffer = NULL; + + window->unk0b_15 = 0; } -THUMB_FUNC BOOL FUN_02019048(struct Window *param0) +THUMB_FUNC BOOL WindowIsInUse(struct Window *window) { - if (param0->unk00 == 0 || param0->bgId == 0xff || param0->pixelBuffer == 0) + if (window->bgConfig == NULL || window->bgId == 0xff || window->pixelBuffer == NULL) { return FALSE; } @@ -4532,40 +4532,40 @@ enum UnkEnum1 UnkEnum1_1 = 1 }; -THUMB_FUNC void FUN_02019064(struct UnkStruct_02016B94_2 *param0, - struct Window *param1, - u8 param2, - u8 param3, - u8 param4, - u8 param5, - u8 param6, - u8 param7, - u16 param8) +THUMB_FUNC void AddWindowParameterized(struct BgConfig *param0, + struct Window *window, + u8 bgId, + u8 tilemapLeft, + u8 tilemapTop, + u8 width, + u8 height, + u8 paletteNum, + u16 baseTile) { - if (param0->unk08[param2].unk08 == NULL) + if (param0->bgs[bgId].unk08 == NULL) { return; } - void *ptr = AllocFromHeap(param0->heap_id, (u32)(param5 * param6 * param0->unk08[param2].unk1f)); + void *ptr = AllocFromHeap(param0->heap_id, (u32)(width * height * param0->bgs[bgId].tileSize)); if (ptr == NULL) { return; } - param1->unk00 = param0; - param1->bgId = param2; - param1->tilemapLeft = param3; - param1->tilemapTop = param4; - param1->width = param5; - param1->height = param6; - param1->paletteNum = param7; + window->bgConfig = param0; + window->bgId = bgId; + window->tilemapLeft = tilemapLeft; + window->tilemapTop = tilemapTop; + window->width = width; + window->height = height; + window->paletteNum = paletteNum; - param1->baseTile = param8; - param1->pixelBuffer = ptr; + window->baseTile = baseTile; + window->pixelBuffer = ptr; enum UnkEnum1 r2; - if (param0->unk08[param2].unk1e == 0) + if (param0->bgs[bgId].unk1e == 0) { r2 = UnkEnum1_0; } @@ -4574,54 +4574,54 @@ THUMB_FUNC void FUN_02019064(struct UnkStruct_02016B94_2 *param0, r2 = UnkEnum1_1; } - param1->unk0b_15 = r2; + window->unk0b_15 = r2; } -THUMB_FUNC void FUN_020190EC(struct UnkStruct_02016B94_2 *param0, - struct Window *param1, - u8 param2, - u8 param3, - u16 param4, - u8 param5) +THUMB_FUNC void AddTextWindowTopLeftCorner(struct BgConfig *param0, + struct Window *window, + u8 width, + u8 height, + u16 baseTile, + u8 paletteNum) { - u32 size = (u32)(param2 * param3 * 32); + u32 size = (u32)(width * height * 32); void *ptr = AllocFromHeap(param0->heap_id, size); - param5 |= (param5 * 16); - memset(ptr, param5, size); + paletteNum |= (paletteNum * 16); + memset(ptr, paletteNum, size); if (ptr != NULL) { - param1->unk00 = param0; - param1->width = param2; - param1->height = param3; - param1->baseTile = param4; - param1->pixelBuffer = ptr; - param1->unk0b_15 = 0; + window->bgConfig = param0; + window->width = width; + window->height = height; + window->baseTile = baseTile; + window->pixelBuffer = ptr; + window->unk0b_15 = 0; } } -THUMB_FUNC void FUN_02019150( - struct UnkStruct_02016B94_2 *param0, struct Window *param1, const struct UnkStruct_02016B94_4 *param2) +THUMB_FUNC void AddWindow( + struct BgConfig *bgConfig, struct Window *window, const struct WindowTemplate *template) { - FUN_02019064(param0, - param1, - param2->unk0, - param2->unk1, - param2->unk2, - param2->unk3, - param2->unk4, - param2->unk5, - param2->unk6); + AddWindowParameterized(bgConfig, + window, + template->bgId, + template->tilemapLeft, + template->tilemapTop, + template->width, + template->height, + template->paletteNum, + template->baseTile); } -THUMB_FUNC void FUN_02019178(struct Window *window) +THUMB_FUNC void RemoveWindow(struct Window *window) { FreeToHeap(window->pixelBuffer); - window->unk00 = 0; + window->bgConfig = NULL; window->bgId = 0xff; window->tilemapLeft = 0; window->tilemapTop = 0; @@ -4649,27 +4649,27 @@ THUMB_FUNC void CopyWindowToVram(struct Window *window) { GF_ASSERT(window != NULL); - GF_ASSERT(window->unk00 != NULL); - GF_ASSERT(window->bgId < NELEMS(window->unk00->unk08)); - GF_ASSERT(window->unk00->unk08[window->bgId].mode < NELEMS(UNK_020EDB68)); + GF_ASSERT(window->bgConfig != NULL); + GF_ASSERT(window->bgId < NELEMS(window->bgConfig->bgs)); + GF_ASSERT(window->bgConfig->bgs[window->bgId].mode < NELEMS(sCopyWindowToVramFuncs)); - UNK_020EDB68[window->unk00->unk08[window->bgId].mode](window); + sCopyWindowToVramFuncs[window->bgConfig->bgs[window->bgId].mode](window); } THUMB_FUNC void FUN_02019220(struct Window *window) { GF_ASSERT(window); - GF_ASSERT(window->unk00); - GF_ASSERT(window->bgId < NELEMS(window->unk00->unk08)); - GF_ASSERT(window->unk00->unk08[window->bgId].mode < NELEMS(UNK_020EDB5C)); + GF_ASSERT(window->bgConfig); + GF_ASSERT(window->bgId < NELEMS(window->bgConfig->bgs)); + GF_ASSERT(window->bgConfig->bgs[window->bgId].mode < NELEMS(UNK_020EDB5C)); - UNK_020EDB5C[window->unk00->unk08[window->bgId].mode](window); + UNK_020EDB5C[window->bgConfig->bgs[window->bgId].mode](window); } THUMB_FUNC void PutWindowTilemap(struct Window *window) { - sPutWindowTilemapFuncs[window->unk00->unk08[window->bgId].mode](window); + sPutWindowTilemapFuncs[window->bgConfig->bgs[window->bgId].mode](window); } THUMB_FUNC void PutWindowTilemapRectAnchoredTopLeft(struct Window *window, u8 width, u8 height) @@ -4679,7 +4679,7 @@ THUMB_FUNC void PutWindowTilemapRectAnchoredTopLeft(struct Window *window, u8 wi window->width = width; window->height = height; - sPutWindowTilemapFuncs[window->unk00->unk08[window->bgId].mode](window); + sPutWindowTilemapFuncs[window->bgConfig->bgs[window->bgId].mode](window); window->width = widthBak; window->height = heightBak; @@ -4687,7 +4687,7 @@ THUMB_FUNC void PutWindowTilemapRectAnchoredTopLeft(struct Window *window, u8 wi THUMB_FUNC void FUN_020192B8(struct Window *window) { - UNK_020EDB74[window->unk00->unk08[window->bgId].mode](window); + UNK_020EDB74[window->bgConfig->bgs[window->bgId].mode](window); } THUMB_FUNC void PutWindowTilemap_TextMode(struct Window *param0) @@ -4695,7 +4695,7 @@ THUMB_FUNC void PutWindowTilemap_TextMode(struct Window *param0) u32 i, j; u32 r3; u32 iCount, jCount; - u16 *st4 = param0->unk00->unk08[param0->bgId].unk08; + u16 *st4 = param0->bgConfig->bgs[param0->bgId].unk08; if (st4 == NULL) { @@ -4726,14 +4726,14 @@ THUMB_FUNC void PutWindowTilemap_AffineMode(struct Window *param0) int r5; int r6; - if (param0->unk00->unk08[param0->bgId].unk08 == NULL) + if (param0->bgConfig->bgs[param0->bgId].unk08 == NULL) { return; } - r6 = UNK_020EDB30[param0->unk00->unk08[param0->bgId].unk1d]; + r6 = UNK_020EDB30[param0->bgConfig->bgs[param0->bgId].unk1d]; - r4 = param0->unk00->unk08[param0->bgId].unk08 + param0->tilemapTop * r6 + param0->tilemapLeft; + r4 = param0->bgConfig->bgs[param0->bgId].unk08 + param0->tilemapTop * r6 + param0->tilemapLeft; r5 = param0->baseTile; for (i = 0; i < param0->height; i++) @@ -4757,13 +4757,13 @@ THUMB_FUNC void FUN_020193B4(struct Window *param0) u16 *st4; - if (param0->unk00->unk08[param0->bgId].unk08 == NULL) + if (param0->bgConfig->bgs[param0->bgId].unk08 == NULL) { return; } - st4 = param0->unk00->unk08[param0->bgId].unk08; + st4 = param0->bgConfig->bgs[param0->bgId].unk08; - st8 = UNK_020EDB30[param0->unk00->unk08[param0->bgId].unk1d]; + st8 = UNK_020EDB30[param0->bgConfig->bgs[param0->bgId].unk1d]; jCount = (u32)(param0->tilemapLeft + param0->width); iCount = (u32)(param0->tilemapTop + param0->height); @@ -4784,13 +4784,13 @@ THUMB_FUNC void FUN_02019444(struct Window *param0) int r6; - if (param0->unk00->unk08[param0->bgId].unk08 == NULL) + if (param0->bgConfig->bgs[param0->bgId].unk08 == NULL) { return; } - r6 = UNK_020EDB30[param0->unk00->unk08[param0->bgId].unk1d]; - r5 = param0->unk00->unk08[param0->bgId].unk08 + param0->tilemapTop * r6 + param0->tilemapLeft; + r6 = UNK_020EDB30[param0->bgConfig->bgs[param0->bgId].unk1d]; + r5 = param0->bgConfig->bgs[param0->bgId].unk08 + param0->tilemapTop * r6 + param0->tilemapLeft; for (i = 0; i < param0->height; i++) { @@ -4802,34 +4802,34 @@ THUMB_FUNC void FUN_02019444(struct Window *param0) } } -THUMB_FUNC void FUN_0201949C(struct Window *window) +THUMB_FUNC void CopyWindowToVram_TextMode(struct Window *window) { PutWindowTilemap_TextMode(window); FUN_02019548(window); - FUN_02017CE8(window->unk00, + FUN_02017CE8(window->bgConfig, window->bgId, - window->unk00->unk08[window->bgId].unk08, - window->unk00->unk08[window->bgId].unk0c, - window->unk00->unk08[window->bgId].unk10); + window->bgConfig->bgs[window->bgId].unk08, + window->bgConfig->bgs[window->bgId].unk0c, + window->bgConfig->bgs[window->bgId].unk10); } THUMB_FUNC void FUN_020194C8(struct Window *window) { PutWindowTilemap_TextMode(window); - FUN_0201AC68(window->unk00, window->bgId); + FUN_0201AC68(window->bgConfig, window->bgId); FUN_02019548(window); } -THUMB_FUNC void FUN_020194E0(struct Window *window) +THUMB_FUNC void CopyWindowToVram_AffineMode(struct Window *window) { PutWindowTilemap_AffineMode(window); - FUN_02017CE8(window->unk00, + FUN_02017CE8(window->bgConfig, window->bgId, - window->unk00->unk08[window->bgId].unk08, - window->unk00->unk08[window->bgId].unk0c, - window->unk00->unk08[window->bgId].unk10); + window->bgConfig->bgs[window->bgId].unk08, + window->bgConfig->bgs[window->bgId].unk0c, + window->bgConfig->bgs[window->bgId].unk10); - FUN_02017E14(window->unk00, + FUN_02017E14(window->bgConfig, window->bgId, window->pixelBuffer, (u32)(window->width * window->height * 64), @@ -4839,8 +4839,8 @@ THUMB_FUNC void FUN_020194E0(struct Window *window) THUMB_FUNC void FUN_0201951C(struct Window *window) { PutWindowTilemap_AffineMode(window); - FUN_0201AC68(window->unk00, window->bgId); - FUN_02017E14(window->unk00, + FUN_0201AC68(window->bgConfig, window->bgId); + FUN_02017E14(window->bgConfig, window->bgId, window->pixelBuffer, (u32)(window->width * window->height * 64), @@ -4849,58 +4849,58 @@ THUMB_FUNC void FUN_0201951C(struct Window *window) THUMB_FUNC void FUN_02019548(struct Window *window) { - FUN_02017E14(window->unk00, + FUN_02017E14(window->bgConfig, window->bgId, window->pixelBuffer, - (u32)(window->width * window->height * window->unk00->unk08[window->bgId].unk1f), + (u32)(window->width * window->height * window->bgConfig->bgs[window->bgId].tileSize), window->baseTile); } THUMB_FUNC void FUN_02019570(struct Window *window) { - UNK_020EDB50[window->unk00->unk08[window->bgId].mode](window); + UNK_020EDB50[window->bgConfig->bgs[window->bgId].mode](window); } THUMB_FUNC void FUN_0201958C(struct Window *window) { - UNK_020EDB44[window->unk00->unk08[window->bgId].mode](window); + UNK_020EDB44[window->bgConfig->bgs[window->bgId].mode](window); } THUMB_FUNC void FUN_020195A8(struct Window *window) { FUN_020193B4(window); - FUN_02017CE8(window->unk00, + FUN_02017CE8(window->bgConfig, window->bgId, - window->unk00->unk08[window->bgId].unk08, - window->unk00->unk08[window->bgId].unk0c, - window->unk00->unk08[window->bgId].unk10); + window->bgConfig->bgs[window->bgId].unk08, + window->bgConfig->bgs[window->bgId].unk0c, + window->bgConfig->bgs[window->bgId].unk10); } THUMB_FUNC void FUN_020195D0(struct Window *window) { FUN_020193B4(window); - FUN_0201AC68(window->unk00, window->bgId); + FUN_0201AC68(window->bgConfig, window->bgId); } THUMB_FUNC void FUN_020195E4(struct Window *window) { FUN_02019444(window); - FUN_02017CE8(window->unk00, + FUN_02017CE8(window->bgConfig, window->bgId, - window->unk00->unk08[window->bgId].unk08, - window->unk00->unk08[window->bgId].unk0c, - window->unk00->unk08[window->bgId].unk10); + window->bgConfig->bgs[window->bgId].unk08, + window->bgConfig->bgs[window->bgId].unk0c, + window->bgConfig->bgs[window->bgId].unk10); } THUMB_FUNC void FUN_0201960C(struct Window *window) { FUN_02019444(window); - FUN_0201AC68(window->unk00, window->bgId); + FUN_0201AC68(window->bgConfig, window->bgId); } THUMB_FUNC void FillWindowPixelBuffer(struct Window *window, u8 param1) { - if (window->unk00->unk08[window->bgId].unk1f == 0x20) + if (window->bgConfig->bgs[window->bgId].tileSize == 0x20) { param1 |= param1 << 4; } @@ -4908,7 +4908,7 @@ THUMB_FUNC void FillWindowPixelBuffer(struct Window *window, u8 param1) MI_CpuFillFast( window->pixelBuffer, (u32)((param1 << 0x18) | (param1 << 0x10) | (param1 << 0x8) | param1), - (u32)(window->unk00->unk08[window->bgId].unk1f * window->width * window->height)); + (u32)(window->bgConfig->bgs[window->bgId].tileSize * window->width * window->height)); } THUMB_FUNC void BlitBitmapRectToWindow(struct Window *window, @@ -4943,7 +4943,7 @@ THUMB_FUNC void BlitBitmapRect(struct Window *window, window->pixelBuffer, (u16)(window->width << 3), (u16)(window->height << 3) }; - if (window->unk00->unk08[window->bgId].unk1e == 0) + if (window->bgConfig->bgs[window->bgId].unk1e == 0) { BlitBitmapRect4Bit(&st1c, &st14, param2, param3, param6, param7, param8, param9, param10); } @@ -4960,7 +4960,7 @@ THUMB_FUNC void FillWindowPixelRect( window->pixelBuffer, (u16)(window->width << 3), (u16)(window->height << 3) }; - if (window->unk00->unk08[window->bgId].unk1e == 0) + if (window->bgConfig->bgs[window->bgId].unk1e == 0) { FUN_02018E88(&st8, x, y, width, height, fillValue); } @@ -7540,7 +7540,7 @@ FUN_0201A8BC: // 0x0201A8BC THUMB_FUNC void ScrollWindow(struct Window *window, u32 param1, u8 param2, u8 param3) { - if (window->unk00->unk08[window->bgId].unk1e == 0) + if (window->bgConfig->bgs[window->bgId].unk1e == 0) { FUN_0201A8E8(window, param1, param2, param3); } @@ -7746,7 +7746,7 @@ THUMB_FUNC void FUN_0201AB24(struct Window *window, u8 param1) THUMB_FUNC u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path) { void *ptr = AllocAndReadFile(heap_id, path); - window->unk00 = ptr; + window->bgConfig = ptr; u32 st0; NNS_G2dGetUnpackedBGCharacterData(ptr, &st0); @@ -7756,14 +7756,14 @@ THUMB_FUNC u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path THUMB_FUNC u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path) { void *ptr = AllocAndReadFile(heap_id, path); - window->unk00 = ptr; + window->bgConfig = ptr; u32 st0; NNS_G2dGetUnpackedPaletteData(ptr, &st0); return st0; } -THUMB_FUNC void FUN_0201AB60(struct UnkStruct_02016B94_2 *param0) +THUMB_FUNC void FUN_0201AB60(struct BgConfig *param0) { FUN_0201AC78(param0); FUN_0201AB78(param0); @@ -7772,180 +7772,180 @@ THUMB_FUNC void FUN_0201AB60(struct UnkStruct_02016B94_2 *param0) param0->unk06 = 0; } -THUMB_FUNC void FUN_0201AB78(struct UnkStruct_02016B94_2 *param0) +THUMB_FUNC void FUN_0201AB78(struct BgConfig *param0) { if ((param0->unk06 & 1) != 0) { - FUN_02017D68(0, param0->unk08[0].unk08, param0->unk08[0].unk10 * 2, param0->unk08[0].unk0c); + FUN_02017D68(0, param0->bgs[0].unk08, param0->bgs[0].unk10 * 2, param0->bgs[0].unk0c); } if ((param0->unk06 & 2) != 0) { - FUN_02017D68(1, param0->unk08[1].unk08, param0->unk08[1].unk10 * 2, param0->unk08[1].unk0c); + FUN_02017D68(1, param0->bgs[1].unk08, param0->bgs[1].unk10 * 2, param0->bgs[1].unk0c); } if ((param0->unk06 & 4) != 0) { - FUN_02017D68(2, param0->unk08[2].unk08, param0->unk08[2].unk10 * 2, param0->unk08[2].unk0c); + FUN_02017D68(2, param0->bgs[2].unk08, param0->bgs[2].unk10 * 2, param0->bgs[2].unk0c); } if ((param0->unk06 & 8) != 0) { - FUN_02017D68(3, param0->unk08[3].unk08, param0->unk08[3].unk10 * 2, param0->unk08[3].unk0c); + FUN_02017D68(3, param0->bgs[3].unk08, param0->bgs[3].unk10 * 2, param0->bgs[3].unk0c); } if ((param0->unk06 & 0x10) != 0) { - FUN_02017D68(4, param0->unk08[4].unk08, param0->unk08[4].unk10 * 2, param0->unk08[4].unk0c); + FUN_02017D68(4, param0->bgs[4].unk08, param0->bgs[4].unk10 * 2, param0->bgs[4].unk0c); } if ((param0->unk06 & 0x20) != 0) { - FUN_02017D68(5, param0->unk08[5].unk08, param0->unk08[5].unk10 * 2, param0->unk08[5].unk0c); + FUN_02017D68(5, param0->bgs[5].unk08, param0->bgs[5].unk10 * 2, param0->bgs[5].unk0c); } if ((param0->unk06 & 0x40) != 0) { - FUN_02017D68(6, param0->unk08[6].unk08, param0->unk08[6].unk10 * 2, param0->unk08[6].unk0c); + FUN_02017D68(6, param0->bgs[6].unk08, param0->bgs[6].unk10 * 2, param0->bgs[6].unk0c); } if ((param0->unk06 & 0x80) != 0) { - FUN_02017D68(7, param0->unk08[7].unk08, param0->unk08[7].unk10 * 2, param0->unk08[7].unk0c); + FUN_02017D68(7, param0->bgs[7].unk08, param0->bgs[7].unk10 * 2, param0->bgs[7].unk0c); } } -THUMB_FUNC void FUN_0201AC68(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC void FUN_0201AC68(struct BgConfig *param0, u32 param1) { param0->unk06 |= 1 << param1; } -THUMB_FUNC void FUN_0201AC78(struct UnkStruct_02016B94_2 *param0) +THUMB_FUNC void FUN_0201AC78(struct BgConfig *param0) { if ((param0->unk04 & 1) != 0) { reg_G2_BG0OFS = (u32)( - (param0->unk08[0].unk14 & 0x1ff) | ((param0->unk08[0].unk18 << 0x10) & 0x1ff0000)); + (param0->bgs[0].unk14 & 0x1ff) | ((param0->bgs[0].unk18 << 0x10) & 0x1ff0000)); } if ((param0->unk04 & 2) != 0) { reg_G2_BG1OFS = (u32)( - (param0->unk08[1].unk14 & 0x1ff) | ((param0->unk08[1].unk18 << 0x10) & 0x1ff0000)); + (param0->bgs[1].unk14 & 0x1ff) | ((param0->bgs[1].unk18 << 0x10) & 0x1ff0000)); } if ((param0->unk04 & 4) != 0) { - if (param0->unk08[2].mode == 0) + if (param0->bgs[2].mode == 0) { reg_G2_BG2OFS = (u32)( - (param0->unk08[2].unk14 & 0x1ff) | ((param0->unk08[2].unk18 << 0x10) & 0x1ff0000)); + (param0->bgs[2].unk14 & 0x1ff) | ((param0->bgs[2].unk18 << 0x10) & 0x1ff0000)); } else { struct Mtx22 st38; MTX22_2DAffine( - &st38, param0->unk08[2].unk20, param0->unk08[2].unk24, param0->unk08[2].unk28, 2); + &st38, param0->bgs[2].unk20, param0->bgs[2].unk24, param0->bgs[2].unk28, 2); G2x_SetBGyAffine_(reg_G2_BG2P, &st38, - param0->unk08[2].unk2c, - param0->unk08[2].unk30, - param0->unk08[2].unk14, - param0->unk08[2].unk18); + param0->bgs[2].unk2c, + param0->bgs[2].unk30, + param0->bgs[2].unk14, + param0->bgs[2].unk18); } } if ((param0->unk04 & 8) != 0) { - if (param0->unk08[3].mode == 0) + if (param0->bgs[3].mode == 0) { reg_G2_BG3OFS = (u32)( - (param0->unk08[3].unk14 & 0x1ff) | ((param0->unk08[3].unk18 << 0x10) & 0x1ff0000)); + (param0->bgs[3].unk14 & 0x1ff) | ((param0->bgs[3].unk18 << 0x10) & 0x1ff0000)); } else { struct Mtx22 st28; MTX22_2DAffine( - &st28, param0->unk08[3].unk20, param0->unk08[3].unk24, param0->unk08[3].unk28, 2); + &st28, param0->bgs[3].unk20, param0->bgs[3].unk24, param0->bgs[3].unk28, 2); G2x_SetBGyAffine_(reg_G2_BG3P, &st28, - param0->unk08[3].unk2c, - param0->unk08[3].unk30, - param0->unk08[3].unk14, - param0->unk08[3].unk18); + param0->bgs[3].unk2c, + param0->bgs[3].unk30, + param0->bgs[3].unk14, + param0->bgs[3].unk18); } } if ((param0->unk04 & 0x10) != 0) { reg_G2S_DB_BG0OFS = (u32)( - (param0->unk08[4].unk14 & 0x1ff) | ((param0->unk08[4].unk18 << 0x10) & 0x1ff0000)); + (param0->bgs[4].unk14 & 0x1ff) | ((param0->bgs[4].unk18 << 0x10) & 0x1ff0000)); } if ((param0->unk04 & 0x20) != 0) { reg_G2S_DB_BG1OFS = (u32)( - (param0->unk08[5].unk14 & 0x1ff) | ((param0->unk08[5].unk18 << 0x10) & 0x1ff0000)); + (param0->bgs[5].unk14 & 0x1ff) | ((param0->bgs[5].unk18 << 0x10) & 0x1ff0000)); } if ((param0->unk04 & 0x40) != 0) { - if (param0->unk08[6].mode == 0) + if (param0->bgs[6].mode == 0) { reg_G2S_DB_BG2OFS = (u32)( - (param0->unk08[6].unk14 & 0x1ff) | ((param0->unk08[6].unk18 << 0x10) & 0x1ff0000)); + (param0->bgs[6].unk14 & 0x1ff) | ((param0->bgs[6].unk18 << 0x10) & 0x1ff0000)); } else { struct Mtx22 st18; MTX22_2DAffine( - &st18, param0->unk08[6].unk20, param0->unk08[6].unk24, param0->unk08[6].unk28, 2); + &st18, param0->bgs[6].unk20, param0->bgs[6].unk24, param0->bgs[6].unk28, 2); G2x_SetBGyAffine_(reg_G2S_DB_BG2P, &st18, - param0->unk08[6].unk2c, - param0->unk08[6].unk30, - param0->unk08[6].unk14, - param0->unk08[6].unk18); + param0->bgs[6].unk2c, + param0->bgs[6].unk30, + param0->bgs[6].unk14, + param0->bgs[6].unk18); } } if ((param0->unk04 & 0x80) != 0) { - if (param0->unk08[7].mode == 0) + if (param0->bgs[7].mode == 0) { reg_G2S_DB_BG3OFS = (u32)( - (param0->unk08[7].unk14 & 0x1ff) | ((param0->unk08[7].unk18 << 0x10) & 0x1ff0000)); + (param0->bgs[7].unk14 & 0x1ff) | ((param0->bgs[7].unk18 << 0x10) & 0x1ff0000)); } else { struct Mtx22 st08; MTX22_2DAffine( - &st08, param0->unk08[7].unk20, param0->unk08[7].unk24, param0->unk08[7].unk28, 2); + &st08, param0->bgs[7].unk20, param0->bgs[7].unk24, param0->bgs[7].unk28, 2); G2x_SetBGyAffine_(reg_G2S_DB_BG3P, &st08, - param0->unk08[7].unk2c, - param0->unk08[7].unk30, - param0->unk08[7].unk14, - param0->unk08[7].unk18); + param0->bgs[7].unk2c, + param0->bgs[7].unk30, + param0->bgs[7].unk14, + param0->bgs[7].unk18); } } } THUMB_FUNC void FUN_0201AEE4( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3) + struct BgConfig *param0, u32 param1, u32 param2, fx32 param3) { - FUN_02017B8C(¶m0->unk08[param1], param2, param3); + FUN_02017B8C(¶m0->bgs[param1], param2, param3); param0->unk04 |= 1 << param1; } THUMB_FUNC void FUN_0201AF08( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u16 param3) + struct BgConfig *param0, u32 param1, u32 param2, u16 param3) { - FUN_0201AF2C(¶m0->unk08[param1], param2, param3); + FUN_0201AF2C(¶m0->bgs[param1], param2, param3); param0->unk04 |= 1 << param1; } -THUMB_FUNC void FUN_0201AF2C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, u16 val) +THUMB_FUNC void FUN_0201AF2C(struct Bg *param0, u32 param1, u16 val) { switch (param1) { @@ -7962,13 +7962,13 @@ THUMB_FUNC void FUN_0201AF2C(struct UnkStruct_02016B94_2_sub *param0, u32 param1 } THUMB_FUNC void FUN_0201AF50( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3) + struct BgConfig *param0, u32 param1, u32 param2, fx32 param3) { - FUN_0201AF74(¶m0->unk08[param1], param2, param3); + FUN_0201AF74(¶m0->bgs[param1], param2, param3); param0->unk04 |= 1 << param1; } -THUMB_FUNC void FUN_0201AF74(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val) +THUMB_FUNC void FUN_0201AF74(struct Bg *param0, u32 param1, fx32 val) { switch (param1 - 9) { @@ -7994,7 +7994,7 @@ THUMB_FUNC void FUN_0201AF74(struct UnkStruct_02016B94_2_sub *param0, u32 param1 } THUMB_FUNC u32 FUN_0201AFBC( - struct UnkStruct_02016B94_2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4) + struct BgConfig *param0, u8 param1, u8 param2, u8 param3, u16 *param4) { void *st18; u16 r6; @@ -8003,20 +8003,20 @@ THUMB_FUNC u32 FUN_0201AFBC( u8 r5; u8 i; - if (param0->unk08[param1].unk08 == NULL) + if (param0->bgs[param1].unk08 == NULL) { return 0; } - r6 = FUN_02017FFC((u8)(param2 >> 3), (u8)(param3 >> 3), param0->unk08[param1].unk1d); + r6 = FUN_02017FFC((u8)(param2 >> 3), (u8)(param3 >> 3), param0->bgs[param1].unk1d); st18 = FUN_020187B0(param1); st14 = (u8)(param2 & 7); st10 = (u8)(param3 & 7); - if (param0->unk08[param1].unk1e == 0) + if (param0->bgs[param1].unk1e == 0) { - u16 *stc = param0->unk08[param1].unk08; + u16 *stc = param0->bgs[param1].unk08; u8 *ptr = AllocFromHeapAtEnd(param0->heap_id, 0x40); st18 += ((stc[r6] & 0x3ff) << 5); @@ -8038,9 +8038,9 @@ THUMB_FUNC u32 FUN_0201AFBC( } else { - if (param0->unk08[param1].mode != 1) + if (param0->bgs[param1].mode != 1) { - u16 *r4 = param0->unk08[param1].unk08; + u16 *r4 = param0->bgs[param1].unk08; u8 *ptr = AllocFromHeapAtEnd(param0->heap_id, 0x40); memcpy(ptr, st18 + ((r4[r6] & 0x3ff) << 6), 0x40); @@ -8052,7 +8052,7 @@ THUMB_FUNC u32 FUN_0201AFBC( } else { - r5 = ((u8 *)st18)[(((u8 *)param0->unk08[param1].unk08)[r6] << 6) + st14 + (st10 << 3)]; + r5 = ((u8 *)st18)[(((u8 *)param0->bgs[param1].unk08)[r6] << 6) + st14 + (st10 << 3)]; } while (TRUE) @@ -8070,7 +8070,7 @@ THUMB_FUNC u32 FUN_0201AFBC( return 0; } -THUMB_FUNC void FUN_0201B118(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 *param2) +THUMB_FUNC void FUN_0201B118(struct BgConfig *param0, u8 param1, u8 *param2) { u8 i, j; if (param1 != 0) diff --git a/include/gf_gfx_loader.h b/include/gf_gfx_loader.h index b95075dc..3f23d1ff 100644 --- a/include/gf_gfx_loader.h +++ b/include/gf_gfx_loader.h @@ -3,8 +3,8 @@ #include "unk_02016B94.h"
-u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
-void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
+u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
+void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 baseAddr, u32 szByte, u32 heap_id);
void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 srcOffset, u32 baseAddr, u32 szByte, u32 heap_id);
u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 whichRoutine, u32 baseAddr, u32 szByte, BOOL isCompressed, u32 heap_id);
diff --git a/include/script.h b/include/script.h index 01bba305..2f5e6540 100644 --- a/include/script.h +++ b/include/script.h @@ -28,7 +28,7 @@ struct UnkStruct_02046444 struct UnkSavStruct80
{
u8 padding[0x8];
- struct UnkStruct_02016B94_2 *unk08;
+ struct BgConfig *unk08;
struct SaveBlock2 *saveBlock2; //0xC
struct UnkStruct_0204639C *unk10;
u8 padding2[0x8];
diff --git a/include/text_02054590.h b/include/text_02054590.h index 77170e70..eaffb2a0 100644 --- a/include/text_02054590.h +++ b/include/text_02054590.h @@ -8,13 +8,13 @@ void FUN_02054590(u32 param0, u32 param1); -void FUN_020545B8(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2); +void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 param2); void FUN_02054608(struct Window *param0, struct Options *options); void FUN_0205464C(struct Window *param0); u16 FUN_02054658(struct Window * window, struct String *str, struct Options *options, u8 param3); u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, u32 a5); u8 FUN_020546C8(u32 param0); -void FUN_020546E0(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2, u32 param3); +void FUN_020546E0(struct BgConfig *param0, struct Window *param1, u32 param2, u32 param3); void FUN_02054744(struct Window *param0, u32 param1, u32 param2); #endif // POKEDIAMOND_UNK_02054590_H diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h index 788c8ddc..d28a3f1e 100644 --- a/include/unk_02016B94.h +++ b/include/unk_02016B94.h @@ -31,7 +31,7 @@ struct UnkStruct_02016B94_1 u32 unk18; }; -struct UnkStruct_02016B94_2_sub +struct Bg { void *unk08; u32 unk0c; @@ -43,7 +43,7 @@ struct UnkStruct_02016B94_2_sub u8 mode; u8 unk1d; u8 unk1e; - u8 unk1f; + u8 tileSize; u16 unk20; u16 unk22; // probably padding fx32 unk24; @@ -52,12 +52,12 @@ struct UnkStruct_02016B94_2_sub fx32 unk30; }; -struct UnkStruct_02016B94_2 +struct BgConfig { u32 heap_id; u16 unk04; u16 unk06; - struct UnkStruct_02016B94_2_sub unk08[8]; + struct Bg bgs[8]; }; struct UnkStruct_02016B94_3 @@ -67,20 +67,20 @@ struct UnkStruct_02016B94_3 u16 unk06; }; -struct UnkStruct_02016B94_4 +struct WindowTemplate { - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u8 unk4; - u8 unk5; - u16 unk6; + u8 bgId; + u8 tilemapLeft; + u8 tilemapTop; + u8 width; + u8 height; + u8 paletteNum; + u16 baseTile; }; struct Window { - struct UnkStruct_02016B94_2 *unk00; + struct BgConfig *bgConfig; u8 bgId; u8 tilemapLeft; u8 tilemapTop; @@ -92,61 +92,61 @@ struct Window void *pixelBuffer; }; -struct UnkStruct_02016B94_2 *FUN_02016B94(u32 heap_id); +struct BgConfig *FUN_02016B94(u32 heap_id); u32 FUN_02016BB8(u32 *param0); void FUN_02016BBC(const struct GraphicsModes *modes); void FUN_02016BF4(const struct GraphicsModes *param0, u32 param1); void FUN_02016C18( - struct UnkStruct_02016B94_2 *param0, u8 param1, const struct UnkStruct_02016B94_1 *param2, u8 param3); -void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3); + struct BgConfig *param0, u8 param1, const struct UnkStruct_02016B94_1 *param2, u8 param3); +void FUN_020170F4(struct BgConfig *param0, u8 param1, u32 param2, u8 param3); u8 FUN_020177DC(u8 param0, u32 param1); void FUN_02017850(u32 param0, u8 *param1, u8 *param2); -void FUN_020178A0(struct UnkStruct_02016B94_2 *param0, u32 param1); +void FUN_020178A0(struct BgConfig *param0, u32 param1); void FUN_020178BC(u32 param0, u16 param1); void FUN_0201797C(u32 param0, GX_LayerToggle toggle); -void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 val); -fx32 FUN_02017B48(struct UnkStruct_02016B94_2 *param0, u32 param1); -fx32 FUN_02017B54(struct UnkStruct_02016B94_2 *param0, u32 param1); -void FUN_02017B60(struct UnkStruct_02016B94_2 *param0, +void FUN_020179E0(struct BgConfig *param0, u32 param1, u32 param2, fx32 val); +fx32 FUN_02017B48(struct BgConfig *param0, u32 param1); +fx32 FUN_02017B54(struct BgConfig *param0, u32 param1); +void FUN_02017B60(struct BgConfig *param0, u32 param1, u32 param2, fx32 param3, struct Mtx22 *param4, fx32 param5, fx32 param6); -void FUN_02017B8C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val); -void FUN_02017BD0(struct UnkStruct_02016B94_2 *param0, +void FUN_02017B8C(struct Bg *param0, u32 param1, fx32 val); +void FUN_02017BD0(struct BgConfig *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4); -void FUN_02017C6C(struct UnkStruct_02016B94_2 *param0, u32 param1); +void FUN_02017C6C(struct BgConfig *param0, u32 param1); void FUN_02017C98(const void *param0, void *param1, u32 param2); -void FUN_02017CD0(struct UnkStruct_02016B94_2 *param0, u32 param1); +void FUN_02017CD0(struct BgConfig *param0, u32 param1); void FUN_02017CE8( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4); + struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4); void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size); -void FUN_02017DFC(struct UnkStruct_02016B94_2 *param0, u32 param1, void *param2, u32 param3); +void FUN_02017DFC(struct BgConfig *param0, u32 param1, void *param2, u32 param3); void FUN_02017E14( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4); + struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4); void FUN_02017E40( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4); + struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4); void FUN_02017E84(u32 param0, void *param1, u32 offset, u32 size); void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id); void FUN_02017F48( - struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); + struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4); void FUN_02017FB4(u32 param0, void *param1, u32 offset, u32 size); void FUN_02017FE4(u32 param0, u32 param1); u16 FUN_02017FFC(u8 param0, u8 param1, u8 param2); u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3); -void FUN_02018148(struct UnkStruct_02016B94_2 *param0, +void FUN_02018148(struct BgConfig *param0, u32 param1, void *param2, u8 param3, u8 param4, u8 param5, u8 param6); -void FUN_02018170(struct UnkStruct_02016B94_2 *param0, +void FUN_02018170(struct BgConfig *param0, u32 param1, u8 param2, u8 param3, @@ -157,7 +157,7 @@ void FUN_02018170(struct UnkStruct_02016B94_2 *param0, u8 param8, u8 param9, u8 param10); -void FUN_020181EC(struct UnkStruct_02016B94_2 *param0, +void FUN_020181EC(struct BgConfig *param0, u32 param1, u8 param2, u8 param3, @@ -168,7 +168,7 @@ void FUN_020181EC(struct UnkStruct_02016B94_2 *param0, u8 param8, u8 param9, u8 param10); -void FUN_02018268(struct UnkStruct_02016B94_2_sub *param0, +void FUN_02018268(struct Bg *param0, u8 param1, u8 param2, u8 param3, @@ -179,7 +179,7 @@ void FUN_02018268(struct UnkStruct_02016B94_2_sub *param0, u8 param8, u8 param9, u8 param10); -void FUN_020183DC(struct UnkStruct_02016B94_2_sub *param0, +void FUN_020183DC(struct Bg *param0, u8 param1, u8 param2, u8 param3, @@ -190,7 +190,7 @@ void FUN_020183DC(struct UnkStruct_02016B94_2_sub *param0, u8 param8, u8 param9, u8 param10); -void FUN_02018540(struct UnkStruct_02016B94_2 *param0, +void FUN_02018540(struct BgConfig *param0, u32 param1, u16 param2, u8 param3, @@ -198,7 +198,7 @@ void FUN_02018540(struct UnkStruct_02016B94_2 *param0, u8 param5, u8 param6, u8 param7); -void FUN_02018590(struct UnkStruct_02016B94_2_sub *param0, +void FUN_02018590(struct Bg *param0, u16 param1, u8 param2, u8 param3, @@ -206,23 +206,23 @@ void FUN_02018590(struct UnkStruct_02016B94_2_sub *param0, u8 param5, u8 param6); void FUN_02018640( - struct UnkStruct_02016B94_2_sub *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); -void FUN_020186B4(struct UnkStruct_02016B94_2 *param0, + struct Bg *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); +void FUN_020186B4(struct BgConfig *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); -void FUN_02018744(struct UnkStruct_02016B94_2 *param0, u32 param1); -void FUN_02018768(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2); -void FUN_0201878C(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2); +void FUN_02018744(struct BgConfig *param0, u32 param1); +void FUN_02018768(struct BgConfig *param0, u32 param1, u16 param2); +void FUN_0201878C(struct BgConfig *param0, u32 param1, u16 param2); void *FUN_020187B0(u32 param0); void FUN_02018808(u8 *param0, u32 param1, u8 (*param2)[2], u8 param3); u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2]; -void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u8 param1); -u16 FUN_02018878(struct UnkStruct_02016B94_2 *param0, u32 param1); -u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1); +void *FUN_0201886C(struct BgConfig *param0, u8 param1); +u16 FUN_02018878(struct BgConfig *param0, u32 param1); +u8 FUN_02018884(struct BgConfig *param0, u32 param1); void BlitBitmapRect4Bit(struct UnkStruct_02016B94_3 *param0, struct UnkStruct_02016B94_3 *param1, u16 param2, @@ -245,28 +245,28 @@ void FUN_02018E88( struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); void FUN_02018F4C( struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); -void *AllocWindows(u32 heap_id, s32 size); -void InitWindow(struct Window *param0); -BOOL FUN_02019048(struct Window *param0); -void FUN_02019064(struct UnkStruct_02016B94_2 *param0, - struct Window *param1, - u8 param2, - u8 param3, - u8 param4, - u8 param5, - u8 param6, - u8 param7, - u16 param8); -void FUN_020190EC(struct UnkStruct_02016B94_2 *param0, - struct Window *param1, - u8 param2, - u8 param3, - u16 param4, - u8 param5); -void FUN_02019150(struct UnkStruct_02016B94_2 *param0, - struct Window *param1, - const struct UnkStruct_02016B94_4 *param2); -void FUN_02019178(struct Window *window); +struct Window *AllocWindows(u32 heap_id, s32 size); +void InitWindow(struct Window *window); +BOOL WindowIsInUse(struct Window *window); +void AddWindowParameterized(struct BgConfig *param0, + struct Window *window, + u8 bgId, + u8 tilemapLeft, + u8 tilemapTop, + u8 width, + u8 height, + u8 paletteNum, + u16 baseTile); +void AddTextWindowTopLeftCorner(struct BgConfig *param0, + struct Window *window, + u8 width, + u8 height, + u16 baseTile, + u8 paletteNum); +void AddWindow(struct BgConfig *bgConfig, + struct Window *window, + const struct WindowTemplate *template); +void RemoveWindow(struct Window *window); void WindowArray_dtor(struct Window *windows, int count); void CopyWindowToVram(struct Window *window); void FUN_02019220(struct Window *window); @@ -277,9 +277,9 @@ void PutWindowTilemap_TextMode(struct Window *param0); void PutWindowTilemap_AffineMode(struct Window *param0); void FUN_020193B4(struct Window *param0); void FUN_02019444(struct Window *param0); -void FUN_0201949C(struct Window *window); +void CopyWindowToVram_TextMode(struct Window *window); void FUN_020194C8(struct Window *window); -void FUN_020194E0(struct Window *window); +void CopyWindowToVram_AffineMode(struct Window *window); void FUN_0201951C(struct Window *window); void FUN_02019548(struct Window *window); void FUN_02019570(struct Window *window); @@ -326,16 +326,16 @@ void FUN_0201AB20(struct Window *window, u8 param1); void FUN_0201AB24(struct Window *window, u8 param1); u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path); u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path); -void FUN_0201AB60(struct UnkStruct_02016B94_2 *param0); -void FUN_0201AB78(struct UnkStruct_02016B94_2 *param0); -void FUN_0201AC68(struct UnkStruct_02016B94_2 *param0, u32 param1); -void FUN_0201AC78(struct UnkStruct_02016B94_2 *param0); -void FUN_0201AEE4(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3); -void FUN_0201AF08(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u16 param3); -void FUN_0201AF2C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, u16 val); -void FUN_0201AF50(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3); -void FUN_0201AF74(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val); -u32 FUN_0201AFBC(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4); -void FUN_0201B118(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 *param2); +void FUN_0201AB60(struct BgConfig *param0); +void FUN_0201AB78(struct BgConfig *param0); +void FUN_0201AC68(struct BgConfig *param0, u32 param1); +void FUN_0201AC78(struct BgConfig *param0); +void FUN_0201AEE4(struct BgConfig *param0, u32 param1, u32 param2, fx32 param3); +void FUN_0201AF08(struct BgConfig *param0, u32 param1, u32 param2, u16 param3); +void FUN_0201AF2C(struct Bg *param0, u32 param1, u16 val); +void FUN_0201AF50(struct BgConfig *param0, u32 param1, u32 param2, fx32 param3); +void FUN_0201AF74(struct Bg *param0, u32 param1, fx32 val); +u32 FUN_0201AFBC(struct BgConfig *param0, u8 param1, u8 param2, u8 param3, u16 *param4); +void FUN_0201B118(struct BgConfig *param0, u8 param1, u8 *param2); #endif // POKEDIAMOND_UNK_02016B94_H |