diff options
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/unk_020023C0.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0200CABC.s | 22 | ||||
-rw-r--r-- | arm9/asm/unk_02012CC8.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02033F50.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02034188.s | 10 | ||||
-rw-r--r-- | arm9/asm/unk_02035068.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02048120.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_020484A8.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02050E48.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_020625EC.s | 16 | ||||
-rw-r--r-- | arm9/asm/unk_020653EC.s | 10 | ||||
-rw-r--r-- | arm9/asm/unk_0206C700.s | 28 | ||||
-rw-r--r-- | arm9/asm/unk_0206F3FC.s | 40 | ||||
-rw-r--r-- | arm9/asm/unk_02072548.s | 60 | ||||
-rw-r--r-- | arm9/asm/unk_02073DA8.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020772F0.s | 54 | ||||
-rw-r--r-- | arm9/asm/unk_020799E8.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02079C70.s | 110 | ||||
-rw-r--r-- | arm9/asm/unk_0207D5BC.s | 172 | ||||
-rw-r--r-- | arm9/asm/unk_0207F95C.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020859C0.s | 16 | ||||
-rw-r--r-- | arm9/asm/unk_02086084.s | 10 | ||||
-rw-r--r-- | arm9/asm/unk_02086414.s | 22 | ||||
-rw-r--r-- | arm9/asm/unk_02089498.s | 12 | ||||
-rw-r--r-- | arm9/asm/unk_02089960.s | 10 | ||||
-rw-r--r-- | arm9/asm/unk_02089D90.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02089F24.s | 16 | ||||
-rw-r--r-- | arm9/asm/unk_0208A338.s | 2 |
28 files changed, 332 insertions, 332 deletions
diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index 1d1f994a..dc0c45ef 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -811,7 +811,7 @@ _020028AC: 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 @@ -901,7 +901,7 @@ FUN_02002A00: ; 0x02002A00 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 860397ce..62bace0d 100644 --- a/arm9/asm/unk_0200CABC.s +++ b/arm9/asm/unk_0200CABC.s @@ -356,7 +356,7 @@ FUN_0200CCF8: ; 0x0200CCF8 cmp r4, #0x0 bne _0200CD5A add r0, r5, #0x0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _0200CD5A: add sp, #0x18 pop {r3-r7, pc} @@ -841,7 +841,7 @@ FUN_0200D0E0: ; 0x0200D0E0 cmp r4, #0x0 bne _0200D142 add r0, r5, #0x0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _0200D142: add sp, #0x18 pop {r3-r7, pc} @@ -890,7 +890,7 @@ 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 GetWindowBgId @@ -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 @@ -1710,7 +1710,7 @@ _0200D846: 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 GetWindowBgId - bl FUN_020187B0 + bl BgGetCharPtr add r5, r0, #0x0 ldr r0, [sp, #0x28] ldr r1, _0200D970 ; =0x0000048C @@ -1969,7 +1969,7 @@ FUN_0200D980: ; 0x0200D980 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: @@ -2082,7 +2082,7 @@ _0200DA8A: 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 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_02033F50.s b/arm9/asm/unk_02033F50.s index 63661fa8..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 diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index f20a3a40..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] @@ -218,7 +218,7 @@ _02034308: 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 d39ac308..245c750f 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -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 @@ -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} diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 61cb11db..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 @@ -228,7 +228,7 @@ _020482B2: 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 d6a12464..7e896527 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -352,7 +352,7 @@ 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 BG_SetMaskColor @@ -360,7 +360,7 @@ FUN_02048764: ; 0x02048764 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 @@ -379,7 +379,7 @@ FUN_02048764: ; 0x02048764 bl FillBgTilemapRect ldr r0, [r4, #0x8] mov r1, #0x3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} nop @@ -523,6 +523,6 @@ _020488E4: _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_02050E48.s b/arm9/asm/unk_02050E48.s index 8407e4a3..7a921b4a 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -1248,7 +1248,7 @@ 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 @@ -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} diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 0f7304c8..2813b999 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1103,10 +1103,10 @@ FUN_02062DB0: ; 0x02062DB0 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 @@ -1191,7 +1191,7 @@ 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 RemoveWindow @@ -1226,12 +1226,12 @@ FUN_02062EC4: ; 0x02062EC4 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} @@ -1522,7 +1522,7 @@ 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 @@ -1929,7 +1929,7 @@ 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 @@ -1939,7 +1939,7 @@ FUN_020634DC: ; 0x020634DC bl RemoveWindow add r0, r4, #0x0 add r0, #0xf4 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0x0 add r0, #0xf4 bl RemoveWindow diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 084b4c8d..cfddf2f5 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -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 @@ -1439,7 +1439,7 @@ FUN_02065EF8: ; 0x02065EF8 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 @@ -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 @@ -2021,7 +2021,7 @@ 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 @@ -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 53191360..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 @@ -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 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 48ec90c3..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] @@ -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,7 +1185,7 @@ 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 @@ -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 @@ -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] @@ -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 326de09a..0ac5ab20 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -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: @@ -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 @@ -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 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 1b491322..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] diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 0b55d53a..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,10 +1785,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, #0x4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x0 bl FUN_02077C84 mov 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 @@ -2238,16 +2238,16 @@ _02077FB0: 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 @@ -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] @@ -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 4d1a4195..f7318276 100644 --- a/arm9/asm/unk_020799E8.s +++ b/arm9/asm/unk_020799E8.s @@ -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 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 36744f2e..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 @@ -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,10 +433,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, #0x2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0x0 mov r1, #0x2 mov r2, #0x0 @@ -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,7 +489,7 @@ 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 @@ -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 @@ -2603,7 +2603,7 @@ _0207B0EC: 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 @@ -3313,18 +3313,18 @@ _0207B682: 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,7 +3340,7 @@ _0207B682: _0207B6E2: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x40 ldr r0, [r4, #0x0] bgt _0207B702 @@ -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,7 +3464,7 @@ _0207B79E: _0207B7F8: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x80 ldr r0, [r4, #0x0] blt _0207B818 @@ -3486,14 +3486,14 @@ _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,14 +3788,14 @@ 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 @@ -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,7 +3895,7 @@ _0207BB02: _0207BB6E: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x40 ldr r0, [r4, #0x0] bgt _0207BB8E @@ -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,7 +3995,7 @@ _0207BC06: _0207BC4E: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x80 ldr r0, [r4, #0x0] blt _0207BC6E @@ -4017,14 +4017,14 @@ _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 @@ -4279,23 +4279,23 @@ _0207BE7E: 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,7 +4311,7 @@ _0207BE7E: _0207BEEA: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B54 + bl Bg_GetYpos cmp r0, #0x30 ldr r0, [r4, #0x0] blt _0207BF0A @@ -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,7 +4430,7 @@ _0207BFA6: _0207BFF6: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_02017B54 + bl Bg_GetYpos cmp r0, #0x8 ldr r0, [r4, #0x0] bgt _0207C016 @@ -4451,23 +4451,23 @@ _0207C016: _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_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index c988d22c..3d3fd3fe 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -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 @@ -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,7 +2842,7 @@ 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 ScheduleBgTilemapBufferTransfer @@ -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 05166c3b..6c0cc9bf 100644 --- a/arm9/asm/unk_0207F95C.s +++ b/arm9/asm/unk_0207F95C.s @@ -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 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 f3583914..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 @@ -736,7 +736,7 @@ 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 RemoveWindow @@ -751,7 +751,7 @@ FUN_02086960: ; 0x02086960 FUN_0208698C: ; 0x0208698C push {r4, lr} add r4, r0, #0x0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0x0 bl RemoveWindow pop {r4, pc} diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 6dbccc0d..b6b6ec25 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -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] @@ -327,7 +327,7 @@ FUN_020896E0: ; 0x020896E0 bl ToggleBgLayer ldr r0, [r4, #0x14] mov r1, #0x0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] bl FreeToHeap 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 7d2b1692..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] @@ -266,7 +266,7 @@ FUN_02089B2C: ; 0x02089B2C bl ToggleBgLayer ldr r0, [r4, #0x18] mov r1, #0x0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] bl FreeToHeap pop {r4, pc} diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index 0becba0f..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 diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index a0b68a0d..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 @@ -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 diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 5f6d405f..3df63ca5 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -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 |