diff options
129 files changed, 3019 insertions, 2948 deletions
diff --git a/arm9/CMakeLists.txt b/arm9/CMakeLists.txt index 0de93feb..8bdaeba1 100644 --- a/arm9/CMakeLists.txt +++ b/arm9/CMakeLists.txt @@ -11,7 +11,7 @@ enable_language(ASM) add_compile_options(-fms-extensions) -file(GLOB_RECURSE SOURCES "*.c" "*.cpp") +file(GLOB_RECURSE SOURCES "*.c" "*.cpp" "*.s") file(GLOB MODULE_INC modules/*/include) add_executable(DP_Arm9 ${SOURCES}) diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 7848df11..8dd9759c 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -53,7 +53,7 @@ Static arm9 Object unk_02015E30.o Object game_init.o Object heap.o - Object unk_02016B94.o + Object bg_window.o Object unk_0201B1A8.o Object unk_0201B4E8.o Object unk_0201B6D0.o 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 diff --git a/arm9/global.inc b/arm9/global.inc index 19e79da0..37eb8509 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1034,23 +1034,23 @@ .extern GF_ExpHeap_FndInitAllocator .extern ReallocFromHeap .extern GF_heap_c_dummy_return_true -.extern FUN_02016B94 -.extern FUN_02016BB8 -.extern FUN_02016BBC -.extern FUN_02016BF4 -.extern FUN_02016C18 -.extern FUN_020170F4 -.extern FUN_020178A0 -.extern FUN_020178BC +.extern BgConfig_Alloc +.extern BgConfig_GetHeapId +.extern SetBothScreensModesAndDisable +.extern SetScreenModeAndDisable +.extern InitBgFromTemplate +.extern SetBgControlParam +.extern FreeBgTilemapBuffer +.extern SetBgPriority .extern ToggleBgLayer -.extern FUN_020179E0 -.extern FUN_02017B48 -.extern FUN_02017B54 -.extern FUN_02017B60 -.extern FUN_02017BD0 -.extern FUN_02017CD0 -.extern FUN_02017CE8 -.extern FUN_02017DFC +.extern BgSetPosTextAndCommit +.extern Bg_GetXpos +.extern Bg_GetYpos +.extern Bg_SetTextDimAndAffineParams +.extern SetBgAffine +.extern BgCommitTilemapBufferToVram +.extern BgCopyOrUncompressTilemapBufferRangeToVram +.extern BG_LoadScreenTilemapData .extern BG_LoadCharTilesData .extern BG_ClearCharDataRange .extern BG_FillCharDataRange @@ -1061,12 +1061,12 @@ .extern CopyRectToBgTilemapRect .extern FillBgTilemapRect .extern BgTilemapRectChangePalette -.extern FUN_02018744 -.extern FUN_02018768 -.extern FUN_0201878C -.extern FUN_020187B0 +.extern BgClearTilemapBufferAndCommit +.extern BgFillTilemapBufferAndCommit +.extern BgFillTilemapBufferAndSchedule +.extern BgGetCharPtr .extern GetBgTilemapBuffer -.extern FUN_02018878 +.extern GetBgAffineRotation .extern GetBgPriority .extern BlitBitmapRect4Bit .extern FillBitmapRect8Bit @@ -1079,25 +1079,25 @@ .extern RemoveWindow .extern WindowArray_dtor .extern CopyWindowToVram -.extern FUN_02019220 +.extern ScheduleWindowCopyToVram .extern PutWindowTilemap .extern PutWindowTilemapRectAnchoredTopLeft -.extern FUN_020192B8 +.extern ClearWindowTilemap .extern PutWindowTilemap_TextMode .extern PutWindowTilemap_AffineMode .extern ClearWindowTilemapText .extern ClearWindowTilemapAffine .extern CopyWindowToVram_TextMode -.extern FUN_020194C8 +.extern ScheduleWindowCopyToVram_TextMode .extern CopyWindowToVram_AffineMode -.extern FUN_0201951C -.extern FUN_02019548 -.extern FUN_02019570 -.extern FUN_0201958C -.extern FUN_020195A8 -.extern FUN_020195D0 -.extern FUN_020195E4 -.extern FUN_0201960C +.extern ScheduleWindowCopyToVram_AffineMode +.extern CopyWindowPixelsToVram_TextMode +.extern ClearWindowTilemapAndCopyToVram +.extern ClearWindowTilemapAndScheduleTransfer +.extern ClearWindowTilemapAndNowCopy_TextMode +.extern ClearWindowTilemapAndCommit_TextMode +.extern ClearWindowTilemapAndNowCopy_AffineMode +.extern ClearWindowTilemapAndCommit_AffineMode .extern FillWindowPixelBuffer .extern BlitBitmapRectToWindow .extern BlitBitmapRect @@ -1119,7 +1119,7 @@ .extern ScheduleSetBgPosText .extern ScheduleSetBgAffineRotation .extern ScheduleSetBgAffinePos -.extern FUN_0201AFBC +.extern DoesPixelAtScreenXYMatchPtrVal .extern FUN_0201B21C .extern FUN_0201B234 .extern FUN_0201B254 diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index a85d9482..9cea7a32 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -101,7 +101,7 @@ _021D757A: bl MOD05_021D7B38 bl GX_SwapDisplay mov r0, #4 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #8] bl MOD05_021D7A30 mov r0, #0 @@ -617,7 +617,7 @@ MOD05_021D7A30: ; 0x021D7A30 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7B04 ; =UNK05_021F6468 add r3, sp, #0x3c ldmia r5!, {r0, r1} @@ -632,7 +632,7 @@ MOD05_021D7A30: ; 0x021D7A30 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -640,7 +640,7 @@ MOD05_021D7A30: ; 0x021D7A30 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7B08 ; =UNK05_021F644C add r3, sp, #0x20 ldmia r5!, {r0, r1} @@ -655,7 +655,7 @@ MOD05_021D7A30: ; 0x021D7A30 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -663,7 +663,7 @@ MOD05_021D7A30: ; 0x021D7A30 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7B0C ; =UNK05_021F6484 add r3, sp, #4 ldmia r5!, {r0, r1} @@ -678,7 +678,7 @@ MOD05_021D7A30: ; 0x021D7A30 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -686,7 +686,7 @@ MOD05_021D7A30: ; 0x021D7A30 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 add r1, sp, #0 strh r0, [r1] @@ -713,13 +713,13 @@ MOD05_021D7B10: ; 0x021D7B10 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index 2645658c..7e1d3287 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -1997,7 +1997,7 @@ _021DCFA0: ldr r0, [r0, #8] mov r1, #2 add r2, #0xc - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram mov r0, #0x41 lsl r0, r0, #2 ldr r3, [sp, #0x18] @@ -2007,7 +2007,7 @@ _021DCFA0: ldr r3, [r3, #8] mov r1, #2 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData mov r0, #0x20 str r0, [sp] str r0, [sp, #4] @@ -2025,7 +2025,7 @@ _021DCFA0: ldr r0, [r4, r0] mov r1, #2 ldr r0, [r0, #8] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [sp, #0x14] bl FreeToHeap mov r0, #0 diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 8eb66a39..dee569a9 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -1865,7 +1865,7 @@ MOD05_021E28A0: ; 0x021E28A0 ldr r0, [sp, #0xc] bl DestroyMsgData add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -1992,7 +1992,7 @@ MOD05_021E29C8: ; 0x021E29C8 add r0, r7, #0 bl DestroyMsgData ldr r0, [sp, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -2112,7 +2112,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 add r0, r7, #0 bl DestroyMsgData ldr r0, [sp, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index 87bdb5f6..9a7c0b1f 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -367,7 +367,7 @@ _021E314E: ldr r0, [r4, #0x1c] ldr r3, [r4, #0xc] add r2, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0xc] cmp r0, #0 bne _021E31D0 @@ -401,7 +401,7 @@ _021E318E: ldr r0, [r4, #0x1c] ldr r3, [r4, #0xc] add r2, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0xc] cmp r0, #0x26 bne _021E31D0 @@ -522,7 +522,7 @@ MOD05_021E3270: ; 0x021E3270 ldr r0, [r4, #0x1c] add r2, r1, #0 mov r3, #0x26 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x26 str r0, [r4, #0xc] ldr r0, _021E32EC ; =MOD05_021E3124 @@ -584,12 +584,12 @@ MOD05_021E32F0: ; 0x021E32F0 _021E32FE: add r0, r4, #0 add r0, #0x20 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r1, #3 ldr r0, [r4, #0x1c] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, [r4, #0x1c] add r0, r4, #0 bl MOD05_021E3114 diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s index 5266f6c6..9bd14da2 100644 --- a/arm9/modules/05/asm/mod05_021E3444.s +++ b/arm9/modules/05/asm/mod05_021E3444.s @@ -1055,7 +1055,7 @@ MOD05_021E3C14: ; 0x021E3C14 ldmia r6!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -1071,12 +1071,12 @@ MOD05_021E3C14: ; 0x021E3C14 mov r1, #1 str r0, [r2] add r0, r4, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -1084,7 +1084,7 @@ MOD05_021E3C14: ; 0x021E3C14 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -1100,12 +1100,12 @@ MOD05_021E3C14: ; 0x021E3C14 mov r1, #2 str r0, [r2] add r0, r4, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 add r2, sp, #0x1c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -1113,7 +1113,7 @@ MOD05_021E3C14: ; 0x021E3C14 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -1129,12 +1129,12 @@ MOD05_021E3C14: ; 0x021E3C14 str r0, [r2] add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 add r2, sp, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -1142,7 +1142,7 @@ MOD05_021E3C14: ; 0x021E3C14 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #8 mov r1, #0 bl GX_EngineAToggleLayers @@ -1214,7 +1214,7 @@ MOD05_021E3D70: ; 0x021E3D70 lsl r1, r1, #0x18 ldr r3, [r3, #0x20] lsr r1, r1, #0x18 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams add r0, r4, #0 bl FUN_0200CAB4 add sp, #0xc diff --git a/arm9/modules/05/asm/mod05_021E80F8.s b/arm9/modules/05/asm/mod05_021E80F8.s index 886d14cd..3d6303b2 100644 --- a/arm9/modules/05/asm/mod05_021E80F8.s +++ b/arm9/modules/05/asm/mod05_021E80F8.s @@ -147,7 +147,7 @@ MOD05_021E81D0: ; 0x021E81D0 ldr r0, [r4, #8] add r2, r1, #0 sub r3, #0x33 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, [r4, #0x60] ldrb r0, [r1, #0x13] lsl r0, r0, #0x18 @@ -195,12 +195,12 @@ MOD05_021E820C: ; 0x021E820C bl FillBgTilemapRect ldr r0, [r4, #8] mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r1, #3 ldr r0, [r4, #8] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r2, [r4, #0x60] mov r0, #0x80 ldrb r1, [r2, #0x13] @@ -217,7 +217,7 @@ MOD05_021E8260: ; 0x021E8260 add r4, r0, #0 ldr r0, [r4, #8] mov r1, #3 - bl FUN_02017B54 + bl Bg_GetYpos cmp r0, #0 bne _021E8274 mov r0, #1 @@ -235,13 +235,13 @@ _021E8280: ldr r0, [r4, #8] add r2, r1, #0 sub r3, #0x33 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021E828E: ldr r0, [r4, #8] mov r1, #3 mov r2, #4 mov r3, #0x10 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 pop {r4, pc} .balign 4, 0 @@ -253,7 +253,7 @@ MOD05_021E82A0: ; 0x021E82A0 add r4, r0, #0 ldr r0, [r4, #8] mov r1, #3 - bl FUN_02017B54 + bl Bg_GetYpos mov r1, #0x2f mvn r1, r1 cmp r0, r1 @@ -273,12 +273,12 @@ MOD05_021E82A0: ; 0x021E82A0 bl FillBgTilemapRect ldr r0, [r4, #8] mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r1, #3 ldr r0, [r4, #8] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0x10 mov r0, #1 pop {r4, pc} @@ -291,13 +291,13 @@ _021E82F2: ldr r0, [r4, #8] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021E82FE: ldr r0, [r4, #8] mov r1, #3 mov r2, #5 mov r3, #0x10 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 add sp, #0x10 pop {r4, pc} diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 311703f6..95a0e6ca 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -2770,7 +2770,7 @@ _021E9C02: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] ldr r0, [r0] add r1, r0, #1 @@ -3160,7 +3160,7 @@ _021E9FA4: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3179,7 +3179,7 @@ _021E9FA4: mov r1, #3 ldr r0, [r0, #0x10] ldr r0, [r0, #8] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, [sp, #0x1c] mov r0, #4 ldr r1, [r1, #0xc] @@ -3275,7 +3275,7 @@ _021EA0B0: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] ldr r0, [r0] cmp r0, #7 @@ -3742,7 +3742,7 @@ _021EA430: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 bl MOD05_021E4394 mov r1, #0x81 @@ -4030,7 +4030,7 @@ _021EA6FA: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x83 lsl r0, r0, #2 add r0, r4, r0 @@ -4093,7 +4093,7 @@ _021EA76C: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -4112,7 +4112,7 @@ _021EA76C: mov r1, #3 ldr r0, [r0, #0x10] ldr r0, [r0, #8] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, [sp, #0x18] mov r0, #4 ldr r1, [r1, #0xc] @@ -5406,7 +5406,7 @@ _021EB18E: mov r1, #0 bl FillWindowPixelBuffer ldr r0, [r4] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -5535,7 +5535,7 @@ _021EB344: str r0, [r5] _021EB36C: ldr r0, [r4] - bl FUN_02019220 + bl ScheduleWindowCopyToVram b _021EB3F2 _021EB374: mov r0, #0 @@ -5566,7 +5566,7 @@ _021EB394: add r0, #8 bl MOD05_021E3E44 ldr r0, [r4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4] bl RemoveWindow ldr r0, [r4] @@ -5580,7 +5580,7 @@ _021EB394: ldr r0, [r5, #0x10] mov r1, #3 ldr r0, [r0, #8] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _021EB410 ; =0x0400004D mov r1, #0 strb r1, [r0] @@ -26506,7 +26506,7 @@ MOD05_021F5518: ; 0x021F5518 bl G2x_SetBlendAlpha_ mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -26649,7 +26649,7 @@ MOD05_021F5608: ; 0x021F5608 ldr r2, _021F565C ; =0x00006001 add r0, r5, #0 mov r1, #2 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add sp, #8 pop {r3, r4, r5, pc} nop @@ -26743,7 +26743,7 @@ MOD05_021F56B8: ; 0x021F56B8 ldr r0, [r4, #8] ldr r2, _021F5718 ; =0x00006002 mov r1, #2 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -26787,7 +26787,7 @@ MOD05_021F571C: ; 0x021F571C ldr r0, [r4, #8] ldr r2, _021F577C ; =0x00006002 mov r1, #3 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit mov r0, #8 mov r1, #1 bl GX_EngineAToggleLayers @@ -26928,7 +26928,7 @@ _021F5856: mov r0, #2 mov r1, #0 strh r0, [r4, #8] - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -27007,7 +27007,7 @@ _021F58EE: strh r1, [r0] mov r0, #2 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #8 strh r0, [r4, #8] b _021F5980 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index b5179d67..555d56cb 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -145,7 +145,7 @@ MOD06_02239790: ; 0x02239790 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -163,7 +163,7 @@ MOD06_02239790: ; 0x02239790 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -171,7 +171,7 @@ MOD06_02239790: ; 0x02239790 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x2c pop {r4, r5, pc} nop @@ -8609,7 +8609,7 @@ MOD06_0223D7B8: ; 0x0223D7B8 bl FUN_0200CCF8 add r0, r4, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x80 ldr r0, [r0] @@ -8855,7 +8855,7 @@ MOD06_0223D9C0: ; 0x0223D9C0 add r5, #8 _0223D9D0: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 bl RemoveWindow add r4, r4, #1 @@ -8976,16 +8976,16 @@ MOD06_0223DA8C: ; 0x0223DA8C strb r0, [r4, r1] mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0 mov r1, #1 bl GX_EngineAToggleLayers @@ -9012,19 +9012,19 @@ MOD06_0223DB1C: ; 0x0223DB1C lsl r1, r1, #2 ldrb r1, [r4, r1] mov r0, #0 - bl FUN_020178BC + bl SetBgPriority ldr r1, _0223DB58 ; =0x00000235 mov r0, #1 ldrb r1, [r4, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _0223DB5C ; =0x00000236 mov r0, #2 ldrb r1, [r4, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _0223DB60 ; =0x00000237 mov r0, #3 ldrb r1, [r4, r1] - bl FUN_020178BC + bl SetBgPriority mov r0, #0x8e lsl r0, r0, #2 ldr r0, [r4, r0] @@ -9323,7 +9323,7 @@ _0223DDB2: _0223DDBA: add r0, r4, #0 add r0, #0x18 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r1, sp, #0x14 ldr r0, [sp, #0x10] add r1, #2 @@ -9546,7 +9546,7 @@ _0223DF30: bl String_dtor add r5, #0x28 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -9604,7 +9604,7 @@ _0223E006: bl MOD06_0223DB1C ldr r0, [r5] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _0223E188 ; =0x000005DC bl FUN_020054C8 mov r0, #0xc @@ -9640,7 +9640,7 @@ _0223E034: bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x18 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 add r0, #0x58 mov r1, #0 @@ -9881,7 +9881,7 @@ _0223E214: bl String_dtor add r5, #0x48 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -9975,7 +9975,7 @@ _0223E314: bl MOD06_0223ECC8 add r4, #0x18 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0223E380 ; =0x000005DC bl FUN_020054C8 mov r0, #4 @@ -10268,7 +10268,7 @@ _0223E50A: bl String_dtor add r5, #0x38 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -10471,7 +10471,7 @@ _0223E74A: bl MOD06_0223ECC8 add r5, #0x18 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 pop {r3, r4, r5, pc} _0223E78C: @@ -10684,7 +10684,7 @@ _0223E902: bl MOD06_0223ECC8 add r5, #0x18 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 pop {r3, r4, r5, pc} _0223E944: @@ -10736,7 +10736,7 @@ _0223E966: bl MOD06_0223ECC8 add r4, #0x18 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 pop {r4, pc} _0223E9B2: @@ -13856,7 +13856,7 @@ MOD06_02240364: ; 0x02240364 bl DestroyListMenu add r0, r4, #0 add r0, #0x20 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x20 bl RemoveWindow @@ -13873,7 +13873,7 @@ MOD06_02240364: ; 0x02240364 ldr r0, _022403DC ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _022403DC ; =0x02252420 ldr r0, [r0] add r0, #0x30 @@ -14524,7 +14524,7 @@ MOD06_022408D4: ; 0x022408D4 bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x54 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _022408EC: add r4, #0x54 add r0, r4, #0 @@ -28539,12 +28539,12 @@ MOD06_022475A4: ; 0x022475A4 mov r1, #3 add r3, r2, #0 add r5, r0, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r5, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r6, #0 add r1, r7, #0 mov r2, #4 @@ -28558,7 +28558,7 @@ MOD06_022475A4: ; 0x022475A4 ldr r3, [r3, #8] mov r1, #3 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData mov r0, #0x20 str r0, [sp] str r0, [sp, #4] @@ -28571,7 +28571,7 @@ MOD06_022475A4: ; 0x022475A4 bl BgTilemapRectChangePalette add r0, r5, #0 mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl FreeToHeap add sp, #0xc @@ -28579,11 +28579,11 @@ MOD06_022475A4: ; 0x022475A4 thumb_func_start MOD06_02247610 MOD06_02247610: ; 0x02247610 - ldr r3, _02247618 ; =FUN_02018744 + ldr r3, _02247618 ; =BgClearTilemapBufferAndCommit mov r1, #3 bx r3 nop -_02247618: .word FUN_02018744 +_02247618: .word BgClearTilemapBufferAndCommit thumb_func_start MOD06_0224761C MOD06_0224761C: ; 0x0224761C @@ -41093,7 +41093,7 @@ MOD06_0224D6A4: ; 0x0224D6A4 mov r1, #1 bl FUN_0200CCF8 add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 bl RemoveWindow ldr r0, [r4, #0x10] @@ -41746,7 +41746,7 @@ MOD06_0224DBCC: ; 0x0224DBCC bl FUN_02002ED0 ldr r0, [r4, #0x14] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #8 pop {r4, pc} .align 2, 0 @@ -41756,7 +41756,7 @@ MOD06_0224DC28: ; 0x0224DC28 push {r3, lr} ldr r0, [r0, #0x14] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #1 bl FUN_02054590 @@ -41834,7 +41834,7 @@ MOD06_0224DCB4: ; 0x0224DCB4 cmp r0, #0 beq _0224DCD6 ldr r0, [r4, #4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4, #4] bl RemoveWindow ldr r0, [r4, #4] @@ -42106,7 +42106,7 @@ _0224DEE6: ldr r0, [r6, #8] bl ScrStrBufs_delete ldr r0, [r6, #4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r6, #4] bl RemoveWindow ldr r0, [r6, #4] @@ -42447,7 +42447,7 @@ _0224E1C0: add r2, r1, #0 bl DestroyListMenu ldr r0, [r6, #4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r6, #4] bl RemoveWindow ldr r0, [r6, #4] @@ -42783,7 +42783,7 @@ _0224E448: bl FillBgTilemapRect ldr r0, [r5, #4] mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, pc} diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 02116199..efb8e257 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -146,7 +146,7 @@ MOD07_02211F34: ; 0x02211F34 bl MOD07_02211F14 ldr r0, [r4] ldr r0, [r0, #0x24] - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0xc] ldr r0, [r4] ldr r0, [r0, #0x24] @@ -423,7 +423,7 @@ MOD07_022121AC: ; 0x022121AC add r4, r0, #0 ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x18 bgt _02212248 ldr r1, _02212370 ; =0x00000B82 @@ -1897,7 +1897,7 @@ MOD07_02212D98: ; 0x02212D98 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02212E58 ; =0x02214A2C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -1912,10 +1912,10 @@ MOD07_02212D98: ; 0x02212D98 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #3 add r3, r1, #0 ldr r0, [r4, #0xc] @@ -1936,10 +1936,10 @@ MOD07_02212D98: ; 0x02212D98 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0xff ldr r0, [r4, #0xc] mov r1, #2 @@ -1960,10 +1960,10 @@ MOD07_02212D98: ; 0x02212D98 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -1984,13 +1984,13 @@ MOD07_02212E64: ; 0x02212E64 bl GX_EngineAToggleLayers ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] bl FreeToHeap pop {r4, pc} @@ -3203,7 +3203,7 @@ MOD07_02213858: ; 0x02213858 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _022138EC ; =0x02214A9C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -3218,10 +3218,10 @@ MOD07_02213858: ; 0x02213858 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022138F0 ; =0x02214A10 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -3236,10 +3236,10 @@ MOD07_02213858: ; 0x02213858 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022138F4 ; =0x02214A80 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -3254,7 +3254,7 @@ MOD07_02213858: ; 0x02213858 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add sp, #0x64 pop {r4, r5, pc} nop @@ -3272,13 +3272,13 @@ MOD07_022138F8: ; 0x022138F8 bl GX_EngineAToggleLayers ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] bl FreeToHeap pop {r4, pc} @@ -4941,16 +4941,16 @@ MOD07_02214600: ; 0x02214600 add r1, r6, #0 bl MOD07_02214510 add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, r4 add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, r4 add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, r4 add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index d66ba9ef..ed457683 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -1827,7 +1827,7 @@ _02212AE8: lsl r1, r1, #0x18 add r0, r4, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #1 bl ToggleBgLayer @@ -1839,47 +1839,47 @@ _02212B40: lsl r1, r1, #4 ldrb r1, [r5, r1] mov r0, #0 - bl FUN_020178BC + bl SetBgPriority ldr r1, _02212BB8 ; =0x000001A1 mov r0, #1 ldrb r1, [r5, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _02212BBC ; =0x000001A2 mov r0, #2 ldrb r1, [r5, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _02212BC0 ; =0x000001A3 mov r0, #3 ldrb r1, [r5, r1] - bl FUN_020178BC + bl SetBgPriority add r0, r5, #0 add r0, #0xc4 mov r2, #0 ldr r0, [r0] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 add r0, #0xc4 mov r2, #0 ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 add r0, #0xc4 mov r1, #3 ldr r0, [r0] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 str r0, [r5, #0x10] pop {r3, r4, r5, r6, r7, pc} @@ -3052,13 +3052,13 @@ _02213410: mov r1, #2 mov r2, #0 neg r3, r6 - bl FUN_020179E0 + bl BgSetPosTextAndCommit sub r4, #0x28 ldr r0, [r5] mov r1, #2 mov r2, #3 neg r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _02213452: pop {r4, r5, r6, pc} @@ -3156,7 +3156,7 @@ _022134FE: mov r7, #0xc8 _02213500: mov r0, #2 - bl FUN_020187B0 + bl BgGetCharPtr mov r2, #0x19 mov r1, #0 lsl r2, r2, #8 @@ -3262,7 +3262,7 @@ _022135AC: mov r1, #2 mov r2, #0 neg r3, r7 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 add r0, #0xc4 sub r4, #0x28 @@ -3270,7 +3270,7 @@ _022135AC: mov r1, #2 mov r2, #3 neg r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #2 mov r1, #1 bl ToggleBgLayer @@ -3280,7 +3280,7 @@ _022135AC: lsl r1, r1, #0x18 mov r0, #2 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -3296,7 +3296,7 @@ MOD08_02213630: ; 0x02213630 add r0, r0, #4 str r0, [r4, #0x18] mov r0, #2 - bl FUN_020187B0 + bl BgGetCharPtr mov r2, #0x19 mov r1, #0 lsl r2, r2, #8 @@ -4166,7 +4166,7 @@ MOD08_02213C94: ; 0x02213C94 lsl r1, r4, #0x18 ldr r0, [r0] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 mov r6, #2 bl MOD08_02212004 @@ -4364,11 +4364,11 @@ _02213E50: lsl r1, r4, #0x18 mov r0, #3 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority lsl r1, r4, #0x18 mov r0, #2 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 bl ToggleBgLayer @@ -4383,7 +4383,7 @@ _02213E8E: ldr r0, [r0] mov r2, #2 add r3, r1, #0 - bl FUN_020170F4 + bl SetBgControlParam ldr r0, [r5, #0x48] bl MOD08_02212004 cmp r0, #1 @@ -4394,7 +4394,7 @@ _02213E8E: ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020170F4 + bl SetBgControlParam _02213EB8: ldr r1, [r5, #0x48] ldr r3, [r5, #0x10] @@ -4506,11 +4506,11 @@ _02213F6E: lsl r1, r5, #0x18 mov r0, #3 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority lsl r1, r5, #0x18 mov r0, #2 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldrb r0, [r4, #0xa] mov r1, #4 mov r2, #8 @@ -4591,21 +4591,21 @@ _0221401E: ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x48] mov r1, #3 add r0, #0xc4 ldr r0, [r0] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x48] mov r1, #3 add r0, #0xc4 ldr r0, [r0] mov r2, #2 mov r3, #4 - bl FUN_020170F4 + bl SetBgControlParam ldr r0, [r4, #0x48] bl MOD08_02212004 cmp r0, #0 @@ -4616,7 +4616,7 @@ _0221401E: ldr r0, [r0] mov r2, #0 mov r3, #1 - bl FUN_020170F4 + bl SetBgControlParam ldr r0, [r4, #0x48] mov r1, #3 bl MOD08_02215638 @@ -4800,7 +4800,7 @@ _022141BE: ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020170F4 + bl SetBgControlParam ldr r1, [r4, #0x48] ldr r3, [r4, #0x10] add r0, r4, #0 @@ -4992,7 +4992,7 @@ _02214338: ldr r0, [r0] mov r2, #0 mov r3, #1 - bl FUN_020170F4 + bl SetBgControlParam ldr r0, [r4, #0x48] mov r1, #3 bl MOD08_02215638 @@ -5071,14 +5071,14 @@ _022143F0: ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x48] mov r1, #3 add r0, #0xc4 ldr r0, [r0] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrb r0, [r4, #0xd] ldr r2, [r4, #0x48] cmp r0, #0 @@ -5208,7 +5208,7 @@ _022144DA: ldr r0, [r4] lsr r1, r1, #0x18 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _02214508: mov r0, #0xa ldrsh r0, [r4, r0] @@ -5221,7 +5221,7 @@ _02214508: ldr r0, [r4] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _02214522: pop {r3, r4, r5, pc} @@ -5546,7 +5546,7 @@ MOD08_0221477C: ; 0x0221477C lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority lsl r0, r4, #0x18 lsr r0, r0, #0x18 mov r1, #0 @@ -5562,7 +5562,7 @@ MOD08_0221477C: ; 0x0221477C lsr r1, r1, #0x18 mov r2, #2 mov r3, #4 - bl FUN_020170F4 + bl SetBgControlParam b _022147E4 _022147C0: add r0, r5, #0 @@ -5572,7 +5572,7 @@ _022147C0: lsr r1, r1, #0x18 mov r2, #0 mov r3, #1 - bl FUN_020170F4 + bl SetBgControlParam add r0, r5, #0 add r0, #0xc4 lsl r1, r4, #0x18 @@ -5580,14 +5580,14 @@ _022147C0: lsr r1, r1, #0x18 mov r2, #2 mov r3, #4 - bl FUN_020170F4 + bl SetBgControlParam _022147E4: add r0, r5, #0 add r0, #0xc4 lsl r1, r4, #0x18 ldr r0, [r0] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 bl MOD08_02212004 cmp r0, #1 @@ -5646,7 +5646,7 @@ MOD08_02214850: ; 0x02214850 lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add r0, r5, #0 bl MOD08_02212004 cmp r0, #1 @@ -5658,7 +5658,7 @@ MOD08_02214850: ; 0x02214850 lsr r1, r1, #0x18 mov r2, #2 mov r3, #3 - bl FUN_020170F4 + bl SetBgControlParam b _022148AC _02214888: add r0, r5, #0 @@ -5668,7 +5668,7 @@ _02214888: ldr r0, [r0] lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020170F4 + bl SetBgControlParam add r0, r5, #0 add r0, #0xc4 lsl r1, r4, #0x18 @@ -5676,13 +5676,13 @@ _02214888: lsr r1, r1, #0x18 mov r2, #2 mov r3, #3 - bl FUN_020170F4 + bl SetBgControlParam _022148AC: add r5, #0xc4 lsl r1, r4, #0x18 ldr r0, [r5] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} .align 2, 0 @@ -15184,7 +15184,7 @@ _02218F32: ldr r0, [r5, #0x18] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, r4, r5, r6, r7, pc} _02218F4E: ldr r0, [r5, #8] @@ -15453,13 +15453,13 @@ _02219136: ldr r0, [r4, #0x30] mov r1, #2 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, r4, r5, pc} .align 2, 0 _02219154: .word 0x04000050 @@ -15605,7 +15605,7 @@ _02219228: bl FUN_020030E8 ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 mov r6, #2 bl MOD08_02212004 @@ -15645,13 +15645,13 @@ _022192BC: ldr r0, [r4, #0x30] mov r1, #2 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x20] ldr r1, _02219310 ; =MOD08_02218FE8 add r2, r4, #0 @@ -15854,13 +15854,13 @@ _0221945E: ldr r0, [r4, #0x30] mov r1, #2 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, r4, r5, pc} .align 2, 0 _0221947C: .word 0x04000050 @@ -16009,7 +16009,7 @@ _02219550: bl FUN_020030E8 ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 mov r6, #2 bl MOD08_02212004 @@ -16049,13 +16049,13 @@ _022195EA: ldr r0, [r4, #0x30] mov r1, #2 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x20] ldr r1, _0221963C ; =MOD08_02219314 add r2, r4, #0 @@ -20509,7 +20509,7 @@ _0221BA38: ldr r0, [r4, #0x28] lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0221BA50: ldr r0, [r4, #0x24] cmp r0, #0 @@ -20520,7 +20520,7 @@ _0221BA50: lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0221BA66: ldrb r0, [r4, #1] add sp, #4 @@ -20540,7 +20540,7 @@ _0221BA70: ldr r0, [r4, #0x28] lsr r1, r1, #0x18 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0221BA8C: mov r3, #0xd6 ldrsh r0, [r4, r3] @@ -20554,7 +20554,7 @@ _0221BA8C: ldr r0, [r4, #0x28] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #4 pop {r3, r4, pc} _0221BAAC: @@ -26110,7 +26110,7 @@ _0221E84C: ldr r0, [r4, #8] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0xc pop {r4, r5, r6, r7, pc} _0221E866: @@ -26622,13 +26622,13 @@ _0221EC7A: ldr r0, [r5, #0x14] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x4e mov r1, #3 ldrsh r3, [r5, r3] ldr r0, [r5, #0x14] add r2, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, r4, r5, r6, r7, pc} _0221ECA0: ldr r0, [r5, #4] @@ -31969,7 +31969,7 @@ _022218B0: lsl r1, r1, #0x18 mov r0, #2 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority _022218C4: ldr r0, [r4, #0x1c] mov r1, #0 @@ -33520,7 +33520,7 @@ _0222255E: mov r1, #2 mov r2, #0 neg r3, r3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4] bl MOD08_02212490 mov r3, #0x12 @@ -33528,7 +33528,7 @@ _0222255E: mov r1, #2 mov r2, #3 neg r3, r3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #8] add r0, r0, #1 str r0, [r4, #8] @@ -33578,14 +33578,14 @@ _022225CE: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] mov r1, #1 bl MOD08_02215588 @@ -33609,7 +33609,7 @@ _022225CE: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] add r1, r6, #0 bl MOD08_02212438 @@ -33762,7 +33762,7 @@ _022226FC: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 @@ -33770,7 +33770,7 @@ _022226FC: lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority _022227AE: ldr r0, [sp, #0x14] add r1, r4, #0 @@ -34338,14 +34338,14 @@ _02222C3E: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4, #0x10] mov r1, #6 mov r2, #0 @@ -34373,7 +34373,7 @@ _02222C3E: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] add r1, r6, #0 bl MOD08_02212438 @@ -34466,7 +34466,7 @@ _02222D6A: lsl r0, r0, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 @@ -34474,7 +34474,7 @@ _02222D6A: lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4, #0x48] mov r1, #0 bl FUN_0200C644 @@ -40527,14 +40527,14 @@ _02225E68: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] mov r1, #1 bl MOD08_02215588 @@ -40558,7 +40558,7 @@ _02225E68: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 bl FreeToHeap ldr r0, [r4] @@ -40647,7 +40647,7 @@ MOD08_02225EFC: ; 0x02225EFC lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 @@ -40655,7 +40655,7 @@ MOD08_02225EFC: ; 0x02225EFC lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority _02225FD0: ldr r0, [r4] ldr r1, _02225FDC ; =MOD08_02225E14 @@ -42728,7 +42728,7 @@ MOD08_02227068: ; 0x02227068 lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -42760,7 +42760,7 @@ MOD08_02227068: ; 0x02227068 lsl r1, r4, #0x18 ldr r0, [r5, #0x2c] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -42860,7 +42860,7 @@ _02227180: bne _022271B2 ldr r0, [r4, #0x2c] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x34] mov r1, #0 bl FUN_0200C644 @@ -42899,12 +42899,12 @@ _022271C0: ldr r0, [r4, #0x2c] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x2c] mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -42934,13 +42934,13 @@ _0222720E: ldrsh r3, [r4, r3] ldr r0, [r4, #0x2c] mov r1, #2 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x12 ldrsh r3, [r4, r3] ldr r0, [r4, #0x2c] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x34] bl FUN_0200C5A8 ldr r0, [r4, #0x38] diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index c07cf346..050abbcc 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2027,7 +2027,7 @@ MOD09_02212E4C: ; 0x02212E4C stmia r3!, {r0, r1} add r0, r2, #0 mov r1, #1 - bl FUN_02016BF4 + bl SetScreenModeAndDisable ldr r5, _02212F4C ; =0x0221AF48 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -2044,7 +2044,7 @@ MOD09_02212E4C: ; 0x02212E4C lsl r0, r0, #2 ldr r0, [r4, r0] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02212F50 ; =0x0221AF80 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -2061,7 +2061,7 @@ MOD09_02212E4C: ; 0x02212E4C lsl r0, r0, #2 ldr r0, [r4, r0] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02212F54 ; =0x0221AF9C add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -2078,12 +2078,12 @@ MOD09_02212E4C: ; 0x02212E4C lsl r0, r0, #2 ldr r0, [r4, r0] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02212F58 ; =0x0221AF64 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -2100,12 +2100,12 @@ MOD09_02212E4C: ; 0x02212E4C lsl r0, r0, #2 ldr r0, [r4, r0] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r3, [r4] mov r0, #5 ldr r3, [r3, #0xc] @@ -2146,16 +2146,16 @@ MOD09_02212F5C: ; 0x02212F5C bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 @@ -3353,13 +3353,13 @@ MOD09_022138F0: ; 0x022138F0 ldr r0, [r5, r0] mov r1, #4 mov r2, #0 - bl FUN_0201878C + bl BgFillTilemapBufferAndSchedule mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #5 mov r2, #0 - bl FUN_0201878C + bl BgFillTilemapBufferAndSchedule add r0, r5, #0 add r1, r4, #0 bl MOD09_02216D80 @@ -3758,15 +3758,15 @@ MOD09_02213C34: ; 0x02213C34 ldr r0, _02213C68 ; =0x00002070 ldr r0, [r4, r0] add r0, #0xa0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r0, _02213C68 ; =0x00002070 ldr r0, [r4, r0] add r0, #0x60 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r0, _02213C68 ; =0x00002070 ldr r0, [r4, r0] add r0, #0x70 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer pop {r4, pc} nop _02213C64: .word 0x00002020 @@ -4235,7 +4235,7 @@ _02214002: bl String_dtor _02214008: add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop @@ -4280,7 +4280,7 @@ MOD09_02214038: ; 0x02214038 ldr r0, _0221407C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -4340,7 +4340,7 @@ MOD09_02214080: ; 0x02214080 ldr r0, _022140F8 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -4388,7 +4388,7 @@ _02214144: ldr r0, [sp, #8] lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _02214156: @@ -4451,7 +4451,7 @@ _0221415E: ldr r0, _022141D4 ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -4508,7 +4508,7 @@ MOD09_022141D8: ; 0x022141D8 ldr r0, _0221425C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -4579,7 +4579,7 @@ _022142BA: ldr r0, _022142F8 ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -4655,7 +4655,7 @@ _02214362: add r0, r7, #0 bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -4695,7 +4695,7 @@ MOD09_022143A0: ; 0x022143A0 ldr r0, _022143F4 ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -4740,7 +4740,7 @@ MOD09_022143F8: ; 0x022143F8 bl String_dtor ldr r0, _02214450 ; =0x00002050 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -4786,7 +4786,7 @@ MOD09_0221445C: ; 0x0221445C add r0, r7, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -4975,21 +4975,21 @@ _022145F4: mov r0, #0x13 lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214684 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r7 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214684 ; =0x00002070 ldr r1, [r5, r0] mov r0, #5 lsl r0, r0, #6 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214684 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5094,11 +5094,11 @@ MOD09_02214694: ; 0x02214694 ldr r0, _02214780 ; =0x00002070 ldr r0, [r5, r0] add r0, #0xe0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214780 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -5203,11 +5203,11 @@ MOD09_02214790: ; 0x02214790 ldr r0, _0221487C ; =0x00002070 ldr r0, [r5, r0] add r0, #0xf0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0221487C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -5315,11 +5315,11 @@ MOD09_0221488C: ; 0x0221488C mov r0, #1 lsl r0, r0, #8 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0221497C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5427,11 +5427,11 @@ MOD09_0221498C: ; 0x0221498C mov r0, #0x11 lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214A7C ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5539,11 +5539,11 @@ MOD09_02214A8C: ; 0x02214A8C mov r0, #0x12 lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214B7C ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5716,11 +5716,11 @@ MOD09_02214B8C: ; 0x02214B8C ldr r0, _02214D14 ; =0x00002070 ldr r0, [r5, r0] add r0, #0xd0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214D14 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -5777,7 +5777,7 @@ MOD09_02214D24: ; 0x02214D24 ldr r0, _02214D9C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -5812,7 +5812,7 @@ MOD09_02214DA0: ; 0x02214DA0 add r0, r6, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -5914,7 +5914,7 @@ _02214E42: bl String_dtor _02214EB8: add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -5948,7 +5948,7 @@ MOD09_02214ED0: ; 0x02214ED0 add r0, r6, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -6050,7 +6050,7 @@ _02214F72: bl String_dtor _02214FE8: add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -6093,7 +6093,7 @@ MOD09_02215000: ; 0x02215000 add r0, r7, #0 bl DestroyMsgData add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6140,7 +6140,7 @@ MOD09_02215060: ; 0x02215060 ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -6186,7 +6186,7 @@ MOD09_022150C8: ; 0x022150C8 add r0, r7, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6247,7 +6247,7 @@ _0221516C: add r0, r6, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -6378,7 +6378,7 @@ MOD09_022151A8: ; 0x022151A8 ldr r0, [sp, #0x2c] bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6434,7 +6434,7 @@ _02215306: add r0, r6, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6481,7 +6481,7 @@ _02215368: add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -6625,7 +6625,7 @@ MOD09_022153B0: ; 0x022153B0 add r0, r7, #0 bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6717,7 +6717,7 @@ MOD09_022154FC: ; 0x022154FC ldr r0, [sp, #0x14] bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -6930,11 +6930,11 @@ _0221576A: ldr r0, _02215780 ; =0x00002070 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215780 ; =0x00002070 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} .align 2, 0 _02215780: .word 0x00002070 @@ -7094,7 +7094,7 @@ _022158C0: bl String_dtor _022158C6: ldr r0, [sp, #0x18] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -7224,22 +7224,22 @@ _022159C8: ldr r1, [r5, r0] ldr r0, [sp, #0x18] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215A20 ; =0x00002070 ldr r1, [r5, r0] ldr r0, [sp, #0x14] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215A20 ; =0x00002070 ldr r1, [r5, r0] ldr r0, [sp, #0x10] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215A20 ; =0x00002070 ldr r1, [r5, r0] ldr r0, [sp, #0xc] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, _02215A1C ; =0x00002075 mov r0, #1 ldrb r2, [r5, r1] @@ -7753,23 +7753,23 @@ _02215E4C: ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -8066,19 +8066,19 @@ _02216156: ldr r0, _02216184 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02216184 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02216184 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02216184 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -8184,7 +8184,7 @@ MOD09_022161B0: ; 0x022161B0 ldr r0, _02216304 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [r5] add r0, r1, #0 add r0, #0x34 @@ -11824,7 +11824,7 @@ _0221803C: ldrb r1, [r6, r1] lsl r1, r1, #4 add r0, r0, r1 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r3, r4, r5, r6, r7, pc} _02218070: mov r4, #0 @@ -11845,7 +11845,7 @@ _02218072: ldrb r0, [r6, r4] lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -13878,7 +13878,7 @@ MOD09_022190CC: ; 0x022190CC stmia r3!, {r0, r1} add r0, r2, #0 mov r1, #1 - bl FUN_02016BF4 + bl SetScreenModeAndDisable ldr r5, _0221918C ; =0x0221BBCC add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -13893,7 +13893,7 @@ MOD09_022190CC: ; 0x022190CC str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02219190 ; =0x0221BBB0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -13908,10 +13908,10 @@ MOD09_022190CC: ; 0x022190CC str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02219194 ; =0x0221BB94 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -13926,10 +13926,10 @@ MOD09_022190CC: ; 0x022190CC str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r3, [r4] mov r0, #5 ldr r3, [r3, #0xc] @@ -13965,13 +13965,13 @@ MOD09_02219198: ; 0x02219198 bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 @@ -14230,11 +14230,11 @@ MOD09_022193BC: ; 0x022193BC ldr r0, [r5, #4] mov r1, #4 mov r2, #0 - bl FUN_0201878C + bl BgFillTilemapBufferAndSchedule ldr r0, [r5, #4] mov r1, #5 mov r2, #0 - bl FUN_0201878C + bl BgFillTilemapBufferAndSchedule add r0, r5, #0 bl MOD09_02219510 add r0, r5, #0 @@ -14469,7 +14469,7 @@ MOD09_02219560: ; 0x02219560 ldr r0, [sp, #0x10] bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -14570,7 +14570,7 @@ _022195C4: bl String_dtor ldr r0, [r5, #0x2c] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _0221968A: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -14646,7 +14646,7 @@ MOD09_02219694: ; 0x02219694 bl String_dtor _02219726: add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -14716,7 +14716,7 @@ MOD09_02219738: ; 0x02219738 bl String_dtor _022197BA: add r0, r4, r7 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -14945,7 +14945,7 @@ MOD09_02219884: ; 0x02219884 mov r0, #0x19 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -15104,7 +15104,7 @@ MOD09_02219A8C: ; 0x02219A8C add r0, r7, #0 bl String_dtor add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -15151,7 +15151,7 @@ MOD09_02219AFC: ; 0x02219AFC add r0, r7, #0 bl String_dtor add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -16918,7 +16918,7 @@ _0221A93C: ldr r1, [r6, #0x2c] lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 878fb5fc..2781e4f1 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -433,13 +433,13 @@ MOD11_0222D944: ; 0x0222D944 bl GX_EngineAToggleLayers ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD11_02231410 pop {r4, pc} @@ -471,26 +471,26 @@ _0222D99A: ldr r0, [r5, #4] add r2, sp, #0x14 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r5, #4] mov r1, #2 add r2, sp, #0x30 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r5, #4] mov r1, #3 add r2, sp, #0x4c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _0222DB40 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -742,7 +742,7 @@ MOD11_0222DB50: ; 0x0222DB50 mov r3, #5 bl FUN_02003008 mov r0, #5 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] mov r0, #5 mov r1, #3 @@ -1467,7 +1467,7 @@ _0222E282: ldmia r6!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r1, _0222E458 ; =0x000023FB mov r0, #1 ldrb r2, [r5, r1] @@ -1489,26 +1489,26 @@ _0222E2F0: add r0, r4, #0 add r2, sp, #0x48 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x64 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x80 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _0222E460 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -1712,13 +1712,13 @@ MOD11_0222E4E8: ; 0x0222E4E8 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD11_022584AC pop {r4, pc} @@ -3366,7 +3366,7 @@ MOD11_0222F254: ; 0x0222F254 ldr r0, [r4, #4] ldr r3, [r4, r3] mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, _0222F280 ; =0x00002434 ldr r0, [r4, r0] cmp r0, #0 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 28a6f1fb..24037833 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -41,7 +41,7 @@ MOD11_0222F29C: ; 0x0222F29C add r3, r1, #0 bl FUN_02003914 mov r0, #5 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #4] mov r0, #5 mov r1, #1 @@ -98,7 +98,7 @@ _0222F30E: ldmia r6!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r6, _0222F4D0 ; =MOD11_0225DA04 add r3, sp, #0x14 ldmia r6!, {r0, r1} @@ -113,10 +113,10 @@ _0222F30E: str r0, [r3] ldr r0, [r5, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x13 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -816,7 +816,7 @@ MOD11_0222F93C: ; 0x0222F93C bl GX_EngineAToggleLayers ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap add r0, r4, #0 @@ -23819,10 +23819,10 @@ _0223AC50: strh r1, [r0] mov r0, #1 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] mov r1, #2 bl MOD11_02231564 @@ -24064,10 +24064,10 @@ _0223AE5E: orr r2, r0 strh r2, [r1] mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] mov r1, #0 bl MOD11_02231564 @@ -62296,7 +62296,7 @@ MOD11_0224D518: ; 0x0224D518 mov r1, #0xff bl FillWindowPixelBuffer add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r1, #0x65 lsl r1, r1, #2 ldrb r1, [r4, r1] @@ -63233,7 +63233,7 @@ _0224DCAE: mov r1, #3 mov r2, #2 mov r3, #0x84 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0224DCBE: ldr r0, _0224DCE0 ; =MOD11_02250060 add r1, r4, #0 @@ -67678,7 +67678,7 @@ _02250086: mov r1, #3 mov r2, #1 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x20] add r0, r0, #1 str r0, [r4, #0x20] @@ -71659,7 +71659,7 @@ _022520D2: mov r1, #0xff bl FillWindowPixelBuffer add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4] bl MOD11_02230094 bl MOD11_0225C76C @@ -84398,27 +84398,27 @@ _0225845A: lsr r1, r1, #0x18 add r2, r6, #0 add r3, r7, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r1, r4, #4 lsl r1, r1, #0x18 ldr r2, _022584A8 ; =0x000002FF add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add r1, r4, #4 lsl r1, r1, #0x18 mov r2, #0 add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 add r6, #0x1c cmp r4, #4 @@ -84444,7 +84444,7 @@ _022584B4: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #4 blo _022584B4 @@ -84905,7 +84905,7 @@ _022588AE: ldr r2, [r2, #0x3c] lsr r1, r1, #0x18 lsl r3, r3, #0xa - bl FUN_02017DFC + bl BG_LoadScreenTilemapData add r1, r4, #4 lsl r1, r1, #0x18 ldr r0, [sp, #0x28] @@ -85968,7 +85968,7 @@ _0225910E: mov r1, #6 mov r2, #0 asr r3, r6, #8 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 bl MOD11_0225902C cmp r4, #1 @@ -85976,13 +85976,13 @@ _0225910E: ldr r2, _02259160 ; =0x000002FF add r0, r7, #0 mov r1, #7 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit mov r0, #7 mov r1, #0 bl ToggleBgLayer mov r0, #7 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r2, _02259164 ; =0x04001000 ldr r0, _02259168 ; =0xFFFF1FFF ldr r1, [r2] @@ -87845,7 +87845,7 @@ _0225A116: ldr r2, _0225A15C ; =0x000002FF add r6, r0, #0 mov r1, #5 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add r0, r6, #0 mov r1, #5 bl ScheduleBgTilemapBufferTransfer @@ -90373,22 +90373,22 @@ _0225B4D6: add r0, r4, #0 mov r1, #4 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #0 add r0, r4, #0 mov r1, #5 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #5 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5] mov r1, #1 ldr r0, [r0] @@ -90427,7 +90427,7 @@ _0225B55A: add r0, r6, #0 mov r1, #4 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r4, [r5, r3] mov r3, #0xff @@ -90435,7 +90435,7 @@ _0225B55A: mov r1, #5 mov r2, #0 sub r3, r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #8 ldrsh r0, [r5, r0] mov r1, #0x64 @@ -90453,13 +90453,13 @@ _0225B590: add r0, r6, #0 mov r1, #4 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r5, r3] add r0, r6, #0 mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #8 ldrsh r0, [r5, r0] mov r1, #0x64 @@ -90471,12 +90471,12 @@ _0225B5B6: mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r6, #0 mov r1, #5 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0xa ldrsh r0, [r5, r0] mov r1, #0x64 @@ -90556,24 +90556,24 @@ MOD11_0225B644: ; 0x0225B644 mov r1, #4 add r3, r2, #0 add r5, r0, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x10 ldrsh r3, [r4, r3] add r0, r5, #0 mov r1, #4 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #0 add r0, r5, #0 mov r1, #5 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x10 ldrsh r3, [r4, r3] add r0, r5, #0 mov r1, #5 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, r5, r6, pc} _0225B68E: cmp r0, #0xc0 @@ -90591,7 +90591,7 @@ _0225B68E: mov r1, #4 mov r2, #0 sub r3, r3, r6 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r4, [r4, r3] mov r3, #0xff @@ -90599,31 +90599,31 @@ _0225B68E: mov r1, #5 mov r2, #0 sub r3, r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _0225B6E0 _0225B6C6: mov r3, #0xc ldrsh r3, [r4, r3] mov r1, #4 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] add r0, r5, #0 mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0225B6E0: add r0, r5, #0 mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 mov r1, #5 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0225B6F8: pop {r4, r5, r6, pc} nop @@ -90671,7 +90671,7 @@ _0225B740: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add r4, r4, #1 add r6, r6, #2 cmp r4, #4 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 9a3d4721..68371f50 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -95,7 +95,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 mov r3, #0x15 bl FUN_02003008 mov r0, #0x15 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x30] mov r0, #0x40 mov r1, #0x15 @@ -454,13 +454,13 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl GX_EngineAToggleLayers ldr r0, [r4, #0x30] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] bl MOD12_022319FC ldr r0, _0222DAD8 ; =0x0000081C @@ -632,7 +632,7 @@ _0222DB60: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0222DC78 ; =MOD12_02244A50 add r3, sp, #0x38 mov r2, #0xa @@ -647,56 +647,56 @@ _0222DBC0: add r0, r4, #0 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r4, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _0222DC7C ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -1069,10 +1069,10 @@ MOD12_0222DF30: ; 0x0222DF30 bl GfGfxLoader_LoadScrnData mov r0, #1 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority add r0, r5, #0 bl MOD12_022335B0 cmp r4, #1 @@ -1090,13 +1090,13 @@ _0222DF9A: bl BG_ClearCharDataRange ldr r0, [r5, #0x30] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority _0222DFBE: add sp, #0x10 pop {r3, r4, r5, pc} @@ -3230,7 +3230,7 @@ MOD12_0222EF04: ; 0x0222EF04 mov r3, #0x16 bl FUN_02003008 mov r0, #0x16 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #0x30] mov r0, #0x40 mov r1, #0x16 @@ -3610,19 +3610,19 @@ MOD12_0222F324: ; 0x0222F324 bl GX_EngineAToggleLayers ldr r0, [r4, #0x30] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #4 mov r1, #0 bl ToggleBgLayer ldr r0, [r4, #0x30] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x28] ldr r1, [r4, #0x2c] bl FUN_0200C398 @@ -3861,7 +3861,7 @@ _0222F558: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0222F6A8 ; =MOD12_02244B70 add r3, sp, #0x54 mov r2, #0xa @@ -3876,56 +3876,56 @@ _0222F5B8: add r0, r4, #0 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x8c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r4, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _0222F6AC ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -3949,20 +3949,20 @@ _0222F5B8: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #4 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0xa8 pop {r3, r4, r5, pc} .align 2, 0 @@ -4200,7 +4200,7 @@ MOD12_0222F834: ; 0x0222F834 bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0x30] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5092,7 +5092,7 @@ MOD12_0222FE4C: ; 0x0222FE4C mov r1, #1 bl MOD12_0223EC7C mov r0, #0x17 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #0x74] mov r0, #0x40 mov r1, #0x17 @@ -5448,13 +5448,13 @@ _02230296: bl GX_EngineAToggleLayers ldr r0, [r4, #0x74] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x74] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x74] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x74] bl MOD12_0223B474 ldr r0, _022303B0 ; =0x00001130 @@ -5807,7 +5807,7 @@ _02230584: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0223069C ; =MOD12_02244C94 add r3, sp, #0x38 mov r2, #0xa @@ -5822,56 +5822,56 @@ _022305E4: add r0, r4, #0 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r4, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _022306A0 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -8354,27 +8354,27 @@ _022319AE: lsr r1, r1, #0x18 add r2, r6, #0 add r3, r7, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #0 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add r1, r4, #4 lsl r1, r1, #0x18 mov r2, #0 add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 add r6, #0x1c cmp r4, #4 @@ -8399,7 +8399,7 @@ _02231A04: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #4 blo _02231A04 @@ -8590,7 +8590,7 @@ _02231B90: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add r4, r4, #1 add r5, r5, #2 cmp r4, #4 @@ -8632,7 +8632,7 @@ _02231BDE: ldr r2, [r2, #0x20] lsr r1, r1, #0x18 lsl r3, r3, #0xa - bl FUN_02017DFC + bl BG_LoadScreenTilemapData add r1, r5, #4 lsl r1, r1, #0x18 ldr r0, [sp, #0xc] @@ -15298,7 +15298,7 @@ _02234F42: _02234F96: ldr r0, [r5, #0x30] mov r1, #1 - bl FUN_02017B48 + bl Bg_GetXpos add r0, r6, #0 bl String_dtor add sp, #0x10 @@ -28778,27 +28778,27 @@ _0223B426: lsr r1, r1, #0x18 add r2, r6, #0 add r3, r7, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #0 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add r1, r4, #4 lsl r1, r1, #0x18 mov r2, #0 add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 add r6, #0x1c cmp r4, #4 @@ -28823,7 +28823,7 @@ _0223B47C: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #4 blo _0223B47C @@ -29192,7 +29192,7 @@ _0223B794: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add r4, r4, #1 add r5, r5, #2 cmp r4, #4 @@ -29256,7 +29256,7 @@ _0223B80A: ldr r2, [r2] lsr r1, r1, #0x18 lsl r3, r3, #0xa - bl FUN_02017DFC + bl BG_LoadScreenTilemapData add r1, r5, #4 lsl r1, r1, #0x18 ldr r0, [sp, #0xc] @@ -29760,7 +29760,7 @@ _0223BBEC: strh r0, [r4, #0x1a] lsl r0, r7, #0x18 lsr r0, r0, #0x18 - bl FUN_020187B0 + bl BgGetCharPtr str r0, [r4, #4] add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -41175,7 +41175,7 @@ MOD12_02241210: ; 0x02241210 mov r3, #0x18 bl FUN_02003008 mov r0, #0x18 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #0x30] mov r0, #0x40 mov r1, #0x18 @@ -41485,19 +41485,19 @@ _022415D4: bl GX_EngineAToggleLayers ldr r0, [r4, #0x30] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #4 mov r1, #0 bl ToggleBgLayer ldr r0, [r4, #0x30] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x28] ldr r1, [r4, #0x2c] bl FUN_0200C398 @@ -41694,14 +41694,14 @@ MOD12_022417DC: ; 0x022417DC bgt _022417FC mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority pop {r3, pc} _022417FC: cmp r0, #0x90 bge _02241808 mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority _02241808: pop {r3, pc} nop @@ -41717,7 +41717,7 @@ MOD12_02241814: ; 0x02241814 bne _02241826 mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority _02241826: pop {r3, pc} .align 2, 0 @@ -41797,7 +41797,7 @@ _02241874: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _022419C4 ; =MOD12_022465C0 add r3, sp, #0x54 mov r2, #0xa @@ -41812,56 +41812,56 @@ _022418D4: add r0, r4, #0 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x8c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r4, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _022419C8 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -41885,20 +41885,20 @@ _022418D4: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #4 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0xa8 pop {r3, r4, r5, pc} .align 2, 0 @@ -43645,7 +43645,7 @@ MOD12_022426BC: ; 0x022426BC bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0x30] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -43702,7 +43702,7 @@ MOD12_022426BC: ; 0x022426BC bl FUN_020030E8 ldr r0, [r5, #0x30] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -43815,7 +43815,7 @@ MOD12_02242804: ; 0x02242804 bl GfGfxLoader_LoadScrnData ldr r0, [r6, #0x30] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index a7651aca..5b8cf4c3 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -10480,7 +10480,7 @@ MOD14_021DC76C: ; 0x021DC76C lsl r0, r0, #4 str r5, [r4, r0] mov r0, #0xa - bl FUN_02016B94 + bl BgConfig_Alloc mov r1, #0x57 lsl r1, r1, #2 str r0, [r4, r1] @@ -10829,22 +10829,22 @@ MOD14_021DCA38: ; 0x021DCA38 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x56 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -12846,28 +12846,28 @@ MOD14_021DDA38: ; 0x021DDA38 add r2, r0, #0 bl GX_SetGraphicsMode ldr r0, _021DDB28 ; =MOD14_021E627C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB2C ; =MOD14_021E6350 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB30 ; =MOD14_021E6334 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB34 ; =MOD14_021E62FC mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 bl MOD14_021DC3C4 cmp r0, #4 @@ -12878,28 +12878,28 @@ MOD14_021DDA38: ; 0x021DDA38 ldr r2, _021DDB38 ; =MOD14_021E6318 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB3C ; =MOD14_021E62E0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB40 ; =MOD14_021E62C4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB44 ; =MOD14_021E62A8 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate b _021DDB1A _021DDADA: mov r0, #0x57 @@ -12908,28 +12908,28 @@ _021DDADA: ldr r2, _021DDB38 ; =MOD14_021E6318 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB48 ; =MOD14_021E6388 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB4C ; =MOD14_021E628C mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB44 ; =MOD14_021E62A8 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate _021DDB1A: bl MOD14_021DDC78 pop {r3, r4, r5, pc} @@ -12983,7 +12983,7 @@ MOD14_021DDB50: ; 0x021DDB50 lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -13584,7 +13584,7 @@ MOD14_021DE014: ; 0x021DE014 ldr r0, _021DE060 ; =0x00005984 mov r1, #3 ldr r0, [r4, r0] - bl FUN_02017B48 + bl Bg_GetXpos ldr r1, _021DE064 ; =0x0000585C str r0, [r4, #0xc] ldr r1, [r4, r1] @@ -13597,7 +13597,7 @@ MOD14_021DE014: ; 0x021DE014 ldr r0, _021DE060 ; =0x00005984 str r3, [r4, #0xc] ldr r0, [r4, r0] - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0 str r3, [sp] mov r0, #0x40 @@ -13920,7 +13920,7 @@ _021DE2C2: mov r1, #3 add r2, r7, #0 lsl r3, r3, #0xc - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram _021DE2DC: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -13937,7 +13937,7 @@ MOD14_021DE2E8: ; 0x021DE2E8 ldr r0, [r5, r0] mov r1, #3 add r6, r2, #0 - bl FUN_02017B48 + bl Bg_GetXpos lsl r0, r0, #0x17 lsr r1, r0, #0xb mov r0, #0xb8 @@ -14105,7 +14105,7 @@ MOD14_021DE3E4: ; 0x021DE3E4 ldr r3, [r5, #0xc] ldr r0, [r5, r0] mov r1, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5, #4] sub r0, r0, #1 str r0, [r5, #4] @@ -14116,7 +14116,7 @@ _021DE45C: ldr r0, [r5, r0] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _021DE480 ; =0x00000618 add r0, r5, #0 add r5, #0xa8 @@ -19666,7 +19666,7 @@ _021E0F82: blt _021E0F5E ldr r0, [r5, #8] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _021E0F94: add r0, r5, #0 bl MOD14_021E0FA8 @@ -19931,7 +19931,7 @@ _021E1190: bl MOD14_021E12B8 ldr r0, [r5, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0 strh r0, [r4, #4] mov r0, #2 @@ -19968,7 +19968,7 @@ _021E11CE: bl ScrollWindow ldr r0, [r5, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldrh r0, [r4, #6] cmp r0, #0x10 blo _021E1220 @@ -20254,16 +20254,16 @@ MOD14_021E13F0: ; 0x021E13F0 bl MOD14_021E153C _021E1430: ldr r0, [r4, #4] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x20 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode _021E144E: pop {r4, pc} @@ -20309,16 +20309,16 @@ _021E14A0: bl MOD14_021E16A0 _021E14A8: ldr r0, [r4, #4] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x20 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD14_021E1114 _021E14CC: @@ -20358,16 +20358,16 @@ _021E150E: mov r1, #0 bl MOD14_021E16A0 ldr r0, [r4, #4] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x20 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD14_021E1140 _021E153A: @@ -20595,7 +20595,7 @@ _021E16DC: ldr r0, [r0, #8] mov r1, #2 mov r3, #0xc - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -20847,10 +20847,10 @@ MOD14_021E189C: ; 0x021E189C mov r1, #1 bl AddTextPrinterParameterized ldr r0, [r5, #0x18] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r5] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #1 strh r0, [r5, #0x1c] add sp, #0xc @@ -21039,10 +21039,10 @@ _021E1A5C: ldrb r1, [r1] bl MOD14_021E1AD8 ldr r0, [sp, #0x14] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r5] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #1 strh r0, [r5, #0x1e] add sp, #0x18 @@ -21175,7 +21175,7 @@ _021E1B5A: _021E1B6E: ldr r0, [r4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, pc} thumb_func_start MOD14_021E1B78 @@ -21194,7 +21194,7 @@ MOD14_021E1B78: ; 0x021E1B78 _021E1B90: ldr r0, [r4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, pc} .align 2, 0 @@ -21230,7 +21230,7 @@ MOD14_021E1B9C: ; 0x021E1B9C add r2, r5, r2 bl FUN_02002218 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #8 pop {r4, r5, r6, pc} @@ -21254,7 +21254,7 @@ _021E1BF0: cmp r5, #6 blt _021E1BF0 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -22275,7 +22275,7 @@ MOD14_021E2394: ; 0x021E2394 sub r3, r3, r5 bl AddTextPrinterParameterized2 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -22290,7 +22290,7 @@ MOD14_021E23F8: ; 0x021E23F8 add r0, r4, #0 bl FillWindowPixelBuffer add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} thumb_func_start MOD14_021E240C @@ -22333,7 +22333,7 @@ _021E2450: cmp r6, #7 blt _021E242C ldr r0, [sp, #0xc] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -22347,7 +22347,7 @@ MOD14_021E2464: ; 0x021E2464 add r0, r4, #0 bl FillWindowPixelBuffer add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} .align 2, 0 @@ -22494,7 +22494,7 @@ _021E2562: _021E2582: ldr r0, [r5, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #7 add sp, #0x1c strb r0, [r4, #5] @@ -22548,7 +22548,7 @@ _021E25C2: bl MOD14_021E240C ldr r0, [r5, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldrb r0, [r4, #4] add sp, #0x1c add r0, r0, #1 @@ -22657,7 +22657,7 @@ _021E26CA: _021E26D0: ldr r0, [r4, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x1c pop {r4, r5, pc} _021E26DC: @@ -22682,7 +22682,7 @@ MOD14_021E26E4: ; 0x021E26E4 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x18 str r0, [sp] mov r0, #0x20 @@ -22803,7 +22803,7 @@ _021E27DC: ldr r0, [r4, #4] mov r1, #1 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0xe ldr r2, [r4, #8] lsl r1, r1, #0x10 @@ -22817,7 +22817,7 @@ _021E280A: mov r1, #1 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0xe ldr r2, [r4, #0xc] lsl r1, r1, #0x10 @@ -22882,7 +22882,7 @@ MOD14_021E2884: ; 0x021E2884 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 bl MOD14_021E2A28 mov r0, #1 @@ -22918,7 +22918,7 @@ MOD14_021E28B4: ; 0x021E28B4 ldr r0, [r4, #4] mov r1, #1 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0xe ldr r2, [r4, #8] lsl r1, r1, #0x10 @@ -22933,7 +22933,7 @@ _021E28EC: mov r1, #1 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0xe ldr r2, [r4, #0xc] lsl r1, r1, #0x10 @@ -22953,7 +22953,7 @@ _021E28EC: bl FillBgTilemapRect ldr r0, [r4, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _021E293C ; =MOD14_021E28AC ldr r2, [r4] add r0, r4, #0 @@ -23194,7 +23194,7 @@ MOD14_021E2AE8: ; 0x021E2AE8 bl MOD14_021E32F8 ldr r0, [r4, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, pc} thumb_func_start MOD14_021E2B10 @@ -23266,7 +23266,7 @@ _021E2B72: bl MOD14_021E31A4 ldr r0, [r5, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 add r1, r4, #0 bl MOD14_021E3290 @@ -23377,7 +23377,7 @@ _021E2C46: bl MOD14_021E31A4 ldr r0, [r5, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 add r1, r4, #0 bl MOD14_021E3290 @@ -24658,7 +24658,7 @@ MOD14_021E355C: ; 0x021E355C bl FillBgTilemapRect ldr r0, [r4, #8] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r3, [r4, #0x10] ldr r0, [r4, #8] lsl r5, r3, #2 @@ -24666,7 +24666,7 @@ MOD14_021E355C: ; 0x021E355C mov r1, #5 ldr r3, [r3, r5] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0 add r1, r4, #0 str r3, [sp] @@ -24961,7 +24961,7 @@ _021E3852: str r6, [r5, #0x10] ldr r0, [r5, #8] mov r1, #5 - bl FUN_02017B48 + bl Bg_GetXpos lsl r0, r0, #0xc ldr r1, _021E3898 ; =MOD14_021E6674 lsl r2, r6, #2 @@ -25042,7 +25042,7 @@ _021E38DE: ldr r0, [r5, #8] mov r1, #5 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrh r0, [r4, #0xc] sub r0, r0, #1 strh r0, [r4, #0xc] @@ -25052,7 +25052,7 @@ _021E3900: ldr r3, [r4, #0x18] mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x10 str r0, [sp] ldr r0, _021E3978 ; =0x04001050 @@ -25072,7 +25072,7 @@ _021E3924: mov r1, #6 ldr r3, [r3, r5] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 strh r0, [r4, #0xe] ldr r0, [r4, #4] @@ -25176,7 +25176,7 @@ _021E39CE: mov r1, #6 ldr r3, [r3, r5] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -25193,7 +25193,7 @@ _021E3A0C: ldr r0, [r5, #8] mov r1, #5 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrh r0, [r4, #0xc] sub r0, r0, #1 strh r0, [r4, #0xc] @@ -25203,7 +25203,7 @@ _021E3A2E: ldr r3, [r4, #0x18] mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x10 str r0, [sp] ldr r0, _021E3AA4 ; =0x04001050 @@ -25223,7 +25223,7 @@ _021E3A52: mov r1, #6 ldr r3, [r3, r5] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 strh r0, [r4, #0xe] ldr r0, [r4, #4] @@ -25309,7 +25309,7 @@ _021E3ADA: ldr r0, [r0, #8] mov r1, #6 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -25326,7 +25326,7 @@ _021E3B12: mov r1, #5 mov r2, #0 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrh r0, [r4, #0xc] sub r0, r0, #1 strh r0, [r4, #0xc] @@ -25336,7 +25336,7 @@ _021E3B34: ldr r3, [r4, #0x18] mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -27090,7 +27090,7 @@ _021E4800: blo _021E47AE add r0, r6, #0 add r0, #0x88 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r6, #0 bl MOD14_021E4770 add sp, #0x14 @@ -28359,7 +28359,7 @@ MOD14_021E5128: ; 0x021E5128 str r0, [r4, r1] ldr r0, [r4, #0xc] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD14_021E5A08 _021E5210: @@ -28469,7 +28469,7 @@ MOD14_021E52C0: ; 0x021E52C0 bl MOD14_021E5504 ldr r0, [r4, #0xc] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _021E52DE: pop {r4, pc} @@ -28502,7 +28502,7 @@ _021E530A: bl MOD14_021E549C ldr r0, [r4, #0xc] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0xdf lsl r0, r0, #2 ldr r1, [r4, r0] @@ -28568,7 +28568,7 @@ _021E534A: bl CopyToBgTilemapRect ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x1c pop {r4, r5, pc} @@ -28663,7 +28663,7 @@ _021E541E: add r4, #0x78 _021E5458: add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r5, r5, #1 add r4, #0x10 cmp r5, #3 @@ -28823,7 +28823,7 @@ _021E5588: cmp r0, #0 beq _021E55A4 add r0, r5, #0 - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r5, #0 bl RemoveWindow add r0, r4, #0 @@ -29009,7 +29009,7 @@ _021E56F0: cmp r0, #0 beq _021E570C add r0, r5, #0 - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r5, #0 bl RemoveWindow add r0, r4, #0 @@ -29102,7 +29102,7 @@ _021E5786: bl AddTextPrinterParameterized2 _021E57B8: add r0, r7, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -29118,7 +29118,7 @@ MOD14_021E57CC: ; 0x021E57CC mov r1, #0 bl FillWindowPixelBuffer add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} .align 2, 0 @@ -29259,7 +29259,7 @@ _021E58C8: blt _021E58C8 _021E58FA: add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -29386,7 +29386,7 @@ _021E59C6: blt _021E59C6 _021E59F8: add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop @@ -29782,7 +29782,7 @@ MOD14_021E5CFC: ; 0x021E5CFC bl AddTextPrinterParameterized2 _021E5D56: add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index f4a704e3..501b5379 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2611,7 +2611,7 @@ MOD15_021D87F8: ; 0x021D87F8 bl FUN_02008C9C str r0, [r4, #0x24] mov r0, #0x23 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x20] ldr r0, _021D8880 ; =MOD15_021D88D8 add r1, r4, #0 @@ -3076,19 +3076,19 @@ _021D8BF4: blt _021D8BD8 ldr r0, [r7, #0x20] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7, #0x20] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7, #0x20] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7, #0x20] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7, #0x20] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r6, #0 bl MOD15_021D8998 _021D8C2A: @@ -3112,32 +3112,32 @@ MOD15_021D8C30: ; 0x021D8C30 ldr r0, _021D8C98 ; =0x021DB964 bl GX_SetBanks ldr r0, _021D8C9C ; =0x021DB8C8 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0 ldr r0, [r4, #0x20] ldr r2, _021D8CA0 ; =0x021DB910 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x20] ldr r2, _021D8CA4 ; =0x021DB8D8 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x20] ldr r2, _021D8CA8 ; =0x021DB948 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x20] ldr r2, _021D8CAC ; =0x021DB8F4 mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x20] ldr r2, _021D8CB0 ; =0x021DB92C mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate pop {r4, pc} nop _021D8C94: .word 0x04000304 @@ -4547,7 +4547,7 @@ MOD15_021D9694: ; 0x021D9694 bl MOD15_021D98C0 add r0, r6, #0 mov r1, #0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x14 pop {r3, r4, r5, r6, pc} @@ -4815,7 +4815,7 @@ _021D99FA: _021D9A02: add r4, #0xc add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} thumb_func_start MOD15_021D9A0C @@ -5306,7 +5306,7 @@ _021D9D8C: _021D9DB0: add r4, #0x1c add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -5552,7 +5552,7 @@ MOD15_021D9F88: ; 0x021D9F88 bl FUN_0200CCF8 add r4, #0x2c add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram pop {r4, pc} .align 2, 0 @@ -5630,7 +5630,7 @@ MOD15_021D9FD4: ; 0x021D9FD4 bl MOD15_021DA0B8 add r0, r4, #0 mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -5676,7 +5676,7 @@ MOD15_021DA044: ; 0x021DA044 str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, sp, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl String_dtor add r0, sp, #0x10 @@ -5794,7 +5794,7 @@ MOD15_021DA164: ; 0x021DA164 mov r1, #3 add r2, r1, #0 mov r3, #0x40 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} thumb_func_start MOD15_021DA178 @@ -5805,7 +5805,7 @@ MOD15_021DA178: ; 0x021DA178 mov r1, #3 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} thumb_func_start MOD15_021DA18C @@ -5892,12 +5892,12 @@ MOD15_021DA1D0: ; 0x021DA1D0 add r0, r4, #0 mov r1, #1 sub r3, r2, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #2 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 bl MOD15_021DA54C mov r1, #2 @@ -5936,7 +5936,7 @@ MOD15_021DA1D0: ; 0x021DA1D0 str r0, [r3] add r0, r4, #0 mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -6044,7 +6044,7 @@ _021DA31A: add r0, sp, #0x28 bl PutWindowTilemap add r0, sp, #0x28 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r5, #0 bl String_dtor add r0, sp, #0x28 @@ -6143,7 +6143,7 @@ _021DA430: blo _021DA40C _021DA452: add r0, sp, #0x20 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, sp, #0x20 bl PutWindowTilemap add r0, r4, #0 @@ -6232,7 +6232,7 @@ _021DA4C2: add r0, r6, #0 bl PutWindowTilemap add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r6, #0 bl RemoveWindow add r7, r7, #1 @@ -6495,7 +6495,7 @@ MOD15_021DA710: ; 0x021DA710 mov r1, #1 mov r2, #3 mov r3, #2 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} thumb_func_start MOD15_021DA720 @@ -6607,7 +6607,7 @@ _021DA7DA: ldr r0, [r4, #0xc] mov r1, #1 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} .align 2, 0 @@ -6775,10 +6775,10 @@ MOD15_021DA8E8: ; 0x021DA8E8 bl PutWindowTilemap add r0, r5, #0 add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD15_021DA950 mov r0, #2 @@ -6885,7 +6885,7 @@ _021DAA12: _021DAA18: add r6, #0x10 add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -7210,7 +7210,7 @@ _021DAC84: str r0, [r1] add r0, r7, #0 add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [sp, #8] mov r2, #2 str r0, [sp] @@ -7337,7 +7337,7 @@ MOD15_021DAD78: ; 0x021DAD78 ldr r0, [r0, #0xc] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} .align 2, 0 @@ -7591,7 +7591,7 @@ _021DAF92: bl MOD15_021DB154 ldr r0, [r4, #0xc] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x1c pop {r3, r4, pc} .align 2, 0 @@ -8135,7 +8135,7 @@ _021DB390: ldr r0, [r4] mov r1, #4 ldr r0, [r0, #0xc] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldrh r0, [r4, #0xa] add sp, #0x1c add r0, r0, #1 @@ -8180,7 +8180,7 @@ _021DB416: ldr r0, [r4] mov r1, #4 ldr r0, [r0, #0xc] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 strh r0, [r4, #8] ldrh r0, [r4, #0xa] @@ -8227,7 +8227,7 @@ _021DB476: ldr r0, [r4] mov r1, #4 ldr r0, [r0, #0xc] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r4, #4] add sp, #0x1c add r0, r0, #1 @@ -8322,14 +8322,14 @@ MOD15_021DB564: ; 0x021DB564 bne _021DB57E add r0, r1, #0 add r1, r2, #0 - bl FUN_02017B48 + bl Bg_GetXpos str r0, [r4, #0xc] mov r0, #0 b _021DB58A _021DB57E: add r0, r1, #0 add r1, r2, #0 - bl FUN_02017B54 + bl Bg_GetYpos str r0, [r4, #0xc] mov r0, #3 _021DB58A: @@ -8416,7 +8416,7 @@ MOD15_021DB604: ; 0x021DB604 lsr r1, r1, #0x18 lsr r2, r2, #0x18 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrh r0, [r4, #0x18] sub r0, r0, #1 strh r0, [r4, #0x18] @@ -8430,7 +8430,7 @@ _021DB632: ldr r3, [r4, #0x10] lsr r1, r1, #0x18 lsr r2, r2, #0x18 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} thumb_func_start MOD15_021DB648 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index c950d9c2..66103b62 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -2153,7 +2153,7 @@ MOD16_021D8534: ; 0x021D8534 lsl r1, r1, #2 str r0, [r5, r1] add r0, r4, #0 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5] mov r1, #1 mov r0, #0 @@ -2162,7 +2162,7 @@ MOD16_021D8534: ; 0x021D8534 str r1, [sp, #0x18] str r1, [sp, #0x1c] add r0, sp, #0x10 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r5] add r1, r4, #0 bl MOD16_021D8DC0 @@ -3335,7 +3335,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -3343,7 +3343,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D8F18 ; =0x021FF4F4 add r3, sp, #0x70 ldmia r6!, {r0, r1} @@ -3358,7 +3358,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -3366,10 +3366,10 @@ MOD16_021D8DC0: ; 0x021D8DC0 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -3387,7 +3387,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -3395,7 +3395,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D8F20 ; =0x021FF4BC add r3, sp, #0x38 ldmia r6!, {r0, r1} @@ -3410,7 +3410,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #5 mov r1, #0x20 mov r2, #0 @@ -3418,7 +3418,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D8F24 ; =0x021FF4A0 add r3, sp, #0x1c ldmia r6!, {r0, r1} @@ -3433,7 +3433,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #6 mov r1, #0x20 mov r2, #0 @@ -3441,7 +3441,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D8F28 ; =0x021FF52C add r3, sp, #0 ldmia r6!, {r0, r1} @@ -3456,7 +3456,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #7 mov r1, #0x40 mov r2, #0 @@ -3464,7 +3464,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0xa8 pop {r4, r5, r6, pc} .align 2, 0 @@ -3481,22 +3481,22 @@ MOD16_021D8F2C: ; 0x021D8F2C push {r4, lr} add r4, r0, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD16_021D8F2C @@ -13043,7 +13043,7 @@ MOD16_021DD530: ; 0x021DD530 str r4, [sp, #0x1c] mov r7, #0xe mov r5, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021DD594 _021DD568: mov r0, #3 @@ -13150,7 +13150,7 @@ MOD16_021DD610: ; 0x021DD610 ldr r0, [r0] mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021DD62A: mov r2, #1 lsl r2, r2, #0x1a @@ -13354,7 +13354,7 @@ _021DD77E: ldr r0, [r5] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit _021DD7B0: add r0, r5, #0 add r1, r4, #0 @@ -13509,7 +13509,7 @@ _021DD8A8: ldr r0, [r5] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit b _021DD8F6 _021DD8E0: add r0, r7, #0 @@ -14753,7 +14753,7 @@ MOD16_021DE1E0: ; 0x021DE1E0 bl MOD16_021DE594 mov r0, #7 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD16_021DE1E0 @@ -14774,7 +14774,7 @@ MOD16_021DE228: ; 0x021DE228 bl MOD16_021DE808 mov r0, #7 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority pop {r4, r5, r6, pc} thumb_func_end MOD16_021DE228 @@ -15449,12 +15449,12 @@ MOD16_021DE788: ; 0x021DE788 add r0, r4, #0 mov r1, #7 sub r3, #0x78 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #7 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -15472,7 +15472,7 @@ MOD16_021DE808: ; 0x021DE808 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r4, pc} thumb_func_end MOD16_021DE808 @@ -16645,11 +16645,11 @@ MOD16_021DEFF8: ; 0x021DEFF8 ldr r0, [r0] add r4, r2, #0 ldr r6, [sp, #0x18] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r5] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r5] mov r1, #0 add r0, r0, #4 @@ -16710,10 +16710,10 @@ MOD16_021DEFF8: ; 0x021DEFF8 bl MOD16_021DF7C8 mov r0, #1 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end MOD16_021DEFF8 @@ -16733,7 +16733,7 @@ MOD16_021DF0BC: ; 0x021DF0BC ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] mov r1, #0 add r0, r0, #4 @@ -16744,10 +16744,10 @@ MOD16_021DF0BC: ; 0x021DF0BC bl SetWindowPaletteNum mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD16_021DF0BC @@ -17855,7 +17855,7 @@ _021DF92E: bl FillWindowPixelBuffer ldr r0, [r4] add r0, r0, #4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021DF94C: ldr r2, [r6, #0x34] mov r1, #4 @@ -17903,10 +17903,10 @@ MOD16_021DF970: ; 0x021DF970 bl String_dtor mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -17921,10 +17921,10 @@ MOD16_021DF9C0: ; 0x021DF9C0 add r4, r1, #0 add r1, r0, #0 add r6, r2, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r5] mov r1, #0 add r0, r0, #4 @@ -26989,7 +26989,7 @@ MOD16_021E3BC8: ; 0x021E3BC8 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _021E3C10 ; =0x000007F4 ldr r0, [r5, r0] bl FreeToHeap @@ -29605,7 +29605,7 @@ MOD16_021E4EE4: ; 0x021E4EE4 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD16_021E4EE4 @@ -34314,7 +34314,7 @@ MOD16_021E71A8: ; 0x021E71A8 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} thumb_func_end MOD16_021E71A8 @@ -38663,7 +38663,7 @@ MOD16_021E92D0: ; 0x021E92D0 ldr r0, [r5] mov r1, #2 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD16_021E92D0 @@ -39800,7 +39800,7 @@ MOD16_021E9B3C: ; 0x021E9B3C ldr r0, [r4] mov r1, #5 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} thumb_func_end MOD16_021E9B3C @@ -41597,7 +41597,7 @@ MOD16_021EA858: ; 0x021EA858 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] mov r1, #0 add r0, r0, #4 @@ -42138,7 +42138,7 @@ _021EAC8A: bl ScheduleSetBgPosText ldr r0, [r4] add r0, r0, #4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xcb ldr r1, [r6, #4] lsl r0, r0, #2 @@ -43647,17 +43647,17 @@ MOD16_021EB724: ; 0x021EB724 ldr r0, [r0] mov r1, #7 sub r3, #0x30 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5] mov r2, #3 add r3, r2, #0 ldr r0, [r0] mov r1, #7 sub r3, #0x13 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #7 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021EB724 @@ -43669,14 +43669,14 @@ MOD16_021EB80C: ; 0x021EB80C ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] mov r1, #7 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #7 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EB80C @@ -45517,7 +45517,7 @@ MOD16_021EC574: ; 0x021EC574 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 bl MOD16_021ECA2C pop {r3, r4, r5, pc} @@ -48269,7 +48269,7 @@ MOD16_021EDA3C: ; 0x021EDA3C ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0xc] mov r1, #0 bl FUN_02013EB0 @@ -51352,12 +51352,12 @@ MOD16_021EF218: ; 0x021EF218 mov r1, #1 str r0, [r2] add r0, r5, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 mov r1, #1 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -51365,7 +51365,7 @@ MOD16_021EF218: ; 0x021EF218 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r3, _021EF2F4 ; =0x021FF770 add r2, sp, #0x1c ldmia r3!, {r0, r1} @@ -51378,12 +51378,12 @@ MOD16_021EF218: ; 0x021EF218 mov r1, #2 str r0, [r2] add r0, r5, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 mov r1, #2 add r2, sp, #0x1c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -51391,16 +51391,16 @@ MOD16_021EF218: ; 0x021EF218 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers add r0, r5, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r3, _021EF2F8 ; =0x021FF7A8 add r2, sp, #0 ldmia r3!, {r0, r1} @@ -51413,12 +51413,12 @@ MOD16_021EF218: ; 0x021EF218 mov r1, #3 str r0, [r2] add r0, r5, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 mov r1, #3 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -51426,7 +51426,7 @@ MOD16_021EF218: ; 0x021EF218 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x54 pop {r4, r5, pc} .align 2, 0 @@ -51440,13 +51440,13 @@ MOD16_021EF2FC: ; 0x021EF2FC push {r4, lr} add r4, r0, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD16_021EF2FC @@ -51486,7 +51486,7 @@ MOD16_021EF318: ; 0x021EF318 MOD16_021EF358: ; 0x021EF358 push {r4, lr} add r4, r0, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 bl RemoveWindow add r0, r4, #0 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 80d17066..6ef3cce7 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -464,7 +464,7 @@ MOD17_021D77D4: ; 0x021D77D4 add r0, r4, #0 bl MOD17_021D80CC mov r0, #0xe - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x38] add r0, r4, #0 bl MOD17_021D7F34 @@ -973,12 +973,12 @@ MOD17_021D7B94: ; 0x021D7B94 mov r1, #2 str r0, [r2] ldr r0, [r5, #0x38] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0x38] mov r1, #2 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -986,7 +986,7 @@ MOD17_021D7B94: ; 0x021D7B94 bl BG_ClearCharDataRange ldr r0, [r5, #0x38] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x1c pop {r4, r5, pc} nop @@ -1016,12 +1016,12 @@ MOD17_021D7BE4: ; 0x021D7BE4 thumb_func_start MOD17_021D7C10 MOD17_021D7C10: ; 0x021D7C10 - ldr r3, _021D7C18 ; =FUN_020178A0 + ldr r3, _021D7C18 ; =FreeBgTilemapBuffer ldr r0, [r0, #0x38] mov r1, #2 bx r3 .align 2, 0 -_021D7C18: .word FUN_020178A0 +_021D7C18: .word FreeBgTilemapBuffer thumb_func_end MOD17_021D7C10 thumb_func_start MOD17_021D7C1C @@ -1112,7 +1112,7 @@ MOD17_021D7CC0: ; 0x021D7CC0 add r4, r0, #0 bl MOD17_021D80CC mov r0, #0xe - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x38] add r0, r4, #0 bl MOD17_021D7F34 @@ -1244,7 +1244,7 @@ MOD17_021D7DB0: ; 0x021D7DB0 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -1466,7 +1466,7 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -1474,7 +1474,7 @@ MOD17_021D7F34: ; 0x021D7F34 bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D8048 ; =0x021DE2BC add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -1489,7 +1489,7 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -1497,7 +1497,7 @@ MOD17_021D7F34: ; 0x021D7F34 bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D804C ; =0x021DE2F4 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -1512,7 +1512,7 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -1520,7 +1520,7 @@ MOD17_021D7F34: ; 0x021D7F34 bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D8050 ; =0x021DE284 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -1535,7 +1535,7 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #4 mov r1, #0x20 mov r2, #0 @@ -1543,7 +1543,7 @@ MOD17_021D7F34: ; 0x021D7F34 bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D8054 ; =0x021DE310 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -1558,7 +1558,7 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #5 mov r1, #0x20 mov r2, #0 @@ -1566,7 +1566,7 @@ MOD17_021D7F34: ; 0x021D7F34 bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x8c pop {r4, r5, pc} nop @@ -1583,19 +1583,19 @@ MOD17_021D8058: ; 0x021D8058 add r4, r0, #0 ldr r0, [r4, #0x38] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x38] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x38] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x38] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD17_021D8058 @@ -3428,7 +3428,7 @@ MOD17_021D8F64: ; 0x021D8F64 ldr r0, [r4, #0x38] add r2, r1, #0 sub r3, #0x13 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 @@ -4462,17 +4462,17 @@ MOD17_021D9778: ; 0x021D9778 add r4, r0, #0 ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 ldr r0, [r4, #0x38] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 ldr r0, [r4, #0x38] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #0 bl MOD17_021D9B74 @@ -4524,7 +4524,7 @@ MOD17_021D9800: ; 0x021D9800 bl MOD17_021D9BCC ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 bl MOD17_021D8F64 mov r0, #0 @@ -4555,17 +4555,17 @@ MOD17_021D9848: ; 0x021D9848 add r4, r0, #0 ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 ldr r0, [r4, #0x38] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 ldr r0, [r4, #0x38] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x38] mov r1, #0x19 str r0, [sp] @@ -4624,7 +4624,7 @@ MOD17_021D98D0: ; 0x021D98D0 bl MOD17_021D9B6C ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r4, pc} .align 2, 0 _021D98EC: .word 0x000006A4 @@ -4903,7 +4903,7 @@ MOD17_021D9B30: ; 0x021D9B30 add r4, r0, #0 ldr r0, _021D9B48 ; =0x000006A8 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _021D9B48 ; =0x000006A8 ldr r0, [r4, r0] bl RemoveWindow @@ -9758,7 +9758,7 @@ MOD17_021DBD4C: ; 0x021DBD4C ldr r0, [r4] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #0 mov r2, #0x2c @@ -9919,11 +9919,11 @@ _021DBE62: str r0, [r4, #0x40] ldr r0, [r6] ldr r1, [r6, #0x1c] - bl FUN_02017B48 + bl Bg_GetXpos str r0, [r4, #0x44] ldr r0, [r6] ldr r1, [r6, #0x1c] - bl FUN_02017B54 + bl Bg_GetYpos str r0, [r4, #0x48] mov r0, #0x80 str r0, [r5, #0x28] @@ -13038,13 +13038,13 @@ MOD17_021DD5A0: ; 0x021DD5A0 mov r1, #2 mov r2, #0 sub r3, r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x10 ldr r0, [r5, #0x38] mov r1, #2 mov r2, #3 sub r3, r3, r6 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021DD5E8: mov r0, #0x23 lsl r0, r0, #4 @@ -14267,18 +14267,18 @@ MOD17_021DDF1C: ; 0x021DDF1C bl FUN_02002ED0 mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r1, #3 ldr r0, [r4, #0x4c] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0x14 pop {r3, r4, pc} .align 2, 0 @@ -14291,7 +14291,7 @@ MOD17_021DDF84: ; 0x021DDF84 mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 03d64bb8..59f678ec 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1476,7 +1476,7 @@ _0223A194: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0223A2AC ; =0x02250010 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -1491,7 +1491,7 @@ _0223A194: str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -1499,7 +1499,7 @@ _0223A194: bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223A2B0 ; =0x0225002C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -1514,7 +1514,7 @@ _0223A194: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -1522,7 +1522,7 @@ _0223A194: bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223A2B4 ; =0x02250048 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -1537,7 +1537,7 @@ _0223A194: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -1545,7 +1545,7 @@ _0223A194: bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223A2B8 ; =0x02250064 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -1560,7 +1560,7 @@ _0223A194: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -1568,7 +1568,7 @@ _0223A194: bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #4 mov r1, #0x20 mov r2, #0 @@ -1749,7 +1749,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 lsl r2, r2, #0x10 bl CreateHeap mov r0, #0x1d - bl FUN_02016B94 + bl BgConfig_Alloc add r4, r0, #0 ldr r0, _0223A4CC ; =0x02251380 add r1, r4, #0 @@ -1764,13 +1764,13 @@ MOD18_0223A3D4: ; 0x0223A3D4 bl MOD18_0223A188 add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] mov r0, #0x1d @@ -1843,7 +1843,7 @@ MOD18_0223A4D8: ; 0x0223A4D8 mov r1, #1 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _0223A55C ; =0x02251380 ldr r0, [r0] ldr r0, [r0, #4] @@ -1868,16 +1868,16 @@ MOD18_0223A4D8: ; 0x0223A4D8 bl MOD18_0223B6A4 mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority bl MOD18_0223C37C bl MOD18_0223C570 ldr r0, _0223A55C ; =0x02251380 @@ -1898,22 +1898,22 @@ MOD18_0223A560: ; 0x0223A560 mov r1, #0 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223A648 ; =0x02251380 mov r1, #1 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223A648 ; =0x02251380 mov r1, #2 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223A648 ; =0x02251380 mov r1, #3 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223A648 ; =0x02251380 ldr r1, [r0] mov r0, #0x57 @@ -4167,7 +4167,7 @@ _0223B6C0: blt _0223B6BA ldr r0, [sp] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -4712,7 +4712,7 @@ _0223BAF4: _0223BB34: add r0, r5, #0 mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _0223BB3C: add sp, #0xc pop {r3, r4, r5, r6, pc} @@ -4842,7 +4842,7 @@ _0223BBD8: _0223BC38: ldr r0, [sp] mov r1, #0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -5554,7 +5554,7 @@ _0223C1B4: add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit lsl r1, r4, #0x18 ldr r6, [r7] ldr r3, _0223C1EC ; =0x000009EA @@ -5562,7 +5562,7 @@ _0223C1B4: ldrsb r3, [r6, r3] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 cmp r4, #3 blt _0223C1B4 @@ -14390,7 +14390,7 @@ _022404A4: blt _022404A4 mov r0, #2 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #0 bl GX_EngineAToggleLayers @@ -14450,7 +14450,7 @@ _02240512: bl MOD18_02240388 ldr r0, [sp, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _02240532: ldrh r0, [r7] mov r2, #0 @@ -14764,16 +14764,16 @@ _0224072E: _02240774: mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] add sp, #0x1c add r0, r0, #1 @@ -22714,7 +22714,7 @@ _02244588: bl RemoveWindow ldr r0, [sp, #0x2c] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [sp, #0x2c] bl MOD18_02244858 mov r0, #0xeb @@ -23066,10 +23066,10 @@ MOD18_02244858: ; 0x02244858 push {r4, lr} add r4, r0, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD18_02244858 @@ -23098,7 +23098,7 @@ MOD18_0224486C: ; 0x0224486C str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineBToggleLayers @@ -23116,7 +23116,7 @@ MOD18_0224486C: ; 0x0224486C str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineBToggleLayers @@ -23134,13 +23134,13 @@ MOD18_0224486C: ; 0x0224486C str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #8 mov r1, #0 bl GX_EngineBToggleLayers add r0, r5, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x40 mov r1, #0 str r0, [sp] @@ -30162,7 +30162,7 @@ MOD18_02247FC0: ; 0x02247FC0 bl DestroyListMenu add r0, r4, #0 add r0, #0xc - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0xc bl RemoveWindow @@ -31138,7 +31138,7 @@ MOD18_02248784: ; 0x02248784 bl DestroyListMenu add r0, r4, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #8 bl RemoveWindow @@ -33051,7 +33051,7 @@ _022495EE: str r0, [r5, #0x48] add r0, r5, #0 add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r1, sp, #0x18 mov r2, #7 @@ -40739,7 +40739,7 @@ MOD18_0224D56C: ; 0x0224D56C bl FUN_0200CCF8 add r0, r4, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #8 bl RemoveWindow @@ -40847,7 +40847,7 @@ _0224D64A: bl MOD18_0224D364 add r0, r4, #0 add r0, #8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0224D690 ; =0x000005FD bl FUN_020054C8 ldr r0, _0224D694 ; =MOD18_0224D5B4 @@ -41346,7 +41346,7 @@ MOD18_0224DA00: ; 0x0224DA00 bl FUN_020054C8 add r0, r5, #0 add r0, #8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 bl DestroyMsgData add r0, r5, #0 @@ -41367,7 +41367,7 @@ MOD18_0224DAA8: ; 0x0224DAA8 bl FUN_0200CCF8 add r0, r4, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #8 bl RemoveWindow @@ -41732,7 +41732,7 @@ _0224DD4C: bl FUN_0200D0E0 add r0, r5, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 add r0, #8 bl RemoveWindow diff --git a/arm9/modules/19/asm/module_19.s b/arm9/modules/19/asm/module_19.s index bb49a485..cfdf20fa 100644 --- a/arm9/modules/19/asm/module_19.s +++ b/arm9/modules/19/asm/module_19.s @@ -30,7 +30,7 @@ MOD19_02252440: ; 0x02252440 ldr r2, _022524E8 ; =0x02252508 add r0, r4, #0 mov r1, #4 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -89,7 +89,7 @@ _022524F0: .word 0xFFFFE0FF MOD19_022524F4: ; 0x022524F4 push {r3, lr} mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #8 bl DestroyHeap pop {r3, pc} diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index a425226b..60964f7e 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -1243,7 +1243,7 @@ MOD20_02252C5C: ; 0x02252C5C _02252CA6: mov r0, #7 str r6, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc mov r1, #6 lsl r1, r1, #6 str r0, [r4, r1] @@ -1570,14 +1570,14 @@ MOD20_02252ED0: ; 0x02252ED0 ldr r2, _02252FE0 ; =MOD20_022545B4 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] ldr r2, _02252FE4 ; =MOD20_022545D0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x40 str r0, [sp] mov r0, #0 @@ -1639,7 +1639,7 @@ MOD20_02252ED0: ; 0x02252ED0 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02252FD8 ; =0x04001000 ldr r1, _02252FE8 ; =0xFFFFE0FF ldr r2, [r0] @@ -1785,7 +1785,7 @@ _022530DA: lsl r0, r0, #6 ldr r0, [r5, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldrh r0, [r4, #2] cmp r0, #0x28 bne _022530FC @@ -1932,7 +1932,7 @@ _02253202: lsl r0, r0, #6 ldr r0, [r5, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldrh r0, [r4, #2] cmp r0, #0x28 bne _02253224 @@ -1983,7 +1983,7 @@ MOD20_02253228: ; 0x02253228 add r0, #0xa9 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_022538B0 add sp, #0x10 @@ -2031,7 +2031,7 @@ MOD20_0225328C: ; 0x0225328C add r0, #0xa5 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_022538B0 add sp, #0x10 @@ -2068,7 +2068,7 @@ MOD20_022532F0: ; 0x022532F0 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02253334 ; =0x00000671 bl FUN_020054C8 add r0, r5, #0 @@ -2103,7 +2103,7 @@ MOD20_02253338: ; 0x02253338 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_02252EBC add sp, #0xc @@ -2135,7 +2135,7 @@ MOD20_02253378: ; 0x02253378 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _022533BC ; =0x0000066F bl FUN_020054C8 add r0, r5, #0 @@ -2451,7 +2451,7 @@ _02253600: lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _0225361C: mov r3, #2 str r3, [sp] @@ -2473,7 +2473,7 @@ _0225361C: lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram cmp r5, #3 bne _02253658 add r0, r6, #0 @@ -2515,12 +2515,12 @@ MOD20_02253668: ; 0x02253668 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r1, #0 ldr r0, _022536C4 ; =0x04001050 add r2, r1, #0 @@ -2546,12 +2546,12 @@ MOD20_022536C8: ; 0x022536C8 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD20_02252EBC pop {r3, r4, r5, pc} diff --git a/arm9/modules/21/src/mod21_02254A6C.c b/arm9/modules/21/src/mod21_02254A6C.c index a5350105..45b11873 100644 --- a/arm9/modules/21/src/mod21_02254A6C.c +++ b/arm9/modules/21/src/mod21_02254A6C.c @@ -25,12 +25,12 @@ extern BOOL MOD20_02253888(void *param0, void *param1); u8 const MOD21_02254D90[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -extern void FUN_02016C18(u32 param0, u32 param1, void *param2, u32 param3); +extern void InitBgFromTemplate(u32 param0, u32 param1, void *param2, u32 param3); extern void GfGfxLoader_LoadCharData(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); extern void GfGfxLoader_LoadScrnData(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); extern void MOD20_02252D7C(u32 param0, u32 param1); -extern void FUN_02017CD0(u32 param0, u32 param1); -extern void FUN_020178A0(u32 param0, u32 param1); +extern void BgCommitTilemapBufferToVram(u32 param0, u32 param1); +extern void FreeBgTilemapBuffer(u32 param0, u32 param1); extern void CopyToBgTilemapRect(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 *param6, u8 param7, u32 param8, u32 param9, u32 param10); @@ -104,12 +104,12 @@ THUMB_FUNC BOOL MOD21_02254B60(u32 param0, void *param1) { #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); - FUN_02016C18(strct->Unk04, 6, MOD21_02254D90, 0); + InitBgFromTemplate(strct->Unk04, 6, MOD21_02254D90, 0); GfGfxLoader_LoadCharData(12, 23, strct->Unk04, 6, 0, 0, 1, 8); GfGfxLoader_LoadScrnData(12, 24, strct->Unk04, 6, 0, 0, 1, 8); MOD20_02252D7C(0, 0); MOD21_02254C5C(strct); - FUN_02017CD0(strct->Unk04, 6); + BgCommitTilemapBufferToVram(strct->Unk04, 6); u32 r3 = reg_GXS_DB_DISPCNT; u32 r2 = reg_GXS_DB_DISPCNT; vu32 tmp = r3; //unused? wtf @@ -128,7 +128,7 @@ THUMB_FUNC BOOL MOD21_02254BF4(u32 param0, void *param1) #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); MOD21_02254C5C(strct); - FUN_02017CD0(strct->Unk04, 6); + BgCommitTilemapBufferToVram(strct->Unk04, 6); return MOD21_02254B4C(param1); } @@ -151,7 +151,7 @@ THUMB_FUNC BOOL MOD21_02254C40(u32 param0, void *param1) { #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); - FUN_020178A0(strct->Unk04, 6); + FreeBgTilemapBuffer(strct->Unk04, 6); return MOD21_02254B4C(param1); } diff --git a/arm9/modules/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s index 9a7e3e39..507feb01 100644 --- a/arm9/modules/22/asm/module_22.s +++ b/arm9/modules/22/asm/module_22.s @@ -875,7 +875,7 @@ MOD22_02254E8C: ; 0x02254E8C bl MOD20_02252D24 str r0, [r4, #0x5c] mov r0, #8 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] cmp r0, #0 bne _02254EBA @@ -1152,7 +1152,7 @@ MOD22_02255098: ; 0x02255098 ldr r2, _0225515C ; =MOD22_02255654 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1182,7 +1182,7 @@ MOD22_02255098: ; 0x02255098 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r7, #0 bl MOD20_022538A0 add r4, r0, #0 @@ -1356,7 +1356,7 @@ MOD22_02255230: ; 0x02255230 bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD22_02255084 pop {r3, r4, r5, pc} @@ -1384,7 +1384,7 @@ MOD22_02255268: ; 0x02255268 bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _022552A8 ; =0x00000669 bl MOD20_02252B28 add r0, r5, #0 @@ -1428,7 +1428,7 @@ _022552DC: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_022538B0 pop {r4, r5, r6, pc} @@ -1488,7 +1488,7 @@ _02255358: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _0225537A: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1549,7 +1549,7 @@ _022553D8: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _022553FA: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1597,7 +1597,7 @@ _0225543A: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02255498 ; =0x00000666 bl MOD20_02252B28 add r0, r6, #0 @@ -1623,7 +1623,7 @@ _02255468: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _02255496: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1668,7 +1668,7 @@ _022554D6: bl MOD22_02255544 ldr r0, [r6, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_022538B0 mov r0, #0 @@ -1797,7 +1797,7 @@ _022555CC: bl MOD20_02254014 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0x84 ldr r0, [r0] diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s index d9858652..15af3d3a 100644 --- a/arm9/modules/23/asm/module_23.s +++ b/arm9/modules/23/asm/module_23.s @@ -1153,7 +1153,7 @@ MOD23_02255088: ; 0x02255088 ldr r2, _02255118 ; =MOD23_02255D1C mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1185,7 +1185,7 @@ MOD23_02255088: ; 0x02255088 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _0225511C ; =0x04001000 ldr r0, _02255120 ; =0xFFFFE0FF ldr r3, [r1] @@ -1313,7 +1313,7 @@ MOD23_022551A4: ; 0x022551A4 bl LoadRectToBgTilemapRect ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 add sp, #0xc @@ -1359,7 +1359,7 @@ MOD23_02255210: ; 0x02255210 bl LoadRectToBgTilemapRect ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 add sp, #0xc @@ -1391,7 +1391,7 @@ MOD23_02255270: ; 0x02255270 bl MOD23_0225548C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1419,7 +1419,7 @@ MOD23_022552A8: ; 0x022552A8 bl MOD23_0225544C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1446,7 +1446,7 @@ MOD23_022552E8: ; 0x022552E8 bl MOD23_0225548C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1474,7 +1474,7 @@ MOD23_02255320: ; 0x02255320 bl MOD23_0225544C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1504,7 +1504,7 @@ MOD23_02255360: ; 0x02255360 bl MOD23_02255410 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1538,7 +1538,7 @@ _022553B2: bl MOD23_0225544C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD23_02255074 pop {r3, r4, r5, pc} @@ -1558,7 +1558,7 @@ MOD23_022553E4: ; 0x022553E4 bl MOD23_02255410 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD23_02255074 pop {r3, r4, r5, pc} @@ -1625,7 +1625,7 @@ MOD23_02255470: ; 0x02255470 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD23_02255074 pop {r4, pc} diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index e114f102..65182148 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -795,12 +795,12 @@ _02254DF0: ldr r2, _02254ED0 ; =MOD24_02255114 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _02254ED4 ; =MOD24_02255130 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #8 bl GF_heap_c_dummy_return_true cmp r0, #0 @@ -860,7 +860,7 @@ _02254E82: _02254E96: ldr r0, [r5, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254ED8 ; =0x04001000 ldr r0, _02254EDC ; =0xFFFFE0FF ldr r3, [r1] @@ -932,7 +932,7 @@ MOD24_02254F28: ; 0x02254F28 add r0, r4, #0 bl MOD20_022538A0 ldr r0, [r0, #0x70] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD24_02254DC8 pop {r4, pc} @@ -1072,7 +1072,7 @@ MOD24_02255038: ; 0x02255038 add r0, r4, #0 bl MOD20_022538A0 ldr r0, [r0, #0x70] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD24_02254DC8 pop {r4, pc} @@ -1088,10 +1088,10 @@ MOD24_02255050: ; 0x02255050 bl MOD24_022550D4 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD24_02254DC8 pop {r3, r4, r5, pc} diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s index 5e70bbbe..69efec33 100644 --- a/arm9/modules/25/asm/module_25.s +++ b/arm9/modules/25/asm/module_25.s @@ -428,7 +428,7 @@ MOD25_02254B34: ; 0x02254B34 ldr r2, _02254BBC ; =MOD25_02254D08 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -460,7 +460,7 @@ MOD25_02254B34: ; 0x02254B34 bl MOD25_02254C30 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254BC0 ; =0x04001000 ldr r0, _02254BC4 ; =0xFFFFE0FF ldr r3, [r1] @@ -494,7 +494,7 @@ MOD25_02254BC8: ; 0x02254BC8 bl MOD25_02254C30 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD25_02254B20 pop {r3, r4, r5, pc} @@ -532,7 +532,7 @@ MOD25_02254C14: ; 0x02254C14 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD25_02254B20 pop {r4, pc} diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s index 526cfa66..251ea218 100644 --- a/arm9/modules/26/asm/module_26.s +++ b/arm9/modules/26/asm/module_26.s @@ -590,7 +590,7 @@ MOD26_02254C60: ; 0x02254C60 ldr r2, _02254CB8 ; =MOD26_02254FD4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] bl MOD26_02254CC4 ldr r0, [r5, #4] @@ -601,7 +601,7 @@ MOD26_02254C60: ; 0x02254C60 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254CBC ; =0x04001000 ldr r0, _02254CC0 ; =0xFFFFE0FF ldr r3, [r1] @@ -722,7 +722,7 @@ MOD26_02254D6C: ; 0x02254D6C bl MOD26_02254DAC ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD26_02254C4C pop {r3, r4, r5, pc} @@ -736,7 +736,7 @@ MOD26_02254D90: ; 0x02254D90 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD26_02254C4C pop {r4, pc} diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 3cb1d089..c2c6c837 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -516,7 +516,7 @@ MOD27_02254C08: ; 0x02254C08 ldr r2, _02254CBC ; =MOD27_02255378 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -551,7 +551,7 @@ MOD27_02254C08: ; 0x02254C08 bl MOD27_02254CC8 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0xf mov r1, #1 bl MOD20_0225396C @@ -849,7 +849,7 @@ MOD27_02254EAC: ; 0x02254EAC bl FillWindowPixelRect _02254EE0: add r0, r5, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #8 pop {r3, r4, r5, pc} .align 2, 0 @@ -1382,7 +1382,7 @@ MOD27_022552B4: ; 0x022552B4 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD27_02254BF4 pop {r4, pc} @@ -1425,7 +1425,7 @@ MOD27_022552D0: ; 0x022552D0 bl MOD27_02254CC8 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02255338 ; =0x00000669 bl MOD20_02252B28 add r0, r6, #0 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index b7f19567..ee242492 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -547,7 +547,7 @@ MOD28_02254C18: ; 0x02254C18 ldr r2, _02254CA8 ; =MOD28_02255ED8 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -576,7 +576,7 @@ MOD28_02254C18: ; 0x02254C18 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, [r5] add r0, r5, #0 bl MOD28_02254CB4 @@ -915,7 +915,7 @@ MOD28_02254F18: ; 0x02254F18 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD28_02254C04 pop {r4, pc} diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s index 9fb45a65..061b078c 100644 --- a/arm9/modules/29/asm/module_29.s +++ b/arm9/modules/29/asm/module_29.s @@ -672,7 +672,7 @@ MOD29_02254D10: ; 0x02254D10 ldr r2, _02254DE8 ; =MOD29_022550E0 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -737,7 +737,7 @@ MOD29_02254D10: ; 0x02254D10 bl GXS_LoadOBJPltt ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254DEC ; =0x04001000 ldr r0, _02254DF0 ; =0xFFFFE0FF ldr r3, [r1] @@ -771,7 +771,7 @@ MOD29_02254DF4: ; 0x02254DF4 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD29_02254CFC pop {r4, pc} diff --git a/arm9/modules/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s index 5daf123f..69e08586 100644 --- a/arm9/modules/30/asm/module_30.s +++ b/arm9/modules/30/asm/module_30.s @@ -536,7 +536,7 @@ MOD30_02254C18: ; 0x02254C18 ldr r2, _02254C9C ; =MOD30_02254DD0 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -566,7 +566,7 @@ MOD30_02254C18: ; 0x02254C18 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254CA0 ; =0x04001000 ldr r0, _02254CA4 ; =0xFFFFE0FF ldr r3, [r1] @@ -598,7 +598,7 @@ MOD30_02254CA8: ; 0x02254CA8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD30_02254C04 pop {r4, pc} diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s index 5e45ce23..e565a1cf 100644 --- a/arm9/modules/31/asm/module_31.s +++ b/arm9/modules/31/asm/module_31.s @@ -526,7 +526,7 @@ MOD31_02254C0C: ; 0x02254C0C ldr r2, _02254C90 ; =MOD31_02254DC8 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -556,7 +556,7 @@ MOD31_02254C0C: ; 0x02254C0C bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254C94 ; =0x04001000 ldr r0, _02254C98 ; =0xFFFFE0FF ldr r3, [r1] @@ -588,7 +588,7 @@ MOD31_02254C9C: ; 0x02254C9C bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD31_02254BF8 pop {r4, pc} diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s index c928dd1a..b78a206b 100644 --- a/arm9/modules/32/asm/module_32.s +++ b/arm9/modules/32/asm/module_32.s @@ -453,7 +453,7 @@ MOD32_02254B58: ; 0x02254B58 ldr r2, _02254BDC ; =MOD32_02254C78 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -483,7 +483,7 @@ MOD32_02254B58: ; 0x02254B58 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254BE0 ; =0x04001000 ldr r0, _02254BE4 ; =0xFFFFE0FF ldr r3, [r1] @@ -517,7 +517,7 @@ MOD32_02254BE8: ; 0x02254BE8 bl MOD32_02254AF0 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD32_02254B44 pop {r3, r4, r5, pc} diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s index a0e764aa..a0c3782f 100644 --- a/arm9/modules/33/asm/module_33.s +++ b/arm9/modules/33/asm/module_33.s @@ -303,7 +303,7 @@ MOD33_02254A38: ; 0x02254A38 ldr r2, _02254ACC ; =MOD33_02254B00 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -340,7 +340,7 @@ MOD33_02254A38: ; 0x02254A38 bl MOD20_02253AA4 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254AD0 ; =0x04001000 ldr r0, _02254AD4 ; =0xFFFFE0FF ldr r3, [r1] @@ -372,7 +372,7 @@ MOD33_02254AD8: ; 0x02254AD8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD33_02254A24 pop {r4, pc} diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s index 4129f34e..02906b7f 100644 --- a/arm9/modules/34/asm/module_34.s +++ b/arm9/modules/34/asm/module_34.s @@ -395,7 +395,7 @@ MOD34_02254AE8: ; 0x02254AE8 ldr r2, _02254B8C ; =MOD34_02254CA0 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -437,7 +437,7 @@ _02254B4A: blt _02254B4A ldr r0, [r6, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02254B90 ; =0x04001000 ldr r1, _02254B94 ; =0xFFFFE0FF ldr r2, [r0] @@ -470,7 +470,7 @@ MOD34_02254B98: ; 0x02254B98 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD34_02254AD4 pop {r4, pc} @@ -496,7 +496,7 @@ MOD34_02254BB4: ; 0x02254BB4 bl MOD34_02254C1C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD34_02254AD4 pop {r3, r4, r5, pc} @@ -521,7 +521,7 @@ MOD34_02254BE8: ; 0x02254BE8 bl MOD34_02254C1C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD34_02254AD4 pop {r3, r4, r5, pc} diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index f73ad3ff..84225174 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -597,7 +597,7 @@ MOD35_02254C98: ; 0x02254C98 ldr r2, _02254D24 ; =MOD35_022550C4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -627,7 +627,7 @@ MOD35_02254C98: ; 0x02254C98 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254D28 ; =0x0400104C mov r0, #0 strb r0, [r1] @@ -688,7 +688,7 @@ _02254D5A: strb r1, [r0, #1] ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD35_02254C84 _02254D7C: diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index 6159d4c9..617d957c 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -993,12 +993,12 @@ _02254F70: ldr r2, _0225502C ; =MOD36_02255408 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _02255030 ; =MOD36_02255424 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #8 bl GF_heap_c_dummy_return_true cmp r0, #0 @@ -1044,7 +1044,7 @@ _02254FEA: bl MOD36_0225503C ldr r0, [r4, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02255034 ; =0x04001000 ldr r0, _02255038 ; =0xFFFFE0FF ldr r3, [r1] @@ -1115,7 +1115,7 @@ _02255082: bl PutWindowTilemap add r4, #0x48 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #8 pop {r3, r4, r5, pc} nop @@ -1154,10 +1154,10 @@ _022550C4: bl RemoveWindow ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD36_02254F48 pop {r3, r4, r5, pc} @@ -1171,7 +1171,7 @@ MOD36_022550F4: ; 0x022550F4 add r0, r4, #0 bl MOD20_022538A0 add r0, #0x48 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD36_02254F48 pop {r4, pc} @@ -1228,7 +1228,7 @@ MOD36_02255164: ; 0x02255164 add r0, r4, #0 bl MOD20_022538A0 add r0, #0x48 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD36_02254F48 pop {r4, pc} @@ -1301,7 +1301,7 @@ MOD36_022551E0: ; 0x022551E0 bl FillWindowPixelBuffer add r4, #0x48 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r5, #0 bl MOD36_02254F48 pop {r3, r4, r5, pc} diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s index c2f1439a..313343b5 100644 --- a/arm9/modules/37/asm/module_37.s +++ b/arm9/modules/37/asm/module_37.s @@ -459,7 +459,7 @@ MOD37_02254B70: ; 0x02254B70 ldr r2, _02254BF4 ; =MOD37_02254D44 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -489,7 +489,7 @@ MOD37_02254B70: ; 0x02254B70 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254BF8 ; =0x04001000 ldr r0, _02254BFC ; =0xFFFFE0FF ldr r3, [r1] @@ -540,7 +540,7 @@ _02254C26: beq _02254C40 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD37_02254B5C _02254C40: diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index e95dcc42..bf495f60 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -741,7 +741,7 @@ MOD38_02254D84: ; 0x02254D84 ldr r2, _02254E1C ; =MOD38_0225529C mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -776,7 +776,7 @@ MOD38_02254D84: ; 0x02254D84 bl MOD38_02254E28 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254E20 ; =0x04001000 ldr r0, _02254E24 ; =0xFFFFE0FF ldr r3, [r1] @@ -925,7 +925,7 @@ MOD38_02254F18: ; 0x02254F18 bl MOD38_02254EF4 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD38_02254D70 pop {r3, r4, r5, pc} @@ -1090,7 +1090,7 @@ _02255048: lsr r3, r3, #1 bl AddTextPrinterParameterized2 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -1128,7 +1128,7 @@ MOD38_02255084: ; 0x02255084 add r3, r1, #0 bl AddTextPrinterParameterized2 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index da3f83f4..2fdb4637 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -788,7 +788,7 @@ MOD39_02254DF4: ; 0x02254DF4 ldr r2, _02254E7C ; =MOD39_02255330 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -818,7 +818,7 @@ MOD39_02254DF4: ; 0x02254DF4 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254E80 ; =0x04001000 ldr r0, _02254E84 ; =0xFFFFE0FF ldr r3, [r1] @@ -870,7 +870,7 @@ _02254EB0: beq _02254ECA ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD39_02254DE0 _02254ECA: diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s index 13c9a94f..62231a53 100644 --- a/arm9/modules/40/asm/module_40.s +++ b/arm9/modules/40/asm/module_40.s @@ -1038,7 +1038,7 @@ MOD40_02254FE8: ; 0x02254FE8 ldr r2, _0225506C ; =MOD40_02255340 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1068,7 +1068,7 @@ MOD40_02254FE8: ; 0x02254FE8 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02255070 ; =0x04001000 ldr r0, _02255074 ; =0xFFFFE0FF ldr r3, [r1] @@ -1120,7 +1120,7 @@ _022550A2: beq _022550BC ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD40_02254FD4 _022550BC: diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s index 4d1afb06..939ea649 100644 --- a/arm9/modules/41/asm/module_41.s +++ b/arm9/modules/41/asm/module_41.s @@ -1561,7 +1561,7 @@ MOD41_022553F4: ; 0x022553F4 ldr r2, _022554CC ; =MOD41_022557DC mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1591,7 +1591,7 @@ MOD41_022553F4: ; 0x022553F4 bl MOD20_02252D7C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _022554D0 ; =0x04001000 ldr r0, _022554D4 ; =0xFFFFE0FF ldr r3, [r1] @@ -1686,7 +1686,7 @@ _02255508: beq _02255522 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD41_022553E0 _02255522: diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index 03136570..9e502906 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -953,7 +953,7 @@ MOD42_02254F3C: ; 0x02254F3C ldr r2, _02254FC0 ; =MOD42_022550DC mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -983,7 +983,7 @@ MOD42_02254F3C: ; 0x02254F3C bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254FC4 ; =0x04001000 ldr r0, _02254FC8 ; =0xFFFFE0FF ldr r3, [r1] @@ -1015,7 +1015,7 @@ MOD42_02254FCC: ; 0x02254FCC bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD42_02254F28 pop {r4, pc} diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index 59d9a752..59f7e81d 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -561,7 +561,7 @@ MOD43_02254C28: ; 0x02254C28 ldr r0, [r5, #4] ldr r2, _02254CC4 ; =MOD43_022551A0 mov r1, #6 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -595,7 +595,7 @@ MOD43_02254C28: ; 0x02254C28 bl MOD43_02254CD0 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254CC8 ; =0x04001000 ldr r0, _02254CCC ; =0xFFFFE0FF ldr r3, [r1] @@ -669,7 +669,7 @@ MOD43_02254CD0: ; 0x02254CD0 add r0, sp, #0x14 bl PutWindowTilemap add r0, sp, #0x14 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, sp, #0x14 bl RemoveWindow add r0, r6, #0 @@ -717,7 +717,7 @@ _02254D78: strb r1, [r0, #1] ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD43_02254C14 _02254DA0: diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s index 19726565..b8f5aa0b 100644 --- a/arm9/modules/44/asm/module_44.s +++ b/arm9/modules/44/asm/module_44.s @@ -456,7 +456,7 @@ MOD44_02254B64: ; 0x02254B64 ldr r2, _02254BEC ; =MOD44_02254C70 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -486,7 +486,7 @@ MOD44_02254B64: ; 0x02254B64 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254BF0 ; =0x04001000 ldr r0, _02254BF4 ; =0xFFFFE0FF ldr r3, [r1] @@ -518,7 +518,7 @@ MOD44_02254BF8: ; 0x02254BF8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD44_02254B50 pop {r4, pc} diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s index 7350136f..4f710dc6 100644 --- a/arm9/modules/45/asm/module_45.s +++ b/arm9/modules/45/asm/module_45.s @@ -637,12 +637,12 @@ MOD45_02254CCC: ; 0x02254CCC ldr r2, _02254D60 ; =MOD45_022550FC mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _02254D64 ; =MOD45_022550E0 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 add r1, r4, #0 bl MOD45_02254DDC @@ -666,10 +666,10 @@ MOD45_02254CCC: ; 0x02254CCC bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r5, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254D68 ; =0x04001000 ldr r0, _02254D6C ; =0xFFFFE0FF ldr r3, [r1] @@ -703,10 +703,10 @@ MOD45_02254D70: ; 0x02254D70 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD45_02254CB8 pop {r3, r4, r5, pc} @@ -742,7 +742,7 @@ _02254DBC: bl MOD45_02254E28 ldr r0, [r5, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD45_02254CB8 pop {r3, r4, r5, pc} diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s index d0e4c762..aecfd51d 100644 --- a/arm9/modules/46/asm/module_46.s +++ b/arm9/modules/46/asm/module_46.s @@ -303,7 +303,7 @@ MOD46_02254A38: ; 0x02254A38 ldr r2, _02254ACC ; =MOD46_02254B00 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -340,7 +340,7 @@ MOD46_02254A38: ; 0x02254A38 bl MOD20_02253AA4 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254AD0 ; =0x04001000 ldr r0, _02254AD4 ; =0xFFFFE0FF ldr r3, [r1] @@ -372,7 +372,7 @@ MOD46_02254AD8: ; 0x02254AD8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD46_02254A24 pop {r4, pc} diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index 4fd8db1f..48bd9b4a 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -877,7 +877,7 @@ MOD47_02254E74: ; 0x02254E74 ldr r2, _02254F28 ; =MOD47_022553F4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -929,7 +929,7 @@ MOD47_02254E74: ; 0x02254E74 bl MOD47_022550FC ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254F2C ; =0x04001000 ldr r0, _02254F30 ; =0xFFFFE0FF ldr r3, [r1] @@ -964,7 +964,7 @@ MOD47_02254F34: ; 0x02254F34 bl RemoveWindow ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD47_02254E60 pop {r3, r4, r5, pc} @@ -1211,7 +1211,7 @@ MOD47_022550FC: ; 0x022550FC bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} nop @@ -1251,7 +1251,7 @@ MOD47_02255184: ; 0x02255184 bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} nop @@ -1308,7 +1308,7 @@ MOD47_022551D8: ; 0x022551D8 bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -1371,7 +1371,7 @@ MOD47_02255250: ; 0x02255250 bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} nop @@ -1464,7 +1464,7 @@ _0225532C: blt _0225532C add r5, #0x20 add r0, r5, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s index 8dfd4e0a..1aff0df2 100644 --- a/arm9/modules/48/asm/module_48.s +++ b/arm9/modules/48/asm/module_48.s @@ -426,7 +426,7 @@ MOD48_02254B30: ; 0x02254B30 ldr r2, _02254BBC ; =MOD48_02254F78 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -490,7 +490,7 @@ MOD48_02254BC8: ; 0x02254BC8 bl MOD48_02254EC0 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD48_02254B1C pop {r3, r4, r5, pc} diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index 32d2524d..68c7625e 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -384,7 +384,7 @@ MOD49_02254AD4: ; 0x02254AD4 ldr r2, _02254BD0 ; =MOD49_02254D20 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] ldr r0, [r5, #4] @@ -450,7 +450,7 @@ MOD49_02254AD4: ; 0x02254AD4 str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, sp, #0x1c - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl String_dtor _02254B94: @@ -458,7 +458,7 @@ _02254B94: bl RemoveWindow ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, [sp, #0x14] add r0, r5, #0 bl MOD49_02254C04 @@ -497,7 +497,7 @@ MOD49_02254BE4: ; 0x02254BE4 bl MOD49_02254CB8 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD49_02254AC0 pop {r3, r4, r5, pc} diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/module_50.s index f6634277..fc52f7fa 100644 --- a/arm9/modules/50/asm/module_50.s +++ b/arm9/modules/50/asm/module_50.s @@ -221,7 +221,7 @@ MOD50_022549AC: ; 0x022549AC bl MOD20_022536F4 mov r0, #8 str r6, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] cmp r0, #0 beq _022549DA @@ -312,7 +312,7 @@ MOD50_02254A48: ; 0x02254A48 ldr r2, _02254ADC ; =MOD50_02254B10 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -350,7 +350,7 @@ MOD50_02254A48: ; 0x02254A48 bl MOD20_02253AA4 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254AE0 ; =0x04001000 ldr r0, _02254AE4 ; =0xFFFFE0FF ldr r3, [r1] @@ -382,7 +382,7 @@ MOD50_02254AE8: ; 0x02254AE8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD50_02254A34 pop {r4, pc} diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 7fe42fad..3683eec3 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -370,16 +370,16 @@ MOD51_02254B30: ; 0x02254B30 push {r4, lr} add r4, r0, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD51_02254B30 @@ -403,10 +403,10 @@ MOD51_02254B54: ; 0x02254B54 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #1 mov r1, #0 bl GX_EngineBToggleLayers @@ -424,10 +424,10 @@ MOD51_02254B54: ; 0x02254B54 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #0 bl GX_EngineBToggleLayers @@ -445,10 +445,10 @@ MOD51_02254B54: ; 0x02254B54 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #4 mov r1, #0 bl GX_EngineBToggleLayers @@ -466,7 +466,7 @@ MOD51_02254B54: ; 0x02254B54 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #8 mov r1, #0 bl GX_EngineBToggleLayers @@ -832,10 +832,10 @@ MOD51_02254E48: ; 0x02254E48 mov r1, #1 bl AddTextPrinterParameterized2 add r0, r7, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r2, [r6, #8] cmp r2, #0 beq _02254F22 @@ -852,7 +852,7 @@ MOD51_02254E48: ; 0x02254E48 bl AddTextPrinterParameterized2 _02254F22: add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -941,7 +941,7 @@ _02254FB0: ldr r0, [r5, #0x14] mov r1, #7 lsl r3, r3, #8 - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram mov r0, #0xa1 mov r1, #0 lsl r0, r0, #2 @@ -1497,7 +1497,7 @@ _022553BE: ldr r3, [r3, r6] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [sp, #0x40] add r4, r4, #1 add r5, #0x38 @@ -1521,7 +1521,7 @@ _02255422: ldr r0, [sp, #0x1c] mov r1, #7 lsl r3, r3, #8 - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 27a9f2f8..46740908 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -47,7 +47,7 @@ _021D74F6: add r4, r0, #0 bl memset mov r0, #0x27 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] mov r0, #0x27 bl ScrStrBufs_new @@ -482,7 +482,7 @@ MOD53_021D78F0: ; 0x021D78F0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D79E4 ; =0x021D9518 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -497,10 +497,10 @@ MOD53_021D78F0: ; 0x021D78F0 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D79E8 ; =0x021D9550 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -515,10 +515,10 @@ MOD53_021D78F0: ; 0x021D78F0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D79EC ; =0x021D956C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -533,7 +533,7 @@ MOD53_021D78F0: ; 0x021D78F0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D79F0 ; =0x021D9588 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -548,10 +548,10 @@ MOD53_021D78F0: ; 0x021D78F0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D79F4 ; =0x021D9534 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -566,7 +566,7 @@ MOD53_021D78F0: ; 0x021D78F0 add r0, r4, #0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -732,22 +732,22 @@ MOD53_021D7B24: ; 0x021D7B24 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index e9a9f2be..8d6e1767 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -48,7 +48,7 @@ _021D74F6: add r4, r0, #0 bl memset mov r0, #0x33 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] add r0, r6, #0 bl OverlayManager_GetField18 @@ -448,7 +448,7 @@ MOD54_021D7894: ; 0x021D7894 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7988 ; =0x021D9720 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -463,10 +463,10 @@ MOD54_021D7894: ; 0x021D7894 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D798C ; =0x021D973C add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -481,10 +481,10 @@ MOD54_021D7894: ; 0x021D7894 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7990 ; =0x021D96CC add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -499,7 +499,7 @@ MOD54_021D7894: ; 0x021D7894 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7994 ; =0x021D96E8 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -514,10 +514,10 @@ MOD54_021D7894: ; 0x021D7894 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7998 ; =0x021D9704 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -532,7 +532,7 @@ MOD54_021D7894: ; 0x021D7894 add r0, r4, #0 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -660,19 +660,19 @@ MOD54_021D7A6C: ; 0x021D7A6C push {r4, lr} add r4, r0, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 6652d482..61c1dbe7 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -45,7 +45,7 @@ MOD55_021D7504: ; 0x021D7504 mov r1, #8 bl SetKeyRepeatTimers mov r0, #0x34 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] bl MOD55_021D780C ldr r0, [r4, #4] @@ -406,7 +406,7 @@ MOD55_021D781C: ; 0x021D781C ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7978 ; =0x021DA34C add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -421,7 +421,7 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -429,7 +429,7 @@ MOD55_021D781C: ; 0x021D781C bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D797C ; =0x021DA368 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -444,7 +444,7 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -452,7 +452,7 @@ MOD55_021D781C: ; 0x021D781C bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7980 ; =0x021DA384 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -467,7 +467,7 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -475,7 +475,7 @@ MOD55_021D781C: ; 0x021D781C bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7984 ; =0x021DA3A0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -490,7 +490,7 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -498,7 +498,7 @@ MOD55_021D781C: ; 0x021D781C bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7988 ; =0x021DA3BC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -513,10 +513,10 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -529,16 +529,16 @@ MOD55_021D781C: ; 0x021D781C bl BG_ClearCharDataRange mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D798C ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -691,22 +691,22 @@ MOD55_021D7AA4: ; 0x021D7AA4 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -1264,7 +1264,7 @@ _021D7F02: mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r6, #0 mov r0, #0xd2 lsl r0, r0, #2 @@ -1347,7 +1347,7 @@ _021D8002: mov r3, #0x90 bl MOD55_021D80F0 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x18] add r6, r6, #1 add r0, #0x3c @@ -1452,7 +1452,7 @@ _021D80C6: ldr r0, [sp] mov r1, #1 ldr r0, [r0, #4] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -2207,7 +2207,7 @@ MOD55_021D868C: ; 0x021D868C mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x3b mov r1, #6 lsl r0, r0, #4 @@ -2482,7 +2482,7 @@ _021D88AA: ldr r0, [sp] mov r1, #1 ldr r0, [r0, #4] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} nop @@ -2642,11 +2642,11 @@ _021D8A00: cmp r7, #0 bne _021D8A0C add r0, r5, #0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer b _021D8A12 _021D8A0C: add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021D8A12: ldr r0, [sp, #0x14] add r4, r4, #1 @@ -2713,7 +2713,7 @@ MOD55_021D8A7C: ; 0x021D8A7C bl FUN_020286EC ldr r0, [r5, #4] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -2801,7 +2801,7 @@ _021D8AEE: mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 @@ -2859,7 +2859,7 @@ _021D8B6C: mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 bl MOD55_021D8A28 mov r0, #0xae @@ -2919,7 +2919,7 @@ _021D8C02: mov r1, #0 bl FillWindowPixelBuffer add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r6, r6, #1 add r4, #0x10 add r7, #0x18 @@ -3312,7 +3312,7 @@ _021D8F1A: str r0, [r5, r1] sub r1, #0x20 add r0, r5, r1 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x34 bl PlayerProfile_new mov r1, #0xf2 @@ -3425,7 +3425,7 @@ _021D9068: bne _021D9092 ldr r0, [r5, #4] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #6 str r0, [sp] mov r0, #1 @@ -3562,7 +3562,7 @@ MOD55_021D9184: ; 0x021D9184 add r4, r1, #0 ldr r0, [r5, #4] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3645,7 +3645,7 @@ _021D91D6: mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 @@ -3724,7 +3724,7 @@ _021D92CE: mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r1, #0 mov r0, #0 eor r1, r4 @@ -3807,7 +3807,7 @@ _021D9338: mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021D93C2: mov r0, #0x3b mov r1, #0x13 @@ -3914,7 +3914,7 @@ MOD55_021D9474: ; 0x021D9474 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D9568 ; =0x021DA2F8 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -3929,7 +3929,7 @@ MOD55_021D9474: ; 0x021D9474 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -3937,7 +3937,7 @@ MOD55_021D9474: ; 0x021D9474 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D956C ; =0x021DA330 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -3952,7 +3952,7 @@ MOD55_021D9474: ; 0x021D9474 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -3960,7 +3960,7 @@ MOD55_021D9474: ; 0x021D9474 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9570 ; =0x021DA314 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -3975,7 +3975,7 @@ MOD55_021D9474: ; 0x021D9474 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -3983,7 +3983,7 @@ MOD55_021D9474: ; 0x021D9474 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -3991,16 +3991,16 @@ MOD55_021D9474: ; 0x021D9474 bl BG_ClearCharDataRange mov r0, #1 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority add sp, #0x64 pop {r4, r5, pc} .align 2, 0 @@ -4096,7 +4096,7 @@ _021D9618: ldr r0, [r4, #4] bl MOD55_021D7AA4 mov r0, #0x34 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] bl MOD55_021D9474 bl MOD55_021D9574 @@ -4211,7 +4211,7 @@ _021D969A: mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xe2 lsl r0, r0, #2 add r0, r4, r0 @@ -4276,7 +4276,7 @@ _021D974E: mov r0, #0xe2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x34 bl FUN_02006D98 add r1, r4, #0 @@ -4348,7 +4348,7 @@ _021D9844: blt _021D983C ldr r0, [r4, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _021D9864: mov r0, #0xd2 lsl r0, r0, #2 @@ -4775,7 +4775,7 @@ _021D9C18: mov r0, #0xd2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x20] bl FreeToHeap mov r0, #0x3b @@ -4895,7 +4895,7 @@ _021D9D16: ldr r0, [r5, #4] bl MOD55_021D7AA4 mov r0, #0x34 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #4] bl MOD55_021D781C add r0, r5, #0 @@ -4951,7 +4951,7 @@ MOD55_021D9D88: ; 0x021D9D88 ldr r0, [r6, #4] str r1, [sp, #0x10] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -5505,7 +5505,7 @@ _021DA17C: mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index bc35714b..c3892911 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -269,7 +269,7 @@ MOD56_02211FD4: ; 0x02211FD4 mov r1, #8 bl SetKeyRepeatTimers mov r0, #0x36 - bl FUN_02016B94 + bl BgConfig_Alloc add r1, r4, #0 add r1, #0xc0 str r0, [r1] @@ -623,7 +623,7 @@ MOD56_022122D4: ; 0x022122D4 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02212430 ; =0x02216368 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -638,7 +638,7 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -646,7 +646,7 @@ MOD56_022122D4: ; 0x022122D4 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02212434 ; =0x02216384 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -661,7 +661,7 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -669,7 +669,7 @@ MOD56_022122D4: ; 0x022122D4 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02212438 ; =0x022163A0 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -684,7 +684,7 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -692,7 +692,7 @@ MOD56_022122D4: ; 0x022122D4 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0221243C ; =0x022163BC add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -707,7 +707,7 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -715,7 +715,7 @@ MOD56_022122D4: ; 0x022122D4 bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02212440 ; =0x022163D8 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -730,10 +730,10 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -746,16 +746,16 @@ MOD56_022122D4: ; 0x022122D4 bl BG_ClearCharDataRange mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, _02212444 ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -899,22 +899,22 @@ MOD56_02212540: ; 0x02212540 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -1376,7 +1376,7 @@ _022128CE: mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r3, r4, pc} nop @@ -1544,16 +1544,16 @@ _02212A9A: bne _02212AFA mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority add r0, r5, #0 mov r1, #0x11 bl MOD56_02215FF4 @@ -1709,16 +1709,16 @@ MOD56_02212BE8: ; 0x02212BE8 bl MOD56_02215FF4 mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0x36 str r0, [sp] add r0, r5, #0 @@ -1947,16 +1947,16 @@ MOD56_02212DD8: ; 0x02212DD8 add r4, r1, #0 mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0x3b mov r1, #0xf lsl r0, r0, #4 @@ -2452,7 +2452,7 @@ MOD56_02213194: ; 0x02213194 add r0, #0xc0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -3004,7 +3004,7 @@ _022135DC: mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _02213614: add sp, #0x10 pop {r4, r5, r6, pc} @@ -3139,7 +3139,7 @@ _022136B8: mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _02213706: ldr r0, [r4] add r1, r5, #0 @@ -3174,7 +3174,7 @@ _02213722: mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _0221374C: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -3426,7 +3426,7 @@ _02213906: add r5, #0xc0 ldr r0, [r5] mov r1, #0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #8 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD56_022138A4 @@ -3632,7 +3632,7 @@ MOD56_02213A94: ; 0x02213A94 add r0, #0xc0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -3738,7 +3738,7 @@ _02213B2C: mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 bl MOD56_02216120 add r0, r5, #0 @@ -5141,7 +5141,7 @@ _02214642: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 mov r1, #5 mov r2, #0 @@ -5432,7 +5432,7 @@ _0221488C: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #1 add sp, #0x34 pop {r4, r5, r6, r7, pc} @@ -5724,7 +5724,7 @@ _02214ADC: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [sp, #0x18] add r0, r5, #0 bl MOD56_022160E4 @@ -6917,7 +6917,7 @@ MOD56_0221547C: ; 0x0221547C add r4, r1, #0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -6951,7 +6951,7 @@ MOD56_022154BC: ; 0x022154BC add r7, r1, #0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7069,7 +7069,7 @@ _02215532: mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 mov r1, #0x29 mov r2, #0 @@ -7473,7 +7473,7 @@ _0221594C: mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x3b mov r1, #0x36 lsl r0, r0, #4 @@ -7545,12 +7545,12 @@ MOD56_022159B0: ; 0x022159B0 add r0, #0xc0 ldr r0, [r0] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 add r0, #0xc0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 bl MOD56_02216120 mov r3, #0 @@ -7595,7 +7595,7 @@ MOD56_022159B0: ; 0x022159B0 mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 bl MOD56_02212EFC add r0, r5, #0 @@ -8302,7 +8302,7 @@ _02215F82: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -8414,7 +8414,7 @@ _02216048: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, pc} nop diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 4d540777..09469284 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -48,7 +48,7 @@ MOD57_021D74E0: ; 0x021D74E0 add r1, #0xb4 str r0, [r1] mov r0, #0x19 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] add r0, r4, #0 bl MOD57_021D79AC @@ -124,7 +124,7 @@ _021D75E4: blo _021D75CE ldr r0, [r4] mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r1, r4, #0 add r1, #0xb4 ldr r1, [r1] @@ -839,7 +839,7 @@ MOD57_021D7B94: ; 0x021D7B94 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7C90 ; =0x021D9774 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -854,10 +854,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7C94 ; =0x021D9790 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -872,10 +872,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7C98 ; =0x021D97C8 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -890,10 +890,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7C9C ; =0x021D97E4 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -908,10 +908,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7CA0 ; =0x021D97AC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -926,10 +926,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x9c pop {r4, r5, pc} .align 2, 0 @@ -1214,19 +1214,19 @@ MOD57_021D7EDC: ; 0x021D7EDC bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -1336,7 +1336,7 @@ _021D7FB0: bl MOD57_021D86E8 ldr r0, [r4] mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r1, r4, #0 add r1, #0xb4 ldr r1, [r1] @@ -1366,7 +1366,7 @@ _021D8006: bl MOD57_021D8FB8 ldr r0, [r4] mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 bl MOD57_021D8690 add r1, r4, #0 @@ -1878,7 +1878,7 @@ _021D8400: ldr r0, [sp] mov r1, #2 ldr r0, [r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD57_021D83D8 @@ -2224,7 +2224,7 @@ MOD57_021D8690: ; 0x021D8690 mov r1, #7 add r2, #0xc add r3, r4, #0 - bl FUN_02017DFC + bl BG_LoadScreenTilemapData _021D86CA: mov r0, #0 str r0, [sp] @@ -2234,7 +2234,7 @@ _021D86CA: mov r1, #7 add r2, #0xc add r3, r4, #0 - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram pop {r3, r4, r5, pc} .align 2, 0 _021D86E0: .word 0x000032FC @@ -2479,7 +2479,7 @@ _021D8864: lsl r1, r7, #0x18 ldr r0, [sp, #4] lsr r1, r1, #0x18 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -2572,7 +2572,7 @@ MOD57_021D890C: ; 0x021D890C ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #2 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 bne _021D894A mov r0, #0 @@ -2612,7 +2612,7 @@ MOD57_021D8954: ; 0x021D8954 ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #2 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 bne _021D8992 mov r0, #0 @@ -3355,7 +3355,7 @@ MOD57_021D8FB8: ; 0x021D8FB8 _021D8FC4: lsl r0, r4, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 7bc32277..891c82da 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -53,7 +53,7 @@ _021D9A36: add r4, r0, #0 bl memset mov r0, #0x27 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] mov r0, #0x27 bl ScrStrBufs_new @@ -335,7 +335,7 @@ MOD58_021D9CFC: ; 0x021D9CFC ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D9DF0 ; =0x021DAE18 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -350,10 +350,10 @@ MOD58_021D9CFC: ; 0x021D9CFC str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9DF4 ; =0x021DAE34 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -368,10 +368,10 @@ MOD58_021D9CFC: ; 0x021D9CFC str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9DF8 ; =0x021DAE50 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -386,7 +386,7 @@ MOD58_021D9CFC: ; 0x021D9CFC str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D9DFC ; =0x021DADE0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -401,10 +401,10 @@ MOD58_021D9CFC: ; 0x021D9CFC str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9E00 ; =0x021DADFC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -419,7 +419,7 @@ MOD58_021D9CFC: ; 0x021D9CFC add r0, r4, #0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -544,22 +544,22 @@ MOD58_021D9ED8: ; 0x021D9ED8 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 423f9cd6..a62f49a4 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -280,7 +280,7 @@ _021D7798: add r0, sp, #0x50 bl GX_SetBanks ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x40 ldr r5, _021D7958 ; =0x021D9DCC str r0, [r4, #0x18] @@ -290,7 +290,7 @@ _021D7798: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D795C ; =0x021D9EA0 add r3, sp, #0x24 ldmia r5!, {r0, r1} @@ -309,10 +309,10 @@ _021D7798: strb r0, [r2, #0x13] ldr r0, [r4, #0x18] add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0xe add r2, sp, #0x24 strb r0, [r2, #0x12] @@ -321,10 +321,10 @@ _021D7798: ldr r0, [r4, #0x18] mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0xd add r2, sp, #0x24 strb r0, [r2, #0x12] @@ -333,10 +333,10 @@ _021D7798: ldr r0, [r4, #0x18] mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0xc add r2, sp, #0x24 strb r0, [r2, #0x12] @@ -344,10 +344,10 @@ _021D7798: strb r1, [r2, #0x13] ldr r0, [r4, #0x18] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0 str r1, [sp] ldr r0, [r4] @@ -391,10 +391,10 @@ _021D7798: ldr r0, [r4, #0x18] mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0xe add r0, sp, #8 strb r1, [r0, #0x12] @@ -403,10 +403,10 @@ _021D7798: ldr r0, [r4, #0x18] add r2, sp, #8 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0xd add r0, sp, #8 strb r1, [r0, #0x12] @@ -416,10 +416,10 @@ _021D7798: mov r1, #6 add r2, sp, #8 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0xc add r0, sp, #8 strb r1, [r0, #0x12] @@ -429,10 +429,10 @@ _021D7798: mov r1, #7 add r2, sp, #8 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 add r1, r0, #0 bl ToggleBgLayer @@ -502,28 +502,28 @@ MOD59_021D796C: ; 0x021D796C bl ToggleBgLayer ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] bl FreeToHeap pop {r4, pc} @@ -847,7 +847,7 @@ MOD59_021D7C10: ; 0x021D7C10 lsl r1, r4, #0x18 ldr r0, [r5, #0x18] lsr r1, r1, #0x18 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0xc pop {r4, r5, pc} .align 2, 0 @@ -1337,7 +1337,7 @@ _021D8028: bl RemoveWindow ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 str r0, [r4, #0x54] mov r5, #1 @@ -1858,7 +1858,7 @@ MOD59_021D8460: ; 0x021D8460 cmp r2, #0 bne _021D849C ldr r0, [r5, #0x18] - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0 beq _021D8498 cmp r0, #0 @@ -1868,14 +1868,14 @@ MOD59_021D8460: ; 0x021D8460 lsr r1, r1, #0x18 mov r2, #2 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D84E2 _021D848A: lsl r1, r4, #0x18 lsr r1, r1, #0x18 mov r2, #1 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D84E2 _021D8498: mov r6, #1 @@ -1884,7 +1884,7 @@ _021D849C: cmp r2, #1 bne _021D84C2 ldr r0, [r5, #0x18] - bl FUN_02017B48 + bl Bg_GetXpos add r1, r6, #0 sub r1, #0x30 cmp r0, r1 @@ -1894,7 +1894,7 @@ _021D849C: lsr r1, r1, #0x18 mov r2, #2 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D84E2 _021D84BE: mov r6, #1 @@ -1903,7 +1903,7 @@ _021D84C2: cmp r2, #2 bne _021D84E2 ldr r0, [r5, #0x18] - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0 beq _021D84E0 lsl r1, r4, #0x18 @@ -1911,7 +1911,7 @@ _021D84C2: lsr r1, r1, #0x18 mov r2, #1 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D84E2 _021D84E0: mov r6, #1 @@ -2206,16 +2206,16 @@ _021D86E4: mov r1, #2 add r2, r7, #0 add r3, r7, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #3 add r3, r2, #0 ldr r0, [r4, #0x18] mov r1, #2 sub r3, #0x6b - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #2 add r1, r7, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #5 mov r1, #1 bl ToggleBgLayer @@ -2235,10 +2235,10 @@ _021D86E4: _021D8728: ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B48 + bl Bg_GetXpos ldr r0, [r4, #0x18] mov r1, #5 - bl FUN_02017B54 + bl Bg_GetYpos add r1, r4, #0 add r1, #0xb0 ldr r3, [r1] @@ -2269,17 +2269,17 @@ _021D8728: mov r1, #2 ldr r0, [r4, #0x18] add r3, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x18] mov r1, #5 mov r2, #1 mov r3, #2 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x18] mov r1, #5 mov r2, #3 add r3, r5, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D890A _021D8792: mov r0, #5 @@ -2324,10 +2324,10 @@ _021D87BE: _021D87E0: ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B48 + bl Bg_GetXpos ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B54 + bl Bg_GetYpos add r0, r4, #0 add r0, #0xb0 ldr r1, [r0] @@ -2356,7 +2356,7 @@ _021D87E0: mov r1, #2 mov r2, #3 add r3, r7, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 add r2, r7, #0 add r0, #0xa8 @@ -2385,7 +2385,7 @@ _021D8846: ldr r0, [r4, #0x18] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit asr r5, r5, #1 cmp r5, #0x90 ble _021D886E @@ -2395,15 +2395,15 @@ _021D886E: mov r1, #2 mov r2, #3 add r3, r5, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D890A _021D887C: ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B48 + bl Bg_GetXpos ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B54 + bl Bg_GetYpos add r0, r4, #0 add r0, #0xb0 ldr r1, [r0] @@ -2431,7 +2431,7 @@ _021D887C: mov r1, #2 mov r2, #3 add r3, r7, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #5 str r0, [r6] b _021D890A @@ -2447,12 +2447,12 @@ _021D88CC: mov r1, #2 ldr r0, [r4, #0x18] add r3, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x18] mov r1, #2 mov r2, #3 add r3, r5, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, #0xa8 str r5, [r4] b _021D890A @@ -2478,7 +2478,7 @@ MOD59_021D8914: ; 0x021D8914 mov r1, #1 bx r3 .align 2, 0 -_021D891C: .word FUN_020178BC +_021D891C: .word SetBgPriority thumb_func_end MOD59_021D8914 thumb_func_start MOD59_021D8920 @@ -2658,7 +2658,7 @@ _021D8A76: str r0, [r4, #0xc] ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit bl _021D985C _021D8A92: ldr r0, _021D8D70 ; =0x00000405 @@ -2748,7 +2748,7 @@ _021D8B44: str r0, [r4, #0xc] ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit bl _021D985C _021D8B58: mov r0, #0x29 @@ -2775,7 +2775,7 @@ _021D8B80: bne _021D8C84 ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #1 add r1, r5, #0 bl ToggleBgLayer @@ -2893,7 +2893,7 @@ _021D8C88: str r0, [r4, #0xc] ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit bl _021D985C _021D8C98: add r0, r5, #0 @@ -3003,7 +3003,7 @@ _021D8D7C: bne _021D8DA0 ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x1c str r0, [r4, #0xc] bl _021D985C @@ -3018,7 +3018,7 @@ _021D8DA0: _021D8DA4: ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x68] bl FUN_020146C4 add r0, r4, #0 @@ -3063,7 +3063,7 @@ _021D8DEA: ldr r0, [r4, #0x18] mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #6 mov r1, #1 str r0, [sp] @@ -3220,7 +3220,7 @@ _021D8F5E: bne _021D8FCE ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 mov r1, #1 bl ToggleBgLayer @@ -3319,7 +3319,7 @@ _021D9030: add r0, #0x98 str r1, [r0] ldr r0, [r4, #0x18] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x30 str r0, [r4, #0xc] bl _021D985C @@ -3557,7 +3557,7 @@ _021D922A: bne _021D92FA ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x3b str r0, [r4, #0xc] b _021D985C @@ -3615,12 +3615,12 @@ _021D9290: ldr r0, [r4, #0x18] mov r1, #1 sub r3, #0x30 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x18] mov r1, #2 add r2, r5, #0 mov r3, #0x30 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x40 str r0, [r4, #0xc] b _021D985C @@ -3801,7 +3801,7 @@ _021D9416: _021D941C: ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x4a str r0, [r4, #0xc] b _021D985C @@ -3867,7 +3867,7 @@ _021D9476: ldr r0, [r4, #0x18] mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D94C2 _021D94AE: mov r0, #2 @@ -3877,7 +3877,7 @@ _021D94AE: ldr r0, [r4, #0x18] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021D94C2: mov r0, #6 mov r1, #1 @@ -3925,7 +3925,7 @@ _021D950C: bne _021D9530 ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, [r4, #0x48] sub r0, r5, #2 cmp r1, r0 @@ -4138,7 +4138,7 @@ _021D9696: ldr r0, [r4, #0x18] mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #6 mov r1, #1 str r0, [sp] @@ -4187,7 +4187,7 @@ _021D971A: _021D971C: ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x61 str r0, [r4, #0xc] b _021D985C @@ -4263,7 +4263,7 @@ _021D97B2: bne _021D985C ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x67 str r0, [r4, #0xc] b _021D985C diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index 6dde1a2a..147b3a99 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -231,7 +231,7 @@ _021D9A2C: add r0, sp, #0x90 bl GX_SetBanks ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x80 ldr r5, _021D9BB8 ; =0x021DA054 str r0, [r4, #4] @@ -241,7 +241,7 @@ _021D9A2C: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D9BBC ; =0x021DA080 add r3, sp, #0x64 ldmia r5!, {r0, r1} @@ -256,7 +256,7 @@ _021D9A2C: str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r3, [r4] mov r0, #2 mov r1, #0x20 @@ -264,7 +264,7 @@ _021D9A2C: bl BG_ClearCharDataRange ldr r0, [r4, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9BC0 ; =0x021DA09C add r3, sp, #0x48 ldmia r5!, {r0, r1} @@ -279,7 +279,7 @@ _021D9A2C: str r0, [r3] ldr r0, [r4, #4] add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -314,7 +314,7 @@ _021D9A2C: str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -351,7 +351,7 @@ _021D9A2C: str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -442,16 +442,16 @@ MOD59_021D9BD0: ; 0x021D9BD0 strh r1, [r0] ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap pop {r4, pc} @@ -600,7 +600,7 @@ _021D9D50: bl RemoveWindow ldr r0, [r4, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 str r0, [r4, #0xc] mov r5, #1 @@ -624,7 +624,7 @@ MOD59_021D9D78: ; 0x021D9D78 ldr r0, [r0, #4] mov r1, #1 asr r3, r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} .align 2, 0 thumb_func_end MOD59_021D9D78 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 5dd63118..52185a9c 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -587,7 +587,7 @@ MOD60_021D7990: ; 0x021D7990 sub sp, #0x80 add r6, r0, #0 ldr r0, [r6] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0 ldr r4, _021D7A08 ; =0x021D8114 str r0, [r6, #0x14] @@ -597,7 +597,7 @@ MOD60_021D7990: ; 0x021D7990 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D7A0C ; =0x021D8168 add r3, sp, #0x10 mov r2, #0xe @@ -616,12 +616,12 @@ _021D79C6: lsr r1, r1, #0x18 add r2, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r1, [r5] ldr r0, [r6, #0x14] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r7, r7, #1 add r4, #0x1c add r5, r5, #4 @@ -651,16 +651,16 @@ MOD60_021D7A14: ; 0x021D7A14 add r4, r0, #0 ldr r0, [r4, #0x14] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] bl FreeToHeap pop {r4, pc} @@ -801,7 +801,7 @@ MOD60_021D7A40: ; 0x021D7A40 ldr r0, [r5, #0x14] mov r1, #0 sub r3, #0x1b - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5, #0x14] mov r1, #2 bl ScheduleBgTilemapBufferTransfer @@ -933,13 +933,13 @@ MOD60_021D7BA4: ; 0x021D7BA4 bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x4c - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r4, #0 add r0, #0x3c - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r4, #0 add r0, #0x2c - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r4, #0 ldr r2, _021D7CCC ; =0x00000232 add r0, #0x3c @@ -977,12 +977,12 @@ MOD60_021D7CD4: ; 0x021D7CD4 _021D7CF0: lsl r4, r6, #4 add r0, r5, r4 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, r4 add r1, r7, #0 bl FillWindowPixelBuffer add r0, r5, r4 - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r5, r4 bl RemoveWindow add r0, r6, #1 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index c63204ff..5014385c 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -344,7 +344,7 @@ _021D775E: bl FUN_0200D0E0 add r0, r5, #0 add r0, #0x94 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0 strh r0, [r5, #8] ldrb r1, [r5, #0xd] @@ -499,7 +499,7 @@ _021D788A: bl FUN_0200D0E0 add r0, r5, #0 add r0, #0x94 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0 strh r0, [r5, #8] cmp r4, #0 @@ -921,7 +921,7 @@ MOD61_021D7BD0: ; 0x021D7BD0 add r4, r0, #0 bl MOD61_021D7BB0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0 ldr r5, _021D7CAC ; =0x021D8434 str r0, [r4, #0x18] @@ -931,7 +931,7 @@ MOD61_021D7BD0: ; 0x021D7BD0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7CB0 ; =0x021D84C8 add r3, sp, #0x10 mov r2, #0x11 @@ -946,42 +946,42 @@ _021D7BFC: ldr r0, [r4, #0x18] add r2, sp, #0x10 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #1 add r2, sp, #0x2c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #2 add r2, sp, #0x48 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #3 add r2, sp, #0x64 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #4 add r2, sp, #0x80 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x18] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x18] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x18] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 ldr r3, [r4] mov r1, #0x20 @@ -1020,19 +1020,19 @@ MOD61_021D7CB4: ; 0x021D7CB4 add r4, r0, #0 ldr r0, [r4, #0x18] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] bl FreeToHeap pop {r4, pc} @@ -1513,7 +1513,7 @@ MOD61_021D80F4: ; 0x021D80F4 add r5, #0x44 _021D80FC: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 bl RemoveWindow add r4, r4, #1 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index a92f1992..1d50728c 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1550,7 +1550,7 @@ _0222E120: ldrsh r3, [r7, r3] mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x59 lsl r3, r3, #2 ldr r0, [r7, r3] @@ -1558,7 +1558,7 @@ _0222E120: ldrsh r3, [r7, r3] mov r1, #5 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0222E160: ldr r0, [sp, #4] cmp r0, #0 @@ -1675,14 +1675,14 @@ _0222E22E: lsl r1, r1, #2 ldr r0, [r0, r1] mov r1, #5 - bl FUN_02017B48 + bl Bg_GetXpos add r4, r0, #0 mov r1, #0x59 ldr r0, [sp, #0x1c] lsl r1, r1, #2 ldr r0, [r0, r1] mov r1, #5 - bl FUN_02017B54 + bl Bg_GetYpos add r3, r0, #0 ldr r0, [sp, #0xc] mov r5, #0x37 @@ -3673,7 +3673,7 @@ MOD62_0222F1E8: ; 0x0222F1E8 add r5, #0x30 _0222F1F2: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 bl RemoveWindow add r4, r4, #1 @@ -4603,7 +4603,7 @@ MOD62_0222F904: ; 0x0222F904 bl FUN_0200CCF8 add r0, r4, #0 add r0, #0xfc - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r4, r0] @@ -6028,7 +6028,7 @@ _0223042E: bl GX_EngineBToggleLayers mov r0, #7 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority add r0, r4, #0 mov r1, #1 bl MOD62_0222F738 @@ -6052,7 +6052,7 @@ _0223049A: bne _02230598 mov r0, #3 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #0x10 str r0, [sp] mov r3, #0 @@ -6697,7 +6697,7 @@ _022309DC: mov r0, #0x43 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x43 lsl r0, r0, #2 add r0, r4, r0 @@ -6844,10 +6844,10 @@ _02230B40: bl FUN_02003210 mov r0, #3 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #7 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #0 bl GX_EngineBToggleLayers @@ -7398,7 +7398,7 @@ _02230F90: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _022310C0 ; =MOD62_02231294 add r3, sp, #0xa8 mov r2, #0xa @@ -7413,26 +7413,26 @@ _02230FF0: add r0, r4, #0 add r2, sp, #0xa8 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 add r2, sp, #0xc4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 add r2, sp, #0xe0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _022310C4 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -7454,34 +7454,34 @@ _02231052: mov r1, #4 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #5 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #6 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #7 add r2, sp, #0x8c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #4 mov r1, #0 bl GX_EngineBToggleLayers diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index 3607b140..d5ce1348 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -692,7 +692,7 @@ MOD63_021D7A48: ; 0x021D7A48 sub sp, #0xb8 add r4, r0, #0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0xa8 ldr r5, _021D7B80 ; =MOD63_021DB9B4 str r0, [r4, #4] @@ -702,7 +702,7 @@ MOD63_021D7A48: ; 0x021D7A48 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7B84 ; =MOD63_021DB9E0 add r3, sp, #0x8c ldmia r5!, {r0, r1} @@ -717,7 +717,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B88 ; =MOD63_021DB9C4 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -732,7 +732,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B8C ; =MOD63_021DBA50 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -747,7 +747,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B90 ; =MOD63_021DBA34 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -762,7 +762,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B94 ; =MOD63_021DB9FC add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -777,7 +777,7 @@ MOD63_021D7A48: ; 0x021D7A48 ldr r0, [r4, #4] mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B98 ; =MOD63_021DBA18 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -792,7 +792,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers @@ -865,22 +865,22 @@ MOD63_021D7B9C: ; 0x021D7B9C bl GX_EngineBToggleLayers ldr r0, [r4, #4] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap pop {r4, pc} diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index 77a19f77..34d50a11 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -69,7 +69,7 @@ MOD63_021D88F0: ; 0x021D88F0 sub sp, #0xb8 add r4, r0, #0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0xa8 ldr r5, _021D89E8 ; =MOD63_021DBB4C str r0, [r4, #0xc] @@ -79,7 +79,7 @@ MOD63_021D88F0: ; 0x021D88F0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D89EC ; =MOD63_021DBC88 add r3, sp, #0x8c ldmia r5!, {r0, r1} @@ -94,7 +94,7 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D89F0 ; =MOD63_021DBC6C add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -109,7 +109,7 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D89F4 ; =MOD63_021DBBC4 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -124,7 +124,7 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D89F8 ; =MOD63_021DBBFC add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -139,7 +139,7 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D89FC ; =MOD63_021DBC18 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -154,7 +154,7 @@ MOD63_021D88F0: ; 0x021D88F0 ldr r0, [r4, #0xc] mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8A00 ; =MOD63_021DBC34 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -169,7 +169,7 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 add r1, r0, #0 bl BG_SetMaskColor @@ -194,7 +194,7 @@ MOD63_021D8A04: ; 0x021D8A04 sub sp, #0x80 add r4, r0, #0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x70 ldr r5, _021D8AC4 ; =MOD63_021DBB3C str r0, [r4, #0xc] @@ -204,7 +204,7 @@ MOD63_021D8A04: ; 0x021D8A04 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -227,7 +227,7 @@ MOD63_021D8A04: ; 0x021D8A04 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8AD0 ; =MOD63_021DBCA4 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -242,7 +242,7 @@ MOD63_021D8A04: ; 0x021D8A04 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8AD4 ; =MOD63_021DBCC0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -257,7 +257,7 @@ MOD63_021D8A04: ; 0x021D8A04 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8AD8 ; =MOD63_021DBCDC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -272,7 +272,7 @@ MOD63_021D8A04: ; 0x021D8A04 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #4 mov r1, #0 bl BG_SetMaskColor @@ -293,7 +293,7 @@ MOD63_021D8ADC: ; 0x021D8ADC sub sp, #0x9c add r4, r0, #0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x8c ldr r5, _021D8BBC ; =MOD63_021DBB6C str r0, [r4, #0xc] @@ -303,7 +303,7 @@ MOD63_021D8ADC: ; 0x021D8ADC ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -326,7 +326,7 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8BC8 ; =MOD63_021DBD14 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -341,7 +341,7 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8BCC ; =MOD63_021DBD30 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -356,7 +356,7 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8BD0 ; =MOD63_021DBBA8 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -371,7 +371,7 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8BD4 ; =MOD63_021DBBE0 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -386,7 +386,7 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #4 mov r1, #0 bl BG_SetMaskColor @@ -1200,22 +1200,22 @@ MOD63_021D9234: ; 0x021D9234 bl MOD63_021DAF9C ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] bl FreeToHeap mov r0, #0 @@ -1708,16 +1708,16 @@ _021D964A: _021D965E: ldr r0, [r5, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0xc] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0xc] bl FreeToHeap ldr r0, [r5, #0x10] @@ -2716,7 +2716,7 @@ MOD63_021D9EE0: ; 0x021D9EE0 ldr r0, [r4, #0xc] mov r1, #1 sub r3, r2, #5 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 str r0, [r4, #8] _021D9EFE: @@ -2736,7 +2736,7 @@ MOD63_021D9F00: ; 0x021D9F00 ldr r0, [r4, #0xc] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 str r0, [r4, #8] _021D9F1E: @@ -2752,7 +2752,7 @@ MOD63_021D9F20: ; 0x021D9F20 ldr r0, [r4, #0xc] mov r1, #3 sub r3, #0x11 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 str r0, [r4, #8] pop {r4, pc} @@ -3183,7 +3183,7 @@ _021DA192: mov r1, #3 mov r2, #1 mov r3, #0x40 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #1 lsl r0, r0, #0xc bl FX_Inv @@ -3203,14 +3203,14 @@ _021DA192: mov r1, #2 add r2, sp, #0x10 mov r3, #0x80 - bl FUN_02017BD0 + bl SetBgAffine mov r0, #0x60 str r0, [sp] ldr r0, [r4, #0xc] mov r1, #3 add r2, sp, #0x10 mov r3, #0xc0 - bl FUN_02017BD0 + bl SetBgAffine mov r0, #1 strb r0, [r4, #3] add sp, #0x20 @@ -3357,19 +3357,19 @@ MOD63_021DA418: ; 0x021DA418 beq _021DA458 ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] bl FreeToHeap ldr r0, _021DA470 ; =0x0000028E @@ -3438,7 +3438,7 @@ MOD63_021DA478: ; 0x021DA478 mov r1, #2 mov r2, #4 mov r3, #1 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams mov r0, #1 ldr r1, [r4, #8] lsl r0, r0, #0xa @@ -3454,7 +3454,7 @@ MOD63_021DA478: ; 0x021DA478 mov r1, #3 mov r2, #4 mov r3, #1 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams _021DA4FE: add sp, #0x2c pop {r4, r5, pc} @@ -3502,7 +3502,7 @@ MOD63_021DA504: ; 0x021DA504 mov r1, #2 mov r2, #4 mov r3, #1 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams mov r0, #2 ldr r1, [r4, #8] lsl r0, r0, #0xa @@ -3518,7 +3518,7 @@ MOD63_021DA504: ; 0x021DA504 mov r1, #3 mov r2, #4 mov r3, #1 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams add sp, #0x2c pop {r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 1d85c1d6..aecc5268 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -60,7 +60,7 @@ _021D755E: mov r1, #0x2f bl MOD64_021D7810 mov r0, #0x2f - bl FUN_02016B94 + bl BgConfig_Alloc add r1, r5, #0 add r1, #0x94 str r0, [r1] @@ -71,7 +71,7 @@ _021D755E: str r1, [sp] str r1, [sp, #8] str r1, [sp, #0xc] - bl FUN_02016BBC + bl SetBothScreensModesAndDisable add r0, r5, #0 add r0, #0x94 ldr r0, [r0] @@ -566,7 +566,7 @@ MOD64_021D7970: ; 0x021D7970 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r7, #0 mov r1, #0x20 mov r2, #0 @@ -574,7 +574,7 @@ MOD64_021D7970: ; 0x021D7970 bl BG_ClearCharDataRange add r0, r5, #0 add r1, r7, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D7A30 ; =0x021D9094 add r3, sp, #0x1c ldmia r6!, {r0, r1} @@ -589,7 +589,7 @@ MOD64_021D7970: ; 0x021D7970 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -597,7 +597,7 @@ MOD64_021D7970: ; 0x021D7970 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D7A34 ; =0x021D90CC add r3, sp, #0 ldmia r6!, {r0, r1} @@ -612,7 +612,7 @@ MOD64_021D7970: ; 0x021D7970 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 @@ -620,7 +620,7 @@ MOD64_021D7970: ; 0x021D7970 bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x54 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -635,13 +635,13 @@ MOD64_021D7A38: ; 0x021D7A38 push {r4, lr} add r4, r0, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD64_021D7A38 @@ -3537,14 +3537,14 @@ MOD64_021D902C: ; 0x021D902C add r1, r0, #0 add r1, #0xa8 ldr r1, [r1] - ldr r3, _021D9040 ; =FUN_02019570 + ldr r3, _021D9040 ; =ClearWindowTilemapAndCopyToVram lsl r1, r1, #2 add r0, r0, r1 add r0, #0x9c ldr r0, [r0] bx r3 nop -_021D9040: .word FUN_02019570 +_021D9040: .word ClearWindowTilemapAndCopyToVram thumb_func_end MOD64_021D902C thumb_func_start MOD64_021D9044 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index db0337b9..13d12cb8 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -581,7 +581,7 @@ _021D7940: mov r0, #0x42 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldrb r0, [r4, #0x1a] ldr r3, [r4, #0x20] lsl r2, r0, #3 @@ -754,7 +754,7 @@ MOD65_021D7A8C: ; 0x021D7A8C add r5, r0, #0 bl MOD65_021D7A6C ldr r0, [r5] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0 ldr r4, _021D7AFC ; =0x021DA040 str r0, [r5, #0x24] @@ -764,7 +764,7 @@ MOD65_021D7A8C: ; 0x021D7A8C ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D7B00 ; =0x021DA140 add r3, sp, #0x10 mov r2, #0x15 @@ -782,11 +782,11 @@ _021D7AC6: lsr r1, r1, #0x18 add r2, r6, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 ldr r0, [r5, #0x24] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit lsl r0, r4, #0x18 ldr r3, [r5] lsr r0, r0, #0x18 @@ -814,7 +814,7 @@ _021D7B0A: lsl r1, r4, #0x18 ldr r0, [r5, #0x24] lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #6 blt _021D7B0A @@ -1020,7 +1020,7 @@ MOD65_021D7CA8: ; 0x021D7CA8 add r5, #0xe8 _021D7CB0: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 bl RemoveWindow add r4, r4, #1 @@ -1716,7 +1716,7 @@ MOD65_021D8214: ; 0x021D8214 beq _021D823E add r0, r5, #0 add r0, #0xe8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _021D823E: add r0, r5, #0 add r0, #0xc4 @@ -2297,7 +2297,7 @@ MOD65_021D86BC: ; 0x021D86BC mov r0, #0x46 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0xc8 add r2, sp, #0 @@ -3069,7 +3069,7 @@ MOD65_021D8CD8: ; 0x021D8CD8 add r5, r0, #0 bl MOD65_021D8CB8 ldr r0, [r5] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #8 ldr r4, _021D8D5C ; =0x021DA35C str r0, [r5, #0x68] @@ -3079,7 +3079,7 @@ MOD65_021D8CD8: ; 0x021D8CD8 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D8D60 ; =0x021DA3C8 add r3, sp, #0x18 mov r2, #0xa @@ -3108,10 +3108,10 @@ _021D8D28: add r2, r6, #0 add r1, r7, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #0x68] add r1, r7, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r3, [r5] add r0, r7, #0 mov r1, #0x20 @@ -3141,13 +3141,13 @@ _021D8D6E: lsl r1, r4, #0x18 ldr r0, [r5, #0x68] lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #3 blt _021D8D6E ldr r0, [r5, #0x68] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0x68] bl FreeToHeap pop {r3, r4, r5, pc} @@ -3296,7 +3296,7 @@ MOD65_021D8EB0: ; 0x021D8EB0 push {r4, lr} add r4, r0, #0 add r0, #0x6c - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r4, #0x6c add r0, r4, #0 bl RemoveWindow @@ -3917,7 +3917,7 @@ _021D9366: bl FUN_0200D0E0 add r4, #0x6c add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #8 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 874296d6..46a8659a 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -269,7 +269,7 @@ _021D7694: _021D76E4: bl MOD66_021D7608 ldr r0, [r4, #4] - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x28] ldr r1, [r4, #0x28] add r0, r4, #0 @@ -336,7 +336,7 @@ _021D7782: lsl r1, r4, #0x18 ldr r0, [r5, #0x28] lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #8 blt _021D7782 @@ -393,7 +393,7 @@ MOD66_021D77E4: ; 0x021D77E4 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D78B0 ; =0x021D9634 add r3, sp, #0x14 mov r2, #0x1c @@ -411,12 +411,12 @@ _021D7814: lsr r1, r1, #0x18 add r2, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 add r0, r6, #0 lsr r1, r1, #0x18 add r4, r4, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r7, r7, #1 add r5, #0x1c cmp r7, #8 @@ -1407,7 +1407,7 @@ _021D7FCE: ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #5 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 beq _021D7FEE mov r4, #0 @@ -1805,7 +1805,7 @@ MOD66_021D82B8: ; 0x021D82B8 add r0, r6, #0 bl CopyWindowToVram add r0, r6, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D82DC: @@ -2046,7 +2046,7 @@ MOD66_021D8494: ; 0x021D8494 add r0, r5, #0 bl FillWindowPixelBuffer add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldrb r1, [r4, #0x15] add r0, r5, #0 mov r2, #0 @@ -2234,16 +2234,16 @@ MOD66_021D8554: ; 0x021D8554 bl CopyWindowToVram add r0, r4, #0 add r0, #0x38 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x48 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x58 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r4, #0x68 add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add sp, #0x14 pop {r4, r5, pc} nop @@ -2683,22 +2683,22 @@ MOD66_021D89B8: ; 0x021D89B8 mov r1, #6 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x28] mov r1, #7 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #0 ldr r0, [r4, #0x28] mov r1, #6 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #0 ldr r0, [r4, #0x28] mov r1, #7 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0 str r1, [sp] mov r0, #0x20 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 25aa9283..171acce3 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -48,7 +48,7 @@ MOD67_021D74E0: ; 0x021D74E0 add r4, r0, #0 bl memset mov r0, #0x2a - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] str r5, [r4, #0x4c] add r0, r5, #0 @@ -221,7 +221,7 @@ MOD67_021D76A0: ; 0x021D76A0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D776C ; =0x021D975C add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -236,10 +236,10 @@ MOD67_021D76A0: ; 0x021D76A0 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7770 ; =0x021D9740 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -254,10 +254,10 @@ MOD67_021D76A0: ; 0x021D76A0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7774 ; =0x021D9778 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -272,7 +272,7 @@ MOD67_021D76A0: ; 0x021D76A0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7778 ; =0x021D9794 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -287,7 +287,7 @@ MOD67_021D76A0: ; 0x021D76A0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -315,16 +315,16 @@ MOD67_021D777C: ; 0x021D777C bl GX_DisableEngineALayers add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x2a add r1, r4, #0 bl FreeToHeapExplicit @@ -417,7 +417,7 @@ _021D7844: mov r1, #3 add r2, r4, #0 lsl r3, r3, #0xa - bl FUN_02017DFC + bl BG_LoadScreenTilemapData mov r1, #0x1e mov r0, #0 lsl r1, r1, #4 @@ -965,19 +965,19 @@ MOD67_021D7C30: ; 0x021D7C30 add r0, r0, #5 ldrb r0, [r4, r0] mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7CB8 ; =0x00001063 mov r1, #1 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7CA8 ; =0x00001062 mov r1, #2 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7CB0 ; =0x00001061 mov r1, #3 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority mov r0, #1 pop {r4, pc} _021D7CA4: @@ -1031,19 +1031,19 @@ MOD67_021D7CBC: ; 0x021D7CBC add r0, r0, #5 ldrb r0, [r4, r0] mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7D50 ; =0x00001063 mov r1, #1 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7D58 ; =0x00001062 mov r1, #2 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7D5C ; =0x00001061 mov r1, #3 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority _021D7D30: ldr r0, _021D7D54 ; =0x0000105F ldrsb r1, [r4, r0] @@ -1146,9 +1146,9 @@ _021D7DB4: bl MOD67_021D8344 _021D7DF2: add r0, r6, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, r5, r6, pc} thumb_func_end MOD67_021D7D9C diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 10d891ac..e30ad283 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -49,7 +49,7 @@ MOD68_021D74E0: ; 0x021D74E0 lsl r1, r1, #2 str r0, [r5, r1] mov r0, #0x24 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5] mov r0, #0x7e lsl r0, r0, #2 @@ -233,7 +233,7 @@ MOD68_021D76C0: ; 0x021D76C0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable bl MOD68_021D7FD8 ldr r5, _021D7768 ; =0x021D8910 add r3, sp, #0x38 @@ -249,10 +249,10 @@ MOD68_021D76C0: ; 0x021D76C0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D776C ; =0x021D88D8 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -267,7 +267,7 @@ MOD68_021D76C0: ; 0x021D76C0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 mov r2, #3 @@ -287,7 +287,7 @@ MOD68_021D76C0: ; 0x021D76C0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 @@ -311,13 +311,13 @@ MOD68_021D7774: ; 0x021D7774 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x24 add r1, r4, #0 bl FreeToHeapExplicit @@ -398,7 +398,7 @@ _021D7812: bl FreeToHeap ldr r0, [r5] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r1, #0x1e mov r0, #0 lsl r1, r1, #4 @@ -544,7 +544,7 @@ MOD68_021D7904: ; 0x021D7904 ldr r0, [sp, #0x10] bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD68_021D7904 @@ -736,7 +736,7 @@ MOD68_021D7A18: ; 0x021D7A18 add r0, r5, #0 bl String_dtor add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -774,7 +774,7 @@ MOD68_021D7AE4: ; 0x021D7AE4 add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -810,7 +810,7 @@ MOD68_021D7B34: ; 0x021D7B34 add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -855,7 +855,7 @@ _021D7BA4: add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -891,7 +891,7 @@ MOD68_021D7BDC: ; 0x021D7BDC add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -980,7 +980,7 @@ MOD68_021D7C28: ; 0x021D7C28 add r0, r4, #0 bl String_dtor add r0, r6, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -1393,7 +1393,7 @@ MOD68_021D7F98: ; 0x021D7F98 bl MOD68_021D85F4 ldr r0, [r4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, pc} .align 2, 0 thumb_func_end MOD68_021D7F98 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 8a49a85d..b29554ea 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -735,7 +735,7 @@ MOD69_0222DBAC: ; 0x0222DBAC sub sp, #0x14 add r4, r0, #0 mov r0, #0x3f - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x10] ldr r0, _0222DCF4 ; =0x0222F8CC bl GX_SetBanks @@ -745,22 +745,22 @@ MOD69_0222DBAC: ; 0x0222DBAC and r0, r1 strh r0, [r2] ldr r0, _0222DD00 ; =0x0222F7C4 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x10] ldr r2, _0222DD04 ; =0x0222F850 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] ldr r2, _0222DD08 ; =0x0222F818 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] ldr r2, _0222DD0C ; =0x0222F834 mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r2, #0 str r2, [sp] mov r1, #1 @@ -796,7 +796,7 @@ MOD69_0222DBAC: ; 0x0222DBAC bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 add r0, #0x14 bl PutWindowTilemap @@ -846,7 +846,7 @@ MOD69_0222DBAC: ; 0x0222DBAC bl GfGfxLoader_LoadScrnData ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _0222DD10 ; =0x04000040 mov r1, #0 strh r1, [r0] @@ -903,13 +903,13 @@ MOD69_0222DD18: ; 0x0222DD18 bl RemoveWindow ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] bl FreeToHeap pop {r4, pc} @@ -2469,7 +2469,7 @@ _0222E9D8: mov r1, #0x18 bl MOD69_0222E89C ldr r0, [r4, #0x10] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0x14 str r0, [r4, #0x30] ldr r0, [r4, #0x34] @@ -2490,7 +2490,7 @@ _0222E9FC: mov r1, #0x58 bl MOD69_0222E89C ldr r0, [r4, #0x10] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0x14 str r0, [r4, #0x30] ldr r0, [r4, #0x34] @@ -2521,7 +2521,7 @@ _0222EA2E: mov r1, #0x88 bl MOD69_0222E89C ldr r0, [r4, #0x10] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #0x34] add r0, r0, #1 str r0, [r4, #0x34] @@ -2595,7 +2595,7 @@ _0222EAEA: ldr r0, [r4, #0xc] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 add r0, #0x14 bl MOD69_0222F6C0 @@ -2610,7 +2610,7 @@ _0222EB16: mov r1, #0 bl FillWindowPixelBuffer ldr r0, [r4, #0x10] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #0x28] add r0, r0, #1 str r0, [r4, #0x28] @@ -2622,7 +2622,7 @@ _0222EB2C: lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 bl MOD69_0222E204 add r0, r5, #0 @@ -2744,7 +2744,7 @@ MOD69_0222EB4C: ; 0x0222EB4C bl AddTextPrinterParameterized2 add r4, #0x14 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} nop diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 0c6604aa..ead9cb12 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -405,7 +405,7 @@ MOD70_021D77CC: ; 0x021D77CC str r5, [r4] str r6, [r4, #4] mov r0, #0x3d - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x10] bl NNS_G2dInitOamManagerModule mov r0, #0 @@ -810,17 +810,17 @@ MOD70_021D7AF4: ; 0x021D7AF4 orr r0, r1 strh r0, [r2] ldr r0, _021D7C00 ; =0x021D823C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r5, #0x10] ldr r2, _021D7C04 ; =0x021D8268 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #0x10] ldr r2, _021D7C08 ; =0x021D824C mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -900,7 +900,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 bl FUN_0200CCA4 ldr r0, [r5, #0x10] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r3, #8 ldr r0, _021D7C0C ; =0x04000050 mov r1, #0 @@ -927,10 +927,10 @@ MOD70_021D7C10: ; 0x021D7C10 add r4, r0, #0 ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD70_021D7C98 pop {r4, pc} @@ -1029,10 +1029,10 @@ MOD70_021D7CC0: ; 0x021D7CC0 bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r4, #0x24 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} thumb_func_end MOD70_021D7CC0 @@ -1114,7 +1114,7 @@ MOD70_021D7CE8: ; 0x021D7CE8 add r3, r1, #0 bl AddTextPrinterParameterized add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0xc pop {r3, r4, r5, r6, pc} thumb_func_end MOD70_021D7CE8 @@ -1341,7 +1341,7 @@ _021D7F1E: blt _021D7F1E _021D7F66: ldr r0, [sp, #0xc] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD70_021D7D98 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 8cd0ea19..eccd3758 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -38,7 +38,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 add r1, r4, #0 bl MIi_CpuClearFast mov r0, #0x1a - bl FUN_02016B94 + bl BgConfig_Alloc mov r1, #0x5d lsl r1, r1, #2 str r0, [r4, r1] @@ -1876,7 +1876,7 @@ MOD71_0222E578: ; 0x0222E578 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _0222E74C ; =0x0223115C add r3, sp, #0xa8 ldmia r4!, {r0, r1} @@ -1891,10 +1891,10 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r4, _0222E750 ; =0x02231124 add r3, sp, #0x8c ldmia r4!, {r0, r1} @@ -1909,10 +1909,10 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r4, _0222E754 ; =0x02231178 add r3, sp, #0x70 ldmia r4!, {r0, r1} @@ -1927,10 +1927,10 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r4, _0222E758 ; =0x02231194 add r3, sp, #0x54 ldmia r4!, {r0, r1} @@ -1945,7 +1945,7 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r4, _0222E75C ; =0x022310EC add r3, sp, #0x38 ldmia r4!, {r0, r1} @@ -1960,10 +1960,10 @@ MOD71_0222E578: ; 0x0222E578 add r0, r5, #0 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r4, _0222E760 ; =0x02231108 add r3, sp, #0x1c ldmia r4!, {r0, r1} @@ -1978,7 +1978,7 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r4, _0222E764 ; =0x02231140 add r3, sp, #0 ldmia r4!, {r0, r1} @@ -1993,7 +1993,7 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -2018,27 +2018,27 @@ _0222E6BC: add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit lsl r1, r4, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 add r2, r6, #0 add r3, r7, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 mov r2, #0 add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 cmp r4, #4 blt _0222E6BC @@ -2188,25 +2188,25 @@ MOD71_0222E848: ; 0x0222E848 push {r4, lr} add r4, r0, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD71_0222E848 @@ -2246,7 +2246,7 @@ _0222E8B2: add r0, r5, #0 lsr r1, r1, #0x18 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData _0222E8D0: add r0, r6, #0 bl FreeToHeap @@ -2270,7 +2270,7 @@ MOD71_0222E8DC: ; 0x0222E8DC add r0, r4, #0 mov r1, #2 lsl r3, r3, #8 - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram add sp, #4 pop {r3, r4, pc} .align 2, 0 @@ -2414,7 +2414,7 @@ MOD71_0222E900: ; 0x0222E900 bl FUN_02002ED0 add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2958,7 +2958,7 @@ _0222EE9A: add r0, #0x1c lsl r0, r0, #4 add r0, r6, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _0222EEA6: mov r0, #3 str r0, [sp] @@ -3046,21 +3046,21 @@ MOD71_0222EF24: ; 0x0222EF24 add r0, #0x1a lsl r0, r0, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x1c lsl r0, r0, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x1e lsl r0, r0, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r4, #0x20 lsl r0, r4, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram pop {r4, r5, r6, pc} thumb_func_end MOD71_0222EF24 @@ -5243,7 +5243,7 @@ _02230108: lsl r1, r0, #4 ldr r0, [sp, #4] add r0, r0, r1 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r7, #0 add r0, #0x8c ldr r0, [r0] @@ -5280,7 +5280,7 @@ _02230154: lsl r1, r0, #4 ldr r0, [sp, #4] add r0, r0, r1 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r6, r6, #1 add r4, r4, #4 add r5, #0x10 @@ -5550,11 +5550,11 @@ MOD71_02230390: ; 0x02230390 ldr r1, _0223048C ; =0x00000568 str r0, [sp] add r0, r0, r1 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r1, _02230490 ; =0x00000578 ldr r0, [sp] add r0, r0, r1 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r6, [sp] ldr r1, _02230494 ; =0x00000438 add r0, r6, #0 @@ -5622,7 +5622,7 @@ _0223042C: lsl r1, r0, #4 ldr r0, [sp, #4] add r0, r0, r1 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _02230438: add r7, r7, #1 add r6, #0x10 @@ -6467,7 +6467,7 @@ MOD71_02230B3C: ; 0x02230B3C ldr r0, [r4, r0] ldr r3, [r4, r3] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x5d ldr r3, _02230B6C ; =0x000022B8 lsl r0, r0, #2 @@ -6475,7 +6475,7 @@ MOD71_02230B3C: ; 0x02230B3C ldr r3, [r4, r3] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} .align 2, 0 _02230B6C: .word 0x000022B8 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index f267b50a..b91c0cfa 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -2440,7 +2440,7 @@ MOD73_021D88E4: ; 0x021D88E4 add r6, r0, #0 bl MOD73_021D88C4 ldr r0, [sp] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #8 ldr r4, _021D8974 ; =0x021DBD30 str r0, [r6] @@ -2450,13 +2450,13 @@ MOD73_021D88E4: ; 0x021D88E4 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers mov r0, #0 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority ldr r4, _021D8978 ; =0x021DBD68 add r3, sp, #0x18 mov r2, #0xe @@ -2483,10 +2483,10 @@ _021D8944: ldr r0, [r6] add r2, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldrb r1, [r5] ldr r0, [r6] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldrb r0, [r5] ldr r3, [sp] mov r1, #0x20 @@ -2511,16 +2511,16 @@ MOD73_021D8980: ; 0x021D8980 add r4, r0, #0 ldr r0, [r4] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4] bl FreeToHeap pop {r4, pc} @@ -4792,10 +4792,10 @@ MOD73_021D9AB4: ; 0x021D9AB4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4, #4] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r4, pc} thumb_func_end MOD73_021D9AB4 @@ -4930,7 +4930,7 @@ _021D9B02: blt _021D9B02 _021D9BCE: ldr r0, [r5, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [r5, #4] mov r1, #5 bl ScheduleBgTilemapBufferTransfer @@ -6170,7 +6170,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0xc] mov r1, #0xf bl FillWindowPixelBuffer @@ -6210,9 +6210,9 @@ MOD73_021DA4D4: ; 0x021DA4D4 mov r3, #1 bl FUN_0200CCA4 ldr r0, [r4, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [r4, #0x10] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, pc} nop @@ -6386,7 +6386,7 @@ _021DA682: mov r3, #0xa0 bl AddTextPrinterParameterized2 ldr r0, [r4, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, pc} nop @@ -6442,7 +6442,7 @@ MOD73_021DA6BC: ; 0x021DA6BC mov r3, #0x10 bl AddTextPrinterParameterized2 ldr r0, [r4, #0x10] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -6477,11 +6477,11 @@ MOD73_021DA754: ; 0x021DA754 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0xc] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4, #0x10] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram pop {r4, pc} .align 2, 0 thumb_func_end MOD73_021DA754 @@ -6572,7 +6572,7 @@ _021DA7EC: add r3, r1, #0 bl FUN_0200D0BC ldr r0, [r4, #0x14] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 5b13fc71..16e58c34 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -584,7 +584,7 @@ MOD74_021D7934: ; 0x021D7934 sub sp, #0x64 add r5, r0, #0 ldr r0, [r5] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0 ldr r4, _021D79C0 ; =0x021D84A0 str r0, [r5, #0x10] @@ -594,7 +594,7 @@ MOD74_021D7934: ; 0x021D7934 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D79C4 ; =0x021D8570 add r3, sp, #0x10 mov r2, #0xa @@ -618,11 +618,11 @@ _021D7976: lsr r1, r1, #0x18 add r2, r6, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 ldr r0, [r5, #0x10] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldrh r0, [r5, #8] add r7, r7, #1 add r4, r4, #1 @@ -667,7 +667,7 @@ _021D79D8: ldr r0, [r6, #0x10] lsr r1, r1, #0x18 add r5, r5, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldrh r0, [r6, #8] add r4, r4, #1 add r0, r0, #2 @@ -825,7 +825,7 @@ _021D7AFE: add r5, #0x6c _021D7B08: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 bl RemoveWindow add r4, r4, #1 @@ -1667,7 +1667,7 @@ MOD74_021D81E0: ; 0x021D81E0 bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x8c - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 mov r1, #1 bl MOD74_021D8388 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 1dd84c2c..79c74bf7 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -49,7 +49,7 @@ MOD75_021E6BA0: ; 0x021E6BA0 add r0, r4, #0 bl MOD75_021E6FA4 mov r0, #6 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] add r0, r4, #0 add r0, #0xcc @@ -578,7 +578,7 @@ MOD75_021E7054: ; 0x021E7054 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021E71A0 ; =0x021EC440 add r3, sp, #0xa8 ldmia r5!, {r0, r1} @@ -593,10 +593,10 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021E71A4 ; =0x021EC45C add r3, sp, #0x8c ldmia r5!, {r0, r1} @@ -611,7 +611,7 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021E71A8 ; =0x021EC494 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -626,10 +626,10 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021E71AC ; =0x021EC4E8 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -644,7 +644,7 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021E71B0 ; =0x021EC478 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -659,10 +659,10 @@ MOD75_021E7054: ; 0x021E7054 add r0, r4, #0 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021E71B4 ; =0x021EC4B0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -677,7 +677,7 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021E71B8 ; =0x021EC4CC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -692,7 +692,7 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #7 mov r2, #9 @@ -738,25 +738,25 @@ MOD75_021E71BC: ; 0x021E71BC bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #6 add r1, r4, #0 bl FreeToHeapExplicit @@ -1611,7 +1611,7 @@ _021E784E: lsl r1, r1, #2 str r0, [r4, r1] add r0, r4, #4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x20 pop {r4, r5, r6, pc} nop @@ -1731,7 +1731,7 @@ _021E794C: bne _021E795C add r5, #0x14 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021E795C: pop {r3, r4, r5, r6, r7, pc} nop @@ -1962,7 +1962,7 @@ _021E7B12: bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 bl MOD75_021E8B70 add r0, r4, #0 @@ -2402,10 +2402,10 @@ MOD75_021E7E60: ; 0x021E7E60 mov r1, #0 bl FillWindowPixelBuffer add r0, r4, #4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 add r0, #0xf0 ldr r0, [r0] @@ -3045,7 +3045,7 @@ MOD75_021E8374: ; 0x021E8374 ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #4 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 bne _021E83B6 mov r0, #0 @@ -3089,7 +3089,7 @@ MOD75_021E83CC: ; 0x021E83CC ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #4 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 bne _021E840E mov r0, #0 @@ -3603,7 +3603,7 @@ MOD75_021E87B8: ; 0x021E87B8 ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #4 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 beq _021E87EE add sp, #8 @@ -4504,7 +4504,7 @@ _021E8ED2: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -4834,7 +4834,7 @@ _021E917A: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -5150,7 +5150,7 @@ _021E9402: _021E940E: add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -5507,7 +5507,7 @@ _021E96EC: bl FUN_0200D0E0 add r0, r5, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 mov r1, #1 bl MOD75_021EC090 @@ -5542,7 +5542,7 @@ _021E9730: bl MOD75_021E92BC add r4, #0x64 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xb pop {r4, pc} .align 2, 0 @@ -5577,7 +5577,7 @@ _021E9772: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -5613,7 +5613,7 @@ MOD75_021E97A8: ; 0x021E97A8 bl MOD75_021EB344 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -5638,7 +5638,7 @@ MOD75_021E97E4: ; 0x021E97E4 bl MOD75_021EB344 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -5807,7 +5807,7 @@ _021E9952: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -6258,7 +6258,7 @@ _021E9D00: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -6446,7 +6446,7 @@ _021E9EA2: bl FUN_0200D0E0 add r0, r5, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 mov r1, #1 bl MOD75_021EC090 @@ -6523,7 +6523,7 @@ _021E9F44: bl MOD75_021E92BC add r4, #0x64 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x16 pop {r4, pc} .align 2, 0 @@ -6567,7 +6567,7 @@ _021E9F96: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -6707,7 +6707,7 @@ MOD75_021EA0CC: ; 0x021EA0CC ldr r0, [r4] add r5, r1, #0 mov r1, #7 - bl FUN_02018878 + bl GetBgAffineRotation lsl r0, r0, #0x10 asr r0, r0, #0x10 add r0, r0, r5 @@ -7817,7 +7817,7 @@ _021EA936: bl MOD75_021EA880 add r4, #0x24 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r3, r4, r5, r6, r7, pc} nop _021EA94C: .word 0x00000429 @@ -7901,7 +7901,7 @@ _021EA9A8: bl BlitBitmapRectToWindow add r5, #0x54 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #6 add r1, r7, #0 bl FreeToHeapExplicit @@ -7990,7 +7990,7 @@ _021EAA4C: _021EAA8C: add r5, #0x54 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [sp, #0x18] mov r0, #6 bl FreeToHeapExplicit @@ -8981,7 +8981,7 @@ _021EB22E: bl MOD75_021EAB44 add r0, r5, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r1, r5, #0 add r1, #0xc4 ldr r1, [r1] @@ -9048,7 +9048,7 @@ _021EB298: ldr r0, [sp, #0x18] bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021EB31E: add r0, r5, #0 ldr r2, _021EB340 ; =0x000003F7 @@ -9058,7 +9058,7 @@ _021EB31E: bl FUN_0200CCA4 add r5, #0xb4 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -9095,7 +9095,7 @@ _021EB364: mov r1, #1 bl FUN_0200D0E0 add r0, r4, r6 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer _021EB37A: add r0, r5, #0 add r0, #0xb4 @@ -9103,7 +9103,7 @@ _021EB37A: bl FUN_0200CCF8 add r0, r5, #0 add r0, #0xb4 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x56 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9129,7 +9129,7 @@ _021EB37A: bl MOD75_021EAAE8 add r0, r5, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r1, #0 add r0, r5, #0 add r2, r1, #0 @@ -9181,7 +9181,7 @@ MOD75_021EB3D8: ; 0x021EB3D8 bl AddTextPrinterParameterized2 add r5, #0x14 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -9259,7 +9259,7 @@ MOD75_021EB454: ; 0x021EB454 bl AddTextPrinterParameterized add r5, #0x34 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -9320,7 +9320,7 @@ MOD75_021EB504: ; 0x021EB504 mov r3, #0x10 bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r6, #0 bl String_dtor add sp, #0xc @@ -9342,13 +9342,13 @@ MOD75_021EB580: ; 0x021EB580 bl FUN_0200CCF8 add r0, r4, #0 add r0, #0x34 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0 add r0, #0x94 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r4, #0x14 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} thumb_func_end MOD75_021EB580 @@ -9632,7 +9632,7 @@ _021EB722: sub r3, r5, r3 bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r6, #0 bl String_dtor add sp, #0xc @@ -9737,7 +9737,7 @@ _021EB866: sub r3, r5, r3 bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r6, #0 bl String_dtor add sp, #0xc @@ -9831,7 +9831,7 @@ MOD75_021EB8E8: ; 0x021EB8E8 sub r3, r5, r3 bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r3, r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 5fe58d1c..16cdc8de 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -50,7 +50,7 @@ MOD76_021D74E0: ; 0x021D74E0 str r1, [r4, r0] add r0, r4, #0 add r0, #0xc8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 bl MOD76_021D8CD4 ldr r0, _021D7564 ; =MOD76_021D76E8 @@ -192,7 +192,7 @@ MOD76_021D7638: ; 0x021D7638 and r0, r1 str r0, [r2] mov r0, #0x43 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] mov r0, #0 mov r1, #0x43 @@ -295,7 +295,7 @@ MOD76_021D7730: ; 0x021D7730 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D77D8 ; =0x021D8E88 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -310,10 +310,10 @@ MOD76_021D7730: ; 0x021D7730 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D77DC ; =0x021D8EC0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -328,10 +328,10 @@ MOD76_021D7730: ; 0x021D7730 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D77E0 ; =0x021D8EA4 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -346,10 +346,10 @@ MOD76_021D7730: ; 0x021D7730 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -373,13 +373,13 @@ MOD76_021D77E4: ; 0x021D77E4 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x43 add r1, r4, #0 bl FreeToHeapExplicit @@ -904,16 +904,16 @@ MOD76_021D7BE0: ; 0x021D7BE0 bl ScheduleSetBgPosText add r0, r5, #0 add r0, #0x18 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x68 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0xb8 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _021D7CC4 ; =0x0000FFFF cmp r4, r0 beq _021D7C2E @@ -935,34 +935,34 @@ _021D7C3A: bl ScheduleSetBgPosText add r0, r5, #0 add r0, #8 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x28 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x38 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x48 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x58 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0xa8 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x78 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x88 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x98 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x18 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _021D7CC4 ; =0x0000FFFF cmp r4, r0 beq _021D7CA6 @@ -1346,7 +1346,7 @@ _021D7F50: str r0, [r5, r1] add r5, #0xd8 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1549,43 +1549,43 @@ _021D80BE: bl FUN_0200C644 add r0, r5, #0 add r0, #0x28 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x38 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x48 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x58 - bl FUN_02019220 + bl ScheduleWindowCopyToVram b _021D817E _021D815E: add r0, r5, #0 add r0, #0x28 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x38 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x48 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x58 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer _021D817E: add r0, r5, #0 add r0, #0xa8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x78 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x88 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r5, #0x98 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #4 pop {r3, r4, r5, r6, pc} nop @@ -1643,7 +1643,7 @@ MOD76_021D81AC: ; 0x021D81AC bl MOD76_021D8300 add r0, r5, #0 add r0, #0x68 - bl FUN_02019220 + bl ScheduleWindowCopyToVram b _021D8232 _021D8222: add r0, r5, #0 @@ -1651,11 +1651,11 @@ _021D8222: bl MOD76_021D8300 add r0, r5, #0 add r0, #0x68 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer _021D8232: add r5, #0xb8 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -2182,7 +2182,7 @@ MOD76_021D862C: ; 0x021D862C bl MOD76_021D7CC8 add r0, r4, #0 add r0, #0xc8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [r4] add r0, r4, #0 ldrh r1, [r1, #0x10] @@ -2230,7 +2230,7 @@ MOD76_021D8688: ; 0x021D8688 bl MOD76_021D7CC8 add r0, r4, #0 add r0, #0xc8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [r4] add r0, r4, #0 ldrh r1, [r1, #0x10] diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 08b3b1da..697ffe65 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -76,7 +76,7 @@ _021D7540: lsr r0, r0, #0x18 bl FUN_0201B2EC ldr r0, [r5] - bl FUN_02016B94 + bl BgConfig_Alloc ldr r1, _021D75F4 ; =0x0000C010 str r0, [r5, r1] bl GX_BothDispOn @@ -876,7 +876,7 @@ MOD77_021D7C44: ; 0x021D7C44 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -1338,17 +1338,17 @@ MOD77_021D7FAC: ; 0x021D7FAC ldr r0, [r5, r0] mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, _021D8208 ; =0x0000C010 mov r1, #6 ldr r0, [r5, r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _021D8208 ; =0x0000C010 ldr r2, _021D8210 ; =0x021D8F98 ldr r0, [r5, r0] mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1446,17 +1446,17 @@ MOD77_021D7FAC: ; 0x021D7FAC ldr r0, [r5, r0] ldr r2, _021D820C ; =0x021D8F7C mov r1, #2 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, _021D8208 ; =0x0000C010 mov r1, #2 ldr r0, [r5, r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _021D8208 ; =0x0000C010 ldr r2, _021D8210 ; =0x021D8F98 ldr r0, [r5, r0] mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1625,19 +1625,19 @@ MOD77_021D8248: ; 0x021D8248 ldr r0, _021D8290 ; =0x0000C010 mov r1, #2 ldr r0, [r4, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _021D8290 ; =0x0000C010 mov r1, #6 ldr r0, [r4, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _021D8290 ; =0x0000C010 mov r1, #3 ldr r0, [r4, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _021D8290 ; =0x0000C010 mov r1, #7 ldr r0, [r4, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} nop _021D8288: .word 0x0000C034 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 02efb8e0..878b206a 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1401,7 +1401,7 @@ _0222DFE4: add r4, r0, #0 bl memset mov r0, #0x3e - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] ldr r0, _0222E10C ; =0x02237E24 add r2, sp, #0 @@ -1413,7 +1413,7 @@ _0222DFE4: ldmia r3!, {r0, r1} stmia r2!, {r0, r1} add r0, r7, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #0xb mov r1, #0x40 mov r2, #0x3e @@ -2631,7 +2631,7 @@ MOD80_0222EA04: ; 0x0222EA04 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0222EB00 ; =0x02236F04 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -2646,10 +2646,10 @@ MOD80_0222EA04: ; 0x0222EA04 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222EB04 ; =0x02236EE8 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -2664,7 +2664,7 @@ MOD80_0222EA04: ; 0x0222EA04 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0222EB08 ; =0x02236F20 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -2679,7 +2679,7 @@ MOD80_0222EA04: ; 0x0222EA04 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0222EB0C ; =0x02236F3C add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -2694,10 +2694,10 @@ MOD80_0222EA04: ; 0x0222EA04 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222EB10 ; =0x02236ECC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -2712,7 +2712,7 @@ MOD80_0222EA04: ; 0x0222EA04 add r0, r4, #0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -2745,19 +2745,19 @@ MOD80_0222EB14: ; 0x0222EB14 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_0222EB14 @@ -3550,7 +3550,7 @@ MOD80_0222F14C: ; 0x0222F14C bl FUN_0200D0E0 ldr r0, _0222F1B0 ; =0x00000FB8 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _0222F1B4 ; =0x00000D5C mov r1, #1 ldr r0, [r4, r0] @@ -3564,7 +3564,7 @@ _0222F18A: bl FUN_0200D0E0 ldr r0, _0222F1B0 ; =0x00000FB8 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r1, #0 add r0, r4, #0 add r2, r1, #0 @@ -3959,10 +3959,10 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222F56C ; =0x02236FAC add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -3977,7 +3977,7 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0222F570 ; =0x02236F90 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -3992,7 +3992,7 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0222F574 ; =0x02236F74 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -4007,10 +4007,10 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222F578 ; =0x02236F58 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -4025,7 +4025,7 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -4051,19 +4051,19 @@ MOD80_0222F57C: ; 0x0222F57C push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_0222F57C @@ -5286,10 +5286,10 @@ MOD80_0222FF6C: ; 0x0222FF6C str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02230024 ; =0x022370BC add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -5304,7 +5304,7 @@ MOD80_0222FF6C: ; 0x0222FF6C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02230028 ; =0x022370A0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -5319,10 +5319,10 @@ MOD80_0222FF6C: ; 0x0222FF6C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223002C ; =0x02237084 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -5337,7 +5337,7 @@ MOD80_0222FF6C: ; 0x0222FF6C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -5362,16 +5362,16 @@ MOD80_02230030: ; 0x02230030 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02230030 @@ -6279,10 +6279,10 @@ MOD80_02230760: ; 0x02230760 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223080C ; =0x022371EC add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -6297,10 +6297,10 @@ MOD80_02230760: ; 0x02230760 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02230810 ; =0x022371B4 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -6315,10 +6315,10 @@ MOD80_02230760: ; 0x02230760 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #0x20 mov r2, #0 @@ -6347,19 +6347,19 @@ MOD80_02230814: ; 0x02230814 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02230814 @@ -8642,7 +8642,7 @@ MOD80_02231AB0: ; 0x02231AB0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02231BB4 ; =0x02237288 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -8657,10 +8657,10 @@ MOD80_02231AB0: ; 0x02231AB0 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02231BB8 ; =0x022372A4 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -8675,7 +8675,7 @@ MOD80_02231AB0: ; 0x02231AB0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02231BBC ; =0x0223726C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -8690,10 +8690,10 @@ MOD80_02231AB0: ; 0x02231AB0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02231BC0 ; =0x02237234 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -8708,10 +8708,10 @@ MOD80_02231AB0: ; 0x02231AB0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02231BC4 ; =0x02237250 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -8726,7 +8726,7 @@ MOD80_02231AB0: ; 0x02231AB0 add r0, r4, #0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -8759,19 +8759,19 @@ MOD80_02231BC8: ; 0x02231BC8 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02231BC8 @@ -11706,10 +11706,10 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02233430 ; =0x0223743C add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -11724,7 +11724,7 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02233434 ; =0x02237458 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -11739,7 +11739,7 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02233438 ; =0x02237404 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -11754,10 +11754,10 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223343C ; =0x022373E8 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -11772,7 +11772,7 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -11798,19 +11798,19 @@ MOD80_02233440: ; 0x02233440 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02233440 @@ -14222,7 +14222,7 @@ MOD80_02234780: ; 0x02234780 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0223488C ; =0x02237544 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -14237,10 +14237,10 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02234890 ; =0x02237528 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -14255,10 +14255,10 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02234894 ; =0x0223757C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -14273,10 +14273,10 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02234898 ; =0x02237560 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -14291,10 +14291,10 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223489C ; =0x0223750C add r3, sp, #0 ldmia r5!, {r0, r1} @@ -14309,7 +14309,7 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -14342,19 +14342,19 @@ MOD80_022348A0: ; 0x022348A0 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_022348A0 @@ -17886,13 +17886,13 @@ MOD80_02236378: ; 0x02236378 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02236458 ; =0x0223761C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -17907,7 +17907,7 @@ MOD80_02236378: ; 0x02236378 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -17925,13 +17925,13 @@ MOD80_02236378: ; 0x02236378 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02236460 ; =0x02237600 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -17946,7 +17946,7 @@ MOD80_02236378: ; 0x02236378 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineBToggleLayers @@ -17977,16 +17977,16 @@ MOD80_02236464: ; 0x02236464 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02236464 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 102775cd..07e7ce6f 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -41,7 +41,7 @@ _02237E84: mov r0, #0 str r0, [r4, #4] mov r0, #0x39 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #8] mov r0, #0x19 lsl r0, r0, #4 @@ -944,7 +944,7 @@ MOD81_02238588: ; 0x02238588 mov r1, #2 str r0, [sp] ldr r0, [r4] - bl FUN_02017BD0 + bl SetBgAffine ldr r0, [r4, #0x1c] add r2, sp, #4 lsl r1, r0, #2 @@ -954,7 +954,7 @@ MOD81_02238588: ; 0x02238588 mov r1, #6 str r0, [sp] ldr r0, [r4] - bl FUN_02017BD0 + bl SetBgAffine add sp, #0x14 pop {r3, r4, pc} .align 2, 0 @@ -2059,13 +2059,13 @@ MOD81_02238D64: ; 0x02238D64 bl MOD81_0223890C ldr r0, [r4, #0x40] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x40] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x40] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0x44 bl RemoveWindow @@ -2158,22 +2158,22 @@ MOD81_02238E44: ; 0x02238E44 and r0, r1 strh r0, [r2] ldr r0, _0223904C ; =0x0223D00C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x40] ldr r2, _02239050 ; =0x0223D01C mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x40] ldr r2, _02239054 ; =0x0223D038 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x40] ldr r2, _02239054 ; =0x0223D038 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -2306,7 +2306,7 @@ MOD81_02238E44: ; 0x02238E44 bl GfGfxLoader_GXLoadPal ldr r0, [r4, #0x40] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD81_022392D8 mov r1, #0 @@ -2540,7 +2540,7 @@ _0223918A: bl AddTextPrinterParameterized add r0, r4, #0 add r0, #0x44 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0 str r0, [r4, #8] ldr r0, [r5] @@ -3641,21 +3641,21 @@ MOD81_022399FC: ; 0x022399FC and r0, r1 strh r0, [r2] ldr r0, _02239C84 ; =0x0223D084 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] ldr r2, _02239C88 ; =0x0223D0B4 mov r1, #2 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] ldr r2, _02239C88 ; =0x0223D0B4 mov r1, #6 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate bl OS_DisableInterrupts add r5, r0, #0 add r0, r4, #0 @@ -3664,14 +3664,14 @@ MOD81_022399FC: ; 0x022399FC ldr r2, _02239C8C ; =0x0223D0D0 mov r1, #3 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] ldr r2, _02239C8C ; =0x0223D0D0 mov r1, #7 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 bl OS_RestoreInterrupts mov r0, #0 @@ -3866,7 +3866,7 @@ _02239C02: mov r1, #6 mov r2, #3 mvn r3, r3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #7 mov r1, #0 bl ToggleBgLayer @@ -3882,7 +3882,7 @@ _02239C02: ldr r0, [r0] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 add r0, #0xc8 mov r1, #1 @@ -3938,21 +3938,21 @@ _02239CAA: add r0, #0xc0 ldr r0, [r0] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, #0xc0 ldr r0, [r4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_02239C94 @@ -4272,13 +4272,13 @@ MOD81_02239F58: ; 0x02239F58 mov r1, #2 mov r2, #3 mvn r3, r3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, #0xc0 ldr r0, [r4] mov r1, #6 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #3 mov r1, #0 bl ToggleBgLayer @@ -4493,7 +4493,7 @@ MOD81_0223A104: ; 0x0223A104 str r1, [r4, r0] ldr r0, [r4, r0] mov r1, #2 - bl FUN_02017B54 + bl Bg_GetYpos lsl r1, r0, #0xc mov r0, #0x56 lsl r0, r0, #2 @@ -4501,7 +4501,7 @@ MOD81_0223A104: ; 0x0223A104 sub r0, r0, #4 ldr r0, [r4, r0] mov r1, #6 - bl FUN_02017B54 + bl Bg_GetYpos mov r1, #0x57 lsl r0, r0, #0xc lsl r1, r1, #2 @@ -4564,7 +4564,7 @@ MOD81_0223A178: ; 0x0223A178 mov r1, #2 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r5, #0x55 lsl r5, r5, #2 add r3, r5, #0 @@ -4577,7 +4577,7 @@ MOD81_0223A178: ; 0x0223A178 sub r3, r6, r3 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0x59 lsl r1, r1, #2 mov r0, #2 @@ -5710,17 +5710,17 @@ MOD81_0223AA68: ; 0x0223AA68 and r0, r1 strh r0, [r2] ldr r0, _0223ABB8 ; =0x0223D11C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x24] ldr r2, _0223ABBC ; =0x0223D13C mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x24] ldr r2, _0223ABBC ; =0x0223D13C mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] bl MOD81_02238828 cmp r0, #3 @@ -5838,12 +5838,12 @@ _0223AAE8: ldr r0, [r4, #0x24] add r2, r1, #0 add r3, #0xfd - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x24] mov r1, #7 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -5866,10 +5866,10 @@ MOD81_0223ABC0: ; 0x0223ABC0 add r4, r0, #0 ldr r0, [r4, #0x24] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x24] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_0223ABC0 @@ -6491,13 +6491,13 @@ MOD81_0223B090: ; 0x0223B090 mov r1, #3 ldr r0, [r4, #0x24] add r2, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #3 add r3, r2, #0 ldr r0, [r4, #0x24] mov r1, #7 add r3, #0xfd - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x28] add r1, sp, #0 bl MOD81_02238C70 @@ -6732,32 +6732,32 @@ MOD81_0223B264: ; 0x0223B264 orr r0, r1 strh r0, [r2] ldr r0, _0223B464 ; =0x0223D188 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0xc] ldr r2, _0223B468 ; =0x0223D198 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223B468 ; =0x0223D198 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223B46C ; =0x0223D1B4 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223B470 ; =0x0223D1D0 mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223B470 ; =0x0223D1D0 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6923,13 +6923,13 @@ MOD81_0223B264: ; 0x0223B264 bl MOD81_022386BC ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r4, #0xc] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r4, #0xc] ldr r2, _0223B474 ; =0xFFFFFE80 mov r1, #0x50 @@ -6958,22 +6958,22 @@ MOD81_0223B478: ; 0x0223B478 add r4, r0, #0 ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_0223B478 @@ -6989,18 +6989,18 @@ MOD81_0223B4B0: ; 0x0223B4B0 mov r1, #2 mov r2, #3 and r3, r6 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 mov r1, #1 mov r2, #3 add r3, r4, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, #0xc0 add r0, r5, #0 mov r1, #5 mov r2, #3 add r3, r4, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, r5, r6, pc} nop _0223B4E4: .word 0x000001FF @@ -7219,17 +7219,17 @@ MOD81_0223B670: ; 0x0223B670 orr r0, r1 strh r0, [r2] ldr r0, _0223B7C8 ; =0x0223D21C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x24] ldr r2, _0223B7CC ; =0x0223D23C mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x24] ldr r2, _0223B7CC ; =0x0223D23C mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] bl MOD81_02238828 cmp r0, #3 @@ -7346,13 +7346,13 @@ _0223B6F0: ldr r0, [r4, #0x24] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #3 add r3, r2, #0 ldr r0, [r4, #0x24] mov r1, #7 add r3, #0xfd - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -7378,10 +7378,10 @@ MOD81_0223B7D0: ; 0x0223B7D0 add r4, r0, #0 ldr r0, [r4, #0x24] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x24] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_0223B7D0 @@ -8018,12 +8018,12 @@ _0223BCC6: ldr r0, [r4, #0x24] add r2, r1, #0 add r3, #0xfd - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x24] mov r1, #7 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x28] add r1, sp, #0 bl MOD81_02238C70 @@ -8381,29 +8381,29 @@ MOD81_0223BF74: ; 0x0223BF74 orr r0, r1 strh r0, [r2] ldr r0, _0223C194 ; =0x0223D294 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0xc] ldr r2, _0223C198 ; =0x0223D2B4 mov r1, #2 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223C198 ; =0x0223D2B4 mov r1, #6 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate bl OS_DisableInterrupts add r5, r0, #0 ldr r0, [r4, #0xc] ldr r2, _0223C19C ; =0x0223D2D0 mov r1, #3 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223C19C ; =0x0223D2D0 mov r1, #7 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 bl OS_RestoreInterrupts mov r0, #0 @@ -8579,18 +8579,18 @@ _0223C14A: ldr r3, _0223C1A4 ; =0xFFFFFE80 mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #3 add r3, r2, #0 ldr r0, [r4, #0xc] mov r1, #6 sub r3, #0xc3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 ldr r0, [r4, #0xc] add r2, r1, #0 mov r3, #0x43 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #7 mov r1, #0 bl ToggleBgLayer @@ -8624,16 +8624,16 @@ MOD81_0223C1A8: ; 0x0223C1A8 _0223C1B8: ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_0223C1A8 @@ -8828,13 +8828,13 @@ MOD81_0223C350: ; 0x0223C350 ldr r0, [r4, #4] mov r1, #2 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r3, [r4, #0x10] ldr r0, [r4, #4] mov r1, #6 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #8] sub r0, r0, #1 str r0, [r4, #8] @@ -8844,12 +8844,12 @@ _0223C390: mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] mov r1, #6 mov r2, #3 mov r3, #0xc0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 bl MOD81_0223C3B0 pop {r3, r4, r5, pc} @@ -9119,7 +9119,7 @@ MOD81_0223C580: ; 0x0223C580 _0223C5AC: ldr r0, [r4, #0x44] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0x48 bl RemoveWindow @@ -9215,17 +9215,17 @@ MOD81_0223C658: ; 0x0223C658 orr r0, r1 strh r0, [r2] ldr r0, _0223C810 ; =0x0223D32C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x44] ldr r2, _0223C814 ; =0x0223D33C mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x44] ldr r2, _0223C818 ; =0x0223D358 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -9292,7 +9292,7 @@ MOD81_0223C658: ; 0x0223C658 bl GfGfxLoader_GXLoadPal ldr r0, [r4, #0x44] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -9653,7 +9653,7 @@ _0223C9D0: bl AddTextPrinterParameterized add r0, r4, #0 add r0, #0x48 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0 str r0, [r4, #8] ldr r0, [r5] diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index a0dc6448..d67f1cb3 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -651,7 +651,7 @@ _0222DA48: add r4, r0, #0 bl memset mov r0, #0x44 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] ldr r0, _0222DB5C ; =0x0222FC0C add r2, sp, #0 @@ -663,7 +663,7 @@ _0222DA48: ldmia r3!, {r0, r1} stmia r2!, {r0, r1} add r0, r7, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #0xb mov r1, #0x20 mov r2, #0x44 @@ -1503,13 +1503,13 @@ MOD82_0222E15C: ; 0x0222E15C str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222E234 ; =0x0222F878 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -1524,7 +1524,7 @@ MOD82_0222E15C: ; 0x0222E15C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -1542,13 +1542,13 @@ MOD82_0222E15C: ; 0x0222E15C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222E23C ; =0x0222F85C add r3, sp, #0 ldmia r5!, {r0, r1} @@ -1563,7 +1563,7 @@ MOD82_0222E15C: ; 0x0222E15C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineBToggleLayers @@ -1591,16 +1591,16 @@ MOD82_0222E240: ; 0x0222E240 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD82_0222E240 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index a1aea99f..3f6affe6 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -354,7 +354,7 @@ _0222D832: bl FUN_0200CB00 ldr r0, [r4] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _0222D99C ; =0x00006B5A ldr r0, _0222D9A0 ; =0x05000042 strh r1, [r0] @@ -626,7 +626,7 @@ _0222DA5C: add r0, sp, #0x18 bl GX_SetBanks add r0, sp, #8 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0 str r1, [sp] mov r3, #0xf @@ -849,7 +849,7 @@ _0222DC2A: strh r1, [r0, r2] ldr r0, [r5] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r3, r4, r5, r6, r7, pc} nop _0222DC5C: .word 0x00004380 @@ -882,7 +882,7 @@ MOD83_0222DC60: ; 0x0222DC60 strh r1, [r0, r2] ldr r0, [r5] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, r5, r6, pc} nop _0222DC9C: .word 0x00004384 @@ -1648,7 +1648,7 @@ _0222E294: blo _0222E206 ldr r0, [r6] mov r1, #0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD83_0222E1F8 @@ -1833,7 +1833,7 @@ _0222E3EC: cmp r0, #0 beq _0222E3FE add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 bl RemoveWindow _0222E3FE: @@ -1844,13 +1844,13 @@ _0222E3FE: blo _0222E3EC ldr r0, [r7] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] bl FreeToHeap mov r0, #0 @@ -1928,7 +1928,7 @@ MOD83_0222E48C: ; 0x0222E48C add r4, r0, #0 bl memset mov r0, #0x51 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] mov r0, #0 add r1, r0, #0 @@ -2513,7 +2513,7 @@ _0222E960: add r0, sp, #0x20 bl GX_SetBanks add r0, sp, #0x10 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0 str r1, [sp] mov r3, #0xf @@ -2621,7 +2621,7 @@ _0222E960: bl BgTilemapRectChangePalette ldr r0, [r4, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD83_0222EA88 add sp, #0x48 @@ -2686,7 +2686,7 @@ MOD83_0222EA88: ; 0x0222EA88 bl BgTilemapRectChangePalette ldr r0, [r4, #4] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2999,35 +2999,35 @@ MOD83_0222ED88: ; 0x0222ED88 bne _0222EDD0 add r0, r4, #0 add r0, #0x18 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x18 bl RemoveWindow add r0, r4, #0 add r0, #0x28 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x28 bl RemoveWindow add r0, r4, #0 add r0, #0x38 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x38 bl RemoveWindow _0222EDD0: ldr r0, [r4, #4] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap pop {r4, pc} @@ -3045,7 +3045,7 @@ MOD83_0222EDF8: ; 0x0222EDF8 add r4, r0, #0 mov r0, #0x55 str r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] add r0, r5, #0 bl OverlayManager_GetField18 @@ -4620,7 +4620,7 @@ _0222FA62: _0222FA70: add r0, r7, #0 add r0, #0x18 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r7, #0 add r0, #0x18 bl RemoveWindow @@ -4631,7 +4631,7 @@ _0222FA70: beq _0222FA9C add r0, r7, #0 add r0, #0x58 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r7, #0 add r0, #0x58 bl RemoveWindow @@ -4645,7 +4645,7 @@ _0222FAA4: cmp r0, #0 beq _0222FAB6 add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 bl RemoveWindow _0222FAB6: @@ -4656,16 +4656,16 @@ _0222FAB6: blt _0222FAA4 ldr r0, [r7] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} @@ -5620,11 +5620,11 @@ MOD83_0223020C: ; 0x0223020C lsr r1, r1, #0x18 mov r2, ip mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 add r0, r7, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5644,7 +5644,7 @@ MOD83_02230258: ; 0x02230258 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0 mov r2, #0xf add r0, r4, #0 @@ -5731,7 +5731,7 @@ MOD83_022302B4: ; 0x022302B4 bl BgTilemapRectChangePalette add r0, r4, #0 mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -5791,7 +5791,7 @@ MOD83_02230330: ; 0x02230330 bl BgTilemapRectChangePalette add r0, r4, #0 mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD83_022302B4 add sp, #0x10 @@ -6267,13 +6267,13 @@ _02230768: _02230776: ldr r0, _022307AC ; =0x00002624 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _022307AC ; =0x00002624 add r0, r4, r0 bl RemoveWindow ldr r0, [r4] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _022307B0 ; =0x000005DC bl FUN_020054C8 add r0, r6, #0 @@ -6309,7 +6309,7 @@ _022307C8: bl GX_EngineAToggleLayers ldr r0, [r5] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x56 bl ScrStrBufs_new mov r1, #2 @@ -6515,7 +6515,7 @@ MOD83_02230954: ; 0x02230954 add r4, r0, #0 bl memset mov r0, #0x56 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] bl GX_DisableEngineALayers bl GX_DisableEngineBLayers @@ -8335,7 +8335,7 @@ MOD83_02231820: ; 0x02231820 bl BgTilemapRectChangePalette add r0, r4, #0 mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -8520,7 +8520,7 @@ MOD83_02231A00: ; 0x02231A00 mov r0, #0xae lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0xae lsl r0, r0, #6 add r0, r4, r0 @@ -8865,7 +8865,7 @@ _02231CC2: str r2, [r3, #4] ldr r6, [r5, r0] add r0, r7, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r7, #0 bl RemoveWindow add r1, r4, #1 @@ -9056,7 +9056,7 @@ _02231E2E: cmp r0, #0 beq _02231E50 add r0, r6, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r6, #0 bl RemoveWindow _02231E50: @@ -9393,7 +9393,7 @@ MOD83_022320D8: ; 0x022320D8 lsr r1, r1, #0x18 add r2, #0xc add r3, r6, #0 - bl FUN_02017DFC + bl BG_LoadScreenTilemapData add r0, r7, #0 bl FreeToHeap add sp, #8 @@ -9513,7 +9513,7 @@ _0223219C: ldr r0, _02232204 ; =0x0000299C mov r1, #3 ldr r0, [r5, r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -9736,7 +9736,7 @@ MOD83_022323A8: ; 0x022323A8 add r4, r0, #0 bl memset mov r0, #0x57 - bl FUN_02016B94 + bl BgConfig_Alloc ldr r1, _02232410 ; =0x0000299C str r0, [r4, r1] mov r0, #0x57 @@ -10584,7 +10584,7 @@ _02232A88: bl MOD83_022316D8 ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 bl RemoveWindow @@ -10626,7 +10626,7 @@ _02232AE2: bl MOD83_022316D8 ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 bl RemoveWindow @@ -11312,7 +11312,7 @@ _022330B6: cmp r0, #0 beq _022330CA add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 bl RemoveWindow _022330CA: @@ -11326,7 +11326,7 @@ _022330CA: cmp r1, #0 beq _022330EA add r0, r7, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _02233158 ; =0x00002B70 add r0, r7, r0 bl RemoveWindow @@ -11337,7 +11337,7 @@ _022330EA: cmp r1, #0 beq _02233104 add r0, r7, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0xae lsl r0, r0, #6 add r0, r7, r0 @@ -11346,19 +11346,19 @@ _02233104: ldr r0, _0223315C ; =0x0000299C mov r1, #0 ldr r0, [r7, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223315C ; =0x0000299C mov r1, #1 ldr r0, [r7, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223315C ; =0x0000299C mov r1, #2 ldr r0, [r7, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223315C ; =0x0000299C mov r1, #3 ldr r0, [r7, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223315C ; =0x0000299C ldr r0, [r7, r0] bl FreeToHeap @@ -11453,7 +11453,7 @@ MOD83_022331E0: ; 0x022331E0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _022332A4 ; =MOD83_0223A480 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -11468,10 +11468,10 @@ MOD83_022331E0: ; 0x022331E0 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022332A8 ; =MOD83_0223A4B8 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -11486,10 +11486,10 @@ MOD83_022331E0: ; 0x022331E0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022332AC ; =MOD83_0223A49C add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -11504,10 +11504,10 @@ MOD83_022331E0: ; 0x022331E0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022332B0 ; =MOD83_0223A464 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -11522,10 +11522,10 @@ MOD83_022331E0: ; 0x022331E0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x80 pop {r3, r4, r5, pc} nop @@ -17155,7 +17155,7 @@ _02235C2E: blt _02235C1E ldr r0, [r5, #0x20] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD83_02235BF4 @@ -17427,7 +17427,7 @@ MOD83_02235E68: ; 0x02235E68 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02235F2C ; =MOD83_0223A52C add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -17442,10 +17442,10 @@ MOD83_02235E68: ; 0x02235E68 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02235F30 ; =MOD83_0223A548 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -17460,10 +17460,10 @@ MOD83_02235E68: ; 0x02235E68 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02235F34 ; =MOD83_0223A564 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -17478,10 +17478,10 @@ MOD83_02235E68: ; 0x02235E68 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02235F38 ; =MOD83_0223A580 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -17496,10 +17496,10 @@ MOD83_02235E68: ; 0x02235E68 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x80 pop {r3, r4, r5, pc} nop @@ -17604,7 +17604,7 @@ MOD83_02235FBC: ; 0x02235FBC bl BgTilemapRectChangePalette ldr r0, [r4, #0x20] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -17862,7 +17862,7 @@ _02236148: bl BgTilemapRectChangePalette ldr r0, [r6, #0x20] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -17921,7 +17921,7 @@ MOD83_02236298: ; 0x02236298 mov r1, #0 bl FUN_0200D0E0 add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 bl RemoveWindow _022362B4: @@ -18097,16 +18097,16 @@ _022363E2: bl GX_SwapDisplay ldr r0, [r6, #0x20] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r6, #0x20] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r6, #0x20] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r6, #0x20] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r3, r4, r5, r6, r7, pc} nop _0223643C: .word 0x00000478 @@ -18519,7 +18519,7 @@ MOD83_02236764: ; 0x02236764 add r4, r0, #0 bl memset mov r0, #0x4e - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x20] mov r0, #0x4e bl FUN_02014590 @@ -22910,11 +22910,11 @@ _02238832: add r0, r7, #0 lsr r1, r1, #0x18 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 add r0, r7, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -24230,7 +24230,7 @@ MOD83_022391EC: ; 0x022391EC mov r1, #5 add r2, #0xc lsl r3, r3, #8 - bl FUN_02017DFC + bl BG_LoadScreenTilemapData ldr r0, [sp, #0x10] bl FreeToHeap mov r0, #0x20 @@ -24248,7 +24248,7 @@ MOD83_022391EC: ; 0x022391EC bl BgTilemapRectChangePalette add r0, r5, #0 mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _022392E0 ; =MOD83_022391CC ldr r0, _022392E4 ; =MOD83_0223CAB0 cmp r4, #0xb diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index 3c6bd557..ea18857a 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -562,7 +562,7 @@ MOD84_021D7968: ; 0x021D7968 sub sp, #0xc add r4, r0, #0 mov r0, #0x4b - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] ldr r0, _021D7A60 ; =0x021DA68C bl GX_SetBanks @@ -576,17 +576,17 @@ MOD84_021D7968: ; 0x021D7968 add r2, r0, #0 bl GX_SetGraphicsMode ldr r0, _021D7A6C ; =0x021DA650 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #4] ldr r2, _021D7A70 ; =0x021DA670 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D7A70 ; =0x021DA670 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -692,10 +692,10 @@ MOD84_021D7A84: ; 0x021D7A84 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap pop {r4, pc} diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s index 592a2056..d97e5a59 100644 --- a/arm9/modules/84/asm/module_84_thumb2.s +++ b/arm9/modules/84/asm/module_84_thumb2.s @@ -32,12 +32,12 @@ _021D817A: mov r1, #2 lsl r0, r0, #24 lsr r0, r0, #24 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r5, #20] mov r1, #3 lsl r0, r0, #24 lsr r0, r0, #24 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r5, #16] add r0, r0, #1 str r0, [r5, #16] @@ -850,7 +850,7 @@ MOD84_021D8784: ; 0x021D8784 cmp r0, #0 beq _021D8798 ldr r0, [r4, #0x24] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0 str r0, [r4, #0x18] _021D8798: @@ -862,7 +862,7 @@ _021D8798: lsr r1, r1, #0x18 mov r2, #3 lsr r3, r3, #0x18 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D8784 @@ -913,7 +913,7 @@ _021D87D0: ldr r2, [r5, #0x30] bl AddTextPrinterParameterized3 ldr r0, [r5, #0x24] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x18 pop {r3, r4, r5, pc} .align 2, 0 @@ -1041,12 +1041,12 @@ MOD84_021D88DC: ; 0x021D88DC mov r1, #2 mov r2, #0 add r3, r6, r7 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5, #4] mov r1, #6 mov r2, #0 add r3, r6, r7 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4] cmp r0, #0 beq _021D8914 @@ -1115,12 +1115,12 @@ _021D897C: ldr r2, _021D8A6C ; =0x021DAC70 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _021D8A6C ; =0x021DAC70 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1238,10 +1238,10 @@ MOD84_021D8A74: ; 0x021D8A74 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D8A74 @@ -1399,12 +1399,12 @@ _021D8B92: ldr r2, _021D8C38 ; =0x021DAC8C mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _021D8C38 ; =0x021DAC8C mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1486,10 +1486,10 @@ MOD84_021D8C3C: ; 0x021D8C3C add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D8C3C @@ -1739,12 +1739,12 @@ _021D8E26: ldr r2, _021D903C ; =0x021DACB8 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D903C ; =0x021DACB8 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -2052,10 +2052,10 @@ _021D90A2: _021D90AC: ldr r0, [r6, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r6, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [sp] bl OS_RestoreInterrupts pop {r3, r4, r5, r6, r7, pc} @@ -2558,12 +2558,12 @@ _021D949A: ldr r2, _021D9540 ; =0x021DACD4 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _021D9540 ; =0x021DACD4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2645,10 +2645,10 @@ MOD84_021D9544: ; 0x021D9544 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D9544 @@ -2730,22 +2730,22 @@ MOD84_021D95CC: ; 0x021D95CC mov r1, #2 mov r2, #0 add r3, r6, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] mov r1, #6 mov r2, #0 add r3, r6, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] mov r1, #3 mov r2, #0 add r3, r6, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] mov r1, #7 mov r2, #0 add r3, r6, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x50] cmp r0, #0 beq _021D9632 @@ -3018,22 +3018,22 @@ _021D9832: ldr r2, _021D99FC ; =0x021DACF0 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D9A00 ; =0x021DAD0C mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D99FC ; =0x021DACF0 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D9A00 ; =0x021DAD0C mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3264,16 +3264,16 @@ _021D9A26: _021D9A30: ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D9A04 @@ -3431,12 +3431,12 @@ _021D9B5A: ldr r2, _021D9C00 ; =0x021DAD28 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _021D9C00 ; =0x021DAD28 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -3518,10 +3518,10 @@ MOD84_021D9C04: ; 0x021D9C04 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D9C04 @@ -4105,22 +4105,22 @@ _021DA0AA: ldr r2, _021DA30C ; =0x021DAD68 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021DA310 ; =0x021DAD4C mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021DA30C ; =0x021DAD68 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021DA310 ; =0x021DAD4C mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4437,16 +4437,16 @@ _021DA35C: _021DA366: ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD84_021DA31C diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index dbf3de15..eab7a6cf 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -263,7 +263,7 @@ MOD85_021D76FC: ; 0x021D76FC push {r3, r4, r5, r6, r7, lr} add r4, r0, #0 mov r0, #0x4f - bl FUN_02016B94 + bl BgConfig_Alloc ldr r1, _021D77CC ; =0x0000043C str r0, [r4, r1] bl MOD85_021D77F8 @@ -408,7 +408,7 @@ MOD85_021D7818: ; 0x021D7818 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D78F4 ; =0x021DED28 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -423,10 +423,10 @@ MOD85_021D7818: ; 0x021D7818 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 @@ -446,10 +446,10 @@ MOD85_021D7818: ; 0x021D7818 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D78FC ; =0x021DED60 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -464,10 +464,10 @@ MOD85_021D7818: ; 0x021D7818 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7900 ; =0x021DED0C add r3, sp, #0 ldmia r5!, {r0, r1} @@ -482,10 +482,10 @@ MOD85_021D7818: ; 0x021D7818 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x80 pop {r3, r4, r5, pc} .align 2, 0 @@ -502,16 +502,16 @@ MOD85_021D7904: ; 0x021D7904 push {r4, lr} add r4, r0, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -619,11 +619,11 @@ MOD85_021D797C: ; 0x021D797C ldr r3, [r3, #8] mov r1, #1 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData ldr r0, _021D7B24 ; =0x0000043C mov r1, #1 ldr r0, [r4, r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -664,11 +664,11 @@ MOD85_021D797C: ; 0x021D797C ldr r3, [r3, #8] mov r1, #2 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData ldr r0, _021D7B24 ; =0x0000043C mov r1, #2 ldr r0, [r4, r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -727,11 +727,11 @@ MOD85_021D797C: ; 0x021D797C ldr r3, [r3, #8] mov r1, #7 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData ldr r0, _021D7B24 ; =0x0000043C mov r1, #7 ldr r0, [r4, r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl FreeToHeap pop {r3, r4, r5, pc} @@ -815,7 +815,7 @@ MOD85_021D7BB8: ; 0x021D7BB8 add r6, r4, #0 add r6, #8 add r0, r6, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r6, #0 bl RemoveWindow ldr r0, _021D7BE8 ; =0x00000408 @@ -865,7 +865,7 @@ MOD85_021D7BEC: ; 0x021D7BEC bl AddTextPrinterParameterized add r4, #8 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r3, r4, r5, r6, pc} nop @@ -887,7 +887,7 @@ MOD85_021D7C44: ; 0x021D7C44 bl FillWindowPixelBuffer add r0, r5, r4 add r0, #8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r3, r4, r5, pc} .align 2, 0 _021D7C68: .word 0x00000408 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 46f77b31..17607453 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -264,7 +264,7 @@ _021D76F8: add r0, sp, #0x2c bl GX_SetBanks ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x1c ldr r5, _021D7850 ; =0x021D7C90 str r0, [r4, #0x10] @@ -274,7 +274,7 @@ _021D76F8: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7854 ; =0x021D7CA0 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -297,10 +297,10 @@ _021D76F8: strb r3, [r0, #0x10] ldr r0, [r4, #0x10] add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #2 add r0, sp, #0 strb r2, [r0, #0x12] @@ -312,10 +312,10 @@ _021D76F8: mov r1, #1 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #4 add r0, sp, #0 strb r1, [r0, #0x12] @@ -328,10 +328,10 @@ _021D76F8: mov r1, #3 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #4 mov r3, #0 add r0, sp, #0 @@ -343,10 +343,10 @@ _021D76F8: strb r2, [r0, #0x10] ldr r0, [r4, #0x10] add r2, sp, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #2 add r0, sp, #0 strb r2, [r0, #0x12] @@ -358,10 +358,10 @@ _021D76F8: mov r1, #5 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #4 add r0, sp, #0 strb r1, [r0, #0x12] @@ -374,10 +374,10 @@ _021D76F8: mov r1, #7 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 add r1, r0, #0 bl ToggleBgLayer @@ -440,22 +440,22 @@ MOD86_021D7858: ; 0x021D7858 bl ToggleBgLayer ldr r0, [r4, #0x10] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] bl FreeToHeap pop {r4, pc} @@ -565,27 +565,27 @@ MOD86_021D7990: ; 0x021D7990 ldr r0, [r4, #0x10] mov r1, #1 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x3c ldrsh r3, [r4, r3] ldr r0, [r4, #0x10] mov r1, #5 mov r2, #3 add r3, #0xc0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x3c ldrsh r3, [r4, r3] ldr r0, [r4, #0x10] mov r1, #0 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x3c ldrsh r3, [r4, r3] ldr r0, [r4, #0x10] mov r1, #4 mov r2, #3 add r3, #0xc0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} .align 2, 0 thumb_func_end MOD86_021D7990 @@ -704,7 +704,7 @@ _021D7A06: bl BgTilemapRectChangePalette ldr r0, [r5, #0x10] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -748,7 +748,7 @@ _021D7A06: bl BgTilemapRectChangePalette ldr r0, [r5, #0x10] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 str r0, [sp] str r0, [sp, #4] diff --git a/arm9/src/unk_02016B94.c b/arm9/src/bg_window.c index 5da8dd32..23763d76 100644 --- a/arm9/src/unk_02016B94.c +++ b/arm9/src/bg_window.c @@ -1,35 +1,35 @@ #include "global.h" -#include "unk_02016B94.h" +#include "bg_window.h" #include "GX_layers.h" #include "game_init.h" #include "gx.h" #include "heap.h" -const u8 UNK_020EDB30[] = { - 0x10, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, +const u8 sTilemapWidthByBufferSize[] = { + [GF_BG_SCR_SIZE_128x128] = 0x10, + [GF_BG_SCR_SIZE_256x256] = 0x20, + [GF_BG_SCR_SIZE_256x512] = 0x20, + [GF_BG_SCR_SIZE_512x256] = 0x20, + [GF_BG_SCR_SIZE_512x512] = 0x20, + [GF_BG_SCR_SIZE_1024x1024] = 0x20, }; -void (*const UNK_020EDB5C[])(struct Window *) = { - FUN_020194C8, - FUN_0201951C, - FUN_020194C8, +void (*const sScheduleWindowCopyToVramFuncs[])(struct Window *) = { + ScheduleWindowCopyToVram_TextMode, + ScheduleWindowCopyToVram_AffineMode, + ScheduleWindowCopyToVram_TextMode, }; -void (*const UNK_020EDB50[])(struct Window *) = { - FUN_020195A8, - FUN_020195E4, - FUN_020195A8, +void (*const sClearWindowTilemapAndCopyToVramFuncs[])(struct Window *) = { + ClearWindowTilemapAndCopyToVram_TextMode, + ClearWindowTilemapAndCopyToVram_AffineMode, + ClearWindowTilemapAndCopyToVram_TextMode, }; -void (*const UNK_020EDB44[])(struct Window *) = { - FUN_020195D0, - FUN_0201960C, - FUN_020195D0, +void (*const sClearWindowTilemapAndScheduleTransferFuncs[])(struct Window *) = { + ClearWindowTilemapAndScheduleTransfer_TextMode, + ClearWindowTilemapAndScheduleTransfer_AffineMode, + ClearWindowTilemapAndScheduleTransfer_TextMode, }; void (*const sPutWindowTilemapFuncs[])(struct Window *) = { @@ -44,13 +44,13 @@ void (*const sCopyWindowToVramFuncs[])(struct Window *) = { CopyWindowToVram_TextMode, }; -void (*const UNK_020EDB74[])(struct Window *) = { +void (*const sClearWindowTilemapFuncs[])(struct Window *) = { ClearWindowTilemapText, ClearWindowTilemapAffine, ClearWindowTilemapText, }; -THUMB_FUNC struct BgConfig *FUN_02016B94(u32 heap_id) +THUMB_FUNC struct BgConfig *BgConfig_Alloc(u32 heap_id) { struct BgConfig *ptr = AllocFromHeap(heap_id, sizeof(struct BgConfig)); memset(ptr, 0, sizeof(struct BgConfig)); @@ -61,12 +61,12 @@ THUMB_FUNC struct BgConfig *FUN_02016B94(u32 heap_id) return ptr; } -THUMB_FUNC u32 FUN_02016BB8(u32 *param0) +THUMB_FUNC u32 BgConfig_GetHeapId(struct BgConfig *bgConfig) { - return *param0; + return bgConfig->heap_id; } -THUMB_FUNC void FUN_02016BBC(const struct GraphicsModes *modes) +THUMB_FUNC void SetBothScreensModesAndDisable(const struct GraphicsModes *modes) { GX_SetGraphicsMode(modes->dispMode, modes->bgMode, modes->_2d3dMode); GXS_SetGraphicsMode(modes->subMode); @@ -77,52 +77,52 @@ THUMB_FUNC void FUN_02016BBC(const struct GraphicsModes *modes) GX_DisableEngineBLayers(); } -THUMB_FUNC void FUN_02016BF4(const struct GraphicsModes *param0, u32 param1) +THUMB_FUNC void SetScreenModeAndDisable(const struct GraphicsModes *gfxModes, u32 whichScreen) { - if (param1 == 0) + if (whichScreen == 0) { - GX_SetGraphicsMode(param0->dispMode, param0->bgMode, param0->_2d3dMode); + GX_SetGraphicsMode(gfxModes->dispMode, gfxModes->bgMode, gfxModes->_2d3dMode); GX_DisableEngineALayers(); } else { - GXS_SetGraphicsMode(param0->subMode); + GXS_SetGraphicsMode(gfxModes->subMode); GX_DisableEngineBLayers(); } } -THUMB_FUNC void FUN_02016C18( - struct BgConfig *param0, u8 param1, const struct BgTemplate *template, u8 bgMode) +THUMB_FUNC void InitBgFromTemplate( + struct BgConfig *bgConfig, u8 bgId, const struct BgTemplate *template, u8 bgMode) { - u8 screenSize = FUN_020177DC(template->unk10, bgMode); - switch (param1) + u8 screenSize = TranslateGFBgModePairToGXScreenSize(template->size, bgMode); + switch (bgId) { - case 0: - GX_EngineAToggleLayers(1, GX_LAYER_TOGGLE_ON); + case GF_BG_LYR_MAIN_0: + GX_EngineAToggleLayers(GF_BG_LYR_MAIN_0_F, GX_LAYER_TOGGLE_ON); G2_SetBG0Control(screenSize, template->colorMode, template->screenBase, template->charBase, template->bgExtPltt); G2_SetBG0Priority(template->priority); G2_BG0Mosaic(template->mosaic); break; - case 1: - GX_EngineAToggleLayers(2, GX_LAYER_TOGGLE_ON); + case GF_BG_LYR_MAIN_1: + GX_EngineAToggleLayers(GF_BG_LYR_MAIN_1_F, GX_LAYER_TOGGLE_ON); G2_SetBG1Control(screenSize, template->colorMode, template->screenBase, template->charBase, template->bgExtPltt); G2_SetBG1Priority(template->priority); G2_BG1Mosaic(template->mosaic); break; - case 2: - GX_EngineAToggleLayers(4, GX_LAYER_TOGGLE_ON); + case GF_BG_LYR_MAIN_2: + GX_EngineAToggleLayers(GF_BG_LYR_MAIN_2_F, GX_LAYER_TOGGLE_ON); switch (bgMode) { default: - case 0: + case GF_BG_TYPE_TEXT: G2_SetBG2ControlText(screenSize, template->colorMode, template->screenBase, template->charBase); break; - case 1: + case GF_BG_TYPE_AFFINE: G2_SetBG2ControlAffine(screenSize, template->areaOver, template->screenBase, template->charBase); break; - case 2: + case GF_BG_TYPE_256x16PLTT: G2_SetBG2Control256x16Pltt(screenSize, template->areaOver, template->screenBase, template->charBase); break; } @@ -130,18 +130,18 @@ THUMB_FUNC void FUN_02016C18( G2_BG2Mosaic(template->mosaic); break; - case 3: - GX_EngineAToggleLayers(8, GX_LAYER_TOGGLE_ON); + case GF_BG_LYR_MAIN_3: + GX_EngineAToggleLayers(GF_BG_LYR_MAIN_3_F, GX_LAYER_TOGGLE_ON); switch (bgMode) { default: - case 0: + case GF_BG_TYPE_TEXT: G2_SetBG3ControlText(screenSize, template->colorMode, template->screenBase, template->charBase); break; - case 1: + case GF_BG_TYPE_AFFINE: G2_SetBG3ControlAffine(screenSize, template->areaOver, template->screenBase, template->charBase); break; - case 2: + case GF_BG_TYPE_256x16PLTT: G2_SetBG3Control256x16Pltt(screenSize, template->areaOver, template->screenBase, template->charBase); break; } @@ -149,32 +149,32 @@ THUMB_FUNC void FUN_02016C18( G2_BG3Mosaic(template->mosaic); break; - case 4: - GX_EngineBToggleLayers(1, GX_LAYER_TOGGLE_ON); + case GF_BG_LYR_SUB_0: + GX_EngineBToggleLayers(GF_BG_LYR_SUB_0_F, GX_LAYER_TOGGLE_ON); G2S_SetBG0Control(screenSize, template->colorMode, template->screenBase, template->charBase, template->bgExtPltt); G2S_SetBG0Priority(template->priority); G2S_BG0Mosaic(template->mosaic); break; - case 5: - GX_EngineBToggleLayers(2, GX_LAYER_TOGGLE_ON); + case GF_BG_LYR_SUB_1: + GX_EngineBToggleLayers(GF_BG_LYR_SUB_1_F, GX_LAYER_TOGGLE_ON); G2S_SetBG1Control(screenSize, template->colorMode, template->screenBase, template->charBase, template->bgExtPltt); G2S_SetBG1Priority(template->priority); G2S_BG1Mosaic(template->mosaic); break; - case 6: - GX_EngineBToggleLayers(4, GX_LAYER_TOGGLE_ON); + case GF_BG_LYR_SUB_2: + GX_EngineBToggleLayers(GF_BG_LYR_SUB_2_F, GX_LAYER_TOGGLE_ON); switch (bgMode) { default: - case 0: + case GF_BG_TYPE_TEXT: G2S_SetBG2ControlText(screenSize, template->colorMode, template->screenBase, template->charBase); break; - case 1: + case GF_BG_TYPE_AFFINE: G2S_SetBG2ControlAffine(screenSize, template->areaOver, template->screenBase, template->charBase); break; - case 2: + case GF_BG_TYPE_256x16PLTT: G2S_SetBG2Control256x16Pltt(screenSize, template->areaOver, template->screenBase, template->charBase); break; } @@ -182,18 +182,18 @@ THUMB_FUNC void FUN_02016C18( G2S_BG2Mosaic(template->mosaic); break; - case 7: - GX_EngineBToggleLayers(8, GX_LAYER_TOGGLE_ON); + case GF_BG_LYR_SUB_3: + GX_EngineBToggleLayers(GF_BG_LYR_SUB_3_F, GX_LAYER_TOGGLE_ON); switch (bgMode) { default: - case 0: + case GF_BG_TYPE_TEXT: G2S_SetBG3ControlText(screenSize, template->colorMode, template->screenBase, template->charBase); break; - case 1: + case GF_BG_TYPE_AFFINE: G2S_SetBG3ControlAffine(screenSize, template->areaOver, template->screenBase, template->charBase); break; - case 2: + case GF_BG_TYPE_256x16PLTT: G2S_SetBG3Control256x16Pltt(screenSize, template->areaOver, template->screenBase, template->charBase); break; } @@ -202,104 +202,104 @@ THUMB_FUNC void FUN_02016C18( break; } - param0->bgs[param1].rotation = 0; - param0->bgs[param1].xScale = FX32_ONE; - param0->bgs[param1].yScale = FX32_ONE; - param0->bgs[param1].centerX = 0; - param0->bgs[param1].centerY = 0; + bgConfig->bgs[bgId].rotation = 0; + bgConfig->bgs[bgId].xScale = FX32_ONE; + bgConfig->bgs[bgId].yScale = FX32_ONE; + bgConfig->bgs[bgId].centerX = 0; + bgConfig->bgs[bgId].centerY = 0; if (template->bufferSize != 0) { - param0->bgs[param1].tilemapBuffer = AllocFromHeap(param0->heap_id, template->bufferSize); + bgConfig->bgs[bgId].tilemapBuffer = AllocFromHeap(bgConfig->heap_id, template->bufferSize); - MI_CpuClear16(param0->bgs[param1].tilemapBuffer, template->bufferSize); + MI_CpuClear16(bgConfig->bgs[bgId].tilemapBuffer, template->bufferSize); - param0->bgs[param1].bufferSize = template->bufferSize; - param0->bgs[param1].unk10 = template->unk0c; + bgConfig->bgs[bgId].bufferSize = template->bufferSize; + bgConfig->bgs[bgId].baseTile = template->unk0c; } else { - param0->bgs[param1].tilemapBuffer = NULL; - param0->bgs[param1].bufferSize = 0; - param0->bgs[param1].unk10 = 0; + bgConfig->bgs[bgId].tilemapBuffer = NULL; + bgConfig->bgs[bgId].bufferSize = 0; + bgConfig->bgs[bgId].baseTile = 0; } - param0->bgs[param1].size = template->unk10; - param0->bgs[param1].mode = bgMode; - param0->bgs[param1].colorMode = template->colorMode; + bgConfig->bgs[bgId].size = template->size; + bgConfig->bgs[bgId].mode = bgMode; + bgConfig->bgs[bgId].colorMode = template->colorMode; - if (bgMode == 0 && template->colorMode == 0) + if (bgMode == GF_BG_TYPE_TEXT && template->colorMode == 0) { - param0->bgs[param1].tileSize = 0x20; + bgConfig->bgs[bgId].tileSize = 0x20; } else { - param0->bgs[param1].tileSize = 0x40; + bgConfig->bgs[bgId].tileSize = 0x40; } - FUN_020179E0(param0, param1, 0, template->unk00); - FUN_020179E0(param0, param1, 3, template->unk04); + BgSetPosTextAndCommit(bgConfig, bgId, BG_POS_OP_SET_X, template->unk00); + BgSetPosTextAndCommit(bgConfig, bgId, BG_POS_OP_SET_Y, template->unk04); } -THUMB_FUNC void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 value) +THUMB_FUNC void SetBgControlParam(struct BgConfig *config, u8 bgId, u32 attr, u8 value) { - if (attr == 0) + if (attr == GF_BG_CNT_SET_COLOR_MODE) { config->bgs[bgId].colorMode = value; } switch (bgId) { - case 0: + case GF_BG_LYR_MAIN_0: GXBg01Control bg0cnt = G2_GetBG0Control(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg0cnt.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg0cnt.charBase = value; } G2_SetBG0Control(bg0cnt.screenSize, config->bgs[bgId].colorMode, bg0cnt.screenBase, bg0cnt.charBase, bg0cnt.bgExtPltt); break; - case 1: + case GF_BG_LYR_MAIN_1: GXBg01Control bg1cnt = G2_GetBG1Control(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg1cnt.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg1cnt.charBase = value; } G2_SetBG1Control(bg1cnt.screenSize, config->bgs[bgId].colorMode, bg1cnt.screenBase, bg1cnt.charBase, bg1cnt.bgExtPltt); break; - case 2: + case GF_BG_LYR_MAIN_2: switch (config->bgs[bgId].mode) { default: - case 0: + case GF_BG_TYPE_TEXT: GXBg23ControlText bg2cnt_tx = G2_GetBG2ControlText(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg2cnt_tx.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg2cnt_tx.charBase = value; } G2_SetBG2ControlText(bg2cnt_tx.screenSize, config->bgs[bgId].colorMode, bg2cnt_tx.screenBase, bg2cnt_tx.charBase); break; - case 1: + case GF_BG_TYPE_AFFINE: GXBg23ControlAffine bg2cnt_aff = G2_GetBG2ControlAffine(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg2cnt_aff.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg2cnt_aff.charBase = value; } @@ -307,13 +307,13 @@ THUMB_FUNC void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 valu G2_SetBG2ControlAffine(bg2cnt_aff.screenSize, bg2cnt_aff.areaOver, bg2cnt_aff.screenBase, bg2cnt_aff.charBase); break; - case 2: + case GF_BG_TYPE_256x16PLTT: GXBg23Control256x16Pltt bg2cnt_256x16pltt = G2_GetBG2Control256x16Pltt(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg2cnt_256x16pltt.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg2cnt_256x16pltt.charBase = value; } @@ -323,30 +323,30 @@ THUMB_FUNC void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 valu break; } break; - case 3: + case GF_BG_LYR_MAIN_3: switch (config->bgs[bgId].mode) { default: - case 0: + case GF_BG_TYPE_TEXT: GXBg23ControlText bg3cnt_tx = G2_GetBG3ControlText(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg3cnt_tx.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg3cnt_tx.charBase = value; } G2_SetBG3ControlText(bg3cnt_tx.screenSize, config->bgs[bgId].colorMode, bg3cnt_tx.screenBase, bg3cnt_tx.charBase); break; - case 1: + case GF_BG_TYPE_AFFINE: GXBg23ControlAffine bg3cnt_aff = G2_GetBG3ControlAffine(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg3cnt_aff.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg3cnt_aff.charBase = value; } @@ -354,13 +354,13 @@ THUMB_FUNC void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 valu G2_SetBG3ControlAffine(bg3cnt_aff.screenSize, bg3cnt_aff.areaOver, bg3cnt_aff.screenBase, bg3cnt_aff.charBase); break; - case 2: + case GF_BG_TYPE_256x16PLTT: GXBg23Control256x16Pltt bg3cnt_256x16pltt = G2_GetBG3Control256x16Pltt(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg3cnt_256x16pltt.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg3cnt_256x16pltt.charBase = value; } @@ -370,56 +370,56 @@ THUMB_FUNC void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 valu break; } break; - case 4: + case GF_BG_LYR_SUB_0: GXBg01Control bg0cntsub = G2S_GetBG0Control(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg0cntsub.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg0cntsub.charBase = value; } G2S_SetBG0Control(bg0cntsub.screenSize, config->bgs[bgId].colorMode, bg0cntsub.screenBase, bg0cntsub.charBase, bg0cntsub.bgExtPltt); break; - case 5: + case GF_BG_LYR_SUB_1: GXBg01Control bg1cntsub = G2S_GetBG1Control(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg1cntsub.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg1cntsub.charBase = value; } G2S_SetBG1Control(bg1cntsub.screenSize, config->bgs[bgId].colorMode, bg1cntsub.screenBase, bg1cntsub.charBase, bg1cntsub.bgExtPltt); break; - case 6: + case GF_BG_LYR_SUB_2: switch (config->bgs[bgId].mode) { default: - case 0: + case GF_BG_TYPE_TEXT: GXBg23ControlText bg2cntsub_tx = G2S_GetBG2ControlText(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg2cntsub_tx.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg2cntsub_tx.charBase = value; } G2S_SetBG2ControlText(bg2cntsub_tx.screenSize, config->bgs[bgId].colorMode, bg2cntsub_tx.screenBase, bg2cntsub_tx.charBase); break; - case 1: + case GF_BG_TYPE_AFFINE: GXBg23ControlAffine bg2cntsub_aff = G2S_GetBG2ControlAffine(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg2cntsub_aff.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg2cntsub_aff.charBase = value; } @@ -427,13 +427,13 @@ THUMB_FUNC void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 valu G2S_SetBG2ControlAffine(bg2cntsub_aff.screenSize, bg2cntsub_aff.areaOver, bg2cntsub_aff.screenBase, bg2cntsub_aff.charBase); break; - case 2: + case GF_BG_TYPE_256x16PLTT: GXBg23Control256x16Pltt bg2cntsub_256x16pltt = G2S_GetBG2Control256x16Pltt(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg2cntsub_256x16pltt.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg2cntsub_256x16pltt.charBase = value; } @@ -443,30 +443,30 @@ THUMB_FUNC void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 valu break; } break; - case 7: + case GF_BG_LYR_SUB_3: switch (config->bgs[bgId].mode) { default: - case 0: + case GF_BG_TYPE_TEXT: GXBg23ControlText bg3cntsub_tx = G2S_GetBG3ControlText(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg3cntsub_tx.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg3cntsub_tx.charBase = value; } G2S_SetBG3ControlText(bg3cntsub_tx.screenSize, config->bgs[bgId].colorMode, bg3cntsub_tx.screenBase, bg3cntsub_tx.charBase); break; - case 1: + case GF_BG_TYPE_AFFINE: GXBg23ControlAffine bg3cntsub_aff = G2S_GetBG3ControlAffine(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg3cntsub_aff.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg3cntsub_aff.charBase = value; } @@ -474,13 +474,13 @@ THUMB_FUNC void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 valu G2S_SetBG3ControlAffine(bg3cntsub_aff.screenSize, bg3cntsub_aff.areaOver, bg3cntsub_aff.screenBase, bg3cntsub_aff.charBase); break; - case 2: + case GF_BG_TYPE_256x16PLTT: GXBg23Control256x16Pltt bg3cntsub_256x16pltt = G2S_GetBG3Control256x16Pltt(); - if (attr == 1) + if (attr == GF_BG_CNT_SET_SCREEN_BASE) { bg3cntsub_256x16pltt.screenBase = value; } - else if (attr == 2) + else if (attr == GF_BG_CNT_SET_CHAR_BASE) { bg3cntsub_256x16pltt.charBase = value; } @@ -493,106 +493,106 @@ THUMB_FUNC void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 valu } } -THUMB_FUNC u8 FUN_020177DC(u8 param0, u32 param1) +THUMB_FUNC u8 TranslateGFBgModePairToGXScreenSize(u8 size, u32 bgMode) { - switch (param1) + switch (bgMode) { - case 0: + case GF_BG_TYPE_TEXT: - if (param0 == 1) + if (size == GF_BG_SCR_SIZE_256x256) { return GX_BG_SCRSIZE_TEXT_256x256; } - else if (param0 == 2) + else if (size == GF_BG_SCR_SIZE_256x512) { return GX_BG_SCRSIZE_TEXT_256x512; } - else if (param0 == 3) + else if (size == GF_BG_SCR_SIZE_512x256) { return GX_BG_SCRSIZE_TEXT_512x256; } - else if (param0 == 4) + else if (size == GF_BG_SCR_SIZE_512x512) { return GX_BG_SCRSIZE_TEXT_512x512; } break; - case 1: + case GF_BG_TYPE_AFFINE: - if (param0 == 0) + if (size == GF_BG_SCR_SIZE_128x128) { - return GX_BG_SCRSIZE_TEXT_256x256; + return GX_BG_SCRSIZE_AFFINE_128x128; } - else if (param0 == 1) + else if (size == GF_BG_SCR_SIZE_256x256) { - return GX_BG_SCRSIZE_TEXT_512x256; + return GX_BG_SCRSIZE_AFFINE_256x256; } - else if (param0 == 4) + else if (size == GF_BG_SCR_SIZE_512x512) { - return GX_BG_SCRSIZE_TEXT_256x512; + return GX_BG_SCRSIZE_AFFINE_512x512; } - else if (param0 == 5) + else if (size == GF_BG_SCR_SIZE_1024x1024) { - return GX_BG_SCRSIZE_TEXT_512x512; + return GX_BG_SCRSIZE_AFFINE_1024x1024; } break; - case 2: + case GF_BG_TYPE_256x16PLTT: - if (param0 == 0) + if (size == GF_BG_SCR_SIZE_128x128) { - return GX_BG_SCRSIZE_TEXT_256x256; + return GX_BG_SCRSIZE_256x16PLTT_128x128; } - else if (param0 == 1) + else if (size == GF_BG_SCR_SIZE_256x256) { - return GX_BG_SCRSIZE_TEXT_512x256; + return GX_BG_SCRSIZE_256x16PLTT_256x256; } - else if (param0 == 4) + else if (size == GF_BG_SCR_SIZE_512x512) { - return GX_BG_SCRSIZE_TEXT_256x512; + return GX_BG_SCRSIZE_256x16PLTT_512x512; } - else if (param0 == 5) + else if (size == GF_BG_SCR_SIZE_1024x1024) { - return GX_BG_SCRSIZE_TEXT_512x512; + return GX_BG_SCRSIZE_256x16PLTT_1024x1024; } break; } - return GX_BG_SCRSIZE_TEXT_256x256; + return GX_BG_SCRSIZE_TEXT_256x256; // GX_BG_SCRSIZE_AFFINE_128x128; GX_BG_SCRSIZE_256x16PLTT_128x128; } THUMB_FUNC void GetBgScreenDimensions(u32 screenSize, u8 *width_p, u8 *height_p) { switch (screenSize) { - case 0: + case GF_BG_SCR_SIZE_128x128: *width_p = 0x10; *height_p = 0x10; break; - case 1: + case GF_BG_SCR_SIZE_256x256: *width_p = 0x20; *height_p = 0x20; break; - case 2: + case GF_BG_SCR_SIZE_256x512: *width_p = 0x20; *height_p = 0x40; break; - case 3: + case GF_BG_SCR_SIZE_512x256: *width_p = 0x40; *height_p = 0x20; break; - case 4: + case GF_BG_SCR_SIZE_512x512: *width_p = 0x40; *height_p = 0x40; break; - case 5: + case GF_BG_SCR_SIZE_1024x1024: *width_p = 0x80; *height_p = 0x80; break; } } -THUMB_FUNC void FUN_020178A0(struct BgConfig *bgConfig, u32 bgId) +THUMB_FUNC void FreeBgTilemapBuffer(struct BgConfig *bgConfig, u32 bgId) { if (bgConfig->bgs[bgId].tilemapBuffer != NULL) { @@ -601,32 +601,32 @@ THUMB_FUNC void FUN_020178A0(struct BgConfig *bgConfig, u32 bgId) } } -THUMB_FUNC void FUN_020178BC(u32 bgId, u16 priority) +THUMB_FUNC void SetBgPriority(u32 bgId, u16 priority) { switch (bgId) { - case 0: + case GF_BG_LYR_MAIN_0: G2_SetBG0Priority(priority); break; - case 1: + case GF_BG_LYR_MAIN_1: G2_SetBG1Priority(priority); break; - case 2: + case GF_BG_LYR_MAIN_2: G2_SetBG2Priority(priority); break; - case 3: + case GF_BG_LYR_MAIN_3: G2_SetBG3Priority(priority); break; - case 4: + case GF_BG_LYR_SUB_0: G2S_SetBG0Priority(priority); break; - case 5: + case GF_BG_LYR_SUB_1: G2S_SetBG1Priority(priority); break; - case 6: + case GF_BG_LYR_SUB_2: G2S_SetBG2Priority(priority); break; - case 7: + case GF_BG_LYR_SUB_3: G2S_SetBG3Priority(priority); break; } @@ -636,220 +636,219 @@ THUMB_FUNC void ToggleBgLayer(u32 bgId, GX_LayerToggle toggle) { switch (bgId) { - case 0: - GX_EngineAToggleLayers(1, toggle); + case GF_BG_LYR_MAIN_0: + GX_EngineAToggleLayers(GF_BG_LYR_MAIN_0_F, toggle); break; - case 1: - GX_EngineAToggleLayers(2, toggle); + case GF_BG_LYR_MAIN_1: + GX_EngineAToggleLayers(GF_BG_LYR_MAIN_1_F, toggle); break; - case 2: - GX_EngineAToggleLayers(4, toggle); + case GF_BG_LYR_MAIN_2: + GX_EngineAToggleLayers(GF_BG_LYR_MAIN_2_F, toggle); break; - case 3: - GX_EngineAToggleLayers(8, toggle); + case GF_BG_LYR_MAIN_3: + GX_EngineAToggleLayers(GF_BG_LYR_MAIN_3_F, toggle); break; - case 4: - GX_EngineBToggleLayers(1, toggle); + case GF_BG_LYR_SUB_0: + GX_EngineBToggleLayers(GF_BG_LYR_SUB_0_F, toggle); break; - case 5: - GX_EngineBToggleLayers(2, toggle); + case GF_BG_LYR_SUB_1: + GX_EngineBToggleLayers(GF_BG_LYR_SUB_1_F, toggle); break; - case 6: - GX_EngineBToggleLayers(4, toggle); + case GF_BG_LYR_SUB_2: + GX_EngineBToggleLayers(GF_BG_LYR_SUB_2_F, toggle); break; - case 7: - GX_EngineBToggleLayers(8, toggle); + case GF_BG_LYR_SUB_3: + GX_EngineBToggleLayers(GF_BG_LYR_SUB_3_F, toggle); break; } } -THUMB_FUNC void FUN_020179E0(struct BgConfig *bgConfig, u32 bgId, u32 param2, fx32 val) +THUMB_FUNC void BgSetPosTextAndCommit(struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 val) { - Bg_SetPosText(&bgConfig->bgs[bgId], param2, val); + Bg_SetPosText(&bgConfig->bgs[bgId], op, val); u32 x = (u32)bgConfig->bgs[bgId].hOffset; u32 y = (u32)bgConfig->bgs[bgId].vOffset; switch (bgId) { - case 0: + case GF_BG_LYR_MAIN_0: G2_SetBG0Offset(x, y); break; - case 1: + case GF_BG_LYR_MAIN_1: G2_SetBG1Offset(x, y); break; - case 2: - if (bgConfig->bgs[2].mode == 0) + case GF_BG_LYR_MAIN_2: + if (bgConfig->bgs[GF_BG_LYR_MAIN_2].mode == 0) { G2_SetBG2Offset(x, y); } else { - FUN_02017C6C(bgConfig, 2); + BgAffineReset(bgConfig, GF_BG_LYR_MAIN_2); } break; - case 3: - if (bgConfig->bgs[3].mode == 0) + case GF_BG_LYR_MAIN_3: + if (bgConfig->bgs[GF_BG_LYR_MAIN_3].mode == 0) { G2_SetBG3Offset(x, y); } else { - FUN_02017C6C(bgConfig, 3); + BgAffineReset(bgConfig, GF_BG_LYR_MAIN_3); } break; - case 4: + case GF_BG_LYR_SUB_0: G2S_SetBG0Offset(x, y); break; - case 5: + case GF_BG_LYR_SUB_1: G2S_SetBG1Offset(x, y); break; - case 6: - if (bgConfig->bgs[6].mode == 0) + case GF_BG_LYR_SUB_2: + if (bgConfig->bgs[GF_BG_LYR_SUB_2].mode == 0) { G2S_SetBG2Offset(x, y); } else { - FUN_02017C6C(bgConfig, 6); + BgAffineReset(bgConfig, GF_BG_LYR_SUB_2); } break; - case 7: - if (bgConfig->bgs[7].mode == 0) + case GF_BG_LYR_SUB_3: + if (bgConfig->bgs[GF_BG_LYR_SUB_3].mode == 0) { G2S_SetBG3Offset(x, y); } else { - FUN_02017C6C(bgConfig, 7); + BgAffineReset(bgConfig, GF_BG_LYR_SUB_3); } break; } } -THUMB_FUNC fx32 FUN_02017B48(struct BgConfig *param0, u32 param1) +THUMB_FUNC fx32 Bg_GetXpos(struct BgConfig *bgConfig, u32 bgId) { - return param0->bgs[param1].hOffset; + return bgConfig->bgs[bgId].hOffset; } -THUMB_FUNC fx32 FUN_02017B54(struct BgConfig *param0, u32 param1) +THUMB_FUNC fx32 Bg_GetYpos(struct BgConfig *bgConfig, u32 bgId) { - return param0->bgs[param1].vOffset; + return bgConfig->bgs[bgId].vOffset; } -THUMB_FUNC void FUN_02017B60(struct BgConfig *param0, - u32 param1, - u32 param2, - fx32 param3, - struct Mtx22 *param4, - fx32 param5, - fx32 param6) +THUMB_FUNC void Bg_SetTextDimAndAffineParams(struct BgConfig *bgConfig, + u32 bgId, + u32 txOp, + fx32 txVal, + struct Mtx22 *mtx, + fx32 centerX, + fx32 centerY) { - Bg_SetPosText(¶m0->bgs[param1], param2, param3); - FUN_02017BD0(param0, param1, param4, param5, param6); + Bg_SetPosText(&bgConfig->bgs[bgId], txOp, txVal); + SetBgAffine(bgConfig, bgId, mtx, centerX, centerY); } THUMB_FUNC void Bg_SetPosText(struct Bg *bg, u32 op, fx32 val) { switch (op) { - case 0: + case BG_POS_OP_SET_X: bg->hOffset = val; break; - case 1: + case BG_POS_OP_ADD_X: bg->hOffset += val; break; - case 2: + case BG_POS_OP_SUB_X: bg->hOffset -= val; break; - case 3: + case BG_POS_OP_SET_Y: bg->vOffset = val; break; - case 4: + case BG_POS_OP_ADD_Y: bg->vOffset += val; break; - case 5: + case BG_POS_OP_SUB_Y: bg->vOffset -= val; break; } } -THUMB_FUNC void FUN_02017BD0( - struct BgConfig *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4) +THUMB_FUNC void SetBgAffine( + struct BgConfig *bgConfig, u32 bgId, struct Mtx22 *mtx, fx32 centerX, fx32 centerY) { - switch (param1) + switch (bgId) { - case 2: - G2_SetBG2Affine(param2, param3, param4, param0->bgs[param1].hOffset, param0->bgs[param1].vOffset); + case GF_BG_LYR_MAIN_2: + G2_SetBG2Affine(mtx, centerX, centerY, bgConfig->bgs[bgId].hOffset, bgConfig->bgs[bgId].vOffset); break; - case 3: - G2_SetBG3Affine(param2, param3, param4, param0->bgs[param1].hOffset, param0->bgs[param1].vOffset); + case GF_BG_LYR_MAIN_3: + G2_SetBG3Affine(mtx, centerX, centerY, bgConfig->bgs[bgId].hOffset, bgConfig->bgs[bgId].vOffset); break; - case 6: - G2S_SetBG2Affine(param2, param3, param4, param0->bgs[param1].hOffset, param0->bgs[param1].vOffset); + case GF_BG_LYR_SUB_2: + G2S_SetBG2Affine(mtx, centerX, centerY, bgConfig->bgs[bgId].hOffset, bgConfig->bgs[bgId].vOffset); break; - case 7: - G2S_SetBG3Affine(param2, param3, param4, param0->bgs[param1].hOffset, param0->bgs[param1].vOffset); + case GF_BG_LYR_SUB_3: + G2S_SetBG3Affine(mtx, centerX, centerY, bgConfig->bgs[bgId].hOffset, bgConfig->bgs[bgId].vOffset); break; } } -THUMB_FUNC void FUN_02017C6C(struct BgConfig *param0, u32 param1) +THUMB_FUNC void BgAffineReset(struct BgConfig *bgConfig, u32 bgId) { struct Mtx22 mtx; - MTX22_2DAffine(&mtx, 0, 0x1000, 0x1000, 0); - FUN_02017BD0(param0, param1, &mtx, 0, 0); + MTX22_2DAffine(&mtx, 0, FX32_ONE, FX32_ONE, 0); + SetBgAffine(bgConfig, bgId, &mtx, 0, 0); } -THUMB_FUNC void FUN_02017C98(const void *param0, void *param1, u32 param2) +THUMB_FUNC void CopyOrUncompressTilemapData(const void *src, void *dest, u32 size) { - if (param2 == 0) + if (size == 0) { - MI_UncompressLZ8(param0, param1); + MI_UncompressLZ8(src, dest); return; } - if (((u32)param0 % 4) == 0 && ((u32)param1 % 4) == 0 && ((u16)param2 % 4) == 0) + if (((u32)src % 4) == 0 && ((u32)dest % 4) == 0 && ((u16)size % 4) == 0) { - MI_CpuCopy32(param0, param1, param2); + MI_CpuCopy32(src, dest, size); return; } - MI_CpuCopy16(param0, param1, param2); + MI_CpuCopy16(src, dest, size); } -THUMB_FUNC void FUN_02017CD0(struct BgConfig *param0, u32 param1) +THUMB_FUNC void BgCommitTilemapBufferToVram(struct BgConfig *bgConfig, u32 bgId) { - FUN_02017CE8(param0, - param1, - param0->bgs[param1].tilemapBuffer, - param0->bgs[param1].bufferSize, - param0->bgs[param1].unk10); + BgCopyOrUncompressTilemapBufferRangeToVram(bgConfig, + bgId, + bgConfig->bgs[bgId].tilemapBuffer, + bgConfig->bgs[bgId].bufferSize, + bgConfig->bgs[bgId].baseTile); } -THUMB_FUNC void FUN_02017CE8( - struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4) +THUMB_FUNC void BgCopyOrUncompressTilemapBufferRangeToVram( + struct BgConfig *bgConfig, u32 bgId, u32 *src, u32 size, u32 tileOffset) { - u32 st0 = param3; - if (param3 == 0) + if (size == 0) { - void *st4 = param0->bgs[param1].tilemapBuffer; - if (st4 != 0) + void *tilemapBuffer = bgConfig->bgs[bgId].tilemapBuffer; + if (tilemapBuffer != 0) { - FUN_02017C98(param2, st4, param3); - LoadBgVramScr(param1, st4, param0->bgs[param1].unk10 * 2, param0->bgs[param1].bufferSize); + CopyOrUncompressTilemapData(src, tilemapBuffer, size); + LoadBgVramScr(bgId, tilemapBuffer, bgConfig->bgs[bgId].baseTile * 2, bgConfig->bgs[bgId].bufferSize); return; } - u32 r7 = param2[0] >> 8; - void *ptr = AllocFromHeapAtEnd(param0->heap_id, r7); - FUN_02017C98(param2, ptr, st0); - LoadBgVramScr(param1, ptr, param4 * 2, r7); + u32 uncompSize = src[0] >> 8; + void *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, uncompSize); + CopyOrUncompressTilemapData(src, ptr, size); + LoadBgVramScr(bgId, ptr, tileOffset * 2, uncompSize); FreeToHeap(ptr); return; } - LoadBgVramScr(param1, param2, param4 * 2, param3); + LoadBgVramScr(bgId, src, tileOffset * 2, size); } THUMB_FUNC void LoadBgVramScr(u32 bgId, void *buffer_p, u32 offset, u32 size) @@ -885,10 +884,10 @@ THUMB_FUNC void LoadBgVramScr(u32 bgId, void *buffer_p, u32 offset, u32 size) } } -THUMB_FUNC void FUN_02017DFC( - struct BgConfig *param0, u32 param1, void *param2, u32 param3) +THUMB_FUNC void BG_LoadScreenTilemapData( + struct BgConfig *bgConfig, u32 bgId, void *src, u32 numTiles) { - FUN_02017C98(param2, param0->bgs[param1].tilemapBuffer, param3); + CopyOrUncompressTilemapData(src, bgConfig->bgs[bgId].tilemapBuffer, numTiles); } THUMB_FUNC void BG_LoadCharTilesData( @@ -910,7 +909,7 @@ THUMB_FUNC void BG_LoadCharPixelData( u32 uncompressedSize = charData[0] >> 8; void *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, uncompressedSize); - FUN_02017C98(charData, ptr, size); + CopyOrUncompressTilemapData(charData, ptr, size); LoadBgVramChar(bgId, ptr, offset, uncompressedSize); FreeToHeap(ptr); return; @@ -925,28 +924,28 @@ THUMB_FUNC void LoadBgVramChar(u32 bgId, void *buffer_p, u32 offset, u32 size) switch (bgId) { - case 0: + case GF_BG_LYR_MAIN_0: GX_LoadBG0Char(buffer_p, offset, size); break; - case 1: + case GF_BG_LYR_MAIN_1: GX_LoadBG1Char(buffer_p, offset, size); break; - case 2: + case GF_BG_LYR_MAIN_2: GX_LoadBG2Char(buffer_p, offset, size); break; - case 3: + case GF_BG_LYR_MAIN_3: GX_LoadBG3Char(buffer_p, offset, size); break; - case 4: + case GF_BG_LYR_SUB_0: GXS_LoadBG0Char(buffer_p, offset, size); break; - case 5: + case GF_BG_LYR_SUB_1: GXS_LoadBG1Char(buffer_p, offset, size); break; - case 6: + case GF_BG_LYR_SUB_2: GXS_LoadBG2Char(buffer_p, offset, size); break; - case 7: + case GF_BG_LYR_SUB_3: GXS_LoadBG3Char(buffer_p, offset, size); break; } @@ -988,7 +987,7 @@ THUMB_FUNC void BG_FillCharDataRange( THUMB_FUNC void BG_LoadPlttData(u32 bgId, void *plttData, u32 size, u32 offset) { DC_FlushRange(plttData, size); - if (bgId < 4) + if (bgId < GF_BG_LYR_MAIN_CNT) { GX_LoadBGPltt(plttData, offset, size); return; @@ -1006,18 +1005,18 @@ THUMB_FUNC u16 GetTileMapIndexFromCoords(u8 x, u8 y, u8 screenSize) { switch (screenSize) { - case 0: + case GF_BG_SCR_SIZE_128x128: return (u16)(x + (y << 4)); - case 1: - case 2: + case GF_BG_SCR_SIZE_256x256: + case GF_BG_SCR_SIZE_256x512: return (u16)(x + (y << 5)); - case 3: + case GF_BG_SCR_SIZE_512x256: return (u16)((x & 0x1f) + ((y + (x & ~0x1f)) << 5)); - case 4: + case GF_BG_SCR_SIZE_512x512: u16 res = (u16)(((u16)((x >> 5) + (y >> 5) * 2)) << 10); res += (x & 0x1f) + ((y & 0x1f) << 5); return res; - case 5: + case GF_BG_SCR_SIZE_1024x1024: return 0; } @@ -1511,82 +1510,82 @@ THUMB_FUNC void BgTilemapRectChangePalette(struct BgConfig *bgConfig, } } -THUMB_FUNC void FUN_02018744(struct BgConfig *param0, u32 param1) +THUMB_FUNC void BgClearTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgId) { - if (param0->bgs[param1].tilemapBuffer != NULL) + if (bgConfig->bgs[bgId].tilemapBuffer != NULL) { - MI_CpuClear16(param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize); - FUN_02017CD0(param0, param1); + MI_CpuClear16(bgConfig->bgs[bgId].tilemapBuffer, bgConfig->bgs[bgId].bufferSize); + BgCommitTilemapBufferToVram(bgConfig, bgId); } } -THUMB_FUNC void FUN_02018768(struct BgConfig *param0, u32 param1, u16 param2) +THUMB_FUNC void BgFillTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgId, u16 fillValue) { - if (param0->bgs[param1].tilemapBuffer != NULL) + if (bgConfig->bgs[bgId].tilemapBuffer != NULL) { - MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize); - FUN_02017CD0(param0, param1); + MI_CpuFill16(bgConfig->bgs[bgId].tilemapBuffer, fillValue, bgConfig->bgs[bgId].bufferSize); + BgCommitTilemapBufferToVram(bgConfig, bgId); } } -THUMB_FUNC void FUN_0201878C(struct BgConfig *param0, u32 param1, u16 param2) +THUMB_FUNC void BgFillTilemapBufferAndSchedule(struct BgConfig *bgConfig, u32 bgId, u16 fillValue) { - if (param0->bgs[param1].tilemapBuffer != NULL) + if (bgConfig->bgs[bgId].tilemapBuffer != NULL) { - MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize); - ScheduleBgTilemapBufferTransfer(param0, param1); + MI_CpuFill16(bgConfig->bgs[bgId].tilemapBuffer, fillValue, bgConfig->bgs[bgId].bufferSize); + ScheduleBgTilemapBufferTransfer(bgConfig, bgId); } } -THUMB_FUNC void *FUN_020187B0(u32 param0) +THUMB_FUNC void *BgGetCharPtr(u32 bgId) { - switch (param0) + switch (bgId) { - case 0: + case GF_BG_LYR_MAIN_0: return G2_GetBG0CharPtr(); - case 1: + case GF_BG_LYR_MAIN_1: return G2_GetBG1CharPtr(); - case 2: + case GF_BG_LYR_MAIN_2: return G2_GetBG2CharPtr(); - case 3: + case GF_BG_LYR_MAIN_3: return G2_GetBG3CharPtr(); - case 4: + case GF_BG_LYR_SUB_0: return G2S_GetBG0CharPtr(); - case 5: + case GF_BG_LYR_SUB_1: return G2S_GetBG1CharPtr(); - case 6: + case GF_BG_LYR_SUB_2: return G2S_GetBG2CharPtr(); - case 7: + case GF_BG_LYR_SUB_3: return G2S_GetBG3CharPtr(); } return NULL; } -THUMB_FUNC void FUN_02018808(u8 *param0, u32 param1, u8 (*param2)[2], u8 param3) +THUMB_FUNC void Convert4bppTo8bppInternal(u8 *src4bpp, u32 size, u8 (*dest8bpp), u8 paletteNum) { - param3 <<= 4; - for (int i = 0; i < param1; i++) + paletteNum <<= 4; + for (u32 i = 0; i < size; i++) { - param2[i][0] = (u8)(param0[i] & 0xf); - if (param2[i][0] != 0) + dest8bpp[i * 2 + 0] = (u8)(src4bpp[i] & 0xf); + if (dest8bpp[i * 2 + 0] != 0) { - param2[i][0] += param3; + dest8bpp[i * 2 + 0] += paletteNum; } - param2[i][1] = (u8)((param0[i] >> 4) & 0xf); - if (param2[i][1] != 0) + dest8bpp[i * 2 + 1] = (u8)((src4bpp[i] >> 4) & 0xf); + if (dest8bpp[i * 2 + 1] != 0) { - param2[i][1] += param3; + dest8bpp[i * 2 + 1] += paletteNum; } } } -THUMB_FUNC u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2] +THUMB_FUNC u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, u32 heap_id) { - u8(*ptr)[2] = (u8(*)[2])AllocFromHeap(heap_id, param1 * 2); + u8 *ptr = (u8*)AllocFromHeap(heap_id, size * 2); - FUN_02018808(param0, param1, ptr, param2); + Convert4bppTo8bppInternal(src4Bpp, size, ptr, paletteNum); return ptr; } @@ -1596,70 +1595,70 @@ THUMB_FUNC void *GetBgTilemapBuffer(struct BgConfig *bgConfig, u8 bgId) return bgConfig->bgs[bgId].tilemapBuffer; } -THUMB_FUNC u16 FUN_02018878(struct BgConfig *param0, u32 param1) +THUMB_FUNC u16 GetBgAffineRotation(struct BgConfig *bgConfig, u32 bgId) { - return param0->bgs[param1].rotation; + return bgConfig->bgs[bgId].rotation; } THUMB_FUNC u8 GetBgPriority(struct BgConfig *bgConfig, u32 bgId) { switch (bgId) { - case 0: + case GF_BG_LYR_MAIN_0: return G2_GetBG0Control().priority; - case 1: + case GF_BG_LYR_MAIN_1: return G2_GetBG1Control().priority; - case 2: + case GF_BG_LYR_MAIN_2: switch (bgConfig->bgs[bgId].mode) { default: - case 0: + case GF_BG_TYPE_TEXT: return G2_GetBG2ControlText().priority; - case 1: + case GF_BG_TYPE_AFFINE: return G2_GetBG2ControlAffine().priority; - case 2: + case GF_BG_TYPE_256x16PLTT: return G2_GetBG2Control256x16Pltt().priority; } break; - case 3: + case GF_BG_LYR_MAIN_3: switch (bgConfig->bgs[bgId].mode) { default: - case 0: + case GF_BG_TYPE_TEXT: return G2_GetBG3ControlText().priority; - case 1: + case GF_BG_TYPE_AFFINE: return G2_GetBG3ControlAffine().priority; - case 2: + case GF_BG_TYPE_256x16PLTT: return G2_GetBG3Control256x16Pltt().priority; } break; - case 4: + case GF_BG_LYR_SUB_0: return G2S_GetBG0Control().priority; - case 5: + case GF_BG_LYR_SUB_1: return G2S_GetBG1Control().priority; - case 6: + case GF_BG_LYR_SUB_2: switch (bgConfig->bgs[bgId].mode) { default: - case 0: + case GF_BG_TYPE_TEXT: return G2S_GetBG2ControlText().priority; - case 1: + case GF_BG_TYPE_AFFINE: return G2S_GetBG2ControlAffine().priority; - case 2: + case GF_BG_TYPE_256x16PLTT: return G2S_GetBG2Control256x16Pltt().priority; } break; - case 7: + case GF_BG_LYR_SUB_3: switch (bgConfig->bgs[bgId].mode) { default: - case 0: + case GF_BG_TYPE_TEXT: return G2S_GetBG3ControlText().priority; - case 1: + case GF_BG_TYPE_AFFINE: return G2S_GetBG3ControlAffine().priority; - case 2: + case GF_BG_TYPE_256x16PLTT: return G2S_GetBG3Control256x16Pltt().priority; } break; @@ -2028,15 +2027,15 @@ THUMB_FUNC void CopyWindowToVram(struct Window *window) sCopyWindowToVramFuncs[window->bgConfig->bgs[window->bgId].mode](window); } -THUMB_FUNC void FUN_02019220(struct Window *window) +THUMB_FUNC void ScheduleWindowCopyToVram(struct Window *window) { GF_ASSERT(window); GF_ASSERT(window->bgConfig); GF_ASSERT(window->bgId < NELEMS(window->bgConfig->bgs)); - GF_ASSERT(window->bgConfig->bgs[window->bgId].mode < NELEMS(UNK_020EDB5C)); + GF_ASSERT(window->bgConfig->bgs[window->bgId].mode < NELEMS(sScheduleWindowCopyToVramFuncs)); - UNK_020EDB5C[window->bgConfig->bgs[window->bgId].mode](window); + sScheduleWindowCopyToVramFuncs[window->bgConfig->bgs[window->bgId].mode](window); } THUMB_FUNC void PutWindowTilemap(struct Window *window) @@ -2057,9 +2056,9 @@ THUMB_FUNC void PutWindowTilemapRectAnchoredTopLeft(struct Window *window, u8 wi window->height = heightBak; } -THUMB_FUNC void FUN_020192B8(struct Window *window) +THUMB_FUNC void ClearWindowTilemap(struct Window *window) { - UNK_020EDB74[window->bgConfig->bgs[window->bgId].mode](window); + sClearWindowTilemapFuncs[window->bgConfig->bgs[window->bgId].mode](window); } THUMB_FUNC void PutWindowTilemap_TextMode(struct Window *param0) @@ -2103,7 +2102,7 @@ THUMB_FUNC void PutWindowTilemap_AffineMode(struct Window *window) return; } - tilemapWidth = UNK_020EDB30[window->bgConfig->bgs[window->bgId].size]; + tilemapWidth = sTilemapWidthByBufferSize[window->bgConfig->bgs[window->bgId].size]; dst = window->bgConfig->bgs[window->bgId].tilemapBuffer + window->tilemapTop * tilemapWidth + window->tilemapLeft; tileId = window->baseTile; @@ -2135,7 +2134,7 @@ THUMB_FUNC void ClearWindowTilemapText(struct Window *window) } dst = window->bgConfig->bgs[window->bgId].tilemapBuffer; - tilemapWidth = UNK_020EDB30[window->bgConfig->bgs[window->bgId].size]; + tilemapWidth = sTilemapWidthByBufferSize[window->bgConfig->bgs[window->bgId].size]; xEnd = (u32)(window->tilemapLeft + window->width); yEnd = (u32)(window->tilemapTop + window->height); @@ -2161,7 +2160,7 @@ THUMB_FUNC void ClearWindowTilemapAffine(struct Window *window) return; } - tilemapWidth = UNK_020EDB30[window->bgConfig->bgs[window->bgId].size]; + tilemapWidth = sTilemapWidthByBufferSize[window->bgConfig->bgs[window->bgId].size]; dstPos = window->bgConfig->bgs[window->bgId].tilemapBuffer + window->tilemapTop * tilemapWidth + window->tilemapLeft; for (i = 0; i < window->height; i++) @@ -2177,29 +2176,29 @@ THUMB_FUNC void ClearWindowTilemapAffine(struct Window *window) THUMB_FUNC void CopyWindowToVram_TextMode(struct Window *window) { PutWindowTilemap_TextMode(window); - FUN_02019548(window); - FUN_02017CE8(window->bgConfig, - window->bgId, - window->bgConfig->bgs[window->bgId].tilemapBuffer, - window->bgConfig->bgs[window->bgId].bufferSize, - window->bgConfig->bgs[window->bgId].unk10); + CopyWindowPixelsToVram_TextMode(window); + BgCopyOrUncompressTilemapBufferRangeToVram(window->bgConfig, + window->bgId, + window->bgConfig->bgs[window->bgId].tilemapBuffer, + window->bgConfig->bgs[window->bgId].bufferSize, + window->bgConfig->bgs[window->bgId].baseTile); } -THUMB_FUNC void FUN_020194C8(struct Window *window) +THUMB_FUNC void ScheduleWindowCopyToVram_TextMode(struct Window *window) { PutWindowTilemap_TextMode(window); ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); - FUN_02019548(window); + CopyWindowPixelsToVram_TextMode(window); } THUMB_FUNC void CopyWindowToVram_AffineMode(struct Window *window) { PutWindowTilemap_AffineMode(window); - FUN_02017CE8(window->bgConfig, - window->bgId, - window->bgConfig->bgs[window->bgId].tilemapBuffer, - window->bgConfig->bgs[window->bgId].bufferSize, - window->bgConfig->bgs[window->bgId].unk10); + BgCopyOrUncompressTilemapBufferRangeToVram(window->bgConfig, + window->bgId, + window->bgConfig->bgs[window->bgId].tilemapBuffer, + window->bgConfig->bgs[window->bgId].bufferSize, + window->bgConfig->bgs[window->bgId].baseTile); BG_LoadCharTilesData(window->bgConfig, window->bgId, @@ -2208,7 +2207,7 @@ THUMB_FUNC void CopyWindowToVram_AffineMode(struct Window *window) window->baseTile); } -THUMB_FUNC void FUN_0201951C(struct Window *window) +THUMB_FUNC void ScheduleWindowCopyToVram_AffineMode(struct Window *window) { PutWindowTilemap_AffineMode(window); ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); @@ -2219,7 +2218,7 @@ THUMB_FUNC void FUN_0201951C(struct Window *window) window->baseTile); } -THUMB_FUNC void FUN_02019548(struct Window *window) +THUMB_FUNC void CopyWindowPixelsToVram_TextMode(struct Window *window) { BG_LoadCharTilesData(window->bgConfig, window->bgId, @@ -2228,43 +2227,43 @@ THUMB_FUNC void FUN_02019548(struct Window *window) window->baseTile); } -THUMB_FUNC void FUN_02019570(struct Window *window) +THUMB_FUNC void ClearWindowTilemapAndCopyToVram(struct Window *window) { - UNK_020EDB50[window->bgConfig->bgs[window->bgId].mode](window); + sClearWindowTilemapAndCopyToVramFuncs[window->bgConfig->bgs[window->bgId].mode](window); } -THUMB_FUNC void FUN_0201958C(struct Window *window) +THUMB_FUNC void ClearWindowTilemapAndScheduleTransfer(struct Window *window) { - UNK_020EDB44[window->bgConfig->bgs[window->bgId].mode](window); + sClearWindowTilemapAndScheduleTransferFuncs[window->bgConfig->bgs[window->bgId].mode](window); } -THUMB_FUNC void FUN_020195A8(struct Window *window) +THUMB_FUNC void ClearWindowTilemapAndCopyToVram_TextMode(struct Window *window) { ClearWindowTilemapText(window); - FUN_02017CE8(window->bgConfig, - window->bgId, - window->bgConfig->bgs[window->bgId].tilemapBuffer, - window->bgConfig->bgs[window->bgId].bufferSize, - window->bgConfig->bgs[window->bgId].unk10); + BgCopyOrUncompressTilemapBufferRangeToVram(window->bgConfig, + window->bgId, + window->bgConfig->bgs[window->bgId].tilemapBuffer, + window->bgConfig->bgs[window->bgId].bufferSize, + window->bgConfig->bgs[window->bgId].baseTile); } -THUMB_FUNC void FUN_020195D0(struct Window *window) +THUMB_FUNC void ClearWindowTilemapAndScheduleTransfer_TextMode(struct Window *window) { ClearWindowTilemapText(window); ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); } -THUMB_FUNC void FUN_020195E4(struct Window *window) +THUMB_FUNC void ClearWindowTilemapAndCopyToVram_AffineMode(struct Window *window) { ClearWindowTilemapAffine(window); - FUN_02017CE8(window->bgConfig, - window->bgId, - window->bgConfig->bgs[window->bgId].tilemapBuffer, - window->bgConfig->bgs[window->bgId].bufferSize, - window->bgConfig->bgs[window->bgId].unk10); + BgCopyOrUncompressTilemapBufferRangeToVram(window->bgConfig, + window->bgId, + window->bgConfig->bgs[window->bgId].tilemapBuffer, + window->bgConfig->bgs[window->bgId].bufferSize, + window->bgConfig->bgs[window->bgId].baseTile); } -THUMB_FUNC void FUN_0201960C(struct Window *window) +THUMB_FUNC void ClearWindowTilemapAndScheduleTransfer_AffineMode(struct Window *window) { ClearWindowTilemapAffine(window); ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); @@ -3869,7 +3868,7 @@ _0201A12C: // 0x0201A12C ldr r0, [sp, #0x0] ldr r3, [r3, #0x0] lsl r1, r1, #0x3 - bl FUN_02018848 + bl Convert4bppTo8bpp str r0, [sp, #0x1ec] cmp r4, #0x3 bhi _0201A21E @@ -5144,44 +5143,44 @@ THUMB_FUNC void DoScheduledBgGpuUpdates(struct BgConfig *bgConfig) THUMB_FUNC void DoScheduledBgTilemapBufferTransfers(struct BgConfig *bgConfig) { - if ((bgConfig->bufferTransferScheduled & 1) != 0) + if ((bgConfig->bufferTransferScheduled & (1 << GF_BG_LYR_MAIN_0)) != 0) { - LoadBgVramScr(0, bgConfig->bgs[0].tilemapBuffer, bgConfig->bgs[0].unk10 * 2, bgConfig->bgs[0].bufferSize); + LoadBgVramScr(GF_BG_LYR_MAIN_0, bgConfig->bgs[GF_BG_LYR_MAIN_0].tilemapBuffer, bgConfig->bgs[GF_BG_LYR_MAIN_0].baseTile * 2, bgConfig->bgs[GF_BG_LYR_MAIN_0].bufferSize); } - if ((bgConfig->bufferTransferScheduled & 2) != 0) + if ((bgConfig->bufferTransferScheduled & (1 << GF_BG_LYR_MAIN_1)) != 0) { - LoadBgVramScr(1, bgConfig->bgs[1].tilemapBuffer, bgConfig->bgs[1].unk10 * 2, bgConfig->bgs[1].bufferSize); + LoadBgVramScr(GF_BG_LYR_MAIN_1, bgConfig->bgs[GF_BG_LYR_MAIN_1].tilemapBuffer, bgConfig->bgs[GF_BG_LYR_MAIN_1].baseTile * 2, bgConfig->bgs[GF_BG_LYR_MAIN_1].bufferSize); } - if ((bgConfig->bufferTransferScheduled & 4) != 0) + if ((bgConfig->bufferTransferScheduled & (1 << GF_BG_LYR_MAIN_2)) != 0) { - LoadBgVramScr(2, bgConfig->bgs[2].tilemapBuffer, bgConfig->bgs[2].unk10 * 2, bgConfig->bgs[2].bufferSize); + LoadBgVramScr(GF_BG_LYR_MAIN_2, bgConfig->bgs[GF_BG_LYR_MAIN_2].tilemapBuffer, bgConfig->bgs[GF_BG_LYR_MAIN_2].baseTile * 2, bgConfig->bgs[GF_BG_LYR_MAIN_2].bufferSize); } - if ((bgConfig->bufferTransferScheduled & 8) != 0) + if ((bgConfig->bufferTransferScheduled & (1 << GF_BG_LYR_MAIN_3)) != 0) { - LoadBgVramScr(3, bgConfig->bgs[3].tilemapBuffer, bgConfig->bgs[3].unk10 * 2, bgConfig->bgs[3].bufferSize); + LoadBgVramScr(GF_BG_LYR_MAIN_3, bgConfig->bgs[GF_BG_LYR_MAIN_3].tilemapBuffer, bgConfig->bgs[GF_BG_LYR_MAIN_3].baseTile * 2, bgConfig->bgs[GF_BG_LYR_MAIN_3].bufferSize); } - if ((bgConfig->bufferTransferScheduled & 0x10) != 0) + if ((bgConfig->bufferTransferScheduled & (1 << GF_BG_LYR_SUB_0)) != 0) { - LoadBgVramScr(4, bgConfig->bgs[4].tilemapBuffer, bgConfig->bgs[4].unk10 * 2, bgConfig->bgs[4].bufferSize); + LoadBgVramScr(GF_BG_LYR_SUB_0, bgConfig->bgs[GF_BG_LYR_SUB_0].tilemapBuffer, bgConfig->bgs[GF_BG_LYR_SUB_0].baseTile * 2, bgConfig->bgs[GF_BG_LYR_SUB_0].bufferSize); } - if ((bgConfig->bufferTransferScheduled & 0x20) != 0) + if ((bgConfig->bufferTransferScheduled & (1 << GF_BG_LYR_SUB_1)) != 0) { - LoadBgVramScr(5, bgConfig->bgs[5].tilemapBuffer, bgConfig->bgs[5].unk10 * 2, bgConfig->bgs[5].bufferSize); + LoadBgVramScr(GF_BG_LYR_SUB_1, bgConfig->bgs[GF_BG_LYR_SUB_1].tilemapBuffer, bgConfig->bgs[GF_BG_LYR_SUB_1].baseTile * 2, bgConfig->bgs[GF_BG_LYR_SUB_1].bufferSize); } - if ((bgConfig->bufferTransferScheduled & 0x40) != 0) + if ((bgConfig->bufferTransferScheduled & (1 << GF_BG_LYR_SUB_2)) != 0) { - LoadBgVramScr(6, bgConfig->bgs[6].tilemapBuffer, bgConfig->bgs[6].unk10 * 2, bgConfig->bgs[6].bufferSize); + LoadBgVramScr(GF_BG_LYR_SUB_2, bgConfig->bgs[GF_BG_LYR_SUB_2].tilemapBuffer, bgConfig->bgs[GF_BG_LYR_SUB_2].baseTile * 2, bgConfig->bgs[GF_BG_LYR_SUB_2].bufferSize); } - if ((bgConfig->bufferTransferScheduled & 0x80) != 0) + if ((bgConfig->bufferTransferScheduled & (1 << GF_BG_LYR_SUB_3)) != 0) { - LoadBgVramScr(7, bgConfig->bgs[7].tilemapBuffer, bgConfig->bgs[7].unk10 * 2, bgConfig->bgs[7].bufferSize); + LoadBgVramScr(GF_BG_LYR_SUB_3, bgConfig->bgs[GF_BG_LYR_SUB_3].tilemapBuffer, bgConfig->bgs[GF_BG_LYR_SUB_3].baseTile * 2, bgConfig->bgs[GF_BG_LYR_SUB_3].bufferSize); } } @@ -5192,103 +5191,103 @@ THUMB_FUNC void ScheduleBgTilemapBufferTransfer(struct BgConfig *bgConfig, u32 b THUMB_FUNC void ApplyScheduledBgPosUpdate(struct BgConfig *bgConfig) { - if ((bgConfig->scrollScheduled & 1) != 0) + if ((bgConfig->scrollScheduled & (1 << GF_BG_LYR_MAIN_0)) != 0) { - G2_SetBG0Offset(bgConfig->bgs[0].hOffset, bgConfig->bgs[0].vOffset); + G2_SetBG0Offset(bgConfig->bgs[GF_BG_LYR_MAIN_0].hOffset, bgConfig->bgs[GF_BG_LYR_MAIN_0].vOffset); } - if ((bgConfig->scrollScheduled & 2) != 0) + if ((bgConfig->scrollScheduled & (1 << GF_BG_LYR_MAIN_1)) != 0) { - G2_SetBG1Offset(bgConfig->bgs[1].hOffset, bgConfig->bgs[1].vOffset); + G2_SetBG1Offset(bgConfig->bgs[GF_BG_LYR_MAIN_1].hOffset, bgConfig->bgs[GF_BG_LYR_MAIN_1].vOffset); } - if ((bgConfig->scrollScheduled & 4) != 0) + if ((bgConfig->scrollScheduled & (1 << GF_BG_LYR_MAIN_2)) != 0) { - if (bgConfig->bgs[2].mode == 0) + if (bgConfig->bgs[GF_BG_LYR_MAIN_2].mode == 0) { - G2_SetBG2Offset(bgConfig->bgs[2].hOffset, bgConfig->bgs[2].vOffset); + G2_SetBG2Offset(bgConfig->bgs[GF_BG_LYR_MAIN_2].hOffset, bgConfig->bgs[GF_BG_LYR_MAIN_2].vOffset); } else { struct Mtx22 st38; MTX22_2DAffine( - &st38, bgConfig->bgs[2].rotation, bgConfig->bgs[2].xScale, bgConfig->bgs[2].yScale, 2); + &st38, bgConfig->bgs[GF_BG_LYR_MAIN_2].rotation, bgConfig->bgs[GF_BG_LYR_MAIN_2].xScale, bgConfig->bgs[GF_BG_LYR_MAIN_2].yScale, 2); G2_SetBG2Affine( &st38, - bgConfig->bgs[2].centerX, - bgConfig->bgs[2].centerY, - bgConfig->bgs[2].hOffset, - bgConfig->bgs[2].vOffset); + bgConfig->bgs[GF_BG_LYR_MAIN_2].centerX, + bgConfig->bgs[GF_BG_LYR_MAIN_2].centerY, + bgConfig->bgs[GF_BG_LYR_MAIN_2].hOffset, + bgConfig->bgs[GF_BG_LYR_MAIN_2].vOffset); } } - if ((bgConfig->scrollScheduled & 8) != 0) + if ((bgConfig->scrollScheduled & (1 << GF_BG_LYR_MAIN_3)) != 0) { - if (bgConfig->bgs[3].mode == 0) + if (bgConfig->bgs[GF_BG_LYR_MAIN_3].mode == 0) { - G2_SetBG3Offset(bgConfig->bgs[3].hOffset, bgConfig->bgs[3].vOffset); + G2_SetBG3Offset(bgConfig->bgs[GF_BG_LYR_MAIN_3].hOffset, bgConfig->bgs[GF_BG_LYR_MAIN_3].vOffset); } else { struct Mtx22 st28; MTX22_2DAffine( - &st28, bgConfig->bgs[3].rotation, bgConfig->bgs[3].xScale, bgConfig->bgs[3].yScale, 2); + &st28, bgConfig->bgs[GF_BG_LYR_MAIN_3].rotation, bgConfig->bgs[GF_BG_LYR_MAIN_3].xScale, bgConfig->bgs[GF_BG_LYR_MAIN_3].yScale, 2); G2_SetBG3Affine( &st28, - bgConfig->bgs[3].centerX, - bgConfig->bgs[3].centerY, - bgConfig->bgs[3].hOffset, - bgConfig->bgs[3].vOffset); + bgConfig->bgs[GF_BG_LYR_MAIN_3].centerX, + bgConfig->bgs[GF_BG_LYR_MAIN_3].centerY, + bgConfig->bgs[GF_BG_LYR_MAIN_3].hOffset, + bgConfig->bgs[GF_BG_LYR_MAIN_3].vOffset); } } - if ((bgConfig->scrollScheduled & 0x10) != 0) + if ((bgConfig->scrollScheduled & (1 << GF_BG_LYR_SUB_0)) != 0) { - G2S_SetBG0Offset(bgConfig->bgs[4].hOffset, bgConfig->bgs[4].vOffset); + G2S_SetBG0Offset(bgConfig->bgs[GF_BG_LYR_SUB_0].hOffset, bgConfig->bgs[GF_BG_LYR_SUB_0].vOffset); } - if ((bgConfig->scrollScheduled & 0x20) != 0) + if ((bgConfig->scrollScheduled & (1 << GF_BG_LYR_SUB_1)) != 0) { - G2S_SetBG1Offset(bgConfig->bgs[5].hOffset, bgConfig->bgs[5].vOffset); + G2S_SetBG1Offset(bgConfig->bgs[GF_BG_LYR_SUB_1].hOffset, bgConfig->bgs[GF_BG_LYR_SUB_1].vOffset); } - if ((bgConfig->scrollScheduled & 0x40) != 0) + if ((bgConfig->scrollScheduled & (1 << GF_BG_LYR_SUB_2)) != 0) { - if (bgConfig->bgs[6].mode == 0) + if (bgConfig->bgs[GF_BG_LYR_SUB_2].mode == 0) { - G2S_SetBG2Offset(bgConfig->bgs[6].hOffset, bgConfig->bgs[6].vOffset); + G2S_SetBG2Offset(bgConfig->bgs[GF_BG_LYR_SUB_2].hOffset, bgConfig->bgs[GF_BG_LYR_SUB_2].vOffset); } else { struct Mtx22 st18; MTX22_2DAffine( - &st18, bgConfig->bgs[6].rotation, bgConfig->bgs[6].xScale, bgConfig->bgs[6].yScale, 2); + &st18, bgConfig->bgs[GF_BG_LYR_SUB_2].rotation, bgConfig->bgs[GF_BG_LYR_SUB_2].xScale, bgConfig->bgs[GF_BG_LYR_SUB_2].yScale, 2); G2S_SetBG2Affine( &st18, - bgConfig->bgs[6].centerX, - bgConfig->bgs[6].centerY, - bgConfig->bgs[6].hOffset, - bgConfig->bgs[6].vOffset); + bgConfig->bgs[GF_BG_LYR_SUB_2].centerX, + bgConfig->bgs[GF_BG_LYR_SUB_2].centerY, + bgConfig->bgs[GF_BG_LYR_SUB_2].hOffset, + bgConfig->bgs[GF_BG_LYR_SUB_2].vOffset); } } - if ((bgConfig->scrollScheduled & 0x80) != 0) + if ((bgConfig->scrollScheduled & (1 << GF_BG_LYR_SUB_3)) != 0) { - if (bgConfig->bgs[7].mode == 0) + if (bgConfig->bgs[GF_BG_LYR_SUB_3].mode == 0) { - G2S_SetBG3Offset(bgConfig->bgs[7].hOffset, bgConfig->bgs[7].vOffset); + G2S_SetBG3Offset(bgConfig->bgs[GF_BG_LYR_SUB_3].hOffset, bgConfig->bgs[GF_BG_LYR_SUB_3].vOffset); } else { struct Mtx22 st08; MTX22_2DAffine( - &st08, bgConfig->bgs[7].rotation, bgConfig->bgs[7].xScale, bgConfig->bgs[7].yScale, 2); + &st08, bgConfig->bgs[GF_BG_LYR_SUB_3].rotation, bgConfig->bgs[GF_BG_LYR_SUB_3].xScale, bgConfig->bgs[GF_BG_LYR_SUB_3].yScale, 2); G2S_SetBG3Affine( &st08, - bgConfig->bgs[7].centerX, - bgConfig->bgs[7].centerY, - bgConfig->bgs[7].hOffset, - bgConfig->bgs[7].vOffset); + bgConfig->bgs[GF_BG_LYR_SUB_3].centerX, + bgConfig->bgs[GF_BG_LYR_SUB_3].centerY, + bgConfig->bgs[GF_BG_LYR_SUB_3].hOffset, + bgConfig->bgs[GF_BG_LYR_SUB_3].vOffset); } } } @@ -5311,13 +5310,13 @@ THUMB_FUNC void Bg_SetAffineRotation(struct Bg *bg, u32 op, u16 val) { switch (op) { - case 0: + case BG_POS_OP_SET_ROT: bg->rotation = val; break; - case 1: + case BG_POS_OP_ADD_ROT: bg->rotation += val; break; - case 2: + case BG_POS_OP_SUB_ROT: bg->rotation -= val; break; } @@ -5334,35 +5333,35 @@ THUMB_FUNC void Bg_SetAffinePos(struct Bg *bg, u32 op, fx32 val) { switch (op) { - case 9: + case BG_POS_OP_SET_CENTERX: bg->centerX = val; break; - case 10: + case BG_POS_OP_ADD_CENTERX: bg->centerX += val; break; - case 11: + case BG_POS_OP_SUB_CENTERX: bg->centerX -= val; break; - case 12: + case BG_POS_OP_SET_CENTERY: bg->centerY = val; break; - case 13: + case BG_POS_OP_ADD_CENTERY: bg->centerY += val; break; - case 14: + case BG_POS_OP_SUB_CENTERY: bg->centerY -= val; break; } } -THUMB_FUNC u32 FUN_0201AFBC( +THUMB_FUNC u32 DoesPixelAtScreenXYMatchPtrVal( struct BgConfig *bgConfig, u8 bgId, u8 x, u8 y, u16 *src) { - void *st18; - u16 r6; - u8 st14; - u8 st10; - u8 r5; + void *bgCharPtr; + u16 tilemapIdx; + u8 xPixOffs; + u8 yPixOffs; + u8 pixelValue; u8 i; if (bgConfig->bgs[bgId].tilemapBuffer == NULL) @@ -5370,60 +5369,61 @@ THUMB_FUNC u32 FUN_0201AFBC( return 0; } - r6 = GetTileMapIndexFromCoords((u8) (x >> 3), (u8) (y >> 3), bgConfig->bgs[bgId].size); - st18 = FUN_020187B0(bgId); + tilemapIdx = GetTileMapIndexFromCoords((u8) (x >> 3), (u8) (y >> 3), bgConfig->bgs[bgId].size); + bgCharPtr = BgGetCharPtr(bgId); - st14 = (u8)(x & 7); - st10 = (u8)(y & 7); + xPixOffs = (u8)(x & 7); + yPixOffs = (u8)(y & 7); if (bgConfig->bgs[bgId].colorMode == 0) { - u16 *stc = bgConfig->bgs[bgId].tilemapBuffer; + u16 *tilemapBuffer = bgConfig->bgs[bgId].tilemapBuffer; u8 *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, 0x40); - st18 += ((stc[r6] & 0x3ff) << 5); + bgCharPtr += ((tilemapBuffer[tilemapIdx] & 0x3ff) << 5); for (i = 0; i < 0x20; i++) { - ptr[(i << 1)] = (u8)(((u8 *)st18)[i] & 0xf); - ptr[(i << 1) + 1] = (u8)(((u8 *)st18)[i] >> 4); + ptr[(i << 1)] = (u8)(((u8 *)bgCharPtr)[i] & 0xf); + ptr[(i << 1) + 1] = (u8)(((u8 *)bgCharPtr)[i] >> 4); } - FUN_0201B118(bgConfig, (u8)((stc[r6] >> 0xa) & 3), ptr); + ApplyFlipFlagsToTile(bgConfig, (u8)((tilemapBuffer[tilemapIdx] >> 0xa) & 3), ptr); - r5 = ptr[st14 + (st10 << 3)]; + pixelValue = ptr[xPixOffs + (yPixOffs << 3)]; FreeToHeap(ptr); - if ((src[0] & (1 << r5)) != 0) + if ((src[0] & (1 << pixelValue)) != 0) { return 1; } } else { - if (bgConfig->bgs[bgId].mode != 1) + if (bgConfig->bgs[bgId].mode != GF_BG_TYPE_AFFINE) { - u16 *r4 = bgConfig->bgs[bgId].tilemapBuffer; + u16 *tilemapBuffer = bgConfig->bgs[bgId].tilemapBuffer; u8 *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, 0x40); - memcpy(ptr, st18 + ((r4[r6] & 0x3ff) << 6), 0x40); + memcpy(ptr, bgCharPtr + ((tilemapBuffer[tilemapIdx] & 0x3ff) << 6), 0x40); - FUN_0201B118(bgConfig, (u8)((r4[r6] >> 0xa) & 3), ptr); + ApplyFlipFlagsToTile(bgConfig, (u8)((tilemapBuffer[tilemapIdx] >> 0xa) & 3), ptr); - r5 = ptr[st14 + (st10 << 3)]; + pixelValue = ptr[xPixOffs + (yPixOffs << 3)]; FreeToHeap(ptr); } else { - r5 = ((u8 *)st18)[(((u8 *)bgConfig->bgs[bgId].tilemapBuffer)[r6] << 6) + st14 + (st10 << 3)]; + pixelValue = ((u8 *)bgCharPtr)[(((u8 *)bgConfig->bgs[bgId].tilemapBuffer)[tilemapIdx] << 6) + xPixOffs + (yPixOffs << 3)]; } + // BUG: Infinite loop while (TRUE) { if (src[0] == 0xffff) { break; } - if (r5 == (u8)(src[0])) + if (pixelValue == (u8)(src[0])) { return 1; } @@ -5432,39 +5432,39 @@ THUMB_FUNC u32 FUN_0201AFBC( return 0; } -THUMB_FUNC void FUN_0201B118(struct BgConfig *param0, u8 param1, u8 *param2) +THUMB_FUNC void ApplyFlipFlagsToTile(struct BgConfig *bgConfig, u8 flag, u8 *src) { u8 i, j; - if (param1 != 0) + if (flag != 0) { - u8 *ptr = AllocFromHeapAtEnd(param0->heap_id, 0x40); + u8 *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, 0x40); - if ((param1 & 1) != 0) + if ((flag & 1) != 0) { for (i = 0; i < 8; i++) { for (j = 0; j < 8; j++) { - ptr[i * 8 + j] = param2[i * 8 + (7 - j)]; + ptr[i * 8 + j] = src[i * 8 + (7 - j)]; } } - memcpy(param2, ptr, 0x40); + memcpy(src, ptr, 0x40); } - if ((param1 & 2) != 0) + if ((flag & 2) != 0) { for (i = 0; i < 8; i++) { u8 *r3 = &ptr[i * 8]; - u8 *r2 = ¶m2[(7 - i) * 8]; + u8 *r2 = &src[(7 - i) * 8]; for (u32 j = 8; j > 0; j--) { *r3++ = *r2++; } } - memcpy(param2, ptr, 0x40); + memcpy(src, ptr, 0x40); } FreeToHeap(ptr); diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index 128092eb..0c6ac0fe 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -3,7 +3,7 @@ #include "gx.h" #include "unk_02031734.h" #include "unk_0202F150.h" -#include "unk_02016B94.h" +#include "bg_window.h" #include "PAD_pad.h" @@ -75,11 +75,11 @@ THUMB_FUNC void PrintErrorMessageAndReset() reg_GXS_DB_DISPCNT &= ~(REG_GXS_DB_DISPCNT_OW_MASK | REG_GXS_DB_DISPCNT_W1_MASK | REG_GXS_DB_DISPCNT_W0_MASK); GX_SetBanks(&UNK_020FF4D8); - ptr = FUN_02016B94(0); - FUN_02016BBC(&UNK_020FF4AC); + ptr = BgConfig_Alloc(0); + SetBothScreensModesAndDisable(&UNK_020FF4AC); - FUN_02016C18(ptr, 0, &UNK_020FF4BC, 0); - FUN_02018744(ptr, 0); + InitBgFromTemplate(ptr, 0, &UNK_020FF4BC, 0); + BgClearTilemapBufferAndCommit(ptr, 0); FUN_0200CB00(ptr, 0, 503, 2, 0, 0); diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index eac7b417..1dc7f50e 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -31,8 +31,8 @@ THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgC if (szByte == 0)
szByte = pScreenData->szByte;
if (GetBgTilemapBuffer(unkStruct02016B94_2, (u8) a3) != NULL)
- FUN_02017DFC(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte);
- FUN_02017CE8(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte, a4);
+ BG_LoadScreenTilemapData(unkStruct02016B94_2, (u8) a3, pScreenData->rawData, szByte);
+ BgCopyOrUncompressTilemapBufferRangeToVram(unkStruct02016B94_2, (u8) a3, pScreenData->rawData, szByte, a4);
}
FreeToHeap(pFile);
}
diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 34ae6e20..6287579c 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -4,7 +4,7 @@ #include "options.h" #include "player_data.h" #include "text.h" -#include "unk_02016B94.h" +#include "bg_window.h" extern void *FUN_02039438(struct UnkSavStruct80* arg, u32 id); extern void *CreateScriptContext(struct UnkSavStruct80* arg, u16 id); @@ -834,11 +834,11 @@ THUMB_FUNC static BOOL FUN_0203A6C8(struct ScriptContext* ctx) { if (*xdir == 0) { - FUN_020179E0(unk80->unk08, 3, 1, *xval); + BgSetPosTextAndCommit(unk80->unk08, 3, 1, *xval); } else { - FUN_020179E0(unk80->unk08, 3, 2, *xval); + BgSetPosTextAndCommit(unk80->unk08, 3, 2, *xval); } } @@ -846,11 +846,11 @@ THUMB_FUNC static BOOL FUN_0203A6C8(struct ScriptContext* ctx) { if (*ydir == 0) { - FUN_020179E0(unk80->unk08, 3, 4, *yval); + BgSetPosTextAndCommit(unk80->unk08, 3, 4, *yval); } else { - FUN_020179E0(unk80->unk08, 3, 5, *yval); + BgSetPosTextAndCommit(unk80->unk08, 3, 5, *yval); } } diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c index bc779ad7..d4984f78 100644 --- a/arm9/src/text_02054590.c +++ b/arm9/src/text_02054590.c @@ -1,6 +1,6 @@ #include "text_02054590.h" #include "text.h" -#include "unk_02016B94.h" +#include "bg_window.h" extern void FUN_0201BD5C(void); extern void FUN_02002ED0(u32 param0, u32 param1, u32 param2); diff --git a/include/unk_02016B94.h b/include/bg_window.h index df9fa25a..91026b4d 100644 --- a/include/unk_02016B94.h +++ b/include/bg_window.h @@ -17,7 +17,7 @@ struct BgTemplate u32 bufferSize; u32 unk0c; - u8 unk10; + u8 size; u8 colorMode; u8 screenBase; u8 charBase; @@ -32,7 +32,7 @@ struct Bg { void *tilemapBuffer; u32 bufferSize; - u32 unk10; + u32 baseTile; fx32 hOffset; fx32 vOffset; @@ -89,41 +89,112 @@ struct Window void *pixelBuffer; }; -struct BgConfig *FUN_02016B94(u32 heap_id); -u32 FUN_02016BB8(u32 *param0); -void FUN_02016BBC(const struct GraphicsModes *modes); -void FUN_02016BF4(const struct GraphicsModes *param0, u32 param1); -void FUN_02016C18( - struct BgConfig *param0, u8 param1, const struct BgTemplate *template, u8 bgMode); -void FUN_020170F4(struct BgConfig *config, u8 bgId, u32 attr, u8 value); -u8 FUN_020177DC(u8 param0, u32 param1); +enum GFBgLayer +{ + GF_BG_LYR_MAIN_0 = 0, + GF_BG_LYR_MAIN_1, + GF_BG_LYR_MAIN_2, + GF_BG_LYR_MAIN_3, + GF_BG_LYR_SUB_0, + GF_BG_LYR_SUB_1, + GF_BG_LYR_SUB_2, + GF_BG_LYR_SUB_3, + GF_BG_LYR_MAIN_CNT = 4, + GF_BG_LYR_SUB_CNT = 4, + GF_BG_LYR_MAIN_FIRST = GF_BG_LYR_MAIN_0, + GF_BG_LYR_SUB_FIRST = GF_BG_LYR_SUB_0, + + GF_BG_LYR_MAIN_0_F = 1 << (GF_BG_LYR_MAIN_0 - GF_BG_LYR_MAIN_FIRST), + GF_BG_LYR_MAIN_1_F = 1 << (GF_BG_LYR_MAIN_1 - GF_BG_LYR_MAIN_FIRST), + GF_BG_LYR_MAIN_2_F = 1 << (GF_BG_LYR_MAIN_2 - GF_BG_LYR_MAIN_FIRST), + GF_BG_LYR_MAIN_3_F = 1 << (GF_BG_LYR_MAIN_3 - GF_BG_LYR_MAIN_FIRST), + GF_BG_LYR_SUB_0_F = 1 << (GF_BG_LYR_SUB_0 - GF_BG_LYR_SUB_FIRST), + GF_BG_LYR_SUB_1_F = 1 << (GF_BG_LYR_SUB_1 - GF_BG_LYR_SUB_FIRST), + GF_BG_LYR_SUB_2_F = 1 << (GF_BG_LYR_SUB_2 - GF_BG_LYR_SUB_FIRST), + GF_BG_LYR_SUB_3_F = 1 << (GF_BG_LYR_SUB_3 - GF_BG_LYR_SUB_FIRST), +}; + +enum GFBgType +{ + GF_BG_TYPE_TEXT = 0, + GF_BG_TYPE_AFFINE, + GF_BG_TYPE_256x16PLTT, +}; + +enum GFBgCntSet +{ + GF_BG_CNT_SET_COLOR_MODE = 0, + GF_BG_CNT_SET_SCREEN_BASE, + GF_BG_CNT_SET_CHAR_BASE, +}; + +enum GFBgScreenSize +{ + GF_BG_SCR_SIZE_128x128 = 0, + GF_BG_SCR_SIZE_256x256, + GF_BG_SCR_SIZE_256x512, + GF_BG_SCR_SIZE_512x256, + GF_BG_SCR_SIZE_512x512, + GF_BG_SCR_SIZE_1024x1024 +}; + +enum BgPosAdjustOp +{ + // Text layers + BG_POS_OP_SET_X = 0, + BG_POS_OP_ADD_X, + BG_POS_OP_SUB_X, + BG_POS_OP_SET_Y, + BG_POS_OP_ADD_Y, + BG_POS_OP_SUB_Y, + + // Affine layers + BG_POS_OP_SET_ROT = 0, + BG_POS_OP_ADD_ROT, + BG_POS_OP_SUB_ROT, + BG_POS_OP_SET_CENTERX = 9, + BG_POS_OP_ADD_CENTERX, + BG_POS_OP_SUB_CENTERX, + BG_POS_OP_SET_CENTERY, + BG_POS_OP_ADD_CENTERY, + BG_POS_OP_SUB_CENTERY, +}; + +struct BgConfig *BgConfig_Alloc(u32 heap_id); +u32 BgConfig_GetHeapId(struct BgConfig *bgConfig); +void SetBothScreensModesAndDisable(const struct GraphicsModes *modes); +void SetScreenModeAndDisable(const struct GraphicsModes *gfxModes, u32 whichScreen); +void InitBgFromTemplate( + struct BgConfig *bgConfig, u8 bgId, const struct BgTemplate *template, u8 bgMode); +void SetBgControlParam(struct BgConfig *config, u8 bgId, u32 attr, u8 value); +u8 TranslateGFBgModePairToGXScreenSize(u8 size, u32 bgMode); void GetBgScreenDimensions(u32 screenSize, u8 *width_p, u8 *height_p); -void FUN_020178A0(struct BgConfig *bgConfig, u32 bgId); -void FUN_020178BC(u32 bgId, u16 priority); +void FreeBgTilemapBuffer(struct BgConfig *bgConfig, u32 bgId); +void SetBgPriority(u32 bgId, u16 priority); void ToggleBgLayer(u32 bgId, GX_LayerToggle toggle); -void FUN_020179E0(struct BgConfig *bgConfig, u32 bgId, u32 param2, fx32 val); -fx32 FUN_02017B48(struct BgConfig *param0, u32 param1); -fx32 FUN_02017B54(struct BgConfig *param0, u32 param1); -void FUN_02017B60(struct BgConfig *param0, - u32 param1, - u32 param2, - fx32 param3, - struct Mtx22 *param4, - fx32 param5, - fx32 param6); +void BgSetPosTextAndCommit(struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 val); +fx32 Bg_GetXpos(struct BgConfig *bgConfig, u32 bgId); +fx32 Bg_GetYpos(struct BgConfig *bgConfig, u32 bgId); +void Bg_SetTextDimAndAffineParams(struct BgConfig *bgConfig, + u32 bgId, + u32 txOp, + fx32 txVal, + struct Mtx22 *mtx, + fx32 centerX, + fx32 centerY); void Bg_SetPosText(struct Bg *bg, u32 op, fx32 val); -void FUN_02017BD0(struct BgConfig *param0, - u32 param1, - struct Mtx22 *param2, - fx32 param3, - fx32 param4); -void FUN_02017C6C(struct BgConfig *param0, u32 param1); -void FUN_02017C98(const void *param0, void *param1, u32 param2); -void FUN_02017CD0(struct BgConfig *param0, u32 param1); -void FUN_02017CE8( - struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4); +void SetBgAffine(struct BgConfig *bgConfig, + u32 bgId, + struct Mtx22 *mtx, + fx32 centerX, + fx32 centerY); +void BgAffineReset(struct BgConfig *bgConfig, u32 bgId); +void CopyOrUncompressTilemapData(const void *src, void *dest, u32 size); +void BgCommitTilemapBufferToVram(struct BgConfig *bgConfig, u32 bgId); +void BgCopyOrUncompressTilemapBufferRangeToVram( + struct BgConfig *bgConfig, u32 bgId, u32 *src, u32 size, u32 tileOffset); void LoadBgVramScr(u32 bgId, void *buffer_p, u32 offset, u32 size); -void FUN_02017DFC(struct BgConfig *param0, u32 param1, void *param2, u32 param3); +void BG_LoadScreenTilemapData(struct BgConfig *bgConfig, u32 bgId, void *src, u32 numTiles); void BG_LoadCharTilesData( struct BgConfig *bgConfig, u32 bgId, u32 *charData, u32 offset, u32 numTiles); void BG_LoadCharPixelData( @@ -211,14 +282,14 @@ void BgTilemapRectChangePalette(struct BgConfig *bgConfig, u8 width, u8 height, u8 paletteNum); -void FUN_02018744(struct BgConfig *param0, u32 param1); -void FUN_02018768(struct BgConfig *param0, u32 param1, u16 param2); -void FUN_0201878C(struct BgConfig *param0, u32 param1, u16 param2); -void *FUN_020187B0(u32 param0); -void FUN_02018808(u8 *param0, u32 param1, u8 (*param2)[2], u8 param3); -u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2]; +void BgClearTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgId); +void BgFillTilemapBufferAndCommit(struct BgConfig *bgConfig, u32 bgId, u16 fillValue); +void BgFillTilemapBufferAndSchedule(struct BgConfig *bgConfig, u32 bgId, u16 fillValue); +void *BgGetCharPtr(u32 bgId); +void Convert4bppTo8bppInternal(u8 *src4bpp, u32 size, u8 (*dest8bpp), u8 paletteNum); +u8 *Convert4bppTo8bpp(u8 *src4Bpp, u32 size, u8 paletteNum, u32 heap_id); void *GetBgTilemapBuffer(struct BgConfig *bgConfig, u8 bgId); -u16 FUN_02018878(struct BgConfig *param0, u32 param1); +u16 GetBgAffineRotation(struct BgConfig *bgConfig, u32 bgId); u8 GetBgPriority(struct BgConfig *bgConfig, u32 bgId); void BlitBitmapRect4Bit(const struct Bitmap *src, const struct Bitmap *dst, @@ -266,25 +337,25 @@ void AddWindow(struct BgConfig *bgConfig, void RemoveWindow(struct Window *window); void WindowArray_dtor(struct Window *windows, int count); void CopyWindowToVram(struct Window *window); -void FUN_02019220(struct Window *window); +void ScheduleWindowCopyToVram(struct Window *window); void PutWindowTilemap(struct Window *window); void PutWindowTilemapRectAnchoredTopLeft(struct Window *window, u8 width, u8 height); -void FUN_020192B8(struct Window *window); +void ClearWindowTilemap(struct Window *window); void PutWindowTilemap_TextMode(struct Window *param0); void PutWindowTilemap_AffineMode(struct Window *window); void ClearWindowTilemapText(struct Window *window); void ClearWindowTilemapAffine(struct Window *window); void CopyWindowToVram_TextMode(struct Window *window); -void FUN_020194C8(struct Window *window); +void ScheduleWindowCopyToVram_TextMode(struct Window *window); void CopyWindowToVram_AffineMode(struct Window *window); -void FUN_0201951C(struct Window *window); -void FUN_02019548(struct Window *window); -void FUN_02019570(struct Window *window); -void FUN_0201958C(struct Window *window); -void FUN_020195A8(struct Window *window); -void FUN_020195D0(struct Window *window); -void FUN_020195E4(struct Window *window); -void FUN_0201960C(struct Window *window); +void ScheduleWindowCopyToVram_AffineMode(struct Window *window); +void CopyWindowPixelsToVram_TextMode(struct Window *window); +void ClearWindowTilemapAndCopyToVram(struct Window *window); +void ClearWindowTilemapAndScheduleTransfer(struct Window *window); +void ClearWindowTilemapAndCopyToVram_TextMode(struct Window *window); +void ClearWindowTilemapAndScheduleTransfer_TextMode(struct Window *window); +void ClearWindowTilemapAndCopyToVram_AffineMode(struct Window *window); +void ClearWindowTilemapAndScheduleTransfer_AffineMode(struct Window *window); void FillWindowPixelBuffer(struct Window *window, u8 param1); void BlitBitmapRectToWindow(struct Window *window, const void *src, @@ -339,7 +410,7 @@ void ScheduleSetBgAffineRotation(struct BgConfig *bgConfig, u32 bgId, u32 op, u1 void Bg_SetAffineRotation(struct Bg *bg, u32 op, u16 val); void ScheduleSetBgAffinePos(struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 value); void Bg_SetAffinePos(struct Bg *bg, u32 op, fx32 val); -u32 FUN_0201AFBC(struct BgConfig *bgConfig, u8 bgId, u8 x, u8 y, u16 *src); -void FUN_0201B118(struct BgConfig *param0, u8 param1, u8 *param2); +u32 DoesPixelAtScreenXYMatchPtrVal(struct BgConfig *bgConfig, u8 bgId, u8 x, u8 y, u16 *src); +void ApplyFlipFlagsToTile(struct BgConfig *bgConfig, u8 flag, u8 *src); #endif // POKEDIAMOND_UNK_02016B94_H diff --git a/include/gf_gfx_loader.h b/include/gf_gfx_loader.h index 3f23d1ff..cb7de269 100644 --- a/include/gf_gfx_loader.h +++ b/include/gf_gfx_loader.h @@ -1,7 +1,7 @@ #ifndef POKEDIAMOND_GF_GFX_LOADER_H
#define POKEDIAMOND_GF_GFX_LOADER_H
-#include "unk_02016B94.h"
+#include "bg_window.h"
u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct BgConfig * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
diff --git a/include/list_menu_cursor.h b/include/list_menu_cursor.h index e4a4b6b9..a2337e9a 100644 --- a/include/list_menu_cursor.h +++ b/include/list_menu_cursor.h @@ -1,7 +1,7 @@ #ifndef POKEDIAMOND_LIST_MENU_CURSOR_H #define POKEDIAMOND_LIST_MENU_CURSOR_H -#include "unk_02016B94.h" +#include "bg_window.h" // TODO: Move to its own header, and fill it out struct ListMenuCursor diff --git a/include/script.h b/include/script.h index 2f5e6540..75b65f90 100644 --- a/include/script.h +++ b/include/script.h @@ -4,7 +4,7 @@ #include "global.h"
#include "msgdata.h"
#include "save_block_2.h"
-#include "unk_02016B94.h"
+#include "bg_window.h"
struct ScriptContext;
diff --git a/include/script_buffers.h b/include/script_buffers.h index 9a742545..b9f0e268 100644 --- a/include/script_buffers.h +++ b/include/script_buffers.h @@ -4,7 +4,7 @@ #include "pokemon.h" #include "pokemon_storage_system.h" #include "trainer_data.h" -#include "unk_02016B94.h" +#include "bg_window.h" struct UnkStruct_0200AA80_sub_sub { diff --git a/include/text.h b/include/text.h index c9984d75..034447c7 100644 --- a/include/text.h +++ b/include/text.h @@ -3,7 +3,7 @@ #include "global.h" #include "font.h" -#include "unk_02016B94.h" +#include "bg_window.h" #define CHAR_0 0x00A2 diff --git a/include/text_02054590.h b/include/text_02054590.h index eaffb2a0..b2f4898b 100644 --- a/include/text_02054590.h +++ b/include/text_02054590.h @@ -3,7 +3,7 @@ #include "global.h" #include "options.h" -#include "unk_02016B94.h" +#include "bg_window.h" #include "string16.h" |