diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-04 20:43:31 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-04 20:43:31 -0400 |
commit | ae369d76f0415f105020c6084fc1a6687c86407c (patch) | |
tree | 9b17e91a7824c4c13a322fea7d9ab0afef153f62 /arm9/modules/16 | |
parent | e29c9e21ba9b64c86ac677b2bf4a69e92e8ac34b (diff) |
Rename more bg and window routines
Diffstat (limited to 'arm9/modules/16')
-rw-r--r-- | arm9/modules/16/asm/module_16.s | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 76c5a9b3..208c87e1 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -1136,7 +1136,7 @@ _021D7D7C: 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 @@ -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 @@ -3340,7 +3340,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 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 @@ -3363,7 +3363,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 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 @@ -3392,7 +3392,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 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 @@ -3415,7 +3415,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 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 @@ -3438,7 +3438,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 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 @@ -3461,7 +3461,7 @@ MOD16_021D8DC0: ; 0x021D8DC0 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 @@ -11459,7 +11459,7 @@ MOD16_021DC860: ; 0x021DC860 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 @@ -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} @@ -14859,7 +14859,7 @@ _021DE2AC: 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 @@ -15443,7 +15443,7 @@ MOD16_021DE788: ; 0x021DE788 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 @@ -15469,7 +15469,7 @@ 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 @@ -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 @@ -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 @@ -16741,7 +16741,7 @@ 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 @@ -17367,7 +17367,7 @@ _021DF584: 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 @@ -18767,7 +18767,7 @@ MOD16_021DFFE0: ; 0x021DFFE0 ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -26092,7 +26092,7 @@ _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 @@ -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 @@ -28434,7 +28434,7 @@ MOD16_021E4634: ; 0x021E4634 ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -29732,7 +29732,7 @@ MOD16_021E4F1C: ; 0x021E4F1C 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 @@ -31843,7 +31843,7 @@ MOD16_021E5FA4: ; 0x021E5FA4 ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -34440,7 +34440,7 @@ MOD16_021E71D0: ; 0x021E71D0 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 @@ -36635,7 +36635,7 @@ MOD16_021E82B8: ; 0x021E82B8 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 @@ -38734,7 +38734,7 @@ _021E932E: 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 @@ -39874,7 +39874,7 @@ _021E9B9E: 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 @@ -41566,7 +41566,7 @@ MOD16_021EA7F0: ; 0x021EA7F0 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 @@ -41601,7 +41601,7 @@ MOD16_021EA858: ; 0x021EA858 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,7 +42135,7 @@ _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 @@ -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 @@ -43600,7 +43600,7 @@ MOD16_021EB724: ; 0x021EB724 ldr r0, [r5] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5] mov r1, #0 str r1, [sp] @@ -43640,7 +43640,7 @@ MOD16_021EB724: ; 0x021EB724 ldr r0, [r5] mov r1, #7 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5] mov r2, #0 add r3, r2, #0 @@ -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 @@ -45568,7 +45568,7 @@ MOD16_021EC5A8: ; 0x021EC5A8 ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -47027,7 +47027,7 @@ MOD16_021ED0D0: ; 0x021ED0D0 ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -48325,7 +48325,7 @@ MOD16_021EDA7C: ; 0x021EDA7C ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -50516,7 +50516,7 @@ MOD16_021EEB50: ; 0x021EEB50 ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -51362,7 +51362,7 @@ MOD16_021EF218: ; 0x021EF218 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 @@ -51388,7 +51388,7 @@ MOD16_021EF218: ; 0x021EF218 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 @@ -51423,7 +51423,7 @@ MOD16_021EF218: ; 0x021EF218 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 @@ -52171,7 +52171,7 @@ MOD16_021EF790: ; 0x021EF790 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 @@ -52219,7 +52219,7 @@ MOD16_021EF8A8: ; 0x021EF8A8 bl FreeToHeap add r0, r4, #0 mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 |