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 | |
| parent | e29c9e21ba9b64c86ac677b2bf4a69e92e8ac34b (diff) | |
Rename more bg and window routines
83 files changed, 1023 insertions, 1030 deletions
diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index 7a509f0b..14707ffd 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -677,13 +677,13 @@ _0200288E: pop {r4-r7, pc} _020028AC: ldr r0, [r5, #0x4] - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x20] ldr r0, [r5, #0x4] - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x24] ldr r0, [r5, #0x4] - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x28] ldr r0, [r5, #0x4] bl GetWindowWidth @@ -844,13 +844,13 @@ FUN_02002A00: ; 0x02002A00 sub sp, #0x18 add r5, r0, #0x0 ldr r0, [r5, #0x4] - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] ldr r0, [r5, #0x4] - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x14] ldr r0, [r5, #0x4] - bl FUN_0201AB18 + bl GetWindowY add r6, r0, #0x0 ldr r0, [r5, #0x4] bl GetWindowWidth diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s index 9476691e..8f5c8dcb 100644 --- a/arm9/asm/unk_0200CABC.s +++ b/arm9/asm/unk_0200CABC.s @@ -282,13 +282,13 @@ FUN_0200CCA4: ; 0x0200CCA4 add r4, r1, #0x0 add r6, r2, #0x0 add r7, r3, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x14] add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x18] add r0, r5, #0x0 bl GetWindowWidth @@ -319,13 +319,13 @@ FUN_0200CCF8: ; 0x0200CCF8 sub sp, #0x18 add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY add r7, r0, #0x0 add r0, r5, #0x0 bl GetWindowWidth @@ -749,13 +749,13 @@ FUN_0200D06C: ; 0x0200D06C add r5, r0, #0x0 add r4, r1, #0x0 add r6, r2, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x14] add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x18] add r0, r5, #0x0 bl GetWindowWidth @@ -804,13 +804,13 @@ FUN_0200D0E0: ; 0x0200D0E0 sub sp, #0x18 add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x10] add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r6, r0, #0x0 add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY add r7, r0, #0x0 add r0, r5, #0x0 bl GetWindowWidth @@ -893,7 +893,7 @@ FUN_0200D18C: ; 0x0200D18C bl FUN_02016BB8 add r6, r0, #0x0 ldr r0, [sp, #0x20] - bl FUN_0201AB08 + bl GetWindowBgId mov r1, #0x6 str r0, [sp, #0x28] add r0, r6, #0x0 @@ -978,7 +978,7 @@ _0200D1E0: ldr r0, [r0, #0x0] add r2, r5, #0x0 lsl r3, r3, #0x6 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #0x24] bl FUN_02002840 ldr r0, [sp, #0x2c] @@ -1049,7 +1049,7 @@ _0200D2D2: ldr r1, [sp, #0x8] add r2, r4, #0x0 lsl r3, r3, #0x6 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #0xc] bl FreeToHeap add r0, r4, #0x0 @@ -1095,7 +1095,7 @@ FUN_0200D300: ; 0x0200D300 add r0, r6, #0x0 mov r2, #0x20 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, [sp, #0x14] add r0, r4, #0x0 bl FreeToHeapExplicit @@ -1496,16 +1496,16 @@ FUN_0200D678: ; 0x0200D678 str r1, [sp, #0x10] add r7, r0, #0x0 str r2, [sp, #0x14] - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x20] add r0, r7, #0x0 - bl FUN_0201AB14 + bl GetWindowX sub r0, r0, #0x7 lsl r0, r0, #0x10 lsr r0, r0, #0x10 str r0, [sp, #0x18] add r0, r7, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x1c] mov r0, #0x0 str r0, [sp, #0x24] @@ -1562,17 +1562,17 @@ FUN_0200D6F8: ; 0x0200D6F8 str r1, [sp, #0x10] add r4, r2, #0x0 add r6, r3, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x14] add r0, sp, #0x30 ldrb r0, [r0, #0x10] cmp r0, #0x1 bhi _0200D756 add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x18] add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x1c] add r0, r5, #0x0 bl GetWindowWidth @@ -1598,10 +1598,10 @@ FUN_0200D6F8: ; 0x0200D6F8 b _0200D788 _0200D756: add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x20] add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x24] add r0, r5, #0x0 bl GetWindowWidth @@ -1637,15 +1637,15 @@ FUN_0200D7A0: ; 0x0200D7A0 add r5, r0, #0x0 add r4, r1, #0x0 str r2, [sp, #0x10] - bl FUN_0201AB08 + bl GetWindowBgId str r0, [sp, #0x14] cmp r4, #0x1 bhi _0200D7FE add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY add r7, r0, #0x0 add r0, r5, #0x0 bl GetWindowWidth @@ -1675,10 +1675,10 @@ FUN_0200D7A0: ; 0x0200D7A0 b _0200D846 _0200D7FE: add r0, r5, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_0201AB18 + bl GetWindowY add r6, r0, #0x0 add r0, r5, #0x0 bl GetWindowWidth @@ -1726,7 +1726,7 @@ FUN_0200D858: ; 0x0200D858 bl FUN_02016BB8 str r0, [sp, #0x28] ldr r0, [sp, #0x20] - bl FUN_0201AB08 + bl GetWindowBgId bl FUN_020187B0 add r5, r0, #0x0 ldr r0, [sp, #0x28] @@ -1854,13 +1854,13 @@ FUN_0200D980: ; 0x0200D980 add r5, r0, #0x0 ldr r0, [r5, #0x0] add r6, r1, #0x0 - bl FUN_0201AB08 + bl GetWindowBgId add r4, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x18] ldr r0, [r5, #0x0] - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x1c] ldr r0, [r5, #0x0] bl GetWindowWidth @@ -1877,7 +1877,7 @@ FUN_0200D980: ; 0x0200D980 ldr r0, [r5, #0x0] mov r3, #0x80 ldr r0, [r0, #0x0] - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r7, r0, #0x2 @@ -1988,7 +1988,7 @@ _0200DA8A: add r2, r2, r3 ldr r0, [r0, #0x0] mov r3, #0x80 - bl FUN_02017E14 + bl BG_LoadCharTilesData cmp r6, #0x0 beq _0200DB72 ldr r0, [sp, #0x1c] @@ -2822,7 +2822,7 @@ FUN_0200DFD8: ; 0x0200DFD8 ldr r0, [r5, r1] add r1, r1, #0x4 ldrb r1, [r5, r1] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r4-r6, pc} nop @@ -2859,7 +2859,7 @@ FUN_0200E188: ; 0x0200E188 ldr r0, [r4, r1] add r1, r1, #0x4 ldrb r1, [r4, r1] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_020142EC.s b/arm9/asm/unk_020142EC.s index c933b981..5526b320 100644 --- a/arm9/asm/unk_020142EC.s +++ b/arm9/asm/unk_020142EC.s @@ -258,7 +258,7 @@ FUN_020144B0: ; 0x020144B0 mov r2, #0x20 lsl r3, r3, #0x15 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData pop {r3, pc} .balign 4 @@ -272,7 +272,7 @@ FUN_020144C8: ; 0x020144C8 mov r2, #0x20 lsl r3, r3, #0x15 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData pop {r3, pc} .balign 4 diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s index a2515a3d..bee153d7 100644 --- a/arm9/asm/unk_02014590.s +++ b/arm9/asm/unk_02014590.s @@ -562,7 +562,7 @@ FUN_02014970: ; 0x02014970 ldr r0, [r6, #0x0] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r4, #0x0 add r5, r6, #0x0 _020149B4: @@ -742,7 +742,7 @@ FUN_02014AD4: ; 0x02014AD4 ldr r0, [r4, #0x0] ldr r3, [r3, #0x10] lsr r1, r1, #0x18 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0x0 bl FUN_0200CAB4 ldr r0, [r4, #0x8] @@ -821,7 +821,7 @@ FUN_02014B58: ; 0x02014B58 lsl r1, r4, #0x18 add r0, r5, #0x0 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r3-r6, pc} .balign 4 diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index be45149a..63661fa8 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -159,13 +159,13 @@ _02033FA4: mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _02034180 ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _02034180 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x1 mov r1, #0x1a mov r2, #0xc8 diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index caa306a6..f20a3a40 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -107,13 +107,13 @@ FUN_02034188: ; 0x02034188 mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _02034390 ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _02034390 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r2, _02034394 ; =0x00000265 mov r0, #0x1 mov r1, #0x1a diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 11335b6e..d39ac308 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -557,7 +557,7 @@ _02035440: bl FUN_020358A0 ldr r0, [r5, #0x8] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0x0 bl FreeToHeap ldr r0, [r5, #0x34] @@ -2657,7 +2657,7 @@ FUN_020365BC: ; 0x020365BC bl FUN_0200CCF8 ldrb r1, [r4, #0x4] ldr r0, [r4, #0x0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0x0 bl RemoveWindow add r0, r5, #0x0 @@ -2927,7 +2927,7 @@ FUN_020367E8: ; 0x020367E8 bl FUN_0200CCF8 ldrb r1, [r4, #0x4] ldr r0, [r4, #0x0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0x0 bl RemoveWindow add r0, r5, #0x0 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index aabd3376..5adb2c02 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -355,7 +355,7 @@ FUN_02048764: ; 0x02048764 bl FUN_02016BBC mov r0, #0x3 mov r1, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r0, [r4, #0x8] ldr r2, _020487E0 ; =UNK_020F4694 mov r1, #0x3 @@ -365,7 +365,7 @@ FUN_02048764: ; 0x02048764 mov r0, #0x3 mov r2, #0x0 add r3, r1, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0x0 str r2, [sp, #0x0] mov r0, #0x20 diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s index 6c8bd92b..d20950c3 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -305,7 +305,7 @@ _02053912: add r1, sp, #0xc mov r2, #0x2 mov r3, #0x0 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #0x1 mov r1, #0x0 bl GX_EngineBToggleLayers diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index e5f32edd..d9e6755b 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1067,7 +1067,7 @@ FUN_02062DB0: ; 0x02062DB0 mov r0, #0x1 lsl r1, r1, #0x6 mov r2, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0x0 str r2, [sp, #0x0] mov r0, #0x20 @@ -1085,7 +1085,7 @@ FUN_02062DB0: ; 0x02062DB0 add r0, #0xd0 ldr r0, [r0, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x1 add r1, r0, #0x0 bl ToggleBgLayer @@ -1200,7 +1200,7 @@ FUN_02062EC4: ; 0x02062EC4 mov r0, #0x1 lsl r1, r1, #0x6 mov r2, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0x0 str r2, [sp, #0x0] mov r0, #0x20 @@ -1218,7 +1218,7 @@ FUN_02062EC4: ; 0x02062EC4 add r0, #0xd0 ldr r0, [r0, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x1 mov r1, #0x0 bl ToggleBgLayer @@ -1494,7 +1494,7 @@ _02063094: add r5, #0xd0 ldr r0, [r5, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r4-r7, pc} .balign 4 @@ -1538,7 +1538,7 @@ FUN_02063178: ; 0x02063178 add r4, #0xd0 ldr r0, [r4, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} thumb_func_start FUN_020631C8 @@ -1916,7 +1916,7 @@ FUN_02063430: ; 0x02063430 add r4, #0xd0 ldr r0, [r4, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3-r4, pc} nop diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 126fe8f6..084b4c8d 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1144,7 +1144,7 @@ _02065C64: lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r1, _02065CF0 ; =0x0000013B mov r0, #0xf ldrb r2, [r5, r1] @@ -1376,7 +1376,7 @@ _02065E14: lsl r0, r0, #0x4 ldr r0, [r5, r0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r1, _02065EE0 ; =0x0000013B mov r0, #0xf ldrb r2, [r5, r1] @@ -1471,7 +1471,7 @@ _02065F7C: lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x4 pop {r3-r4, pc} @@ -1510,7 +1510,7 @@ FUN_02065F8C: ; 0x02065F8C lsl r0, r0, #0x4 ldr r0, [r4, r0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x4 pop {r3-r4, pc} .balign 4 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index da45d0a0..53191360 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2644,7 +2644,7 @@ FUN_0206DD08: ; 0x0206DD08 ldr r0, [r4, #0x14] bl FUN_0200372C ldr r0, [r4, #0x0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0206DD64 ; =0x027E0000 ldr r1, _0206DD68 ; =0x00003FF8 mov r0, #0x1 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index ec8358fb..dfe7d1f8 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1037,7 +1037,7 @@ _0206FB54: .word 0x00000B34 FUN_0206FB58: ; 0x0206FB58 push {r3, lr} ldr r0, [r0, #0x0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_0200BC30 ldr r3, _0206FB78 ; =0x027E0000 @@ -1190,12 +1190,12 @@ FUN_0206FBA0: ; 0x0206FBA0 mov r1, #0x20 add r2, r0, #0x0 mov r3, #0xc - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x4 mov r1, #0x20 mov r2, #0x0 mov r3, #0xc - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0xb8 pop {r3-r5, pc} nop @@ -1282,7 +1282,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r3, #0x0 lsl r2, r2, #0x10 lsr r2, r2, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, [sp, #0x10] ldr r0, _0206FE6C ; =0x000004A4 ldr r1, [r1, #0xc] @@ -1382,10 +1382,10 @@ FUN_0206FD24: ; 0x0206FD24 bl FUN_020724D4 mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x4 mov r1, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x14 pop {r4-r5, pc} .balign 4 @@ -2185,10 +2185,10 @@ _020704CC: _020704D2: ldr r0, [r4, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} .balign 4 _020704E4: .word 0x000005A4 @@ -2868,7 +2868,7 @@ _02070A60: mov r0, #0x2 mov r2, #0x10 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData pop {r4-r6, pc} .balign 4 _02070A78: .word 0x000005A4 @@ -3147,7 +3147,7 @@ _02070C6E: bl FUN_020717E8 ldr r0, [r5, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _02070CA6: cmp r4, #0x6 beq _02070CB2 @@ -3433,7 +3433,7 @@ _02070ECC: bl FUN_020717E8 ldr r0, [r5, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _02070EFE: add sp, #0x10 pop {r4-r6, pc} @@ -3480,7 +3480,7 @@ _02070F30: bl FUN_020717E8 ldr r0, [r4, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0xb2 lsl r0, r0, #0x4 ldrb r1, [r4, r0] @@ -3495,7 +3495,7 @@ _02070F70: bl FUN_020717E8 ldr r0, [r4, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0xb2 mov r1, #0x0 lsl r0, r0, #0x4 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index cc01c965..326de09a 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -961,7 +961,7 @@ _02072C78: add r1, r5, r1 mov r2, #0x4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _02072CBE _02072C90: ldrb r3, [r4, #0x9] @@ -973,7 +973,7 @@ _02072C90: add r1, r5, r1 mov r2, #0x4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _02072CBE _02072CA8: ldrb r3, [r4, #0x9] @@ -985,7 +985,7 @@ _02072CA8: add r1, r5, r1 mov r2, #0x4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData _02072CBE: ldr r0, [sp, #0x8] ldrh r1, [r7, r6] diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 36695450..3ed800a5 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -1155,10 +1155,10 @@ _0207470C: bl FUN_0207499C ldr r0, [r5, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, _02074838 ; =0x00000306 ldrb r1, [r4, r0] cmp r1, #0x10 @@ -1206,10 +1206,10 @@ _02074770: bl FUN_0207499C ldr r0, [r5, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, _02074838 ; =0x00000306 ldrb r1, [r4, r0] cmp r1, #0x0 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 6a0ff960..0b55d53a 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1795,12 +1795,12 @@ FUN_02077B44: ; 0x02077B44 mov r1, #0x20 add r2, r0, #0x0 mov r3, #0x12 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x4 mov r1, #0x20 mov r2, #0x0 mov r3, #0x12 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x1 lsl r0, r0, #0x1a add r4, r0, #0x0 @@ -2281,7 +2281,7 @@ FUN_02077FE8: ; 0x02077FE8 bl GfGfxLoader_GXLoadPal mov r0, #0x4 mov r1, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x2 diff --git a/arm9/asm/unk_020799E8.s b/arm9/asm/unk_020799E8.s index 751aecc6..4d1a4195 100644 --- a/arm9/asm/unk_020799E8.s +++ b/arm9/asm/unk_020799E8.s @@ -281,7 +281,7 @@ _02079BAE: add r0, r6, #0x0 ldr r2, [r2, #0x14] add r3, r4, #0x0 - bl FUN_02017E14 + bl BG_LoadCharTilesData b _02079C36 _02079BC6: add r0, r7, #0x0 @@ -337,7 +337,7 @@ _02079C24: ldr r1, [r1, #0xc] lsr r0, r0, #0x18 add r2, r4, #0x0 - bl FUN_02017FB4 + bl BG_LoadPlttData _02079C36: add r0, r7, #0x0 bl FreeToHeap diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 07974952..692aea6e 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -350,7 +350,7 @@ FUN_02079F24: ; 0x02079F24 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates mov r0, #0xae lsl r0, r0, #0x2 ldr r0, [r4, r0] @@ -441,7 +441,7 @@ FUN_02079F78: ; 0x02079F78 mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r5, _0207A080 ; =UNK_020FA688 add r3, sp, #0x38 ldmia r5!, {r0-r1} @@ -494,12 +494,12 @@ FUN_02079F78: ; 0x02079F78 mov r1, #0x20 mov r2, #0x0 mov r3, #0x13 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x4 mov r1, #0x20 mov r2, #0x0 mov r3, #0x13 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4-r5, pc} nop @@ -2763,7 +2763,7 @@ _0207B256: bl FUN_02018148 ldr r0, [r5, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0x0 bl FreeToHeap ldr r0, _0207B2AC ; =0x0000068C @@ -2875,7 +2875,7 @@ _0207B344: blo _0207B30A ldr r0, [r6, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4-r7, pc} nop @@ -2953,7 +2953,7 @@ _0207B3D6: blo _0207B39C ldr r0, [r6, #0x0] mov r1, #0x3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r3-r7, pc} .balign 4 @@ -3301,12 +3301,12 @@ _0207B682: mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #0x0] mov r1, #0x2 mov r2, #0x3 mov r3, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207C6F0 @@ -3347,7 +3347,7 @@ _0207B6E2: mov r2, #0x0 mov r1, #0x2 add r3, r2, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207B774 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -3356,7 +3356,7 @@ _0207B702: mov r1, #0x2 add r2, r1, #0x0 mov r3, #0x40 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207B76E _0207B70E: bl FUN_0207ECDC @@ -3471,7 +3471,7 @@ _0207B7F8: mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207B864 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -3480,7 +3480,7 @@ _0207B818: mov r1, #0x2 mov r2, #0x1 mov r3, #0x40 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207B860 _0207B824: mov r0, #0x85 @@ -3800,7 +3800,7 @@ FUN_0207BA74: ; 0x0207BA74 ldr r0, [r4, #0x0] mov r1, #0x2 add r3, r2, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r4, #0x0 bl FUN_0207ECDC add r0, r4, #0x0 @@ -3851,13 +3851,13 @@ _0207BB02: mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r2, #0x3 add r3, r2, #0x0 ldr r0, [r4, #0x0] mov r1, #0x2 add r3, #0xfd - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #0x0 add r0, r4, #0x0 mvn r1, r1 @@ -3902,7 +3902,7 @@ _0207BB6E: mov r2, #0x0 mov r1, #0x2 add r3, r2, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207BBE4 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -3911,7 +3911,7 @@ _0207BB8E: mov r1, #0x2 add r2, r1, #0x0 mov r3, #0x40 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207BBDE _0207BB9A: bl FUN_0207ECDC @@ -4002,7 +4002,7 @@ _0207BC4E: mov r1, #0x2 mov r2, #0x0 mov r3, #0x88 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207BCBC ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -4011,7 +4011,7 @@ _0207BC6E: mov r1, #0x2 mov r2, #0x1 mov r3, #0x40 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207BCB6 _0207BC7A: mov r0, #0x85 @@ -4136,7 +4136,7 @@ _0207BD60: blo _0207BD60 ldr r0, [r5, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4-r6, pc} .balign 4 _0207BD80: .word 0x0000012E @@ -4178,7 +4178,7 @@ _0207BDB6: _0207BDCC: ldr r0, [r5, #0x0] mov r1, #0x2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3-r7, pc} .balign 4 @@ -4232,7 +4232,7 @@ _0207BE38: mov r1, #0x2 mov r2, #0x3 mov r3, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} _0207BE46: add r0, r4, #0x0 @@ -4242,7 +4242,7 @@ _0207BE46: ldr r0, [r4, #0x0] mov r1, #0x2 add r3, #0xfd - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} .balign 4 _0207BE5C: .word 0x0000068C @@ -4268,12 +4268,12 @@ _0207BE7E: ldr r0, [r4, #0x0] mov r2, #0x0 add r3, #0xfe - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #0x0] mov r1, #0x2 mov r2, #0x3 mov r3, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r4, #0x0 mov r1, #0x0 bl FUN_0207C6F0 @@ -4318,7 +4318,7 @@ _0207BEEA: mov r1, #0x2 mov r2, #0x3 mov r3, #0x38 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207BF78 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -4327,7 +4327,7 @@ _0207BF0A: mov r1, #0x2 mov r2, #0x4 mov r3, #0x10 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207BF74 _0207BF16: mov r1, #0xb5 @@ -4437,7 +4437,7 @@ _0207BFF6: mov r1, #0x2 mov r2, #0x3 mov r3, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, _0207C078 ; =0x0000068E mov r1, #0x2 strb r1, [r4, r0] @@ -4446,7 +4446,7 @@ _0207C016: mov r1, #0x2 mov r2, #0x5 mov r3, #0x10 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207C072 _0207C022: add r0, r4, #0x0 diff --git a/arm9/asm/unk_0207C328.s b/arm9/asm/unk_0207C328.s index e4fac6e3..38691c40 100644 --- a/arm9/asm/unk_0207C328.s +++ b/arm9/asm/unk_0207C328.s @@ -1826,7 +1826,7 @@ FUN_0207CFAC: ; 0x0207CFAC pop {r4, pc} _0207CFC0: add r0, r1, #0x0 - bl FUN_0201AB14 + bl GetWindowX add r1, r0, #0x0 ldr r0, _0207CFE8 ; =0x000004C4 lsl r1, r1, #0x3 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 7cd9e02e..9b1bc9b8 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -2845,7 +2845,7 @@ FUN_0207ED18: ; 0x0207ED18 bl FUN_0201958C ldr r0, [r4, #0x0] mov r1, #0x1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} thumb_func_start FUN_0207ED30 diff --git a/arm9/asm/unk_0207F95C.s b/arm9/asm/unk_0207F95C.s index 954edc56..05166c3b 100644 --- a/arm9/asm/unk_0207F95C.s +++ b/arm9/asm/unk_0207F95C.s @@ -92,7 +92,7 @@ _0207F992: ldr r0, [r4, #0x0] mov r2, #0x0 add r3, r1, #0x0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _0207F9BA _0207F9AC: ldr r1, _0207F9C4 ; =0x0000068F @@ -200,7 +200,7 @@ _0207FA52: _0207FA6C: ldr r0, [r6, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _0207FA74: pop {r3-r7, pc} nop @@ -330,7 +330,7 @@ _0207FB4A: bl FUN_0207F9C8 ldr r0, [r5, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0x0 bl FUN_0207CEDC ldr r0, _0207FC00 ; =0x00000694 @@ -390,7 +390,7 @@ _0207FBD6: _0207FBE2: ldr r0, [r5, #0x0] mov r1, #0x4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x1 pop {r4-r6, pc} _0207FBEE: diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index b3b8bd1d..f3583914 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -380,7 +380,7 @@ FUN_02086664: ; 0x02086664 ldr r0, [r4, #0x8] bl FUN_0200372C ldr r0, [r4, #0x4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _02086690 ; =0x027E0000 ldr r1, _02086694 ; =0x00003FF8 mov r0, #0x1 diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 57c254fa..6dbccc0d 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -209,7 +209,7 @@ FUN_02089610: ; 0x02089610 ldr r0, [r0, #0x14] bx r3 nop -_02089618: .word FUN_0201AB60 +_02089618: .word DoScheduledBgGpuUpdates thumb_func_start FUN_0208961C FUN_0208961C: ; 0x0208961C @@ -280,13 +280,13 @@ _02089628: ldr r3, [r4, #0x0] mov r1, #0x20 add r2, r0, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _020896DC ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _020896DC ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x5c pop {r4-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 6fac4090..7d2b1692 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -220,13 +220,13 @@ _02089A78: ldr r3, [r4, #0x0] mov r1, #0x20 add r2, r0, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x0 add r1, r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x4 mov r1, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x5c pop {r4-r5, pc} .balign 4 @@ -373,10 +373,10 @@ _02089C34: _02089C3C: ldr r1, _02089CC8 ; =0x00006C21 add r0, r5, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _02089CC8 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x6 mov r1, #0x1 str r0, [sp, #0x0] @@ -424,10 +424,10 @@ _02089CA2: bne _02089CC2 add r0, r5, #0x0 add r1, r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x4 add r1, r5, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x5 str r0, [r4, #0x4] b _02089CC2 diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index fb7a7217..0becba0f 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -106,13 +106,13 @@ FUN_02089D90: ; 0x02089D90 mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _02089F1C ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _02089F1C ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x1 mov r1, #0x1a mov r2, #0x5 diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index 31753c3c..a0b68a0d 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -110,13 +110,13 @@ FUN_02089F24: ; 0x02089F24 mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _0208A0B0 ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _0208A0B0 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x1 mov r1, #0x1a mov r2, #0x5 @@ -279,13 +279,13 @@ _0208A0C8: mov r1, #0x20 add r2, r0, #0x0 add r3, r4, #0x0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _0208A250 ; =0x00006C21 mov r0, #0x0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _0208A250 ; =0x00006C21 mov r0, #0x4 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #0x1 mov r1, #0x1a mov r2, #0x6 diff --git a/arm9/global.inc b/arm9/global.inc index 7f29e3e0..282bd94b 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1051,11 +1051,11 @@ .extern FUN_02017CD0 .extern FUN_02017CE8 .extern FUN_02017DFC -.extern FUN_02017E14 -.extern FUN_02017F18 -.extern FUN_02017F48 -.extern FUN_02017FB4 -.extern FUN_02017FE4 +.extern BG_LoadCharTilesData +.extern BG_ClearCharDataRange +.extern BG_FillCharDataRange +.extern BG_LoadPlttData +.extern BG_SetMaskColor .extern FUN_02018148 .extern FUN_02018170 .extern FUN_020181EC @@ -1104,21 +1104,21 @@ .extern FillWindowPixelRect .extern FUN_0201974C .extern ScrollWindow -.extern FUN_0201AB08 +.extern GetWindowBgId .extern GetWindowWidth .extern GetWindowHeight -.extern FUN_0201AB14 -.extern FUN_0201AB18 -.extern FUN_0201AB1C -.extern FUN_0201AB20 -.extern FUN_0201AB24 -.extern FUN_0201AB28 -.extern FUN_0201AB44 -.extern FUN_0201AB60 -.extern FUN_0201AC68 -.extern FUN_0201AEE4 -.extern FUN_0201AF08 -.extern FUN_0201AF50 +.extern GetWindowX +.extern GetWindowY +.extern MoveWindowX +.extern MoveWindowY +.extern SetWindowPaletteNum +.extern LoadCharacterDataFromFile +.extern LoadPaletteDataFromFile +.extern DoScheduledBgGpuUpdates +.extern ScheduleBgTilemapBufferTransfer +.extern ScheduleSetBgPosText +.extern ScheduleSetBgAffineRotation +.extern ScheduleSetBgAffinePos .extern FUN_0201AFBC .extern FUN_0201B21C .extern FUN_0201B234 diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 4ca1ac2e..a85d9482 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -8,7 +8,7 @@ MOD05_021D74E0: ; 0x021D74E0 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_02009F80 ldr r0, [r4, #0x34] @@ -637,7 +637,7 @@ MOD05_021D7A30: ; 0x021D7A30 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 bl FUN_02018744 @@ -660,7 +660,7 @@ MOD05_021D7A30: ; 0x021D7A30 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 bl FUN_02018744 @@ -683,7 +683,7 @@ MOD05_021D7A30: ; 0x021D7A30 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 bl FUN_02018744 diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index 7b1e767f..fc147e48 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -1903,7 +1903,7 @@ MOD05_021DCECC: ; 0x021DCECC ldr r1, [r1, #0xc] mov r2, #0x20 mov r3, #0xc0 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r0, [sp] bl FreeToHeap mov r0, #0 @@ -1945,7 +1945,7 @@ MOD05_021DCF14: ; 0x021DCF14 ldr r0, [r0, #8] ldr r3, [r3, #0x10] mov r1, #2 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #8] bl FreeToHeap mov r0, #0 diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index 99df49cd..87bdb5f6 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -61,7 +61,7 @@ MOD05_021E2EE4: ; 0x021E2EE4 add r0, #0x38 mov r1, #4 add r7, r3, #0 - bl FUN_0201AB28 + bl LoadCharacterDataFromFile str r0, [r5, #0x34] add r3, r0, #0 str r4, [sp] @@ -69,11 +69,11 @@ MOD05_021E2EE4: ; 0x021E2EE4 ldr r0, [r5, #0x1c] ldr r3, [r3, #0x10] add r1, r6, #0 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r2, _021E2F30 ; =UNK05_021FD62C add r0, sp, #4 mov r1, #4 - bl FUN_0201AB44 + bl LoadPaletteDataFromFile ldr r0, [r0, #0xc] mov r1, #1 add r2, r7, #0 diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s index 42f9037e..5266f6c6 100644 --- a/arm9/modules/05/asm/mod05_021E3444.s +++ b/arm9/modules/05/asm/mod05_021E3444.s @@ -1081,7 +1081,7 @@ MOD05_021E3C14: ; 0x021E3C14 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 bl FUN_02018744 @@ -1110,7 +1110,7 @@ MOD05_021E3C14: ; 0x021E3C14 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 bl FUN_02018744 @@ -1139,7 +1139,7 @@ MOD05_021E3C14: ; 0x021E3C14 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 bl FUN_02018744 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 28a5f8fd..311703f6 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -2761,7 +2761,7 @@ _021E9C02: add r1, sp, #0x28 mov r2, #2 mov r3, #0x1e - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3174,7 +3174,7 @@ _021E9FA4: mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [sp, #0x1c] mov r1, #3 ldr r0, [r0, #0x10] @@ -3733,7 +3733,7 @@ _021EA430: add r1, sp, #0x28 mov r2, #2 mov r3, #0x1e - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -4107,7 +4107,7 @@ _021EA76C: mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [sp, #0x18] mov r1, #3 ldr r0, [r0, #0x10] @@ -5401,7 +5401,7 @@ _021EB18E: add r1, sp, #0x14 mov r2, #2 mov r3, #0x1e - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r0, [r4] mov r1, #0 bl FillWindowPixelBuffer @@ -5576,7 +5576,7 @@ _021EB394: mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r5, #0x10] mov r1, #3 ldr r0, [r0, #8] @@ -26629,7 +26629,7 @@ MOD05_021F5608: ; 0x021F5608 add r1, sp, #4 add r2, r0, #0 mov r3, #0xc2 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #4 mov r1, #0x20 bl AllocFromHeap @@ -26643,7 +26643,7 @@ MOD05_021F5608: ; 0x021F5608 mov r1, #2 add r2, r4, #0 mov r3, #0x20 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r4, #0 bl FreeToHeap ldr r2, _021F565C ; =0x00006001 @@ -26694,21 +26694,21 @@ _021F5696: thumb_func_start MOD05_021F569C MOD05_021F569C: ; 0x021F569C - ldr r3, _021F56A4 ; =FUN_02017FE4 + ldr r3, _021F56A4 ; =BG_SetMaskColor mov r0, #2 mov r1, #0 bx r3 .balign 4, 0 -_021F56A4: .word FUN_02017FE4 +_021F56A4: .word BG_SetMaskColor thumb_func_start MOD05_021F56A8 MOD05_021F56A8: ; 0x021F56A8 - ldr r3, _021F56B0 ; =FUN_02017FE4 + ldr r3, _021F56B0 ; =BG_SetMaskColor mov r0, #2 ldr r1, _021F56B4 ; =0x00007FFF bx r3 .balign 4, 0 -_021F56B0: .word FUN_02017FE4 +_021F56B0: .word BG_SetMaskColor _021F56B4: .word 0x00007FFF thumb_func_start MOD05_021F56B8 @@ -26733,13 +26733,13 @@ MOD05_021F56B8: ; 0x021F56B8 mov r0, #2 add r1, sp, #4 add r2, r0, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r1, #2 str r1, [sp] ldr r0, [r4, #8] add r2, r1, #0 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange ldr r0, [r4, #8] ldr r2, _021F5718 ; =0x00006002 mov r1, #2 @@ -26777,13 +26777,13 @@ MOD05_021F571C: ; 0x021F571C strh r2, [r1] add r1, sp, #4 mov r2, #2 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r2, #2 str r2, [sp] ldr r0, [r4, #8] mov r1, #3 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange ldr r0, [r4, #8] ldr r2, _021F577C ; =0x00006002 mov r1, #3 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 03071c93..df0a3ec9 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -168,7 +168,7 @@ MOD06_02239790: ; 0x02239790 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 bl FUN_02018744 @@ -14695,7 +14695,7 @@ MOD06_02240A28: ; 0x02240A28 add r1, #0x38 ldrb r1, [r1] ldr r0, [r4, #0x34] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0 add r0, #0x34 bl RemoveWindow @@ -14930,7 +14930,7 @@ _02240C1A: add r1, #0x48 ldrb r1, [r1] ldr r0, [r5, #0x44] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0 add r0, #0x44 bl RemoveWindow @@ -15286,7 +15286,7 @@ MOD06_02240F1C: ; 0x02240F1C add r1, #0x28 ldrb r1, [r1] ldr r0, [r4, #0x24] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r4, #0x24 add r0, r4, #0 bl RemoveWindow @@ -28496,7 +28496,7 @@ MOD06_02247544: ; 0x02247544 ldr r1, [r1, #0xc] mov r2, #0x20 lsl r3, r0, #7 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r4, #0 bl FreeToHeap pop {r3, r4, r5, pc} @@ -28521,7 +28521,7 @@ MOD06_0224756C: ; 0x0224756C ldr r3, [r3, #0x10] add r0, r5, #0 mov r1, #3 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r6, #0 bl FreeToHeap add sp, #4 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 16149710..332afa24 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -437,13 +437,13 @@ MOD07_022121AC: ; 0x022121AC ldr r0, [r4, #0xc] mov r1, #3 mov r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r2, #0 add r3, r2, #0 ldr r0, [r4, #0xc] mov r1, #2 sub r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #0 add r0, r4, #0 add r2, r1, #0 @@ -492,13 +492,13 @@ _02212248: ldr r3, [r4, r3] mov r1, #3 mov r2, #2 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r3, _02212374 ; =0x00000B74 ldr r0, [r4, #0xc] ldr r3, [r4, r3] mov r1, #2 mov r2, #1 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r3, _02212370 ; =0x00000B82 mov r1, #0 ldrb r0, [r4, r3] @@ -669,23 +669,23 @@ _022123B4: mov r1, #3 mov r2, #0 mov r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r2, #0 add r3, r2, #0 ldr r0, [r5, #0xc] mov r1, #2 sub r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #3 ldr r0, [r5, #0xc] add r2, r1, #0 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0xc] mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #0 add r0, r5, #0 add r2, r1, #0 @@ -798,23 +798,23 @@ _022124CC: mov r1, #3 mov r2, #0 add r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r3, r6, #0 ldr r0, [r5, #0xc] mov r1, #2 mov r2, #0 sub r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #3 ldr r0, [r5, #0xc] add r2, r1, #0 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0xc] mov r1, #2 mov r2, #3 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r5, #0 mov r1, #0 add r2, r6, #0 @@ -921,12 +921,12 @@ _022125DE: mov r1, #3 mov r2, #1 mov r3, #0x10 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #2 ldr r0, [r4, #0xc] add r2, r1, #0 mov r3, #0x10 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r2, _022126A4 ; =0x00000B82 mov r1, #0 ldrb r0, [r4, r2] @@ -1086,7 +1086,7 @@ MOD07_02212720: ; 0x02212720 ldr r3, _02212818 ; =0x02214960 add r2, r1, #0 ldrb r3, [r3, r5] - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r3, _02212814 ; =0x00000B82 ldr r0, [r4, #0xc] ldrb r3, [r4, r3] @@ -1095,7 +1095,7 @@ MOD07_02212720: ; 0x02212720 lsl r5, r3, #1 ldr r3, _02212818 ; =0x02214960 ldrb r3, [r3, r5] - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r2, _02212814 ; =0x00000B82 mov r1, #0 ldrb r2, [r4, r2] @@ -1206,7 +1206,7 @@ MOD07_02212824: ; 0x02212824 ldr r3, _0221294C ; =0x02214960 mov r2, #1 ldrb r3, [r3, r5] - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r3, _02212948 ; =0x00000B82 ldr r0, [r4, #0xc] ldrb r3, [r4, r3] @@ -1215,7 +1215,7 @@ MOD07_02212824: ; 0x02212824 lsl r5, r3, #1 ldr r3, _0221294C ; =0x02214960 ldrb r3, [r3, r5] - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r2, _02212948 ; =0x00000B82 mov r1, #0 ldrb r2, [r4, r2] @@ -1868,7 +1868,7 @@ MOD07_02212D68: ; 0x02212D68 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r0, [r4, #8] bl FUN_0200372C bl FUN_0201C30C @@ -1921,7 +1921,7 @@ MOD07_02212D98: ; 0x02212D98 ldr r0, [r4, #0xc] mov r2, #0 add r3, #0xfd - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r5, _02212E5C ; =0x02214A48 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -1945,7 +1945,7 @@ MOD07_02212D98: ; 0x02212D98 mov r1, #2 mov r2, #0 mvn r3, r3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r5, _02212E60 ; =0x02214A64 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -2063,7 +2063,7 @@ MOD07_02212E90: ; 0x02212E90 bl FUN_02003108 ldr r1, _02212F28 ; =0x000018C6 mov r0, #1 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -3327,7 +3327,7 @@ MOD07_02213924: ; 0x02213924 mov r3, #0 lsl r2, r2, #0x10 lsr r2, r2, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, [sp, #0x10] ldr r0, _022139B4 ; =0x000004E4 ldr r1, [r1, #0xc] @@ -3443,7 +3443,7 @@ _02213A54: add r1, r5, r1 mov r2, #0x20 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _02213A7A _02213A68: ldr r1, _02213A9C ; =0x000004E4 @@ -3453,7 +3453,7 @@ _02213A68: add r1, r5, r1 mov r2, #0x20 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData _02213A7A: add r4, r4, #1 add r7, #0x18 @@ -3462,7 +3462,7 @@ _02213A7A: blo _022139C8 ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -3527,10 +3527,10 @@ MOD07_02213AEC: ; 0x02213AEC bl MOD07_02213AA0 ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} .align 2, 0 _02213B18: .word 0x00000544 @@ -3625,10 +3625,10 @@ _02213B80: _02213BCE: ldr r0, [r5, #0xc] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r3, r4, r5, r6, pc} nop @@ -4817,7 +4817,7 @@ _02214558: add r1, r5, r1 mov r2, #4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _0221459E _02214570: ldrb r3, [r4, #9] @@ -4829,7 +4829,7 @@ _02214570: add r1, r5, r1 mov r2, #4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _0221459E _02214588: ldrb r3, [r4, #9] @@ -4841,7 +4841,7 @@ _02214588: add r1, r5, r1 mov r2, #4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData _0221459E: ldr r0, [sp, #8] ldrh r1, [r7, r6] diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index 3d45d586..d66ba9ef 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -1816,7 +1816,7 @@ _02212AE8: lsr r0, r0, #0x18 lsl r1, r1, #0xe mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 bl MOD08_02212490 add r4, r0, #0 @@ -3173,7 +3173,7 @@ _02213500: ldr r2, [sp, #0x18] mov r1, #2 lsl r3, r3, #6 - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7555,7 +7555,7 @@ MOD08_02215638: ; 0x02215638 ldr r0, [r0] lsr r1, r1, #0x18 lsl r3, r3, #0x10 - bl FUN_02017E14 + bl BG_LoadCharTilesData pop {r3, pc} .align 2, 0 @@ -33598,7 +33598,7 @@ _022225CE: lsr r0, r0, #0x18 lsl r1, r1, #0xe mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4] bl MOD08_02212490 add r5, r0, #0 @@ -34362,7 +34362,7 @@ _02222C3E: lsr r0, r0, #0x18 lsl r1, r1, #0xe mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4] bl MOD08_02212490 add r5, r0, #0 @@ -40547,7 +40547,7 @@ _02225E68: lsr r0, r0, #0x18 lsl r1, r1, #0xe mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4] bl MOD08_02212490 add r5, r0, #0 diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index cd43756a..4579c6c4 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2111,23 +2111,23 @@ MOD09_02212E4C: ; 0x02212E4C ldr r3, [r3, #0xc] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #4 ldr r3, [r3, #0xc] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x80 pop {r3, r4, r5, pc} .align 2, 0 @@ -3156,7 +3156,7 @@ _02213778: lsl r0, r0, #2 ldr r0, [r6, r0] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _0221378E: pop {r3, r4, r5, r6, r7, pc} @@ -3338,7 +3338,7 @@ _022138E2: lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _022138EE: pop {r3, r4, r5, r6, r7, pc} @@ -3432,7 +3432,7 @@ _02213976: lsl r1, r1, #0x18 ldr r0, [r5, r0] lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r7, #0 bl FreeToHeap add r4, r4, #1 @@ -3781,7 +3781,7 @@ MOD09_02213C6C: ; 0x02213C6C lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} .align 2, 0 @@ -11755,7 +11755,7 @@ MOD09_02217F88: ; 0x02217F88 lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp, #0x18] bl FreeToHeap add sp, #0x1c @@ -13935,19 +13935,19 @@ MOD09_022190CC: ; 0x022190CC ldr r3, [r3, #0xc] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #4 ldr r3, [r3, #0xc] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #4] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x64 pop {r4, r5, pc} .align 2, 0 @@ -14141,12 +14141,12 @@ _02219316: ldr r0, [r4, #4] mov r1, #6 add r3, r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #4] mov r1, #6 mov r2, #3 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} _02219330: mov r1, #6 @@ -14154,25 +14154,25 @@ _02219330: ldr r0, [r4, #4] mov r2, #0 add r3, #0xfa - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #4] mov r1, #6 mov r2, #3 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} _0221934C: mov r2, #0 ldr r0, [r4, #4] mov r1, #6 add r3, r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r2, #3 add r3, r2, #0 ldr r0, [r4, #4] mov r1, #6 add r3, #0xfd - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} thumb_func_start MOD09_02219368 @@ -16851,7 +16851,7 @@ MOD09_0221A884: ; 0x0221A884 bl FUN_02018148 ldr r0, [r5, #4] mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp, #0x18] bl FreeToHeap add sp, #0x1c diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 71334e08..878fb5fc 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -3157,7 +3157,7 @@ _0222F088: ldr r0, [r4, #0x28] bl FUN_0200372C ldr r0, [r4, #4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222F0CC ; =0x027E0000 ldr r1, _0222F0D0 ; =0x00003FF8 mov r0, #1 @@ -3183,7 +3183,7 @@ MOD11_0222F0D4: ; 0x0222F0D4 bl FUN_0200372C bl FUN_0201C30C ldr r0, [r4, #4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222F0F8 ; =0x027E0000 ldr r1, _0222F0FC ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index ca3736f6..f0113545 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -4128,7 +4128,7 @@ _022311D0: ldr r2, [r4, r2] mov r1, #3 lsl r3, r3, #5 - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r0, #0x5f lsl r0, r0, #2 add r0, r4, r0 @@ -84910,7 +84910,7 @@ _022588AE: lsl r1, r1, #0x18 ldr r0, [sp, #0x28] lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _022588D0: add r4, r4, #1 add r6, r6, #2 @@ -86411,7 +86411,7 @@ MOD11_022594DC: ; 0x022594DC bl FUN_02018540 add r0, r4, #0 mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x4e lsl r0, r0, #4 ldr r0, [r5, r0] @@ -86479,7 +86479,7 @@ MOD11_02259554: ; 0x02259554 bl FUN_02018540 add r0, r4, #0 mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x4e lsl r0, r0, #4 ldr r0, [r5, r0] @@ -87848,7 +87848,7 @@ _0225A116: bl FUN_02018768 add r0, r6, #0 mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0 add r1, r5, #0 bl MOD11_0225ADD0 @@ -89218,7 +89218,7 @@ MOD11_0225ABA4: ; 0x0225ABA4 bl FUN_02003054 add r0, r6, #0 mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, _0225AC58 ; =MOD11_0225F71C lsl r1, r4, #2 ldrb r2, [r0, r1] @@ -89247,7 +89247,7 @@ MOD11_0225ABA4: ; 0x0225ABA4 bl FUN_02018540 add r0, r6, #0 mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -89528,7 +89528,7 @@ _0225AE36: _0225AE40: ldr r0, [sp, #4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #8 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 96c131ea..9a3d4721 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -546,7 +546,7 @@ MOD12_0222DAE4: ; 0x0222DAE4 ldr r0, [r4, #0x5c] bl FUN_0200372C ldr r0, [r4, #0x30] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222DB10 ; =0x027E0000 ldr r1, _0222DB14 ; =0x00003FF8 mov r0, #1 @@ -1087,7 +1087,7 @@ _0222DF9A: lsl r1, r0, #0xd mov r2, #0 mov r3, #0x15 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r5, #0x30] mov r1, #2 bl FUN_02018744 @@ -3759,7 +3759,7 @@ _0222F4BA: ldr r0, [r6, #0x50] bl FUN_0200372C ldr r0, [r6, #0x30] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222F4EC ; =0x027E0000 ldr r1, _0222F4F0 ; =0x00003FF8 mov r0, #1 @@ -5642,7 +5642,7 @@ _02230464: ldr r0, [r0] bl FUN_0200372C ldr r0, [r4, #0x74] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _022304A8 ; =0x027E0000 ldr r1, _022304AC ; =0x00003FF8 mov r0, #1 @@ -8637,7 +8637,7 @@ _02231BDE: lsl r1, r1, #0x18 ldr r0, [sp, #0xc] lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _02231C00: add r5, r5, #1 add r6, r6, #2 @@ -9892,7 +9892,7 @@ _02232594: _0223259E: ldr r0, [sp, #4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -11738,7 +11738,7 @@ MOD12_0223336C: ; 0x0223336C ldr r2, [r2, #0x14] mov r1, #4 lsl r3, r3, #0xc - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r0, #0xb6 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -12042,7 +12042,7 @@ _022335CC: blt _022335BC ldr r0, [r5, #0x30] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3, r4, r5, r6, r7, pc} nop _022335DC: .word MOD12_022451D0 @@ -26791,7 +26791,7 @@ _0223A4D2: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -27041,7 +27041,7 @@ _0223A6AE: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -28094,7 +28094,7 @@ _0223AED6: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r2, r4, #0 ldrb r1, [r4, #0x17] ldr r0, [r4] @@ -28140,7 +28140,7 @@ _0223AF34: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -28580,7 +28580,7 @@ _0223B294: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] mov r1, #0xc ldrb r0, [r0, #0x12] @@ -29261,7 +29261,7 @@ _0223B80A: lsl r1, r1, #0x18 ldr r0, [sp, #0xc] lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _0223B82E: add r5, r5, #1 add r4, r4, #2 @@ -30517,7 +30517,7 @@ MOD12_0223C19C: ; 0x0223C19C ldr r2, [r2] mov r1, #4 lsl r3, r3, #0xc - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, _0223C1D8 ; =0x0000FFFF add r4, #0x94 strh r0, [r4] @@ -30851,7 +30851,7 @@ _0223C410: ldr r0, [sp] mov r1, #3 ldr r0, [r0, #0x60] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -35079,7 +35079,7 @@ _0223E49A: bl FUN_0200D0BC ldr r0, [r5, #0x74] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0 add r0, #0x98 ldr r1, _0223E520 ; =MOD12_02246224 @@ -35138,7 +35138,7 @@ MOD12_0223E528: ; 0x0223E528 bl FUN_0200D0E0 ldr r0, [r4, #0x74] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, _0223E544 ; =0x00001BF1 mov r1, #0 strb r1, [r4, r0] @@ -36587,7 +36587,7 @@ _0223F032: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x74] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -36844,7 +36844,7 @@ _0223F222: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x74] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -39313,7 +39313,7 @@ _02240522: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x74] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r2, r4, #0 ldrb r1, [r4, #0x1a] ldr r0, [r4] @@ -39359,7 +39359,7 @@ _02240580: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x74] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -41665,7 +41665,7 @@ MOD12_02241754: ; 0x02241754 ldr r0, [r0] bl FUN_0200372C ldr r0, [r4, #0x30] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _022417D4 ; =0x027E0000 ldr r1, _022417D8 ; =0x00003FF8 mov r0, #1 @@ -46385,7 +46385,7 @@ _02243C52: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -46635,7 +46635,7 @@ _02243E2E: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -46799,7 +46799,7 @@ _02243F56: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _02243F7A: ldrb r1, [r4, #0x1a] add r2, r4, #0 @@ -46846,7 +46846,7 @@ _02243FBA: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 0c8541b9..c4b96eeb 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -13862,7 +13862,7 @@ _021DE250: ldr r0, [r6, r0] ldr r3, [r3, #0x10] mov r1, #3 - bl FUN_02017E14 + bl BG_LoadCharTilesData _021DE262: ldr r0, [sp, #0x10] bl FreeToHeap @@ -24644,7 +24644,7 @@ MOD14_021E355C: ; 0x021E355C ldr r0, [r4, #8] mov r1, #4 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -28336,7 +28336,7 @@ MOD14_021E5128: ; 0x021E5128 mov r1, #0x20 mov r2, #0 mov r3, #0xa - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 85687e1e..217f561a 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -6754,7 +6754,7 @@ MOD15_021DA8E8: ; 0x021DA8E8 mov r1, #0x20 mov r2, #0 mov r3, #0x23 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -7732,7 +7732,7 @@ MOD15_021DAFF8: ; 0x021DAFF8 ldr r0, [r5, #0xc] ldr r3, [r3, #0x10] mov r1, #4 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #8] bl FreeToHeap _021DB0D4: 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 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 236cbc5a..fd8ca035 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -860,7 +860,7 @@ MOD17_021D7AE4: ; 0x021D7AE4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x38] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r0, [r4, #0x20] bl FUN_020081C4 bl FUN_02009F80 @@ -983,7 +983,7 @@ MOD17_021D7B94: ; 0x021D7B94 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r5, #0x38] mov r1, #2 bl FUN_02018744 @@ -1136,7 +1136,7 @@ MOD17_021D7CD8: ; 0x021D7CD8 MOD17_021D7CF0: ; 0x021D7CF0 push {r3, lr} ldr r0, [r0, #0x38] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_02009F80 pop {r3, pc} .align 2, 0 @@ -1471,7 +1471,7 @@ MOD17_021D7F34: ; 0x021D7F34 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #1 bl FUN_02018744 @@ -1494,7 +1494,7 @@ MOD17_021D7F34: ; 0x021D7F34 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #2 bl FUN_02018744 @@ -1517,7 +1517,7 @@ MOD17_021D7F34: ; 0x021D7F34 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #3 bl FUN_02018744 @@ -1540,7 +1540,7 @@ MOD17_021D7F34: ; 0x021D7F34 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #4 bl FUN_02018744 @@ -1563,7 +1563,7 @@ MOD17_021D7F34: ; 0x021D7F34 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #5 bl FUN_02018744 @@ -3993,7 +3993,7 @@ _021D93C4: ldr r0, [r0, #0x38] mov r2, #3 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4] bl MOD17_021D9848 ldr r0, [r4, #0xc] @@ -4125,7 +4125,7 @@ _021D94B2: ldr r0, [r0, #0x38] mov r1, #1 sub r3, #0x2b - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #0xc] add sp, #4 add r0, r0, #1 @@ -4424,25 +4424,25 @@ _021D9728: ldr r0, [r0, #0x38] add r2, r1, #0 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5] mov r1, #1 ldr r0, [r0, #0x38] mov r2, #2 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5] mov r1, #2 ldr r0, [r0, #0x38] mov r2, #5 add r3, r6, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5] mov r1, #1 ldr r0, [r0, #0x38] mov r2, #5 add r3, r6, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _021D9766: ldr r0, [r5, #8] add r0, r0, #1 @@ -10076,7 +10076,7 @@ MOD17_021DBF94: ; 0x021DBF94 lsl r1, r1, #0x18 lsr r1, r1, #0x18 mov r2, #2 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r1, [r4] ldr r3, [r4, #0x40] ldr r0, [r1] @@ -10084,7 +10084,7 @@ MOD17_021DBF94: ; 0x021DBF94 mov r2, #5 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r3, r4, r5, pc} _021DBFC8: ldr r0, [r1] @@ -10093,7 +10093,7 @@ _021DBFC8: lsl r1, r1, #0x18 lsr r1, r1, #0x18 mov r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r1, [r4] ldr r3, [r4, #0x48] ldr r0, [r1] @@ -10101,7 +10101,7 @@ _021DBFC8: mov r2, #3 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4] add r1, r4, #4 bl MOD17_021DBD04 @@ -10175,7 +10175,7 @@ MOD17_021DC004: ; 0x021DC004 lsl r1, r5, #0x18 add r0, r7, #0 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r4, r5, r6, r7, pc} thumb_func_end MOD17_021DC004 @@ -10278,7 +10278,7 @@ MOD17_021DC11C: ; 0x021DC11C ldr r0, [r4] ldr r3, [r3, #0x10] lsr r1, r1, #0x18 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0 bl FUN_0200CAB4 ldr r0, [r4, #8] @@ -14088,7 +14088,7 @@ _021DDD96: bl FreeToHeap ldr r0, [r5, #0x4c] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD17_021DDD54 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index b6d3d0c3..03d64bb8 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1496,7 +1496,7 @@ _0223A194: mov r1, #0x20 add r2, r0, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #0 bl FUN_02018744 @@ -1519,7 +1519,7 @@ _0223A194: mov r1, #0x20 mov r2, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 bl FUN_02018744 @@ -1542,7 +1542,7 @@ _0223A194: mov r1, #0x20 mov r2, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 bl FUN_02018744 @@ -1565,7 +1565,7 @@ _0223A194: mov r1, #0x20 mov r2, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 bl FUN_02018744 @@ -1573,12 +1573,12 @@ _0223A194: mov r1, #0x20 mov r2, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0xa8 pop {r3, r4, r5, pc} nop @@ -6173,7 +6173,7 @@ MOD18_0223C6CC: ; 0x0223C6CC add r4, r0, #0 bl MOD18_0223C188 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_02009F80 pop {r4, pc} @@ -22606,7 +22606,7 @@ _022444AC: bl GX_EngineBToggleLayers mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r0, [r4] add sp, #0x60 add r0, r0, #1 @@ -23180,7 +23180,7 @@ MOD18_0224486C: ; 0x0224486C mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 add r1, r4, #0 mov r2, #7 @@ -33408,7 +33408,7 @@ _02249936: bl FUN_0200CCF8 ldrb r1, [r4, #0x14] ldr r0, [r4, #0x10] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0 add r0, #0x10 bl RemoveWindow @@ -33557,7 +33557,7 @@ MOD18_02249A64: ; 0x02249A64 add r1, #0x24 ldrb r1, [r1] ldr r0, [r4, #0x20] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x44] bl ListMenuItems_dtor mov r0, #0 @@ -42490,7 +42490,7 @@ MOD18_0224E26C: ; 0x0224E26C bl FUN_0200CCF8 ldrb r1, [r4, #8] ldr r0, [r4, #4] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #4 bl RemoveWindow add r0, r4, #0 @@ -43018,7 +43018,7 @@ MOD18_0224E6A8: ; 0x0224E6A8 bl FUN_0200CCF8 ldrb r1, [r4, #0xc] ldr r0, [r4, #8] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0 add r0, #8 bl RemoveWindow diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s index 3c634036..526cfa66 100644 --- a/arm9/modules/26/asm/module_26.s +++ b/arm9/modules/26/asm/module_26.s @@ -702,7 +702,7 @@ _02254CEC: ldr r2, [sp, #0x1c] mov r1, #6 lsl r3, r3, #8 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #0x1c] bl FreeToHeap _02254D68: diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index 413c6a77..6e550b60 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -391,7 +391,7 @@ MOD49_02254AD4: ; 0x02254AD4 mov r1, #6 mov r2, #4 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 3966d71a..27a9f2f8 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -436,7 +436,7 @@ MOD53_021D78A8: ; 0x021D78A8 bl FUN_0201C30C bl FUN_02009F80 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D78C8 ; =0x027E0000 ldr r1, _021D78CC ; =0x00003FF8 mov r0, #1 @@ -571,12 +571,12 @@ MOD53_021D78F0: ; 0x021D78F0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4, r5, pc} nop diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index c1c294fc..e9a9f2be 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -402,7 +402,7 @@ MOD54_021D784C: ; 0x021D784C bl FUN_0201C30C bl FUN_02009F80 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D786C ; =0x027E0000 ldr r1, _021D7870 ; =0x00003FF8 mov r0, #1 @@ -537,12 +537,12 @@ MOD54_021D7894: ; 0x021D7894 mov r1, #0x20 add r2, r0, #0 mov r3, #0x33 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x33 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4, r5, pc} nop diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 8f876fa1..6652d482 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -368,7 +368,7 @@ MOD55_021D77D0: ; 0x021D77D0 bl FUN_020081C4 _021D77E6: ldr r0, [r4, #4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_02009F80 ldr r3, _021D7804 ; =0x027E0000 @@ -426,7 +426,7 @@ MOD55_021D781C: ; 0x021D781C mov r1, #0x20 add r2, r0, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #0 bl FUN_02018744 @@ -449,7 +449,7 @@ MOD55_021D781C: ; 0x021D781C mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 bl FUN_02018744 @@ -472,7 +472,7 @@ MOD55_021D781C: ; 0x021D781C mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 bl FUN_02018744 @@ -495,7 +495,7 @@ MOD55_021D781C: ; 0x021D781C mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 bl FUN_02018744 @@ -521,12 +521,12 @@ MOD55_021D781C: ; 0x021D781C mov r1, #0x20 add r2, r0, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 mov r1, #3 bl FUN_020178BC @@ -3934,7 +3934,7 @@ MOD55_021D9474: ; 0x021D9474 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 bl FUN_02018744 @@ -3957,7 +3957,7 @@ MOD55_021D9474: ; 0x021D9474 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 bl FUN_02018744 @@ -3980,7 +3980,7 @@ MOD55_021D9474: ; 0x021D9474 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 bl FUN_02018744 @@ -3988,7 +3988,7 @@ MOD55_021D9474: ; 0x021D9474 mov r1, #0x20 add r2, r0, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 mov r1, #3 bl FUN_020178BC diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 47c92423..bc35714b 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -575,7 +575,7 @@ MOD56_0221228C: ; 0x0221228C push {r3, lr} add r0, #0xc0 ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_02009F80 ldr r3, _022122AC ; =0x027E0000 @@ -643,7 +643,7 @@ MOD56_022122D4: ; 0x022122D4 mov r1, #0x20 add r2, r0, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #0 bl FUN_02018744 @@ -666,7 +666,7 @@ MOD56_022122D4: ; 0x022122D4 mov r1, #0x20 mov r2, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 bl FUN_02018744 @@ -689,7 +689,7 @@ MOD56_022122D4: ; 0x022122D4 mov r1, #0x20 mov r2, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 bl FUN_02018744 @@ -712,7 +712,7 @@ MOD56_022122D4: ; 0x022122D4 mov r1, #0x20 mov r2, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 bl FUN_02018744 @@ -738,12 +738,12 @@ MOD56_022122D4: ; 0x022122D4 mov r1, #0x20 add r2, r0, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 mov r1, #3 bl FUN_020178BC diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index c5c56cfc..1a34bf60 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -2212,7 +2212,7 @@ MOD57_021D8690: ; 0x021D8690 ldr r2, [r3, #0x14] ldr r0, [r5] ldr r3, [r3, #0x10] - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [r5] mov r1, #7 bl GetBgTilemapBuffer @@ -2444,7 +2444,7 @@ MOD57_021D8830: ; 0x021D8830 str r0, [sp, #4] lsr r1, r1, #0x18 lsl r3, r3, #0xc - bl FUN_02017E14 + bl BG_LoadCharTilesData lsl r1, r7, #0x18 ldr r0, [sp, #4] lsr r1, r1, #0x18 @@ -2652,7 +2652,7 @@ _021D89A6: mov r1, #7 mov r3, #1 str r2, [sp] - bl FUN_02017F48 + bl BG_FillCharDataRange pop {r3, r4, r5, r6, r7, pc} nop _021D89D0: .word MOD57_021D98F4 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index afa5321b..7bc32277 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -289,7 +289,7 @@ MOD58_021D9CB4: ; 0x021D9CB4 bl FUN_0201C30C bl FUN_02009F80 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D9CD4 ; =0x027E0000 ldr r1, _021D9CD8 ; =0x00003FF8 mov r0, #1 @@ -424,12 +424,12 @@ MOD58_021D9CFC: ; 0x021D9CFC mov r1, #0x20 add r2, r0, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4, r5, pc} nop @@ -604,7 +604,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #0x20 mov r2, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 str r0, [sp] mov r0, #2 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 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 129f4bed..10f7e0e4 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -405,7 +405,7 @@ _021D7804: bl FUN_0200BC30 bl NNS_GfdDoVramTransfer ldr r0, [r4, #0x14] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D782C ; =0x027E0000 ldr r1, _021D7830 ; =0x00003FF8 mov r0, #1 @@ -631,12 +631,12 @@ _021D79C6: ldr r3, [r6] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r6] mov r0, #4 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x80 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -695,7 +695,7 @@ MOD60_021D7A40: ; 0x021D7A40 ldr r2, [r3, #0x14] ldr r0, [r5, #0x14] ldr r3, [r3, #0x10] - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r3, [sp, #0x20] mov r0, #0 str r0, [sp] @@ -703,7 +703,7 @@ MOD60_021D7A40: ; 0x021D7A40 ldr r0, [r5, #0x14] ldr r3, [r3, #0x10] mov r1, #4 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r6, #0 bl FreeToHeap mov r0, #0x49 @@ -725,13 +725,13 @@ MOD60_021D7A40: ; 0x021D7A40 ldr r1, [r1, #0xc] mov r2, #0x20 add r3, r0, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, [sp, #0x1c] mov r0, #4 ldr r1, [r1, #0xc] mov r2, #0x20 mov r3, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r6, #0 bl FreeToHeap mov r0, #0x49 @@ -804,13 +804,13 @@ MOD60_021D7A40: ; 0x021D7A40 bl FUN_020179E0 ldr r0, [r5, #0x14] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x14] mov r1, #0 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x14] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x24 pop {r3, r4, r5, r6, pc} thumb_func_end MOD60_021D7A40 @@ -1451,7 +1451,7 @@ _021D8080: mov r1, #0 mov r2, #3 neg r3, r3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r3, r4, r5, pc} _021D80BE: mov r0, #0x80 @@ -1479,7 +1479,7 @@ _021D80BE: mov r1, #0 mov r2, #3 neg r3, r3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _021D80F6: pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index d00ef443..6725c1fa 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -739,7 +739,7 @@ _021D7A7A: _021D7A88: bl NNS_GfdDoVramTransfer ldr r0, [r4, #0x18] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7AA0 ; =0x027E0000 ldr r1, _021D7AA4 ; =0x00003FF8 mov r0, #1 @@ -986,27 +986,27 @@ _021D7BFC: ldr r3, [r4] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #1 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #3 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #4 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4, r5, pc} .align 2, 0 @@ -1095,7 +1095,7 @@ MOD61_021D7CE8: ; 0x021D7CE8 ldr r0, [r5, #0x18] ldr r3, [r3, #0x10] mov r1, #1 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r3, [sp, #0x28] mov r0, #0 str r0, [sp] @@ -1103,7 +1103,7 @@ MOD61_021D7CE8: ; 0x021D7CE8 ldr r0, [r5, #0x18] ldr r3, [r3, #0x10] mov r1, #4 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r7, #0 bl FreeToHeap ldr r1, [sp, #0x1c] @@ -1127,7 +1127,7 @@ MOD61_021D7CE8: ; 0x021D7CE8 mov r3, #0 lsl r2, r2, #0x10 lsr r2, r2, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r0, [r5] bl FUN_02002FD0 str r0, [r5, #0x30] @@ -1307,10 +1307,10 @@ _021D7E00: bl FUN_02018170 ldr r0, [r5, #0x18] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x18] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r5, #0xc] cmp r0, #1 bne _021D7FA6 @@ -1339,7 +1339,7 @@ _021D7E00: bl FUN_02018170 ldr r0, [r5, #0x18] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r2, #0 strb r2, [r5, #0x14] ldr r0, _021D7FB0 ; =MOD61_021D7AA8 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 7b8b5bb6..a92f1992 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -7511,7 +7511,7 @@ MOD62_022310CC: ; 0x022310CC bl FUN_0200372C add r4, #0xe4 ldr r0, [r4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _02231104 ; =0x027E0000 ldr r1, _02231108 ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index 4e6e6d0b..3607b140 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -404,7 +404,7 @@ MOD63_021D782C: ; 0x021D782C ldr r0, [r0, #4] bx r3 nop -_021D7834: .word FUN_0201AB60 +_021D7834: .word DoScheduledBgGpuUpdates thumb_func_end MOD63_021D782C thumb_func_start MOD63_021D7838 @@ -819,10 +819,10 @@ MOD63_021D7A48: ; 0x021D7A48 bl GX_EngineBToggleLayers 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, #0xb8 pop {r3, r4, r5, pc} nop @@ -2031,15 +2031,15 @@ _021D844C: bl GfGfxLoader_GXLoadPal 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 r0, #4 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r2, _021D85CC ; =0x00000227 mov r0, #1 mov r1, #0x1a @@ -2104,12 +2104,12 @@ _021D844C: add r1, #2 mov r2, #2 mov r3, #0x42 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #4 add r1, sp, #0x1c mov r2, #2 mov r3, #0x44 - bl FUN_02017FB4 + bl BG_LoadPlttData add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index 24804568..77a19f77 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -172,10 +172,10 @@ MOD63_021D88F0: ; 0x021D88F0 bl FUN_02016C18 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, #0xb8 pop {r3, r4, r5, pc} nop @@ -275,7 +275,7 @@ MOD63_021D8A04: ; 0x021D8A04 bl FUN_02016C18 mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x80 pop {r3, r4, r5, pc} nop @@ -389,7 +389,7 @@ MOD63_021D8ADC: ; 0x021D8ADC bl FUN_02016C18 mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x9c pop {r4, r5, pc} nop diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 82afd6d8..1d85c1d6 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -312,7 +312,7 @@ MOD64_021D77A4: ; 0x021D77A4 add r0, r4, #0 add r0, #0x94 ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -571,7 +571,7 @@ MOD64_021D7970: ; 0x021D7970 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 add r1, r7, #0 bl FUN_02018744 @@ -594,7 +594,7 @@ MOD64_021D7970: ; 0x021D7970 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 @@ -617,7 +617,7 @@ MOD64_021D7970: ; 0x021D7970 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 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index e14e5ac9..db0337b9 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -264,7 +264,7 @@ MOD65_021D76DC: ; 0x021D76DC _021D76EE: bl FUN_0201C30C ldr r0, [r4, #0x24] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7708 ; =0x027E0000 ldr r1, _021D770C ; =0x00003FF8 mov r0, #1 @@ -792,7 +792,7 @@ _021D7AC6: lsr r0, r0, #0x18 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r7, r7, #1 add r4, r4, #1 add r6, #0x1c @@ -919,10 +919,10 @@ MOD65_021D7B24: ; 0x021D7B24 bl NARC_dtor ldr r0, [r5, #0x24] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x24] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -3025,7 +3025,7 @@ MOD65_021D8C88: ; 0x021D8C88 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x68] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r0, [r4, #0x44] bl FUN_020081C4 bl FUN_0200BC30 @@ -3116,7 +3116,7 @@ _021D8D28: add r0, r7, #0 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [sp] add r4, r4, #1 add r0, r0, #1 @@ -3248,10 +3248,10 @@ MOD65_021D8D90: ; 0x021D8D90 bl NARC_dtor ldr r0, [r5, #0x68] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x68] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} thumb_func_end MOD65_021D8D90 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 84391ba0..a4452068 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -142,7 +142,7 @@ _021D75DE: add r0, r4, #0 bl MOD66_021D9220 ldr r0, [r4, #0x28] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7600 ; =0x027E0000 ldr r1, _021D7604 ; =0x00003FF8 mov r0, #1 @@ -426,49 +426,49 @@ _021D7814: ldr r3, [r3, #4] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #1 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #2 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #3 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #4 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #5 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #6 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #7 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0xf4 pop {r4, r5, r6, r7, pc} nop @@ -1630,10 +1630,10 @@ MOD66_021D8140: ; 0x021D8140 bl MOD66_021D8480 ldr r0, [r5, #0x28] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021D818A: pop {r3, r4, r5, pc} thumb_func_end MOD66_021D8140 @@ -2055,7 +2055,7 @@ MOD66_021D8494: ; 0x021D8494 bl FUN_0200D7A0 ldr r0, [r6, #0x28] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021D84C6: pop {r4, r5, r6, pc} thumb_func_end MOD66_021D8494 @@ -2657,19 +2657,19 @@ _021D897C: _021D898C: ldr r0, [r4, #0x28] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r3, r4, pc} thumb_func_end MOD66_021D8838 @@ -2789,28 +2789,28 @@ MOD66_021D89B8: ; 0x021D89B8 bl FUN_02018540 ldr r0, [r4, #0x28] mov r1, #0 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2943,12 +2943,12 @@ MOD66_021D8BF0: ; 0x021D8BF0 mov r1, #6 mov r2, #0 mov r3, #8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #0 mov r3, #8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _021D8C4A _021D8C16: cmp r4, #0xf8 @@ -2957,23 +2957,23 @@ _021D8C16: mov r1, #6 mov r2, #0 mov r3, #0xf8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #0 mov r3, #0xf8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _021D8C4A _021D8C34: mov r1, #6 mov r2, #0 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #0 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _021D8C4A: cmp r6, #0x50 bge _021D8C68 @@ -2981,12 +2981,12 @@ _021D8C4A: mov r1, #6 mov r2, #3 mov r3, #0x50 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #3 mov r3, #0x50 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, r5, r6, pc} _021D8C68: mov r3, #0x13 @@ -2996,24 +2996,24 @@ _021D8C68: ble _021D8C8A mov r1, #6 mov r2, #3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r3, #0x13 ldr r0, [r5, #0x28] mov r1, #7 mov r2, #3 lsl r3, r3, #4 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, r5, r6, pc} _021D8C8A: mov r1, #6 mov r2, #3 add r3, r6, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #3 add r3, r6, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD66_021D8BF0 @@ -3360,7 +3360,7 @@ _021D8F04: bl MOD66_021D868C ldr r0, [r5, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021D8F2C: ldr r1, [r4, #8] add r0, r1, #1 @@ -3534,10 +3534,10 @@ _021D9066: bl MOD66_021D868C ldr r0, [r5, #0x28] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r3, #0 str r3, [r5, #0x14] mov r0, #8 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 85a4b0d0..4a89a4a2 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -175,7 +175,7 @@ MOD67_021D7624: ; 0x021D7624 MOD67_021D7660: ; 0x021D7660 push {r3, lr} ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7678 ; =0x027E0000 ldr r1, _021D767C ; =0x00003FF8 mov r0, #1 @@ -292,12 +292,12 @@ MOD67_021D76A0: ; 0x021D76A0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x2a - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0x2a - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x80 pop {r3, r4, r5, pc} nop @@ -425,7 +425,7 @@ _021D7844: bl FUN_02002ED0 mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x10 pop {r4, pc} thumb_func_end MOD67_021D77B0 @@ -628,11 +628,11 @@ _021D79AC: ldr r1, _021D7A34 ; =0x00001062 ldr r0, [r4] ldrb r1, [r4, r1] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r1, _021D7A30 ; =0x00001061 ldr r0, [r4] ldrb r1, [r4, r1] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc mov r0, #1 pop {r3, r4, pc} @@ -829,7 +829,7 @@ MOD67_021D7B5C: ; 0x021D7B5C bl FUN_020186B4 ldr r0, [r5] add r1, r4, #0 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc pop {r4, r5, pc} .align 2, 0 @@ -920,7 +920,7 @@ _021D7C10: ldr r0, [r7] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 16c68965..081b1768 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -187,7 +187,7 @@ _021D767C: .word 0x04000050 MOD68_021D7680: ; 0x021D7680 push {r3, lr} ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7698 ; =0x027E0000 ldr r1, _021D769C ; =0x00003FF8 mov r0, #1 @@ -272,7 +272,7 @@ MOD68_021D76C0: ; 0x021D76C0 mov r1, #2 mov r2, #3 mov r3, #8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r5, _021D7770 ; =0x021D88F4 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -292,7 +292,7 @@ MOD68_021D76C0: ; 0x021D76C0 mov r1, #0x20 mov r2, #0 mov r3, #0x24 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x64 pop {r4, r5, pc} nop diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 5f8bd400..1ee2e22e 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -766,7 +766,7 @@ MOD69_0222DBAC: ; 0x0222DBAC mov r1, #1 ldr r0, [r4, #0x10] add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index e8b68f04..9356ef57 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -857,7 +857,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 mov r1, #1 ldr r0, [r5, #0x10] add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index a8d81d99..35aa7381 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1793,7 +1793,7 @@ MOD71_0222E4DC: ; 0x0222E4DC mov r0, #0x5d lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r0, _0222E548 ; =0x00002110 ldr r0, [r5, r0] cmp r0, #0 @@ -1998,17 +1998,17 @@ MOD71_0222E578: ; 0x0222E578 mov r1, #0x20 add r2, r0, #0 mov r3, #0x1a - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0x1a - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x1a - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r4, #0 mov r6, #3 add r7, r4, #0 @@ -2304,10 +2304,10 @@ MOD71_0222E900: ; 0x0222E900 bl GfGfxLoader_GXLoadPal 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 r1, #0x1a mov r0, #0 lsl r1, r1, #4 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 8855a586..fcf89fc9 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -2407,7 +2407,7 @@ MOD73_021D88B0: ; 0x021D88B0 ldr r0, [r4, #0x20] cmp r0, #0 beq _021D88C2 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates _021D88C2: pop {r4, pc} thumb_func_end MOD73_021D88B0 @@ -2491,7 +2491,7 @@ _021D8944: ldr r3, [sp] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r7, r7, #1 add r4, #0x1c add r5, r5, #1 @@ -4933,7 +4933,7 @@ _021D9BCE: bl FUN_02019220 ldr r0, [r5, #4] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021D9BDC: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -5108,7 +5108,7 @@ _021D9CD8: str r0, [r5, #0x28] ldr r0, [r5, #4] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD73_021D9CA0 @@ -6050,7 +6050,7 @@ MOD73_021DA374: ; 0x021DA374 bl FreeToHeap ldr r0, [r4, #4] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} thumb_func_end MOD73_021DA374 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 9bb33e16..5b13fc71 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -343,7 +343,7 @@ MOD74_021D7784: ; 0x021D7784 bl MOD74_021D82E8 bl NNS_GfdDoVramTransfer ldr r0, [r4, #0x10] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D77A4 ; =0x027E0000 ldr r1, _021D77A8 ; =0x00003FF8 mov r0, #1 @@ -635,7 +635,7 @@ _021D799C: ldr r3, [r5] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldrh r0, [r5, #8] cmp r0, #0 beq _021D79BA @@ -643,7 +643,7 @@ _021D799C: mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange _021D79BA: add sp, #0x64 pop {r4, r5, r6, r7, pc} @@ -747,7 +747,7 @@ _021D7A5A: bl NARC_dtor ldr r0, [r5, #0x10] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 90d51109..562c24d4 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -530,7 +530,7 @@ MOD75_021E6FFC: ; 0x021E6FFC MOD75_021E700C: ; 0x021E700C push {r3, lr} ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_0200BC30 ldr r3, _021E702C ; =0x027E0000 @@ -697,22 +697,22 @@ MOD75_021E7054: ; 0x021E7054 mov r1, #7 mov r2, #9 mov r3, #0x80 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos add r0, r4, #0 mov r1, #7 mov r2, #0xc mov r3, #0x50 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #6 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #6 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0xd4 pop {r4, r5, pc} nop @@ -2259,7 +2259,7 @@ _021E7D68: bl MOD75_021E7E0C ldr r0, [r4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #1 pop {r4, pc} _021E7D88: @@ -2312,7 +2312,7 @@ _021E7DD4: bl MOD75_021E7E0C ldr r0, [r4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #1 pop {r4, pc} _021E7DF2: @@ -2574,7 +2574,7 @@ _021E7FB6: bl MOD75_021E84E4 ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021E8004: add r5, #0xfc ldr r0, [r5] @@ -2628,7 +2628,7 @@ _021E803E: bl MOD75_021E84E4 ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] @@ -2714,7 +2714,7 @@ _021E80EA: bl MOD75_021E84E4 ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] @@ -3153,7 +3153,7 @@ _021E8460: bl MOD75_021E84E4 ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r4, #6] lsl r3, r0, #1 ldr r0, _021E84DC ; =0x00000424 @@ -3329,7 +3329,7 @@ _021E85A8: ldr r0, [sp] mov r1, #4 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3, r4, r5, r6, r7, pc} nop _021E85D4: .word 0x00000276 @@ -3452,7 +3452,7 @@ _021E869C: _021E86B2: ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _021E86BC: .word 0x00000424 @@ -4392,7 +4392,7 @@ _021E8DDA: _021E8DFC: ldr r0, [r4] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc pop {r3, r4, pc} .align 2, 0 @@ -6733,7 +6733,7 @@ _021EA0FE: mov r1, #7 mov r2, #0 lsr r3, r3, #0x10 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, _021EA114 ; =0x0000049A strh r5, [r4, r0] pop {r3, r4, r5, pc} @@ -6862,7 +6862,7 @@ _021EA1EC: ldrh r3, [r5, r3] mov r1, #7 mov r2, #0 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, _021EA2CC ; =0x000001F6 add r1, r6, #0 bl _s32_div_f diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index d3de7545..c4e3785a 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -247,7 +247,7 @@ MOD76_021D76B8: ; 0x021D76B8 MOD76_021D76E8: ; 0x021D76E8 push {r3, lr} ldr r0, [r0, #4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_0200BC30 ldr r3, _021D7708 ; =0x027E0000 @@ -354,7 +354,7 @@ MOD76_021D7730: ; 0x021D7730 mov r1, #0x20 add r2, r0, #0 mov r3, #0x43 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x64 pop {r4, r5, pc} nop @@ -901,7 +901,7 @@ MOD76_021D7BE0: ; 0x021D7BE0 mov r2, #0 mov r1, #2 add r3, r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r5, #0 add r0, #0x18 bl FUN_0201958C @@ -932,7 +932,7 @@ _021D7C3A: add r3, r1, #0 mov r2, #0 add r3, #0xfe - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r5, #0 add r0, #8 bl FUN_0201958C @@ -1755,7 +1755,7 @@ _021D82E0: blo _021D82E0 ldr r0, [r5, #4] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, r5, r6, pc} thumb_func_end MOD76_021D82D8 @@ -1794,7 +1794,7 @@ _021D832E: _021D8344: ldr r0, [r5, #4] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3, r4, r5, r6, r7, pc} nop _021D8350: .word 0x0000FFFF diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 52e30c10..08b3b1da 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -1413,10 +1413,10 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #6 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _021D821C ; =0x00004753 mov r0, #6 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _021D8208 ; =0x0000C010 ldr r2, _021D8220 ; =0x021D8F40 ldr r0, [r5, r1] @@ -1508,10 +1508,10 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #2 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, [r5] mov r0, #0x10 bl String_ctor @@ -1533,23 +1533,23 @@ MOD77_021D7FAC: ; 0x021D7FAC add r1, sp, #0x14 add r1, #2 add r2, r0, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #2 add r1, sp, #0x14 add r2, r0, #0 mov r3, #0x84 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #2 add r1, sp, #0x10 add r1, #2 add r2, r0, #0 mov r3, #0x86 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #2 add r1, sp, #0x10 add r2, r0, #0 mov r3, #0x9e - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, _021D8208 ; =0x0000C010 ldr r2, _021D823C ; =0x021D8F30 ldr r0, [r5, r1] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 47f9d903..02efb8e0 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -2717,12 +2717,12 @@ MOD80_0222EA04: ; 0x0222EA04 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -4030,12 +4030,12 @@ MOD80_0222F494: ; 0x0222F494 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x8c pop {r4, r5, pc} nop @@ -5342,12 +5342,12 @@ MOD80_0222FF6C: ; 0x0222FF6C mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x70 pop {r3, r4, r5, pc} nop @@ -6323,17 +6323,17 @@ MOD80_02230760: ; 0x02230760 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x54 pop {r4, r5, pc} nop @@ -8731,12 +8731,12 @@ MOD80_02231AB0: ; 0x02231AB0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -11777,12 +11777,12 @@ MOD80_02233358: ; 0x02233358 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x8c pop {r4, r5, pc} nop @@ -14314,12 +14314,12 @@ MOD80_02234780: ; 0x02234780 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -17954,12 +17954,12 @@ MOD80_02236378: ; 0x02236378 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x10 mov r1, #0 bl GX_EngineBToggleLayers @@ -18097,10 +18097,10 @@ MOD80_02236488: ; 0x02236488 bl GfGfxLoader_LoadScrnData 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} thumb_func_end MOD80_02236488 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index fce433e7..d991bc62 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -1048,7 +1048,7 @@ _02238648: lsr r1, r1, #0x18 add r2, r7, #0 add r3, r6, #0 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r1, [sp, #0x20] add r0, r4, #0 bl ReleaseBoxMonLock @@ -2189,7 +2189,7 @@ MOD81_02238E44: ; 0x02238E44 str r2, [sp] ldr r0, [r4, #0x40] add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -6830,21 +6830,21 @@ MOD81_0223B264: ; 0x0223B264 ldr r0, [r4, #0xc] mov r2, #0 add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r0, #0xc8 str r0, [sp] ldr r0, [r4, #0xc] mov r1, #5 mov r2, #0 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r0, #0xc8 str r0, [sp] ldr r0, [r4, #0xc] mov r1, #2 mov r2, #0 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r1, #0 str r1, [sp] ldr r0, [r4] @@ -9241,7 +9241,7 @@ MOD81_0223C658: ; 0x0223C658 str r2, [sp] ldr r0, [r4, #0x44] add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 055eafaa..a0dc6448 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -1571,12 +1571,12 @@ MOD82_0222E15C: ; 0x0222E15C mov r1, #0x20 add r2, r0, #0 mov r3, #0x44 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x44 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x70 pop {r3, r4, r5, pc} nop @@ -1711,10 +1711,10 @@ MOD82_0222E264: ; 0x0222E264 bl GfGfxLoader_LoadScrnData 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} thumb_func_end MOD82_0222E264 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index b30544aa..9e9d13b7 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -428,10 +428,10 @@ _0222D8B2: ldr r3, [r5, #4] bl MOD83_02238A38 ldr r0, [sp, #0x1c] - bl FUN_0201AB14 + bl GetWindowX add r6, r0, #0 ldr r0, [sp, #0x1c] - bl FUN_0201AB18 + bl GetWindowY add r7, r0, #0 ldr r0, [sp, #0x1c] bl GetWindowWidth @@ -586,7 +586,7 @@ _0222DA18: mov r1, #0 mov r2, #3 asr r3, r3, #0xc - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r3, #0x41 lsl r3, r3, #2 ldr r0, [r4] @@ -597,7 +597,7 @@ _0222DA18: add r3, r4, r3 mov r2, #3 asr r3, r3, #0xc - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _0222DA48: pop {r3, r4, r5, pc} nop @@ -645,7 +645,7 @@ _0222DA5C: mov r0, #0 mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #2 lsl r0, r0, #0xe str r0, [sp] @@ -665,7 +665,7 @@ _0222DA5C: strh r2, [r1] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 str r0, [sp] mov r1, #2 @@ -683,7 +683,7 @@ _0222DA5C: mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange bl FUN_0201BD5C mov r0, #0 mov r1, #0x20 @@ -1477,11 +1477,11 @@ _0222E104: beq _0222E188 ldr r0, [sp, #0x2c] mov r1, #3 - bl FUN_0201AB1C + bl MoveWindowX lsl r1, r5, #0x18 ldr r0, [sp, #0x2c] lsr r1, r1, #0x18 - bl FUN_0201AB20 + bl MoveWindowY ldr r2, [sp, #0x54] ldr r3, [sp, #0x58] lsl r2, r2, #0x10 @@ -1595,10 +1595,10 @@ _0222E206: mov r3, #3 bl FUN_0200CCA4 add r0, r5, #0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x10] add r0, r5, #0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x14] add r0, r5, #0 bl GetWindowWidth @@ -1622,10 +1622,10 @@ _0222E256: mov r3, #2 bl FUN_0200CCA4 add r0, r5, #0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x18] add r0, r5, #0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x1c] add r0, r5, #0 bl GetWindowWidth @@ -1699,7 +1699,7 @@ MOD83_0222E2E4: ; 0x0222E2E4 add r1, #0x5c lsl r0, r0, #4 add r0, r1, r0 - bl FUN_0201AB18 + bl GetWindowY sub r0, r0, #1 lsl r4, r0, #3 ldr r0, [r5, #0x54] @@ -1765,7 +1765,7 @@ _0222E362: cmp r0, #0 beq _0222E38E add r0, r5, #0 - bl FUN_0201AB18 + bl GetWindowY sub r0, r0, #1 lsl r4, r0, #3 add r0, r5, #0 @@ -1895,7 +1895,7 @@ MOD83_0222E464: ; 0x0222E464 bl FUN_0201C30C bl FUN_02009F80 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222E484 ; =MOD83_027E0000 ldr r1, _0222E488 ; =0x00003FF8 mov r0, #1 @@ -18219,7 +18219,7 @@ _02236520: bl FUN_0201C30C bl FUN_02009F80 ldr r0, [r4, #0x20] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _02236540 ; =MOD83_027E0000 ldr r1, _02236544 ; =0x00003FF8 mov r0, #1 @@ -23228,7 +23228,7 @@ _02238A8A: add r0, r1, #0 lsl r1, r6, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AB1C + bl MoveWindowX _02238A9C: mov r0, #0 mvn r0, r0 @@ -23237,7 +23237,7 @@ _02238A9C: lsl r1, r5, #0x18 ldr r0, [r4, #0x10] lsr r1, r1, #0x18 - bl FUN_0201AB20 + bl MoveWindowY _02238AAE: ldr r1, [sp, #0x28] add r0, r4, #0 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 85fd8ff5..34b35590 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -431,7 +431,7 @@ MOD85_021D7818: ; 0x021D7818 mov r1, #0x20 add r2, r0, #0 mov r3, #0x4f - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r5, _021D78F8 ; =0x021DED44 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -578,7 +578,7 @@ MOD85_021D797C: ; 0x021D797C ldr r1, [r1, #0xc] lsl r2, r2, #4 mov r3, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r5, #0 bl FreeToHeap mov r1, #0 @@ -598,7 +598,7 @@ MOD85_021D797C: ; 0x021D797C ldr r0, [r4, r0] ldr r3, [r3, #0x10] mov r1, #1 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -643,7 +643,7 @@ MOD85_021D797C: ; 0x021D797C ldr r0, [r4, r0] ldr r3, [r3, #0x10] mov r1, #2 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -686,7 +686,7 @@ MOD85_021D797C: ; 0x021D797C ldr r1, [r1, #0xc] lsl r2, r2, #4 mov r3, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -706,7 +706,7 @@ MOD85_021D797C: ; 0x021D797C ldr r0, [r4, r0] ldr r3, [r3, #0x10] mov r1, #7 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -1462,7 +1462,7 @@ MOD85_021D80DC: ; 0x021D80DC bl FUN_02009F80 ldr r0, _021D80F4 ; =0x0000043C ldr r0, [r4, r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates pop {r4, pc} nop _021D80F4: .word 0x0000043C @@ -8830,7 +8830,7 @@ MOD85_021DB69C: ; 0x021DB69C lsr r0, r0, #0x18 mov r2, #0x20 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData pop {r4, pc} .align 2, 0 thumb_func_end MOD85_021DB69C @@ -10247,7 +10247,7 @@ MOD85_021DC050: ; 0x021DC050 ldr r0, _021DC090 ; =0x0000043C mov r1, #1 ldr r0, [r4, r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc pop {r4, r5, pc} .align 2, 0 @@ -10282,7 +10282,7 @@ MOD85_021DC094: ; 0x021DC094 ldr r0, _021DC0D4 ; =0x0000043C mov r1, #1 ldr r0, [r4, r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc pop {r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index a552ad64..a1e2bb35 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -245,7 +245,7 @@ MOD86_021D76E0: ; 0x021D76E0 ldr r0, [r0, #0x10] bx r3 nop -_021D76E8: .word FUN_0201AB60 +_021D76E8: .word DoScheduledBgGpuUpdates thumb_func_end MOD86_021D76E0 thumb_func_start MOD86_021D76EC @@ -772,12 +772,12 @@ _021D7A06: ldr r3, [r5] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r5] mov r0, #4 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r2, [r5] mov r0, #0 mov r1, #0x40 diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index 7d8c93d3..128092eb 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -84,9 +84,9 @@ THUMB_FUNC void PrintErrorMessageAndReset() FUN_0200CB00(ptr, 0, 503, 2, 0, 0); FUN_02002ED0(0, 0x20, 0); - FUN_02017F18(0, 0x20, 0, 0); - FUN_02017FE4(0, 0x6C21); - FUN_02017FE4(4, 0x6C21); + BG_ClearCharDataRange(0, 0x20, 0, 0); + BG_SetMaskColor(0, 0x6C21); + BG_SetMaskColor(4, 0x6C21); struct MsgData *msg_data = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 0xc8, 0); struct String *str = String_ctor(6 << 6, 0); diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index e6fedda8..eac7b417 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -13,7 +13,7 @@ THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct BgCo {
if (szByte == 0)
szByte = pCharData->szByte;
- FUN_02017E14(unkStruct02016B94_2, (u8)a3, pCharData->pRawData, szByte, a4);
+ BG_LoadCharTilesData(unkStruct02016B94_2, (u8)a3, pCharData->pRawData, szByte, a4);
}
FreeToHeap(pFile);
}
diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c index 527e03a2..bc779ad7 100644 --- a/arm9/src/text_02054590.c +++ b/arm9/src/text_02054590.c @@ -47,7 +47,7 @@ THUMB_FUNC void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 THUMB_FUNC void FUN_02054608(struct Window *param0, struct Options *options) { - FUN_0200CD68(param0->bgConfig, FUN_0201AB08(param0), 994, 10, (u8)Options_GetFrame(options), 4); + FUN_0200CD68(param0->bgConfig, GetWindowBgId(param0), 994, 10, (u8)Options_GetFrame(options), 4); FUN_0205464C(param0); FUN_0200D0BC(param0, 0, 994, 10); } @@ -105,7 +105,7 @@ THUMB_FUNC void FUN_020546E0( THUMB_FUNC void FUN_02054744(struct Window *param0, u32 param1, u32 param2) { - FUN_0200D300(param0->bgConfig, FUN_0201AB08(param0), 0x399, 9, (u8)param1, param2, 4); + FUN_0200D300(param0->bgConfig, GetWindowBgId(param0), 0x399, 9, (u8)param1, param2, 4); FillWindowPixelBuffer(param0, 15); FUN_0200D6F8(param0, 0, 0x399, 9, (u8)param1); } diff --git a/arm9/src/unk_02016B94.c b/arm9/src/unk_02016B94.c index cb990b8b..2579ccb2 100644 --- a/arm9/src/unk_02016B94.c +++ b/arm9/src/unk_02016B94.c @@ -5,9 +5,6 @@ #include "gx.h" #include "heap.h" -extern void NNS_G2dGetUnpackedBGCharacterData(void *param0, u32 *param1); -extern void NNS_G2dGetUnpackedPaletteData(void *param0, u32 *param1); - const u8 UNK_020EDB30[] = { 0x10, 0x20, @@ -59,7 +56,7 @@ THUMB_FUNC struct BgConfig *FUN_02016B94(u32 heap_id) memset(ptr, 0, sizeof(struct BgConfig)); ptr->heap_id = heap_id; ptr->scrollScheduled = 0; - ptr->unk06 = 0; + ptr->bufferTransferScheduled = 0; return ptr; } @@ -564,33 +561,33 @@ THUMB_FUNC u8 FUN_020177DC(u8 param0, u32 param1) return 0; } -THUMB_FUNC void FUN_02017850(u32 param0, u8 *param1, u8 *param2) +THUMB_FUNC void GetBgScreenDimensions(u32 screenSize, u8 *width_p, u8 *height_p) { - switch (param0) + switch (screenSize) { case 0: - *param1 = 0x10; - *param2 = 0x10; + *width_p = 0x10; + *height_p = 0x10; break; case 1: - *param1 = 0x20; - *param2 = 0x20; + *width_p = 0x20; + *height_p = 0x20; break; case 2: - *param1 = 0x20; - *param2 = 0x40; + *width_p = 0x20; + *height_p = 0x40; break; case 3: - *param1 = 0x40; - *param2 = 0x20; + *width_p = 0x40; + *height_p = 0x20; break; case 4: - *param1 = 0x40; - *param2 = 0x40; + *width_p = 0x40; + *height_p = 0x40; break; case 5: - *param1 = 0x80; - *param2 = 0x80; + *width_p = 0x80; + *height_p = 0x80; break; } } @@ -668,7 +665,7 @@ THUMB_FUNC void ToggleBgLayer(u32 bgId, GX_LayerToggle toggle) THUMB_FUNC void FUN_020179E0(struct BgConfig *bgConfig, u32 bgId, u32 param2, fx32 val) { - FUN_02017B8C(&bgConfig->bgs[bgId], param2, val); + Bg_SetPosText(&bgConfig->bgs[bgId], param2, val); u32 x = (u32)bgConfig->bgs[bgId].hOffset; u32 y = (u32)bgConfig->bgs[bgId].vOffset; @@ -748,31 +745,31 @@ THUMB_FUNC void FUN_02017B60(struct BgConfig *param0, fx32 param5, fx32 param6) { - FUN_02017B8C(¶m0->bgs[param1], param2, param3); + Bg_SetPosText(¶m0->bgs[param1], param2, param3); FUN_02017BD0(param0, param1, param4, param5, param6); } -THUMB_FUNC void FUN_02017B8C(struct Bg *param0, u32 param1, fx32 val) +THUMB_FUNC void Bg_SetPosText(struct Bg *bg, u32 op, fx32 val) { - switch (param1) + switch (op) { case 0: - param0->hOffset = val; + bg->hOffset = val; break; case 1: - param0->hOffset += val; + bg->hOffset += val; break; case 2: - param0->hOffset -= val; + bg->hOffset -= val; break; case 3: - param0->vOffset = val; + bg->vOffset = val; break; case 4: - param0->vOffset += val; + bg->vOffset += val; break; case 5: - param0->vOffset -= val; + bg->vOffset -= val; break; } } @@ -840,50 +837,50 @@ THUMB_FUNC void FUN_02017CE8( if (st4 != 0) { FUN_02017C98(param2, st4, param3); - FUN_02017D68(param1, st4, param0->bgs[param1].unk10 * 2, param0->bgs[param1].bufferSize); + LoadBgVramScr(param1, st4, param0->bgs[param1].unk10 * 2, param0->bgs[param1].bufferSize); return; } u32 r7 = param2[0] >> 8; void *ptr = AllocFromHeapAtEnd(param0->heap_id, r7); FUN_02017C98(param2, ptr, st0); - FUN_02017D68(param1, ptr, param4 * 2, r7); + LoadBgVramScr(param1, ptr, param4 * 2, r7); FreeToHeap(ptr); return; } - FUN_02017D68(param1, param2, param4 * 2, param3); + LoadBgVramScr(param1, param2, param4 * 2, param3); } -THUMB_FUNC void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size) +THUMB_FUNC void LoadBgVramScr(u32 bgId, void *buffer_p, u32 offset, u32 size) { - DC_FlushRange(param1, size); + DC_FlushRange(buffer_p, size); - switch (param0) + switch (bgId) { case 0: - GX_LoadBG0Scr(param1, offset, size); + GX_LoadBG0Scr(buffer_p, offset, size); break; case 1: - GX_LoadBG1Scr(param1, offset, size); + GX_LoadBG1Scr(buffer_p, offset, size); break; case 2: - GX_LoadBG2Scr(param1, offset, size); + GX_LoadBG2Scr(buffer_p, offset, size); break; case 3: - GX_LoadBG3Scr(param1, offset, size); + GX_LoadBG3Scr(buffer_p, offset, size); break; case 4: - GXS_LoadBG0Scr(param1, offset, size); + GXS_LoadBG0Scr(buffer_p, offset, size); break; case 5: - GXS_LoadBG1Scr(param1, offset, size); + GXS_LoadBG1Scr(buffer_p, offset, size); break; case 6: - GXS_LoadBG2Scr(param1, offset, size); + GXS_LoadBG2Scr(buffer_p, offset, size); break; case 7: - GXS_LoadBG3Scr(param1, offset, size); + GXS_LoadBG3Scr(buffer_p, offset, size); break; } } @@ -894,86 +891,85 @@ THUMB_FUNC void FUN_02017DFC( FUN_02017C98(param2, param0->bgs[param1].tilemapBuffer, param3); } -THUMB_FUNC void FUN_02017E14( - struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4) +THUMB_FUNC void BG_LoadCharTilesData( + struct BgConfig *bgConfig, u32 bgId, u32 *charData, u32 offset, u32 numTiles) { - if (param0->bgs[param1].colorMode == 0) + if (bgConfig->bgs[bgId].colorMode == 0) { - FUN_02017E40(param0, param1, param2, param3, param4 << 5); + BG_LoadCharPixelData(bgConfig, bgId, charData, offset, numTiles << 5); return; } - FUN_02017E40(param0, param1, param2, param3, param4 << 6); + BG_LoadCharPixelData(bgConfig, bgId, charData, offset, numTiles << 6); } -THUMB_FUNC void FUN_02017E40( - struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4) +THUMB_FUNC void BG_LoadCharPixelData( + struct BgConfig *bgConfig, u32 bgId, u32 *charData, u32 size, u32 offset) { - u32 st0 = param3; - if (param3 == 0) + if (size == 0) { - u32 r4 = param2[0] >> 8; - void *ptr = AllocFromHeapAtEnd(param0->heap_id, r4); - FUN_02017C98(param2, ptr, st0); - FUN_02017E84(param1, ptr, param4, r4); + u32 uncompressedSize = charData[0] >> 8; + void *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, uncompressedSize); + FUN_02017C98(charData, ptr, size); + LoadBgVramChar(bgId, ptr, offset, uncompressedSize); FreeToHeap(ptr); return; } - FUN_02017E84(param1, param2, param4, param3); + LoadBgVramChar(bgId, charData, offset, size); } -THUMB_FUNC void FUN_02017E84(u32 param0, void *param1, u32 offset, u32 size) +THUMB_FUNC void LoadBgVramChar(u32 bgId, void *buffer_p, u32 offset, u32 size) { - DC_FlushRange(param1, size); + DC_FlushRange(buffer_p, size); - switch (param0) + switch (bgId) { case 0: - GX_LoadBG0Char(param1, offset, size); + GX_LoadBG0Char(buffer_p, offset, size); break; case 1: - GX_LoadBG1Char(param1, offset, size); + GX_LoadBG1Char(buffer_p, offset, size); break; case 2: - GX_LoadBG2Char(param1, offset, size); + GX_LoadBG2Char(buffer_p, offset, size); break; case 3: - GX_LoadBG3Char(param1, offset, size); + GX_LoadBG3Char(buffer_p, offset, size); break; case 4: - GXS_LoadBG0Char(param1, offset, size); + GXS_LoadBG0Char(buffer_p, offset, size); break; case 5: - GXS_LoadBG1Char(param1, offset, size); + GXS_LoadBG1Char(buffer_p, offset, size); break; case 6: - GXS_LoadBG2Char(param1, offset, size); + GXS_LoadBG2Char(buffer_p, offset, size); break; case 7: - GXS_LoadBG3Char(param1, offset, size); + GXS_LoadBG3Char(buffer_p, offset, size); break; } } -THUMB_FUNC void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id) +THUMB_FUNC void BG_ClearCharDataRange(u32 bgId, u32 size, u32 offset, u32 heap_id) { void *ptr = AllocFromHeapAtEnd(heap_id, size); memset(ptr, 0, size); - FUN_02017E84(param0, ptr, offset, size); + LoadBgVramChar(bgId, ptr, offset, size); FreeToHeapExplicit(heap_id, ptr); } -THUMB_FUNC void FUN_02017F48( - struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4) +THUMB_FUNC void BG_FillCharDataRange( + struct BgConfig *param0, u32 bgId, u32 fillValue, u32 count, u32 offset) { void *st4; - u32 st0 = param3 * param0->bgs[param1].tileSize; - u32 r5 = param2; - st4 = AllocFromHeapAtEnd(param0->heap_id, st0); + u32 size = count * param0->bgs[bgId].tileSize; + u32 r5 = fillValue; + st4 = AllocFromHeapAtEnd(param0->heap_id, size); - if (param0->bgs[param1].tileSize == 0x20) + if (param0->bgs[bgId].tileSize == 0x20) { r5 = (r5 << 0xc | r5 << 0x8 | r5 << 0x4 | r5); r5 |= r5 << 0x10; @@ -983,64 +979,64 @@ THUMB_FUNC void FUN_02017F48( r5 = r5 << 0x18 | r5 << 0x10 | r5 << 8 | r5; } - MI_CpuFillFast(st4, r5, st0); + MI_CpuFillFast(st4, r5, size); - FUN_02017E84((u8)param1, st4, param0->bgs[param1].tileSize * param4, st0); + LoadBgVramChar((u8)bgId, st4, param0->bgs[bgId].tileSize * offset, size); FreeToHeap(st4); } -THUMB_FUNC void FUN_02017FB4(u32 param0, void *param1, u32 offset, u32 size) +THUMB_FUNC void BG_LoadPlttData(u32 bgId, void *plttData, u32 size, u32 offset) { - DC_FlushRange(param1, offset); - if (param0 < 4) + DC_FlushRange(plttData, size); + if (bgId < 4) { - GX_LoadBGPltt(param1, size, offset); + GX_LoadBGPltt(plttData, offset, size); return; } - GXS_LoadBGPltt(param1, size, offset); + GXS_LoadBGPltt(plttData, offset, size); } -THUMB_FUNC void FUN_02017FE4(u32 param0, u32 param1) +THUMB_FUNC void BG_SetMaskColor(u32 bgId, u32 value) { - FUN_02017FB4(param0, ¶m1, 2, 0); + BG_LoadPlttData(bgId, &value, 2, 0); } -THUMB_FUNC u16 FUN_02017FFC(u8 param0, u8 param1, u8 param2) +THUMB_FUNC u16 GetTileMapIndexFromCoords(u8 x, u8 y, u8 screenSize) { - switch (param2) + switch (screenSize) { case 0: - return (u16)(param0 + (param1 << 4)); + return (u16)(x + (y << 4)); case 1: case 2: - return (u16)(param0 + (param1 << 5)); + return (u16)(x + (y << 5)); case 3: - return (u16)((param0 & 0x1f) + ((param1 + (param0 & ~0x1f)) << 5)); + return (u16)((x & 0x1f) + ((y + (x & ~0x1f)) << 5)); case 4: - u16 res = (u16)(((u16)((param0 >> 5) + (param1 >> 5) * 2)) << 10); - res += (param0 & 0x1f) + ((param1 & 0x1f) << 5); + u16 res = (u16)(((u16)((x >> 5) + (y >> 5) * 2)) << 10); + res += (x & 0x1f) + ((y & 0x1f) << 5); return res; case 5: return 0; } - return param0; + return x; } -THUMB_FUNC u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3) +THUMB_FUNC u16 GetSrcTileMapIndexFromCoords(u8 x, u8 y, u8 width, u8 height) { u8 r2 = 0; u16 r3 = 0; - s16 r4 = (s16)(param2 - 32); - s16 r5 = (s16)(param3 - 32); + s16 r4 = (s16)(width - 32); + s16 r5 = (s16)(height - 32); - if (((u32)param0 >> 5) != 0) + if (((u32)x >> 5) != 0) { r2++; } - if (((u32)param1 >> 5) != 0) + if (((u32)y >> 5) != 0) { r2 += 2; } @@ -1050,11 +1046,11 @@ THUMB_FUNC u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3) case 0: if (r4 >= 0) { - r3 += param0 + (param1 << 5); + r3 += x + (y << 5); } else { - r3 += param0 + param1 * param2; + r3 += x + y * width; } break; case 1: @@ -1064,25 +1060,25 @@ THUMB_FUNC u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3) } else { - r3 += (param3 << 5); + r3 += (height << 5); } - r3 += (param0 & 0x1f) + param1 * r4; + r3 += (x & 0x1f) + y * r4; break; case 2: - r3 += param2 << 5; + r3 += width << 5; if (r4 >= 0) { - r3 += param0 + ((param1 & 0x1f) << 5); + r3 += x + ((y & 0x1f) << 5); } else { - r3 += param0 + (param1 & 0x1f) * param2; + r3 += x + (y & 0x1f) * width; } break; case 3: - r3 += (param2 + r5) << 5; - r3 += (param0 & 0x1f) + (param1 & 0x1f) * r4; + r3 += (width + r5) << 5; + r3 += (x & 0x1f) + (y & 0x1f) * r4; break; } @@ -1184,94 +1180,94 @@ THUMB_FUNC void FUN_020181EC(struct BgConfig *param0, } } -THUMB_FUNC void FUN_02018268(struct Bg *param0, - u8 param1, - u8 param2, - u8 param3, - u8 param4, - u16 *param5, - u8 param6, - u8 param7, - u8 param8, - u8 param9, +THUMB_FUNC void FUN_02018268(struct Bg *bg, + u8 dstX, + u8 dstY, + u8 width, + u8 height, + u16 *src, + u8 srcX, + u8 srcY, + u8 srcWidth, + u8 srcHeight, u8 param10) { - void *st2c = param0->tilemapBuffer; + u16 *tilemapBuffer = bg->tilemapBuffer; - if (st2c == 0) + if (tilemapBuffer == 0) { return; } - u8 st41; - u8 st40; - FUN_02017850(param0->unk1d, &st41, &st40); + u8 dstWidth; + u8 dstHeight; + GetBgScreenDimensions(bg->unk1d, &dstWidth, &dstHeight); u8 i; u8 j; if (param10 == 0) { - for (i = 0; i < param4; i++) + for (i = 0; i < height; i++) { - if (param2 + i >= st40) + if (dstY + i >= dstHeight) { break; } - if (param7 + i >= param9) + if (srcY + i >= srcHeight) { break; } - for (j = 0; j < param3; j++) + for (j = 0; j < width; j++) { - if (param1 + j >= st41) + if (dstX + j >= dstWidth) { break; } - if (param6 + j >= param8) + if (srcX + j >= srcWidth) { break; } - ((u16 *)st2c)[FUN_02017FFC((u8)(param1 + j), (u8)(param2 + i), param0->unk1d)] = - param5[param6 + param8 * (param7 + i) + j]; + ((u16 *)tilemapBuffer)[GetTileMapIndexFromCoords((u8) (dstX + j), (u8) (dstY + i), bg->unk1d)] = + src[srcX + srcWidth * (srcY + i) + j]; } } } else { - for (i = 0; i < param4; i++) + for (i = 0; i < height; i++) { - if (param2 + i >= st40) + if (dstY + i >= dstHeight) { break; } - if (param7 + i >= param9) + if (srcY + i >= srcHeight) { break; } - for (j = 0; j < param3; j++) + for (j = 0; j < width; j++) { - if (param1 + j >= st41) + if (dstX + j >= dstWidth) { break; } - if (param6 + j >= param8) + if (srcX + j >= srcWidth) { break; } - ((u16 *)st2c)[FUN_02017FFC((u8)(param1 + j), (u8)(param2 + i), param0->unk1d)] = - param5[FUN_02018068((u8)(param6 + j), (u8)(param7 + i), param8, param9)]; + ((u16 *)tilemapBuffer)[GetTileMapIndexFromCoords((u8) (dstX + j), (u8) (dstY + i), bg->unk1d)] = + src[GetSrcTileMapIndexFromCoords((u8) (srcX + j), (u8) (srcY + i), srcWidth, srcHeight)]; } } } @@ -1298,7 +1294,7 @@ THUMB_FUNC void FUN_020183DC(struct Bg *param0, u8 st41; u8 st40; - FUN_02017850(param0->unk1d, &st41, &st40); + GetBgScreenDimensions(param0->unk1d, &st41, &st40); u8 i; u8 j; @@ -1330,7 +1326,7 @@ THUMB_FUNC void FUN_020183DC(struct Bg *param0, break; } - ((u8 *)st2c)[FUN_02017FFC((u8)(param1 + j), (u8)(param2 + i), param0->unk1d)] = + ((u8 *)st2c)[GetTileMapIndexFromCoords((u8) (param1 + j), (u8) (param2 + i), param0->unk1d)] = param5[param6 + param8 * (param7 + i) + j]; } } @@ -1363,8 +1359,8 @@ THUMB_FUNC void FUN_020183DC(struct Bg *param0, break; } - ((u8 *)st2c)[FUN_02017FFC((u8)(param1 + j), (u8)(param2 + i), param0->unk1d)] = - param5[FUN_02018068((u8)(param6 + j), (u8)(param7 + i), param8, param9)]; + ((u8 *)st2c)[GetTileMapIndexFromCoords((u8) (param1 + j), (u8) (param2 + i), param0->unk1d)] = + param5[GetSrcTileMapIndexFromCoords((u8) (param6 + j), (u8) (param7 + i), param8, param9)]; } } } @@ -1405,7 +1401,7 @@ THUMB_FUNC void FUN_02018590(struct Bg *param0, u8 st19; u8 st18; - FUN_02017850(param0->unk1d, &st19, &st18); + GetBgScreenDimensions(param0->unk1d, &st19, &st18); u8 i; u8 j; @@ -1423,7 +1419,7 @@ THUMB_FUNC void FUN_02018590(struct Bg *param0, break; } - u16 idx = FUN_02017FFC(j, i, param0->unk1d); + u16 idx = GetTileMapIndexFromCoords(j, i, param0->unk1d); if (param6 == 0x11) { @@ -1452,7 +1448,7 @@ THUMB_FUNC void FUN_02018640( u8 st19; u8 st18; - FUN_02017850(param0->unk1d, &st19, &st18); + GetBgScreenDimensions(param0->unk1d, &st19, &st18); u8 i; u8 j; @@ -1470,7 +1466,7 @@ THUMB_FUNC void FUN_02018640( break; } - ((u8 *)r4)[FUN_02017FFC(j, i, param0->unk1d)] = param1; + ((u8 *)r4)[GetTileMapIndexFromCoords(j, i, param0->unk1d)] = param1; } } } @@ -1490,7 +1486,7 @@ THUMB_FUNC void FUN_020186B4(struct BgConfig *param0, { u8 st11; u8 st10; - FUN_02017850(param0->bgs[param1].unk1d, &st11, &st10); + GetBgScreenDimensions(param0->bgs[param1].unk1d, &st11, &st10); u8 i; u8 j; @@ -1508,7 +1504,7 @@ THUMB_FUNC void FUN_020186B4(struct BgConfig *param0, break; } - u16 idx = FUN_02017FFC(j, i, param0->bgs[param1].unk1d); + u16 idx = GetTileMapIndexFromCoords(j, i, param0->bgs[param1].unk1d); ((u16 *)r4)[idx] = (u16)((((u16 *)r4)[idx] & 0xfff) | (param6 << 0xc)); } } @@ -1538,7 +1534,7 @@ THUMB_FUNC void FUN_0201878C(struct BgConfig *param0, u32 param1, u16 param2) if (param0->bgs[param1].tilemapBuffer != NULL) { MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize); - FUN_0201AC68(param0, param1); + ScheduleBgTilemapBufferTransfer(param0, param1); } } @@ -2192,7 +2188,7 @@ THUMB_FUNC void CopyWindowToVram_TextMode(struct Window *window) THUMB_FUNC void FUN_020194C8(struct Window *window) { PutWindowTilemap_TextMode(window); - FUN_0201AC68(window->bgConfig, window->bgId); + ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); FUN_02019548(window); } @@ -2205,7 +2201,7 @@ THUMB_FUNC void CopyWindowToVram_AffineMode(struct Window *window) window->bgConfig->bgs[window->bgId].bufferSize, window->bgConfig->bgs[window->bgId].unk10); - FUN_02017E14(window->bgConfig, + BG_LoadCharTilesData(window->bgConfig, window->bgId, window->pixelBuffer, (u32)(window->width * window->height * 64), @@ -2215,8 +2211,8 @@ THUMB_FUNC void CopyWindowToVram_AffineMode(struct Window *window) THUMB_FUNC void FUN_0201951C(struct Window *window) { PutWindowTilemap_AffineMode(window); - FUN_0201AC68(window->bgConfig, window->bgId); - FUN_02017E14(window->bgConfig, + ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); + BG_LoadCharTilesData(window->bgConfig, window->bgId, window->pixelBuffer, (u32)(window->width * window->height * 64), @@ -2225,7 +2221,7 @@ THUMB_FUNC void FUN_0201951C(struct Window *window) THUMB_FUNC void FUN_02019548(struct Window *window) { - FUN_02017E14(window->bgConfig, + BG_LoadCharTilesData(window->bgConfig, window->bgId, window->pixelBuffer, (u32)(window->width * window->height * window->bgConfig->bgs[window->bgId].tileSize), @@ -2255,7 +2251,7 @@ THUMB_FUNC void FUN_020195A8(struct Window *window) THUMB_FUNC void FUN_020195D0(struct Window *window) { FUN_020193B4(window); - FUN_0201AC68(window->bgConfig, window->bgId); + ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); } THUMB_FUNC void FUN_020195E4(struct Window *window) @@ -2271,7 +2267,7 @@ THUMB_FUNC void FUN_020195E4(struct Window *window) THUMB_FUNC void FUN_0201960C(struct Window *window) { FUN_02019444(window); - FUN_0201AC68(window->bgConfig, window->bgId); + ScheduleBgTilemapBufferTransfer(window->bgConfig, window->bgId); } THUMB_FUNC void FillWindowPixelBuffer(struct Window *window, u8 param1) @@ -4918,15 +4914,15 @@ THUMB_FUNC void ScrollWindow(struct Window *window, u32 param1, u8 param2, u8 pa { if (window->bgConfig->bgs[window->bgId].colorMode == 0) { - FUN_0201A8E8(window, param1, param2, param3); + ScrollWindow4bpp(window, param1, param2, param3); } else { - FUN_0201A9D4(window, param1, param2, param3); + ScrollWindow8bpp(window, param1, param2, param3); } } -THUMB_FUNC void FUN_0201A8E8(struct Window *window, u32 param1, u8 param2, u8 param3) +THUMB_FUNC void ScrollWindow4bpp(struct Window *window, u32 param1, u8 param2, u8 fillValue) { void *r2; int r5, r1, r3; @@ -4935,7 +4931,7 @@ THUMB_FUNC void FUN_0201A8E8(struct Window *window, u32 param1, u8 param2, u8 pa int i, j; r2 = window->pixelBuffer; - st4 = (param3 << 0x18) | (param3 << 0x10) | (param3 << 0x8) | param3; + st4 = (fillValue << 0x18) | (fillValue << 0x10) | (fillValue << 0x8) | fillValue; stc = window->height * window->width * 32; st8 = window->width; @@ -4994,49 +4990,49 @@ THUMB_FUNC void FUN_0201A8E8(struct Window *window, u32 param1, u8 param2, u8 pa } } -THUMB_FUNC void FUN_0201A9D4(struct Window *window, u32 param1, u8 param2, u8 param3) +THUMB_FUNC void ScrollWindow8bpp(struct Window *window, u32 param1, u8 param2, u8 fillValue) { - void *r2; - int r5, r1, r3; - int st4, stc; - u32 st8; + void *pixelBuffer; + int dstOffs, srcOffs, r3; + int st4, size; + u32 srcWidth; int i, j; - r2 = (u8 *)window->pixelBuffer; - st4 = (param3 << 0x18) | (param3 << 0x10) | (param3 << 0x8) | param3; - stc = window->height * window->width * 64; - st8 = window->width; + pixelBuffer = (u8 *)window->pixelBuffer; + st4 = (fillValue << 0x18) | (fillValue << 0x10) | (fillValue << 0x8) | fillValue; + size = window->height * window->width * 64; + srcWidth = window->width; switch (param1) { case 0: - for (i = 0; i < stc; i += 64) + for (i = 0; i < size; i += 64) { r3 = param2; for (j = 0; j < 8; j++) { - r5 = i + (j << 3); - r1 = i + (int)(((st8 * (r3 & ~7)) | (r3 & 7)) << 3); + dstOffs = i + (j << 3); + srcOffs = i + (int)(((srcWidth * (r3 & ~7)) | (r3 & 7)) << 3); - if (r1 < stc) + if (srcOffs < size) { - *(u32 *)(r2 + r5) = *(u32 *)(r2 + r1); + *(u32 *)(pixelBuffer + dstOffs) = *(u32 *)(pixelBuffer + srcOffs); } else { - *(u32 *)(r2 + r5) = (u32)st4; + *(u32 *)(pixelBuffer + dstOffs) = (u32)st4; } - r5 += 4; - r1 += 4; - if (r1 < stc + 4) + dstOffs += 4; + srcOffs += 4; + if (srcOffs < size + 4) { - *(u32 *)(r2 + r5) = *(u32 *)(r2 + r1); + *(u32 *)(pixelBuffer + dstOffs) = *(u32 *)(pixelBuffer + srcOffs); } else { - *(u32 *)(r2 + r5) = (u32)st4; + *(u32 *)(pixelBuffer + dstOffs) = (u32)st4; } r3++; @@ -5045,33 +5041,33 @@ THUMB_FUNC void FUN_0201A9D4(struct Window *window, u32 param1, u8 param2, u8 pa break; case 1: - r2 += stc - 8; - for (i = 0; i < stc; i += 64) + pixelBuffer += size - 8; + for (i = 0; i < size; i += 64) { r3 = param2; for (j = 0; j < 8; j++) { - r5 = i + (j << 3); - r1 = i + (int)(((st8 * (r3 & ~7)) | (r3 & 7)) << 3); + dstOffs = i + (j << 3); + srcOffs = i + (int)(((srcWidth * (r3 & ~7)) | (r3 & 7)) << 3); - if (r1 < stc) + if (srcOffs < size) { - *(u32 *)(r2 - r5) = *(u32 *)(r2 - r1); + *(u32 *)(pixelBuffer - dstOffs) = *(u32 *)(pixelBuffer - srcOffs); } else { - *(u32 *)(r2 - r5) = (u32)st4; + *(u32 *)(pixelBuffer - dstOffs) = (u32)st4; } - r5 -= 4; - r1 -= 4; - if (r1 < stc - 4) + dstOffs -= 4; + srcOffs -= 4; + if (srcOffs < size - 4) { - *(u32 *)(r2 - r5) = *(u32 *)(r2 - r1); + *(u32 *)(pixelBuffer - dstOffs) = *(u32 *)(pixelBuffer - srcOffs); } else { - *(u32 *)(r2 - r5) = (u32)st4; + *(u32 *)(pixelBuffer - dstOffs) = (u32)st4; } r3++; @@ -5085,7 +5081,7 @@ THUMB_FUNC void FUN_0201A9D4(struct Window *window, u32 param1, u8 param2, u8 pa } } -THUMB_FUNC u8 FUN_0201AB08(struct Window *window) +THUMB_FUNC u8 GetWindowBgId(struct Window *window) { return window->bgId; } @@ -5098,271 +5094,271 @@ THUMB_FUNC u8 GetWindowHeight(struct Window *window) { return window->height; } -THUMB_FUNC u8 FUN_0201AB14(struct Window *window) +THUMB_FUNC u8 GetWindowX(struct Window *window) { return window->tilemapLeft; } -THUMB_FUNC u8 FUN_0201AB18(struct Window *window) +THUMB_FUNC u8 GetWindowY(struct Window *window) { return window->tilemapTop; } -THUMB_FUNC void FUN_0201AB1C(struct Window *window, u8 param1) +THUMB_FUNC void MoveWindowX(struct Window *window, u8 x) { - window->tilemapLeft = param1; + window->tilemapLeft = x; } -THUMB_FUNC void FUN_0201AB20(struct Window *window, u8 param1) +THUMB_FUNC void MoveWindowY(struct Window *window, u8 y) { - window->tilemapTop = param1; + window->tilemapTop = y; } -THUMB_FUNC void FUN_0201AB24(struct Window *window, u8 param1) +THUMB_FUNC void SetWindowPaletteNum(struct Window *window, u8 paletteNum) { - window->paletteNum = param1; + window->paletteNum = paletteNum; } -THUMB_FUNC u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path) +THUMB_FUNC NNSG2dCharacterData * LoadCharacterDataFromFile(void **char_ret, u32 heap_id, const char *path) { void *ptr = AllocAndReadFile(heap_id, path); - window->bgConfig = ptr; - u32 st0; + *char_ret = ptr; + NNSG2dCharacterData *st0; NNS_G2dGetUnpackedBGCharacterData(ptr, &st0); return st0; } -THUMB_FUNC u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path) +THUMB_FUNC NNSG2dPaletteData * LoadPaletteDataFromFile(void **pltt_ret, u32 heap_id, const char *path) { void *ptr = AllocAndReadFile(heap_id, path); - window->bgConfig = ptr; - u32 st0; + *pltt_ret = ptr; + NNSG2dPaletteData *st0; NNS_G2dGetUnpackedPaletteData(ptr, &st0); return st0; } -THUMB_FUNC void FUN_0201AB60(struct BgConfig *param0) +THUMB_FUNC void DoScheduledBgGpuUpdates(struct BgConfig *bgConfig) { - FUN_0201AC78(param0); - FUN_0201AB78(param0); + ApplyScheduledBgPosUpdate(bgConfig); + DoScheduledBgTilemapBufferTransfers(bgConfig); - param0->scrollScheduled = 0; - param0->unk06 = 0; + bgConfig->scrollScheduled = 0; + bgConfig->bufferTransferScheduled = 0; } -THUMB_FUNC void FUN_0201AB78(struct BgConfig *param0) +THUMB_FUNC void DoScheduledBgTilemapBufferTransfers(struct BgConfig *bgConfig) { - if ((param0->unk06 & 1) != 0) + if ((bgConfig->bufferTransferScheduled & 1) != 0) { - FUN_02017D68(0, param0->bgs[0].tilemapBuffer, param0->bgs[0].unk10 * 2, param0->bgs[0].bufferSize); + LoadBgVramScr(0, bgConfig->bgs[0].tilemapBuffer, bgConfig->bgs[0].unk10 * 2, bgConfig->bgs[0].bufferSize); } - if ((param0->unk06 & 2) != 0) + if ((bgConfig->bufferTransferScheduled & 2) != 0) { - FUN_02017D68(1, param0->bgs[1].tilemapBuffer, param0->bgs[1].unk10 * 2, param0->bgs[1].bufferSize); + LoadBgVramScr(1, bgConfig->bgs[1].tilemapBuffer, bgConfig->bgs[1].unk10 * 2, bgConfig->bgs[1].bufferSize); } - if ((param0->unk06 & 4) != 0) + if ((bgConfig->bufferTransferScheduled & 4) != 0) { - FUN_02017D68(2, param0->bgs[2].tilemapBuffer, param0->bgs[2].unk10 * 2, param0->bgs[2].bufferSize); + LoadBgVramScr(2, bgConfig->bgs[2].tilemapBuffer, bgConfig->bgs[2].unk10 * 2, bgConfig->bgs[2].bufferSize); } - if ((param0->unk06 & 8) != 0) + if ((bgConfig->bufferTransferScheduled & 8) != 0) { - FUN_02017D68(3, param0->bgs[3].tilemapBuffer, param0->bgs[3].unk10 * 2, param0->bgs[3].bufferSize); + LoadBgVramScr(3, bgConfig->bgs[3].tilemapBuffer, bgConfig->bgs[3].unk10 * 2, bgConfig->bgs[3].bufferSize); } - if ((param0->unk06 & 0x10) != 0) + if ((bgConfig->bufferTransferScheduled & 0x10) != 0) { - FUN_02017D68(4, param0->bgs[4].tilemapBuffer, param0->bgs[4].unk10 * 2, param0->bgs[4].bufferSize); + LoadBgVramScr(4, bgConfig->bgs[4].tilemapBuffer, bgConfig->bgs[4].unk10 * 2, bgConfig->bgs[4].bufferSize); } - if ((param0->unk06 & 0x20) != 0) + if ((bgConfig->bufferTransferScheduled & 0x20) != 0) { - FUN_02017D68(5, param0->bgs[5].tilemapBuffer, param0->bgs[5].unk10 * 2, param0->bgs[5].bufferSize); + LoadBgVramScr(5, bgConfig->bgs[5].tilemapBuffer, bgConfig->bgs[5].unk10 * 2, bgConfig->bgs[5].bufferSize); } - if ((param0->unk06 & 0x40) != 0) + if ((bgConfig->bufferTransferScheduled & 0x40) != 0) { - FUN_02017D68(6, param0->bgs[6].tilemapBuffer, param0->bgs[6].unk10 * 2, param0->bgs[6].bufferSize); + LoadBgVramScr(6, bgConfig->bgs[6].tilemapBuffer, bgConfig->bgs[6].unk10 * 2, bgConfig->bgs[6].bufferSize); } - if ((param0->unk06 & 0x80) != 0) + if ((bgConfig->bufferTransferScheduled & 0x80) != 0) { - FUN_02017D68(7, param0->bgs[7].tilemapBuffer, param0->bgs[7].unk10 * 2, param0->bgs[7].bufferSize); + LoadBgVramScr(7, bgConfig->bgs[7].tilemapBuffer, bgConfig->bgs[7].unk10 * 2, bgConfig->bgs[7].bufferSize); } } -THUMB_FUNC void FUN_0201AC68(struct BgConfig *param0, u32 param1) +THUMB_FUNC void ScheduleBgTilemapBufferTransfer(struct BgConfig *bgConfig, u32 bgId) { - param0->unk06 |= 1 << param1; + bgConfig->bufferTransferScheduled |= 1 << bgId; } -THUMB_FUNC void FUN_0201AC78(struct BgConfig *param0) +THUMB_FUNC void ApplyScheduledBgPosUpdate(struct BgConfig *bgConfig) { - if ((param0->scrollScheduled & 1) != 0) + if ((bgConfig->scrollScheduled & 1) != 0) { - G2_SetBG0Offset(param0->bgs[0].hOffset, param0->bgs[0].vOffset); + G2_SetBG0Offset(bgConfig->bgs[0].hOffset, bgConfig->bgs[0].vOffset); } - if ((param0->scrollScheduled & 2) != 0) + if ((bgConfig->scrollScheduled & 2) != 0) { - G2_SetBG1Offset(param0->bgs[1].hOffset, param0->bgs[1].vOffset); + G2_SetBG1Offset(bgConfig->bgs[1].hOffset, bgConfig->bgs[1].vOffset); } - if ((param0->scrollScheduled & 4) != 0) + if ((bgConfig->scrollScheduled & 4) != 0) { - if (param0->bgs[2].mode == 0) + if (bgConfig->bgs[2].mode == 0) { - G2_SetBG2Offset(param0->bgs[2].hOffset, param0->bgs[2].vOffset); + G2_SetBG2Offset(bgConfig->bgs[2].hOffset, bgConfig->bgs[2].vOffset); } else { struct Mtx22 st38; MTX22_2DAffine( - &st38, param0->bgs[2].rotation, param0->bgs[2].xScale, param0->bgs[2].yScale, 2); + &st38, bgConfig->bgs[2].rotation, bgConfig->bgs[2].xScale, bgConfig->bgs[2].yScale, 2); G2_SetBG2Affine( &st38, - param0->bgs[2].centerX, - param0->bgs[2].centerY, - param0->bgs[2].hOffset, - param0->bgs[2].vOffset); + bgConfig->bgs[2].centerX, + bgConfig->bgs[2].centerY, + bgConfig->bgs[2].hOffset, + bgConfig->bgs[2].vOffset); } } - if ((param0->scrollScheduled & 8) != 0) + if ((bgConfig->scrollScheduled & 8) != 0) { - if (param0->bgs[3].mode == 0) + if (bgConfig->bgs[3].mode == 0) { - G2_SetBG3Offset(param0->bgs[3].hOffset, param0->bgs[3].vOffset); + G2_SetBG3Offset(bgConfig->bgs[3].hOffset, bgConfig->bgs[3].vOffset); } else { struct Mtx22 st28; MTX22_2DAffine( - &st28, param0->bgs[3].rotation, param0->bgs[3].xScale, param0->bgs[3].yScale, 2); + &st28, bgConfig->bgs[3].rotation, bgConfig->bgs[3].xScale, bgConfig->bgs[3].yScale, 2); G2_SetBG3Affine( &st28, - param0->bgs[3].centerX, - param0->bgs[3].centerY, - param0->bgs[3].hOffset, - param0->bgs[3].vOffset); + bgConfig->bgs[3].centerX, + bgConfig->bgs[3].centerY, + bgConfig->bgs[3].hOffset, + bgConfig->bgs[3].vOffset); } } - if ((param0->scrollScheduled & 0x10) != 0) + if ((bgConfig->scrollScheduled & 0x10) != 0) { - G2S_SetBG0Offset(param0->bgs[4].hOffset, param0->bgs[4].vOffset); + G2S_SetBG0Offset(bgConfig->bgs[4].hOffset, bgConfig->bgs[4].vOffset); } - if ((param0->scrollScheduled & 0x20) != 0) + if ((bgConfig->scrollScheduled & 0x20) != 0) { - G2S_SetBG1Offset(param0->bgs[5].hOffset, param0->bgs[5].vOffset); + G2S_SetBG1Offset(bgConfig->bgs[5].hOffset, bgConfig->bgs[5].vOffset); } - if ((param0->scrollScheduled & 0x40) != 0) + if ((bgConfig->scrollScheduled & 0x40) != 0) { - if (param0->bgs[6].mode == 0) + if (bgConfig->bgs[6].mode == 0) { - G2S_SetBG2Offset(param0->bgs[6].hOffset, param0->bgs[6].vOffset); + G2S_SetBG2Offset(bgConfig->bgs[6].hOffset, bgConfig->bgs[6].vOffset); } else { struct Mtx22 st18; MTX22_2DAffine( - &st18, param0->bgs[6].rotation, param0->bgs[6].xScale, param0->bgs[6].yScale, 2); + &st18, bgConfig->bgs[6].rotation, bgConfig->bgs[6].xScale, bgConfig->bgs[6].yScale, 2); G2S_SetBG2Affine( &st18, - param0->bgs[6].centerX, - param0->bgs[6].centerY, - param0->bgs[6].hOffset, - param0->bgs[6].vOffset); + bgConfig->bgs[6].centerX, + bgConfig->bgs[6].centerY, + bgConfig->bgs[6].hOffset, + bgConfig->bgs[6].vOffset); } } - if ((param0->scrollScheduled & 0x80) != 0) + if ((bgConfig->scrollScheduled & 0x80) != 0) { - if (param0->bgs[7].mode == 0) + if (bgConfig->bgs[7].mode == 0) { - G2S_SetBG3Offset(param0->bgs[7].hOffset, param0->bgs[7].vOffset); + G2S_SetBG3Offset(bgConfig->bgs[7].hOffset, bgConfig->bgs[7].vOffset); } else { struct Mtx22 st08; MTX22_2DAffine( - &st08, param0->bgs[7].rotation, param0->bgs[7].xScale, param0->bgs[7].yScale, 2); + &st08, bgConfig->bgs[7].rotation, bgConfig->bgs[7].xScale, bgConfig->bgs[7].yScale, 2); G2S_SetBG3Affine( &st08, - param0->bgs[7].centerX, - param0->bgs[7].centerY, - param0->bgs[7].hOffset, - param0->bgs[7].vOffset); + bgConfig->bgs[7].centerX, + bgConfig->bgs[7].centerY, + bgConfig->bgs[7].hOffset, + bgConfig->bgs[7].vOffset); } } } -THUMB_FUNC void FUN_0201AEE4( - struct BgConfig *param0, u32 param1, u32 param2, fx32 param3) +THUMB_FUNC void ScheduleSetBgPosText( + struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 value) { - FUN_02017B8C(¶m0->bgs[param1], param2, param3); - param0->scrollScheduled |= 1 << param1; + Bg_SetPosText(&bgConfig->bgs[bgId], op, value); + bgConfig->scrollScheduled |= 1 << bgId; } -THUMB_FUNC void FUN_0201AF08( - struct BgConfig *param0, u32 param1, u32 param2, u16 param3) +THUMB_FUNC void ScheduleSetBgAffineRotation( + struct BgConfig *bgConfig, u32 bgId, u32 op, u16 value) { - FUN_0201AF2C(¶m0->bgs[param1], param2, param3); - param0->scrollScheduled |= 1 << param1; + Bg_SetAffineRotation(&bgConfig->bgs[bgId], op, value); + bgConfig->scrollScheduled |= 1 << bgId; } -THUMB_FUNC void FUN_0201AF2C(struct Bg *param0, u32 param1, u16 val) +THUMB_FUNC void Bg_SetAffineRotation(struct Bg *bg, u32 op, u16 val) { - switch (param1) + switch (op) { case 0: - param0->rotation = val; + bg->rotation = val; break; case 1: - param0->rotation += val; + bg->rotation += val; break; case 2: - param0->rotation -= val; + bg->rotation -= val; break; } } -THUMB_FUNC void FUN_0201AF50( - struct BgConfig *param0, u32 param1, u32 param2, fx32 param3) +THUMB_FUNC void ScheduleSetBgAffinePos( + struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 value) { - FUN_0201AF74(¶m0->bgs[param1], param2, param3); - param0->scrollScheduled |= 1 << param1; + Bg_SetAffinePos(&bgConfig->bgs[bgId], op, value); + bgConfig->scrollScheduled |= 1 << bgId; } -THUMB_FUNC void FUN_0201AF74(struct Bg *param0, u32 param1, fx32 val) +THUMB_FUNC void Bg_SetAffinePos(struct Bg *bg, u32 op, fx32 val) { - switch (param1 - 9) + switch (op) { - case 0: - param0->centerX = val; + case 9: + bg->centerX = val; break; - case 1: - param0->centerX += val; + case 10: + bg->centerX += val; break; - case 2: - param0->centerX -= val; + case 11: + bg->centerX -= val; break; - case 3: - param0->centerY = val; + case 12: + bg->centerY = val; break; - case 4: - param0->centerY += val; + case 13: + bg->centerY += val; break; - case 5: - param0->centerY -= val; + case 14: + bg->centerY -= val; break; } } THUMB_FUNC u32 FUN_0201AFBC( - struct BgConfig *param0, u8 param1, u8 param2, u8 param3, u16 *param4) + struct BgConfig *bgConfig, u8 bgId, u8 x, u8 y, u16 *src) { void *st18; u16 r6; @@ -5371,21 +5367,21 @@ THUMB_FUNC u32 FUN_0201AFBC( u8 r5; u8 i; - if (param0->bgs[param1].tilemapBuffer == NULL) + if (bgConfig->bgs[bgId].tilemapBuffer == NULL) { return 0; } - r6 = FUN_02017FFC((u8)(param2 >> 3), (u8)(param3 >> 3), param0->bgs[param1].unk1d); - st18 = FUN_020187B0(param1); + r6 = GetTileMapIndexFromCoords((u8) (x >> 3), (u8) (y >> 3), bgConfig->bgs[bgId].unk1d); + st18 = FUN_020187B0(bgId); - st14 = (u8)(param2 & 7); - st10 = (u8)(param3 & 7); + st14 = (u8)(x & 7); + st10 = (u8)(y & 7); - if (param0->bgs[param1].colorMode == 0) + if (bgConfig->bgs[bgId].colorMode == 0) { - u16 *stc = param0->bgs[param1].tilemapBuffer; - u8 *ptr = AllocFromHeapAtEnd(param0->heap_id, 0x40); + u16 *stc = bgConfig->bgs[bgId].tilemapBuffer; + u8 *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, 0x40); st18 += ((stc[r6] & 0x3ff) << 5); for (i = 0; i < 0x20; i++) @@ -5394,42 +5390,42 @@ THUMB_FUNC u32 FUN_0201AFBC( ptr[(i << 1) + 1] = (u8)(((u8 *)st18)[i] >> 4); } - FUN_0201B118(param0, (u8)((stc[r6] >> 0xa) & 3), ptr); + FUN_0201B118(bgConfig, (u8)((stc[r6] >> 0xa) & 3), ptr); r5 = ptr[st14 + (st10 << 3)]; FreeToHeap(ptr); - if ((param4[0] & (1 << r5)) != 0) + if ((src[0] & (1 << r5)) != 0) { return 1; } } else { - if (param0->bgs[param1].mode != 1) + if (bgConfig->bgs[bgId].mode != 1) { - u16 *r4 = param0->bgs[param1].tilemapBuffer; - u8 *ptr = AllocFromHeapAtEnd(param0->heap_id, 0x40); + u16 *r4 = bgConfig->bgs[bgId].tilemapBuffer; + u8 *ptr = AllocFromHeapAtEnd(bgConfig->heap_id, 0x40); memcpy(ptr, st18 + ((r4[r6] & 0x3ff) << 6), 0x40); - FUN_0201B118(param0, (u8)((r4[r6] >> 0xa) & 3), ptr); + FUN_0201B118(bgConfig, (u8)((r4[r6] >> 0xa) & 3), ptr); r5 = ptr[st14 + (st10 << 3)]; FreeToHeap(ptr); } else { - r5 = ((u8 *)st18)[(((u8 *)param0->bgs[param1].tilemapBuffer)[r6] << 6) + st14 + (st10 << 3)]; + r5 = ((u8 *)st18)[(((u8 *)bgConfig->bgs[bgId].tilemapBuffer)[r6] << 6) + st14 + (st10 << 3)]; } while (TRUE) { - if (param4[0] == 0xffff) + if (src[0] == 0xffff) { break; } - if (r5 == (u8)(param4[0])) + if (r5 == (u8)(src[0])) { return 1; } diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h index 1e5a4fdb..9479f889 100644 --- a/include/unk_02016B94.h +++ b/include/unk_02016B94.h @@ -1,6 +1,7 @@ #ifndef POKEDIAMOND_UNK_02016B94_H #define POKEDIAMOND_UNK_02016B94_H +#include "NNS_g2d.h" #include "global.h" #include "GX_layers.h" #include "MI_uncompress.h" @@ -9,10 +10,6 @@ #include "heap.h" #include "math_util.h" -#define reg_G2_BG2P (u32 *)0x4000020 -#define reg_G2_BG3P (u32 *)0x4000030 -#define reg_G2S_DB_BG2P (u32 *)0x4001020 -#define reg_G2S_DB_BG3P (u32 *)0x4001030 struct BgTemplate { u32 unk00; @@ -56,7 +53,7 @@ struct BgConfig { u32 heap_id; u16 scrollScheduled; - u16 unk06; + u16 bufferTransferScheduled; struct Bg bgs[8]; }; @@ -100,7 +97,7 @@ 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); -void FUN_02017850(u32 param0, u8 *param1, u8 *param2); +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 ToggleBgLayer(u32 bgId, GX_LayerToggle toggle); @@ -114,7 +111,7 @@ void FUN_02017B60(struct BgConfig *param0, struct Mtx22 *param4, fx32 param5, fx32 param6); -void FUN_02017B8C(struct Bg *param0, u32 param1, fx32 val); +void Bg_SetPosText(struct Bg *bg, u32 op, fx32 val); void FUN_02017BD0(struct BgConfig *param0, u32 param1, struct Mtx22 *param2, @@ -125,20 +122,20 @@ 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 FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size); +void LoadBgVramScr(u32 bgId, void *buffer_p, u32 offset, u32 size); void FUN_02017DFC(struct BgConfig *param0, u32 param1, void *param2, u32 param3); -void FUN_02017E14( - struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4); -void FUN_02017E40( - struct BgConfig *param0, u32 param1, u32 *param2, u32 param3, u32 param4); -void FUN_02017E84(u32 param0, void *param1, u32 offset, u32 size); -void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id); -void FUN_02017F48( - struct BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4); -void FUN_02017FB4(u32 param0, void *param1, u32 offset, u32 size); -void FUN_02017FE4(u32 param0, u32 param1); -u16 FUN_02017FFC(u8 param0, u8 param1, u8 param2); -u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3); +void BG_LoadCharTilesData( + struct BgConfig *bgConfig, u32 bgId, u32 *charData, u32 offset, u32 numTiles); +void BG_LoadCharPixelData( + struct BgConfig *bgConfig, u32 bgId, u32 *charData, u32 size, u32 offset); +void LoadBgVramChar(u32 bgId, void *buffer_p, u32 offset, u32 size); +void BG_ClearCharDataRange(u32 bgId, u32 size, u32 offset, u32 heap_id); +void BG_FillCharDataRange( + struct BgConfig *param0, u32 bgId, u32 fillValue, u32 count, u32 offset); +void BG_LoadPlttData(u32 bgId, void *plttData, u32 size, u32 offset); +void BG_SetMaskColor(u32 bgId, u32 value); +u16 GetTileMapIndexFromCoords(u8 x, u8 y, u8 screenSize); +u16 GetSrcTileMapIndexFromCoords(u8 x, u8 y, u8 width, u8 height); void FUN_02018148(struct BgConfig *param0, u32 param1, void *param2, @@ -168,16 +165,16 @@ void FUN_020181EC(struct BgConfig *param0, u8 param8, u8 param9, u8 param10); -void FUN_02018268(struct Bg *param0, - u8 param1, - u8 param2, - u8 param3, - u8 param4, - u16 *param5, - u8 param6, - u8 param7, - u8 param8, - u8 param9, +void FUN_02018268(struct Bg *bg, + u8 dstX, + u8 dstY, + u8 width, + u8 height, + u16 *src, + u8 srcX, + u8 srcY, + u8 srcWidth, + u8 srcHeight, u8 param10); void FUN_020183DC(struct Bg *param0, u8 param1, @@ -314,28 +311,28 @@ void FillWindowPixelRect(struct Window *window, u8 fillValue, u16 x, u16 y, u16 void FUN_0201974C( struct Window *window, u32 *param1, u32 param2, u32 param3, u16 param4, u16 param5, u32 param6); void ScrollWindow(struct Window *window, u32 param1, u8 param2, u8 param3); -void FUN_0201A8E8(struct Window *window, u32 param1, u8 param2, u8 param3); -void FUN_0201A9D4(struct Window *window, u32 param1, u8 param2, u8 param3); -u8 FUN_0201AB08(struct Window *window); +void ScrollWindow4bpp(struct Window *window, u32 param1, u8 param2, u8 fillValue); +void ScrollWindow8bpp(struct Window *window, u32 param1, u8 param2, u8 fillValue); +u8 GetWindowBgId(struct Window *window); u8 GetWindowWidth(struct Window *window); u8 GetWindowHeight(struct Window *window); -u8 FUN_0201AB14(struct Window *window); -u8 FUN_0201AB18(struct Window *window); -void FUN_0201AB1C(struct Window *window, u8 param1); -void FUN_0201AB20(struct Window *window, u8 param1); -void FUN_0201AB24(struct Window *window, u8 param1); -u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path); -u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path); -void FUN_0201AB60(struct BgConfig *param0); -void FUN_0201AB78(struct BgConfig *param0); -void FUN_0201AC68(struct BgConfig *param0, u32 param1); -void FUN_0201AC78(struct BgConfig *param0); -void FUN_0201AEE4(struct BgConfig *param0, u32 param1, u32 param2, fx32 param3); -void FUN_0201AF08(struct BgConfig *param0, u32 param1, u32 param2, u16 param3); -void FUN_0201AF2C(struct Bg *param0, u32 param1, u16 val); -void FUN_0201AF50(struct BgConfig *param0, u32 param1, u32 param2, fx32 param3); -void FUN_0201AF74(struct Bg *param0, u32 param1, fx32 val); -u32 FUN_0201AFBC(struct BgConfig *param0, u8 param1, u8 param2, u8 param3, u16 *param4); +u8 GetWindowX(struct Window *window); +u8 GetWindowY(struct Window *window); +void MoveWindowX(struct Window *window, u8 x); +void MoveWindowY(struct Window *window, u8 y); +void SetWindowPaletteNum(struct Window *window, u8 paletteNum); +NNSG2dCharacterData * LoadCharacterDataFromFile(void **char_ret, u32 heap_id, const char *path); +NNSG2dPaletteData * LoadPaletteDataFromFile(void **pltt_ret, u32 heap_id, const char *path); +void DoScheduledBgGpuUpdates(struct BgConfig *bgConfig); +void DoScheduledBgTilemapBufferTransfers(struct BgConfig *bgConfig); +void ScheduleBgTilemapBufferTransfer(struct BgConfig *bgConfig, u32 bgId); +void ApplyScheduledBgPosUpdate(struct BgConfig *bgConfig); +void ScheduleSetBgPosText(struct BgConfig *bgConfig, u32 bgId, u32 op, fx32 value); +void ScheduleSetBgAffineRotation(struct BgConfig *bgConfig, u32 bgId, u32 op, u16 value); +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); #endif // POKEDIAMOND_UNK_02016B94_H |