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/59 | |
parent | e29c9e21ba9b64c86ac677b2bf4a69e92e8ac34b (diff) |
Rename more bg and window routines
Diffstat (limited to 'arm9/modules/59')
-rw-r--r-- | arm9/modules/59/asm/mod59_021D74E0_asm.s | 26 | ||||
-rw-r--r-- | arm9/modules/59/asm/mod59_021D9868.s | 8 |
2 files changed, 17 insertions, 17 deletions
diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 1b1c3f63..5f558d22 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -206,7 +206,7 @@ MOD59_021D7724: ; 0x021D7724 ldr r0, [r0, #0x18] bx r3 nop -_021D772C: .word FUN_0201AB60 +_021D772C: .word DoScheduledBgGpuUpdates thumb_func_end MOD59_021D7724 thumb_func_start MOD59_021D7730 @@ -1372,7 +1372,7 @@ MOD59_021D8058: ; 0x021D8058 ldr r3, [r5] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1420,10 +1420,10 @@ _021D80AA: bl MOD59_021D8234 mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -1714,7 +1714,7 @@ _021D82C8: mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 str r0, [sp] mov r3, #0x32 @@ -1722,19 +1722,19 @@ _021D82C8: mov r1, #2 add r2, r4, #0 lsl r3, r3, #6 - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r3, #0x20 add r2, r3, #0 mov r0, #2 add r1, r6, #0 add r3, #0xe0 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r3, #0x12 ldr r1, _021D83F4 ; =0x021D9ED8 mov r0, #2 mov r2, #0x20 lsl r3, r3, #4 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -1765,7 +1765,7 @@ _021D82C8: mov r0, #5 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 str r0, [sp] mov r3, #0x32 @@ -1773,17 +1773,17 @@ _021D82C8: mov r1, #5 add r2, r4, #0 lsl r3, r3, #6 - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r0, #5 add r1, r6, #0 mov r2, #0x20 lsl r3, r0, #6 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #5 ldr r1, _021D83F4 ; =0x021D9ED8 mov r2, #0x20 lsl r3, r0, #6 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r6, #0 bl FreeToHeap add r0, r4, #0 @@ -1831,7 +1831,7 @@ MOD59_021D83F8: ; 0x021D83F8 mov r0, #6 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x20 str r0, [sp] mov r0, #0 diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index a096c1ab..6dde1a2a 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -212,7 +212,7 @@ MOD59_021D9A14: ; 0x021D9A14 ldr r0, [r0, #4] bx r3 nop -_021D9A1C: .word FUN_0201AB60 +_021D9A1C: .word DoScheduledBgGpuUpdates thumb_func_end MOD59_021D9A14 thumb_func_start MOD59_021D9A20 @@ -261,7 +261,7 @@ _021D9A2C: mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #4] mov r1, #2 bl FUN_02018744 @@ -387,10 +387,10 @@ _021D9A2C: bl FUN_02002ED0 mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r2, #0xc ldr r0, _021D9BCC ; =0x04000050 mov r1, #2 |