diff options
Diffstat (limited to 'arm9/modules/16/asm/module_16.s')
-rw-r--r-- | arm9/modules/16/asm/module_16.s | 352 |
1 files changed, 176 insertions, 176 deletions
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 9417b6bd..66103b62 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -1065,7 +1065,7 @@ MOD16_021D7CC8: ; 0x021D7CC8 lsl r1, r1, #0x18 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r1, [r5, #0x14] ldr r6, [r5, #0x1c] add r0, r1, #0 @@ -1106,7 +1106,7 @@ MOD16_021D7CC8: ; 0x021D7CC8 lsl r1, r1, #0x18 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_02018170 + bl CopyToBgTilemapRect _021D7D4C: mov r0, #0x20 sub r3, r0, r4 @@ -1130,13 +1130,13 @@ _021D7D4C: ldr r0, [r5] lsr r1, r1, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect _021D7D7C: ldr r1, [r5, #8] ldr r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x1c] add sp, #0x1c add r0, r0, #1 @@ -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 @@ -2330,7 +2330,7 @@ MOD16_021D86DC: ; 0x021D86DC push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates mov r0, #0x55 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3198,7 +3198,7 @@ _021D8CDC: ldr r2, [r2, #0x14] lsr r1, r1, #0x18 add r3, r4, #0 - bl FUN_02017E14 + bl BG_LoadCharTilesData _021D8CF0: add r0, r7, #0 bl FreeToHeap @@ -3335,15 +3335,15 @@ 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 add r3, r4, #0 - bl FUN_02017F18 + 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,18 +3358,18 @@ 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 add r3, r4, #0 - bl FUN_02017F18 + 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,15 +3387,15 @@ 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 add r3, r4, #0 - bl FUN_02017F18 + 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,15 +3410,15 @@ 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 add r3, r4, #0 - bl FUN_02017F18 + 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,15 +3433,15 @@ 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 add r3, r4, #0 - bl FUN_02017F18 + 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,15 +3456,15 @@ 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 add r3, r4, #0 - bl FUN_02017F18 + 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 @@ -3515,7 +3515,7 @@ MOD16_021D8F60: ; 0x021D8F60 ldr r0, [r4] add r1, r4, #4 mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #4 mov r1, #0 bl FillWindowPixelBuffer @@ -3531,7 +3531,7 @@ MOD16_021D8F90: ; 0x021D8F90 add r0, r0, #4 bx r3 nop -_021D8F98: .word FUN_02019178 +_021D8F98: .word RemoveWindow thumb_func_end MOD16_021D8F90 thumb_func_start MOD16_021D8F9C @@ -8445,7 +8445,7 @@ MOD16_021DB388: ; 0x021DB388 add r1, r7, #0 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner add r0, r7, #0 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -8457,7 +8457,7 @@ MOD16_021DB3BC: ; 0x021DB3BC mov r1, #1 bx r3 nop -_021DB3C4: .word FUN_020191A4 +_021DB3C4: .word WindowArray_dtor thumb_func_end MOD16_021DB3BC thumb_func_start MOD16_021DB3C8 @@ -11429,7 +11429,7 @@ MOD16_021DC860: ; 0x021DC860 lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r5] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -11454,12 +11454,12 @@ MOD16_021DC860: ; 0x021DC860 lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r5] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021DC860 @@ -11607,7 +11607,7 @@ MOD16_021DC958: ; 0x021DC958 bl DestroyMsgData ldr r0, [r5] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -11669,7 +11669,7 @@ MOD16_021DCA2C: ; 0x021DCA2C bl DestroyMsgData ldr r0, [r5] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -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 @@ -13130,7 +13130,7 @@ _021DD5FE: mov r1, #1 ldr r0, [r0] mov r2, #3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _021DD60A: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -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 @@ -14854,12 +14854,12 @@ _021DE2AC: lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r6, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap add r0, r6, #0 mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -15438,23 +15438,23 @@ MOD16_021DE788: ; 0x021DE788 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r4, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap add r0, r4, #0 mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r2, #0 add r3, r2, #0 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 @@ -15469,10 +15469,10 @@ MOD16_021DE808: ; 0x021DE808 mov r0, #7 mov r1, #0x40 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r4, pc} thumb_func_end MOD16_021DE808 @@ -15606,19 +15606,19 @@ MOD16_021DE8D0: ; 0x021DE8D0 mov r1, #7 add r2, r6, #0 lsr r3, r3, #0x10 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #9 mov r3, #0x80 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #0xc mov r3, #0x68 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldrh r0, [r5, #0x28] strh r0, [r5, #0x2a] pop {r4, r5, r6, pc} @@ -15658,19 +15658,19 @@ _021DE95E: mov r1, #7 mov r2, #0 lsr r3, r3, #0x10 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #9 mov r3, #0x80 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #0xc mov r3, #0x68 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldr r0, [r7, #0x1c] ldr r0, [r0, #0xc] cmp r0, #0 @@ -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 @@ -16657,7 +16657,7 @@ MOD16_021DEFF8: ; 0x021DEFF8 ldr r0, [r5] mov r1, #7 add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum add r0, r5, #0 bl MOD16_021DF17C add r0, r5, #0 @@ -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 @@ -16741,13 +16741,13 @@ MOD16_021DF0BC: ; 0x021DF0BC ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_0201AB24 + 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 @@ -17304,7 +17304,7 @@ MOD16_021DF514: ; 0x021DF514 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [sp, #0x10] bl FreeToHeap cmp r7, #3 @@ -17361,13 +17361,13 @@ _021DF584: str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD16_021DF514 @@ -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 @@ -18761,13 +18761,13 @@ MOD16_021DFFE0: ; 0x021DFFE0 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -25958,7 +25958,7 @@ MOD16_021E3348: ; 0x021E3348 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r7, #0 bl FreeToHeap ldr r1, [r6] @@ -25989,7 +25989,7 @@ MOD16_021E3348: ; 0x021E3348 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r7, #0 bl FreeToHeap _021E33E6: @@ -26021,7 +26021,7 @@ _021E33E6: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r7, #0 bl FreeToHeap _021E342A: @@ -26053,7 +26053,7 @@ _021E342A: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r7, #0 bl FreeToHeap _021E346E: @@ -26085,14 +26085,14 @@ _021E346E: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap _021E34B2: ldr r0, [r5] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -26968,7 +26968,7 @@ MOD16_021E3B70: ; 0x021E3B70 ldr r0, [r4] mov r1, #8 add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum add sp, #4 pop {r3, r4, r5, r6, pc} nop @@ -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 @@ -27008,7 +27008,7 @@ MOD16_021E3BC8: ; 0x021E3BC8 str r1, [r5, r0] ldr r0, [r4] add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum pop {r3, r4, r5, pc} .align 2, 0 _021E3C10: .word 0x000007F4 @@ -28428,13 +28428,13 @@ MOD16_021E4634: ; 0x021E4634 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -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 @@ -29649,7 +29649,7 @@ MOD16_021E4F1C: ; 0x021E4F1C str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -29674,7 +29674,7 @@ MOD16_021E4F1C: ; 0x021E4F1C str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -29700,7 +29700,7 @@ MOD16_021E4F1C: ; 0x021E4F1C str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -29726,13 +29726,13 @@ MOD16_021E4F1C: ; 0x021E4F1C str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -31837,13 +31837,13 @@ MOD16_021E5FA4: ; 0x021E5FA4 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -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 @@ -34357,7 +34357,7 @@ MOD16_021E71D0: ; 0x021E71D0 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -34382,7 +34382,7 @@ MOD16_021E71D0: ; 0x021E71D0 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -34408,7 +34408,7 @@ MOD16_021E71D0: ; 0x021E71D0 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -34434,13 +34434,13 @@ MOD16_021E71D0: ; 0x021E71D0 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -36577,7 +36577,7 @@ MOD16_021E82B8: ; 0x021E82B8 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -36603,7 +36603,7 @@ MOD16_021E82B8: ; 0x021E82B8 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -36629,13 +36629,13 @@ MOD16_021E82B8: ; 0x021E82B8 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -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 @@ -38728,13 +38728,13 @@ _021E932E: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #2 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021E92F8 @@ -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 @@ -39868,13 +39868,13 @@ _021E9B9E: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #5 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021E9B60 @@ -41560,13 +41560,13 @@ MOD16_021EA7F0: ; 0x021EA7F0 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -41582,7 +41582,7 @@ MOD16_021EA858: ; 0x021EA858 ldr r0, [r0] mov r1, #1 add r3, r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #0 mov r0, #1 lsl r0, r0, #8 @@ -41597,11 +41597,11 @@ 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 - bl FUN_0201AB24 + bl SetWindowPaletteNum add sp, #8 pop {r4, pc} thumb_func_end MOD16_021EA858 @@ -42135,10 +42135,10 @@ _021EAC8A: ldr r3, [r5, r3] mov r1, #1 mov r2, #0 - bl FUN_0201AEE4 + 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 @@ -42156,7 +42156,7 @@ MOD16_021EACB0: ; 0x021EACB0 ldr r0, [r4] mov r1, #9 add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum mov r0, #0xca mov r2, #0x97 lsl r0, r0, #2 @@ -43594,13 +43594,13 @@ MOD16_021EB724: ; 0x021EB724 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap ldr r0, [r5] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5] mov r1, #0 str r1, [sp] @@ -43634,30 +43634,30 @@ MOD16_021EB724: ; 0x021EB724 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #7 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5] mov r2, #0 add r3, r2, #0 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 @@ -44379,19 +44379,19 @@ _021EBD70: mov r1, #7 mov r2, #0 lsr r3, r3, #0x10 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #9 mov r3, #0x83 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #0xc mov r3, #0x63 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos str r6, [r5, #0x48] pop {r4, r5, r6, pc} thumb_func_end MOD16_021EBD58 @@ -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} @@ -45562,13 +45562,13 @@ MOD16_021EC5A8: ; 0x021EC5A8 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -47021,13 +47021,13 @@ MOD16_021ED0D0: ; 0x021ED0D0 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -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 @@ -48319,13 +48319,13 @@ MOD16_021EDA7C: ; 0x021EDA7C str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -50510,13 +50510,13 @@ MOD16_021EEB50: ; 0x021EEB50 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -51352,20 +51352,20 @@ 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 add r3, r4, #0 - bl FUN_02017F18 + 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,29 +51378,29 @@ 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 add r3, r4, #0 - bl FUN_02017F18 + 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,20 +51413,20 @@ 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 add r3, r4, #0 - bl FUN_02017F18 + 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 @@ -51470,7 +51470,7 @@ MOD16_021EF318: ; 0x021EF318 add r1, r4, #0 mov r2, #1 str r3, [sp, #0x10] - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -51486,12 +51486,12 @@ MOD16_021EF318: ; 0x021EF318 MOD16_021EF358: ; 0x021EF358 push {r4, lr} add r4, r0, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor pop {r4, pc} thumb_func_end MOD16_021EF358 @@ -52092,7 +52092,7 @@ MOD16_021EF790: ; 0x021EF790 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r5, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -52116,7 +52116,7 @@ MOD16_021EF790: ; 0x021EF790 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r5, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -52141,7 +52141,7 @@ MOD16_021EF790: ; 0x021EF790 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r5, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -52166,12 +52166,12 @@ MOD16_021EF790: ; 0x021EF790 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r5, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap add r0, r5, #0 mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021EF790 @@ -52214,12 +52214,12 @@ MOD16_021EF8A8: ; 0x021EF8A8 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r4, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap add r0, r4, #0 mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 |