diff options
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/unk_020023C0.s | 12 | ||||
-rw-r--r-- | arm9/asm/unk_0200CABC.s | 74 | ||||
-rw-r--r-- | arm9/asm/unk_020142EC.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02014590.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_02033F50.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_02034188.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_02035068.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_020484A8.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02053750.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020625EC.s | 14 | ||||
-rw-r--r-- | arm9/asm/unk_020653EC.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_0206C700.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0206F3FC.s | 26 | ||||
-rw-r--r-- | arm9/asm/unk_02072548.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_02073DA8.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_020772F0.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_020799E8.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02079C70.s | 60 | ||||
-rw-r--r-- | arm9/asm/unk_0207C328.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0207D5BC.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0207F95C.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02086414.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02089498.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_02089960.s | 14 | ||||
-rw-r--r-- | arm9/asm/unk_02089D90.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_02089F24.s | 12 |
26 files changed, 154 insertions, 154 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 |