diff options
Diffstat (limited to 'arm9/asm')
36 files changed, 725 insertions, 725 deletions
diff --git a/arm9/asm/RUNTIME_CPLUS_StaticInitializers.s b/arm9/asm/RUNTIME_CPLUS_StaticInitializers.s index 403e0812..c1446521 100644 --- a/arm9/asm/RUNTIME_CPLUS_StaticInitializers.s +++ b/arm9/asm/RUNTIME_CPLUS_StaticInitializers.s @@ -5,7 +5,7 @@ .global __global_destructor_chain
__global_destructor_chain: ; 0x021D74C8
- .space 0x18
+ .space 0xC
.text
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_020023C0.s b/arm9/asm/unk_020023C0.s index 7a509f0b..dc0c45ef 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -468,7 +468,7 @@ _02002700: ldrb r2, [r2, #0x0] ldrb r3, [r3, #0x0] ldr r0, [r4, #0x4] - bl FUN_0201974C + bl CopyGlyphToWindow add r5, #0x80 ldrb r1, [r5, #0x0] ldrb r0, [r4, #0xe] @@ -677,13 +677,13 @@ _0200288E: pop {r4-r7, pc} _020028AC: ldr r0, [r5, #0x4] - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x20] ldr r0, [r5, #0x4] - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x24] ldr r0, [r5, #0x4] - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x28] ldr r0, [r5, #0x4] bl GetWindowWidth @@ -723,7 +723,7 @@ _020028AC: lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r1, [sp, #0x20] add r0, r0, #0x2 @@ -752,7 +752,7 @@ _020028AC: lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x28] add r7, r6, #0x0 add r0, r0, #0x3 @@ -781,7 +781,7 @@ _020028AC: lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x14] add r6, #0x15 lsl r0, r0, #0x18 @@ -807,11 +807,11 @@ _020028AC: lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x4] ldr r1, [sp, #0x20] ldr r0, [r0, #0x0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldrb r1, [r4, #0x1] mov r0, #0x1f bic r1, r0 @@ -844,13 +844,13 @@ FUN_02002A00: ; 0x02002A00 sub sp, #0x18 add r5, r0, #0x0 ldr r0, [r5, #0x4] - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] ldr r0, [r5, #0x4] - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x14] ldr r0, [r5, #0x4] - bl FUN_0201AB18 + bl GetWindowY add r6, r0, #0x0 ldr r0, [r5, #0x4] bl GetWindowWidth @@ -878,7 +878,7 @@ FUN_02002A00: ; 0x02002A00 ldr r1, [sp, #0x10] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -897,11 +897,11 @@ FUN_02002A00: ; 0x02002A00 ldr r1, [sp, #0x10] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x4] ldr r1, [sp, #0x10] ldr r0, [r0, #0x0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x18 pop {r3-r7, pc} nop diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s index 9476691e..62bace0d 100644 --- a/arm9/asm/unk_0200CABC.s +++ b/arm9/asm/unk_0200CABC.s @@ -147,7 +147,7 @@ FUN_0200CB6C: ; 0x0200CB6C add r2, sp, #0x28 ldrh r2, [r2, #0x1c] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r1, sp, #0x28 ldrh r4, [r1, #0x1c] lsl r0, r7, #0x18 @@ -164,7 +164,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] ldr r3, [sp, #0x18] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect add r0, sp, #0x28 ldrb r1, [r0, #0x10] ldr r0, [sp, #0x18] @@ -185,7 +185,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x3 str r0, [sp, #0x0] @@ -201,7 +201,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x20] str r0, [sp, #0x0] @@ -218,7 +218,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, sp, #0x28 ldrb r1, [r0, #0x14] ldr r0, [sp, #0x1c] @@ -237,7 +237,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -253,7 +253,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] ldr r3, [sp, #0x18] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -269,7 +269,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x24 pop {r4-r7, pc} .balign 4 @@ -282,13 +282,13 @@ FUN_0200CCA4: ; 0x0200CCA4 add r4, r1, #0x0 add r6, r2, #0x0 add r7, r3, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x14] add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x18] add r0, r5, #0x0 bl GetWindowWidth @@ -319,13 +319,13 @@ FUN_0200CCF8: ; 0x0200CCF8 sub sp, #0x18 add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY add r7, r0, #0x0 add r0, r5, #0x0 bl GetWindowWidth @@ -352,11 +352,11 @@ FUN_0200CCF8: ; 0x0200CCF8 ldr r0, [r5, #0x0] ldr r1, [sp, #0x10] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect cmp r4, #0x0 bne _0200CD5A add r0, r5, #0x0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _0200CD5A: add sp, #0x18 pop {r3-r7, pc} @@ -454,7 +454,7 @@ FUN_0200CDD8: ; 0x0200CDD8 lsl r3, r3, #0x18 ldrh r2, [r2, #0x1c] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x14] sub r0, r0, #0x1 str r0, [sp, #0x24] @@ -475,7 +475,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -491,7 +491,7 @@ FUN_0200CDD8: ; 0x0200CDD8 ldr r3, [sp, #0x14] add r0, r7, #0x0 lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect add r0, sp, #0x38 ldrb r1, [r0, #0x10] ldr r0, [sp, #0x14] @@ -512,7 +512,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x2c] add r2, r4, #0x4 add r0, r0, #0x1 @@ -531,7 +531,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x2c] add r2, r4, #0x5 add r0, r0, #0x2 @@ -550,7 +550,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] ldr r3, [sp, #0x28] str r0, [sp, #0x0] @@ -566,7 +566,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] ldr r3, [sp, #0x24] str r0, [sp, #0x0] @@ -582,7 +582,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -599,7 +599,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -616,7 +616,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -633,7 +633,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r2, r4, #0x0 ldr r3, [sp, #0x28] add r2, #0xc @@ -653,7 +653,7 @@ FUN_0200CDD8: ; 0x0200CDD8 ldr r1, [sp, #0x10] add r0, r7, #0x0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -670,7 +670,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -687,7 +687,7 @@ FUN_0200CDD8: ; 0x0200CDD8 ldr r3, [sp, #0x14] add r0, r7, #0x0 lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -704,7 +704,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -721,7 +721,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -737,7 +737,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x30 pop {r3-r7, pc} .balign 4 @@ -749,13 +749,13 @@ FUN_0200D06C: ; 0x0200D06C add r5, r0, #0x0 add r4, r1, #0x0 add r6, r2, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x14] add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x18] add r0, r5, #0x0 bl GetWindowWidth @@ -804,13 +804,13 @@ FUN_0200D0E0: ; 0x0200D0E0 sub sp, #0x18 add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY add r7, r0, #0x0 add r0, r5, #0x0 bl GetWindowWidth @@ -837,11 +837,11 @@ FUN_0200D0E0: ; 0x0200D0E0 ldr r0, [r5, #0x0] ldr r1, [sp, #0x10] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect cmp r4, #0x0 bne _0200D142 add r0, r5, #0x0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _0200D142: add sp, #0x18 pop {r3-r7, pc} @@ -890,10 +890,10 @@ FUN_0200D18C: ; 0x0200D18C str r1, [sp, #0x24] str r0, [sp, #0x20] ldr r0, [r0, #0x0] - bl FUN_02016BB8 + bl BgConfig_GetHeapId add r6, r0, #0x0 ldr r0, [sp, #0x20] - bl FUN_0201AB08 + bl GetWindowBgId mov r1, #0x6 str r0, [sp, #0x28] add r0, r6, #0x0 @@ -901,7 +901,7 @@ FUN_0200D18C: ; 0x0200D18C bl AllocFromHeap add r5, r0, #0x0 ldr r0, [sp, #0x28] - bl FUN_020187B0 + bl BgGetCharPtr add r4, r0, #0x0 str r6, [sp, #0x0] mov r0, #0x26 @@ -978,7 +978,7 @@ _0200D1E0: ldr r0, [r0, #0x0] add r2, r5, #0x0 lsl r3, r3, #0x6 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #0x24] bl FUN_02002840 ldr r0, [sp, #0x2c] @@ -1049,7 +1049,7 @@ _0200D2D2: ldr r1, [sp, #0x8] add r2, r4, #0x0 lsl r3, r3, #0x6 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #0xc] bl FreeToHeap add r0, r4, #0x0 @@ -1095,7 +1095,7 @@ FUN_0200D300: ; 0x0200D300 add r0, r6, #0x0 mov r2, #0x20 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, [sp, #0x14] add r0, r4, #0x0 bl FreeToHeapExplicit @@ -1176,7 +1176,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldrh r2, [r2, #0x1c] lsr r3, r3, #0x18 str r0, [sp, #0x10] - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] str r0, [sp, #0x30] sub r0, #0x8 @@ -1198,7 +1198,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, sp, #0x48 ldrb r0, [r0, #0x10] add r2, r4, #0x2 @@ -1225,7 +1225,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r2, r4, #0x3 lsl r2, r2, #0x10 ldr r1, [sp, #0x18] @@ -1245,7 +1245,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x38] add r2, r4, #0x4 add r0, r0, #0x1 @@ -1264,7 +1264,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x38] add r0, r0, #0x2 str r0, [sp, #0x28] @@ -1283,7 +1283,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x34] str r0, [sp, #0x0] @@ -1298,7 +1298,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x30] str r0, [sp, #0x0] @@ -1313,7 +1313,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -1330,7 +1330,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -1346,7 +1346,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -1362,7 +1362,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -1378,7 +1378,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 add r6, r0, r6 @@ -1397,7 +1397,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1414,7 +1414,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1434,7 +1434,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1451,7 +1451,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1468,7 +1468,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1484,7 +1484,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x40 pop {r3-r7, pc} .balign 4 @@ -1496,16 +1496,16 @@ FUN_0200D678: ; 0x0200D678 str r1, [sp, #0x10] add r7, r0, #0x0 str r2, [sp, #0x14] - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x20] add r0, r7, #0x0 - bl FUN_0201AB14 + bl GetWindowX sub r0, r0, #0x7 lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x18] add r0, r7, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x1c] mov r0, #0x0 str r0, [sp, #0x24] @@ -1538,7 +1538,7 @@ _0200D6BA: ldr r1, [sp, #0x20] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0x1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -1562,17 +1562,17 @@ FUN_0200D6F8: ; 0x0200D6F8 str r1, [sp, #0x10] add r4, r2, #0x0 add r6, r3, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x14] add r0, sp, #0x30 ldrb r0, [r0, #0x10] cmp r0, #0x1 bhi _0200D756 add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x18] add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x1c] add r0, r5, #0x0 bl GetWindowWidth @@ -1598,10 +1598,10 @@ FUN_0200D6F8: ; 0x0200D6F8 b _0200D788 _0200D756: add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x20] add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x24] add r0, r5, #0x0 bl GetWindowWidth @@ -1637,15 +1637,15 @@ FUN_0200D7A0: ; 0x0200D7A0 add r5, r0, #0x0 add r4, r1, #0x0 str r2, [sp, #0x10] - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x14] cmp r4, #0x1 bhi _0200D7FE add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY add r7, r0, #0x0 add r0, r5, #0x0 bl GetWindowWidth @@ -1671,14 +1671,14 @@ FUN_0200D7A0: ; 0x0200D7A0 ldr r0, [r5, #0x0] ldr r1, [sp, #0x14] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect b _0200D846 _0200D7FE: add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY add r6, r0, #0x0 add r0, r5, #0x0 bl GetWindowWidth @@ -1704,13 +1704,13 @@ _0200D7FE: ldr r0, [r5, #0x0] ldr r1, [sp, #0x14] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect _0200D846: ldr r0, [sp, #0x10] cmp r0, #0x0 bne _0200D852 add r0, r5, #0x0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _0200D852: add sp, #0x18 pop {r3-r7, pc} @@ -1723,11 +1723,11 @@ FUN_0200D858: ; 0x0200D858 str r0, [sp, #0x20] ldr r0, [r0, #0x0] str r1, [sp, #0x24] - bl FUN_02016BB8 + bl BgConfig_GetHeapId str r0, [sp, #0x28] ldr r0, [sp, #0x20] - bl FUN_0201AB08 - bl FUN_020187B0 + bl GetWindowBgId + bl BgGetCharPtr add r5, r0, #0x0 ldr r0, [sp, #0x28] ldr r1, _0200D970 ; =0x0000048C @@ -1854,13 +1854,13 @@ FUN_0200D980: ; 0x0200D980 add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId add r4, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x18] ldr r0, [r5, #0x0] - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x1c] ldr r0, [r5, #0x0] bl GetWindowWidth @@ -1877,7 +1877,7 @@ FUN_0200D980: ; 0x0200D980 ldr r0, [r5, #0x0] mov r3, #0x80 ldr r0, [r0, #0x0] - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r7, r0, #0x2 @@ -1904,7 +1904,7 @@ FUN_0200D980: ; 0x0200D980 add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1924,7 +1924,7 @@ FUN_0200D980: ; 0x0200D980 add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x14] add r7, r0, #0x3 @@ -1946,7 +1946,7 @@ FUN_0200D980: ; 0x0200D980 add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1965,11 +1965,11 @@ FUN_0200D980: ; 0x0200D980 add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x0] add r1, r4, #0x0 ldr r0, [r0, #0x0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x24 pop {r4-r7, pc} _0200DA8A: @@ -1988,7 +1988,7 @@ _0200DA8A: add r2, r2, r3 ldr r0, [r0, #0x0] mov r3, #0x80 - bl FUN_02017E14 + bl BG_LoadCharTilesData cmp r6, #0x0 beq _0200DB72 ldr r0, [sp, #0x1c] @@ -2017,7 +2017,7 @@ _0200DA8A: add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -2037,7 +2037,7 @@ _0200DA8A: add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x10] add r7, r0, #0x3 @@ -2059,7 +2059,7 @@ _0200DA8A: add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -2078,11 +2078,11 @@ _0200DA8A: add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x0] add r1, r4, #0x0 ldr r0, [r0, #0x0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _0200DB72: add sp, #0x24 pop {r4-r7, pc} @@ -2228,7 +2228,7 @@ FUN_0200DC4C: ; 0x0200DC4C bl FUN_0200DFD8 add r0, r6, #0x0 add r1, r7, #0x0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _0200DCA0 ; =0x0000016F add r0, r4, r0 add sp, #0xc @@ -2266,7 +2266,7 @@ FUN_0200DCA4: ; 0x0200DCA4 bl FUN_0200DFD8 add r0, r6, #0x0 add r1, r7, #0x0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _0200DCF4 ; =0x0000016F add r0, r4, r0 add sp, #0xc @@ -2646,7 +2646,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r3, r3, #0x18 add r6, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x1 ldrb r0, [r5, r3] @@ -2667,7 +2667,7 @@ FUN_0200DFD8: ; 0x0200DFD8 ldrb r3, [r5, r3] ldr r0, [r5, r0] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x2 ldrb r0, [r5, r3] @@ -2690,7 +2690,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x4 ldrb r0, [r5, r3] @@ -2707,7 +2707,7 @@ FUN_0200DFD8: ; 0x0200DFD8 ldrb r3, [r5, r3] ldr r0, [r5, r0] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x3 ldrb r0, [r5, r3] @@ -2728,7 +2728,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x5 ldrb r0, [r5, r3] @@ -2749,7 +2749,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x6 ldrb r0, [r5, r3] @@ -2772,7 +2772,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x7 ldrb r0, [r5, r3] @@ -2793,7 +2793,7 @@ FUN_0200DFD8: ; 0x0200DFD8 ldrb r3, [r5, r3] ldr r0, [r5, r0] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r6, #0x8 ldrb r0, [r5, r3] @@ -2816,13 +2816,13 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r1, #0x5a lsl r1, r1, #0x2 ldr r0, [r5, r1] add r1, r1, #0x4 ldrb r1, [r5, r1] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r4-r6, pc} nop @@ -2853,13 +2853,13 @@ FUN_0200E188: ; 0x0200E188 sub r3, r3, #0x1 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r1, #0x5a lsl r1, r1, #0x2 ldr r0, [r4, r1] add r1, r1, #0x4 ldrb r1, [r4, r1] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s index 038bee3f..e54565f1 100644 --- a/arm9/asm/unk_02012CC8.s +++ b/arm9/asm/unk_02012CC8.s @@ -1565,6 +1565,6 @@ ListMenuUpdateCursorObj: ; 0x020136F8 add r3, r4, #0x0 bl AddTextPrinterParameterized2 add r0, r5, #0x0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4-r6, pc} diff --git a/arm9/asm/unk_020142EC.s b/arm9/asm/unk_020142EC.s index c933b981..5526b320 100644 --- a/arm9/asm/unk_020142EC.s +++ b/arm9/asm/unk_020142EC.s @@ -258,7 +258,7 @@ FUN_020144B0: ; 0x020144B0 mov r2, #0x20 lsl r3, r3, #0x15 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData pop {r3, pc} .balign 4 @@ -272,7 +272,7 @@ FUN_020144C8: ; 0x020144C8 mov r2, #0x20 lsl r3, r3, #0x15 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData pop {r3, pc} .balign 4 diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s index a2515a3d..201e2a14 100644 --- a/arm9/asm/unk_02014590.s +++ b/arm9/asm/unk_02014590.s @@ -557,12 +557,12 @@ FUN_02014970: ; 0x02014970 lsl r1, r1, #0x18 ldr r0, [r6, #0x0] lsr r1, r1, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r1, [r6, #0x4] ldr r0, [r6, #0x0] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r4, #0x0 add r5, r6, #0x0 _020149B4: @@ -742,7 +742,7 @@ FUN_02014AD4: ; 0x02014AD4 ldr r0, [r4, #0x0] ldr r3, [r3, #0x10] lsr r1, r1, #0x18 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0x0 bl FUN_0200CAB4 ldr r0, [r4, #0x8] @@ -817,11 +817,11 @@ FUN_02014B58: ; 0x02014B58 lsr r2, r2, #0x18 lsr r3, r3, #0x18 add r5, r0, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect lsl r1, r4, #0x18 add r0, r5, #0x0 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r3-r6, pc} .balign 4 diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index 985c0e82..7240c93f 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -132,18 +132,18 @@ _02033FA4: ldr r0, _02034170 ; =UNK_020EECD0 bl GX_SetBanks add r0, r4, #0x0 - bl FUN_02016B94 + bl BgConfig_Alloc add r6, r0, #0x0 ldr r0, _02034174 ; =UNK_020EECA4 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0x0 ldr r2, _02034178 ; =UNK_020EECB4 add r0, r6, #0x0 add r3, r1, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r6, #0x0 mov r1, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0x0 str r1, [sp, #0x0] ldr r2, _0203417C ; =0x000001F7 @@ -159,13 +159,13 @@ _02033FA4: mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _02034180 ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _02034180 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x1 mov r1, #0x1a mov r2, #0xc8 @@ -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..66bb542c 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -80,18 +80,18 @@ FUN_02034188: ; 0x02034188 ldr r0, _02034380 ; =UNK_020EED2C bl GX_SetBanks add r0, r4, #0x0 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [sp, #0x10] ldr r0, _02034384 ; =UNK_020EED00 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0x0 ldr r0, [sp, #0x10] ldr r2, _02034388 ; =UNK_020EED10 add r3, r1, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [sp, #0x10] mov r1, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0x0 str r1, [sp, #0x0] ldr r0, [sp, #0x10] @@ -107,13 +107,13 @@ FUN_02034188: ; 0x02034188 mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _02034390 ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _02034390 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r2, _02034394 ; =0x00000265 mov r0, #0x1 mov r1, #0x1a @@ -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,36 +189,36 @@ _020342E4: b _020342E4 _02034308: add r0, sp, #0x14 - bl FUN_02019178 + bl RemoveWindow ldr r0, [sp, #0xc] bl DestroyMsgData mov r0, #0x0 add r1, r0, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x1 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x2 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x3 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x4 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x5 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x6 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x7 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [sp, #0x10] mov r1, #0x0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [sp, #0x10] bl FreeToHeap add sp, #0x24 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 03a16da6..245c750f 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -552,12 +552,12 @@ _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] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0x0 bl FreeToHeap ldr r0, [r5, #0x34] @@ -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 @@ -773,7 +773,7 @@ _02035614: bl FUN_02001B8C str r0, [r4, #0x20] add r0, r4, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] ldr r0, [r0, #0xc] bl Sav2_PlayerData_GetProfileAddr @@ -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 @@ -1058,7 +1058,7 @@ _0203584C: bl DestroyMsgData add r5, #0x10 add r0, r5, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _0203588E: add sp, #0x20 pop {r3-r7, pc} @@ -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 @@ -2657,9 +2657,9 @@ FUN_020365BC: ; 0x020365BC bl FUN_0200CCF8 ldrb r1, [r4, #0x4] ldr r0, [r4, #0x0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0x0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0x0 bl FUN_020358A0 mov r0, #0x4 @@ -2927,9 +2927,9 @@ FUN_020367E8: ; 0x020367E8 bl FUN_0200CCF8 ldrb r1, [r4, #0x4] ldr r0, [r4, #0x0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer 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..68018241 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -34,12 +34,12 @@ FUN_02048120: ; 0x02048120 ldr r0, _02048158 ; =UNK_020F465C bl GX_SetBanks ldr r0, _0204815C ; =UNK_020F4630 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r2, _02048160 ; =UNK_020F4640 add r0, r4, #0x0 mov r1, #0x3 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x20 str r0, [sp, #0x0] mov r0, #0xb @@ -77,7 +77,7 @@ _0204817A: str r0, [r4, #0x0] str r5, [r4, #0x4] mov r0, #0xb - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x8] bl FUN_02048120 mov r2, #0x52 @@ -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,14 +221,14 @@ _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] bl DestroyMsgData ldr r0, [r4, #0x8] mov r1, #0x3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x8] bl FreeToHeap add r0, r4, #0x0 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 47b2c109..7e896527 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -352,20 +352,20 @@ FUN_02048764: ; 0x02048764 orr r0, r1 strh r0, [r2, #0x0] ldr r0, _020487DC ; =UNK_020F4684 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #0x3 mov r1, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r0, [r4, #0x8] ldr r2, _020487E0 ; =UNK_020F4694 mov r1, #0x3 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r1, #0x20 mov r0, #0x3 mov r2, #0x0 add r3, r1, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0x0 str r2, [sp, #0x0] mov r0, #0x20 @@ -376,10 +376,10 @@ FUN_02048764: ; 0x02048764 ldr r0, [r4, #0x8] mov r1, #0x3 add r3, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r4, #0x8] mov r1, #0x3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} nop @@ -514,15 +514,15 @@ 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 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r3-r5, pc} .balign 4 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..7a921b4a 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 @@ -1248,35 +1248,35 @@ FUN_02051810: ; 0x02051810 bl FUN_0200D0E0 add r0, r5, #0x0 add r0, #0x14 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _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 @@ -1996,7 +1996,7 @@ _02051DE0: lsl r3, r3, #0x4 bl ListMenuUpdateCursorObj ldr r0, [r4, #0x7c] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0x0 add sp, #0x8 pop {r4, pc} @@ -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_02053750.s b/arm9/asm/unk_02053750.s index 6c8bd92b..d20950c3 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -305,7 +305,7 @@ _02053912: add r1, sp, #0xc mov r2, #0x2 mov r3, #0x0 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #0x1 mov r1, #0x0 bl GX_EngineBToggleLayers 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..2813b999 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1067,7 +1067,7 @@ FUN_02062DB0: ; 0x02062DB0 mov r0, #0x1 lsl r1, r1, #0x6 mov r2, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0x0 str r2, [sp, #0x0] mov r0, #0x20 @@ -1080,33 +1080,33 @@ FUN_02062DB0: ; 0x02062DB0 ldr r0, [r0, #0x0] mov r1, #0x1 add r3, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0x0 add r0, #0xd0 ldr r0, [r0, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x1 add r1, r0, #0x0 - bl FUN_0201797C + bl ToggleBgLayer add r0, r4, #0x0 add r0, #0xd0 ldr r0, [r0, #0x0] mov r1, #0x0 - bl FUN_02018884 + bl GetBgPriority strh r0, [r4, #0x10] add r0, r4, #0x0 add r0, #0xd0 ldr r0, [r0, #0x0] mov r1, #0x1 - bl FUN_02018884 + bl GetBgPriority strh r0, [r4, #0x12] mov r0, #0x0 mov r1, #0x2 - bl FUN_020178BC + bl SetBgPriority mov r0, #0x1 add r1, r0, #0x0 - bl FUN_020178BC + bl SetBgPriority ldrh r0, [r4, #0x1c] ldr r2, _02062EB8 ; =0x000003E2 mov r1, #0x3 @@ -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 @@ -1191,16 +1191,16 @@ FUN_02062EC4: ; 0x02062EC4 bl FUN_0200D0E0 add r0, r4, #0x0 add r0, #0xe4 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0x0 add r0, #0xe4 - bl FUN_02019178 + bl RemoveWindow mov r1, #0xad ldr r3, [r4, #0x0] mov r0, #0x1 lsl r1, r1, #0x6 mov r2, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0x0 str r2, [sp, #0x0] mov r0, #0x20 @@ -1213,25 +1213,25 @@ FUN_02062EC4: ; 0x02062EC4 ldr r0, [r0, #0x0] mov r1, #0x1 add r3, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0x0 add r0, #0xd0 ldr r0, [r0, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x1 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer ldrh r1, [r4, #0x10] mov r0, #0x0 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldrh r1, [r4, #0x12] mov r0, #0x1 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add sp, #0x10 pop {r4, pc} @@ -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 @@ -1494,7 +1494,7 @@ _02063094: add r5, #0xd0 ldr r0, [r5, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r4-r7, pc} .balign 4 @@ -1522,14 +1522,14 @@ FUN_02063178: ; 0x02063178 bl ListMenuItems_dtor add r0, r4, #0x0 add r0, #0xd4 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0x0 add r0, #0xd4 mov r1, #0x0 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] @@ -1538,7 +1538,7 @@ FUN_02063178: ; 0x02063178 add r4, #0xd0 ldr r0, [r4, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} thumb_func_start FUN_020631C8 @@ -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 @@ -1916,7 +1916,7 @@ FUN_02063430: ; 0x02063430 add r4, #0xd0 ldr r0, [r4, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3-r4, pc} nop @@ -1929,20 +1929,20 @@ FUN_020634DC: ; 0x020634DC push {r4, lr} add r4, r0, #0x0 add r0, #0xd4 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0x0 add r0, #0xd4 mov r1, #0x0 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 + bl ClearWindowTilemapAndCopyToVram 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..cfddf2f5 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 @@ -1144,7 +1144,7 @@ _02065C64: lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r1, _02065CF0 ; =0x0000013B mov r0, #0xf ldrb r2, [r5, r1] @@ -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 @@ -1376,7 +1376,7 @@ _02065E14: lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r1, _02065EE0 ; =0x0000013B mov r0, #0xf ldrb r2, [r5, r1] @@ -1426,7 +1426,7 @@ FUN_02065EF8: ; 0x02065EF8 mov r0, #0x65 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x65 lsl r0, r0, #0x2 add r0, r4, r0 @@ -1435,11 +1435,11 @@ 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 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram 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] @@ -1471,7 +1471,7 @@ _02065F7C: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x4 pop {r3-r4, pc} @@ -1483,7 +1483,7 @@ FUN_02065F8C: ; 0x02065F8C mov r0, #0x5d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x5d lsl r0, r0, #0x2 add r0, r4, r0 @@ -1503,14 +1503,14 @@ 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 lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x4 pop {r3-r4, pc} .balign 4 @@ -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 @@ -2021,11 +2021,11 @@ FUN_020663D4: ; 0x020663D4 mov r0, #0x61 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram 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 @@ -2151,7 +2151,7 @@ FUN_020664D8: ; 0x020664D8 mov r0, #0x61 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram pop {r4, pc} thumb_func_start FUN_020664F4 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 9b642d7a..e7ebe1cf 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -113,7 +113,7 @@ FUN_0206C700: ; 0x0206C700 add r3, r5, #0x0 bl FUN_02003008 add r0, r5, #0x0 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x0] add r0, r5, #0x0 mov r1, #0x1 @@ -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 @@ -297,7 +297,7 @@ FUN_0206C92C: ; 0x0206C92C bl Main_SetVBlankIntrCB ldr r0, [r4, #0x4] mov r1, #0x1 - bl FUN_020191A4 + bl WindowArray_dtor ldr r0, [r4, #0x14] mov r1, #0x0 bl FUN_02003038 @@ -2280,7 +2280,7 @@ _0206D9C6: ldmia r6!, {r0-r1} stmia r3!, {r0-r1} add r0, r2, #0x0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r6, _0206DC30 ; =UNK_020F837C add r3, sp, #0x64 mov r2, #0xa @@ -2295,26 +2295,26 @@ _0206DA26: add r0, r4, #0x0 add r2, sp, #0x64 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0x0 mov r1, #0x2 add r2, sp, #0x80 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0x0 mov r1, #0x3 add r2, sp, #0x9c mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _0206DC34 ; =0x04000008 mov r0, #0x3 ldrh r2, [r1, #0x0] @@ -2338,10 +2338,10 @@ _0206DA26: str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r5, #0x2c] bl Options_GetFrame add r6, r0, #0x0 @@ -2538,16 +2538,16 @@ FUN_0206DC48: ; 0x0206DC48 bl GX_EngineAToggleLayers add r0, r4, #0x0 mov r1, #0x1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .balign 4 @@ -2644,7 +2644,7 @@ FUN_0206DD08: ; 0x0206DD08 ldr r0, [r4, #0x14] bl FUN_0200372C ldr r0, [r4, #0x0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0206DD64 ; =0x027E0000 ldr r1, _0206DD68 ; =0x00003FF8 mov r0, #0x1 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index c4933942..66967f99 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -774,7 +774,7 @@ _0206F914: mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r0, _0206F974 ; =0x000006FC mov r1, #0x0 ldr r0, [r4, r0] @@ -1037,7 +1037,7 @@ _0206FB54: .word 0x00000B34 FUN_0206FB58: ; 0x0206FB58 push {r3, lr} ldr r0, [r0, #0x0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_0200BC30 ldr r3, _0206FB78 ; =0x027E0000 @@ -1083,7 +1083,7 @@ FUN_0206FBA0: ; 0x0206FBA0 ldmia r5!, {r0-r1} stmia r3!, {r0-r1} add r0, r2, #0x0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0206FCBC ; =UNK_020F94D4 add r3, sp, #0x8c ldmia r5!, {r0-r1} @@ -1098,10 +1098,10 @@ FUN_0206FBA0: ; 0x0206FBA0 str r0, [r3, #0x0] add r0, r4, #0x0 add r3, r1, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0206FCC0 ; =UNK_020F94F0 add r3, sp, #0x70 ldmia r5!, {r0-r1} @@ -1116,10 +1116,10 @@ FUN_0206FBA0: ; 0x0206FBA0 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0206FCC4 ; =UNK_020F949C add r3, sp, #0x54 ldmia r5!, {r0-r1} @@ -1134,10 +1134,10 @@ FUN_0206FBA0: ; 0x0206FBA0 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0206FCC8 ; =UNK_020F9480 add r3, sp, #0x38 ldmia r5!, {r0-r1} @@ -1152,7 +1152,7 @@ FUN_0206FBA0: ; 0x0206FBA0 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0206FCCC ; =UNK_020F950C add r3, sp, #0x1c ldmia r5!, {r0-r1} @@ -1167,10 +1167,10 @@ FUN_0206FBA0: ; 0x0206FBA0 add r0, r4, #0x0 mov r1, #0x4 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0206FCD0 ; =UNK_020F9528 add r3, sp, #0x0 ldmia r5!, {r0-r1} @@ -1185,17 +1185,17 @@ FUN_0206FBA0: ; 0x0206FBA0 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x0 mov r1, #0x20 add r2, r0, #0x0 mov r3, #0xc - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x4 mov r1, #0x20 mov r2, #0x0 mov r3, #0xc - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0xb8 pop {r3-r5, pc} nop @@ -1219,22 +1219,22 @@ FUN_0206FCD4: ; 0x0206FCD4 bl GX_EngineBToggleLayers add r0, r4, #0x0 mov r1, #0x5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0xc add r1, r4, #0x0 bl FreeToHeapExplicit @@ -1282,7 +1282,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r3, #0x0 lsl r2, r2, #0x10 lsr r2, r2, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, [sp, #0x10] ldr r0, _0206FE6C ; =0x000004A4 ldr r1, [r1, #0xc] @@ -1382,10 +1382,10 @@ FUN_0206FD24: ; 0x0206FD24 bl FUN_020724D4 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x4 mov r1, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x14 pop {r4-r5, pc} .balign 4 @@ -1408,7 +1408,7 @@ FUN_0206FE74: ; 0x0206FE74 ldr r1, _0206FF54 ; =0x000005A4 str r0, [r6, r1] mov r0, #0xc - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r6, #0x0] ldr r0, _0206FF54 ; =0x000005A4 ldr r1, [r6, r0] @@ -2090,7 +2090,7 @@ _020703F2: mov r1, #0x2 add r2, r6, #0x0 add r3, r7, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect add r0, sp, #0x20 ldrb r0, [r0, #0x10] cmp r0, #0x0 @@ -2111,7 +2111,7 @@ _020703F2: mov r1, #0x2 mov r2, #0x17 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect _0207044C: mov r0, #0x10 str r0, [sp, #0x0] @@ -2125,7 +2125,7 @@ _0207044C: mov r1, #0x2 add r2, r6, #0x0 add r3, r7, #0x0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r5, #0x0 add r1, r4, #0x0 bl FUN_020709FC @@ -2185,10 +2185,10 @@ _020704CC: _020704D2: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} .balign 4 _020704E4: .word 0x000005A4 @@ -2775,7 +2775,7 @@ FUN_02070988: ; 0x02070988 mov r1, #0x2 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect mov r0, #0x10 str r0, [sp, #0x0] mov r0, #0x6 @@ -2788,7 +2788,7 @@ FUN_02070988: ; 0x02070988 mov r1, #0x2 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r5, #0x0 add r1, r7, #0x0 mov r2, #0x7 @@ -2868,7 +2868,7 @@ _02070A60: mov r0, #0x2 mov r2, #0x10 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData pop {r4-r6, pc} .balign 4 _02070A78: .word 0x000005A4 @@ -3147,7 +3147,7 @@ _02070C6E: bl FUN_020717E8 ldr r0, [r5, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _02070CA6: cmp r4, #0x6 beq _02070CB2 @@ -3433,7 +3433,7 @@ _02070ECC: bl FUN_020717E8 ldr r0, [r5, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _02070EFE: add sp, #0x10 pop {r4-r6, pc} @@ -3480,7 +3480,7 @@ _02070F30: bl FUN_020717E8 ldr r0, [r4, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0xb2 lsl r0, r0, #0x4 ldrb r1, [r4, r0] @@ -3495,7 +3495,7 @@ _02070F70: bl FUN_020717E8 ldr r0, [r4, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0xb2 mov r1, #0x0 lsl r0, r0, #0x4 @@ -4602,7 +4602,7 @@ FUN_020717E8: ; 0x020717E8 add r5, r1, #0x0 add r4, r2, #0x0 mov r1, #0x4 - bl FUN_0201886C + bl GetBgTilemapBuffer lsl r1, r5, #0x1 mov r3, #0x19 add r5, r4, #0x0 @@ -4696,7 +4696,7 @@ _02071886: ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #0x4 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0x0 bne _020718BA mov r0, #0x0 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 79a7eb39..0ac5ab20 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 @@ -708,7 +708,7 @@ FUN_02072A54: ; 0x02072A54 cmp r0, #0x1 bne _02072A9C add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3-r7, pc} _02072A9C: @@ -766,7 +766,7 @@ _02072ADC: bl AddTextPrinterParameterized2 _02072B0A: add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3-r7, pc} .balign 4 @@ -794,7 +794,7 @@ FUN_02072B20: ; 0x02072B20 cmp r1, #0x7 beq _02072B4C add r0, r4, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, pc} _02072B4C: @@ -814,7 +814,7 @@ _02072B4C: mov r3, #0x3 bl FUN_0200BA78 add r0, r4, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, pc} nop @@ -847,7 +847,7 @@ FUN_02072B7C: ; 0x02072B7C mov r3, #0x1 bl FUN_0200B9EC add r0, r4, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4-r5, pc} .balign 4 @@ -872,7 +872,7 @@ FUN_02072BBC: ; 0x02072BBC add r3, r1, #0x0 bl FillWindowPixelRect add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x8 pop {r3-r5, pc} @@ -903,7 +903,7 @@ FUN_02072BE8: ; 0x02072BE8 mov r3, #0x0 bl FUN_0200B9EC add r0, r4, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4-r5, pc} .balign 4 @@ -948,7 +948,7 @@ _02072C64: ; jump table (using 16-bit offset) .short _02072C78 - _02072C64 - 2; case 4 _02072C6E: add r0, r4, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4-r7, pc} _02072C78: @@ -961,7 +961,7 @@ _02072C78: add r1, r5, r1 mov r2, #0x4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _02072CBE _02072C90: ldrb r3, [r4, #0x9] @@ -973,7 +973,7 @@ _02072C90: add r1, r5, r1 mov r2, #0x4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _02072CBE _02072CA8: ldrb r3, [r4, #0x9] @@ -985,7 +985,7 @@ _02072CA8: add r1, r5, r1 mov r2, #0x4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData _02072CBE: ldr r0, [sp, #0x8] ldrh r1, [r7, r6] @@ -1018,7 +1018,7 @@ _02072CBE: mov r3, #0x5 bl FillWindowPixelRect add r0, r4, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4-r7, pc} .balign 4 @@ -1081,17 +1081,17 @@ FUN_02072D1C: ; 0x02072D1C ldr r1, [sp, #0x0] ldr r0, [sp, #0x4] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x8] add r0, r7, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [sp, #0xc] ldr r0, [sp, #0x10] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x14] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3-r7, pc} _02072DB0: @@ -1122,22 +1122,22 @@ FUN_02072DDC: ; 0x02072DDC add r1, r5, #0x4 lsl r0, r4, #0x4 add r0, r1, r0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0x1 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0x2 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0x3 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r3-r5, pc} thumb_func_start FUN_02072E14 @@ -1149,22 +1149,22 @@ FUN_02072E14: ; 0x02072E14 add r1, r5, #0x4 lsl r0, r4, #0x4 add r0, r1, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x1 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x2 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x3 add r1, r5, #0x4 lsl r0, r0, #0x4 add r0, r1, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer pop {r3-r5, pc} thumb_func_start FUN_02072E4C @@ -1501,7 +1501,7 @@ FUN_02073094: ; 0x02073094 mov r0, #0x79 lsl r0, r0, #0x2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _020730FE: mov r0, #0x2 tst r0, r4 @@ -1535,7 +1535,7 @@ _020730FE: mov r0, #0x7d lsl r0, r0, #0x2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _02073148: add sp, #0x10 pop {r3-r5, pc} @@ -1586,7 +1586,7 @@ _02073198: mov r1, #0x1 bl AddTextPrinterParameterized add r0, r4, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r3-r6, pc} .balign 4 @@ -1797,7 +1797,7 @@ _02073332: ldr r0, [sp, #0x10] bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4-r7, pc} nop @@ -1860,7 +1860,7 @@ _020733B4: ldr r0, [sp, #0x10] bl String_dtor add r0, r4, r7 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4-r7, pc} .balign 4 @@ -1908,7 +1908,7 @@ _02073416: add r0, r5, #0x0 bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3-r7, pc} .balign 4 @@ -1966,7 +1966,7 @@ _02073490: add r0, r5, #0x0 bl String_dtor add r0, r4, r7 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3-r7, pc} .balign 4 @@ -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 @@ -2133,7 +2133,7 @@ _0207356C: mov r0, #0x95 lsl r0, r0, #0x2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x2c pop {r4-r7, pc} .balign 4 @@ -2220,7 +2220,7 @@ _0207366E: mov r0, #0x95 lsl r0, r0, #0x2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4-r7, pc} nop @@ -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..44777340 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -39,7 +39,7 @@ FUN_02073DB4: ; 0x02073DB4 mov r0, #0x95 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r0, _02073DEC ; =0x000006FC mov r1, #0x0 ldr r0, [r4, r0] @@ -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 @@ -994,11 +994,11 @@ _020745DA: strb r1, [r6, r0] ldr r0, [r6, #0x0] mov r1, #0x2 - bl FUN_0201886C + bl GetBgTilemapBuffer str r0, [sp, #0x14] ldr r0, [r6, #0x0] mov r1, #0x1 - bl FUN_0201886C + bl GetBgTilemapBuffer ldr r1, _020746B4 ; =0x00000B0C str r0, [sp, #0x10] ldrb r3, [r6, r1] @@ -1155,10 +1155,10 @@ _0207470C: bl FUN_0207499C ldr r0, [r5, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, _02074838 ; =0x00000306 ldrb r1, [r4, r0] cmp r1, #0x10 @@ -1206,10 +1206,10 @@ _02074770: bl FUN_0207499C ldr r0, [r5, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, _02074838 ; =0x00000306 ldrb r1, [r4, r0] cmp r1, #0x0 @@ -1303,7 +1303,7 @@ FUN_02074848: ; 0x02074848 ldr r3, [sp, #0x20] mov r1, #0x2 mov r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect str r6, [sp, #0x0] mov r1, #0x10 str r1, [sp, #0x4] @@ -1314,7 +1314,7 @@ FUN_02074848: ; 0x02074848 ldr r3, [sp, #0x20] mov r1, #0x1 mov r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r1, r4, r0 ldr r0, _02074994 ; =0x00000302 @@ -1345,7 +1345,7 @@ FUN_02074848: ; 0x02074848 ldr r2, [sp, #0x20] mov r1, #0x2 add r3, r6, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, _02074998 ; =0x00000306 mov r3, #0x10 ldrb r2, [r4, r0] @@ -1368,7 +1368,7 @@ FUN_02074848: ; 0x02074848 ldr r2, [sp, #0x20] mov r1, #0x1 add r3, r6, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect add sp, #0x28 pop {r3-r7, pc} _02074918: @@ -1399,7 +1399,7 @@ _02074918: mov r1, #0x2 lsr r2, r2, #0x18 add r3, r6, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, _02074998 ; =0x00000306 ldrb r2, [r4, r0] mov r0, #0x10 @@ -1426,7 +1426,7 @@ _02074918: mov r1, #0x1 lsr r2, r2, #0x18 add r3, r6, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect add sp, #0x28 pop {r3-r7, pc} nop diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index f28e35ea..adf8cadd 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -742,7 +742,7 @@ _020772FE: add r4, r0, #0x0 bl memset mov r0, #0x12 - bl FUN_02016B94 + bl BgConfig_Alloc mov r1, #0x16 lsl r1, r1, #0x4 str r0, [r4, r1] @@ -1526,7 +1526,7 @@ _020779C2: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer bl FUN_0201D12C bl FUN_0201E08C mov r0, #0x16 @@ -1716,7 +1716,7 @@ FUN_02077B44: ; 0x02077B44 ldmia r5!, {r0-r1} stmia r3!, {r0-r1} add r0, r2, #0x0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02077C6C ; =UNK_020F9EC0 add r3, sp, #0x54 ldmia r5!, {r0-r1} @@ -1731,10 +1731,10 @@ FUN_02077B44: ; 0x02077B44 str r0, [r3, #0x0] add r0, r4, #0x0 add r3, r1, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02077C70 ; =UNK_020F9FA0 add r3, sp, #0x38 ldmia r5!, {r0-r1} @@ -1749,10 +1749,10 @@ FUN_02077B44: ; 0x02077B44 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02077C74 ; =UNK_020FA064 add r3, sp, #0x1c ldmia r5!, {r0-r1} @@ -1767,10 +1767,10 @@ FUN_02077B44: ; 0x02077B44 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02077C78 ; =UNK_020F9DFC add r3, sp, #0x0 ldmia r5!, {r0-r1} @@ -1785,22 +1785,22 @@ FUN_02077B44: ; 0x02077B44 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x0 bl FUN_02077C84 mov r0, #0x0 mov r1, #0x20 add r2, r0, #0x0 mov r3, #0x12 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x4 mov r1, #0x20 mov r2, #0x0 mov r3, #0x12 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x1 lsl r0, r0, #0x1a add r4, r0, #0x0 @@ -1911,7 +1911,7 @@ FUN_02077CD4: ; 0x02077CD4 ldr r3, [r3, r5] lsr r1, r1, #0x18 mov r2, #0x0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r3, [r4, r6] mov r5, #0xc mov r0, #0x16 @@ -1924,7 +1924,7 @@ FUN_02077CD4: ; 0x02077CD4 ldr r3, [r3, r6] lsr r1, r1, #0x18 mov r2, #0x3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r6, _02077E80 ; =0x00000464 mov r0, #0x1 ldr r1, [r4, r6] @@ -1941,7 +1941,7 @@ FUN_02077CD4: ; 0x02077CD4 ldr r3, [r3, r5] lsr r1, r1, #0x18 mov r2, #0x0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, [r4, r6] mov r0, #0x1 add r3, r1, #0x0 @@ -1957,7 +1957,7 @@ FUN_02077CD4: ; 0x02077CD4 ldr r3, [r3, r6] lsr r1, r1, #0x18 mov r2, #0x3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0x46 ldr r0, _02077E84 ; =0x0000FFFF lsl r1, r1, #0x2 @@ -2231,23 +2231,23 @@ 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 blt _02077FB0 add r0, r6, #0x0 mov r1, #0x4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r6, #0x0 mov r1, #0x2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r6, #0x0 mov r1, #0x1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r6, #0x0 mov r1, #0x0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x12 add r1, r6, #0x0 bl FreeToHeapExplicit @@ -2281,7 +2281,7 @@ FUN_02077FE8: ; 0x02077FE8 bl GfGfxLoader_GXLoadPal mov r0, #0x4 mov r1, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x2 @@ -3159,14 +3159,14 @@ _0207873C: lsr r1, r1, #0x18 mov r2, #0x0 mov r3, #0xee - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #0x3 lsl r1, r6, #0x18 add r3, r2, #0x0 ldr r0, [sp, #0x10] lsr r1, r1, #0x18 sub r3, #0x53 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5, #0x0] add sp, #0x28 add r0, r0, #0x1 @@ -3236,14 +3236,14 @@ _020787D8: ldr r3, [r4, r3] lsr r1, r1, #0x18 mov r2, #0x0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, [sp, #0x18] ldr r0, [sp, #0x10] lsl r1, r1, #0x18 ldr r3, [r5, r7] lsr r1, r1, #0x18 mov r2, #0x3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0x28 pop {r3-r7, pc} _020787FC: @@ -3275,7 +3275,7 @@ _02078820: ldr r3, [r4, r3] lsr r1, r1, #0x18 mov r2, #0x0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, [sp, #0x18] ldr r3, [sp, #0x20] lsl r1, r1, #0x18 @@ -3283,7 +3283,7 @@ _02078820: ldr r3, [r7, r3] lsr r1, r1, #0x18 mov r2, #0x3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [sp, #0x24] mov r1, #0xa ldr r0, [r4, r0] @@ -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 @@ -3680,13 +3680,13 @@ FUN_02078B88: ; 0x02078B88 lsl r0, r4, #0x18 lsr r0, r0, #0x18 mov r1, #0x1 - bl FUN_020178BC + bl SetBgPriority mov r0, #0x1 eor r0, r4 lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r1, #0x2 - bl FUN_020178BC + bl SetBgPriority pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_020799E8.s b/arm9/asm/unk_020799E8.s index 308fcf1b..f7318276 100644 --- a/arm9/asm/unk_020799E8.s +++ b/arm9/asm/unk_020799E8.s @@ -281,7 +281,7 @@ _02079BAE: add r0, r6, #0x0 ldr r2, [r2, #0x14] add r3, r4, #0x0 - bl FUN_02017E14 + bl BG_LoadCharTilesData b _02079C36 _02079BC6: add r0, r7, #0x0 @@ -297,7 +297,7 @@ _02079BDA: lsl r1, r5, #0x18 add r0, r6, #0x0 lsr r1, r1, #0x18 - bl FUN_0201886C + bl GetBgTilemapBuffer cmp r0, #0x0 beq _02079BF8 ldr r2, [sp, #0xc] @@ -306,7 +306,7 @@ _02079BDA: lsr r1, r1, #0x18 add r2, #0xc add r3, r4, #0x0 - bl FUN_02017DFC + bl BG_LoadScreenTilemapData _02079BF8: add r0, sp, #0x18 ldrh r0, [r0, #0x20] @@ -317,7 +317,7 @@ _02079BF8: add r0, r6, #0x0 add r2, #0xc add r3, r4, #0x0 - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram b _02079C36 _02079C10: add r0, r7, #0x0 @@ -337,7 +337,7 @@ _02079C24: ldr r1, [r1, #0xc] lsr r0, r0, #0x18 add r2, r4, #0x0 - bl FUN_02017FB4 + bl BG_LoadPlttData _02079C36: add r0, r7, #0x0 bl FreeToHeap diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 07974952..f69ef230 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -107,7 +107,7 @@ FUN_02079C7C: ; 0x02079C7C lsl r1, r1, #0x2 str r0, [r5, r1] mov r0, #0x13 - bl FUN_02016B94 + bl BgConfig_Alloc mov r1, #0x1 str r0, [r5, #0x0] mov r0, #0x13 @@ -350,7 +350,7 @@ FUN_02079F24: ; 0x02079F24 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates mov r0, #0xae lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -400,7 +400,7 @@ FUN_02079F78: ; 0x02079F78 ldmia r5!, {r0-r1} stmia r3!, {r0-r1} add r0, r2, #0x0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0207A078 ; =UNK_020FA650 add r3, sp, #0x70 ldmia r5!, {r0-r1} @@ -415,10 +415,10 @@ FUN_02079F78: ; 0x02079F78 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0207A07C ; =UNK_020FA66C add r3, sp, #0x54 ldmia r5!, {r0-r1} @@ -433,15 +433,15 @@ FUN_02079F78: ; 0x02079F78 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0x0 mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r5, _0207A080 ; =UNK_020FA688 add r3, sp, #0x38 ldmia r5!, {r0-r1} @@ -456,7 +456,7 @@ FUN_02079F78: ; 0x02079F78 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0207A084 ; =UNK_020FA6A4 add r3, sp, #0x1c ldmia r5!, {r0-r1} @@ -471,10 +471,10 @@ FUN_02079F78: ; 0x02079F78 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0207A088 ; =UNK_020FA634 add r3, sp, #0x0 ldmia r5!, {r0-r1} @@ -489,17 +489,17 @@ FUN_02079F78: ; 0x02079F78 str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x1 mov r1, #0x20 mov r2, #0x0 mov r3, #0x13 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x4 mov r1, #0x20 mov r2, #0x0 mov r3, #0x13 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4-r5, pc} nop @@ -518,19 +518,19 @@ FUN_0207A08C: ; 0x0207A08C bl GX_DisableEngineBLayers add r0, r4, #0x0 mov r1, #0x5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 mov r1, #0x1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x13 add r1, r4, #0x0 bl FreeToHeapExplicit @@ -2600,10 +2600,10 @@ _0207B0EC: ldr r0, [r5, #0x0] mov r1, #0x1 mov r3, #0xe - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x0] mov r1, #0x1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0x0 bl FUN_0207DD88 add r0, r5, #0x0 @@ -2760,10 +2760,10 @@ _0207B256: ldr r0, [r5, #0x0] mov r1, #0x3 add r2, #0xc - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [r5, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0x0 bl FreeToHeap ldr r0, _0207B2AC ; =0x0000068C @@ -2858,7 +2858,7 @@ _0207B318: ldr r0, [r6, #0x0] mov r1, #0x3 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect cmp r4, #0x8 bhs _0207B33E mov r4, #0x0 @@ -2875,7 +2875,7 @@ _0207B344: blo _0207B30A ldr r0, [r6, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4-r7, pc} nop @@ -2936,7 +2936,7 @@ _0207B3AC: ldr r0, [r6, #0x0] mov r1, #0x3 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect cmp r4, #0x8 bhs _0207B3D0 mov r4, #0x0 @@ -2953,7 +2953,7 @@ _0207B3D6: blo _0207B39C ldr r0, [r6, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r3-r7, pc} .balign 4 @@ -3301,30 +3301,30 @@ _0207B682: mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #0x0] mov r1, #0x2 mov r2, #0x3 mov r3, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207C6F0 mov r0, #0x85 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x0 add r0, #0x64 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x81 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207CFAC @@ -3340,14 +3340,14 @@ _0207B682: _0207B6E2: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x40 ldr r0, [r4, #0x0] bgt _0207B702 mov r2, #0x0 mov r1, #0x2 add r3, r2, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207B774 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -3356,7 +3356,7 @@ _0207B702: mov r1, #0x2 add r2, r1, #0x0 mov r3, #0x40 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207B76E _0207B70E: bl FUN_0207ECDC @@ -3449,7 +3449,7 @@ _0207B79E: mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207CFAC @@ -3464,14 +3464,14 @@ _0207B79E: _0207B7F8: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x80 ldr r0, [r4, #0x0] blt _0207B818 mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207B864 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -3480,20 +3480,20 @@ _0207B818: mov r1, #0x2 mov r2, #0x1 mov r3, #0x40 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207B860 _0207B824: mov r0, #0x85 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0x64 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x81 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 mov r1, #0x81 bl FUN_0207D924 @@ -3788,19 +3788,19 @@ FUN_0207BA74: ; 0x0207BA74 mov r0, #0x85 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x0 add r0, #0x64 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x81 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r2, #0x0 ldr r0, [r4, #0x0] mov r1, #0x2 add r3, r2, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r4, #0x0 bl FUN_0207ECDC add r0, r4, #0x0 @@ -3851,13 +3851,13 @@ _0207BB02: mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r2, #0x3 add r3, r2, #0x0 ldr r0, [r4, #0x0] mov r1, #0x2 add r3, #0xfd - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #0x0 add r0, r4, #0x0 mvn r1, r1 @@ -3868,18 +3868,18 @@ _0207BB02: mov r0, #0x85 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x0 add r0, #0x64 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x81 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207CFAC @@ -3895,14 +3895,14 @@ _0207BB02: _0207BB6E: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x40 ldr r0, [r4, #0x0] bgt _0207BB8E mov r2, #0x0 mov r1, #0x2 add r3, r2, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207BBE4 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -3911,7 +3911,7 @@ _0207BB8E: mov r1, #0x2 add r2, r1, #0x0 mov r3, #0x40 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207BBDE _0207BB9A: bl FUN_0207ECDC @@ -3980,7 +3980,7 @@ _0207BC06: mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207CFAC @@ -3995,14 +3995,14 @@ _0207BC06: _0207BC4E: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x80 ldr r0, [r4, #0x0] blt _0207BC6E mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207BCBC ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -4011,20 +4011,20 @@ _0207BC6E: mov r1, #0x2 mov r2, #0x1 mov r3, #0x40 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207BCB6 _0207BC7A: mov r0, #0x85 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0x64 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x81 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 mov r1, #0x9e bl FUN_0207D924 @@ -4066,7 +4066,7 @@ FUN_0207BCC8: ; 0x0207BCC8 mov r1, #0x2 add r2, r4, #0x0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x2f str r0, [sp, #0x0] mov r0, #0x1 @@ -4082,7 +4082,7 @@ FUN_0207BCC8: ; 0x0207BCC8 mov r1, #0x2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x30 str r0, [sp, #0x0] mov r0, #0x1 @@ -4098,7 +4098,7 @@ FUN_0207BCC8: ; 0x0207BCC8 mov r1, #0x2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x30 str r0, [sp, #0x0] mov r0, #0x1 @@ -4113,7 +4113,7 @@ FUN_0207BCC8: ; 0x0207BCC8 mov r1, #0x2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r3-r7, pc} @@ -4136,7 +4136,7 @@ _0207BD60: blo _0207BD60 ldr r0, [r5, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4-r6, pc} .balign 4 _0207BD80: .word 0x0000012E @@ -4178,7 +4178,7 @@ _0207BDB6: _0207BDCC: ldr r0, [r5, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3-r7, pc} .balign 4 @@ -4232,7 +4232,7 @@ _0207BE38: mov r1, #0x2 mov r2, #0x3 mov r3, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} _0207BE46: add r0, r4, #0x0 @@ -4242,7 +4242,7 @@ _0207BE46: ldr r0, [r4, #0x0] mov r1, #0x2 add r3, #0xfd - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} .balign 4 _0207BE5C: .word 0x0000068C @@ -4268,34 +4268,34 @@ _0207BE7E: ldr r0, [r4, #0x0] mov r2, #0x0 add r3, #0xfe - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #0x0] mov r1, #0x2 mov r2, #0x3 mov r3, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207C6F0 add r0, r4, #0x0 add r0, #0x64 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x81 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x79 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207CFAC @@ -4311,14 +4311,14 @@ _0207BE7E: _0207BEEA: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B54 + bl Bg_GetYpos cmp r0, #0x30 ldr r0, [r4, #0x0] blt _0207BF0A mov r1, #0x2 mov r2, #0x3 mov r3, #0x38 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207BF78 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -4327,7 +4327,7 @@ _0207BF0A: mov r1, #0x2 mov r2, #0x4 mov r3, #0x10 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207BF74 _0207BF16: mov r1, #0xb5 @@ -4403,21 +4403,21 @@ _0207BFA6: lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x10 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207CFAC @@ -4430,14 +4430,14 @@ _0207BFA6: _0207BFF6: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B54 + bl Bg_GetYpos cmp r0, #0x8 ldr r0, [r4, #0x0] bgt _0207C016 mov r1, #0x2 mov r2, #0x3 mov r3, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207C078 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -4446,28 +4446,28 @@ _0207C016: mov r1, #0x2 mov r2, #0x5 mov r3, #0x10 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207C072 _0207C022: add r0, r4, #0x0 add r0, #0x64 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x81 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x79 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x8d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 mov r1, #0xb4 bl FUN_0207D924 diff --git a/arm9/asm/unk_0207C328.s b/arm9/asm/unk_0207C328.s index e4fac6e3..38691c40 100644 --- a/arm9/asm/unk_0207C328.s +++ b/arm9/asm/unk_0207C328.s @@ -1826,7 +1826,7 @@ FUN_0207CFAC: ; 0x0207CFAC pop {r4, pc} _0207CFC0: add r0, r1, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r1, r0, #0x0 ldr r0, _0207CFE8 ; =0x000004C4 lsl r1, r1, #0x3 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 9bf3f266..3d3fd3fe 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] @@ -269,7 +269,7 @@ _0207D732: ldr r1, [r1, r2] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_020191A4 + bl WindowArray_dtor _0207D744: pop {r3, pc} nop @@ -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 @@ -354,7 +354,7 @@ _0207D7CA: bl FUN_0207D998 _0207D7E8: add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3-r5, pc} nop @@ -428,7 +428,7 @@ FUN_0207D800: ; 0x0207D800 bl AddTextPrinterParameterized2 _0207D88A: add r0, r5, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4-r6, pc} .balign 4 @@ -484,11 +484,11 @@ _0207D8F2: bl FUN_0207D998 add r0, r5, #0x0 add r0, #0x64 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x81 lsl r0, r0, #0x2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r3-r5, pc} nop _0207D918: .word 0x0000025E @@ -515,7 +515,7 @@ FUN_0207D924: ; 0x0207D924 mov r0, #0x8d lsl r0, r0, #0x2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r3-r5, pc} nop _0207D954: .word 0x000F0E00 @@ -1039,7 +1039,7 @@ FUN_0207DD88: ; 0x0207DD88 ldr r0, [r4, #0x0] mov r1, #0x1 add r3, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x2 str r0, [sp, #0x0] mov r0, #0x12 @@ -1052,7 +1052,7 @@ FUN_0207DD88: ; 0x0207DD88 mov r1, #0x1 mov r2, #0x0 mov r3, #0xe - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, _0207DE38 ; =0x0000068C ldrsb r0, [r4, r0] cmp r0, #0x7 @@ -1122,31 +1122,31 @@ FUN_0207DE3C: ; 0x0207DE3C sub sp, #0x10 add r4, r0, #0x0 add r0, r4, #0x4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0x74 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0x84 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0x94 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0xa4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0xb4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0xc4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0xd4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0xe4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1376,32 +1376,32 @@ _0207E058: mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x50 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3-r5, pc} .balign 4 @@ -1517,7 +1517,7 @@ FUN_0207E190: ; 0x0207E190 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -1560,7 +1560,7 @@ _0207E1F4: mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r3-r7, pc} thumb_func_start FUN_0207E200 @@ -1569,34 +1569,34 @@ FUN_0207E200: ; 0x0207E200 sub sp, #0x18 add r4, r0, #0x0 add r0, #0x24 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 add r0, #0xf4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x41 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x45 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x49 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x4d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x51 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x55 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1803,42 +1803,42 @@ FUN_0207E200: ; 0x0207E200 mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x50 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x60 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x70 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3-r5, pc} nop @@ -1856,11 +1856,11 @@ FUN_0207E4A0: ; 0x0207E4A0 sub sp, #0x10 add r4, r0, #0x0 add r0, #0x34 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x59 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x93 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -1919,7 +1919,7 @@ _0207E4C6: lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x93 lsl r0, r0, #0x2 ldr r1, [r4, r0] @@ -1946,7 +1946,7 @@ _0207E4C6: mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r1, #0x91 lsl r1, r1, #0x2 ldr r1, [r4, r1] @@ -1966,7 +1966,7 @@ FUN_0207E594: ; 0x0207E594 push {r4, lr} add r4, r0, #0x0 add r0, #0x44 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x93 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -2025,22 +2025,22 @@ _0207E5BC: mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} .balign 4 @@ -2049,7 +2049,7 @@ FUN_0207E650: ; 0x0207E650 push {r4, lr} add r4, r0, #0x0 add r0, #0x54 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x93 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -2108,22 +2108,22 @@ _0207E678: mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} .balign 4 @@ -2135,11 +2135,11 @@ FUN_0207E70C: ; 0x0207E70C mov r0, #0x7d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x79 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -2163,7 +2163,7 @@ FUN_0207E70C: ; 0x0207E70C mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0207E780 ; =0x00000699 ldrb r0, [r4, r0] cmp r0, #0x0 @@ -2191,7 +2191,7 @@ FUN_0207E788: ; 0x0207E788 mov r0, #0x71 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0x0 mov r1, #0xa1 bl FUN_0207D924 @@ -2258,7 +2258,7 @@ _0207E7BC: lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _0207E82C: add sp, #0x10 pop {r4, pc} @@ -2419,7 +2419,7 @@ FUN_0207E840: ; 0x0207E840 lsl r0, r0, #0x2 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4-r6, pc} .balign 4 @@ -2486,12 +2486,12 @@ FUN_0207E9A0: ; 0x0207E9A0 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} .balign 4 _0207EA34: .word 0x0000069A @@ -2645,15 +2645,15 @@ FUN_0207EB64: ; 0x0207EB64 lsl r0, r0, #0x2 add r0, r5, r0 add r4, r1, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x69 lsl r0, r0, #0x2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x6d lsl r0, r0, #0x2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] @@ -2754,17 +2754,17 @@ _0207EC1C: lsl r0, r0, #0x2 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] add r0, #0x60 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] add r0, #0x70 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x4 pop {r3-r6, pc} .balign 4 @@ -2779,30 +2779,30 @@ FUN_0207EC94: ; 0x0207EC94 mov r0, #0x65 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x69 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x6d lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x50 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x60 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x70 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer pop {r4, pc} thumb_func_start FUN_0207ECDC @@ -2827,12 +2827,12 @@ FUN_0207ECDC: ; 0x0207ECDC lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} _0207ED0E: sub r0, #0xc8 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} thumb_func_start FUN_0207ED18 @@ -2842,10 +2842,10 @@ FUN_0207ED18: ; 0x0207ED18 mov r0, #0x61 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r0, [r4, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} thumb_func_start FUN_0207ED30 @@ -2895,7 +2895,7 @@ FUN_0207ED30: ; 0x0207ED30 lsr r0, r0, #0x1c lsl r0, r0, #0x4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r1, [r4, r0] @@ -2905,7 +2905,7 @@ FUN_0207ED30: ; 0x0207ED30 lsr r0, r0, #0x1c lsl r0, r0, #0x4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} nop _0207EDB0: .word 0x0000068D @@ -2922,17 +2922,17 @@ FUN_0207EDB4: ; 0x0207EDB4 lsl r0, r0, #0x2 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] add r0, #0x60 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] add r0, #0x70 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r4, [r5, r0] @@ -2959,7 +2959,7 @@ _0207EDF6: mov r3, #0x0 bl FUN_0207D998 add r0, r4, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r3-r5, pc} .balign 4 _0207EE20: .word 0x0000068C @@ -3015,12 +3015,12 @@ FUN_0207EE2C: ; 0x0207EE2C mov r0, #0x75 lsl r0, r0, #0x2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4-r6, pc} .balign 4 @@ -3033,12 +3033,12 @@ FUN_0207EEB0: ; 0x0207EEB0 mov r0, #0x75 lsl r0, r0, #0x2 add r0, r4, r0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x91 lsl r0, r0, #0x2 ldr r0, [r4, r0] add r0, #0x50 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer pop {r4, pc} thumb_func_start FUN_0207EECC @@ -3119,7 +3119,7 @@ _0207EF10: mov r1, #0x1 bl AddTextPrinterParameterized2 add r0, r6, #0x0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_0207F95C.s b/arm9/asm/unk_0207F95C.s index b36fe9c1..6c0cc9bf 100644 --- a/arm9/asm/unk_0207F95C.s +++ b/arm9/asm/unk_0207F95C.s @@ -92,7 +92,7 @@ _0207F992: ldr r0, [r4, #0x0] mov r2, #0x0 add r3, r1, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207F9BA _0207F9AC: ldr r1, _0207F9C4 ; =0x0000068F @@ -116,7 +116,7 @@ FUN_0207F9C8: ; 0x0207F9C8 add r4, r1, #0x0 mov r1, #0x4 add r5, r2, #0x0 - bl FUN_0201886C + bl GetBgTilemapBuffer add r7, r0, #0x0 lsl r0, r5, #0x2 add r1, r5, r0 @@ -200,7 +200,7 @@ _0207FA52: _0207FA6C: ldr r0, [r6, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _0207FA74: pop {r3-r7, pc} nop @@ -279,7 +279,7 @@ _0207FADA: ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #0x4 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0x0 bne _0207FB12 mov r0, #0x0 @@ -330,7 +330,7 @@ _0207FB4A: bl FUN_0207F9C8 ldr r0, [r5, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0x0 bl FUN_0207CEDC ldr r0, _0207FC00 ; =0x00000694 @@ -390,7 +390,7 @@ _0207FBD6: _0207FBE2: ldr r0, [r5, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x1 pop {r4-r6, pc} _0207FBEE: diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index e235eb3e..162a8aca 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -282,7 +282,7 @@ _02085A9A: cmp r5, #0x6 blt _02085A7C mov r0, #0x35 - bl FUN_02016B94 + bl BgConfig_Alloc add r1, r4, #0x0 add r1, #0xe4 str r0, [r1, #0x0] @@ -471,37 +471,37 @@ FUN_02085C08: ; 0x02085C08 add r0, #0xe4 ldr r0, [r0, #0x0] mov r1, #0x1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] mov r1, #0x2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] mov r1, #0x3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] mov r1, #0x4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] mov r1, #0x5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] mov r1, #0x6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] mov r1, #0x7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 47bbe03c..d110b7f1 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -48,7 +48,7 @@ FUN_02086084: ; 0x02086084 bl FUN_02006D98 str r0, [r4, #0x3c] mov r0, #0x47 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x4] mov r0, #0x40 mov r1, #0x47 @@ -197,16 +197,16 @@ FUN_020861DC: ; 0x020861DC bl FUN_02002FEC ldr r0, [r4, #0x4] mov r1, #0x1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x4] mov r1, #0x2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x4] mov r1, #0x3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x4] mov r1, #0x4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x4] bl FreeToHeap bl FUN_0201C29C diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 237ebc91..f01e84e2 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -294,7 +294,7 @@ _0208655C: ldmia r5!, {r0-r1} stmia r3!, {r0-r1} add r0, r2, #0x0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02086658 ; =UNK_020FCF84 add r3, sp, #0x54 mov r2, #0xa @@ -309,26 +309,26 @@ _020865BC: add r0, r4, #0x0 add r2, sp, #0x54 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x2 add r2, sp, #0x70 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x3 add r2, sp, #0x8c mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0x0 mov r1, #0x2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0x0 mov r1, #0x3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _0208665C ; =0x04000008 mov r0, #0x3 ldrh r2, [r1, #0x0] @@ -356,10 +356,10 @@ _020865BC: str r0, [r3, #0x0] add r0, r4, #0x0 mov r3, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0x0 mov r1, #0x4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0xa8 pop {r3-r5, pc} .balign 4 @@ -380,7 +380,7 @@ FUN_02086664: ; 0x02086664 ldr r0, [r4, #0x8] bl FUN_0200372C ldr r0, [r4, #0x4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _02086690 ; =0x027E0000 ldr r1, _02086694 ; =0x00003FF8 mov r0, #0x1 @@ -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 @@ -736,10 +736,10 @@ FUN_02086960: ; 0x02086960 bl FUN_0200CCF8 add r0, r4, #0x0 add r0, #0x28 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0x0 add r0, #0x28 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x48] mov r1, #0x0 bl FUN_02001C5C @@ -751,9 +751,9 @@ FUN_02086960: ; 0x02086960 FUN_0208698C: ; 0x0208698C push {r4, lr} add r4, r0, #0x0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram 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..b6b6ec25 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -209,7 +209,7 @@ FUN_02089610: ; 0x02089610 ldr r0, [r0, #0x14] bx r3 nop -_02089618: .word FUN_0201AB60 +_02089618: .word DoScheduledBgGpuUpdates thumb_func_start FUN_0208961C FUN_0208961C: ; 0x0208961C @@ -227,7 +227,7 @@ _02089628: add r0, sp, #0x34 bl GX_SetBanks ldr r0, [r4, #0x0] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x24 ldr r5, _020896CC ; =UNK_020FF314 str r0, [r4, #0x14] @@ -237,7 +237,7 @@ _02089628: ldmia r5!, {r0-r1} stmia r3!, {r0-r1} add r0, r2, #0x0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _020896D0 ; =UNK_020FF324 add r3, sp, #0x8 ldmia r5!, {r0-r1} @@ -252,10 +252,10 @@ _02089628: str r0, [r3, #0x0] ldr r0, [r4, #0x14] add r3, r1, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x14] mov r1, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0x0 str r1, [sp, #0x0] ldr r0, [r4, #0x0] @@ -280,13 +280,13 @@ _02089628: ldr r3, [r4, #0x0] mov r1, #0x20 add r2, r0, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _020896DC ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _020896DC ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x5c pop {r4-r5, pc} .balign 4 @@ -303,31 +303,31 @@ FUN_020896E0: ; 0x020896E0 add r4, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x1 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x2 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x3 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x4 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x5 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x6 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x7 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x14] mov r1, #0x0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] bl FreeToHeap pop {r4, pc} @@ -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} @@ -502,7 +502,7 @@ _0208986C: _0208987E: ldr r0, [r4, #0x14] add r1, r5, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r5, #0x1 _02089888: add r0, r5, #0x0 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 4e0d2d7f..7af6109f 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -167,7 +167,7 @@ _02089A78: add r0, sp, #0x34 bl GX_SetBanks ldr r0, [r4, #0x0] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x24 ldr r5, _02089B1C ; =UNK_020FF380 str r0, [r4, #0x18] @@ -177,7 +177,7 @@ _02089A78: ldmia r5!, {r0-r1} stmia r3!, {r0-r1} add r0, r2, #0x0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02089B20 ; =UNK_020FF390 add r3, sp, #0x8 ldmia r5!, {r0-r1} @@ -192,10 +192,10 @@ _02089A78: str r0, [r3, #0x0] ldr r0, [r4, #0x18] add r3, r1, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0x0 str r1, [sp, #0x0] ldr r0, [r4, #0x0] @@ -220,13 +220,13 @@ _02089A78: ldr r3, [r4, #0x0] mov r1, #0x20 add r2, r0, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x4 mov r1, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x5c pop {r4-r5, pc} .balign 4 @@ -242,31 +242,31 @@ FUN_02089B2C: ; 0x02089B2C add r4, r0, #0x0 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x1 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x2 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x3 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x4 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x5 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x6 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x7 mov r1, #0x0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x18] mov r1, #0x0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] bl FreeToHeap pop {r4, pc} @@ -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} @@ -373,10 +373,10 @@ _02089C34: _02089C3C: ldr r1, _02089CC8 ; =0x00006C21 add r0, r5, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _02089CC8 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x6 mov r1, #0x1 str r0, [sp, #0x0] @@ -424,10 +424,10 @@ _02089CA2: bne _02089CC2 add r0, r5, #0x0 add r1, r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x4 add r1, r5, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x5 str r0, [r4, #0x4] b _02089CC2 diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index e78492e3..4ef386dd 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -79,18 +79,18 @@ FUN_02089D90: ; 0x02089D90 ldr r0, _02089F0C ; =UNK_020FF418 bl GX_SetBanks add r0, r4, #0x0 - bl FUN_02016B94 + bl BgConfig_Alloc add r5, r0, #0x0 ldr r0, _02089F10 ; =UNK_020FF3EC - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0x0 ldr r2, _02089F14 ; =UNK_020FF3FC add r0, r5, #0x0 add r3, r1, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0x0 mov r1, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0x0 str r1, [sp, #0x0] ldr r2, _02089F18 ; =0x000001F7 @@ -106,13 +106,13 @@ FUN_02089D90: ; 0x02089D90 mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _02089F1C ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _02089F1C ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x1 mov r1, #0x1a mov r2, #0x5 @@ -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..63f6e77a 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -83,18 +83,18 @@ FUN_02089F24: ; 0x02089F24 ldr r0, _0208A0A0 ; =UNK_020FF418 bl GX_SetBanks add r0, r4, #0x0 - bl FUN_02016B94 + bl BgConfig_Alloc add r5, r0, #0x0 ldr r0, _0208A0A4 ; =UNK_020FF3EC - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0x0 ldr r2, _0208A0A8 ; =UNK_020FF3FC add r0, r5, #0x0 add r3, r1, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0x0 mov r1, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0x0 str r1, [sp, #0x0] ldr r2, _0208A0AC ; =0x000001F7 @@ -110,13 +110,13 @@ FUN_02089F24: ; 0x02089F24 mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _0208A0B0 ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _0208A0B0 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x1 mov r1, #0x1a mov r2, #0x5 @@ -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 @@ -252,18 +252,18 @@ _0208A0C8: ldr r0, _0208A240 ; =UNK_020FF474 bl GX_SetBanks add r0, r4, #0x0 - bl FUN_02016B94 + bl BgConfig_Alloc add r5, r0, #0x0 ldr r0, _0208A244 ; =UNK_020FF448 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0x0 ldr r2, _0208A248 ; =UNK_020FF458 add r0, r5, #0x0 add r3, r1, #0x0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0x0 mov r1, #0x0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0x0 str r1, [sp, #0x0] ldr r2, _0208A24C ; =0x000001F7 @@ -279,13 +279,13 @@ _0208A0C8: mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _0208A250 ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _0208A250 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x1 mov r1, #0x1a mov r2, #0x6 @@ -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..3df63ca5 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 @@ -779,7 +779,7 @@ _0208A954: lsl r3, r3, #0x4 bl ListMenuUpdateCursorObj ldr r0, [r4, #0x68] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, _0208A994 ; =0x000005DC bl FUN_020054C8 mov r0, #0x0 |