summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-11-28 19:28:41 -0800
committerYamaArashi <shadow962@live.com>2015-11-28 19:28:41 -0800
commitfe5e75ac8f45528204faf51fdcd02fdbbefc80da (patch)
treec06544ff0cbfd626cb666856bead6681ee6a8c61
parent03778a4c06025a3a4d787847d0d0aa544c99ff60 (diff)
update window, text, and main menu disasm
Diffstat
-rw-r--r--asm/emerald.s3947
-rw-r--r--asm/main.s2
-rw-r--r--asm/main_menu.s410
-rw-r--r--asm/pixel_buffer.s41
-rw-r--r--asm/text_renderer.s347
-rw-r--r--asm/window.s224
6 files changed, 2506 insertions, 2465 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index 7334e0dfb..d2ad7f140 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -3409,11 +3409,11 @@ c2_800ACD4: ; 800AF30
movs r0, 0x1
bl bg_set_tilemap
ldr r0, =gUnknown_082ED204
- bl Window_InitFromTemplates
+ bl InitWindows
lsls r0, 16
cmp r0, 0
beq @0800B03C
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
bl reset_temp_tile_data_buffers
movs r0, 0x50
movs r1, 0
@@ -3493,10 +3493,10 @@ sub_800B080: ; 800B080
bl gpu_pal_apply
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_082ED224
str r4, [sp]
str r5, [sp, 0x4]
@@ -3517,15 +3517,15 @@ sub_800B080: ; 800B080
movs r3, 0x1
bl box_print
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -3544,10 +3544,10 @@ sub_800B138: ; 800B138
bl gpu_copy_bg_tile_pattern_data_to_vram
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =gUnknown_082ED224
str r0, [sp]
movs r0, 0
@@ -3560,15 +3560,15 @@ sub_800B138: ; 800B138
movs r3, 0
bl box_print
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r0}
bx r0
@@ -5501,8 +5501,8 @@ sub_800C054: ; 800C054
bx r1
thumb_func_end sub_800C054
- thumb_func_start mega_func_4
-mega_func_4: ; 800C12C
+ thumb_func_start sub_800C12C
+sub_800C12C: ; 800C12C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -5616,7 +5616,7 @@ mega_func_4: ; 800C12C
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end mega_func_4
+ thumb_func_end sub_800C12C
thumb_func_start sub_800C210
sub_800C210: ; 800C210
@@ -11171,7 +11171,7 @@ sub_800EEBC: ; 800EEBC
adds r1, r0
ldrh r0, [r1, 0x14]
movs r1, 0xF0
- bl mega_func_4
+ bl sub_800C12C
lsls r0, 24
cmp r0, 0
bne @0800EEF8
@@ -13103,6 +13103,7 @@ sub_800FE50: ; 800FE50
thumb_func_end sub_800FE50
thumb_func_start sub_800FE84
+; BOOL sub_800FE84(u32 a1, u32 size)
sub_800FE84: ; 800FE84
push {r4-r7,lr}
mov r7, r9
@@ -17352,7 +17353,7 @@ sub_801209C: ; 801209C
beq @0801217C
ldrh r0, [r1, 0x14]
movs r1, 0x5A
- bl mega_func_4
+ bl sub_800C12C
lsls r0, 24
cmp r0, 0
bne @0801217C
@@ -17801,7 +17802,7 @@ sub_80124EC: ; 80124EC
lsrs r5, r2, 24
adds r0, r6, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
lsls r4, 8
movs r0, 0x90
lsls r0, 6
@@ -17884,7 +17885,7 @@ sub_80124EC: ; 80124EC
@080125A6:
adds r0, r6, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -18212,7 +18213,7 @@ sub_8012780: ; 8012780
bl sub_8016FC0
strb r0, [r6, 0x17]
ldr r0, =gUnknown_082F00BC
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6, 0x10]
ldr r0, =0x02022c2d
ldrb r0, [r0]
@@ -18233,15 +18234,15 @@ sub_8012780: ; 8012780
@08012930:
ldr r0, =gUnknown_082F0124
@08012932:
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6, 0xF]
@08012938:
ldr r0, =gUnknown_082F012C
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6, 0x11]
ldrb r0, [r6, 0x10]
movs r1, 0x22
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r6, 0x10]
ldr r2, =gUnknown_082EDBC4
movs r3, 0x1
@@ -18253,10 +18254,10 @@ sub_8012780: ; 8012780
movs r3, 0x8
bl sub_80173E0
ldrb r0, [r6, 0x10]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r6, 0xF]
movs r1, 0
bl sub_81973FC
@@ -18277,10 +18278,10 @@ sub_8012780: ; 8012780
movs r1, 0
bl sub_81973FC
ldrb r0, [r6, 0x11]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6, 0x11]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
mov r5, r8
@@ -18963,7 +18964,7 @@ sub_8012F64: ; 8012F64
push {r4,lr}
adds r4, r0, 0
ldrb r0, [r4, 0x11]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4, 0x11]
movs r1, 0
bl sub_819746C
@@ -18972,18 +18973,18 @@ sub_8012F64: ; 8012F64
movs r2, 0
bl sub_81AE6C8
ldrb r0, [r4, 0x10]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4, 0xF]
movs r1, 0
bl sub_819746C
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
ldrb r0, [r4, 0x11]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r4, 0xF]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r4, 0x10]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r4, 0x17]
bl remove_task
ldr r0, [r4, 0x8]
@@ -19713,17 +19714,17 @@ sub_80134E8: ; 80134E8
movs r4, 0
strb r0, [r6, 0x11]
ldr r0, =gUnknown_082F00BC
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6, 0xC]
ldr r0, =gUnknown_082F0174
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6, 0xB]
ldr r0, =gUnknown_082F017C
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6, 0xD]
ldrb r0, [r6, 0xC]
movs r1, 0x22
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r6, 0xC]
ldr r2, =gUnknown_082EF7DC
movs r1, 0x1
@@ -19734,10 +19735,10 @@ sub_80134E8: ; 80134E8
movs r3, 0x8
bl sub_80173E0
ldrb r0, [r6, 0xC]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6, 0xC]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r6, 0xB]
movs r1, 0
bl sub_81973FC
@@ -19758,12 +19759,12 @@ sub_80134E8: ; 80134E8
movs r1, 0
bl sub_81973FC
ldrb r0, [r6, 0xD]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6, 0xD]
bl sub_80125BC
ldrb r0, [r6, 0xD]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
strb r4, [r6, 0xF]
@@ -20165,7 +20166,7 @@ sub_80134E8: ; 80134E8
b @08013B82
@08013A8C:
ldrb r0, [r6, 0xD]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r6, 0xD]
movs r1, 0
bl sub_819746C
@@ -20174,18 +20175,18 @@ sub_80134E8: ; 80134E8
movs r2, 0
bl sub_81AE6C8
ldrb r0, [r6, 0xC]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r6, 0xB]
movs r1, 0
bl sub_819746C
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
ldrb r0, [r6, 0xD]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r6, 0xB]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r6, 0xC]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r6, 0x11]
bl remove_task
ldr r0, [r6]
@@ -21040,7 +21041,7 @@ sub_80141A4: ; 80141A4
bl sub_80C4E74
@080141F2:
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
pop {r4}
@@ -21243,7 +21244,7 @@ sub_8014384: ; 8014384
bl set_callback2
@080143C6:
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
pop {r4}
@@ -21982,7 +21983,7 @@ sub_8014A40: ; 8014A40
orrs r1, r0
str r1, [sp, 0x4]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5, 0xF]
ldrb r0, [r5, 0xF]
bl sub_8018784
@@ -22293,7 +22294,7 @@ sub_8014A40: ; 8014A40
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
ldrb r0, [r5, 0xF]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r5, 0x17]
bl remove_task
ldr r0, [r5, 0x8]
@@ -22349,7 +22350,7 @@ sub_8014A40: ; 8014A40
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
ldrb r0, [r5, 0xF]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r5, 0x17]
bl remove_task
ldr r0, [r5, 0x8]
@@ -22502,7 +22503,7 @@ sub_8014F48: ; 8014F48
orrs r1, r4
str r1, [sp, 0x4]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r7, 0xB]
ldr r0, =gUnknown_082F017C
ldr r1, [r0, 0x4]
@@ -22514,7 +22515,7 @@ sub_8014F48: ; 8014F48
ands r1, r5
orrs r1, r4
str r1, [r0, 0x4]
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r7, 0xD]
ldrb r0, [r7, 0xB]
bl sub_8018784
@@ -22535,14 +22536,14 @@ sub_8014F48: ; 8014F48
bl sub_8018784
ldrb r0, [r7, 0xD]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r7, 0xD]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r7, 0xD]
bl sub_80125BC
ldrb r0, [r7, 0xD]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
strb r6, [r7, 0xF]
@@ -22705,9 +22706,9 @@ sub_8014F48: ; 8014F48
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
ldrb r0, [r7, 0xD]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r7, 0xB]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r7, 0x11]
bl remove_task
ldr r0, [r7]
@@ -22887,7 +22888,7 @@ task00_081182DC: ; 80152F4
orrs r1, r0
str r1, [sp, 0x4]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5, 0xB]
ldrb r0, [r5, 0xB]
bl sub_8018784
@@ -23074,7 +23075,7 @@ task00_081182DC: ; 80152F4
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
ldrb r0, [r5, 0xB]
- bl Window_Remove
+ bl RemoveWindow
@08015580:
ldrb r0, [r5, 0x11]
bl remove_task
@@ -26184,7 +26185,7 @@ sub_80170B8: ; 80170B8
sub_8017118: ; 8017118
push {r4,lr}
sub sp, 0x8
- bl Window_AddFromTemplate
+ bl AddWindow
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -26193,7 +26194,7 @@ sub_8017118: ; 8017118
bl sub_81973FC
adds r0, r4, 0
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_082EFD94
movs r0, 0x1
str r0, [sp]
@@ -26205,9 +26206,9 @@ sub_8017118: ; 8017118
bl sub_80173E0
adds r0, r4, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
add sp, 0x8
pop {r4}
@@ -26221,7 +26222,7 @@ sub_8017168: ; 8017168
push {lr}
lsls r0, 24
lsrs r0, 24
- bl Window_Remove
+ bl RemoveWindow
pop {r0}
bx r0
thumb_func_end sub_8017168
@@ -26282,7 +26283,7 @@ sub_8017178: ; 8017178
str r0, [sp]
@080171DC:
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0
@@ -26303,7 +26304,7 @@ sub_8017178: ; 8017178
strb r0, [r1]
ldrb r0, [r5]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r7]
adds r0, 0x1
strb r0, [r7]
@@ -26328,7 +26329,7 @@ sub_8017178: ; 8017178
movs r1, 0x1
bl sub_819746C
ldrb r0, [r5]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
strb r0, [r7]
mov r0, r8
@@ -26348,7 +26349,7 @@ sub_8017178: ; 8017178
movs r1, 0x1
bl sub_819746C
ldrb r0, [r5]
- bl Window_Remove
+ bl RemoveWindow
strb r4, [r7]
movs r0, 0x2
negs r0, r0
@@ -26395,7 +26396,7 @@ sub_80172A0: ; 80172A0
mov r1, r9
strb r0, [r1]
ldr r0, [sp, 0x20]
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6]
ldrb r0, [r6]
movs r1, 0
@@ -26419,7 +26420,7 @@ sub_80172A0: ; 80172A0
@0801730C:
ldrb r0, [r6]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08017314:
ldrb r0, [r5]
adds r0, 0x1
@@ -26449,7 +26450,7 @@ sub_80172A0: ; 80172A0
movs r2, 0
bl sub_81AE6C8
ldrb r0, [r6]
- bl Window_Remove
+ bl RemoveWindow
mov r7, r9
ldrb r0, [r7]
bl sub_8017168
@@ -26471,7 +26472,7 @@ sub_80172A0: ; 80172A0
movs r2, 0
bl sub_81AE6C8
ldrb r0, [r6]
- bl Window_Remove
+ bl RemoveWindow
mov r3, r9
ldrb r0, [r3]
bl sub_8017168
@@ -26730,7 +26731,7 @@ sub_80173E0: ; 80173E0
mov r0, sp
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -28610,7 +28611,7 @@ sub_8018424: ; 8018424
sub_8018438: ; 8018438
push {lr}
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
pop {r0}
@@ -28718,8 +28719,8 @@ sub_8018450: ; 8018450
movs r0, 0x3
bl bgid_upload_textbox_1
ldr r0, =gUnknown_082F05A8
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r1, 0xC0
lsls r1, 7
movs r0, 0
@@ -28871,7 +28872,7 @@ sub_80186A4: ; 80186A4
ldr r1, =0x02022c60
movs r0, 0
strb r0, [r1]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
bl bg_get_tilemap
bl free
@@ -28901,7 +28902,7 @@ sub_80186EC: ; 80186EC
lsrs r4, 24
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r4, 0
bne @0801871C
ldr r0, =gUnknown_085EF654
@@ -28947,9 +28948,9 @@ sub_80186EC: ; 80186EC
bl sub_8199EEC
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0x14
pop {r4-r7}
pop {r0}
@@ -29104,7 +29105,7 @@ sub_8018884: ; 8018884
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r1, 0
str r1, [sp]
str r1, [sp, 0x4]
@@ -29122,10 +29123,10 @@ sub_8018884: ; 8018884
movs r2, 0xF
bl sub_8098858
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x14
pop {r4}
pop {r0}
@@ -29139,10 +29140,10 @@ sub_80188DC: ; 80188DC
movs r0, 0x1
bl rbox_fill_rectangle
movs r0, 0x1
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x1
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_80188DC
@@ -29181,7 +29182,7 @@ mevent_0814257C: ; 80188F8
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
- bl draw_bouncing_down_arrow_2
+ bl DrawDownArrow
ldr r0, =0x030022c0
ldrh r1, [r0, 0x2E]
movs r0, 0x3
@@ -29204,7 +29205,7 @@ mevent_0814257C: ; 80188F8
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
- bl draw_bouncing_down_arrow_2
+ bl DrawDownArrow
movs r0, 0
strb r0, [r4]
bl sub_80188DC
@@ -29238,7 +29239,7 @@ sub_801898C: ; 801898C
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
- bl draw_bouncing_down_arrow_2
+ bl DrawDownArrow
add sp, 0xC
pop {r0}
bx r0
@@ -29259,7 +29260,7 @@ sub_80189B4: ; 80189B4
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
- bl draw_bouncing_down_arrow_2
+ bl DrawDownArrow
add sp, 0xC
pop {r0}
bx r0
@@ -29406,10 +29407,10 @@ sub_8018A50: ; 8018A50
cmp r4, r0
beq @08018AFA
movs r0, 0x2
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x2
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08018AFA:
adds r0, r4, 0
add sp, 0x24
@@ -29453,11 +29454,11 @@ sub_8018B08: ; 8018B08
@08018B48:
ldr r0, =gUnknown_082F05D0
@08018B4A:
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4]
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
movs r2, 0
str r2, [sp]
@@ -29476,9 +29477,9 @@ sub_8018B08: ; 8018B08
bl sub_8098858
ldrb r0, [r4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @08018BD6
.pool
@08018B98:
@@ -29531,12 +29532,12 @@ sub_8018B08: ; 8018B08
ldrb r0, [r4]
bl rbox_fill_rectangle
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r6, 0
b @08018C42
@08018C1A:
@@ -29545,12 +29546,12 @@ sub_8018B08: ; 8018B08
ldrb r0, [r4]
bl rbox_fill_rectangle
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1
negs r0, r0
b @08018C42
@@ -29598,12 +29599,12 @@ sub_8018C4C: ; 8018C4C
bl ExpandStringRefs
@08018C8C:
ldr r0, =gUnknown_082F05D8
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r5]
lsls r0, 24
lsrs r0, 24
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r5]
movs r2, 0
str r2, [sp]
@@ -29622,9 +29623,9 @@ sub_8018C4C: ; 8018C4C
bl sub_8098858
ldrb r0, [r5]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r5]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6]
adds r0, 0x1
strb r0, [r6]
@@ -29670,12 +29671,12 @@ sub_8018C4C: ; 8018C4C
ldrb r0, [r5]
bl rbox_fill_rectangle
ldrb r0, [r5]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r5]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r5]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r4, 0
b @08018D90
.pool
@@ -29685,12 +29686,12 @@ sub_8018C4C: ; 8018C4C
ldrb r0, [r5]
bl rbox_fill_rectangle
ldrb r0, [r5]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r5]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r5]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x2
negs r0, r0
b @08018D90
@@ -31035,13 +31036,13 @@ task00_mystery_gift: ; 80191F4
bne @0801985C
ldr r0, =gUnknown_085EF360
bl sub_8018884
- bl sub_801D0A0
+ bl mevent_srv_new_wcard
b @08019866
.pool
@0801985C:
ldr r0, =gUnknown_085EF37C
bl sub_8018884
- bl sub_801D07C
+ bl mevent_srv_init_wnews
@08019866:
movs r0, 0x20
strb r0, [r5, 0x8]
@@ -32559,7 +32560,7 @@ sub_801A3F4: ; 801A3F4
cmp r0, 0
bne @0801A414
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -32632,8 +32633,8 @@ sub_801A43C: ; 801A43C
movs r3, 0
bl gpu_copy_to_wram_bg_tile_map
ldr r0, =gUnknown_082F0D3C
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
bl sub_80A1A74
bl reset_all_obj_data
bl clear_tasks
@@ -32692,7 +32693,7 @@ sub_801A43C: ; 801A43C
ldr r0, =sub_801A3F4
bl set_callback2
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -32706,7 +32707,7 @@ sub_801A43C: ; 801A43C
thumb_func_start sub_801A584
sub_801A584: ; 801A584
push {r4,lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r4, 0
@0801A58C:
lsls r0, r4, 24
@@ -32771,13 +32772,13 @@ sub_801A600: ; 801A600
sub sp, 0x8
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_082F0D5C
ldr r4, [r5]
movs r0, 0x1
@@ -32837,15 +32838,15 @@ sub_801A600: ; 801A600
movs r3, 0
bl sub_801A8B0
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -32946,7 +32947,7 @@ sub_801A6C0: ; 801A6C0
beq @0801A7F8
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r4, 0
ldr r6, =0x02021fc4
movs r7, 0x80
@@ -32991,10 +32992,10 @@ sub_801A6C0: ; 801A6C0
cmp r4, 0x3
ble @0801A796
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0801A7F8:
ldr r0, =0x030022c0
ldrh r1, [r0, 0x2E]
@@ -33473,7 +33474,7 @@ sub_801AB68: ; 801AB68
lsrs r1, 24
adds r0, r5, 0
str r3, [sp, 0x14]
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
mov r1, r9
str r1, [sp]
mov r0, r10
@@ -33526,17 +33527,17 @@ sub_801ABDC: ; 801ABDC
movs r3, 0x1
bl sub_801AB68
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
b @0801AC36
@0801AC22:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -33656,21 +33657,21 @@ sub_801AC54: ; 801AC54
bl bg_vram_setup
bl reset_temp_tile_data_buffers
ldr r0, =gUnknown_082F0DD4
- bl Window_InitFromTemplates
+ bl InitWindows
lsls r0, 16
cmp r0, 0
bne @0801AD8C
b @0801AFC2
@0801AD8C:
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
movs r0, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -33884,7 +33885,7 @@ sub_801AC54: ; 801AC54
bl set_callback2
@0801AFAE:
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -35510,7 +35511,7 @@ sub_801BB74: ; 801BB74
bl decompress_and_copy_tile_data_to_vram
ldr r4, =gUnknown_082F0E1C
adds r0, r4, 0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r5]
movs r2, 0xBB
lsls r2, 1
@@ -35518,7 +35519,7 @@ sub_801BB74: ; 801BB74
strh r0, [r1]
adds r0, r4, 0
adds r0, 0x8
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r5]
movs r2, 0xBC
lsls r2, 1
@@ -35526,7 +35527,7 @@ sub_801BB74: ; 801BB74
strh r0, [r1]
adds r4, 0x10
adds r0, r4, 0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r5]
movs r2, 0xBD
lsls r2, 1
@@ -35752,19 +35753,19 @@ sub_801BDA4: ; 801BDA4
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
ldr r0, [r4]
movs r1, 0xBC
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
ldr r0, [r4]
movs r1, 0xBB
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
b @0801BEDA
.pool
@0801BE94:
@@ -36148,10 +36149,10 @@ sub_801C178: ; 801C178
lsls r6, r0, 24
lsrs r5, r6, 24
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r5, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r4, 0x1
beq @0801C2A0
cmp r4, 0x1
@@ -36202,13 +36203,13 @@ sub_801C178: ; 801C178
add r4, r9
movs r0, 0x3
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
movs r0, 0x3
adds r1, r4, 0
- bl font_get_width_of_string
+ bl GetStringWidth
movs r1, 0xA0
subs r1, r0
cmp r1, 0
@@ -36391,7 +36392,7 @@ sub_801C178: ; 801C178
adds r4, 0x10
movs r0, 0x3
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
lsls r0, 24
lsrs r2, r0, 24
ldr r0, [r7]
@@ -36453,7 +36454,7 @@ sub_801C178: ; 801C178
adds r1, 0x1
movs r0, 0x3
mov r2, r10
- bl font_get_width_of_string
+ bl GetStringWidth
add r8, r0
mov r0, r8
lsls r2, r0, 24
@@ -36485,7 +36486,7 @@ sub_801C178: ; 801C178
adds r1, 0x2A
movs r0, 0x3
mov r2, r10
- bl font_get_width_of_string
+ bl GetStringWidth
ldr r1, [r7]
adds r1, r5
movs r2, 0xB7
@@ -36510,7 +36511,7 @@ sub_801C178: ; 801C178
mov r1, r9
lsrs r0, r1, 24
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -36982,7 +36983,7 @@ sub_801C758: ; 801C758
bl decompress_and_copy_tile_data_to_vram
ldr r4, =gUnknown_082F1DE8
adds r0, r4, 0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r5]
movs r2, 0xE4
lsls r2, 1
@@ -36990,7 +36991,7 @@ sub_801C758: ; 801C758
strh r0, [r1]
adds r4, 0x8
adds r0, r4, 0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r5]
movs r3, 0xE5
lsls r3, 1
@@ -37294,13 +37295,13 @@ sub_801CA50: ; 801CA50
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
ldr r0, [r4]
movs r2, 0xE4
lsls r2, 1
adds r0, r2
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
b @0801CC0E
.pool
@0801CB84:
@@ -37692,23 +37693,23 @@ sub_801CE7C: ; 801CE7C
lsls r7, 1
adds r0, r7
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r6]
movs r4, 0xE5
lsls r4, 1
adds r0, r4
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r6]
adds r0, r7
ldrb r0, [r0]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, [r6]
movs r0, 0xE7
lsls r0, 1
@@ -37716,13 +37717,13 @@ sub_801CE7C: ; 801CE7C
add r4, r8
movs r0, 0x3
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
movs r0, 0x3
adds r1, r4, 0
- bl font_get_width_of_string
+ bl GetStringWidth
movs r1, 0xE0
subs r1, r0
lsrs r0, r1, 31
@@ -37801,14 +37802,14 @@ sub_801CE7C: ; 801CE7C
adds r0, r3
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r6]
movs r1, 0xE5
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
@@ -37922,8 +37923,8 @@ sub_801CFA4: ; 801CFA4
.pool
thumb_func_end sub_801CFA4
- thumb_func_start sub_801D07C
-sub_801D07C: ; 801D07C
+ thumb_func_start mevent_srv_init_wnews
+mevent_srv_init_wnews: ; 801D07C
push {r4,lr}
ldr r4, =0x02022c7c
movs r0, 0x60
@@ -37937,10 +37938,10 @@ sub_801D07C: ; 801D07C
pop {r0}
bx r0
.pool
- thumb_func_end sub_801D07C
+ thumb_func_end mevent_srv_init_wnews
- thumb_func_start sub_801D0A0
-sub_801D0A0: ; 801D0A0
+ thumb_func_start mevent_srv_new_wcard
+mevent_srv_new_wcard: ; 801D0A0
push {r4,lr}
ldr r4, =0x02022c7c
movs r0, 0x60
@@ -37954,7 +37955,7 @@ sub_801D0A0: ; 801D0A0
pop {r0}
bx r0
.pool
- thumb_func_end sub_801D0A0
+ thumb_func_end mevent_srv_new_wcard
thumb_func_start sub_801D0C4
sub_801D0C4: ; 801D0C4
@@ -42541,7 +42542,7 @@ sub_801F4D0: ; 801F4D0
movs r2, 0x4
bl bg_vram_setup
ldr r0, =gUnknown_082F2C70
- bl Window_InitFromTemplates
+ bl InitWindows
bl reset_temp_tile_data_buffers
bl sub_8020770
ldr r0, [r4]
@@ -42584,7 +42585,7 @@ sub_801F544: ; 801F544
movs r0, 0
str r0, [r4]
@0801F55A:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r1, =0x02039b28
movs r0, 0x3
strb r0, [r1, 0x15]
@@ -42808,7 +42809,7 @@ sub_801F6F8: ; 801F6F8
bl sub_80203B0
movs r0, 0x3
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801F720
@0801F716:
bl is_dma3_queue_busy_with_gpu_copy
@@ -42840,7 +42841,7 @@ sub_801F730: ; 801F730
bl sub_802040C
movs r0, 0x3
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801F758
@0801F74E:
bl is_dma3_queue_busy_with_gpu_copy
@@ -42883,7 +42884,7 @@ sub_801F768: ; 801F768
bl sub_80201A4
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801F7C4
@0801F79E:
bl is_dma3_queue_busy_with_gpu_copy
@@ -42944,7 +42945,7 @@ sub_801F7E0: ; 801F7E0
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801F81E
.pool
@0801F814:
@@ -43033,7 +43034,7 @@ sub_801F870: ; 801F870
bl sub_8020118
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801F8CC
@0801F8BA:
bl is_dma3_queue_busy_with_gpu_copy
@@ -43098,7 +43099,7 @@ sub_801F8DC: ; 801F8DC
bl sub_8020118
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801F972
@0801F938:
bl is_dma3_queue_busy_with_gpu_copy
@@ -43112,7 +43113,7 @@ sub_801F8DC: ; 801F8DC
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801F972
.pool
@0801F95C:
@@ -43181,7 +43182,7 @@ sub_801F984: ; 801F984
bl sub_8020118
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801FA1A
@0801F9E0:
bl is_dma3_queue_busy_with_gpu_copy
@@ -43193,7 +43194,7 @@ sub_801F984: ; 801F984
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801FA1A
.pool
@0801FA00:
@@ -43235,7 +43236,7 @@ sub_801FA2C: ; 801FA2C
bl sub_80201A4
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -43290,7 +43291,7 @@ sub_801FA68: ; 801FA68
bl sub_8020420
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0801FB34
.pool
@0801FAC0:
@@ -43322,10 +43323,10 @@ sub_801FA68: ; 801FA68
movs r1, 0
movs r2, 0x5
movs r3, 0x11
- bl Window_ScrollVertically
+ bl ScrollWindow
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x02022c88
ldr r1, [r0]
ldrh r0, [r1, 0x1C]
@@ -43406,7 +43407,7 @@ sub_801FB70: ; 801FB70
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -43443,7 +43444,7 @@ sub_801FBB4: ; 801FBB4
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -43485,7 +43486,7 @@ sub_801FBF8: ; 801FBF8
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -43526,7 +43527,7 @@ sub_801FC4C: ; 801FC4C
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -43567,7 +43568,7 @@ sub_801FC9C: ; 801FC9C
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -43604,7 +43605,7 @@ sub_801FCEC: ; 801FCEC
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -43646,7 +43647,7 @@ sub_801FD30: ; 801FD30
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -43687,7 +43688,7 @@ sub_801FD88: ; 801FD88
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -43752,7 +43753,7 @@ sub_801FDDC: ; 801FDDC
orrs r0, r1
str r0, [sp, 0x10]
add r0, sp, 0xC
- bl Window_AddFromTemplate
+ bl AddWindow
adds r1, r0, 0
ldr r5, =0x02022c88
ldr r0, [r5]
@@ -43765,10 +43766,10 @@ sub_801FDDC: ; 801FDDC
lsls r0, r1, 24
lsrs r0, 24
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r5]
ldrb r0, [r0, 0x18]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r5]
ldrb r0, [r0, 0x18]
ldr r2, =gUnknown_085EAE62
@@ -43821,7 +43822,7 @@ sub_801FEBC: ; 801FEBC
bl sub_8198070
ldr r0, [r4]
ldrb r0, [r0, 0x18]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@0801FEDA:
pop {r4}
pop {r0}
@@ -43839,7 +43840,7 @@ sub_801FEE4: ; 801FEE4
beq @0801FEFE
lsls r0, 24
lsrs r0, 24
- bl Window_Remove
+ bl RemoveWindow
ldr r1, [r4]
movs r0, 0xFF
strh r0, [r1, 0x18]
@@ -43928,7 +43929,7 @@ sub_801FF18: ; 801FF18
str r0, [sp, 0x14]
@0801FF98:
add r0, sp, 0x14
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r5, =0x02022c88
ldr r1, [r5]
strh r0, [r1, 0x1E]
@@ -43961,9 +43962,9 @@ sub_801FF18: ; 801FF18
lsrs r5, r0, 24
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =gUnknown_082F2D40
lsls r0, r7, 1
adds r0, r7
@@ -44049,7 +44050,7 @@ sub_8020094: ; 8020094
bl sub_8198070
ldr r0, [r4]
ldrb r0, [r0, 0x1E]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@080200B2:
movs r0, 0
movs r1, 0
@@ -44071,7 +44072,7 @@ sub_80200C8: ; 80200C8
beq @080200E2
lsls r0, 24
lsrs r0, 24
- bl Window_Remove
+ bl RemoveWindow
ldr r1, [r4]
movs r0, 0xFF
strh r0, [r1, 0x1E]
@@ -44100,7 +44101,7 @@ sub_80200EC: ; 80200EC
adds r1, r2, 0
adds r2, r3, 0
movs r3, 0x1
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
add sp, 0x8
pop {r0}
bx r0
@@ -44186,7 +44187,7 @@ sub_80201A4: ; 80201A4
sub sp, 0x4C
movs r0, 0x2
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
bl sub_801F0B0
lsls r0, 24
lsrs r2, r0, 24
@@ -44266,7 +44267,7 @@ sub_80201A4: ; 80201A4
movs r0, 0
adds r1, r5, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
cmp r0, 0x28
bgt @08020286
lsls r3, r6, 24
@@ -44316,7 +44317,7 @@ sub_80201A4: ; 80201A4
movs r0, 0
adds r1, r6, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
cmp r0, 0x23
bgt @080202AC
mov r1, r8
@@ -44448,7 +44449,7 @@ sub_80203B0: ; 80203B0
sub sp, 0xC
movs r0, 0x3
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0x1
movs r2, 0xD
@@ -44476,7 +44477,7 @@ sub_80203B0: ; 80203B0
movs r3, 0x1
bl sub_81983AC
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -44491,7 +44492,7 @@ sub_802040C: ; 802040C
movs r1, 0
bl sub_8198070
movs r0, 0x3
- bl Window_FillTileMap
+ bl ClearWindowTileMap
pop {r0}
bx r0
thumb_func_end sub_802040C
@@ -44524,7 +44525,7 @@ sub_8020420: ; 8020420
movs r0, 0
movs r1, 0x11
movs r2, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
adds r4, 0x1
lsls r4, 24
lsrs r4, 24
@@ -44783,13 +44784,13 @@ sub_80206A4: ; 80206A4
movs r2, 0x20
bl gpu_pal_apply
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
.pool
@@ -44799,11 +44800,11 @@ sub_80206A4: ; 80206A4
sub_80206D0: ; 80206D0
push {lr}
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
bl sub_80201A4
movs r0, 0x2
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_80206D0
@@ -44831,18 +44832,18 @@ sub_80206E8: ; 80206E8
str r0, [sp, 0x4]
movs r0, 0x1
movs r3, 0
- bl Window_CopyWholePixelBlockToWindow
+ bl BlitSurfaceToWindow
adds r4, 0x1
cmp r4, 0xE
ble @080206F8
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4}
pop {r0}
@@ -44855,7 +44856,7 @@ sub_8020740: ; 8020740
push {lr}
movs r0, 0x3
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0x1
movs r2, 0xD0
@@ -45870,7 +45871,7 @@ sub_8020F74: ; 8020F74
sub_8020F88: ; 8020F88
push {lr}
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
pop {r0}
@@ -46356,7 +46357,7 @@ sub_802130C: ; 802130C
bl gpu_copy_wram_bg_tilemap_to_vram
b @0802143E
@080213E6:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
bl gpu_sync_bg_hide
movs r0, 0
@@ -47129,7 +47130,7 @@ sub_80219C8: ; 80219C8
negs r2, r2
movs r0, 0x2
mov r1, r8
- bl font_get_width_of_string
+ bl GetStringWidth
lsls r4, 2
lsrs r0, 1
subs r4, r0
@@ -47542,7 +47543,7 @@ sub_8021D34: ; 8021D34
mov r9, r4
ldrb r0, [r4]
movs r1, 0x4
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 27
movs r1, 0xD6
lsls r1, 24
@@ -47569,7 +47570,7 @@ sub_8021D34: ; 8021D34
adds r1, r4, 0
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
movs r1, 0xB0
subs r0, r1, r0
lsls r0, 24
@@ -47611,7 +47612,7 @@ sub_8021D34: ; 8021D34
adds r1, r5, 0
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
subs r0, r6, r0
lsls r0, 24
lsrs r6, r0, 24
@@ -47631,7 +47632,7 @@ sub_8021D34: ; 8021D34
adds r1, r4, 0
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
subs r0, r6, r0
lsls r0, 24
lsrs r6, r0, 24
@@ -47662,7 +47663,7 @@ sub_8021D34: ; 8021D34
adds r1, r5, 0
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
subs r0, r6, r0
lsls r0, 24
lsrs r6, r0, 24
@@ -47697,7 +47698,7 @@ sub_8021D34: ; 8021D34
adds r1, r4, 0
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
movs r2, 0xB0
subs r0, r2, r0
lsls r0, 24
@@ -47769,7 +47770,7 @@ sub_8021D34: ; 8021D34
negs r2, r2
movs r0, 0x2
adds r1, r4, 0
- bl font_get_width_of_string
+ bl GetStringWidth
subs r0, r6, r0
lsls r0, 24
lsrs r6, r0, 24
@@ -47845,7 +47846,7 @@ sub_8021D34: ; 8021D34
negs r2, r2
movs r0, 0x2
adds r1, r4, 0
- bl font_get_width_of_string
+ bl GetStringWidth
movs r1, 0xB0
subs r1, r0
lsls r1, 24
@@ -47927,7 +47928,7 @@ sub_8022070: ; 8022070
mov r0, sp
strb r1, [r0, 0x4]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
adds r1, r6, 0
adds r1, 0x82
strb r0, [r1]
@@ -47937,10 +47938,10 @@ sub_8022070: ; 8022070
adds r4, r6, 0
adds r4, 0x82
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
b @08022218
@0802210C:
adds r5, r6, 0
@@ -48054,7 +48055,7 @@ sub_8022070: ; 8022070
adds r0, 0x82
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r1, r6, 0
adds r1, 0x80
movs r0, 0
@@ -48087,7 +48088,7 @@ sub_802222C: ; 802222C
movs r1, 0x1
bl sub_8198070
ldrb r0, [r5]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r4, 0
bl sub_8022600
pop {r4,r5}
@@ -48136,14 +48137,14 @@ sub_8022250: ; 8022250
b @080224BA
@08022296:
ldr r0, =gUnknown_082F32EC
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r6, 0x2]
lsls r0, 24
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6, 0x2]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r6, 0x2]
ldr r4, =0x0000021d
adds r1, r4, 0
@@ -48165,7 +48166,7 @@ sub_8022250: ; 8022250
movs r0, 0x1
mov r1, r10
mov r2, r8
- bl font_get_width_of_string
+ bl GetStringWidth
lsrs r0, 1
movs r4, 0x60
subs r0, r4, r0
@@ -48187,7 +48188,7 @@ sub_8022250: ; 8022250
movs r0, 0x1
mov r1, r10
mov r2, r8
- bl font_get_width_of_string
+ bl GetStringWidth
lsrs r0, 1
subs r4, r0
lsls r4, 24
@@ -48229,7 +48230,7 @@ sub_8022250: ; 8022250
ldr r1, =gUnknown_085ED850
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
movs r1, 0xC0
subs r1, r0
lsls r1, 24
@@ -48303,7 +48304,7 @@ sub_8022250: ; 8022250
ldr r1, =0x02021fc4
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
subs r0, r7, r0
lsls r0, 24
lsrs r7, r0, 24
@@ -48334,7 +48335,7 @@ sub_8022250: ; 8022250
@08022444:
ldrb r0, [r6, 0x2]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @080224BA
.pool
@08022480:
@@ -48351,9 +48352,9 @@ sub_8022250: ; 8022250
movs r1, 0x1
bl sub_8198070
ldrb r0, [r6, 0x2]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r6, 0x2]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r4, 0
bl remove_task
bl script_env_2_enable_and_set_ctx_running
@@ -48497,16 +48498,16 @@ sub_8022588: ; 8022588
lsls r0, 3
ldr r1, =gUnknown_082F32F4
adds r0, r1
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, =0x000001bb
adds r4, r5, r1
adds r4, r6
strb r0, [r4]
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -48538,7 +48539,7 @@ sub_8022600: ; 8022600
adds r0, r6, r1
adds r5, r0, r7
ldrb r0, [r5]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6, 0x8]
cmp r7, r0
bne @08022668
@@ -48548,7 +48549,7 @@ sub_8022600: ; 8022600
movs r0, 0x2
adds r1, r4, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
lsrs r0, 1
movs r2, 0x24
subs r2, r0
@@ -48575,7 +48576,7 @@ sub_8022600: ; 8022600
movs r0, 0x2
adds r1, r4, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
lsrs r0, 1
movs r2, 0x24
subs r2, r0
@@ -48599,7 +48600,7 @@ sub_8022600: ; 8022600
adds r0, r7
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
@@ -49491,12 +49492,12 @@ sub_8022D14: ; 8022D14
@08022DB2:
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @08022E08
.pool
@08022DC0:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @08022E0E
@@ -52054,7 +52055,7 @@ sub_8024134: ; 8024134
bl text_box_related_one
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =sub_8153688
movs r1, 0
bl AddTask
@@ -52430,12 +52431,12 @@ sub_8024444: ; 8024444
@080244AC:
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @080244F6
.pool
@080244BC:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @080244FC
@@ -52988,13 +52989,13 @@ sub_80248B0: ; 80248B0
bl rbox_template_set
ldr r4, =0x02022c94
add r0, sp, 0x10
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
ldr r5, =0x0000021d
adds r1, r5, 0
@@ -53019,12 +53020,12 @@ sub_8024918: ; 8024918
push {r4,lr}
ldr r4, =0x02022c94
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
movs r1, 0x1
bl sub_8198070
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -54718,7 +54719,7 @@ sub_80256AC: ; 80256AC
bl remove_task
ldr r0, [r4]
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
@0802574C:
add sp, 0x4
pop {r4}
@@ -59294,7 +59295,7 @@ sub_8027ACC: ; 8027ACC
ldr r1, =gUnknown_085EDCE5
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r4, r0, 0
movs r6, 0
ldr r5, =gUnknown_082F7B34
@@ -59302,7 +59303,7 @@ sub_8027ACC: ; 8027ACC
ldr r1, [r5]
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r0, 0x32
cmp r0, r4
ble @08027B2A
@@ -59341,7 +59342,7 @@ sub_8027ACC: ; 8027ACC
orrs r0, r2
str r0, [sp]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r7, 0x2]
lsls r0, 24
lsrs r0, 24
@@ -59369,7 +59370,7 @@ sub_8027ACC: ; 8027ACC
ldrb r0, [r7, 0x2]
movs r1, 0x1
@08027BB6:
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08027BBA:
ldrh r0, [r7]
adds r0, 0x1
@@ -59382,7 +59383,7 @@ sub_8027ACC: ; 8027ACC
cmp r0, 0
bne @08027BE2
ldrb r0, [r7, 0x2]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r4, 0
bl remove_task
bl script_env_2_enable_and_set_ctx_running
@@ -59430,7 +59431,7 @@ sub_8027BEC: ; 8027BEC
bl sub_8098858
adds r0, r7, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_085EDCE5
ldr r0, [sp, 0x18]
lsls r2, r0, 3
@@ -59474,7 +59475,7 @@ sub_8027BEC: ; 8027BEC
mov r1, r8
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
adds r5, r0, 0
ldr r0, =gUnknown_082F7B34
adds r4, r0
@@ -59513,7 +59514,7 @@ sub_8027BEC: ; 8027BEC
cmp r6, 0x2
ble @08027C76
adds r0, r7, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -62313,7 +62314,7 @@ sub_8029274: ; 8029274
thumb_func_start sub_80292D4
sub_80292D4: ; 80292D4
push {lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
thumb_func_end sub_80292D4
@@ -62562,7 +62563,7 @@ sub_8029440: ; 8029440
movs r0, 0x1
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
movs r1, 0x38
subs r1, r0
lsrs r1, 1
@@ -62581,7 +62582,7 @@ sub_8029440: ; 8029440
orrs r0, r2
str r0, [sp, 0xC]
add r0, sp, 0xC
- bl Window_AddFromTemplate
+ bl AddWindow
mov r2, r10
ldr r1, [r2]
add r1, r9
@@ -62591,14 +62592,14 @@ sub_8029440: ; 8029440
add r0, r9
adds r0, r6
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
mov r3, r10
ldr r0, [r3]
add r0, r9
adds r0, r6
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
bl link_get_multiplayer_id
lsls r0, 24
lsrs r0, 24
@@ -62637,7 +62638,7 @@ sub_8029440: ; 8029440
adds r0, r6
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r3, [sp, 0x18]
ldrh r0, [r3, 0x6]
adds r0, 0xE
@@ -62674,7 +62675,7 @@ sub_8029440: ; 8029440
adds r0, r1
adds r0, r6
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -62700,12 +62701,12 @@ sub_8029440: ; 8029440
adds r0, r4
adds r0, r6
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r5]
adds r0, r4
adds r0, r6
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -62840,7 +62841,7 @@ sub_80296A8: ; 80296A8
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
movs r1, 0xD8
subs r1, r0
str r1, [sp, 0x64]
@@ -62926,7 +62927,7 @@ sub_80296A8: ; 80296A8
add r1, sp, 0xC
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
adds r3, r0, 0
ldr r2, =0x02022cf8
ldr r0, [r2]
@@ -63030,7 +63031,7 @@ sub_802988C: ; 802988C
@08029914:
ldr r6, =gUnknown_082F7BBC
adds r0, r6, 0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r4, =0x02022cf8
ldr r1, [r4]
ldr r2, =0x00003008
@@ -63040,7 +63041,7 @@ sub_802988C: ; 802988C
movs r0, 0x8
adds r0, r6
mov r9, r0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r4]
ldr r5, =0x00003009
adds r1, r5
@@ -63048,11 +63049,11 @@ sub_802988C: ; 802988C
ldr r0, [r4]
add r0, r8
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r4]
adds r0, r5
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
adds r0, r6, 0
bl sub_8029174
mov r0, r9
@@ -63066,21 +63067,21 @@ sub_802988C: ; 802988C
adds r0, r5
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldr r1, =0x00003009
mov r9, r1
add r0, r9
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EDD49
mov r8, r2
movs r2, 0x1
negs r2, r2
movs r0, 0x1
mov r1, r8
- bl font_get_width_of_string
+ bl GetStringWidth
adds r1, r0, 0
movs r0, 0xE0
subs r0, r1
@@ -63181,7 +63182,7 @@ sub_802988C: ; 802988C
mov r1, r10
movs r2, 0x1
negs r2, r2
- bl font_get_width_of_string
+ bl GetStringWidth
adds r5, r0, 0
cmp r6, r4
bne @08029AE0
@@ -63258,13 +63259,13 @@ sub_802988C: ; 802988C
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, =0x00003009
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, [r4]
ldr r0, =0x00003014
adds r1, r0
@@ -63280,12 +63281,12 @@ sub_802988C: ; 802988C
ldr r1, =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r4]
ldr r2, =0x00003009
adds r0, r2
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@08029B90:
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
@@ -63334,19 +63335,19 @@ sub_802988C: ; 802988C
adds r0, r5
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldr r1, =0x00003009
adds r0, r1
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r6, =gUnknown_085EDD86
movs r2, 0x1
negs r2, r2
movs r0, 0x1
adds r1, r6, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r1, r0, 0
movs r0, 0xE0
subs r0, r1
@@ -63376,13 +63377,13 @@ sub_802988C: ; 802988C
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, =0x00003009
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, [r4]
ldr r0, =0x00003014
adds r1, r0
@@ -63398,12 +63399,12 @@ sub_802988C: ; 802988C
ldr r1, =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r4]
ldr r2, =0x00003009
adds r0, r2
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@08029CC0:
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
@@ -63473,17 +63474,17 @@ sub_802988C: ; 802988C
ldr r4, =0x00003009
adds r0, r4
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
ldr r6, =gUnknown_082F7BCC
adds r0, r6, 0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r5]
adds r1, r4
strb r0, [r1]
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
adds r0, r6, 0
bl sub_8029174
b @08029FF8
@@ -63497,20 +63498,20 @@ sub_802988C: ; 802988C
adds r0, r6
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldr r1, =0x00003009
mov r10, r1
add r0, r10
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EDD9B
movs r2, 0x1
negs r2, r2
movs r0, 0x1
adds r1, r5, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r1, r0, 0
movs r0, 0xE0
subs r0, r1
@@ -63610,13 +63611,13 @@ sub_802988C: ; 802988C
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, =0x00003009
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, [r4]
ldr r0, =0x00003014
adds r1, r0
@@ -63632,12 +63633,12 @@ sub_802988C: ; 802988C
ldr r1, =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r4]
ldr r2, =0x00003009
adds r0, r2
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@08029F2C:
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
@@ -63688,20 +63689,20 @@ sub_802988C: ; 802988C
ldr r5, =0x00003008
adds r0, r1, r5
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r6]
ldr r4, =0x00003009
adds r0, r4
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r6]
adds r0, r5
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -63766,7 +63767,7 @@ sub_802A010: ; 802A010
@0802A04E:
ldr r0, =gUnknown_082F7BD4
mov r9, r0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r7]
ldr r4, =0x00003008
adds r1, r4
@@ -63775,7 +63776,7 @@ sub_802A010: ; 802A010
add r1, r9
mov r8, r1
mov r0, r8
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r7]
ldr r2, =0x00003009
adds r1, r2
@@ -63783,12 +63784,12 @@ sub_802A010: ; 802A010
ldr r0, [r7]
adds r0, r4
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r7]
ldr r3, =0x00003009
adds r0, r3
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
mov r0, r9
bl sub_8029174
mov r0, r8
@@ -63815,14 +63816,14 @@ sub_802A010: ; 802A010
adds r0, r2, r3
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r7]
ldr r1, =0x00003009
mov r10, r1
add r0, r10
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -63878,12 +63879,12 @@ sub_802A010: ; 802A010
add r0, r8
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, [r7]
ldr r2, =0x00003014
adds r1, r2
@@ -63898,12 +63899,12 @@ sub_802A010: ; 802A010
ldr r3, =0x00003008
adds r0, r3
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r7]
ldr r1, =0x00003009
adds r0, r1
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@0802A1B6:
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
@@ -63925,7 +63926,7 @@ sub_802A010: ; 802A010
adds r0, r2, r0
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
@@ -63975,7 +63976,7 @@ sub_802A010: ; 802A010
add r0, r8
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x030022c0
ldrh r1, [r0, 0x2E]
movs r5, 0x1
@@ -64058,21 +64059,21 @@ sub_802A010: ; 802A010
ldr r6, =0x00003008
adds r0, r6
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r7]
ldr r1, =0x00003009
adds r0, r1
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r7]
adds r0, r6
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
ldr r0, [r7]
ldr r2, =0x00003009
adds r0, r2
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -64146,7 +64147,7 @@ sub_802A380: ; 802A380
@0802A3D8:
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, [r5]
ldr r0, =0x00003014
adds r1, r0
@@ -64229,7 +64230,7 @@ sub_802A454: ; 802A454
@0802A482:
ldr r4, =gUnknown_082F7BEC
adds r0, r4, 0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r5]
ldr r2, =0x00003008
adds r1, r2
@@ -64237,7 +64238,7 @@ sub_802A454: ; 802A454
ldr r0, [r5]
adds r0, r2
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
adds r0, r4, 0
bl sub_8029174
b @0802A510
@@ -64247,7 +64248,7 @@ sub_802A454: ; 802A454
adds r0, r2, r4
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -64265,7 +64266,7 @@ sub_802A454: ; 802A454
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, [r5]
ldr r0, =0x00003014
adds r1, r0
@@ -64280,7 +64281,7 @@ sub_802A454: ; 802A454
ldr r1, =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@0802A50A:
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
@@ -64316,11 +64317,11 @@ sub_802A534: ; 802A534
ldr r4, =0x00003008
adds r0, r4
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -64372,7 +64373,7 @@ sub_802A588: ; 802A588
@0802A5BA:
ldr r4, =gUnknown_082F7BE4
adds r0, r4, 0
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r6]
ldr r2, =0x00003008
adds r1, r2
@@ -64380,7 +64381,7 @@ sub_802A588: ; 802A588
ldr r0, [r6]
adds r0, r2
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
adds r0, r4, 0
bl sub_8029174
ldr r1, [r6]
@@ -64407,7 +64408,7 @@ sub_802A588: ; 802A588
adds r0, r1, r4
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
@@ -64425,7 +64426,7 @@ sub_802A588: ; 802A588
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, [r6]
ldr r2, =0x00003014
adds r1, r2
@@ -64440,7 +64441,7 @@ sub_802A588: ; 802A588
ldr r1, =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@0802A66E:
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
@@ -64477,11 +64478,11 @@ sub_802A588: ; 802A588
ldr r4, =0x00003008
adds r0, r4
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -69828,7 +69829,7 @@ sub_802D074: ; 802D074
thumb_func_start sub_802D0AC
sub_802D0AC: ; 802D0AC
push {lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl sub_8034CC8
pop {r0}
bx r0
@@ -69951,7 +69952,7 @@ sub_802D150: ; 802D150
movs r2, 0x4
bl bg_vram_setup
ldr r0, =gUnknown_082FE174
- bl Window_InitFromTemplates
+ bl InitWindows
bl reset_temp_tile_data_buffers
ldr r0, [r6]
bl sub_802C974
@@ -70214,7 +70215,7 @@ sub_802D3BC: ; 802D3BC
adds r0, 0x1C
adds r0, r1
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
adds r4, 0x1
cmp r4, r5
blt @0802D3E2
@@ -70243,7 +70244,7 @@ sub_802D3BC: ; 802D3BC
adds r0, 0x1C
adds r0, r1
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
adds r4, 0x1
cmp r4, r5
blt @0802D420
@@ -70300,7 +70301,7 @@ sub_802D448: ; 802D448
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0802D4D2
.pool
@0802D4A4:
@@ -70310,7 +70311,7 @@ sub_802D448: ; 802D448
bne @0802D4EC
ldr r0, [r5]
ldrb r0, [r0, 0x12]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x1
@@ -70384,7 +70385,7 @@ sub_802D4F4: ; 802D4F4
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0802D574
.pool
@0802D550:
@@ -70394,7 +70395,7 @@ sub_802D4F4: ; 802D4F4
bne @0802D58E
ldr r0, [r5]
ldrb r0, [r0, 0x12]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x1
@@ -70502,7 +70503,7 @@ sub_802D5E4: ; 802D5E4
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0802D664
.pool
@0802D640:
@@ -70512,7 +70513,7 @@ sub_802D5E4: ; 802D5E4
bne @0802D67E
ldr r0, [r5]
ldrb r0, [r0, 0x12]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x1
@@ -70582,7 +70583,7 @@ sub_802D688: ; 802D688
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0802D708
.pool
@0802D6E4:
@@ -70592,7 +70593,7 @@ sub_802D688: ; 802D688
bne @0802D722
ldr r0, [r5]
ldrb r0, [r0, 0x12]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x1
@@ -70781,7 +70782,7 @@ sub_802D7E8: ; 802D7E8
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, [r5]
ldr r0, =0x0000016f
strh r0, [r1, 0x14]
@@ -70835,7 +70836,7 @@ sub_802D884: ; 802D884
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r4]
strh r5, [r0, 0x14]
strb r6, [r0, 0xD]
@@ -70888,7 +70889,7 @@ sub_802D8FC: ; 802D8FC
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r4]
strh r5, [r0, 0x14]
strb r6, [r0, 0xD]
@@ -70926,7 +70927,7 @@ sub_802D974: ; 802D974
bne @0802DA0C
ldr r0, [r4]
ldrb r0, [r0, 0x12]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x1
@@ -70995,7 +70996,7 @@ sub_802DA14: ; 802DA14
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, [r4]
movs r0, 0
strb r0, [r1, 0xD]
@@ -71028,7 +71029,7 @@ sub_802DA44: ; 802DA44
bne @0802DA82
ldr r0, [r4]
ldrb r0, [r0, 0x12]
- bl Window_Remove
+ bl RemoveWindow
ldr r1, [r4]
movs r0, 0xFF
strh r0, [r1, 0x12]
@@ -71095,14 +71096,14 @@ sub_802DA9C: ; 802DA9C
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
lsls r0, r4, 24
lsrs r0, 24
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
add sp, 0x8
pop {r4-r6}
@@ -71171,15 +71172,15 @@ sub_802DB8C: ; 802DB8C
movs r2, 0x3
bl memcpy
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
add r0, sp, 0xC
str r0, [sp]
movs r4, 0
@@ -71547,7 +71548,7 @@ sub_802DE1C: ; 802DE1C
orrs r0, r2
str r0, [sp]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, =0x02022d00
ldr r1, [r1]
lsls r2, r5, 1
@@ -71556,7 +71557,7 @@ sub_802DE1C: ; 802DE1C
strh r0, [r1]
lsls r0, 24
lsrs r0, 24
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrh r0, [r6, 0x6]
adds r0, 0x10
strh r0, [r6, 0x6]
@@ -71598,7 +71599,7 @@ sub_802DED8: ; 802DED8
add r0, r8
ldrb r0, [r0]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
lsls r5, 24
lsrs r5, 24
adds r0, r5, 0
@@ -71608,7 +71609,7 @@ sub_802DED8: ; 802DED8
negs r2, r2
mov r9, r2
movs r0, 0x1
- bl font_get_width_of_string
+ bl GetStringWidth
movs r4, 0x40
subs r4, r0
lsrs r4, 1
@@ -71635,7 +71636,7 @@ sub_802DED8: ; 802DED8
add r0, r8
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -71716,7 +71717,7 @@ sub_802DFD4: ; 802DFD4
adds r0, 0x1C
adds r0, r1
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r4, 0x1
cmp r4, r5
blt @0802DFE4
@@ -72292,7 +72293,7 @@ sub_802E3E4: ; 802E3E4
ldr r1, =gUnknown_085EDE8D
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r4, r0, 0
movs r6, 0
ldr r5, =gUnknown_082FE278
@@ -72300,7 +72301,7 @@ sub_802E3E4: ; 802E3E4
ldr r1, [r5]
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r0, 0x26
cmp r0, r4
ble @0802E442
@@ -72339,7 +72340,7 @@ sub_802E3E4: ; 802E3E4
orrs r0, r2
str r0, [sp]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r7, 0x2]
ldrh r0, [r7, 0x2]
adds r1, r4, 0
@@ -72366,7 +72367,7 @@ sub_802E3E4: ; 802E3E4
ldrb r0, [r7, 0x2]
movs r1, 0x1
@0802E4CA:
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0802E4CE:
ldrh r0, [r7]
adds r0, 0x1
@@ -72379,7 +72380,7 @@ sub_802E3E4: ; 802E3E4
cmp r0, 0
bne @0802E4F6
ldrb r0, [r7, 0x2]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r4, 0
bl remove_task
bl script_env_2_enable_and_set_ctx_running
@@ -72423,7 +72424,7 @@ sub_802E500: ; 802E500
bl sub_8098858
adds r0, r4, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EDE8D
ldr r1, [sp, 0x1C]
lsls r2, r1, 3
@@ -72483,7 +72484,7 @@ sub_802E500: ; 802E500
movs r0, 0x1
adds r1, r5, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
ldr r1, [sp, 0x1C]
lsls r3, r1, 3
subs r3, r0
@@ -72507,7 +72508,7 @@ sub_802E500: ; 802E500
cmp r6, 0x2
bls @0802E58A
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0x24
pop {r3-r5}
mov r8, r3
@@ -79987,8 +79988,8 @@ trs_config: ; 8035658
lsls r0, 2
adds r0, r1
ldr r0, [r0]
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
pop {r4}
pop {r0}
bx r0
@@ -84855,7 +84856,7 @@ sub_8038420: ; 8038420
sub sp, 0x4
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
bl run_active_tasks
ldr r0, =0x030022c0
@@ -84941,7 +84942,7 @@ sub_80384E4: ; 80384E4
ldr r0, =0x03007630
bl MPlayStop_rev01
bl sub_803849C
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x030022c0
ldr r0, [r0, 0x8]
bl set_callback2
@@ -86130,7 +86131,7 @@ sub_8038F14: ; 8038F14
bl sub_8038F34
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
bl run_active_tasks
pop {r0}
@@ -86263,7 +86264,7 @@ sub_8038F34: ; 8038F34
lsls r0, 24
cmp r0, 0
beq @08039074
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =sub_80392A8
bl set_callback2
b @080391C6
@@ -86360,7 +86361,7 @@ sub_8038F34: ; 8038F34
.pool
@0803914C:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @080391C6
@@ -86593,7 +86594,7 @@ sub_803937C: ; 803937C
bl sub_803939C
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
bl run_active_tasks
pop {r0}
@@ -86698,7 +86699,7 @@ sub_803939C: ; 803939C
.pool
@0803949C:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -86927,7 +86928,7 @@ sub_803939C: ; 803939C
cmp r0, 0x1
bne @0803975E
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0803975E
@@ -86958,7 +86959,7 @@ sub_803939C: ; 803939C
.pool
@08039704:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -95083,7 +95084,7 @@ sub_803DE40: ; 803DE40
ldr r0, =bc_evolution_cutscene
str r0, [r1]
@0803DE86:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x02022fec
ldr r0, [r0]
movs r1, 0x2
@@ -95133,7 +95134,7 @@ bc_evolution_cutscene: ; 803DEB4
lsrs r4, r0, 16
cmp r4, 0
beq @0803DF20
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x03005d04
ldr r1, =sub_803DF48
str r1, [r0]
@@ -124213,7 +124214,7 @@ sub_804E038: ; 804E038
beq @0804E170
b @0804E3B8
@0804E170:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x020244ec
ldr r1, =0x0202449c
ldr r1, [r1]
@@ -125865,10 +125866,10 @@ atk6C_8026208: ; 804EF04
@0804F000:
bl sub_804F100
movs r0, 0xD
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0xD
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0804F06A
@0804F014:
bl is_dma3_queue_busy_with_gpu_copy
@@ -125890,7 +125891,7 @@ atk6C_8026208: ; 804EF04
bl sub_804F144
movs r0, 0xD
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0804F06A
.pool
@0804F04C:
@@ -125920,15 +125921,15 @@ atk6C_8026208: ; 804EF04
cmp r0, 0
bne @0804F0F2
movs r0, 0xE
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0xE
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0xD
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0xD
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x7
movs r2, 0x2
@@ -126044,12 +126045,12 @@ sub_804F17C: ; 804F17C
movs r0, 0xE
movs r2, 0
movs r3, 0
- bl Window_CopyToPixels
+ bl CopyToWindowPixelBuffer
movs r0, 0xE
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0xE
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
bl sub_804F384
pop {r0}
bx r0
@@ -126166,7 +126167,7 @@ sub_804F220: ; 804F220
strb r4, [r0, 0xD]
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
movs r0, 0xF9
strb r0, [r5]
adds r5, 0x1
@@ -126226,10 +126227,10 @@ sub_804F220: ; 804F220
strb r1, [r0, 0x9]
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
movs r0, 0xE
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r3}
mov r8, r3
@@ -127256,7 +127257,7 @@ sub_804F7AC: ; 804F7AC
.pool
@0804FC60:
movs r0, 0x16
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
b @0804FD24
@0804FC6A:
@@ -139797,7 +139798,7 @@ sub_80568CC: ; 80568CC
beq @08056938
b @08056A2C
@08056938:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl SpeciesToNationalPokedexNum
lsls r0, 16
@@ -140270,7 +140271,7 @@ atkF3_receive_new_pokemon_maybe: ; 8056BEC
adds r2, 0x6D
movs r1, 0x2
bl pokemon_getattr
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
mov r2, r10
ldrb r0, [r2]
eors r0, r4
@@ -143197,7 +143198,7 @@ sub_80586F8: ; 80586F8
bne @08058738
bl sub_817E3F4
@08058738:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
b @08058798
.pool
@0805875C:
@@ -143226,7 +143227,7 @@ sub_80586F8: ; 80586F8
bne @08058794
bl sub_817E3F4
@08058794:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
@08058798:
pop {r0}
bx r0
@@ -144353,7 +144354,7 @@ bx_t1_healthbar_update: ; 8059130
sub_80591A0: ; 80591A0
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @080591B2
@@ -145039,7 +145040,7 @@ sub_8059744: ; 8059744
sub_80597B4: ; 80597B4
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @080597C6
@@ -145076,7 +145077,7 @@ sub_80597CC: ; 80597CC
adds r1, r3
ldrb r4, [r1, 0x8]
bl remove_task
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl sub_81B89AC
@0805980A:
@@ -145154,7 +145155,7 @@ sub_80598A4: ; 80598A4
ldr r1, =sub_80598E0
str r1, [r0]
bl nullsub_35
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl sub_81AABB0
@080598CC:
pop {r0}
@@ -156438,7 +156439,7 @@ sub_805FB08: ; 805FB08
bx_t7_button_a: ; 805FB7C
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0805FB8E
@@ -165849,7 +165850,7 @@ sub_8064C58: ; 8064C58
sub_8064CCC: ; 8064CCC
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @08064CDE
@@ -190019,7 +190020,7 @@ sub_807109C: ; 807109C
mov r0, sp
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
add sp, 0x10
pop {r4-r6}
pop {r0}
@@ -190194,7 +190195,7 @@ c3_080469FC: ; 8071204
movs r1, 0x1
bl sub_819746C
ldrb r0, [r4, 0xA]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r5, 0
bl remove_task
bl script_env_2_enable_and_set_ctx_running
@@ -190216,7 +190217,7 @@ c3_080469FC: ; 8071204
movs r1, 0x1
bl sub_819746C
ldrb r0, [r4, 0xA]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r5, 0
bl remove_task
bl script_env_2_enable_and_set_ctx_running
@@ -190232,7 +190233,7 @@ sub_80712C0: ; 80712C0
push {r4,r5,lr}
sub sp, 0x18
ldr r0, =gUnknown_0832B6C0
- bl Window_AddFromTemplate
+ bl AddWindow
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -190255,7 +190256,7 @@ sub_80712C0: ; 80712C0
lsrs r5, 24
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =c3_080469FC
movs r1, 0x3
bl AddTask
@@ -190878,7 +190879,7 @@ c1_hatching_egg: ; 80717A0
adds r1, r0, 0
movs r0, 0
bl bg_set_tilemap
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
bl sub_80A1A74
bl gpu_pal_allocator_reset
bl reset_all_obj_data
@@ -190889,7 +190890,7 @@ c1_hatching_egg: ; 80717A0
.pool
@080718B8:
ldr r0, =gUnknown_0832C06C
- bl Window_InitFromTemplates
+ bl InitWindows
ldr r0, =0x03000de0
ldr r1, [r0]
movs r0, 0
@@ -190996,7 +190997,7 @@ c1_hatching_egg: ; 80717A0
strb r0, [r1, 0x2]
@080719D6:
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -191152,7 +191153,7 @@ sub_8071A94: ; 8071A94
ldr r0, [r5]
ldrb r0, [r0, 0x8]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r5]
strb r4, [r0, 0x3]
ldr r1, [r5]
@@ -191272,11 +191273,11 @@ sub_8071A94: ; 8071A94
strb r0, [r1, 0x2]
ldr r0, [r5]
ldrb r0, [r0, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r5]
ldrb r0, [r0, 0x8]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @08071E06
.pool
@08071C88:
@@ -191322,7 +191323,7 @@ sub_8071A94: ; 8071A94
@08071CE8:
ldr r0, [r5]
ldrb r0, [r0, 0x8]
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @08071CF8
@@ -191436,7 +191437,7 @@ sub_8071A94: ; 8071A94
ldr r4, =0x03000de0
ldr r0, [r4]
ldrb r0, [r0, 0x8]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl bg_unset_tilemap
movs r0, 0x1
@@ -191447,7 +191448,7 @@ sub_8071A94: ; 8071A94
bl set_callback2
@08071E06:
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -191978,7 +191979,7 @@ sub_8072214: ; 8072214
lsrs r4, 24
adds r0, r5, 0
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r3, =0x03000de0
ldr r0, [r3]
movs r2, 0
@@ -193400,7 +193401,7 @@ heathbar_draw_hp: ; 8072C38
ldr r0, [r0]
movs r1, 0x9
add r2, sp, 0x4
- bl font_render_some
+ bl RenderTextFont9
movs r4, 0
ldr r1, =0x02020630
mov r2, r10
@@ -193619,7 +193620,7 @@ sub_8072E0C: ; 8072E0C
ldr r0, [r0]
movs r1, 0x9
add r2, sp, 0x4
- bl font_render_some
+ bl RenderTextFont9
adds r4, r6, 0
adds r0, r4, 0x3
cmp r4, r0
@@ -193808,7 +193809,7 @@ sub_80730D4: ; 80730D4
adds r0, r6, 0
movs r1, 0x9
mov r2, sp
- bl font_render_some
+ bl RenderTextFont9
movs r7, 0x6
movs r5, 0
mov r2, sp
@@ -193960,7 +193961,7 @@ sub_80730D4: ; 80730D4
ldr r0, [r0]
movs r1, 0x9
mov r2, sp
- bl font_render_some
+ bl RenderTextFont9
movs r7, 0
lsls r0, r4, 4
adds r0, r4
@@ -197625,7 +197626,7 @@ write_to_rbox: ; 8075094
str r0, [sp, 0x18]
str r1, [sp, 0x1C]
add r0, sp, 0x18
- bl Window_AddFromTemplate
+ bl AddWindow
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -197636,7 +197637,7 @@ write_to_rbox: ; 8075094
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
add r0, sp, 0x14
movs r2, 0
strb r5, [r0]
@@ -197669,7 +197670,7 @@ write_to_rbox: ; 8075094
str r4, [r7]
adds r0, r6, 0
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -197686,7 +197687,7 @@ sub_807512C: ; 807512C
push {lr}
lsls r0, 24
lsrs r0, 24
- bl Window_Remove
+ bl RemoveWindow
pop {r0}
bx r0
thumb_func_end sub_807512C
@@ -201817,20 +201818,20 @@ sub_80772A4: ; 80772A4
movs r0, 0x1
bl bg_set_tilemap
ldr r0, =gUnknown_0832DEF4
- bl Window_InitFromTemplates
+ bl InitWindows
lsls r0, 16
cmp r0, 0
beq @0807738C
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
movs r5, 0
@08077310:
lsls r4, r5, 24
lsrs r4, 24
adds r0, r4, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r5, 0x1
cmp r5, 0x11
bls @08077310
@@ -202697,7 +202698,7 @@ sub_80773D0: ; 80773D0
ldr r0, =sub_807825C
bl set_callback2
@08077B46:
- bl run_remoboxes
+ bl RunTextPrinters
bl run_active_tasks
bl call_obj_callbacks
bl obj_sync_something
@@ -202824,7 +202825,7 @@ sub_8077B74: ; 8077B74
adds r0, 0x37
strb r1, [r0]
movs r0, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0
bl sub_8079BE0
movs r0, 0x1
@@ -203428,7 +203429,7 @@ sub_80781C8: ; 80781C8
ldr r0, =0x02032184
ldr r0, [r0]
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x0203229c
ldr r0, [r0]
bl free
@@ -203447,7 +203448,7 @@ sub_80781C8: ; 80781C8
ldr r0, =0x02032184
ldr r0, [r0]
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x0203229c
ldr r0, [r0]
bl free
@@ -204849,7 +204850,7 @@ sub_8078DBC: ; 8078DBC
bl sub_8098858
movs r0, 0x1
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_0832DEAC
movs r0, 0x1
movs r1, 0x2
@@ -204859,10 +204860,10 @@ sub_8078DBC: ; 8078DBC
movs r2, 0
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r4]
adds r0, 0x6F
movs r1, 0x1
@@ -205124,7 +205125,7 @@ sub_807905C: ; 807905C
movs r0, 0x1
bl sub_81BF8EC
@080790C0:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
@080790C4:
add sp, 0x4
pop {r0}
@@ -205336,7 +205337,7 @@ sub_8079218: ; 8079218
@08079258:
strb r1, [r0]
movs r0, 0x11
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @08079290
.pool
@08079268:
@@ -205356,7 +205357,7 @@ sub_8079218: ; 8079218
movs r1, 0x64
strb r1, [r0]
movs r0, 0x11
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@08079290:
pop {r0}
bx r0
@@ -205379,10 +205380,10 @@ sub_807929C: ; 807929C
@080792B2:
lsrs r4, r6, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x80
lsls r0, 17
adds r6, r0
@@ -205564,7 +205565,7 @@ sub_8079408: ; 8079408
lsrs r4, r5, 24
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
bl rbox_fill_rectangle
movs r0, 0x80
@@ -205653,7 +205654,7 @@ sub_80794CC: ; 80794CC
ldr r0, =0x0203229c
ldr r0, [r0]
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl sub_800E084
ldr r0, =c2_8056854
bl set_callback2
@@ -205670,7 +205671,7 @@ sub_80794CC: ; 80794CC
ldr r0, =0x0203229c
ldr r0, [r0]
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =c2_8056854
bl set_callback2
@0807953A:
@@ -205954,7 +205955,7 @@ sub_80796B4: ; 80796B4
adds r0, r4
lsls r0, 24
lsrs r0, 24
- bl Window_FillTileMap
+ bl ClearWindowTileMap
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -206217,15 +206218,15 @@ sub_80796B4: ; 80796B4
movs r3, 0
bl sub_8199EEC
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x0203229c
ldr r1, [r0]
b @08079A1A
@@ -206304,13 +206305,13 @@ sub_8079A3C: ; 8079A3C
bl CopyString_Limit10
movs r0, 0
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
movs r0, 0
adds r1, r4, 0
- bl font_get_width_of_string
+ bl GetStringWidth
lsls r0, 24
lsrs r0, 24
add sp, 0xC
@@ -206456,10 +206457,10 @@ sub_8079B84: ; 8079B84
movs r3, 0x4
bl box_print
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -207193,7 +207194,7 @@ sub_807A19C: ; 807A19C
lsrs r4, 24
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =gUnknown_0832DEBC
lsls r4, 2
adds r4, r0
@@ -207212,10 +207213,10 @@ sub_807A19C: ; 807A19C
movs r2, 0xC
bl sub_8098858
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4}
pop {r0}
@@ -209128,7 +209129,7 @@ sub_807AE50: ; 807AE50
bl set_callback2
@0807B116:
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -209155,12 +209156,12 @@ sub_807B154: ; 807B154
push {lr}
movs r0, 0
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_807B154
@@ -209207,7 +209208,7 @@ sub_807B170: ; 807B170
adds r1, r0, 0
movs r0, 0x3
bl bg_set_tilemap
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
ldr r0, =gUnknown_08C00000
mov r10, r0
movs r0, 0
@@ -209233,7 +209234,7 @@ sub_807B170: ; 807B170
movs r2, 0x20
bl decompress_palette
ldr r0, =gUnknown_08338FFC
- bl Window_InitFromTemplates
+ bl InitWindows
mov r0, r9
str r0, [sp]
movs r0, 0
@@ -209407,12 +209408,12 @@ sub_807B270: ; 807B270
bl sub_807ACFC
movs r0, 0
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0807B424
@0807B3F0:
bl sub_807BA94
@@ -209447,7 +209448,7 @@ sub_807B270: ; 807B270
bl set_callback2
@0807B43E:
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -209661,7 +209662,7 @@ sub_807B60C: ; 807B60C
push {lr}
bl sub_807BBC8
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -210760,10 +210761,10 @@ sub_807BBEC: ; 807BBEC
bl sub_807B62C
movs r0, 0
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
bl @0807CF48
.pool
@0807C29C:
@@ -212261,7 +212262,7 @@ sub_807BBEC: ; 807BBEC
ldr r0, [r7]
cmp r0, 0
beq @0807CFAA
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x3
bl bg_get_tilemap
bl free
@@ -212822,10 +212823,10 @@ sub_807CFC8: ; 807CFC8
bl sub_807B62C
movs r0, 0
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
bl @0807E394
.pool
@0807D678:
@@ -214366,7 +214367,7 @@ sub_807CFC8: ; 807CFC8
ldr r0, [r7]
cmp r0, 0
beq @0807E3F6
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x3
bl bg_get_tilemap
bl free
@@ -215163,7 +215164,7 @@ sub_807EA2C: ; 807EA2C
bl sub_807B5B8
bl sub_807E4DC
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -215734,7 +215735,7 @@ c2_080543C4: ; 807F068
lsrs r5, r0, 24
cmp r5, 0
bne @0807F0BE
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x3
bl bg_get_tilemap
bl free
@@ -215874,7 +215875,7 @@ sub_807F1A8: ; 807F1A8
lsrs r4, 24
adds r0, r5, 0
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =0x020322a0
ldr r0, [r2]
adds r0, 0xF6
@@ -215905,7 +215906,7 @@ sub_807F1A8: ; 807F1A8
bl sub_8199EEC
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x14
pop {r4-r6}
pop {r0}
@@ -216818,17 +216819,17 @@ sub_807FA34: ; 807FA34
push {r4,lr}
sub sp, 0x8
ldr r0, =gUnknown_08339980
- bl Window_InitFromTemplates
+ bl InitWindows
lsls r0, 16
cmp r0, 0
beq @0807FA74
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
movs r4, 0
@0807FA4A:
lsls r0, r4, 24
lsrs r0, 24
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r4, 0x1
cmp r4, 0x4
ble @0807FA4A
@@ -217094,7 +217095,7 @@ sub_807FAC8: ; 807FAC8
lsrs r4, r0, 24
cmp r4, 0
bne @0807FCE2
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x2
bl bg_unset_tilemap
movs r0, 0x1
@@ -217109,7 +217110,7 @@ sub_807FAC8: ; 807FAC8
@0807FCE2:
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
add sp, 0x4
pop {r4-r6}
@@ -218083,7 +218084,7 @@ sub_8080018: ; 8080018
bl run_active_tasks
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
add sp, 0x4
pop {r4-r7}
@@ -218479,10 +218480,10 @@ sub_80807BC: ; 80807BC
@080808A6:
lsrs r4, r5, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@080808B6:
movs r2, 0x80
lsls r2, 17
@@ -219061,7 +219062,7 @@ sub_80808D4: ; 80808D4
bl run_active_tasks
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
add sp, 0x4
pop {r4-r7}
@@ -220357,7 +220358,7 @@ sub_8081898: ; 8081898
bl run_active_tasks
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
pop {r4-r6}
pop {r0}
@@ -221632,10 +221633,10 @@ sub_8081FC8: ; 8081FC8
cmp r0, 0xFF
beq @0808235C
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0808235C:
adds r0, r4, 0x1
lsls r0, 24
@@ -221665,10 +221666,10 @@ sub_8081FC8: ; 8081FC8
cmp r0, 0xFF
beq @0808239E
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0808239E:
adds r0, r4, 0x1
lsls r0, 24
@@ -221807,7 +221808,7 @@ sub_8081FC8: ; 8081FC8
bl run_active_tasks
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
pop {r3}
mov r8, r3
@@ -222211,7 +222212,7 @@ sub_8082644: ; 8082644
ldr r0, =0x00002222
cmp r1, r0
bne @08082898
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x2
bl bg_unset_tilemap
movs r0, 0x1
@@ -222277,7 +222278,7 @@ sub_8082644: ; 8082644
bl run_active_tasks
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
add sp, 0x4
pop {r4-r6}
@@ -222429,7 +222430,7 @@ sub_8082924: ; 8082924
ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
bl set_callback2
@08082A76:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x2
bl bg_unset_tilemap
movs r0, 0x1
@@ -222457,7 +222458,7 @@ sub_8082924: ; 8082924
bl run_active_tasks
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
pop {r4-r6}
pop {r0}
@@ -224037,7 +224038,7 @@ sub_8083450: ; 8083450
strb r0, [r1]
movs r0, 0x5
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @08083898
.pool
@08083790:
@@ -224081,10 +224082,10 @@ sub_8083450: ; 8083450
lsls r4, r6, 24
lsrs r4, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@080837EA:
adds r0, r6, 0x1
lsls r0, 16
@@ -224769,10 +224770,10 @@ sub_8083B08: ; 8083B08
b @08083C84
@08083D8A:
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x5
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x020322a4
ldr r1, [r0]
movs r3, 0x84
@@ -224843,14 +224844,14 @@ sub_8083E24: ; 8083E24
str r1, [sp, 0x30]
ldr r5, =0x0203ab74
add r0, sp, 0x2C
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0
bl sub_81973FC
ldrb r0, [r5]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r6, =gUnknown_085EE44F
movs r0, 0x1
adds r1, r6, 0
@@ -224934,10 +224935,10 @@ sub_8083E24: ; 8083E24
cmp r6, 0x2
ble @08083E8A
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x34
pop {r4-r7}
pop {r0}
@@ -225203,7 +225204,7 @@ sub_80840D4: ; 80840D4
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
@08084148:
movs r0, 0
str r0, [sp]
@@ -225259,17 +225260,17 @@ sub_808417C: ; 808417C
movs r3, 0x1
bl sub_80840D4
movs r0, 0x4
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x4
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
b @080841DA
@080841C6:
movs r0, 0x4
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -243769,7 +243770,7 @@ sub_808CC64: ; 808CC64
bl sub_808CF78
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EE903
movs r5, 0
str r5, [sp]
@@ -243807,13 +243808,13 @@ fishA_wait_for_a_pressed: ; 808CCA8
bne @0808CCBC
bl sub_808CF78
@0808CCBC:
- bl run_remoboxes
+ bl RunTextPrinters
movs r1, 0xA
ldrsh r0, [r5, r1]
cmp r0, 0
bne @0808CD58
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r6, r0, 16
cmp r6, 0
@@ -243926,7 +243927,7 @@ sub_808CD94: ; 808CD94
bl obj_anim_image_start
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EE91E
movs r0, 0
str r0, [sp]
@@ -243974,7 +243975,7 @@ sub_808CE04: ; 808CE04
bl obj_anim_image_start
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EE933
movs r0, 0
str r0, [sp]
@@ -244092,9 +244093,9 @@ sub_808CE8C: ; 808CE8C
thumb_func_start fishF
fishF: ; 808CF2C
push {lr}
- bl run_remoboxes
+ bl RunTextPrinters
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -269346,7 +269347,7 @@ copy_textbox_border_tile_patterns_to_vram: ; 809877C
lsls r5, 24
lsrs r5, 24
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_08DDD748
@@ -269397,7 +269398,7 @@ sub_80987D4: ; 80987D4
lsrs r1, 24
mov r8, r1
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0851021C
@@ -269464,25 +269465,25 @@ sub_8098858: ; 8098858
str r2, [sp, 0xC]
adds r0, r4, 0
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r7, r0, 24
adds r0, r4, 0
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
adds r0, r4, 0
movs r1, 0x2
- bl Window_GetField
+ bl GetWindowAttribute
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
adds r0, r4, 0
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
mov r9, r0
mov r2, r9
lsls r2, 16
@@ -269490,7 +269491,7 @@ sub_8098858: ; 8098858
mov r9, r2
adds r0, r4, 0
movs r1, 0x4
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x10]
@@ -269653,31 +269654,31 @@ sub_80989E0: ; 80989E0
mov r10, r2
adds r0, r4, 0
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r7, r0, 24
adds r0, r4, 0
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
adds r0, r4, 0
movs r1, 0x2
- bl Window_GetField
+ bl GetWindowAttribute
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
adds r0, r4, 0
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0x4
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0xC]
@@ -269841,14 +269842,14 @@ rbox_fill_rectangle: ; 8098B7C
lsrs r6, 24
adds r0, r6, 0
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
mov r9, r0
lsls r0, 24
lsrs r0, 24
mov r9, r0
adds r0, r6, 0
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
mov r8, r0
mov r1, r8
lsls r1, 16
@@ -269856,19 +269857,19 @@ rbox_fill_rectangle: ; 8098B7C
mov r8, r1
adds r0, r6, 0
movs r1, 0x2
- bl Window_GetField
+ bl GetWindowAttribute
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r6, 0
movs r1, 0x4
- bl Window_GetField
+ bl GetWindowAttribute
movs r1, 0x1
negs r1, r1
add r8, r1
@@ -274506,7 +274507,7 @@ sub_809AE6C: ; 809AE6C
negs r2, r2
movs r0, 0x6
adds r1, r4, 0
- bl font_get_width_of_string
+ bl GetStringWidth
lsrs r0, 3
lsls r0, 24
lsrs r7, r0, 24
@@ -274594,7 +274595,7 @@ sub_809AE6C: ; 809AE6C
str r1, [sp, 0x1C]
ldr r5, =0x03000f30
mov r0, r8
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0x85
@@ -274605,10 +274606,10 @@ sub_809AE6C: ; 809AE6C
movs r1, 0
bl sub_81973FC
ldrb r0, [r5]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r5]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r5]
ldr r2, =0x02021fc4
str r4, [sp]
@@ -274621,7 +274622,7 @@ sub_809AE6C: ; 809AE6C
bl Print
ldrb r0, [r5]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
add sp, 0x20
pop {r3}
@@ -276459,7 +276460,7 @@ sub_809BDB4: ; 809BDB4
movs r1, 0x1
bl sub_819746C
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -282236,7 +282237,7 @@ sub_809EBA0: ; 809EBA0
movs r1, 0
bl sub_8198070
adds r0, r4, 0
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
pop {r4}
@@ -282635,7 +282636,7 @@ sub_809EDE8: ; 809EDE8
bl sub_809EBC4
ldrb r0, [r5, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0809EEF4:
add sp, 0xC
pop {r3}
@@ -282677,7 +282678,7 @@ sub_809EF00: ; 809EF00
ldrsb r0, [r1, r0]
strh r0, [r5, 0xC]
ldr r0, =gUnknown_08510420
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r5, 0x10]
lsls r0, 24
lsrs r0, 24
@@ -282803,8 +282804,8 @@ sub_809F048: ; 809F048
movs r0, 0
bl gpu_sync_bg_show
ldr r0, =gUnknown_08510408
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
bl sub_81973A4
pop {r0}
bx r0
@@ -282943,7 +282944,7 @@ sub_809F0F8: ; 809F0F8
bl sub_809F0C0
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldrh r0, [r6]
@@ -283191,7 +283192,7 @@ sub_809F200: ; 809F200
bne @0809F404
adds r0, r4, 0
bl remove_task
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl do_reset
@0809F404:
add sp, 0x4
@@ -283462,10 +283463,10 @@ sub_809F654: ; 809F654
sub sp, 0xC
ldr r4, =0x0203760c
ldr r0, =gUnknown_08510508
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
@@ -283492,7 +283493,7 @@ sub_809F654: ; 809F654
bl Print
ldrb r0, [r4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -283519,11 +283520,11 @@ sub_809F6C8: ; 809F6C8
ldr r4, =0x0203760d
ldr r0, =gUnknown_08510530
@0809F6F4:
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldr r4, =0x0203760d
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
@@ -283555,7 +283556,7 @@ sub_809F6C8: ; 809F6C8
bl Print
ldrb r0, [r4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -283575,9 +283576,9 @@ sub_809F774: ; 809F774
bl sub_8198070
ldrb r0, [r4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
@0809F796:
bl sub_81A9E40
lsls r0, 24
@@ -283588,7 +283589,7 @@ sub_809F774: ; 809F774
movs r1, 0
bl sub_8198070
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
@0809F7B0:
pop {r4}
pop {r0}
@@ -283794,7 +283795,7 @@ sub_809F894: ; 809F894
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
b @0809F98E
.pool
@@ -284910,7 +284911,7 @@ sub_80A024C: ; 80A024C
sub_80A02B0: ; 80A02B0
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @080A02CA
@@ -284951,7 +284952,7 @@ sub_80A02D8: ; 80A02D8
sub_80A02FC: ; 80A02FC
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @080A0316
@@ -285161,7 +285162,7 @@ sub_80A03E4: ; 80A03E4
movs r2, 0x1
bl bg_vram_setup
ldr r0, =gUnknown_085105AC
- bl Window_InitFromTemplates
+ bl InitWindows
movs r0, 0
movs r1, 0x8
movs r2, 0xE0
@@ -285272,7 +285273,7 @@ sub_80A0550: ; 80A0550
@080A05AC:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_082C8959
movs r4, 0
str r4, [sp]
@@ -285291,10 +285292,10 @@ sub_80A0550: ; 80A0550
movs r2, 0xE
bl sub_8098858
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
negs r0, r0
str r4, [sp]
@@ -285354,7 +285355,7 @@ sub_80A0550: ; 80A0550
movs r0, 0x4
b @080A06A6
@080A0670:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x030022c0
ldr r0, [r0, 0x8]
bl set_callback2
@@ -285418,7 +285419,7 @@ sub_80A06B4: ; 80A06B4
@080A06EC:
ldr r6, =0x02037622
add r0, sp, 0xC
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6]
ldrb r0, [r6]
movs r1, 0
@@ -285573,7 +285574,7 @@ sub_80A06B4: ; 80A06B4
bl Print
ldrb r0, [r6]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -285593,7 +285594,7 @@ sub_80A0888: ; 80A0888
movs r1, 0
bl sub_819746C
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -303560,7 +303561,7 @@ task_title_screen_3: ; 80AAD64
movs r2, 0
movs r3, 0x10
bl sub_80A1AD4
- ldr r0, =c2_title_menu_1
+ ldr r0, =Cb2_GoToMainMenu
bl set_callback2
b @080AAE98
.pool
@@ -303672,20 +303673,20 @@ task_title_screen_3: ; 80AAD64
.pool
thumb_func_end task_title_screen_3
- thumb_func_start c2_title_menu_1
-c2_title_menu_1: ; 80AAEB8
+ thumb_func_start Cb2_GoToMainMenu
+Cb2_GoToMainMenu: ; 80AAEB8
push {lr}
bl fade_and_return_progress_probably
lsls r0, 24
cmp r0, 0
bne @080AAECA
- ldr r0, =c2_title_menu_2
+ ldr r0, =CB2_InitMainMenu
bl set_callback2
@080AAECA:
pop {r0}
bx r0
.pool
- thumb_func_end c2_title_menu_1
+ thumb_func_end Cb2_GoToMainMenu
thumb_func_start c2_show_copyright_and_intro_again_1
c2_show_copyright_and_intro_again_1: ; 80AAED4
@@ -315681,7 +315682,7 @@ sub_80B11A8: ; 80B11A8
ldr r1, =0x030022c0
ldr r0, =sub_80B1204
str r0, [r1, 0x8]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =sub_8036760
bl set_callback2
bl prev_quest_postbuffer_cursor_backup_reset
@@ -317902,7 +317903,7 @@ sub_80B23B0: ; 80B23B0
bl Print
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -317921,7 +317922,7 @@ sub_80B241C: ; 80B241C
bl sub_819746C
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -318203,7 +318204,7 @@ sub_80B2634: ; 80B2634
bl sub_800AB98
bl sub_800A2BC
ldr r0, =gUnknown_08550594
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0xA]
b @080B2678
.pool
@@ -318920,7 +318921,7 @@ sub_80B2CB0: ; 80B2CB0
bl sub_80B241C
bl script_env_2_enable_and_set_ctx_running
ldrb r0, [r4, 0x12]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r5, 0
bl remove_task
@080B2CDE:
@@ -318948,7 +318949,7 @@ sub_80B2CEC: ; 80B2CEC
bl sub_80B241C
bl sub_8098374
ldrb r0, [r4, 0x12]
- bl Window_Remove
+ bl RemoveWindow
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
bl remove_task
@@ -318975,7 +318976,7 @@ sub_80B2D2C: ; 80B2D2C
ldrh r0, [r4, 0x12]
bl sub_80B241C
ldrb r0, [r4, 0x12]
- bl Window_Remove
+ bl RemoveWindow
bl textbox_close
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
@@ -333917,8 +333918,8 @@ c2_options_menu: ; 80BA4DC
movs r2, 0
bl bg_change_y_offset
ldr r0, =gUnknown_0855C680
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0x40
movs r1, 0
bl lcd_io_set
@@ -334005,7 +334006,7 @@ c2_options_menu: ; 80BA4DC
.pool
@080BA728:
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
bl sub_80BB0D0
ldr r1, =0x030022c0
movs r0, 0x87
@@ -334020,7 +334021,7 @@ c2_options_menu: ; 80BA4DC
b @080BA7F4
@080BA748:
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
bl sub_80BB104
ldr r1, =0x030022c0
movs r2, 0x87
@@ -334088,7 +334089,7 @@ c2_options_menu: ; 80BA4DC
bl sub_80BAB38
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@080BA7EC:
ldr r1, =0x030022c0
movs r2, 0x87
@@ -334382,7 +334383,7 @@ sub_80BA86C: ; 80BA86C
strb r0, [r1]
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@080BAA5A:
pop {r4-r7}
pop {r0}
@@ -334483,7 +334484,7 @@ sub_80BAB08: ; 80BAB08
bne @080BAB2C
adds r0, r2, 0
bl remove_task
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x030022c0
ldr r0, [r0, 0x8]
bl set_callback2
@@ -334657,20 +334658,20 @@ sub_80BAC38: ; 80BAC38
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r4, r0, 0
ldr r0, =gUnknown_085EE5DF
mov r8, r0
movs r0, 0x1
mov r1, r8
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r5, r0, 0
ldr r6, =gUnknown_085EE5E9
movs r0, 0x1
adds r1, r6, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
subs r5, 0x5E
subs r4, r5
subs r4, r0
@@ -335146,20 +335147,20 @@ sub_80BB028: ; 80BB028
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r4, r0, 0
ldr r0, =gUnknown_085EE654
mov r8, r0
movs r0, 0x1
mov r1, r8
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r5, r0, 0
ldr r6, =gUnknown_085EE65D
movs r0, 0x1
adds r1, r6, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
subs r5, 0x5E
subs r4, r5
subs r4, r0
@@ -335202,7 +335203,7 @@ sub_80BB0D0: ; 80BB0D0
sub sp, 0xC
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EE589
movs r0, 0x1
str r0, [sp]
@@ -335215,7 +335216,7 @@ sub_80BB0D0: ; 80BB0D0
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r0}
bx r0
@@ -335228,7 +335229,7 @@ sub_80BB104: ; 80BB104
sub sp, 0xC
movs r0, 0x1
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r4, 0
ldr r5, =gUnknown_0855C664
@080BB114:
@@ -335255,7 +335256,7 @@ sub_80BB104: ; 80BB104
bls @080BB114
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -337548,13 +337549,13 @@ sub_80BC514: ; 80BC514
lsrs r0, 31
bl sub_80BC844
ldr r0, =gUnknown_0855D2A8
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x030022c0
movs r2, 0x87
lsls r2, 3
@@ -337751,7 +337752,7 @@ sub_80BC844: ; 80BC844
thumb_func_start sub_80BC890
sub_80BC890: ; 80BC890
push {lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
bl bg_get_tilemap
cmp r0, 0
@@ -338803,7 +338804,7 @@ sub_80BCE84: ; 80BCE84
@080BD13E:
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -338904,7 +338905,7 @@ sub_80BD1F4: ; 80BD1F4
movs r0, 0x10
str r0, [sp, 0x4]
movs r0, 0
- bl Window_CopyWholePixelBlockToWindow
+ bl BlitSurfaceToWindow
b @080BD234
.pool
@080BD220:
@@ -338916,7 +338917,7 @@ sub_80BD1F4: ; 80BD1F4
str r0, [sp, 0x4]
movs r0, 0
movs r1, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
@080BD234:
add sp, 0x8
pop {r4}
@@ -338980,7 +338981,7 @@ sub_80BD28C: ; 80BD28C
str r0, [sp, 0x4]
movs r0, 0
movs r1, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
add sp, 0x8
pop {r0}
bx r0
@@ -341654,8 +341655,8 @@ sub_80BE91C: ; 80BE91C
movs r0, 0
bl bg_set_tilemap
ldr r0, =gUnknown_0856E640
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
adds r0, r5, 0
pop {r4,r5}
pop {r1}
@@ -341812,11 +341813,11 @@ sub_80BEA24: ; 80BEA24
bl gpu_copy_to_wram_bg_tile_map
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, =0x02039b54
ldr r0, [r0]
ldrh r1, [r0]
@@ -341824,7 +341825,7 @@ sub_80BEA24: ; 80BEA24
bl sub_80C0D30
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =0x030022c0
movs r3, 0x87
lsls r3, 3
@@ -341889,7 +341890,7 @@ sub_80BEA24: ; 80BEA24
@080BEBD0:
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
bl gpu_copy_wram_bg_tilemap_to_vram
movs r0, 0x2
@@ -342094,7 +342095,7 @@ sub_80BEA24: ; 80BEA24
thumb_func_start sub_80BEDB0
sub_80BEDB0: ; 80BEDB0
push {lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
bl bg_get_tilemap
cmp r0, 0
@@ -342700,13 +342701,13 @@ sub_80BF250: ; 80BF250
bl gpu_copy_to_wram_bg_tile_map
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =0x030022c0
movs r3, 0x87
lsls r3, 3
@@ -342869,10 +342870,10 @@ sub_80BF250: ; 80BF250
@080BF4D8:
movs r0, 0x3
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
movs r0, 0x1
@@ -343299,9 +343300,9 @@ sub_80BF82C: ; 80BF82C
bl gpu_copy_to_wram_bg_tile_map
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @080BFB4E
.pool
@080BF910:
@@ -343485,7 +343486,7 @@ sub_80BF82C: ; 80BF82C
strh r6, [r0, 0x10]
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
bl gpu_copy_wram_bg_tilemap_to_vram
movs r0, 0x2
@@ -343959,8 +343960,8 @@ sub_80BFE38: ; 80BFE38
movs r0, 0x2
bl bg_set_tilemap
ldr r0, =gUnknown_0856E670
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
@@ -343986,11 +343987,11 @@ sub_80BFE38: ; 80BFE38
bl gpu_copy_to_wram_bg_tile_map
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, =0x03005e00
lsls r4, r5, 2
adds r4, r5
@@ -344001,7 +344002,7 @@ sub_80BFE38: ; 80BFE38
bl sub_80C0D30
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
bl sub_80A1A74
movs r0, 0
bl sub_80BC844
@@ -344025,7 +344026,7 @@ sub_80BFE38: ; 80BFE38
bl sub_80C020C
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x2
bl gpu_copy_wram_bg_tilemap_to_vram
movs r0, 0x3
@@ -344213,7 +344214,7 @@ blockset_load_palette_to_gpu: ; 80C012C
lsls r1, 5
movs r0, 0
bl lcd_io_set
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x2
bl bg_get_tilemap
cmp r0, 0
@@ -345792,7 +345793,7 @@ sub_80C0D30: ; 80C0D30
mov r1, sp
movs r2, 0x80
movs r3, 0
- bl Window_CopyToPixels
+ bl CopyToWindowPixelBuffer
add sp, 0x80
pop {r3}
mov r8, r3
@@ -346476,7 +346477,7 @@ sub_80C12B0: ; 80C12B0
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -346558,10 +346559,10 @@ sub_80C12E0: ; 80C12E0
movs r0, 0
bl bg_set_tilemap
ldr r0, =gUnknown_0856F008
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =gUnknown_08DC3304
movs r2, 0x80
lsls r2, 6
@@ -346629,7 +346630,7 @@ sub_80C12E0: ; 80C12E0
bl sub_80C20F8
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
bl gpu_copy_wram_bg_tilemap_to_vram
movs r0, 0x2
@@ -346716,7 +346717,7 @@ sub_80C12E0: ; 80C12E0
thumb_func_start sub_80C152C
sub_80C152C: ; 80C152C
push {lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
bl bg_get_tilemap
cmp r0, 0
@@ -346762,7 +346763,7 @@ sub_80C1570: ; 80C1570
bl sub_80C20F8
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
ldr r0, =sub_80C15B0
@@ -346865,7 +346866,7 @@ sub_80C15B0: ; 80C15B0
bl sub_80C2040
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
@080C167C:
@@ -346894,7 +346895,7 @@ sub_80C15B0: ; 80C15B0
bl sub_80C2040
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
@080C16BC:
@@ -346922,7 +346923,7 @@ sub_80C16CC: ; 80C16CC
bl sub_80C20F8
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
ldr r0, =sub_80C170C
@@ -347061,7 +347062,7 @@ sub_80C170C: ; 80C170C
bl audio_play
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @080C1994
.pool
@080C1860:
@@ -347100,7 +347101,7 @@ sub_80C170C: ; 80C170C
bl sub_80C2064
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
@080C18B6:
@@ -347134,7 +347135,7 @@ sub_80C170C: ; 80C170C
bl sub_80C2064
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
@080C1900:
@@ -347168,7 +347169,7 @@ sub_80C170C: ; 80C170C
bl sub_80C2064
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
@080C194A:
@@ -347202,7 +347203,7 @@ sub_80C170C: ; 80C170C
bl sub_80C2064
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
@080C1994:
@@ -347326,7 +347327,7 @@ sub_80C1A4C: ; 80C1A4C
str r0, [r1]
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@080C1AA6:
pop {r4}
pop {r0}
@@ -347440,7 +347441,7 @@ sub_80C1B64: ; 80C1B64
str r0, [r6]
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
pop {r4-r6}
@@ -347512,7 +347513,7 @@ sub_80C1BCC: ; 80C1BCC
str r0, [r5]
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
bl gpu_copy_wram_bg_tilemap_to_vram
b @080C1D2E
@@ -347561,7 +347562,7 @@ sub_80C1BCC: ; 80C1BCC
bl sub_80C2618
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @080C1D2E
@080C1CCA:
movs r0, 0x80
@@ -347609,7 +347610,7 @@ sub_80C1BCC: ; 80C1BCC
bl sub_80C2618
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@080C1D2E:
pop {r3}
mov r8, r3
@@ -348875,7 +348876,7 @@ sub_80C2728: ; 80C2728
adds r0, r1
ldr r0, [r0]
bl set_callback2
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, [r5]
bl free
movs r0, 0
@@ -348936,7 +348937,7 @@ sub_80C2760: ; 80C2760
@080C27D8:
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
b @080C28D4
@080C27E2:
bl sub_80C3438
@@ -348953,7 +348954,7 @@ sub_80C2760: ; 80C2760
@080C27F8:
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
bl sub_80C4FF0
movs r0, 0x2
bl sub_80C438C
@@ -349213,7 +349214,7 @@ sub_80C2760: ; 80C2760
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x02039ce8
ldr r1, [r0]
movs r0, 0x10
@@ -350325,8 +350326,8 @@ sub_80C3388: ; 80C3388
movs r2, 0
bl bg_change_y_offset
ldr r0, =gUnknown_0856FAC4
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
bl sub_81973A4
pop {r0}
bx r0
@@ -350899,7 +350900,7 @@ sub_80C3880: ; 80C3880
ldr r1, =gUnknown_085ECF8F
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
mov r10, r0
ldr r0, =0x02039ce8
ldr r0, [r0]
@@ -350929,7 +350930,7 @@ sub_80C3880: ; 80C3880
movs r0, 0x1
movs r1, 0
adds r3, r4, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldr r2, =0x02021fc4
mov r9, r2
mov r0, r9
@@ -351031,7 +351032,7 @@ sub_80C3A18: ; 80C3A18
adds r1, 0x19
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r2, r0, 0
adds r2, 0xE
lsls r2, 24
@@ -351067,7 +351068,7 @@ sub_80C3A18: ; 80C3A18
adds r1, 0x33
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r2, r0, 0
adds r2, 0xE
lsls r2, 24
@@ -352044,10 +352045,10 @@ sub_80C438C: ; 80C438C
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -352978,7 +352979,7 @@ sub_80C4B08: ; 80C4B08
@080C4B50:
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -353031,7 +353032,7 @@ sub_80C4B08: ; 80C4B08
@080C4BC4:
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
b @080C4BF6
@080C4BCE:
ldr r0, =0x02039ce8
@@ -353912,7 +353913,7 @@ sub_80C5310: ; 80C5310
thumb_func_start sub_80C5340
sub_80C5340: ; 80C5340
push {r4,lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r4, =0x02039cf0
ldr r0, [r4]
cmp r0, 0
@@ -354149,8 +354150,8 @@ sub_80C5484: ; 80C5484
.pool
@080C5560:
ldr r0, =gUnknown_08571400
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
b @080C56F4
.pool
@080C5570:
@@ -355128,10 +355129,10 @@ sub_80C5DB8: ; 80C5DB8
movs r4, 0
@080C5DC2:
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -355222,7 +355223,7 @@ sub_80C5DB8: ; 80C5DB8
@080C5E92:
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -355247,7 +355248,7 @@ sub_80C5ED0: ; 80C5ED0
lsrs r4, r0, 24
movs r0, 0x3
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r4, 0x3
bne @080C5F18
ldr r0, =0x02039cec
@@ -355290,7 +355291,7 @@ sub_80C5ED0: ; 80C5ED0
@080C5F3A:
movs r0, 0x3
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
add sp, 0xC
@@ -356045,8 +356046,8 @@ sub_80C64CC: ; 80C64CC
.pool
@080C65C0:
ldr r0, =gUnknown_08571428
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
bl sub_80C6B94
ldr r1, =gUnknown_0856FBBC
movs r0, 0
@@ -356220,7 +356221,7 @@ sub_80C66AC: ; 80C66AC
movs r0, 0x4
bl gpu_tile_obj_free_by_tag
@080C676A:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
b @080C67A4
.pool
@080C6774:
@@ -356743,10 +356744,10 @@ sub_80C6B94: ; 80C6B94
movs r4, 0
@080C6B9A:
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -356820,7 +356821,7 @@ sub_80C6B94: ; 80C6B94
@080C6C40:
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -356923,7 +356924,7 @@ sub_80C6C70: ; 80C6C70
strh r0, [r2, 0x22]
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
subs r6, 0x3
str r6, [sp]
mov r1, r8
@@ -356944,7 +356945,7 @@ sub_80C6C70: ; 80C6C70
@080C6D4A:
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -356998,7 +356999,7 @@ sub_80C6D80: ; 80C6D80
orrs r0, r1
str r0, [r5, 0x4]
adds r0, r5, 0
- bl Window_AddFromTemplate
+ bl AddWindow
lsls r0, 16
lsrs r0, 16
mov r10, r0
@@ -357010,10 +357011,10 @@ sub_80C6D80: ; 80C6D80
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
adds r6, r0, 0
ldrb r0, [r5, 0x3]
lsls r0, 5
@@ -357099,7 +357100,7 @@ sub_80C6D80: ; 80C6D80
@080C6E90:
mov r1, r10
lsrs r0, r1, 24
- bl Window_Remove
+ bl RemoveWindow
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@@ -357163,7 +357164,7 @@ sub_80C6EAC: ; 80C6EAC
lsrs r5, 24
lsls r5, 5
mov r0, r8
- bl Window_AddFromTemplate
+ bl AddWindow
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -357172,10 +357173,10 @@ sub_80C6EAC: ; 80C6EAC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
adds r7, r0, 0
mov r0, r8
ldrb r0, [r0, 0x3]
@@ -357214,7 +357215,7 @@ sub_80C6EAC: ; 80C6EAC
adds r2, r5, 0
bl CpuSet
adds r0, r4, 0
- bl Window_Remove
+ bl RemoveWindow
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@@ -357651,7 +357652,7 @@ c3_0808C39C: ; 80C7268
bl sub_81973C4
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, =gUnknown_085716C0
movs r2, 0xA
ldrsh r0, [r5, r2]
@@ -357673,12 +357674,12 @@ c3_0808C39C: ; 80C7268
bl text_box_related_one
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrh r0, [r5, 0x26]
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @080C7318
.pool
@080C730C:
@@ -357758,7 +357759,7 @@ c3_0808C39C: ; 80C7268
strh r2, [r5, 0xA]
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, =gUnknown_085716C0
movs r2, 0xA
ldrsh r0, [r5, r2]
@@ -357790,7 +357791,7 @@ c3_0808C39C: ; 80C7268
ldrh r0, [r5, 0x26]
lsls r0, 24
lsrs r0, 24
- bl Window_Remove
+ bl RemoveWindow
adds r0, r4, 0
bl remove_task
b @080C756A
@@ -357806,7 +357807,7 @@ c3_0808C39C: ; 80C7268
bne @080C7428
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EBCAD
str r4, [sp]
movs r0, 0x2
@@ -357829,7 +357830,7 @@ c3_0808C39C: ; 80C7268
bne @080C745C
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EBC89
movs r0, 0
str r0, [sp]
@@ -357857,7 +357858,7 @@ c3_0808C39C: ; 80C7268
beq @080C749C
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, =gUnknown_085716C0
movs r2, 0xA
ldrsh r0, [r5, r2]
@@ -357894,7 +357895,7 @@ c3_0808C39C: ; 80C7268
strh r0, [r5, 0xA]
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, =gUnknown_085716C0
movs r3, 0xA
ldrsh r0, [r5, r3]
@@ -357927,7 +357928,7 @@ c3_0808C39C: ; 80C7268
strh r0, [r5, 0xA]
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, =gUnknown_085716C0
movs r2, 0xA
ldrsh r0, [r5, r2]
@@ -357963,7 +357964,7 @@ c3_0808C39C: ; 80C7268
ldrh r0, [r5, 0x26]
lsls r0, 24
lsrs r0, 24
- bl Window_Remove
+ bl RemoveWindow
adds r0, r4, 0
bl remove_task
@080C756A:
@@ -358056,7 +358057,7 @@ sub_80C75FC: ; 80C75FC
orrs r1, r0
str r1, [sp]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -358807,13 +358808,13 @@ sub_80C7BE4: ; 80C7BE4
movs r0, 0x4
strb r0, [r4, 0x4]
adds r0, r4, 0
- bl Window_AddFromTemplate
+ bl AddWindow
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
movs r1, 0x44
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
mov r1, r10
movs r2, 0x40
@@ -358857,7 +358858,7 @@ sub_80C7BE4: ; 80C7BE4
bl box_print
adds r0, r4, 0
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
adds r5, r0, 0
mov r1, r9
ldr r0, [r1]
@@ -358875,7 +358876,7 @@ sub_80C7BE4: ; 80C7BE4
adds r0, r5, 0
bl CpuSet
adds r0, r4, 0
- bl Window_Remove
+ bl RemoveWindow
add sp, 0x24
pop {r3-r5}
mov r8, r3
@@ -359261,9 +359262,9 @@ task_box_related_3: ; 80C7FA8
b @080C80D0
@080C805E:
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0
str r0, [sp]
movs r1, 0xC0
@@ -362727,7 +362728,7 @@ sub_80C9FC8: ; 80C9FC8
bl free
movs r0, 0
str r0, [r4]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
pop {r4}
pop {r0}
bx r0
@@ -362812,11 +362813,11 @@ sub_80CA044: ; 80CA044
sub_80CA0A4: ; 80CA0A4
push {lr}
ldr r0, =gUnknown_08572714
- bl Window_InitFromTemplates
+ bl InitWindows
lsls r0, 16
cmp r0, 0
beq @080CA0C0
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
movs r0, 0x1
b @080CA0C2
.pool
@@ -363313,7 +363314,7 @@ sub_80CA4FC: ; 80CA4FC
sub sp, 0xC
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r6, =0x02039d08
ldr r2, [r6]
ldrb r0, [r2, 0x1]
@@ -363413,7 +363414,7 @@ sub_80CA4FC: ; 80CA4FC
@080CA5E8:
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r4, =0x02039d08
ldr r1, [r4]
ldr r2, =0x00000ce4
@@ -364267,7 +364268,7 @@ sub_80CAC58: ; 80CAC58
bl sub_81AFC28
movs r0, 0x1
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, [r5]
adds r2, r4
movs r0, 0x1
@@ -364285,10 +364286,10 @@ sub_80CAC58: ; 80CAC58
movs r2, 0xE
bl sub_8098858
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
@@ -368501,7 +368502,7 @@ sub_80CD00C: ; 80CD00C
adds r1, r0, 0
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r1, r0, 0
lsrs r0, r1, 31
adds r1, r0
@@ -374147,7 +374148,7 @@ sub_80CFFD0: ; 80CFFD0
ldr r0, [r5]
ldr r1, =0x00000c6c
adds r0, r1
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, [r5]
movs r4, 0xCB
lsls r4, 4
@@ -374157,7 +374158,7 @@ sub_80CFFD0: ; 80CFFD0
strh r0, [r1]
lsls r0, 24
lsrs r0, 24
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -374285,7 +374286,7 @@ sub_80D013C: ; 80D013C
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
pop {r4,r5}
pop {r0}
bx r0
@@ -374302,7 +374303,7 @@ sub_80D0164: ; 80D0164
cmp r0, 0
beq @080D01B0
ldr r0, =gUnknown_0857BB1C
- bl Window_AddFromTemplate8Bpp
+ bl AddWindow8Bit
adds r1, r0, 0
ldr r0, =0x02039d08
ldr r0, [r0]
@@ -374317,7 +374318,7 @@ sub_80D0164: ; 80D0164
lsls r0, r1, 24
lsrs r0, 24
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
b @080D01B2
.pool
@@ -374464,7 +374465,7 @@ sub_80D024C: ; 80D024C
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl Window_FillPixels8Bpp
+ bl FillWindowPixelBuffer8Bit
ldr r1, [r6]
ldrb r0, [r1, 0x2]
ldrb r1, [r1, 0x3]
@@ -374476,12 +374477,12 @@ sub_80D024C: ; 80D024C
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram8Bpp
+ bl CopyWindowToVram8Bit
movs r0, 0xFC
lsls r0, 6
ldr r2, =0x00007fff
@@ -374607,7 +374608,7 @@ sub_80D03B0: ; 80D03B0
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram8Bpp
+ bl CopyWindowToVram8Bit
ldr r1, [r4]
ldrb r0, [r1, 0x1]
adds r0, 0x1
@@ -375160,7 +375161,7 @@ sub_80D07B0: ; 80D07B0
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl Window_CopyPixelRectToWindow4BppTo8Bpp
+ bl BlitSurfaceRectToWindow4BitTo8Bit
@080D0828:
add sp, 0x1C
pop {r4-r7}
@@ -375202,7 +375203,7 @@ sub_80D0834: ; 80D0834
str r1, [sp]
str r1, [sp, 0x4]
movs r1, 0
- bl Window_FillPixelRect8Bpp
+ bl FillWindowPixelRect8Bit
@080D0878:
add sp, 0x8
pop {r4,r5}
@@ -377119,7 +377120,7 @@ sub_80D17B4: ; 80D17B4
adds r4, r0, 0
movs r0, 0x2
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@@ -383647,7 +383648,7 @@ sub_80D49B0: ; 80D49B0
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x24
pop {r4,r5}
pop {r0}
@@ -383847,7 +383848,7 @@ sub_80D4BE0: ; 80D4BE0
ldrb r4, [r0]
adds r0, r5, 0
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
lsls r1, r4, 4
@@ -383863,7 +383864,7 @@ sub_80D4BE0: ; 80D4BE0
adds r0, r5, 0
bl CallWindowFunction
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, =0x02037318
ldrb r0, [r0, 0x16]
cmp r0, 0xE
@@ -383894,7 +383895,7 @@ sub_80D4BE0: ; 80D4BE0
adds r0, r5, 0
movs r2, 0
movs r3, 0
- bl Window_CopyWholePixelBlockToWindow
+ bl BlitSurfaceToWindow
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -389397,8 +389398,8 @@ sub_80D779C: ; 80D779C
sub_80D77E4: ; 80D77E4
push {lr}
ldr r0, =gUnknown_08587F44
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
ldr r0, =0x02039f2a
ldrb r1, [r0]
movs r0, 0x1
@@ -390858,7 +390859,7 @@ sub_80D8490: ; 80D8490
lsls r0, r4, 24
lsrs r0, 24
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x7
str r0, [sp]
adds r0, r4, 0
@@ -391294,12 +391295,12 @@ sub_80D895C: ; 80D895C
lsrs r4, r5, 24
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x80
lsls r0, 17
adds r5, r0
@@ -394824,7 +394825,7 @@ sub_80DA830: ; 80DA830
ldr r0, =0x03005dac
ldr r1, =sub_80DA874
str r1, [r0]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl sub_80D7A5C
bl sub_805F094
ldr r0, =c2_exit_to_overworld_2_switch
@@ -395623,7 +395624,7 @@ sub_80DAEA4: ; 80DAEA4
adds r0, r5, r0
ldrb r0, [r0]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
lsls r4, r5, 24
lsrs r4, 24
adds r0, r4, 0
@@ -396329,7 +396330,7 @@ prints_contest_move_description: ; 80DB370
bl sub_80DED10
movs r0, 0xA
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, =gContestEffectDescriptionPointers
ldr r0, =gContestMoves
adds r0, r7, r0
@@ -396847,10 +396848,10 @@ sub_80DB89C: ; 80DB89C
push {lr}
movs r0, 0x4
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x4
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl sub_80DED60
pop {r0}
@@ -399510,7 +399511,7 @@ sub_80DCD48: ; 80DCD48
@080DCD7E:
adds r0, r5, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -403193,11 +403194,11 @@ sub_80DEB70: ; 80DEB70
mov r0, sp
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl sub_80DED60
add sp, 0x10
@@ -403241,11 +403242,11 @@ sub_80DEBD0: ; 80DEBD0
mov r0, sp
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
lsls r5, 24
lsrs r5, 24
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl sub_80DED60
add sp, 0x10
@@ -403293,7 +403294,7 @@ sub_80DEC30: ; 80DEC30
mov r0, sp
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
b @080DECA4
@080DEC80:
ldr r0, =0x02039f2a
@@ -403312,10 +403313,10 @@ sub_80DEC30: ; 80DEC30
@080DEC9C:
mov r0, sp
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
@080DECA4:
movs r0, 0x4
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl sub_80DED60
add sp, 0x10
@@ -403405,9 +403406,9 @@ sub_80DED10: ; 80DED10
thumb_func_start sub_80DED4C
sub_80DED4C: ; 80DED4C
push {lr}
- bl run_remoboxes
+ bl RunTextPrinters
movs r0, 0x4
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -404726,7 +404727,7 @@ sub_80DF750: ; 80DF750
@080DF784:
adds r0, r7, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
@@ -405137,7 +405138,7 @@ CreateShopMainMenu: ; 80DFA78
orrs r1, r0
str r1, [sp]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5, 0xE]
str r4, [r5, 0x4]
movs r5, 0x3
@@ -405160,7 +405161,7 @@ CreateShopMainMenu: ; 80DFA78
orrs r1, r0
str r1, [sp, 0x8]
add r0, sp, 0x8
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5, 0xE]
str r4, [r5, 0x4]
movs r5, 0x2
@@ -405178,10 +405179,10 @@ CreateShopMainMenu: ; 80DFA78
movs r2, 0
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
ldrb r0, [r4, 0xE]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0xE]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =Task_ShopMenu
movs r1, 0x8
bl AddTask
@@ -405347,7 +405348,7 @@ HandleShopQuit: ; 80DFC68
movs r1, 0x2
bl sub_8198070
ldrb r0, [r5, 0xE]
- bl Window_Remove
+ bl RemoveWindow
bl sub_80ED238
bl script_env_2_disable
adds r0, r4, 0
@@ -405629,7 +405630,7 @@ FreeShopItemNames: ; 80DFEFC
ldr r0, =0x02039f78
ldr r0, [r0]
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
.pool
@@ -405840,7 +405841,7 @@ PrintShopItemDescription: ; 80E003C
@080E00EA:
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@@ -406231,8 +406232,8 @@ sub_80E0424: ; 80E0424
sub_80E0468: ; 80E0468
push {lr}
ldr r0, =gUnknown_08589A70
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
@@ -406242,11 +406243,11 @@ sub_80E0468: ; 80E0468
movs r2, 0xE0
bl copy_textbox_border_tile_patterns_to_vram
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
pop {r0}
bx r0
.pool
@@ -407073,7 +407074,7 @@ sub_80E0AC8: ; 80E0AC8
bl audio_play
strh r5, [r4, 0xA]
movs r0, 0x2
- bl Window_FillTileMap
+ bl ClearWindowTileMap
bl sub_80E0224
ldrb r0, [r4, 0xE]
movs r1, 0x2
@@ -407361,11 +407362,11 @@ sub_80E0D88: ; 80E0D88
movs r1, 0
bl sub_8198070
movs r0, 0x4
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x3
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrh r0, [r5, 0xA]
ldr r1, =0x02021cc4
bl itemid_get_name
@@ -407404,9 +407405,9 @@ sub_80E0D88: ; 80E0D88
movs r1, 0
bl sub_8198070
movs r0, 0x4
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x3
- bl Window_FillTileMap
+ bl ClearWindowTileMap
adds r0, r4, 0
bl sub_80E10A0
@080E0EA4:
@@ -407451,7 +407452,7 @@ sub_80E0EDC: ; 80E0EDC
ldr r1, =0x03005e08
adds r4, r0, r1
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r6, =0x02039f60
ldrb r0, [r6, 0xF]
cmp r0, 0
@@ -407651,9 +407652,9 @@ sub_80E10A0: ; 80E10A0
movs r1, 0x1
bl sub_80E0250
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl sub_80E01C8
@@ -407680,7 +407681,7 @@ sub_80E10EC: ; 80E10EC
adds r4, r0
movs r0, 0x4
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x02039f70
ldr r0, [r0]
movs r1, 0x80
@@ -409956,7 +409957,7 @@ sub_80E21D0: ; 80E21D0
bl sub_8199944
ldrb r0, [r4, 0x14]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
@080E22E8:
add sp, 0x10
@@ -410184,7 +410185,7 @@ CreatePCMenu: ; 80E239C
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
adds r0, r6, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
mov r1, r8
adds r2, r6, 0
@@ -410271,7 +410272,7 @@ sub_80E2578: ; 80E2578
bls @080E258A
movs r0, 0x1
movs r1, 0
- bl fbox_get_field
+ bl GetFontAttribute
ldr r0, =0x020375e0
ldrh r1, [r0]
cmp r1, 0
@@ -410587,7 +410588,7 @@ sub_80E2578: ; 80E2578
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
adds r0, r6, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
adds r1, r7, 0
adds r2, r6, 0
@@ -410845,12 +410846,12 @@ CreateWindowFromRect: ; 80E2A1C
str r0, [sp, 0x18]
str r1, [sp, 0x1C]
add r0, sp, 0x18
- bl Window_AddFromTemplate
+ bl AddWindow
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
add sp, 0x20
pop {r4,r5}
@@ -410868,7 +410869,7 @@ sub_80E2A78: ; 80E2A78
movs r1, 0x1
bl sub_8198070
adds r0, r4, 0
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -410900,35 +410901,35 @@ sub_80E2A94: ; 80E2A94
@080E2AC8:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_0858BBAC
b @080E2B12
.pool
@080E2AD8:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_0858BB9C
b @080E2B12
.pool
@080E2AE8:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_0858BBBC
b @080E2B12
.pool
@080E2AF8:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_0858BBCC
b @080E2B12
.pool
@080E2B08:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_0858BBEC
@080E2B12:
bl GetMenuCursorPos
@@ -410953,7 +410954,7 @@ sub_80E2A94: ; 80E2A94
@080E2B40:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_0858BBE0
bl GetMenuCursorPos
lsls r0, 24
@@ -411110,7 +411111,7 @@ CreateStartMenu: ; 80E2BAC
bl sub_80E2CC4
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -411164,7 +411165,7 @@ display_text_and_get_width_internal: ; 80E2D10
movs r0, 0x1
mov r1, sp
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
add sp, 0x40
pop {r1}
bx r1
@@ -411610,7 +411611,7 @@ choose_name_or_words_screen_init_bgs: ; 80E2FE4
lsls r0, r4, 3
ldr r1, =gUnknown_0858BE10
adds r0, r1
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r5, =0x02039f94
ldr r1, [r5]
ldr r2, =0x00001e11
@@ -412030,7 +412031,7 @@ sub_80E347C: ; 80E347C
lsls r0, 24
lsrs r0, 24
bl remove_task
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, [r4]
bl free
str r5, [r4]
@@ -412138,7 +412139,7 @@ pokemon_transfer_to_pc_with_message: ; 80E34E4
bl text_box_related_one
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -412149,9 +412150,9 @@ pokemon_transfer_to_pc_with_message: ; 80E34E4
thumb_func_start sub_80E3604
sub_80E3604: ; 80E3604
push {lr}
- bl run_remoboxes
+ bl RunTextPrinters
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @080E362E
@@ -414477,7 +414478,7 @@ sub_80E4894: ; 80E4894
adds r0, r4
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@@ -414496,7 +414497,7 @@ sub_80E4894: ; 80E4894
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -414532,7 +414533,7 @@ sub_80E48E8: ; 80E48E8
adds r0, r4
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -414548,7 +414549,7 @@ sub_80E48E8: ; 80E48E8
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0x2C
pop {r4,r5}
pop {r0}
@@ -415036,7 +415037,7 @@ sub_80E4D10: ; 80E4D10
adds r1, r0
ldrb r0, [r1]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r4, 0
cmp r4, r6
bcs @080E4DA6
@@ -415095,11 +415096,11 @@ sub_80E4D10: ; 80E4D10
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -415125,7 +415126,7 @@ sub_80E4DE4: ; 80E4DE4
adds r0, r5, r0
ldrb r1, [r0]
adds r0, r6, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r4, 0
ldr r1, =gUnknown_0858BF8C
lsls r0, r5, 2
@@ -415157,7 +415158,7 @@ sub_80E4DE4: ; 80E4DE4
cmp r4, 0x3
bls @080E4E0E
adds r0, r6, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0xC
pop {r3}
mov r8, r3
@@ -415241,7 +415242,7 @@ sub_80E4EF0: ; 80E4EF0
adds r0, r4
ldrb r0, [r0]
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -415258,12 +415259,12 @@ sub_80E4EF0: ; 80E4EF0
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -415771,16 +415772,16 @@ sub_80E52EC: ; 80E52EC
bl rbox_template_set
ldr r4, =0x02039f98
add r0, sp, 0x10
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
movs r1, 0x85
lsls r1, 2
@@ -415819,9 +415820,9 @@ sub_80E5384: ; 80E5384
bl sub_8198070
ldrb r0, [r4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -419509,7 +419510,7 @@ sub_80E70F4: ; 80E70F4
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4}
pop {r0}
@@ -424929,7 +424930,7 @@ sub_80E9C9C: ; 80E9C9C
bl malloc_and_clear
str r0, [r4]
ldr r0, =gUnknown_0858D06C
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r5, 0xC]
adds r0, r6, 0
bl game_continue
@@ -425171,9 +425172,9 @@ sub_80E9E90: ; 80E9E90
movs r1, 0
bl sub_819746C
ldrb r0, [r4, 0xC]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4, 0xC]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =0x0203a020
@@ -425226,7 +425227,7 @@ sub_80E9F20: ; 80E9F20
orrs r1, r0
str r1, [sp]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r5, 0xE]
lsls r0, 24
lsrs r0, 24
@@ -425311,11 +425312,11 @@ sub_80E9FFC: ; 80E9FFC
movs r1, 0
bl sub_819746C
ldrb r0, [r4, 0xC]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4, 0xE]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4, 0xE]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =0x02021cc4
@@ -425483,9 +425484,9 @@ sub_80EA18C: ; 80EA18C
movs r1, 0
bl sub_819746C
ldrb r0, [r5, 0xE]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r5, 0xE]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
subs r6, 0x8
@@ -445560,8 +445561,8 @@ sub_80F57C4: ; 80F57C4
cmp r4, 0x3
ble @080F57E0
ldr r0, =gUnknown_0858D898
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0x4C
movs r1, 0
bl lcd_io_set
@@ -447352,7 +447353,7 @@ sub_80F6820: ; 80F6820
bl lcd_io_set
adds r0, r5, 0
bl remove_task
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
bl set_callback2
bl sub_80F7E64
@@ -447725,16 +447726,16 @@ sub_80F6B78: ; 80F6B78
movs r0, 0x2
strb r0, [r4, 0x4]
adds r0, r4, 0
- bl Window_AddFromTemplate
+ bl AddWindow
lsls r6, r0, 24
lsrs r4, r6, 24
adds r0, r4, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
adds r1, r5, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r2, r0, 0
adds r2, 0x9
cmp r2, 0
@@ -447768,7 +447769,7 @@ sub_80F6B78: ; 80F6B78
bl box_print
adds r0, r4, 0
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
mov r9, r0
ldr r2, =gUnknown_0858D6D0
mov r8, r2
@@ -447960,7 +447961,7 @@ sub_80F6B78: ; 80F6B78
bl CpuSet
ldr r1, [sp, 0x38]
lsrs r0, r1, 24
- bl Window_Remove
+ bl RemoveWindow
ldr r2, [sp, 0x30]
lsls r1, r2, 3
movs r0, 0xF0
@@ -450142,11 +450143,11 @@ sub_80F7ED0: ; 80F7ED0
mov r0, sp
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0x10
pop {r4}
pop {r0}
@@ -517625,7 +517626,7 @@ sub_811A4D0: ; 811A4D0
bl sub_811C13C
bl sub_811AA90
bl sub_811F2B8
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl set_callback2
pop {r4}
@@ -521229,8 +521230,8 @@ sub_811BFA4: ; 811BFA4
movs r0, 0x1
bl bg_set_tilemap
ldr r0, =gUnknown_08597C64
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
bl sub_811CF64
bl sub_811CF04
movs r0, 0
@@ -521614,7 +521615,7 @@ sub_811C30C: ; 811C30C
movs r0, 0x1
mov r1, sp
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
@0811C392:
adds r0, 0x11
lsls r1, r6, 16
@@ -523137,7 +523138,7 @@ sub_811CFCC: ; 811CFCC
adds r4, r0, 0
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
@@ -523156,10 +523157,10 @@ sub_811CFCC: ; 811CFCC
adds r3, r4, 0
bl sub_811D058
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0811D020:
add sp, 0x14
pop {r4,r5}
@@ -523273,7 +523274,7 @@ sub_811D0BC: ; 811D0BC
movs r0, 0
bl sub_811D104
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
add sp, 0xC
@@ -523365,7 +523366,7 @@ sub_811D104: ; 811D104
@0811D1BC:
movs r0, 0x1
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, [sp, 0xC]
cmp r2, 0
beq @0811D1E0
@@ -523396,7 +523397,7 @@ sub_811D104: ; 811D104
@0811D1FC:
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x14
pop {r0}
bx r0
@@ -523467,13 +523468,13 @@ sub_811D230: ; 811D230
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r1, =0x0203a11c
ldr r1, [r1]
strh r0, [r1, 0x2]
lsls r0, 24
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -523513,7 +523514,7 @@ sub_811D2C8: ; 811D2C8
ldr r0, [r0]
ldrb r0, [r0, 0x2]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r7, 0
ldr r0, [sp, 0x14]
cmp r7, r0
@@ -523640,7 +523641,7 @@ sub_811D2C8: ; 811D2C8
ldr r0, [r0]
ldrb r0, [r0, 0x2]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -523956,7 +523957,7 @@ sub_811D60C: ; 811D60C
sub_811D684: ; 811D684
push {lr}
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
bl gpu_copy_wram_bg_tilemap_to_vram
pop {r0}
@@ -523970,7 +523971,7 @@ sub_811D698: ; 811D698
bl sub_811DD84
movs r0, 0x2
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r4, 0x1
beq @0811D6BC
cmp r4, 0x1
@@ -523989,7 +523990,7 @@ sub_811D698: ; 811D698
@0811D6C6:
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -524311,7 +524312,7 @@ sub_811D864: ; 811D864
blt @0811D88E
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -524355,7 +524356,7 @@ sub_811D950: ; 811D950
movs r0, 0x2
movs r1, 0x11
movs r2, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
cmp r4, 0
beq @0811D9AA
str r5, [sp]
@@ -524366,7 +524367,7 @@ sub_811D950: ; 811D950
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
@0811D9AA:
add sp, 0x8
pop {r4,r5}
@@ -524379,10 +524380,10 @@ sub_811D9B4: ; 811D9B4
push {lr}
movs r0, 0x2
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_811D9B4
@@ -526429,13 +526430,13 @@ sub_811E948: ; 811E948
orrs r0, r1
str r0, [sp, 0x10]
add r0, sp, 0xC
- bl Window_AddFromTemplate
+ bl AddWindow
lsls r0, 16
lsrs r7, r0, 16
lsls r4, r7, 24
lsrs r0, r4, 24
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r6, 0
mov r0, r8
lsls r1, r0, 4
@@ -526469,7 +526470,7 @@ sub_811E948: ; 811E948
cmp r6, 0x3
ble @0811E9C6
lsrs r0, r4, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@0811E9FA:
add sp, 0x14
pop {r3-r5}
@@ -530205,7 +530206,7 @@ sub_8120708: ; 8120708
strb r4, [r0]
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -531611,7 +531612,7 @@ sub_81211EC: ; 81211EC
ldr r1, =gUnknown_085EB7EA
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r5, r0, 0
movs r4, 0
ldr r0, =0x0203a12c
@@ -531624,7 +531625,7 @@ sub_81211EC: ; 81211EC
adds r1, r0, 0
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
cmp r0, r5
ble @0812121C
adds r5, r0, 0
@@ -531723,7 +531724,7 @@ sub_81211EC: ; 81211EC
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
ldrb r0, [r5]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -532188,8 +532189,8 @@ sub_81215EC: ; 81215EC
.pool
@08121730:
ldr r0, =gUnknown_0859F29C
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
b @081219D4
.pool
@08121740:
@@ -532372,7 +532373,7 @@ sub_81215EC: ; 81215EC
b @081219D4
@081218DE:
bl sub_8121B1C
- bl run_remoboxes
+ bl RunTextPrinters
b @081219D4
.pool
@081218EC:
@@ -532648,15 +532649,15 @@ sub_8121B1C: ; 8121B1C
sub sp, 0x2C
movs r7, 0
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r6, 0
ldr r1, =0x0203a134
ldr r0, [r1]
@@ -532766,10 +532767,10 @@ sub_8121B1C: ; 8121B1C
bl box_print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@@ -532921,7 +532922,7 @@ sub_8121D00: ; 8121D00
bl bg_unset_tilemap
movs r0, 0
bl gpu_reset_bgs_and_dma3_busy_flags
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, [r4]
bl free
movs r0, 0
@@ -533109,9 +533110,9 @@ sub_8121F20: ; 8121F20
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl run_remoboxes
+ bl RunTextPrinters
adds r0, r4, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
pop {r4}
@@ -538333,8 +538334,8 @@ sub_8124690: ; 8124690
.pool
@0812477C:
ldr r0, =gUnknown_085A1EF0
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
b @0812489C
.pool
@0812478C:
@@ -538388,10 +538389,10 @@ sub_8124690: ; 8124690
movs r2, 0x20
bl gpu_pal_apply
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085E8CB4
movs r0, 0x1
str r0, [sp]
@@ -538601,7 +538602,7 @@ sub_8124904: ; 8124904
@081249F4:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
@081249FC:
ldr r0, =0x0203a148
ldr r2, [r0]
@@ -538637,10 +538638,10 @@ sub_8124904: ; 8124904
@08124A48:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
@@ -539216,7 +539217,7 @@ sub_8124E0C: ; 8124E0C
movs r0, 0
str r0, [r4]
@08124F16:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
@08124F1A:
add sp, 0x4
pop {r4}
@@ -542634,7 +542635,7 @@ sub_81269D4: ; 81269D4
ldr r1, =gUnknown_085A6B90
adds r0, r1
@08126A2E:
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r2, 0x85
@@ -542664,9 +542665,9 @@ sub_8126A58: ; 8126A58
movs r1, 0
bl sub_8198070
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
pop {r4}
@@ -542844,7 +542845,7 @@ sub_8126C08: ; 8126C08
sub sp, 0x10
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, =gUnknown_085A6B68
ldr r0, =0x0203a150
ldrb r0, [r0]
@@ -543101,7 +543102,7 @@ sub_8126E44: ; 8126E44
ldr r5, =0x0203a188
ldrb r0, [r5, 0x1]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
bl sub_8126E8C
ldrb r0, [r5, 0x1]
@@ -544148,7 +544149,7 @@ sub_8127744: ; 8127744
ldrb r5, [r0, 0x3]
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x0203a151
ldrb r0, [r0]
cmp r4, r0
@@ -550010,8 +550011,8 @@ sub_812A750: ; 812A750
movs r2, 0x4
bl bg_vram_setup
ldr r0, =gUnknown_085A7434
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
add sp, 0x4
pop {r0}
bx r0
@@ -550339,7 +550340,7 @@ sub_812AA48: ; 812AA48
movs r2, 0xE0
bl sub_809882C
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
pop {r0}
bx r0
thumb_func_end sub_812AA48
@@ -550685,7 +550686,7 @@ sub_812ACF4: ; 812ACF4
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x0203ab34
ldr r1, [r0]
movs r0, 0x7
@@ -551253,7 +551254,7 @@ sub_812B158: ; 812B158
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r2, 0x85
lsls r2, 2
movs r3, 0xC0
@@ -551343,7 +551344,7 @@ sub_812B214: ; 812B214
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x0203ab34
ldr r1, [r0]
movs r0, 0x18
@@ -551396,7 +551397,7 @@ sub_812B280: ; 812B280
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x0203ab34
ldr r1, [r0]
movs r0, 0x1A
@@ -556883,12 +556884,12 @@ sub_812DD48: ; 812DD48
bl sub_812DFDC
bl sub_812FAF4
ldr r0, =gUnknown_085A7444
- bl Window_AddFromTemplate
+ bl AddWindow
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -556916,7 +556917,7 @@ sub_812DD78: ; 812DD78
bl box_print
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
negs r0, r0
str r4, [sp]
@@ -556947,14 +556948,14 @@ sub_812DDC4: ; 812DDC4
beq @0812DE08
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x1
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -560958,7 +560959,7 @@ sub_812FDEC: ; 812FDEC
sub_812FDF8: ; 812FDF8
push {lr}
bl sub_812FFC8
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -560981,7 +560982,7 @@ sub_812FE0C: ; 812FE0C
str r5, [r4]
ldr r0, =0x030011f7
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1
bl bg_get_tilemap
bl free
@@ -561258,17 +561259,17 @@ sub_8130098: ; 8130098
bl bg_set_tilemap
ldr r4, =0x030011f7
ldr r0, =gUnknown_085B07EC
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
ldrb r0, [r4]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
bl gpu_sync_bg_show
pop {r4}
@@ -568388,12 +568389,12 @@ sub_8133A78: ; 8133A78
ldr r1, =gUnknown_085EB7EA
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r6, r0, 0
ldr r1, =gUnknown_085E8D38
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
mov r8, r0
movs r5, 0
ldr r0, =0x00002e29
@@ -568415,7 +568416,7 @@ sub_8133A78: ; 8133A78
adds r1, r0
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
@08133B00:
cmp r0, r6
ble @08133B06
@@ -568435,7 +568436,7 @@ sub_8133A78: ; 8133A78
orrs r1, r0
str r1, [sp, 0xC]
add r0, sp, 0xC
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r7, 0x6]
lsls r0, 24
lsrs r0, 24
@@ -568548,9 +568549,9 @@ sub_8133BE4: ; 8133BE4
movs r1, 0
bl sub_8198070
ldrb r0, [r4, 0x6]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4, 0x6]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
adds r0, r5, 0
@@ -568985,8 +568986,8 @@ set_256color_bg_bg0: ; 8133F0C
movs r2, 0x3
bl bg_vram_setup
ldr r0, =gUnknown_085B1DCC
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r1, 0xAA
lsls r1, 2
movs r0, 0
@@ -569186,7 +569187,7 @@ sub_81341FC: ; 81341FC
movs r3, 0
bl Print
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =sub_813425C
@@ -569354,7 +569355,7 @@ sub_8134390: ; 8134390
bl cry_related
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085E8C90
movs r0, 0x1
str r0, [sp]
@@ -569525,13 +569526,13 @@ sub_81344C8: ; 81344C8
orrs r0, r1
str r0, [sp, 0x2C]
add r0, sp, 0x2C
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r4, =0x030011f8
strh r0, [r4]
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x7
add r1, sp, 0xC
movs r2, 0x68
@@ -569567,7 +569568,7 @@ sub_81344C8: ; 81344C8
movs r3, 0x11
bl box_print
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
mov r2, r10
@@ -569613,11 +569614,11 @@ sub_8134604: ; 8134604
ldr r4, =0x030011f8
ldrb r0, [r4]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0xFF
strh r0, [r4]
movs r0, 0x40
@@ -569993,8 +569994,8 @@ LoadWallClockGraphics: ; 81347C8
movs r2, 0x3
bl bg_vram_setup
ldr r0, =gUnknown_085B21DC
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r1, 0x94
lsls r1, 2
movs r0, 0
@@ -570188,7 +570189,7 @@ Cb2_StartWallClock: ; 81349F4
movs r3, 0
bl Print
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
@@ -570335,7 +570336,7 @@ Cb2_ViewWallClock: ; 8134B44
movs r3, 0
bl Print
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
@@ -570518,7 +570519,7 @@ sub_8134DC4: ; 8134DC4
movs r3, 0
bl Print
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =gUnknown_085B21F4
@@ -570579,7 +570580,7 @@ c3_80BF560: ; 8134E30
movs r1, 0
bl sub_8198070
movs r0, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, =0x03005e00
lsls r1, r4, 2
adds r1, r4
@@ -570636,7 +570637,7 @@ c2_080111BC: ; 8134EE8
ands r0, r1
cmp r0, 0
bne @08134F02
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x030022c0
ldr r0, [r0, 0x8]
bl set_callback2
@@ -572323,8 +572324,8 @@ sub_8135C38: ; 8135C38
sub_8135D24: ; 8135D24
push {r4,lr}
ldr r0, =gUnknown_085B2748
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
@@ -572341,7 +572342,7 @@ sub_8135D24: ; 8135D24
@08135D50:
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -572419,7 +572420,7 @@ sub_8135DAC: ; 8135DAC
movs r4, 0
@08135DFE:
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -572621,7 +572622,7 @@ sub_8135FCC: ; 8135FCC
adds r4, r0, 0
movs r0, 0x7
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x2
negs r0, r0
cmp r4, r0
@@ -572751,7 +572752,7 @@ sub_8135FCC: ; 8135FCC
bls @081360AA
movs r0, 0x7
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081360F8:
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
@@ -573343,7 +573344,7 @@ sub_8136524: ; 8136524
ldr r0, [r0]
bl set_callback2
@081365AC:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x0203ab50
ldr r0, [r0]
bl free
@@ -573785,7 +573786,7 @@ sub_8136938: ; 8136938
movs r2, 0
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
ldrb r0, [r6, 0x2]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
ldr r1, =0x03005e00
@@ -579838,7 +579839,7 @@ sub_8139B60: ; 8139B60
sub sp, 0xC
ldr r5, =0x0203ab5e
ldr r0, =gUnknown_085B2BAC
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0
@@ -579889,10 +579890,10 @@ sub_8139B60: ; 8139B60
movs r1, 0x1
bl Print
ldrb r0, [r5]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r5]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -579911,7 +579912,7 @@ sub_8139C10: ; 8139C10
movs r1, 0x1
bl sub_8198070
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -580830,7 +580831,7 @@ sub_813A2DC: ; 813A2DC
str r0, [sp, 0x18]
str r1, [sp, 0x1C]
mov r0, r8
- bl Window_AddFromTemplate
+ bl AddWindow
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
@@ -581061,16 +581062,16 @@ sub_813A570: ; 813A570
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
- bl Window_Remove
+ bl RemoveWindow
adds r0, r5, 0
bl remove_task
bl script_env_2_enable_and_set_ctx_running
@@ -581493,7 +581494,7 @@ sub_813A958: ; 813A958
push {r4,lr}
ldr r4, =0x0203ab6d
ldr r0, =gUnknown_085B311C
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
@@ -581501,7 +581502,7 @@ sub_813A958: ; 813A958
bl sub_813A8FC
ldrb r0, [r4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -581516,7 +581517,7 @@ sub_813A988: ; 813A988
movs r1, 0x1
bl sub_8198070
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -581586,14 +581587,14 @@ sub_813AA18: ; 813AA18
push {r4,lr}
ldr r4, =0x0203ab6e
ldr r0, =gUnknown_085B3124
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl SetStandardWindowBorderStyle
ldrb r0, [r4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -581608,7 +581609,7 @@ sub_813AA44: ; 813AA44
movs r1, 0x1
bl sub_8198070
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -581638,7 +581639,7 @@ sub_813AA60: ; 813AA60
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
cmp r4, 0x4
beq @0813AAE8
cmp r4, 0x4
@@ -581921,7 +581922,7 @@ sub_813ACE8: ; 813ACE8
bne @0813AD18
ldr r4, =0x0203ab5e
ldr r0, =gUnknown_085B3220
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
@@ -581961,7 +581962,7 @@ sub_813AD34: ; 813AD34
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
cmp r6, 0xA
bne @0813AD90
ldrb r0, [r4]
@@ -582009,7 +582010,7 @@ sub_813ADB8: ; 813ADB8
movs r1, 0x1
bl sub_8198070
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -582100,12 +582101,12 @@ sub_813ADD4: ; 813ADD4
ldrh r0, [r6, 0x22]
lsls r0, 24
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrh r0, [r6, 0x22]
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0813AE90:
add sp, 0x18
pop {r3,r4}
@@ -582215,20 +582216,20 @@ sub_813AF48: ; 813AF48
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
- bl Window_Remove
+ bl RemoveWindow
adds r0, r5, 0
bl remove_task
@0813AFB6:
@@ -583124,7 +583125,7 @@ sub_813B57C: ; 813B57C
.pool
@0813B764:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0813B7C6
@@ -584759,14 +584760,14 @@ sub_813C4BC: ; 813C4BC
sub sp, 0xC
ldr r6, =0x0203ab74
ldr r0, =gUnknown_085B3D7C
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6]
ldrb r0, [r6]
movs r1, 0
bl sub_81973FC
ldrb r0, [r6]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =0x02021fc4
ldr r1, =gUnknown_085EF68D
adds r0, r5, 0
@@ -584827,10 +584828,10 @@ sub_813C4BC: ; 813C4BC
ble @0813C540
ldr r4, =0x0203ab74
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -584849,7 +584850,7 @@ sub_813C5A0: ; 813C5A0
movs r1, 0
bl sub_819746C
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -584958,7 +584959,7 @@ sub_813C664: ; 813C664
bl free
movs r0, 0
bl sub_813C6A8
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl remove_task
@0813C694:
@@ -584976,14 +584977,14 @@ sub_813C6A8: ; 813C6A8
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
adds r0, r4, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -585332,8 +585333,8 @@ sub_813C91C: ; 813C91C
b @0813CA00
@0813C9DE:
ldr r0, =gUnknown_085B3D6C
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
b @0813CA00
.pool
@0813C9F0:
@@ -588242,7 +588243,7 @@ sub_813E3A4: ; 813E3A4
push {lr}
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
bl run_active_tasks
pop {r0}
@@ -588254,7 +588255,7 @@ sub_813E3C0: ; 813E3C0
push {lr}
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
bl run_active_tasks
pop {r0}
@@ -588605,7 +588606,7 @@ sub_813E570: ; 813E570
.pool
@0813E714:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813E724
@@ -588923,7 +588924,7 @@ sub_813E570: ; 813E570
.pool
@0813EA1C:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813EA2A
@@ -589037,7 +589038,7 @@ sub_813E570: ; 813E570
ldr r0, [r4]
bl free
str r6, [r4]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x030061e8
ldr r0, [r0]
bl set_callback2
@@ -589137,7 +589138,7 @@ sub_813E570: ; 813E570
.pool
@0813EC10:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813EC1E
@@ -589173,7 +589174,7 @@ sub_813E570: ; 813E570
.pool
@0813EC6C:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813EC7A
@@ -589236,7 +589237,7 @@ sub_813E570: ; 813E570
.4byte @0813F180
@0813ECFC:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813ED0A
@@ -589266,7 +589267,7 @@ sub_813E570: ; 813E570
.pool
@0813ED48:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813ED56
@@ -589295,7 +589296,7 @@ sub_813E570: ; 813E570
.pool
@0813ED90:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0813EDCE
@@ -589323,7 +589324,7 @@ sub_813E570: ; 813E570
strh r0, [r1, 0x14]
@0813EDCE:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813EDDC
@@ -589480,7 +589481,7 @@ sub_813E570: ; 813E570
beq @0813EF3E
b @0813F1A4
@0813EF3E:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x020244ec
ldr r1, =0x03005e00
mov r3, r8
@@ -589610,7 +589611,7 @@ sub_813E570: ; 813E570
.pool
@0813F090:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813F09E
@@ -589639,7 +589640,7 @@ sub_813E570: ; 813E570
.pool
@0813F0D8:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0813F1A4
@@ -589704,7 +589705,7 @@ sub_813E570: ; 813E570
.pool
@0813F180:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0813F1A4
@@ -589806,7 +589807,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813F284:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813F294
@@ -590107,7 +590108,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813F570:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813F57E
@@ -590183,7 +590184,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813F624:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
@@ -590304,7 +590305,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813F748:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813F756
@@ -590341,7 +590342,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813F7A4:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813F7B2
@@ -590405,7 +590406,7 @@ sub_813F1B8: ; 813F1B8
.4byte @0813FCA0
@0813F838:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813F846
@@ -590436,7 +590437,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813F884:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813F892
@@ -590466,7 +590467,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813F8CC:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0813F90C
@@ -590495,7 +590496,7 @@ sub_813F1B8: ; 813F1B8
strh r0, [r1, 0x14]
@0813F90C:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813F91A
@@ -590631,7 +590632,7 @@ sub_813F1B8: ; 813F1B8
movs r0, 0
bl bg_get_tilemap
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x020244ec
ldr r1, =0x03005e00
mov r2, r8
@@ -590754,7 +590755,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813FBA4:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @0813FBB2
@@ -590784,7 +590785,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813FBEC:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0813FCC4
@@ -590852,7 +590853,7 @@ sub_813F1B8: ; 813F1B8
.pool
@0813FCA0:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0813FCC4
@@ -591646,7 +591647,7 @@ sub_8140388: ; 8140388
movs r0, 0x2
bl bg_set_tilemap
ldr r0, =gUnknown_085B614C
- bl Window_InitFromTemplates
+ bl InitWindows
bl sub_8197200
ldr r0, =0x0203ab8c
strb r5, [r0]
@@ -591677,7 +591678,7 @@ sub_8140418: ; 8140418
adds r0, r4
movs r4, 0
str r4, [r0]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
bl bg_unset_tilemap
movs r0, 0x1
@@ -591895,7 +591896,7 @@ sub_81405CC: ; 81405CC
b @081407F8
@08140630:
bl sub_8140388
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
movs r1, 0x90
lsls r1, 6
movs r0, 0x50
@@ -591987,7 +591988,7 @@ sub_81405CC: ; 81405CC
bl Print
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =0x02021bbc
movs r2, 0x3C
negs r2, r2
@@ -592219,7 +592220,7 @@ sub_8140914: ; 8140914
bl Print
ldrb r0, [r5]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =gUnknown_085B6410
adds r0, r4, 0
bl sub_8121F68
@@ -594101,7 +594102,7 @@ sub_814189C: ; 814189C
bl Print
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @08141958
.pool
@08141928:
@@ -594124,7 +594125,7 @@ sub_814189C: ; 814189C
bl Print
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08141958:
ldr r1, =0x03005e00
lsls r0, r5, 2
@@ -594262,7 +594263,7 @@ sub_8141A18: ; 8141A18
bl Print
ldrb r0, [r5]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
mov r1, r9
ldr r0, [r1]
ldrb r1, [r0, 0x19]
@@ -594458,7 +594459,7 @@ sub_8141B58: ; 8141B58
bl Print
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =dp01t_12_3_battle_menu
b @08141C8E
.pool
@@ -594485,7 +594486,7 @@ sub_8141B58: ; 8141B58
bl Print
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =sub_8140914
@08141C8E:
ldr r2, =0x0000ffff
@@ -594517,7 +594518,7 @@ sub_8141B58: ; 8141B58
bl Print
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =sub_8140994
adds r0, r6, 0
movs r2, 0x3C
@@ -594604,7 +594605,7 @@ dp01t_12_3_battle_menu: ; 8141D0C
bl Print
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =sub_8140914
ldr r2, =0x0000ffff
adds r0, r5, 0
@@ -595990,7 +595991,7 @@ sub_8142918: ; 8142918
movs r1, 0x1
bl sub_819746C
bl sub_8145C14
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -596122,7 +596123,7 @@ sub_81429F0: ; 81429F0
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =0x03005e00
lsls r0, r6, 2
adds r0, r6
@@ -596199,7 +596200,7 @@ sub_8142A88: ; 8142A88
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =sub_81429F0
str r0, [r6]
b @08142BB0
@@ -596224,7 +596225,7 @@ sub_8142A88: ; 8142A88
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
@@ -596254,7 +596255,7 @@ sub_8142A88: ; 8142A88
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =sub_81429A0
str r0, [r6]
strh r4, [r6, 0x22]
@@ -601040,7 +601041,7 @@ sub_8145354: ; 8145354
ldr r4, =0x0203ab94
adds r0, r7, 0
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
str r0, [r4]
@0814539E:
ldr r1, [r5]
@@ -601073,7 +601074,7 @@ sub_8145354: ; 8145354
ldr r1, =gUnknown_085B8C10
movs r2, 0x20
adds r3, r4, 0
- bl Window_CopyToPixels
+ bl CopyToWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -601409,7 +601410,7 @@ sub_8145648: ; 8145648
adds r0, r6, 0
ldr r1, =gUnknown_085B8C10
movs r2, 0x20
- bl Window_CopyToPixels
+ bl CopyToWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -601603,7 +601604,7 @@ sub_8145814: ; 8145814
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_8145814
@@ -601619,7 +601620,7 @@ sub_8145824: ; 8145824
cmp r2, 0
bne @08145848
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
lsls r1, r4, 16
@@ -601663,7 +601664,7 @@ sub_8145850: ; 8145850
adds r0, r7, 0
movs r2, 0
movs r3, 0
- bl Window_CopyToPixels
+ bl CopyToWindowPixelBuffer
ldr r0, =gUnknown_085B8418
ldrb r1, [r4, 0x3]
lsls r1, 4
@@ -602069,13 +602070,13 @@ sub_8145BAC: ; 8145BAC
bl rbox_template_set
ldr r4, =0x0203ab9c
add r0, sp, 0x10
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r2, 0x85
lsls r2, 2
@@ -602099,7 +602100,7 @@ sub_8145C14: ; 8145C14
movs r1, 0x1
bl sub_819746C
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -612871,7 +612872,7 @@ sub_814B3DC: ; 814B3DC
bx_t4_button_a: ; 814B44C
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0814B45E
@@ -620670,7 +620671,7 @@ battle_show_message_maybe: ; 814F9EC
add r0, r8
ldrb r1, [r0]
adds r0, r7, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
@0814FA36:
mov r9, r0
@@ -620833,15 +620834,15 @@ battle_show_message_maybe: ; 814F9EC
mov r0, sp
adds r1, r6, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
mov r0, r9
cmp r0, 0
beq @0814FB9C
adds r0, r7, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r7, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0814FB9C:
add sp, 0x10
pop {r3,r4}
@@ -640218,7 +640219,7 @@ sub_815955C: ; 815955C
bx_t6_button_a: ; 8159594
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @081595A6
@@ -640326,7 +640327,7 @@ sub_8159660: ; 8159660
adds r0, r1
ldr r1, =sub_8159698
str r1, [r0]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl sub_81358F4
@08159684:
pop {r0}
@@ -654648,7 +654649,7 @@ sub_8160868: ; 8160868
@08160BE8:
movs r0, 0x3
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x0203bc38
ldrb r0, [r0, 0x4]
cmp r0, 0
@@ -654793,7 +654794,7 @@ sub_8160868: ; 8160868
bl sub_8161234
movs r0, 0x3
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @08160E8A
@08160D48:
ldr r0, =0x02037fd4
@@ -654950,7 +654951,7 @@ sub_8160EA0: ; 8160EA0
ldr r1, =0x0203bc38
adds r2, r1, 0x2
bl sub_81AE6C8
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, [r4]
bl free
movs r0, 0
@@ -654997,7 +654998,7 @@ render_previous_quest_text: ; 8160EE0
bl ExpandStringRefs
movs r0, 0x3
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
str r5, [sp, 0x4]
@@ -655058,7 +655059,7 @@ sub_8160F50: ; 8160F50
cmp r7, 0
bne @08160FC4
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r6]
movs r1, 0x5
strb r1, [r0]
@@ -655068,7 +655069,7 @@ sub_8160F50: ; 8160F50
.pool
@08160FC4:
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r6]
movs r2, 0
movs r1, 0x3
@@ -655151,7 +655152,7 @@ sub_8161074: ; 8161074
bl ExpandStringRefs
movs r0, 0x3
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
str r5, [sp, 0x4]
@@ -655951,7 +655952,7 @@ sub_8161724: ; 8161724
movs r1, 0
bl sub_8198070
movs r0, 0x6
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0
bl sub_81B3054
ldr r1, =0x03005e00
@@ -659939,7 +659940,7 @@ ConvertBattleFrontierTrainerSpeechToString: ; 81638AC
negs r2, r2
movs r0, 0x1
adds r1, r4, 0
- bl font_get_width_of_string
+ bl GetStringWidth
cmp r0, 0xCC
bls @0816390A
adds r0, r4, 0
@@ -664873,7 +664874,7 @@ sub_816631C: ; 816631C
bl _call_via_r0
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
pop {r0}
bx r0
@@ -664983,8 +664984,8 @@ sub_8166380: ; 8166380
movs r2, 0x4
bl bg_vram_setup
ldr r0, =gUnknown_085DFCDC
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x97
movs r2, 0xE0
@@ -665073,9 +665074,9 @@ sub_8166380: ; 8166380
.pool
@08166528:
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x1
bl sub_8167BA0
@@ -665459,7 +665460,7 @@ sub_816681C: ; 816681C
ldr r0, [r4]
bl free
str r5, [r4]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r1, =0x030022c0
ldr r0, =sub_816624C
str r0, [r1, 0x8]
@@ -665919,7 +665920,7 @@ sub_8166BEC: ; 8166BEC
ldr r0, [r6]
bl free
str r5, [r6]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
@08166D18:
add sp, 0x4
pop {r4-r6}
@@ -665958,7 +665959,7 @@ sub_8166D44: ; 8166D44
bl CopyString
movs r0, 0x2
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x97
movs r2, 0xE
@@ -665974,10 +665975,10 @@ sub_8166D44: ; 8166D44
movs r3, 0
bl Print
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =gUnknown_085DFCFC
movs r1, 0x97
movs r2, 0xE
@@ -666015,7 +666016,7 @@ sub_8166DE4: ; 8166DE4
movs r0, 0x2
bl rbox_fill_rectangle
movs r0, 0x2
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@08166E18:
lsls r0, r4, 24
asrs r0, 24
@@ -666033,7 +666034,7 @@ sub_8166E24: ; 8166E24
bl sub_8098858
movs r0, 0x2
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r3, =0x0203bc90
ldr r0, [r3]
adds r0, 0x53
@@ -666100,10 +666101,10 @@ sub_8166E24: ; 8166E24
ldr r0, =0x02021fc4
bl sub_8166FB0
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -666115,7 +666116,7 @@ sub_8166EDC: ; 8166EDC
push {r4,r5,lr}
movs r0, 0x2
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =0x0203bc90
adds r3, r5, 0
movs r4, 0x5
@@ -666159,7 +666160,7 @@ sub_8166EDC: ; 8166EDC
bl sub_8166FB0
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
@08166F44:
pop {r4,r5}
@@ -666174,7 +666175,7 @@ sub_8166F50: ; 8166F50
sub sp, 0xC
movs r0, 0x2
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x97
movs r2, 0xE
@@ -666190,10 +666191,10 @@ sub_8166F50: ; 8166F50
movs r3, 0
bl Print
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r0}
bx r0
@@ -666206,10 +666207,10 @@ sub_8166F94: ; 8166F94
movs r0, 0x2
bl rbox_fill_rectangle
movs r0, 0x2
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x2
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_8166F94
@@ -667602,10 +667603,10 @@ sub_8167BA0: ; 8167BA0
mov r8, r1
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r7, =0x0203bcac
ldr r3, [r7]
ldr r1, =0x00008041
@@ -667672,19 +667673,19 @@ sub_8167BA0: ; 8167BA0
beq @08167C84
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @08167C94
.pool
@08167C84:
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08167C94:
add sp, 0xC
pop {r3}
@@ -668760,7 +668761,7 @@ sub_816856C: ; 816856C
sub_81685A4: ; 81685A4
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @081685B6
@@ -668801,7 +668802,7 @@ sub_81685D4: ; 81685D4
ldr r1, =sub_8168610
str r1, [r0]
bl nullsub_35
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl sub_81ADD70
@081685FC:
pop {r0}
@@ -673436,7 +673437,7 @@ sub_816AED8: ; 816AED8
orrs r1, r0
str r1, [sp]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r6, 0x8]
lsls r0, 24
lsrs r0, 24
@@ -673508,9 +673509,9 @@ sub_816AF98: ; 816AF98
movs r1, 0
bl sub_8198070
ldrb r0, [r4, 0x8]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4, 0x8]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r1, =0x03005e00
@@ -673527,9 +673528,9 @@ sub_816AF98: ; 816AF98
movs r1, 0
bl sub_8198070
ldrb r0, [r4, 0x8]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4, 0x8]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =0x03005e00
@@ -673721,7 +673722,7 @@ sub_816B190: ; 816B190
orrs r1, r0
str r1, [sp]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
@@ -674094,9 +674095,9 @@ sub_816B4DC: ; 816B4DC
movs r1, 0
bl sub_8198070
ldrb r0, [r4, 0x8]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4, 0x8]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
pop {r4}
@@ -674998,7 +674999,7 @@ sub_816BC7C: ; 816BC7C
lsls r0, r2, 3
ldr r1, =gUnknown_085DFF5C
adds r0, r1
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r2, 0x85
@@ -675033,11 +675034,11 @@ sub_816BCC4: ; 816BCC4
movs r1, 0
bl sub_8198070
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
@0816BCF8:
@@ -675302,7 +675303,7 @@ sub_816BEF0: ; 816BEF0
adds r4, r0, 0
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -675425,7 +675426,7 @@ sub_816BFE0: ; 816BFE0
movs r1, 0x11
movs r2, 0
adds r3, r6, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
b @0816C050
.pool
@0816C030:
@@ -675616,7 +675617,7 @@ sub_816C158: ; 816C158
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
bl sub_816C110
bl sub_816C140
bl sub_816BD04
@@ -675727,7 +675728,7 @@ sub_816C2C0: ; 816C2C0
ldrb r5, [r0]
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =0x02021fc4
adds r0, r4, 0
adds r1, r6, 0
@@ -683107,8 +683108,8 @@ sub_81701C4: ; 81701C4
movs r2, 0x2
bl bg_vram_setup
ldr r0, =gUnknown_085E5070
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x27
movs r2, 0xD0
@@ -683312,7 +683313,7 @@ sub_8170290: ; 8170290
bl free
str r5, [r4]
@08170412:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
@08170416:
add sp, 0xC
pop {r4,r5}
@@ -683332,7 +683333,7 @@ sub_8170428: ; 8170428
beq @08170460
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, [r4]
adds r2, 0xC
movs r0, 0x1
@@ -683350,10 +683351,10 @@ sub_8170428: ; 8170428
@08170460:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08170470:
add sp, 0xC
pop {r4}
@@ -689199,7 +689200,7 @@ sub_817354C: ; 817354C
sub_8173560: ; 8173560
push {lr}
bl run_active_tasks
- bl run_remoboxes
+ bl RunTextPrinters
bl call_obj_callbacks
bl obj_sync_something
bl fade_and_return_progress_probably
@@ -689676,7 +689677,7 @@ sub_81738BC: ; 81738BC
bl text_box_related_one
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =0x03005e00
mov r0, r8
add r0, r9
@@ -689716,7 +689717,7 @@ sub_81739C4: ; 81739C4
bl bg_unset_tilemap
movs r0, 0x3
bl bg_unset_tilemap
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r5, =0x0203bcdc
ldr r0, [r5]
cmp r0, 0
@@ -690242,10 +690243,10 @@ sub_8173DC0: ; 8173DC0
bl sub_80A1AD4
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =0x03005e00
mov r2, r9
adds r0, r2, r6
@@ -690339,7 +690340,7 @@ sub_8173EE4: ; 8173EE4
adds r4, r1
strh r0, [r4, 0x10]
ldr r0, =gUnknown_085E5380
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r0, [r6]
ldrb r1, [r0, 0x14]
lsrs r1, 3
@@ -690429,7 +690430,7 @@ sub_8173F84: ; 8173F84
bl text_box_related_one
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =sub_8174028
str r0, [r4]
@08174018:
@@ -690557,7 +690558,7 @@ sub_81740B0: ; 81740B0
bl gpu_sync_bg_hide
movs r0, 0x3
bl gpu_sync_bg_hide
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x1
bl bg_unset_tilemap
movs r0, 0x3
@@ -691459,7 +691460,7 @@ sub_81748F0: ; 81748F0
movs r0, 0x3
bl gpu_sync_bg_hide
bl sub_8198314
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x1
bl bg_unset_tilemap
movs r0, 0x3
@@ -691523,7 +691524,7 @@ sub_81749A0: ; 81749A0
bl text_box_related_one
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -691568,9 +691569,9 @@ sub_8174A38: ; 8174A38
sub sp, 0xC
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r4, =gUnknown_085E8B3E
movs r0, 0x1
adds r1, r4, 0
@@ -691589,7 +691590,7 @@ sub_8174A38: ; 8174A38
bl box_print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4}
pop {r0}
@@ -691604,9 +691605,9 @@ sub_8174A88: ; 8174A88
adds r7, r0, 0
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrh r0, [r7, 0x8]
ldr r1, =0x000001ff
ands r1, r0
@@ -691707,7 +691708,7 @@ sub_8174A88: ; 8174A88
bl box_print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @08174C82
.pool
@08174B8C:
@@ -691821,7 +691822,7 @@ sub_8174A88: ; 8174A88
bl box_print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08174C82:
add sp, 0x2C
pop {r4-r7}
@@ -691840,9 +691841,9 @@ sub_8174C98: ; 8174C98
sub sp, 0x20
movs r0, 0x1
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r2, =0x0000021d
movs r0, 0x1
movs r1, 0
@@ -692057,7 +692058,7 @@ sub_8174C98: ; 8174C98
bl box_print
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -692850,13 +692851,13 @@ sub_8175548: ; 8175548
movs r2, 0x40
bl gpu_pal_apply
ldr r0, =gUnknown_085E6F6C
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl gpu_sync_bg_show
pop {r0}
@@ -692867,7 +692868,7 @@ sub_8175548: ; 8175548
thumb_func_start sub_81755A4
sub_81755A4: ; 81755A4
push {lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
bl bg_get_tilemap
cmp r0, 0
@@ -693904,7 +693905,7 @@ sub_8175DA0: ; 8175DA0
ble @08175E92
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r3, =0x03005e00
mov r2, r9
adds r1, r2, r4
@@ -694041,10 +694042,10 @@ sub_8175DA0: ; 8175DA0
bne @0817602A
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x03005e00
lsls r1, r4, 2
adds r1, r4
@@ -697281,7 +697282,7 @@ sub_8177A98: ; 8177A98
ldr r0, =0x0203bcf0
ldr r0, [r0]
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl remove_task
ldr r0, =sub_80861E8
@@ -697326,10 +697327,10 @@ pokedex_diploma_something: ; 8177AD4
movs r2, 0x1
bl sub_8177BCC
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -697375,17 +697376,17 @@ sub_8177B44: ; 8177B44
sub_8177B9C: ; 8177B9C
push {lr}
ldr r0, =gUnknown_085E8204
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
bl gpu_pal_apply
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
pop {r0}
bx r0
.pool
@@ -697855,8 +697856,8 @@ sub_8177E88: ; 8177E88
sub_8178008: ; 8178008
push {r4,lr}
ldr r0, =gUnknown_085EFD28
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
ldr r0, =gUnknown_085EFD00
movs r1, 0xF0
movs r2, 0x20
@@ -697865,7 +697866,7 @@ sub_8178008: ; 8178008
@08178020:
lsls r0, r4, 24
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -697932,7 +697933,7 @@ sub_8178090: ; 8178090
bl memcpy
movs r0, 0x3
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_085E926B
movs r0, 0x1
adds r1, r4, 0
@@ -697950,7 +697951,7 @@ sub_8178090: ; 8178090
movs r3, 0x1
bl sub_817804C
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
@@ -698562,7 +698563,7 @@ sub_8178610: ; 8178610
ldr r0, =0x0203bcf4
ldr r0, [r0]
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =sub_81AD40C
bl set_callback2
adds r0, r4, 0
@@ -698880,7 +698881,7 @@ sub_81787AC: ; 81787AC
movs r0, 0
@0817889A:
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
b @081788A6
@081788A2:
bl sub_8178110
@@ -699000,17 +699001,17 @@ sub_8178974: ; 8178974
movs r2, 0x1
bl bg_vram_setup
ldr r0, =gUnknown_085EFD68
- bl Window_InitFromTemplates
+ bl InitWindows
lsls r0, 16
cmp r0, 0
beq @08178A22
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
movs r4, 0
@081789AC:
lsls r0, r4, 24
lsrs r0, 24
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r4, 0x1
cmp r4, 0x1
ble @081789AC
@@ -699043,7 +699044,7 @@ sub_8178974: ; 8178974
bl run_active_tasks
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
movs r0, 0
movs r1, 0
@@ -699134,10 +699135,10 @@ sub_8178A78: ; 8178A78
movs r3, 0xD
bl SetWindowBorderStyle
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl gpu_sync_bg_show
movs r0, 0x1
@@ -699171,7 +699172,7 @@ sub_8178A78: ; 8178A78
.pool
@08178B48:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @08178B56
@@ -699226,7 +699227,7 @@ sub_8178A78: ; 8178A78
.pool
@08178BCC:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @08178BDA
@@ -699261,10 +699262,10 @@ sub_8178A78: ; 8178A78
movs r3, 0x2
bl sub_8178EC4
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r2, 0x87
lsls r2, 3
adds r1, r4, r2
@@ -699379,7 +699380,7 @@ sub_8178A78: ; 8178A78
.pool
@08178D28:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
beq @08178D36
@@ -699455,7 +699456,7 @@ sub_8178A78: ; 8178A78
.pool
@08178DE0:
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r2, r0, 16
cmp r2, 0
@@ -699544,7 +699545,7 @@ sub_8178A78: ; 8178A78
bl run_active_tasks
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
add sp, 0x8
pop {r4-r6}
@@ -699591,7 +699592,7 @@ sub_8178EC4: ; 8178EC4
lsrs r1, 24
adds r0, r5, 0
str r3, [sp, 0x18]
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
mov r0, r9
str r0, [sp]
mov r1, r8
@@ -699817,9 +699818,9 @@ sub_8178FDC: ; 8178FDC
adds r3, r6, 0
bl gpu_copy_bg_tile_pattern_data_to_vram
ldr r0, =gUnknown_085EFD94
- bl Window_InitFromTemplates
+ bl InitWindows
ldr r0, =gUnknown_085EFD9C
- bl Window_AddFromTemplateWithoutAllocatingMemory
+ bl AddWindowWithoutTileMap
ldr r4, =0x0203bd0e
strb r0, [r4]
ldrb r0, [r4]
@@ -699827,9 +699828,9 @@ sub_8178FDC: ; 8178FDC
lsls r1, 4
adds r2, r5, r1
movs r1, 0x7
- bl Window_SetField
+ bl SetWindowAttribute
ldr r0, =gUnknown_085EFDA4
- bl Window_AddFromTemplateWithoutAllocatingMemory
+ bl AddWindowWithoutTileMap
strb r0, [r4, 0x1]
ldrb r0, [r4, 0x1]
movs r3, 0xE8
@@ -699837,8 +699838,8 @@ sub_8178FDC: ; 8178FDC
adds r5, r3
movs r1, 0x7
adds r2, r5, 0
- bl Window_SetField
- bl TextBox_ResetSomeField
+ bl SetWindowAttribute
+ bl DeactivateAllTextPrinters
bl reset_all_obj_data
bl clear_tasks
bl sub_80A1A74
@@ -699871,16 +699872,16 @@ sub_8178FDC: ; 8178FDC
bl SetWindowBorderStyle
ldrb r0, [r4, 0x1]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x1]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =gUnknown_085EC816
movs r1, 0x1
movs r2, 0
@@ -699952,7 +699953,7 @@ sub_8179288: ; 8179288
ldr r4, =0x0203bd0e
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC917
movs r1, 0x1
movs r2, 0
@@ -699965,7 +699966,7 @@ sub_8179288: ; 8179288
beq @081792DC
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC816
movs r1, 0x1
movs r2, 0
@@ -699985,7 +699986,7 @@ sub_8179288: ; 8179288
ldr r0, =0x0203bd0e
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC86F
b @08179330
.pool
@@ -699993,7 +699994,7 @@ sub_8179288: ; 8179288
ldr r0, =0x0203bd0e
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x03006214
ldr r0, [r0]
cmp r0, 0
@@ -700009,7 +700010,7 @@ sub_8179288: ; 8179288
ldr r0, =0x0203bd0e
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC86F
movs r1, 0x1
movs r2, 0
@@ -700048,7 +700049,7 @@ sub_8179390: ; 8179390
ldr r0, =0x0203bd0e
ldrb r0, [r0]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC8D4
movs r1, 0x1
movs r2, 0
@@ -701380,8 +701381,8 @@ sub_8179DF4: ; 8179DF4
sub_8179FAC: ; 8179FAC
push {lr}
ldr r0, =gUnknown_085F0558
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
@@ -701392,9 +701393,9 @@ sub_8179FAC: ; 8179FAC
bl gpu_pal_apply
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
pop {r0}
@@ -701724,7 +701725,7 @@ sub_817A2C0: ; 817A2C0
bl set_callback2
adds r0, r4, 0
bl remove_task
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x0203bd18
ldr r0, [r0]
bl free
@@ -702882,7 +702883,7 @@ sub_817AD40: ; 817AD40
@0817AD68:
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EFAAA
movs r0, 0x1
str r0, [sp]
@@ -703159,7 +703160,7 @@ sub_817AFD4: ; 817AFD4
ands r0, r1
cmp r0, 0
bne @0817B020
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl do_reset
@0817B020:
add sp, 0x4
@@ -703173,11 +703174,11 @@ sub_817AFD4: ; 817AFD4
sub_817B02C: ; 817B02C
push {lr}
ldr r0, =gUnknown_085F06C8
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0
movs r2, 0x2
@@ -726653,7 +726654,7 @@ sub_8186D9C: ; 8186D9C
sub_8186E10: ; 8186E10
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @08186E22
@@ -732577,7 +732578,7 @@ sub_818A1B0: ; 818A1B0
sub_818A220: ; 818A220
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0818A232
@@ -738539,7 +738540,7 @@ sub_818D65C: ; 818D65C
lsrs r6, r3, 24
adds r0, r2, 0
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
adds r3, r0, 0
movs r0, 0
str r0, [sp]
@@ -738632,7 +738633,7 @@ sub_818D6CC: ; 818D6CC
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl Window_CopyPixelRectToWindow
+ bl BlitSurfaceRectToWindow
str r6, [sp]
mov r0, r9
ldr r1, [sp, 0x18]
@@ -744041,8 +744042,8 @@ sub_8190400: ; 8190400
movs r2, 0x4
bl bg_vram_setup
ldr r0, =gUnknown_0860CEB4
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
ldr r0, =0x02022e14
strh r4, [r0]
ldr r0, =0x02022e16
@@ -745190,10 +745191,10 @@ sub_8190CD4: ; 8190CD4
lsrs r4, 24
adds r0, r4, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r6, 0x1
cmp r6, r5
blt @08190E18
@@ -747359,7 +747360,7 @@ sub_8190CD4: ; 8190CD4
bl free
movs r5, 0
str r5, [r4]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
mov r0, r9
cmp r0, 0
bne @081921C4
@@ -748154,14 +748155,14 @@ sub_81924E0: ; 81924E0
ldr r0, [sp, 0x44]
lsrs r4, r0, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add r0, sp, 0xC
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
add r0, sp, 0xC
strb r5, [r0, 0xA]
movs r7, 0
@@ -748244,23 +748245,23 @@ sub_81924E0: ; 81924E0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add r0, sp, 0xC
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
adds r7, r5, 0
cmp r7, 0x2
ble @0819288A
ldr r4, [sp, 0x40]
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x000003fe
ldr r1, [sp, 0x24]
cmp r1, r0
@@ -748290,7 +748291,7 @@ sub_81924E0: ; 81924E0
strb r1, [r0, 0x7]
strb r1, [r0, 0x9]
movs r1, 0
- bl remo_copy
+ bl AddTextPrinter
movs r7, 0
ldr r3, =gUnknown_0860B358
@081929AE:
@@ -748432,7 +748433,7 @@ sub_81924E0: ; 81924E0
strb r1, [r0, 0x9]
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
movs r1, 0
mov r0, r8
adds r0, 0x22
@@ -748963,7 +748964,7 @@ sub_81924E0: ; 81924E0
strb r1, [r0, 0x9]
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
mov r0, r8
bl free
add sp, 0x58
@@ -749927,10 +749928,10 @@ sub_819314C: ; 819314C
strb r0, [r1, 0x5]
ldr r4, [sp, 0x6C]
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add r0, sp, 0xC
strb r5, [r0, 0x8]
adds r1, r0, 0
@@ -749938,7 +749939,7 @@ sub_819314C: ; 819314C
strb r5, [r1, 0x9]
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
ldr r1, [sp, 0x24]
ldr r0, =0x000003ff
cmp r1, r0
@@ -749985,14 +749986,14 @@ sub_819314C: ; 819314C
strb r4, [r1, 0x9]
ldr r4, [sp, 0x64]
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add r0, sp, 0xC
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
ldr r3, [sp, 0x4C]
ldr r1, [r3, 0x4]
ldr r0, =0x000003ff
@@ -750039,14 +750040,14 @@ sub_819314C: ; 819314C
strb r5, [r1, 0x9]
ldr r4, [sp, 0x68]
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add r0, sp, 0xC
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
add r0, sp, 0xC
strb r6, [r0, 0xA]
ldr r0, =gUnknown_0860D350
@@ -750071,14 +750072,14 @@ sub_819314C: ; 819314C
strb r5, [r1, 0x9]
ldr r4, [sp, 0x60]
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add r0, sp, 0xC
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
add sp, 0x80
pop {r3-r5}
mov r8, r3
@@ -750330,7 +750331,7 @@ sub_819395C: ; 819395C
beq @08193ABA
b @08193BC2
@08193ABA:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl remove_some_task
ldr r4, =0x0203cd7c
ldr r0, [r4]
@@ -750375,7 +750376,7 @@ sub_819395C: ; 819395C
lsrs r6, r0, 24
cmp r6, 0
bne @08193BC2
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl remove_some_task
ldr r4, =0x0203cd7c
ldr r0, [r4]
@@ -750415,7 +750416,7 @@ sub_819395C: ; 819395C
lsrs r6, r0, 24
cmp r6, 0
bne @08193BC2
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
bl remove_some_task
ldr r4, =0x0203cd7c
ldr r0, [r4]
@@ -751280,8 +751281,8 @@ sub_8194220: ; 8194220
movs r2, 0x4
bl bg_vram_setup
ldr r0, =gUnknown_0860CE94
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
ldr r0, =0x02022e14
strh r4, [r0]
ldr r0, =0x02022e16
@@ -751524,7 +751525,7 @@ sub_8194220: ; 8194220
adds r0, r1, 0
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
mov r3, r8
lsls r3, 2
str r3, [sp, 0x1C]
@@ -751784,7 +751785,7 @@ sub_8194220: ; 8194220
add r0, sp, 0x4
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
ldr r3, [sp, 0x20]
adds r3, 0x2
str r3, [sp, 0x20]
@@ -751811,20 +751812,20 @@ sub_8194220: ; 8194220
.pool
@081947C8:
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =sub_8194BEC
bl SetHBlankCallback
ldr r0, =sub_8194CE4
@@ -752130,7 +752131,7 @@ sub_8194950: ; 8194950
add r0, sp, 0x4
movs r1, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
@08194A9E:
mov r2, r8
ldr r1, [r2]
@@ -752222,7 +752223,7 @@ sub_8194B54: ; 8194B54
push {lr}
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
bl run_active_tasks
pop {r0}
@@ -754834,7 +754835,7 @@ sub_819612C: ; 819612C
ldr r1, =0x03005e08
adds r5, r0, r1
ldr r0, =gUnknown_0860EF98
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r5, 0x4]
lsls r0, 16
asrs r0, 16
@@ -754856,7 +754857,7 @@ sub_819612C: ; 819612C
cmp r0, r1
bne @08196188
ldrb r0, [r5, 0x4]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r4, 0
b @081961E0
.pool
@@ -754871,7 +754872,7 @@ sub_819612C: ; 819612C
beq @081961D8
ldrb r0, [r5, 0x4]
movs r1, 0x88
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =gUnknown_0860EA4C
movs r1, 0xE0
movs r2, 0x20
@@ -754889,7 +754890,7 @@ sub_819612C: ; 819612C
.pool
@081961D8:
ldrb r0, [r5, 0x4]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r6, 0
@081961E0:
bl remove_task
@@ -754917,7 +754918,7 @@ sub_81961F0: ; 81961F0
cmp r0, 0
bne @08196268
ldrb r0, [r4, 0x4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r1, 0x4
ldrsh r0, [r4, r1]
movs r1, 0x9C
@@ -754944,7 +754945,7 @@ sub_81961F0: ; 81961F0
strh r0, [r4, 0xA]
ldrb r0, [r4, 0x4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
movs r0, 0x1
@@ -755029,7 +755030,7 @@ sub_81962D8: ; 81962D8
bne @08196328
ldrb r0, [r4, 0x4]
movs r1, 0x88
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, =0x0203cd80
ldrb r0, [r1, 0x7]
cmp r0, 0
@@ -755080,10 +755081,10 @@ sub_8196330: ; 8196330
beq @08196388
ldrb r0, [r4, 0x4]
movs r1, 0x88
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x84
lsls r0, 1
bl audio_play
@@ -755133,7 +755134,7 @@ sub_8196390: ; 8196390
ldrb r0, [r4, 0xA]
bl remove_task
ldrb r0, [r4, 0x4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
movs r0, 0x1
@@ -755206,23 +755207,23 @@ sub_819645C: ; 819645C
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
mov r9, r0
adds r0, r4, 0
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
str r0, [sp, 0x8]
adds r0, r4, 0
movs r1, 0x2
- bl Window_GetField
+ bl GetWindowAttribute
str r0, [sp, 0xC]
adds r0, r4, 0
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
adds r6, r0, 0
adds r0, r4, 0
movs r1, 0x4
- bl Window_GetField
+ bl GetWindowAttribute
str r0, [sp, 0x10]
mov r0, r9
lsls r0, 24
@@ -755419,7 +755420,7 @@ sub_81965D8: ; 81965D8
lsrs r1, 24
mov r0, sp
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
add sp, 0x10
pop {r0}
bx r0
@@ -755451,10 +755452,10 @@ sub_8196648: ; 8196648
ands r0, r1
strb r0, [r2]
@08196678:
- bl run_remoboxes
+ bl RunTextPrinters
lsls r0, r4, 24
lsrs r0, 24
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
pop {r4}
@@ -756901,7 +756902,7 @@ sub_8197184: ; 8197184
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_0860EA6C
@@ -756935,7 +756936,7 @@ sub_81971C4: ; 81971C4
sub_81971D0: ; 81971D0
push {lr}
ldr r0, =gUnknown_0860F098
- bl Window_InitFromTemplates
+ bl InitWindows
ldr r0, =0x0203cd8c
movs r1, 0xFF
strb r1, [r0]
@@ -756949,7 +756950,7 @@ sub_81971D0: ; 81971D0
thumb_func_start sub_81971F4
sub_81971F4: ; 81971F4
push {lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
thumb_func_end sub_81971F4
@@ -756965,7 +756966,7 @@ sub_8197200: ; 8197200
movs r1, 0
movs r2, 0
bl bg_change_y_offset
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
bl sub_81973A4
pop {r0}
bx r0
@@ -756974,9 +756975,9 @@ sub_8197200: ; 8197200
thumb_func_start sub_8197224
sub_8197224: ; 8197224
push {lr}
- bl run_remoboxes
+ bl RunTextPrinters
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -757043,7 +757044,7 @@ text_box_related_one: ; 8197238
mov r0, sp
adds r1, r3, 0
adds r2, r7, 0
- bl remo_copy
+ bl AddTextPrinter
lsls r0, 16
lsrs r0, 16
add sp, 0x10
@@ -757195,14 +757196,14 @@ sub_81973C4: ; 81973C4
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
cmp r4, 0x1
bne @081973F2
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081973F2:
pop {r4,r5}
pop {r0}
@@ -757223,14 +757224,14 @@ sub_81973FC: ; 81973FC
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
cmp r4, 0x1
bne @0819742A
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0819742A:
pop {r4,r5}
pop {r0}
@@ -757251,14 +757252,14 @@ sub_8197434: ; 8197434
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
cmp r4, 0x1
bne @08197462
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08197462:
pop {r4,r5}
pop {r0}
@@ -757279,14 +757280,14 @@ sub_819746C: ; 819746C
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
cmp r4, 0x1
bne @0819749A
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0819749A:
pop {r4,r5}
pop {r0}
@@ -757844,7 +757845,7 @@ sub_81978EC: ; 81978EC
bl sub_8121E7C
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r4-r6}
pop {r0}
@@ -757980,7 +757981,7 @@ sub_8197A14: ; 8197A14
ldrb r0, [r4]
cmp r0, 0xFF
beq @08197A26
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
@08197A26:
@@ -758048,7 +758049,7 @@ sub_8197A80: ; 8197A80
ldrb r0, [r4]
cmp r0, 0xFF
beq @08197A92
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
@08197A92:
@@ -758140,14 +758141,14 @@ sub_8197B1C: ; 8197B1C
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
cmp r4, 0x1
bne @08197B52
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08197B52:
pop {r4,r5}
pop {r0}
@@ -758168,21 +758169,21 @@ sub_8197B64: ; 8197B64
ldr r5, =0x0203cd9e
adds r0, r6, 0
movs r1, 0x5
- bl Window_GetField
+ bl GetWindowAttribute
strb r0, [r5]
ldr r1, =sub_8197BB4
adds r0, r6, 0
bl CallWindowFunction
adds r0, r6, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r6, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
cmp r4, 0x1
bne @08197BA2
adds r0, r6, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08197BA2:
pop {r4-r6}
pop {r0}
@@ -758470,14 +758471,14 @@ sub_8197DF8: ; 8197DF8
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
cmp r4, 0x1
bne @08197E26
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08197E26:
pop {r4,r5}
pop {r0}
@@ -758545,14 +758546,14 @@ SetWindowBorderStyle: ; 8197E80
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
cmp r4, 0x1
bne @08197EB6
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08197EB6:
pop {r4,r5}
pop {r0}
@@ -758573,21 +758574,21 @@ sub_8197EC8: ; 8197EC8
ldr r5, =0x0203cd9e
adds r0, r6, 0
movs r1, 0x5
- bl Window_GetField
+ bl GetWindowAttribute
strb r0, [r5]
ldr r1, =DrawWindowBorder
adds r0, r6, 0
bl CallWindowFunction
adds r0, r6, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r6, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
cmp r4, 0x1
bne @08197F06
adds r0, r6, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08197F06:
pop {r4-r6}
pop {r0}
@@ -758772,14 +758773,14 @@ sub_8198070: ; 8198070
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
cmp r4, 0x1
bne @0819809E
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0819809E:
pop {r4,r5}
pop {r0}
@@ -758870,7 +758871,7 @@ sub_81980F0: ; 81980F0
strh r4, [r1, 0x6]
ldr r4, =0x0203cda0
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
cmp r5, 0xF
bls @08198158
@@ -758912,20 +758913,20 @@ sub_8198180: ; 8198180
ldrb r0, [r5]
cmp r0, 0xFF
beq @081981EE
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r5]
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
adds r1, r6, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldrb r0, [r5]
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
movs r2, 0xEC
subs r2, r7
lsls r0, 3
@@ -758946,7 +758947,7 @@ sub_8198180: ; 8198180
beq @081981EE
ldrb r0, [r5]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081981EE:
add sp, 0xC
pop {r3}
@@ -759000,21 +759001,21 @@ sub_8198204: ; 8198204
strb r0, [r1, 0x2]
adds r5, r7, 0
ldrb r0, [r5]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r5]
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r6, 0
beq @0819829E
movs r0, 0
adds r1, r6, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
lsls r0, 16
lsrs r4, r0, 16
ldrb r0, [r5]
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
movs r2, 0xEC
mov r1, r8
subs r2, r1
@@ -759050,7 +759051,7 @@ sub_8198204: ; 8198204
beq @081982C8
ldrb r0, [r7]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081982C8:
add sp, 0x18
pop {r3-r5}
@@ -759070,7 +759071,7 @@ sub_81982D8: ; 81982D8
cmp r0, 0xFF
beq @081982E8
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081982E8:
pop {r0}
bx r0
@@ -759085,10 +759086,10 @@ sub_81982F0: ; 81982F0
cmp r0, 0xFF
beq @08198308
movs r1, 0xFF
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@08198308:
pop {r4}
pop {r0}
@@ -759104,14 +759105,14 @@ sub_8198314: ; 8198314
cmp r0, 0xFF
beq @0819833C
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
@0819833C:
@@ -759299,7 +759300,7 @@ RedrawMenuCursor: ; 8198448
str r0, [sp, 0x4]
mov r0, r9
movs r1, 0x11
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldrb r0, [r5, 0x5]
ldrb r1, [r5, 0x6]
ldr r2, =gUnknown_085EE498
@@ -759713,7 +759714,7 @@ PrintTextArray: ; 8198740
@081987A4:
adds r0, r6, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -759793,7 +759794,7 @@ sub_81987BC: ; 81987BC
@0819883C:
adds r0, r7, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -759826,7 +759827,7 @@ sub_8198854: ; 8198854
lsrs r5, 24
adds r0, r6, 0
movs r1, 0
- bl fbox_get_field
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -759886,7 +759887,7 @@ sub_81988A4: ; 81988A4
strb r6, [r0, 0x5]
adds r0, r6, 0
movs r1, 0x5
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -759897,7 +759898,7 @@ sub_81988A4: ; 81988A4
strb r1, [r3, 0xC]
adds r0, r6, 0
movs r1, 0x6
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
adds r1, r5, 0
ands r1, r0
@@ -759910,7 +759911,7 @@ sub_81988A4: ; 81988A4
strb r0, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x7
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -759920,7 +759921,7 @@ sub_81988A4: ; 81988A4
strb r1, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x4
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -759932,7 +759933,7 @@ sub_81988A4: ; 81988A4
strb r2, [r0, 0xA]
adds r0, r6, 0
movs r1, 0x3
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xB]
mov r0, sp
@@ -759961,7 +759962,7 @@ sub_81988A4: ; 81988A4
mov r0, sp
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -759970,7 +759971,7 @@ sub_81988A4: ; 81988A4
@0819899E:
ldr r0, [sp, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -760006,13 +760007,13 @@ sub_81989B8: ; 81989B8
mov r8, r0
adds r0, r4, 0
movs r1, 0
- bl fbox_get_field
+ bl GetFontAttribute
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
adds r0, r4, 0
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -760037,7 +760038,7 @@ sub_81989B8: ; 81989B8
thumb_func_end sub_81989B8
thumb_func_start rbox_template_set
-; void rbox_template_set(rbox_template *template, char bg_id, char x, char y, char w, char h, char a7, s16 a8)
+; void rbox_template_set(WindowTemplate *template, char bg_id, char x, char y, char w, char h, char a7, s16 a8)
rbox_template_set: ; 8198A24
push {r4-r7,lr}
mov r7, r8
@@ -760141,7 +760142,7 @@ sub_8198AA4: ; 8198AA4
adds r3, r6, 0
bl rbox_template_set
add r0, sp, 0x10
- bl Window_AddFromTemplate
+ bl AddWindow
lsls r0, 16
lsrs r0, 16
add sp, 0x18
@@ -760184,7 +760185,7 @@ sub_8198AF8: ; 8198AF8
lsrs r1, 24
mov r10, r1
ldr r7, =0x0203cd9f
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r7]
ldrb r0, [r7]
movs r1, 0x1
@@ -760200,7 +760201,7 @@ sub_8198AF8: ; 8198AF8
strb r6, [r0, 0x5]
adds r0, r6, 0
movs r1, 0
- bl fbox_get_field
+ bl GetFontAttribute
add r1, sp, 0xC
add r0, r8
strb r0, [r1, 0x6]
@@ -760215,7 +760216,7 @@ sub_8198AF8: ; 8198AF8
strb r0, [r1, 0x9]
adds r0, r6, 0
movs r1, 0x5
- bl fbox_get_field
+ bl GetFontAttribute
add r3, sp, 0xC
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -760226,7 +760227,7 @@ sub_8198AF8: ; 8198AF8
strb r1, [r3, 0xC]
adds r0, r6, 0
movs r1, 0x6
- bl fbox_get_field
+ bl GetFontAttribute
add r3, sp, 0xC
adds r1, r5, 0
ands r1, r0
@@ -760239,7 +760240,7 @@ sub_8198AF8: ; 8198AF8
strb r0, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x7
- bl fbox_get_field
+ bl GetFontAttribute
add r3, sp, 0xC
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -760249,7 +760250,7 @@ sub_8198AF8: ; 8198AF8
strb r1, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x4
- bl fbox_get_field
+ bl GetFontAttribute
add r1, sp, 0xC
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -760258,21 +760259,21 @@ sub_8198AF8: ; 8198AF8
strb r4, [r1, 0xC]
adds r0, r6, 0
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
add r1, sp, 0xC
strb r0, [r1, 0xA]
adds r0, r6, 0
movs r1, 0x3
- bl fbox_get_field
+ bl GetFontAttribute
add r1, sp, 0xC
strb r0, [r1, 0xB]
adds r0, r1, 0
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
adds r0, r6, 0
movs r1, 0x1
- bl fbox_get_field
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
ldrb r1, [r7]
@@ -760344,7 +760345,7 @@ sub_8198C78: ; 8198C78
movs r1, 0x1
bl sub_8198070
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -760441,7 +760442,7 @@ sub_8198C94: ; 8198C94
@08198D3A:
mov r0, r10
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -760483,7 +760484,7 @@ sub_8198D54: ; 8198D54
lsrs r3, 24
movs r1, 0
str r3, [sp, 0x14]
- bl fbox_get_field
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -760543,7 +760544,7 @@ sub_8198DBC: ; 8198DBC
strb r7, [r0, 0x5]
adds r0, r7, 0
movs r1, 0x5
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -760554,7 +760555,7 @@ sub_8198DBC: ; 8198DBC
strb r1, [r3, 0xC]
adds r0, r7, 0
movs r1, 0x6
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
adds r1, r5, 0
ands r1, r0
@@ -760567,7 +760568,7 @@ sub_8198DBC: ; 8198DBC
strb r0, [r3, 0xD]
adds r0, r7, 0
movs r1, 0x7
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -760577,7 +760578,7 @@ sub_8198DBC: ; 8198DBC
strb r1, [r3, 0xD]
adds r0, r7, 0
movs r1, 0x4
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -760586,12 +760587,12 @@ sub_8198DBC: ; 8198DBC
strb r4, [r1, 0xC]
adds r0, r7, 0
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xA]
adds r0, r7, 0
movs r1, 0x3
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xB]
movs r6, 0
@@ -760624,7 +760625,7 @@ sub_8198DBC: ; 8198DBC
strb r0, [r4, 0x6]
adds r0, r7, 0
movs r1, 0x1
- bl fbox_get_field
+ bl GetFontAttribute
adds r1, r6, 0
muls r1, r0
ldr r0, [sp, 0x18]
@@ -760636,7 +760637,7 @@ sub_8198DBC: ; 8198DBC
mov r0, sp
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -760651,7 +760652,7 @@ sub_8198DBC: ; 8198DBC
@08198EDE:
ldr r0, [sp, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -760688,7 +760689,7 @@ sub_8198EF8: ; 8198EF8
adds r0, r3, 0
movs r1, 0
str r3, [sp, 0x14]
- bl fbox_get_field
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -760905,7 +760906,7 @@ sub_8199060: ; 8199060
str r6, [sp, 0x4]
movs r1, 0x11
adds r2, r4, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldrb r6, [r5, 0x9]
adds r0, r7, 0
adds r1, r6, 0
@@ -761575,7 +761576,7 @@ PrintMenuTable: ; 819958C
@081995D0:
mov r0, r8
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
@@ -761606,7 +761607,7 @@ sub_81995E4: ; 81995E4
movs r0, 0x1
strb r0, [r1, 0x5]
movs r1, 0x5
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -761617,7 +761618,7 @@ sub_81995E4: ; 81995E4
strb r1, [r3, 0xC]
movs r0, 0x1
movs r1, 0x6
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
adds r1, r5, 0
ands r1, r0
@@ -761630,7 +761631,7 @@ sub_81995E4: ; 81995E4
strb r0, [r3, 0xD]
movs r0, 0x1
movs r1, 0x7
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -761640,7 +761641,7 @@ sub_81995E4: ; 81995E4
strb r1, [r3, 0xD]
movs r0, 0x1
movs r1, 0x4
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -761673,7 +761674,7 @@ sub_81995E4: ; 81995E4
mov r0, sp
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -761682,7 +761683,7 @@ sub_81995E4: ; 81995E4
@081996A6:
adds r0, r6, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -761711,7 +761712,7 @@ sub_81996C0: ; 81996C0
lsrs r6, 24
ldr r1, =0x0203cd9f
mov r8, r1
- bl Window_AddFromTemplate
+ bl AddWindow
mov r2, r8
strb r0, [r2]
ldrb r0, [r2]
@@ -761741,7 +761742,7 @@ sub_81996C0: ; 81996C0
strb r0, [r1, 0x9]
movs r0, 0x1
movs r1, 0x5
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -761752,7 +761753,7 @@ sub_81996C0: ; 81996C0
strb r1, [r3, 0xC]
movs r0, 0x1
movs r1, 0x6
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
adds r1, r5, 0
ands r1, r0
@@ -761765,7 +761766,7 @@ sub_81996C0: ; 81996C0
strb r0, [r3, 0xD]
movs r0, 0x1
movs r1, 0x7
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -761775,7 +761776,7 @@ sub_81996C0: ; 81996C0
strb r1, [r3, 0xD]
movs r0, 0x1
movs r1, 0x4
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -761788,7 +761789,7 @@ sub_81996C0: ; 81996C0
strb r1, [r0, 0xB]
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
mov r2, r8
ldrb r0, [r2]
movs r1, 0x2
@@ -761871,7 +761872,7 @@ sub_81997AC: ; 81997AC
@08199824:
mov r0, r10
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -761910,7 +761911,7 @@ sub_819983C: ; 819983C
movs r0, 0x1
strb r0, [r1, 0x5]
movs r1, 0x5
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -761921,7 +761922,7 @@ sub_819983C: ; 819983C
strb r1, [r3, 0xC]
movs r0, 0x1
movs r1, 0x6
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
adds r1, r5, 0
ands r1, r0
@@ -761934,7 +761935,7 @@ sub_819983C: ; 819983C
strb r0, [r3, 0xD]
movs r0, 0x1
movs r1, 0x7
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -761944,7 +761945,7 @@ sub_819983C: ; 819983C
strb r1, [r3, 0xD]
movs r0, 0x1
movs r1, 0x4
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -761989,7 +761990,7 @@ sub_819983C: ; 819983C
mov r0, sp
movs r1, 0xFF
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -762004,7 +762005,7 @@ sub_819983C: ; 819983C
@0819992A:
ldr r0, [sp, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -762744,12 +762745,12 @@ box_print: ; 8199E64
strb r0, [r1, 0x9]
adds r0, r4, 0
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x3
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xB]
mov r3, sp
@@ -762780,7 +762781,7 @@ box_print: ; 8199E64
mov r0, sp
adds r1, r5, 0
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
add sp, 0x10
pop {r4-r6}
pop {r0}
@@ -762848,7 +762849,7 @@ sub_8199EEC: ; 8199EEC
lsrs r1, 24
mov r0, sp
movs r2, 0
- bl remo_copy
+ bl AddTextPrinter
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -762904,7 +762905,7 @@ sub_8199F74: ; 8199F74
strb r0, [r2, 0xC]
adds r0, r6, 0
movs r1, 0x5
- bl fbox_get_field
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -762915,7 +762916,7 @@ sub_8199F74: ; 8199F74
strb r1, [r3, 0xC]
adds r0, r6, 0
movs r1, 0x6
- bl fbox_get_field
+ bl GetFontAttribute
mov r2, sp
adds r1, r4, 0
ands r1, r0
@@ -762925,7 +762926,7 @@ sub_8199F74: ; 8199F74
strb r5, [r2, 0xD]
adds r0, r6, 0
movs r1, 0x7
- bl fbox_get_field
+ bl GetFontAttribute
mov r2, sp
lsls r0, 4
ldrb r1, [r2, 0xD]
@@ -762935,7 +762936,7 @@ sub_8199F74: ; 8199F74
mov r0, sp
mov r1, r8
adds r2, r7, 0
- bl remo_copy
+ bl AddTextPrinter
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -763286,7 +763287,7 @@ sub_819A27C: ; 819A27C
adds r0, r6, 0
adds r2, r4, 0
adds r3, r5, 0
- bl Window_CopyWholePixelBlockToWindow
+ bl BlitSurfaceToWindow
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -763355,7 +763356,7 @@ sub_819A2F8: ; 819A2F8
adds r1, r5, 0
movs r2, 0
movs r3, 0
- bl Window_CopyPixelRectToWindow
+ bl BlitSurfaceRectToWindow
add sp, 0x18
pop {r4,r5}
pop {r0}
@@ -763556,7 +763557,7 @@ sub_819A4C8: ; 819A4C8
push {lr}
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
bl run_active_tasks
pop {r0}
@@ -763645,8 +763646,8 @@ sub_819A514: ; 819A514
movs r2, 0x3
bl bg_vram_setup
ldr r0, =gUnknown_08610434
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
b @0819A8E6
.pool
@0819A5C0:
@@ -763924,7 +763925,7 @@ sub_819A514: ; 819A514
@0819A8AC:
bl sub_819BCF8
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =0x030022c0
movs r3, 0x87
lsls r3, 3
@@ -763934,7 +763935,7 @@ sub_819A514: ; 819A514
@0819A8C4:
bl sub_819B9E8
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =0x030022c0
movs r0, 0x87
lsls r0, 3
@@ -763945,7 +763946,7 @@ sub_819A514: ; 819A514
bl sub_819B9B4
movs r0, 0
@0819A8E2:
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@0819A8E6:
ldr r1, =0x030022c0
movs r2, 0x87
@@ -764672,7 +764673,7 @@ sub_819AE08: ; 819AE08
ldr r0, [r4]
bl free
str r5, [r4]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x8
strh r0, [r6, 0x8]
b @0819AF50
@@ -764802,7 +764803,7 @@ bc_exit_to_overworld: ; 819AF68
ldr r0, [r7]
bl free
str r5, [r7]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =sub_80861B0
bl set_callback2
adds r0, r6, 0
@@ -765925,12 +765926,12 @@ sub_819B958: ; 819B958
strb r1, [r0]
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
pop {r4,r5}
pop {r0}
bx r0
@@ -765943,7 +765944,7 @@ sub_819B9B4: ; 819B9B4
sub sp, 0xC
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EEBB2
movs r0, 0x1
str r0, [sp]
@@ -765955,7 +765956,7 @@ sub_819B9B4: ; 819B9B4
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r0}
bx r0
@@ -765971,7 +765972,7 @@ sub_819B9E8: ; 819B9E8
ldrb r4, [r0, 0x3]
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x6C
muls r0, r4
ldr r1, [r5]
@@ -766007,7 +766008,7 @@ sub_819B9E8: ; 819B9E8
bl box_print
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -766021,7 +766022,7 @@ sub_819BA64: ; 819BA64
sub sp, 0xC
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x0300127c
ldr r0, [r0]
ldrb r0, [r0, 0x5]
@@ -766053,7 +766054,7 @@ sub_819BA64: ; 819BA64
bl Print
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r0}
bx r0
@@ -766066,7 +766067,7 @@ sub_819BAC8: ; 819BAC8
sub sp, 0xC
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EEC50
movs r0, 0x5
str r0, [sp]
@@ -766079,7 +766080,7 @@ sub_819BAC8: ; 819BAC8
bl Print
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r0}
bx r0
@@ -766098,10 +766099,10 @@ sub_819BAFC: ; 819BAFC
adds r0, r1
ldrb r5, [r0, 0x10]
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x3
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =gUnknown_08610476
str r4, [sp]
movs r6, 0
@@ -766150,7 +766151,7 @@ sub_819BAFC: ; 819BAFC
bl box_print
movs r0, 0x3
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -766163,10 +766164,10 @@ sub_819BBA8: ; 819BBA8
push {r4,r5,lr}
sub sp, 0xC
movs r0, 0x4
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x4
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_08610476
str r5, [sp]
movs r4, 0
@@ -766189,7 +766190,7 @@ sub_819BBA8: ; 819BBA8
bl box_print
movs r0, 0x4
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -766329,10 +766330,10 @@ sub_819BCF8: ; 819BCF8
cmp r4, 0x5
bhi @0819BD64
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x5
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x6C
muls r0, r4
ldr r1, [r5]
@@ -766366,7 +766367,7 @@ sub_819BCF8: ; 819BCF8
bl Print
movs r0, 0x5
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0819BD64:
add sp, 0x2C
pop {r4,r5}
@@ -767629,7 +767630,7 @@ sub_819C7E0: ; 819C7E0
push {lr}
bl call_obj_callbacks
bl obj_sync_something
- bl run_remoboxes
+ bl RunTextPrinters
bl fade_and_return_progress_probably
bl run_active_tasks
pop {r0}
@@ -767830,7 +767831,7 @@ sub_819C90C: ; 819C90C
ldr r0, [r4]
bl free
str r5, [r4]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0x8
strh r0, [r6, 0x8]
b @0819C9F0
@@ -767972,7 +767973,7 @@ sub_819CA08: ; 819CA08
ldr r0, [r7]
bl free
str r5, [r7]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =sub_80861B0
bl set_callback2
adds r0, r6, 0
@@ -769322,7 +769323,7 @@ sub_819D588: ; 819D588
bl gpu_pal_apply
bl sub_819ED34
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @0819D622
.pool
@0819D5F0:
@@ -769373,10 +769374,10 @@ sub_819D588: ; 819D588
@0819D64E:
movs r0, 0x5
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x5
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x03001284
ldr r0, [r0]
ldrb r0, [r0, 0x14]
@@ -769672,7 +769673,7 @@ sub_819D770: ; 819D770
strh r0, [r1]
bl sub_819ED34
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -769706,15 +769707,15 @@ sub_819D770: ; 819D770
movs r0, 0x1
bl sub_819EDBC
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @0819D990
@0819D936:
movs r0, 0x5
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x5
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0819D990
@0819D948:
ldr r0, =0x03001284
@@ -770099,8 +770100,8 @@ sub_819DC1C: ; 819DC1C
movs r2, 0x4
bl bg_vram_setup
ldr r0, =gUnknown_086108C8
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
ldr r1, =0x030022c0
movs r0, 0x87
lsls r0, 3
@@ -770314,7 +770315,7 @@ sub_819DC1C: ; 819DC1C
ldr r0, =gUnknown_085EEC73
bl sub_819EBEC
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =0x030022c0
movs r0, 0x87
lsls r0, 3
@@ -770324,7 +770325,7 @@ sub_819DC1C: ; 819DC1C
@0819DF30:
bl sub_819EFA8
movs r0, 0x8
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @0819E006
@0819DF3C:
ldr r0, =0x03001284
@@ -770335,7 +770336,7 @@ sub_819DC1C: ; 819DC1C
bl sub_819EB4C
@0819DF4A:
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =0x030022c0
movs r0, 0x87
lsls r0, 3
@@ -770345,7 +770346,7 @@ sub_819DC1C: ; 819DC1C
@0819DF64:
bl sub_819EB18
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @0819E006
@0819DF70:
movs r0, 0x87
@@ -770364,7 +770365,7 @@ sub_819DC1C: ; 819DC1C
@0819DF8C:
bl sub_819ED78
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =0x030022c0
movs r0, 0x87
lsls r0, 3
@@ -771753,12 +771754,12 @@ sub_819EA64: ; 819EA64
strb r1, [r0]
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
pop {r4,r5}
pop {r0}
bx r0
@@ -771769,13 +771770,13 @@ sub_819EA64: ; 819EA64
sub_819EAC0: ; 819EAC0
push {lr}
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_819EAC0
@@ -771784,13 +771785,13 @@ sub_819EAC0: ; 819EAC0
sub_819EADC: ; 819EADC
push {lr}
movs r0, 0x7
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x7
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x7
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_819EADC
@@ -771800,13 +771801,13 @@ sub_819EAF8: ; 819EAF8
push {lr}
bl sub_819EAC0
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x5
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x5
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_819EAF8
@@ -771817,7 +771818,7 @@ sub_819EB18: ; 819EB18
sub sp, 0xC
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EEC66
movs r0, 0x1
str r0, [sp]
@@ -771829,7 +771830,7 @@ sub_819EB18: ; 819EB18
bl Print
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r0}
bx r0
@@ -771842,7 +771843,7 @@ sub_819EB4C: ; 819EB4C
sub sp, 0xC
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x03001284
ldr r1, [r0]
ldrb r0, [r1, 0x3]
@@ -771850,7 +771851,7 @@ sub_819EB4C: ; 819EB4C
bls @0819EB70
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0819EBD4
.pool
@0819EB70:
@@ -771899,7 +771900,7 @@ sub_819EB4C: ; 819EB4C
bl box_print
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0819EBD4:
add sp, 0xC
pop {r4}
@@ -771915,7 +771916,7 @@ sub_819EBEC: ; 819EBEC
adds r4, r0, 0
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x5
str r0, [sp]
movs r0, 0
@@ -771928,7 +771929,7 @@ sub_819EBEC: ; 819EBEC
bl Print
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4}
pop {r0}
@@ -771940,10 +771941,10 @@ sub_819EC20: ; 819EC20
push {r4,r5,lr}
sub sp, 0xC
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x3
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_08610922
str r5, [sp]
movs r4, 0
@@ -771975,7 +771976,7 @@ sub_819EC20: ; 819EC20
bl box_print
movs r0, 0x3
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -771988,10 +771989,10 @@ sub_819EC94: ; 819EC94
push {r4,r5,lr}
sub sp, 0xC
movs r0, 0x4
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x4
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_08610922
str r5, [sp]
movs r4, 0
@@ -772014,7 +772015,7 @@ sub_819EC94: ; 819EC94
bl box_print
movs r0, 0x4
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -772061,7 +772062,7 @@ sub_819ED34: ; 819ED34
push {lr}
movs r0, 0x5
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x03001284
ldr r0, [r0]
ldrb r0, [r0, 0x14]
@@ -772081,7 +772082,7 @@ sub_819ED34: ; 819ED34
@0819ED60:
movs r0, 0x5
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
.pool
@@ -772092,7 +772093,7 @@ sub_819ED78: ; 819ED78
push {lr}
movs r0, 0x3
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x03001284
ldr r0, [r0]
ldrb r0, [r0, 0x14]
@@ -772112,7 +772113,7 @@ sub_819ED78: ; 819ED78
@0819EDA4:
movs r0, 0x3
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
.pool
@@ -772148,7 +772149,7 @@ sub_819EDBC: ; 819EDBC
@0819EDF6:
movs r0, 0x3
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
.pool
@@ -772186,10 +772187,10 @@ sub_819EE08: ; 819EE08
movs r2, 0xA
bl gpu_pal_apply
movs r0, 0x7
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x7
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x03001284
ldr r1, [r0]
ldrb r0, [r1, 0x3]
@@ -772197,7 +772198,7 @@ sub_819EE08: ; 819EE08
bls @0819EE74
movs r0, 0x7
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0819EED8
.pool
@0819EE74:
@@ -772246,7 +772247,7 @@ sub_819EE08: ; 819EE08
bl box_print
movs r0, 0x7
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0819EED8:
add sp, 0x18
pop {r4}
@@ -772274,7 +772275,7 @@ sub_819EEF0: ; 819EEF0
bls @0819EF2C
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0819EF90
.pool
@0819EF2C:
@@ -772323,7 +772324,7 @@ sub_819EEF0: ; 819EEF0
bl box_print
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0819EF90:
add sp, 0xC
pop {r4}
@@ -772342,17 +772343,17 @@ sub_819EFA8: ; 819EFA8
adds r5, r4, 0
movs r0, 0x8
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r4, 0x2
bls @0819EFD0
movs r0, 0x8
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0819F03A
.pool
@0819EFD0:
movs r0, 0x8
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, [r6]
ldrb r0, [r0, 0x14]
cmp r0, 0
@@ -772396,7 +772397,7 @@ sub_819EFA8: ; 819EFA8
bl Print
movs r0, 0x8
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0819F03A:
add sp, 0x2C
pop {r4-r6}
@@ -772986,10 +772987,10 @@ sub_819F488: ; 819F488
beq @0819F58A
movs r0, 0x5
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x5
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @0819F54E
@0819F548:
ldr r0, =gUnknown_085EEC8B
@@ -775160,7 +775161,7 @@ sub_81A04E4: ; 81A04E4
ldr r1, [r0]
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
cmp r0, r5
ble @081A0674
adds r5, r0, 0
@@ -775331,15 +775332,15 @@ sub_81A0784: ; 81A0784
str r0, [sp, 0x18]
str r1, [sp, 0x1C]
add r0, sp, 0x18
- bl Window_AddFromTemplate
+ bl AddWindow
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
add sp, 0x20
pop {r4,r5}
@@ -775357,7 +775358,7 @@ sub_81A07E8: ; 81A07E8
movs r1, 0x1
bl sub_8198070
adds r0, r4, 0
- bl Window_Remove
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -778128,14 +778129,14 @@ sub_81A1EA8: ; 81A1EA8
lsrs r7, r0, 24
ldr r4, =0x0203ab74
ldr r0, =gUnknown_08611C74
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r7, 0
bne @081A1EF0
ldr r0, =0x02021fc4
@@ -778221,10 +778222,10 @@ sub_81A1EA8: ; 81A1EA8
movs r3, 0x84
bl sub_81A1D78
ldrb r0, [r6]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -778416,14 +778417,14 @@ sub_81A2134: ; 81A2134
lsrs r7, r0, 24
ldr r4, =0x0203ab74
ldr r0, =gUnknown_08611C74
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r7, 0
bne @081A217C
ldr r0, =0x02021fc4
@@ -778536,11 +778537,11 @@ sub_81A2134: ; 81A2134
bl sub_81A2008
ldr r1, =0x0203ab74
ldrb r0, [r1]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =0x0203ab74
ldrb r0, [r1]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -778769,14 +778770,14 @@ sub_81A2460: ; 81A2460
lsrs r7, r0, 24
ldr r4, =0x0203ab74
ldr r0, =gUnknown_08611C74
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r7, 0
bne @081A24A8
ldr r0, =0x02021fc4
@@ -778846,10 +778847,10 @@ sub_81A2460: ; 81A2460
movs r3, 0x83
bl sub_81A2358
ldrb r0, [r6]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -779017,14 +779018,14 @@ sub_81A2698: ; 81A2698
sub sp, 0xC
ldr r6, =0x0203ab74
ldr r0, =gUnknown_08611C74
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6]
ldrb r0, [r6]
movs r1, 0
bl sub_81973FC
ldrb r0, [r6]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =0x02021fc4
ldr r1, =gUnknown_085EE261
adds r0, r4, 0
@@ -779118,10 +779119,10 @@ sub_81A2698: ; 81A2698
movs r3, 0x40
bl sub_81A258C
ldrb r0, [r6]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -779320,14 +779321,14 @@ sub_81A2968: ; 81A2968
sub sp, 0xC
ldr r5, =0x0203ab74
ldr r0, =gUnknown_08611C74
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0
bl sub_81973FC
ldrb r0, [r5]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0xA
bl sub_81A1C90
ldr r4, =0x02021fc4
@@ -779378,10 +779379,10 @@ sub_81A2968: ; 81A2968
movs r3, 0x71
bl sub_81A2888
ldrb r0, [r5]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r5]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -779695,14 +779696,14 @@ sub_81A2C94: ; 81A2C94
lsrs r7, r0, 24
ldr r4, =0x0203ab74
ldr r0, =gUnknown_08611C74
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r7, 0
bne @081A2CD8
ldr r0, =0x02021fc4
@@ -779787,11 +779788,11 @@ sub_81A2C94: ; 81A2C94
bl sub_81A2B04
mov r1, r8
ldrb r0, [r1]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
mov r1, r8
ldrb r0, [r1]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
@@ -779990,14 +779991,14 @@ sub_81A2F38: ; 81A2F38
sub sp, 0xC
ldr r5, =0x0203ab74
ldr r0, =gUnknown_08611C74
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5]
ldrb r0, [r5]
movs r1, 0
bl sub_81973FC
ldrb r0, [r5]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =0x02021fc4
ldr r1, =gUnknown_085EE2D8
adds r0, r4, 0
@@ -780048,10 +780049,10 @@ sub_81A2F38: ; 81A2F38
movs r3, 0x71
bl sub_81A2E54
ldrb r0, [r5]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r5]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -780068,14 +780069,14 @@ sub_81A2FF8: ; 81A2FF8
sub sp, 0xC
ldr r4, =0x0203ab74
ldr r0, =gUnknown_08611C7C
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x02021fc4
mov r9, r0
ldr r1, =gUnknown_085EDF86
@@ -780256,10 +780257,10 @@ sub_81A2FF8: ; 81A2FF8
cmp r1, 0x4
ble @081A314A
ldrb r0, [r6]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r6]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -783115,23 +783116,23 @@ sub_81A4AA0: ; 81A4AA0
push {r4,lr}
ldr r4, =0x0203ab74
ldr r0, =gUnknown_08611C84
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl sub_81973FC
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x020375e2
ldrh r0, [r0]
movs r1, 0
bl sub_81A4998
ldrb r0, [r4]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -783144,14 +783145,14 @@ sub_81A4AE8: ; 81A4AE8
ldr r4, =0x0203ab74
ldrb r0, [r4]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x020375e2
ldrh r0, [r0]
movs r1, 0x1
bl sub_81A4998
ldrb r0, [r4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -796044,7 +796045,7 @@ sub_81AB520: ; 81AB520
str r0, [sp, 0x4]
mov r0, r8
movs r2, 0x8
- bl Window_CopyWholePixelBlockToWindow
+ bl BlitSurfaceToWindow
@081AB5BE:
ldrb r0, [r5, 0x5]
cmp r0, 0x3
@@ -796130,7 +796131,7 @@ sub_81AB520: ; 81AB520
str r0, [sp, 0x4]
mov r0, r8
movs r2, 0x60
- bl Window_CopyWholePixelBlockToWindow
+ bl BlitSurfaceToWindow
@081AB696:
add sp, 0x14
pop {r3,r4}
@@ -796182,7 +796183,7 @@ bag_menu_print_description_box_text: ; 81AB6B0
@081AB6FC:
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -796247,7 +796248,7 @@ sub_81AB75C: ; 81AB75C
movs r1, 0
movs r2, 0
adds r3, r5, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
b @081AB7AE
@081AB798:
ldr r2, =gUnknown_085E8D60
@@ -796403,7 +796404,7 @@ free_bag_item_list_buffers: ; 81AB8C8
ldr r0, =0x0203ce74
ldr r0, [r0]
bl free
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x0203ce54
ldr r0, [r0]
bl free
@@ -796732,7 +796733,7 @@ sub_81ABB4C: ; 81ABB4C
lsrs r0, 24
strh r0, [r4, 0x14]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
bl sav2_get_text_speed
lsls r0, 24
lsrs r0, 24
@@ -797115,11 +797116,11 @@ set_callback3_to_bag: ; 81ABECC
bl sub_81AB7BC
bl sub_81AB854
movs r0, 0x3
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x4
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r1, =0x03005e00
@@ -797239,9 +797240,9 @@ sub_81ABFA8: ; 81ABFA8
cmp r2, 0
bne @081AC026
movs r0, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x1
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
ldr r3, =0x0203ce58
ldrb r2, [r3, 0x5]
@@ -797486,9 +797487,9 @@ sub_81AC10C: ; 81AC10C
lsrs r0, 24
strh r0, [r6]
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
bl sub_81AB7BC
@@ -797646,7 +797647,7 @@ sub_81AC2E8: ; 81AC2E8
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
str r5, [sp, 0x4]
@@ -798338,14 +798339,14 @@ sub_81AC644: ; 81AC644
cmp r0, 0x2
bne @081ACA50
movs r0, 0x1
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, =0x0203ce7c
ldrh r0, [r0]
bl sub_81AE2FC
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x4
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
b @081ACA86
@@ -798361,7 +798362,7 @@ sub_81AC644: ; 81AC644
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -798874,7 +798875,7 @@ sub_81ACE7C: ; 81ACE7C
@081ACEB8:
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =0x0203ce58
@@ -798931,7 +798932,7 @@ sub_81ACEF4: ; 81ACEF4
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -798987,7 +798988,7 @@ sub_81ACF88: ; 81ACF88
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -799124,7 +799125,7 @@ display_threw_away_item_str: ; 81AD0CC
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -800116,7 +800117,7 @@ display_deposit_item_ask_str: ; 81AD9EC
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -800230,7 +800231,7 @@ sub_81ADB14: ; 81ADB14
mov r8, r2
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =0x0203ce7c
ldrh r0, [r4]
bl itemid_is_unique
@@ -800707,12 +800708,12 @@ sub_81ADF20: ; 81ADF20
orrs r0, r1
str r0, [sp, 0x18]
add r0, sp, 0x14
- bl Window_AddFromTemplate
+ bl AddWindow
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x40
@@ -800756,7 +800757,7 @@ sub_81ADF20: ; 81ADF20
@081ADFBA:
adds r0, r6, 0
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
ldr r1, =0x0203ce54
ldr r1, [r1]
ldr r2, =0x00000844
@@ -800764,7 +800765,7 @@ sub_81ADF20: ; 81ADF20
ldr r2, =0x04000100
bl CpuSet
adds r0, r6, 0
- bl Window_Remove
+ bl RemoveWindow
add sp, 0x1C
pop {r3,r4}
mov r8, r3
@@ -800789,7 +800790,7 @@ sub_81ADFF8: ; 81ADFF8
adds r4, r0
movs r0, 0x2
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
adds r5, r0, 0
lsls r0, r7, 5
adds r0, r4, r0
@@ -800810,7 +800811,7 @@ sub_81ADFF8: ; 81ADFF8
bl CpuSet
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4-r7}
pop {r0}
bx r0
@@ -800821,8 +800822,8 @@ sub_81ADFF8: ; 81ADFF8
setup_bag_menu_textboxes: ; 81AE054
push {r4,lr}
ldr r0, =gUnknown_08614174
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
@@ -800842,9 +800843,9 @@ setup_bag_menu_textboxes: ; 81AE054
@081AE088:
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -800946,7 +800947,7 @@ sub_81AE13C: ; 81AE13C
lsls r0, r2, 3
ldr r1, =gUnknown_086141AC
adds r0, r1
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
@@ -800980,9 +800981,9 @@ sub_81AE184: ; 81AE184
movs r1, 0
bl sub_8198070
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
@@ -801011,7 +801012,7 @@ sub_81AE1C4: ; 81AE1C4
lsls r0, r2, 3
ldr r1, =gUnknown_086141AC
adds r0, r1
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
@081AE1E8:
ldrb r0, [r4]
@@ -801038,9 +801039,9 @@ sub_81AE1F8: ; 81AE1F8
movs r1, 0
bl sub_8197DF8
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
@@ -801121,7 +801122,7 @@ sub_81AE2B4: ; 81AE2B4
push {lr}
movs r0, 0x3
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0x13
movs r2, 0
@@ -801144,7 +801145,7 @@ sub_81AE2B4: ; 81AE2B4
bl sub_819A2F8
movs r0, 0x3
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_81AE2B4
@@ -801160,7 +801161,7 @@ sub_81AE2FC: ; 81AE2FC
lsrs r4, r0, 16
movs r0, 0x4
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r4, 0
bne @081AE354
movs r4, 0
@@ -801188,7 +801189,7 @@ sub_81AE2FC: ; 81AE2FC
bls @081AE31A
movs r0, 0x4
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081AE440
.pool
@081AE354:
@@ -801296,7 +801297,7 @@ sub_81AE2FC: ; 81AE2FC
bl sub_81AE0BC
movs r0, 0x4
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081AE440:
add sp, 0x14
pop {r3,r4}
@@ -801344,7 +801345,7 @@ sub_81AE45C: ; 81AE45C
beq @081AE558
@081AE492:
mov r0, r12
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5, 0x5]
cmp r6, 0x1
beq @081AE4B0
@@ -801381,7 +801382,7 @@ sub_81AE45C: ; 81AE45C
strb r0, [r4, 0x6]
ldrb r0, [r4, 0x5]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
strb r0, [r4, 0x4]
b @081AE570
@@ -801415,7 +801416,7 @@ sub_81AE45C: ; 81AE45C
cmp r6, 0
bne @081AE534
ldrb r0, [r5, 0x5]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
b @081AE546
.pool
@081AE534:
@@ -801431,7 +801432,7 @@ sub_81AE45C: ; 81AE45C
ldr r0, =0x0203ce84
ldrb r0, [r0, 0x5]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081AE570
.pool
@081AE558:
@@ -801440,7 +801441,7 @@ sub_81AE45C: ; 81AE45C
movs r2, 0
bl sub_81AE6C8
ldrb r0, [r5, 0x5]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0
strb r0, [r5, 0x4]
ldr r0, [r5]
@@ -801472,10 +801473,10 @@ calls_per_item_funcs_in_list_outer: ; 81AE584
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5, 0x10]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r5, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
pop {r4,r5}
pop {r1}
@@ -801510,7 +801511,7 @@ sub_81AE5B0: ; 81AE5B0
str r4, [sp]
ldrb r4, [r5, 0x4]
str r4, [sp, 0x4]
- bl Window_WriteStandardTileMapRectOverridePalette
+ bl PutWindowRectTileMapOverridePalette
adds r5, 0x8
ldrb r0, [r5, 0x4]
cmp r0, 0xFF
@@ -801518,7 +801519,7 @@ sub_81AE5B0: ; 81AE5B0
@081AE5F0:
ldrb r0, [r6, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r7, 0
add sp, 0x8
pop {r4-r7}
@@ -801691,7 +801692,7 @@ sub_81AE70C: ; 81AE70C
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrh r1, [r4, 0x18]
ldrh r3, [r4, 0xE]
adds r0, r4, 0
@@ -801701,7 +801702,7 @@ sub_81AE70C: ; 81AE70C
bl sub_81AEB20
ldrb r0, [r4, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -801764,11 +801765,11 @@ sub_81AE794: ; 81AE794
ldrb r0, [r4, 0x10]
movs r1, 0x1
adds r2, r3, 0
- bl Window_SetField
+ bl SetWindowAttribute
ldrb r0, [r4, 0x10]
movs r1, 0x2
adds r2, r5, 0
- bl Window_SetField
+ bl SetWindowAttribute
pop {r4,r5}
pop {r0}
bx r0
@@ -801895,7 +801896,7 @@ sub_81AE88C: ; 81AE88C
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl fbox_get_field
+ bl GetFontAttribute
ldrb r1, [r4, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -802002,7 +802003,7 @@ calls_per_item_funcs_in_list: ; 81AE8D4
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrh r1, [r7, 0x18]
ldrh r3, [r7, 0xE]
adds r0, r7, 0
@@ -802135,7 +802136,7 @@ calls_printshopbuyprice: ; 81AEA68
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl fbox_get_field
+ bl GetFontAttribute
ldrb r1, [r4, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -802221,7 +802222,7 @@ sub_81AEB20: ; 81AEB20
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl fbox_get_field
+ bl GetFontAttribute
ldrb r1, [r6, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -802273,7 +802274,7 @@ sub_81AEB20: ; 81AEB20
ldrb r5, [r6, 0x1E]
ldrb r0, [r6, 0x10]
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
adds r4, r0, 0
lsls r4, 19
ldr r0, =0xffff0000
@@ -802281,7 +802282,7 @@ sub_81AEB20: ; 81AEB20
lsrs r4, 16
ldrb r0, [r6, 0x10]
movs r1, 0x2
- bl Window_GetField
+ bl GetWindowAttribute
adds r2, r0, 0
lsls r2, 3
adds r2, r7
@@ -802306,7 +802307,7 @@ sub_81AEB20: ; 81AEB20
ldrb r5, [r6, 0x1E]
ldrb r0, [r6, 0x10]
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
adds r4, r0, 0
lsls r4, 3
add r4, r8
@@ -802314,7 +802315,7 @@ sub_81AEB20: ; 81AEB20
lsrs r4, 16
ldrb r0, [r6, 0x10]
movs r1, 0x2
- bl Window_GetField
+ bl GetWindowAttribute
adds r2, r0, 0
lsls r2, 3
adds r2, r7
@@ -802345,7 +802346,7 @@ sub_81AEC18: ; 81AEC18
strb r0, [r1, 0x1]
ldrb r0, [r4, 0x10]
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
mov r1, sp
lsls r0, 3
adds r0, 0x2
@@ -802354,7 +802355,7 @@ sub_81AEC18: ; 81AEC18
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl fbox_get_field
+ bl GetFontAttribute
mov r1, sp
lsls r0, 24
lsrs r0, 24
@@ -802396,7 +802397,7 @@ sub_81AEC78: ; 81AEC78
lsls r0, r1, 26
lsrs r0, 26
movs r1, 0x1
- bl fbox_get_field
+ bl GetFontAttribute
adds r4, r0, 0
ldrb r0, [r7, 0x16]
lsls r0, 26
@@ -802438,7 +802439,7 @@ sub_81AEC78: ; 81AEC78
str r5, [sp]
str r0, [sp, 0x4]
adds r0, r6, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
@081AECF4:
add sp, 0x8
pop {r3}
@@ -802610,7 +802611,7 @@ sub_81AEDF0: ; 81AEDF0
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrh r1, [r6, 0x18]
ldrh r3, [r6, 0xE]
adds r0, r6, 0
@@ -802622,7 +802623,7 @@ sub_81AEDF0: ; 81AEDF0
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl fbox_get_field
+ bl GetFontAttribute
ldrb r1, [r6, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -802643,7 +802644,7 @@ sub_81AEDF0: ; 81AEDF0
orrs r3, r1
lsrs r3, 24
movs r1, 0x1
- bl Window_ScrollVertically
+ bl ScrollWindow
ldrh r1, [r6, 0x18]
adds r0, r6, 0
movs r2, 0
@@ -802661,13 +802662,13 @@ sub_81AEDF0: ; 81AEDF0
lsrs r4, 16
ldrb r0, [r6, 0x10]
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
adds r5, r0, 0
lsls r5, 19
lsrs r5, 16
ldrb r0, [r6, 0x10]
movs r1, 0x4
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 3
subs r0, r4
lsls r0, 16
@@ -802683,7 +802684,7 @@ sub_81AEDF0: ; 81AEDF0
adds r0, r3, 0
movs r2, 0
adds r3, r4, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
b @081AEF1A
@081AEEBC:
ldrb r0, [r6, 0x10]
@@ -802697,7 +802698,7 @@ sub_81AEDF0: ; 81AEDF0
orrs r3, r1
lsrs r3, 24
movs r1, 0
- bl Window_ScrollVertically
+ bl ScrollWindow
ldrh r2, [r6, 0xE]
subs r2, r7
ldrh r1, [r6, 0x18]
@@ -802711,7 +802712,7 @@ sub_81AEDF0: ; 81AEDF0
bl calls_printshopbuyprice
ldrb r0, [r6, 0x10]
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 19
lsrs r0, 16
ldrb r3, [r6, 0x10]
@@ -802728,7 +802729,7 @@ sub_81AEDF0: ; 81AEDF0
adds r0, r3, 0
movs r2, 0
movs r3, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
@081AEF1A:
add sp, 0x8
pop {r3}
@@ -802819,7 +802820,7 @@ sub_81AEF28: ; 81AEF28
bl calls_printshopitemdescription
ldrb r0, [r4, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081AEFEE
@081AEFC6:
adds r0, r4, 0
@@ -802836,7 +802837,7 @@ sub_81AEF28: ; 81AEF28
bl calls_printshopitemdescription
ldrb r0, [r4, 0x10]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081AEFEE:
movs r0, 0
@081AEFF0:
@@ -805715,7 +805716,7 @@ sub_81B06F4: ; 81B06F4
beq @081B0726
bl free
@081B0726:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
.pool
@@ -805845,11 +805846,11 @@ sub_81B07E0: ; 81B07E0
adds r0, r5, r0
ldrb r0, [r0, 0x8]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, [r4]
adds r0, r5, r0
ldrb r0, [r0, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
b @081B093E
@@ -805877,7 +805878,7 @@ sub_81B07E0: ; 81B07E0
adds r0, r5, r0
ldrb r0, [r0, 0x8]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081B092C
.pool
@081B089C:
@@ -805955,7 +805956,7 @@ sub_81B07E0: ; 81B07E0
ldr r0, [r0]
adds r0, r5, r0
ldrb r0, [r0, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
@081B093E:
@@ -808275,7 +808276,7 @@ sub_81B1B8C: ; 81B1B8C
movs r1, 0
bl sub_8198070
movs r0, 0x6
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081B1BC2:
adds r0, r5, 0
bl remove_task
@@ -808339,7 +808340,7 @@ sub_81B1C1C: ; 81B1C1C
movs r1, 0
bl sub_8198070
movs r0, 0x6
- bl Window_FillTileMap
+ bl ClearWindowTileMap
bl sub_81221AC
lsls r0, 24
lsrs r0, 24
@@ -809274,29 +809275,29 @@ sub_81B239C: ; 81B239C
b @081B23DC
@081B23B8:
ldr r0, =gUnknown_08615810
- bl Window_InitFromTemplates
+ bl InitWindows
b @081B23E2
.pool
@081B23C4:
ldr r0, =gUnknown_08615850
- bl Window_InitFromTemplates
+ bl InitWindows
b @081B23E2
.pool
@081B23D0:
ldr r0, =gUnknown_08615890
- bl Window_InitFromTemplates
+ bl InitWindows
b @081B23E2
.pool
@081B23DC:
ldr r0, =gUnknown_086158D0
- bl Window_InitFromTemplates
+ bl InitWindows
@081B23E2:
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
movs r4, 0
@081B23E8:
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -809337,13 +809338,13 @@ sub_81B2428: ; 81B2428
cmp r2, 0x1
bne @081B24B4
ldr r0, =gUnknown_08615918
- bl Window_AddFromTemplate
+ bl AddWindow
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_085E8CE3
movs r0, 0
adds r1, r5, 0
@@ -809365,12 +809366,12 @@ sub_81B2428: ; 81B2428
movs r3, 0x1
bl sub_8199EEC
adds r0, r4, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =gUnknown_08615910
- bl Window_AddFromTemplate
+ bl AddWindow
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0
@@ -809378,14 +809379,14 @@ sub_81B2428: ; 81B2428
.pool
@081B24B4:
ldr r0, =gUnknown_08615908
- bl Window_AddFromTemplate
+ bl AddWindow
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0x3
@081B24C0:
adds r0, r5, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x0203cec8
ldrb r1, [r0, 0x8]
movs r0, 0xF
@@ -809437,10 +809438,10 @@ sub_81B2428: ; 81B2428
bl box_print
@081B2540:
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r5, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
@081B2554:
@@ -809565,7 +809566,7 @@ sub_81B2578: ; 81B2578
str r0, [sp, 0x4]
ldr r0, [sp, 0x8]
mov r1, r9
- bl Window_CopyWholePixelBlockToWindow
+ bl BlitSurfaceToWindow
mov r0, r9
bl free
@081B2646:
@@ -809713,7 +809714,7 @@ sub_81B2748: ; 81B2748
adds r5, r4, 0
ldrb r0, [r0, 0x8]
movs r1, 0x5
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 28
lsrs r6, r0, 24
adds r7, r6, 0
@@ -810232,7 +810233,7 @@ sub_81B2BF4: ; 81B2BF4
adds r5, r4, 0
ldrb r0, [r7, 0x8]
movs r1, 0x5
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 28
lsrs r6, r0, 24
cmp r4, 0
@@ -810527,7 +810528,7 @@ sub_81B2E64: ; 81B2E64
mov r9, r1
ldrb r0, [r6, 0x8]
movs r1, 0x5
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 28
lsrs r7, r0, 24
mov r1, r8
@@ -810602,7 +810603,7 @@ sub_81B2E64: ; 81B2E64
str r5, [sp]
movs r7, 0x1
str r7, [sp, 0x4]
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldrb r0, [r6, 0x8]
ldrb r1, [r4]
ldr r3, [r6]
@@ -810612,7 +810613,7 @@ sub_81B2E64: ; 81B2E64
str r5, [sp]
movs r4, 0x2
str r4, [sp, 0x4]
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldr r1, [r6]
ldrb r0, [r1, 0x1A]
cmp r5, r0
@@ -810628,7 +810629,7 @@ sub_81B2E64: ; 81B2E64
str r1, [sp]
str r7, [sp, 0x4]
movs r1, 0xD
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldrb r0, [r6, 0x8]
ldr r1, [r6]
ldrb r2, [r1, 0x18]
@@ -810642,11 +810643,11 @@ sub_81B2E64: ; 81B2E64
str r1, [sp]
str r4, [sp, 0x4]
movs r1, 0x2
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
@081B2F88:
ldrb r0, [r6, 0x8]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x8
pop {r3,r4}
mov r8, r3
@@ -810734,7 +810735,7 @@ sub_81B302C: ; 81B302C
movs r1, 0
bl sub_8198070
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
movs r0, 0x2
@@ -810799,13 +810800,13 @@ sub_81B3054: ; 81B3054
@081B30C4:
ldr r0, =gUnknown_08615948
@081B30C6:
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5]
b @081B30DC
.pool
@081B30D4:
ldr r0, =gUnknown_08615920
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4, 0xD]
@081B30DC:
cmp r6, 0
@@ -810973,7 +810974,7 @@ sub_81B31B0: ; 81B31B0
str r1, [sp, 0x18]
@081B3226:
add r0, sp, 0x14
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r6, =0x0203cec4
ldr r1, [r6]
strb r0, [r1, 0xC]
@@ -810997,7 +810998,7 @@ sub_81B31B0: ; 81B31B0
mov r9, r0
movs r0, 0x1
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -811127,7 +811128,7 @@ sub_81B334C: ; 81B334C
sub_81B3364: ; 81B3364
push {r4,lr}
ldr r0, =gUnknown_08615970
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r4, =0x0203cec4
ldr r1, [r4]
strb r0, [r1, 0xC]
@@ -811151,7 +811152,7 @@ sub_81B3394: ; 81B3394
ldr r4, =0x0203cec4
ldr r0, [r4]
ldrb r0, [r0, 0xC]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, [r4]
adds r0, 0xC
bl sub_81B302C
@@ -811834,22 +811835,22 @@ sub_81B3938: ; 81B3938
adds r0, r2, 0
ldrb r0, [r0]
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
strh r0, [r6]
add r0, sp, 0x8
ldrb r0, [r0]
movs r1, 0x2
- bl Window_GetField
+ bl GetWindowAttribute
strh r0, [r6, 0x2]
add r0, sp, 0x8
ldrb r0, [r0]
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
strh r0, [r6, 0x4]
add r0, sp, 0x8
ldrb r0, [r0]
movs r1, 0x4
- bl Window_GetField
+ bl GetWindowAttribute
strh r0, [r6, 0x6]
strh r4, [r6, 0x10]
movs r1, 0x4
@@ -811880,22 +811881,22 @@ sub_81B3938: ; 81B3938
adds r0, r2, 0
ldrb r0, [r0, 0x1]
movs r1, 0x1
- bl Window_GetField
+ bl GetWindowAttribute
strh r0, [r6, 0x8]
add r0, sp, 0x8
ldrb r0, [r0, 0x1]
movs r1, 0x2
- bl Window_GetField
+ bl GetWindowAttribute
strh r0, [r6, 0xA]
add r0, sp, 0x8
ldrb r0, [r0, 0x1]
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
strh r0, [r6, 0xC]
add r0, sp, 0x8
ldrb r0, [r0, 0x1]
movs r1, 0x4
- bl Window_GetField
+ bl GetWindowAttribute
strh r0, [r6, 0xE]
strh r4, [r6, 0x12]
movs r1, 0xC
@@ -811949,10 +811950,10 @@ sub_81B3938: ; 81B3938
bl sub_8199CBC
add r0, sp, 0x8
ldrb r0, [r0]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
add r0, sp, 0x8
ldrb r0, [r0, 0x1]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r4, =0x0203cec8
movs r0, 0x9
strb r0, [r4, 0xB]
@@ -812363,14 +812364,14 @@ sub_81B3D48: ; 81B3D48
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0xA
ldrsb r0, [r4, r0]
ldr r1, [r5]
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, =0x0203cef0
ldr r1, [r0]
ldrb r2, [r6]
@@ -812397,14 +812398,14 @@ sub_81B3D48: ; 81B3D48
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0xA
ldrsb r0, [r4, r0]
ldr r1, [r5]
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
mov r0, r8
subs r0, 0x8
adds r0, r7, r0
@@ -812450,14 +812451,14 @@ sub_81B3E60: ; 81B3E60
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0xA
ldrsb r0, [r5, r0]
ldr r1, [r4]
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =0x0203cef0
@@ -818761,7 +818762,7 @@ sub_81B767C: ; 81B767C
bl sub_81D3640
ldrb r0, [r4, 0x18]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
@@ -818791,7 +818792,7 @@ sub_81B76C8: ; 81B76C8
bl sub_81D3784
ldrb r0, [r4, 0x18]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x4
@@ -823931,7 +823932,7 @@ sub_81BA040: ; 81BA040
thumb_func_end sub_81BA040
thumb_func_start Font6Func
-; int Font6Func(struct TextBox *x)
+; int Font6Func(struct TextPrinter *x)
Font6Func: ; 81BA250
push {r4-r6,lr}
adds r6, r0, 0
@@ -824190,7 +824191,7 @@ Font6Func: ; 81BA250
lsls r2, 24
lsrs r2, 28
@081BA472:
- bl GenerateFontHalfRowLut
+ bl GenerateFontHalfRowLookupTable
b @081BA35E
@081BA478:
ldr r0, [r6]
@@ -824269,7 +824270,7 @@ Font6Func: ; 81BA250
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
b @081BA35E
@081BA500:
movs r0, 0x2
@@ -824279,7 +824280,7 @@ Font6Func: ; 81BA250
@081BA506:
strb r0, [r6, 0x1C]
adds r0, r6, 0
- bl sub_80054F8
+ bl TextPrinterInitDownArrowCounters
@081BA50E:
movs r0, 0x3
b @081BA662
@@ -824317,7 +824318,7 @@ Font6Func: ; 81BA250
.pool
@081BA554:
adds r0, r6, 0
- bl remo_is_it_time_to_continue
+ bl TextPrinterWait
lsls r0, 16
cmp r0, 0
beq @081BA50E
@@ -824326,7 +824327,7 @@ Font6Func: ; 81BA250
b @081BA50E
@081BA566:
adds r0, r6, 0
- bl remo_is_it_time_to_continue_plus_down_arrow
+ bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
beq @081BA50E
@@ -824336,7 +824337,7 @@ Font6Func: ; 81BA250
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r6, 0x6]
movs r1, 0
strb r0, [r6, 0x8]
@@ -824346,12 +824347,12 @@ Font6Func: ; 81BA250
b @081BA50E
@081BA590:
adds r0, r6, 0
- bl remo_is_it_time_to_continue_plus_down_arrow
+ bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
beq @081BA50E
adds r0, r6, 0
- bl remo_clear_down_arrow
+ bl TextPrinterClearDownArrow
ldrb r1, [r6, 0x5]
ldr r0, =0x03002f80
ldr r2, [r0]
@@ -824390,7 +824391,7 @@ Font6Func: ; 81BA250
orrs r3, r1
lsrs r3, 24
movs r1, 0
- bl Window_ScrollVertically
+ bl ScrollWindow
movs r0, 0
strb r0, [r6, 0x1F]
b @081BA62E
@@ -824406,7 +824407,7 @@ Font6Func: ; 81BA250
orrs r3, r1
lsrs r3, 24
movs r1, 0
- bl Window_ScrollVertically
+ bl ScrollWindow
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsls r0, 29
@@ -824419,7 +824420,7 @@ Font6Func: ; 81BA250
@081BA62E:
ldrb r0, [r6, 0x4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081BA50E
@081BA638:
strb r2, [r6, 0x1C]
@@ -825085,7 +825086,7 @@ bx_t3_healthbar_update: ; 81BB214
sub_81BB284: ; 81BB284
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @081BB296
@@ -825771,7 +825772,7 @@ sub_81BB828: ; 81BB828
sub_81BB898: ; 81BB898
push {lr}
movs r0, 0
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @081BB8AA
@@ -831624,7 +831625,7 @@ sub_81BEBF4: ; 81BEBF4
.4byte @081BED00
.4byte @081BED1C
@081BEC40:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
movs r1, 0x7
movs r2, 0x2
@@ -832785,8 +832786,8 @@ sub_81BF5A4: ; 81BF5A4
movs r2, 0
bl bg_change_y_offset
ldr r0, =gUnknown_08618110
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
ldr r0, =gUnknown_08618138
str r0, [r4]
ldr r0, =0x050001e0
@@ -832799,18 +832800,18 @@ sub_81BF5A4: ; 81BF5A4
bl lcd_io_set
movs r0, 0x2
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_08617E9B
movs r0, 0
adds r1, r5, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r1, r0, 0
movs r4, 0x78
subs r0, r4, r1
@@ -832834,7 +832835,7 @@ sub_81BF5A4: ; 81BF5A4
movs r0, 0
adds r1, r5, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r1, r0, 0
subs r4, r1
lsrs r0, r4, 31
@@ -832855,7 +832856,7 @@ sub_81BF5A4: ; 81BF5A4
movs r0, 0
adds r1, r5, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r1, r0, 0
movs r0, 0x70
subs r0, r1
@@ -832876,7 +832877,7 @@ sub_81BF5A4: ; 81BF5A4
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r1, r0, 0
movs r0, 0xD0
subs r0, r1
@@ -832896,13 +832897,13 @@ sub_81BF5A4: ; 81BF5A4
bl box_print
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r3}
mov r8, r3
@@ -832963,7 +832964,7 @@ sub_81BF7E8: ; 81BF7E8
bl bg_fill_tilemap_rect
movs r0, 0x1
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =gUnknown_08618158
str r0, [sp]
movs r0, 0x1
@@ -832980,10 +832981,10 @@ sub_81BF7E8: ; 81BF7E8
movs r3, 0
bl box_print
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
cmp r6, 0x5
bhi @081BF87E
ldr r0, =@081BF850
@@ -833001,15 +833002,15 @@ sub_81BF7E8: ; 81BF7E8
.4byte @081BF878
@081BF868:
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081BF87E
@081BF870:
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081BF87E
@081BF878:
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081BF87E:
movs r0, 0
bl gpu_copy_wram_bg_tilemap_to_vram
@@ -834220,9 +834221,9 @@ sub_81C0348: ; 81C0348
movs r2, 0x1
bl bg_change_x_offset
movs r0, 0x13
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0xD
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081C03D8:
ldr r0, =0x0203cf1c
ldr r1, [r0]
@@ -834246,7 +834247,7 @@ sub_81C0348: ; 81C0348
cmp r0, 0x1
bls @081C0416
movs r0, 0xD
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081C0416:
bl sub_81C2524
ldr r0, =0x0203cf1c
@@ -834262,7 +834263,7 @@ sub_81C0348: ; 81C0348
thumb_func_start sub_81C0434
sub_81C0434: ; 81C0434
push {lr}
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x0203cf1c
ldr r0, [r0]
bl free
@@ -834554,7 +834555,7 @@ sub_81C0604: ; 81C0604
movs r1, 0x1
bl sub_81C4204
movs r0, 0xD
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
@@ -835427,7 +835428,7 @@ sub_81C0E48: ; 81C0E48
ldrh r6, [r1]
mov r8, r6
movs r0, 0x13
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r2, =0x02020630
ldr r0, [r5]
ldr r1, =0x000040d5
@@ -835443,7 +835444,7 @@ sub_81C0E48: ; 81C0E48
cmp r0, 0
blt @081C0E96
movs r0, 0xD
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081C0E96:
movs r4, 0x3
negs r4, r4
@@ -835461,9 +835462,9 @@ sub_81C0E48: ; 81C0E48
cmp r0, 0
bne @081C0EC4
movs r0, 0x5
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x6
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081C0EC4:
ldr r0, [r5]
ldr r1, =0x000020bc
@@ -835730,7 +835731,7 @@ sub_81C1070: ; 81C1070
bne @081C115E
@081C1118:
movs r0, 0x13
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r2, =0x02020630
ldr r0, =0x0203cf1c
ldr r0, [r0]
@@ -835747,7 +835748,7 @@ sub_81C1070: ; 81C1070
cmp r0, 0
blt @081C1142
movs r0, 0xD
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081C1142:
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
@@ -835777,9 +835778,9 @@ sub_81C1070: ; 81C1070
cmp r0, 0
bne @081C11A0
movs r0, 0xE
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0xF
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
@@ -835830,9 +835831,9 @@ sub_81C11F4: ; 81C11F4
movs r0, 0x8
bl sub_81C4C60
movs r0, 0x6
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl sub_81C3E9C
ldr r4, =0x0203cf1c
@@ -835856,9 +835857,9 @@ sub_81C11F4: ; 81C11F4
cmp r0, 0x4
beq @081C125E
movs r0, 0xE
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0xF
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0
movs r1, 0x3
bl sub_81C1DA4
@@ -836627,9 +836628,9 @@ sub_81C18F4: ; 81C18F4
lsls r4, 24
lsrs r4, 24
movs r0, 0xE
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0xF
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
@@ -836741,7 +836742,7 @@ sub_81C1940: ; 81C1940
b @081C1B74
@081C1A00:
movs r0, 0x13
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r2, =0x02020630
ldr r0, [r4]
ldr r1, =0x000040d5
@@ -836757,7 +836758,7 @@ sub_81C1940: ; 81C1940
cmp r0, 0
blt @081C1A28
movs r0, 0xD
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081C1A28:
ldr r1, [r4]
ldr r2, =0x000040c6
@@ -836797,7 +836798,7 @@ sub_81C1940: ; 81C1940
cmp r0, 0x3
beq @081C1B74
movs r0, 0x13
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r2, =0x02020630
ldr r0, [r4]
ldr r1, =0x000040d5
@@ -836813,7 +836814,7 @@ sub_81C1940: ; 81C1940
cmp r0, 0
blt @081C1AB0
movs r0, 0xD
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081C1AB0:
ldr r1, [r4]
ldr r2, =0x000040c6
@@ -836850,7 +836851,7 @@ sub_81C1940: ; 81C1940
cmp r0, 0
beq @081C1B74
movs r0, 0x13
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r2, =0x02020630
ldr r4, =0x0203cf1c
ldr r0, [r4]
@@ -836867,7 +836868,7 @@ sub_81C1940: ; 81C1940
cmp r0, 0
blt @081C1B38
movs r0, 0xD
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081C1B38:
ldr r1, [r4]
ldr r2, =0x000040c6
@@ -837294,7 +837295,7 @@ sub_81C1E20: ; 81C1E20
cmp r0, 0x2
bne @081C1ED4
movs r0, 0xE
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081C1ED4
.pool
@081C1EAC:
@@ -837313,10 +837314,10 @@ sub_81C1E20: ; 81C1E20
cmp r0, 0
blt @081C1ECE
movs r0, 0xD
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081C1ECE:
movs r0, 0x13
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081C1ED4:
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
@@ -837460,7 +837461,7 @@ sub_81C1F80: ; 81C1F80
cmp r0, 0
bne @081C2006
movs r0, 0xF
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081C2006:
ldrh r0, [r4, 0x4]
bl sub_81C240C
@@ -837482,10 +837483,10 @@ sub_81C1F80: ; 81C1F80
cmp r0, 0
blt @081C2046
movs r0, 0xD
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081C2046:
movs r0, 0x13
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081C204C:
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
@@ -837621,7 +837622,7 @@ sub_81C20F0: ; 81C20F0
bge @081C217A
bl sub_81C4A88
movs r0, 0xD
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
@081C217A:
@@ -838106,13 +838107,13 @@ sub_81C2524: ; 81C2524
sub_81C2554: ; 81C2554
push {r4,r5,lr}
ldr r0, =gUnknown_0861CC24
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r4, 0
@081C2562:
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -838180,13 +838181,13 @@ sub_81C25E8: ; 81C25E8
push {lr}
movs r0, 0x11
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x12
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x13
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r0, =0x0203cf1c
ldr r0, [r0]
adds r0, 0x74
@@ -838270,11 +838271,11 @@ sub_81C2628: ; 81C2628
bl sub_81C228C
@081C26C6:
movs r0, 0x11
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081C26EE
@081C26CE:
movs r0, 0x11
- bl Window_FillTileMap
+ bl ClearWindowTileMap
mov r0, r8
bl sub_806EBA4
lsls r0, 24
@@ -838341,9 +838342,9 @@ sub_81C2628: ; 81C2628
mov r0, r8
bl sub_81C27DC
movs r0, 0x12
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x13
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
add sp, 0x18
pop {r3}
mov r8, r3
@@ -838373,11 +838374,11 @@ sub_81C2794: ; 81C2794
movs r3, 0x1
bl sub_81C25A4
movs r0, 0x12
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x11
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x13
- bl Window_FillTileMap
+ bl ClearWindowTileMap
add sp, 0x8
pop {r4}
pop {r0}
@@ -838451,7 +838452,7 @@ sub_81C2838: ; 81C2838
adds r0, r4, 0
adds r1, r3, 0
movs r3, 0
- bl Window_CopyWholePixelBlockToWindow
+ bl BlitSurfaceToWindow
add sp, 0x8
pop {r4}
pop {r0}
@@ -838723,13 +838724,13 @@ sub_81C2AFC: ; 81C2AFC
lsrs r4, r0, 24
adds r5, r4, 0
movs r0, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x1
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x2
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x3
- bl Window_FillTileMap
+ bl ClearWindowTileMap
cmp r4, 0x1
beq @081C2B66
cmp r4, 0x1
@@ -838745,9 +838746,9 @@ sub_81C2AFC: ; 81C2AFC
b @081C2C06
@081C2B34:
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x4
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
bl sub_81A6BF4
lsls r0, 24
lsrs r0, 24
@@ -838760,24 +838761,24 @@ sub_81C2AFC: ; 81C2AFC
bne @081C2B5E
@081C2B58:
movs r0, 0x8
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081C2B5E:
movs r0, 0x9
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081C2C06
@081C2B66:
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0xA
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0xB
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0xC
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081C2C06
@081C2B80:
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, =0x0203cf1c
ldr r1, [r0]
ldr r2, =0x000040bc
@@ -838795,16 +838796,16 @@ sub_81C2AFC: ; 81C2AFC
cmp r0, r1
beq @081C2C06
movs r0, 0xE
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081C2C06
.pool
@081C2BBC:
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081C2C06
@081C2BC4:
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r0, =0x0203cf1c
ldr r1, [r0]
ldr r2, =0x000040bc
@@ -838822,12 +838823,12 @@ sub_81C2AFC: ; 81C2AFC
cmp r0, r1
beq @081C2C06
movs r0, 0xF
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081C2C06
.pool
@081C2C00:
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
@081C2C06:
movs r4, 0
ldr r5, =0x0203cf1c
@@ -838837,7 +838838,7 @@ sub_81C2AFC: ; 81C2AFC
adds r0, r1
adds r0, r4
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -838872,7 +838873,7 @@ sub_81C2C38: ; 81C2C38
b @081C2D0E
@081C2C58:
movs r0, 0x4
- bl Window_FillTileMap
+ bl ClearWindowTileMap
bl sub_81A6BF4
lsls r0, 24
lsrs r0, 24
@@ -838885,18 +838886,18 @@ sub_81C2C38: ; 81C2C38
bne @081C2C7C
@081C2C76:
movs r0, 0x8
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081C2C7C:
movs r0, 0x9
- bl Window_FillTileMap
+ bl ClearWindowTileMap
b @081C2D0E
@081C2C84:
movs r0, 0xA
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0xB
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0xC
- bl Window_FillTileMap
+ bl ClearWindowTileMap
b @081C2D0E
@081C2C98:
ldr r0, =0x0203cf1c
@@ -838916,12 +838917,12 @@ sub_81C2C38: ; 81C2C38
cmp r0, r1
beq @081C2D0E
movs r0, 0xE
- bl Window_FillTileMap
+ bl ClearWindowTileMap
b @081C2D0E
.pool
@081C2CCC:
movs r0, 0x5
- bl Window_FillTileMap
+ bl ClearWindowTileMap
b @081C2D0E
@081C2CD4:
ldr r0, =0x0203cf1c
@@ -838941,12 +838942,12 @@ sub_81C2C38: ; 81C2C38
cmp r0, r1
beq @081C2D0E
movs r0, 0xF
- bl Window_FillTileMap
+ bl ClearWindowTileMap
b @081C2D0E
.pool
@081C2D08:
movs r0, 0x5
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081C2D0E:
movs r4, 0
@081C2D10:
@@ -838980,11 +838981,11 @@ sub_81C2D2C: ; 81C2D2C
bne @081C2D56
lsls r0, r2, 3
adds r0, r3, r0
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
@081C2D56:
ldrb r0, [r4]
pop {r4}
@@ -839006,9 +839007,9 @@ sub_81C2D68: ; 81C2D68
ldrb r0, [r4]
cmp r0, 0xFF
beq @081C2D8C
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
@081C2D8C:
@@ -839034,7 +839035,7 @@ sub_81C2D9C: ; 81C2D9C
cmp r0, 0xFF
beq @081C2DBA
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
@081C2DBA:
adds r0, r4, 0x1
lsls r0, 16
@@ -839189,7 +839190,7 @@ sub_81C2EC4: ; 81C2EC4
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r2, r0, 0
ldr r0, =0x0203cf1c
ldr r1, [r0]
@@ -839704,7 +839705,7 @@ sub_81C335C: ; 81C335C
movs r0, 0x1
mov r1, r8
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r5, r0, 0
movs r0, 0
mov r9, r0
@@ -840692,7 +840693,7 @@ sub_81C3C5C: ; 81C3C5C
movs r1, 0
movs r2, 0x35
movs r3, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldr r2, =gBattleMoves
lsls r1, r5, 1
adds r0, r1, r5
@@ -840945,7 +840946,7 @@ sub_81C3E9C: ; 81C3E9C
lsrs r5, r0, 24
adds r0, r5, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r4, 0
beq @081C3F30
ldr r0, =0x0203cf1c
@@ -840989,12 +840990,12 @@ sub_81C3E9C: ; 81C3E9C
bl sub_81C25A4
@081C3F20:
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081C3F36
.pool
@081C3F30:
adds r0, r5, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
@081C3F36:
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
@@ -841142,10 +841143,10 @@ sub_81C4064: ; 81C4064
movs r1, 0
movs r2, 0
movs r3, 0x42
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
adds r0, r4, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x8
pop {r4}
pop {r0}
@@ -841194,7 +841195,7 @@ sub_81C40A0: ; 81C40A0
movs r1, 0
movs r2, 0
adds r3, r6, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
mov r0, r10
lsls r7, r0, 4
mov r0, r8
@@ -841205,7 +841206,7 @@ sub_81C40A0: ; 81C40A0
movs r1, 0
movs r2, 0
adds r3, r7, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
movs r4, 0x30
str r4, [sp]
movs r0, 0x10
@@ -841214,7 +841215,7 @@ sub_81C40A0: ; 81C40A0
movs r1, 0
movs r2, 0
adds r3, r6, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
str r4, [sp]
movs r0, 0x10
str r0, [sp, 0x4]
@@ -841222,7 +841223,7 @@ sub_81C40A0: ; 81C40A0
movs r1, 0
movs r2, 0
adds r3, r7, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
mov r0, r9
bl sub_81C3B08
mov r0, r10
@@ -841250,7 +841251,7 @@ sub_81C4154: ; 81C4154
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r1, =gUnknown_085EA4CB
movs r0, 0
str r0, [sp]
@@ -843699,7 +843700,7 @@ sub_81C55D8: ; 81C55D8
@081C5638:
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r1, 0
str r1, [sp]
movs r0, 0x1
@@ -844277,7 +844278,7 @@ sub_81C5AB8: ; 81C5AB8
movs r1, 0
movs r2, 0
adds r3, r5, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
b @081C5B08
@081C5AF4:
ldr r1, =gUnknown_085E8D60
@@ -844363,7 +844364,7 @@ sub_81C5B4C: ; 81C5B4C
bl sub_81C56CC
bl reset_all_obj_data
bl gpu_pal_allocator_reset
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =0x0203cf2c
ldr r0, [r0]
bl free
@@ -844608,7 +844609,7 @@ sub_81C5D20: ; 81C5D20
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r1, 0
str r1, [sp]
movs r0, 0x1
@@ -845104,7 +845105,7 @@ sub_81C61E0: ; 81C61E0
bl sub_81C61A8
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldrh r0, [r4]
@@ -845201,7 +845202,7 @@ sub_81C62C4: ; 81C62C4
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r1, 0
str r1, [sp]
movs r0, 0x1
@@ -845254,7 +845255,7 @@ sub_81C6350: ; 81C6350
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r1, 0
str r1, [sp]
movs r0, 0x1
@@ -845413,7 +845414,7 @@ sub_81C64B4: ; 81C64B4
movs r1, 0
bl sub_8198070
movs r0, 0x3
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
adds r0, r5, 0
@@ -845431,7 +845432,7 @@ sub_81C64B4: ; 81C64B4
movs r1, 0
bl sub_8198070
movs r0, 0x3
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
adds r0, r6, 0
@@ -845469,7 +845470,7 @@ sub_81C654C: ; 81C654C
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r1, 0
str r1, [sp]
movs r0, 0x1
@@ -845771,7 +845772,7 @@ sub_81C67CC: ; 81C67CC
bl ExpandStringRefs
movs r0, 0x1
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
mov r1, r8
str r1, [sp]
movs r0, 0x1
@@ -846164,8 +846165,8 @@ sub_81C6A94: ; 81C6A94
sub_81C6BD8: ; 81C6BD8
push {r4,lr}
ldr r0, =gUnknown_0861F328
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
@@ -846182,16 +846183,16 @@ sub_81C6BD8: ; 81C6BD8
@081C6C04:
adds r0, r4, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x4
bls @081C6C04
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
@@ -846339,7 +846340,7 @@ sub_81C6D24: ; 81C6D24
lsls r0, r2, 3
ldr r1, =gUnknown_0861F350
adds r0, r1
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
@@ -846372,9 +846373,9 @@ sub_81C6D6C: ; 81C6D6C
movs r1, 0
bl sub_8198070
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
@@ -846421,7 +846422,7 @@ sub_81C6DD8: ; 81C6DD8
lsrs r4, 24
movs r0, 0x2
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
bl sav2_get_text_speed
lsls r0, 24
lsrs r0, 24
@@ -846450,7 +846451,7 @@ sub_81C6E1C: ; 81C6E1C
movs r1, 0
bl sub_8197DF8
movs r0, 0x2
- bl Window_FillTileMap
+ bl ClearWindowTileMap
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
pop {r0}
@@ -847583,7 +847584,7 @@ sub_81C7738: ; 81C7738
@081C7750:
bl sub_81C99D4
bl sub_81C7C94
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
@081C775E:
pop {r1}
@@ -847612,7 +847613,7 @@ sub_81C7764: ; 81C7764
lsls r1, 5
movs r0, 0
bl lcd_io_set
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
movs r0, 0
bl gpu_reset_bgs_and_dma3_busy_flags
ldr r1, =gUnknown_0861FA04
@@ -848145,15 +848146,15 @@ sub_81C7B74: ; 81C7B74
bl sub_81C763C
adds r4, r0, 0
ldr r0, =gUnknown_0861FA08
- bl Window_InitFromTemplates
+ bl InitWindows
movs r0, 0
str r0, [r4, 0x10]
bl sub_81C7BF8
ldrb r0, [r4, 0x10]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0x10]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -848210,7 +848211,7 @@ sub_81C7BF8: ; 81C7BF8
lsrs r4, 24
adds r0, r4, 0
movs r1, 0x44
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x80
str r0, [sp]
movs r0, 0x1
@@ -848219,7 +848220,7 @@ sub_81C7BF8: ; 81C7BF8
movs r1, 0x55
movs r2, 0
movs r3, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
add sp, 0x8
pop {r4}
pop {r0}
@@ -849010,7 +849011,7 @@ sub_81C8234: ; 81C8234
adds r4, r0, 0
bl sub_81C8FE0
ldrb r0, [r4, 0x8]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x11
bl sub_81C7650
pop {r4}
@@ -849148,12 +849149,12 @@ sub_81C835C: ; 81C835C
adds r4, r0, 0
ldrb r0, [r4, 0x8]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0x8]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -849285,12 +849286,12 @@ sub_81C83F0: ; 81C83F0
beq @081C846E
ldrb r0, [r4, 0x8]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081C8476
@081C846E:
ldrb r0, [r4, 0x8]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081C8476:
movs r0, 0
b @081C849C
@@ -849840,7 +849841,7 @@ sub_81C8838: ; 81C8838
bl _call_via_r3
ldrb r0, [r4, 0x8]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -850223,7 +850224,7 @@ sub_81C8B70: ; 81C8B70
adds r6, r2, 0
ldrb r0, [r0, 0x8]
movs r1, 0x7
- bl Window_GetField
+ bl GetWindowAttribute
mov r10, r0
mov r1, r9
ldrb r0, [r1, 0x4]
@@ -850253,7 +850254,7 @@ sub_81C8B70: ; 81C8B70
mov r1, r9
ldrb r0, [r1, 0x8]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081C8C1E
.pool
@081C8BD4:
@@ -850290,7 +850291,7 @@ sub_81C8B70: ; 81C8B70
mov r1, r9
ldrb r0, [r1, 0x8]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081C8C1E:
subs r6, 0x1
movs r0, 0x1
@@ -850313,7 +850314,7 @@ sub_81C8B70: ; 81C8B70
mov r1, r9
ldrb r0, [r1, 0x8]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -850332,7 +850333,7 @@ sub_81C8C64: ; 81C8C64
adds r4, r1, 0
ldrb r0, [r5, 0x8]
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
bl bg_get_tilemap
@@ -850404,7 +850405,7 @@ sub_81C8CB4: ; 81C8CB4
str r1, [sp, 0x4]
movs r1, 0x44
movs r2, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldrb r0, [r4, 0x8]
ldrb r1, [r4, 0x5]
ldrh r3, [r4, 0xA]
@@ -850432,7 +850433,7 @@ sub_81C8CB4: ; 81C8CB4
str r1, [sp, 0x4]
movs r1, 0x3
movs r2, 0
- bl Window_CopyRectToVram
+ bl CopyWindowRectToVram
add sp, 0x10
pop {r4-r6}
pop {r0}
@@ -850466,7 +850467,7 @@ sub_81C8D4C: ; 81C8D4C
str r1, [sp, 0x4]
movs r1, 0x11
movs r2, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldrb r0, [r4, 0x8]
ldrb r1, [r4, 0x5]
ldrh r2, [r4, 0xA]
@@ -850487,7 +850488,7 @@ sub_81C8D4C: ; 81C8D4C
bl sub_81C8C64
ldrb r0, [r4, 0x8]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -850528,7 +850529,7 @@ sub_81C8DBC: ; 81C8DBC
str r1, [sp, 0x4]
movs r1, 0x11
movs r2, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldrb r0, [r6, 0x8]
movs r1, 0x1
orrs r5, r1
@@ -850556,7 +850557,7 @@ sub_81C8DBC: ; 81C8DBC
str r1, [sp, 0x4]
movs r2, 0
adds r3, r4, 0
- bl Window_CopyRectToVram
+ bl CopyWindowRectToVram
add sp, 0x1C
pop {r3,r4}
mov r8, r3
@@ -850618,7 +850619,7 @@ sub_81C8E54: ; 81C8E54
movs r1, 0x2
movs r2, 0
adds r3, r4, 0
- bl Window_CopyRectToVram
+ bl CopyWindowRectToVram
@081C8EC0:
add sp, 0xC
pop {r3}
@@ -851065,7 +851066,7 @@ sub_81C91AC: ; 81C91AC
orrs r0, r3
str r0, [sp, 0x4]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r7, 0x8]
lsls r0, 16
lsrs r0, 16
@@ -852088,7 +852089,7 @@ sub_81C99D4: ; 81C99D4
adds r4, r0, 0
bl sub_81CA7F4
ldrb r0, [r4, 0x8]
- bl Window_Remove
+ bl RemoveWindow
bl sub_81C9FEC
bl sub_81CA994
movs r0, 0x2
@@ -853739,17 +853740,17 @@ sub_81CA6E0: ; 81CA6E0
bl sub_81C763C
adds r4, r0, 0
ldr r0, =gUnknown_086202CC
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0x8]
movs r1, 0x66
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x8]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -853772,11 +853773,11 @@ sub_81CA714: ; 81CA714
negs r2, r2
movs r0, 0x1
adds r1, r6, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r4, r0, 0
ldrb r0, [r5, 0x8]
movs r1, 0x66
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r5, 0x8]
movs r2, 0xC0
subs r2, r4
@@ -853810,11 +853811,11 @@ sub_81CA770: ; 81CA770
negs r2, r2
movs r0, 0x1
adds r1, r6, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r4, r0, 0
ldrb r0, [r5, 0x8]
movs r1, 0x66
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r5, 0x8]
movs r2, 0xC0
subs r2, r4
@@ -855315,11 +855316,11 @@ sub_81CB2E0: ; 81CB2E0
bl sub_81CC2B4
bl sub_81CBC1C
ldrb r0, [r4, 0x12]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r4, 0x10]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r4, 0x14]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x6
bl sub_81C7650
pop {r4}
@@ -856574,7 +856575,7 @@ sub_81CBCEC: ; 81CBCEC
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
bl bg_get_tilemap
@@ -856618,7 +856619,7 @@ sub_81CBD48: ; 81CBD48
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
bl bg_get_tilemap
@@ -856641,24 +856642,24 @@ sub_81CBD78: ; 81CBD78
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_086227D8
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0x10]
ldr r0, =gUnknown_086227E0
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0x12]
ldrb r0, [r4, 0x10]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x10]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0x12]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x12]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0x10]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -856671,7 +856672,7 @@ sub_81CBDC0: ; 81CBDC0
adds r4, r0, 0
ldrb r0, [r4, 0x12]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrh r0, [r4, 0x12]
bl sub_81CBDF4
ldrh r0, [r4, 0x12]
@@ -856682,7 +856683,7 @@ sub_81CBDC0: ; 81CBDC0
bl sub_81CBE50
ldrb r0, [r4, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -856856,7 +856857,7 @@ sub_81CBEF8: ; 81CBEF8
adds r4, r0, 0
ldrb r0, [r5, 0x10]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r5, 0x10]
lsls r4, 24
lsrs r4, 24
@@ -856883,7 +856884,7 @@ sub_81CBF60: ; 81CBF60
adds r5, r0, 0
ldrb r0, [r5, 0x12]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r4, 0
movs r6, 0x80
lsls r6, 17
@@ -856919,7 +856920,7 @@ sub_81CBF60: ; 81CBF60
@081CBFAE:
ldrb r0, [r5, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -856980,10 +856981,10 @@ sub_81CC014: ; 81CC014
bl sub_81CC330
ldrb r0, [r4, 0x12]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x12]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -856994,7 +856995,7 @@ sub_81CC034: ; 81CC034
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08622808
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x14]
movs r1, 0x1
@@ -857021,12 +857022,12 @@ sub_81CC058: ; 81CC058
bl sub_81971C4
ldrb r0, [r4, 0x14]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x14]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0x14]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
bl sub_81C7CCC
movs r2, 0
movs r1, 0x18
@@ -857053,12 +857054,12 @@ sub_81CC09C: ; 81CC09C
bl sub_8098858
ldrb r0, [r4, 0x14]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x14]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0x14]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -857098,9 +857099,9 @@ sub_81CC0E0: ; 81CC0E0
sub_81CC104: ; 81CC104
push {r4,lr}
adds r4, r0, 0
- bl run_remoboxes
+ bl RunTextPrinters
ldrb r0, [r4, 0x14]
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
pop {r4}
@@ -857132,9 +857133,9 @@ sub_81CC11C: ; 81CC11C
sub_81CC140: ; 81CC140
push {r4,lr}
adds r4, r0, 0
- bl run_remoboxes
+ bl RunTextPrinters
ldrb r0, [r4, 0x14]
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
pop {r4}
@@ -857196,9 +857197,9 @@ sub_81CC194: ; 81CC194
ands r0, r1
strb r0, [r2]
@081CC1C4:
- bl run_remoboxes
+ bl RunTextPrinters
ldrb r0, [r4, 0x14]
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
pop {r4}
@@ -857812,7 +857813,7 @@ sub_81CC670: ; 81CC670
bl sub_812305C
bl sub_81CC9EC
ldrb r0, [r4, 0x8]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x10
bl sub_81C7650
movs r0, 0x4
@@ -858289,7 +858290,7 @@ sub_81CCA1C: ; 81CCA1C
adds r1, r4, 0
bl bg_set_tilemap
ldr r0, =gUnknown_08623110
- bl Window_AddFromTemplate
+ bl AddWindow
movs r4, 0
strh r0, [r5, 0x8]
lsls r0, 24
@@ -858309,12 +858310,12 @@ sub_81CCA1C: ; 81CCA1C
bl decompress_and_copy_tile_data_to_vram
ldrb r0, [r5, 0x8]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r5, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r5, 0x8]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =gUnknown_08622868
movs r1, 0x10
movs r2, 0x20
@@ -858388,14 +858389,14 @@ sub_81CCB0C: ; 81CCB0C
@081CCB44:
ldrb r0, [r4, 0x8]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x8]
movs r1, 0x2
str r1, [sp]
movs r1, 0
movs r2, 0
movs r3, 0xC
- bl Window_WriteStandardTileMapRect
+ bl PutWindowRectTileMap
ldrb r0, [r4, 0x8]
adds r2, r5, 0x4
movs r1, 0x1
@@ -858413,21 +858414,21 @@ sub_81CCB0C: ; 81CCB0C
bl sub_81CCD70
ldrb r0, [r4, 0x8]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl sub_81CCFA4
b @081CCC40
@081CCB8E:
ldrb r0, [r4, 0x8]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x8]
movs r1, 0x2
str r1, [sp]
movs r1, 0
movs r2, 0
movs r3, 0xC
- bl Window_WriteStandardTileMapRect
+ bl PutWindowRectTileMap
ldrb r0, [r4, 0x8]
adds r2, r5, 0x4
movs r1, 0x1
@@ -858455,9 +858456,9 @@ sub_81CCB0C: ; 81CCB0C
@081CCBDC:
ldrb r0, [r4, 0x8]
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x8]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0x8]
adds r2, r5, 0x4
movs r1, 0x1
@@ -858476,7 +858477,7 @@ sub_81CCB0C: ; 81CCB0C
@081CCC0C:
ldrb r0, [r4, 0x8]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
bl sub_81CCFA4
b @081CCC40
@@ -861011,7 +861012,7 @@ sub_81CDE94: ; 81CDE94
b @081CE2C0
@081CE0BC:
ldr r0, =gUnknown_08623364
- bl Window_AddFromTemplate
+ bl AddWindow
movs r2, 0xC1
lsls r2, 5
adds r1, r5, r2
@@ -861020,22 +861021,22 @@ sub_81CDE94: ; 81CDE94
cmp r0, 0x1
bne @081CE0F6
ldr r0, =gUnknown_0862336C
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r2, =0x00001821
adds r1, r5, r2
strb r0, [r1]
ldr r0, =gUnknown_08623374
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r2, =0x00001822
adds r1, r5, r2
strb r0, [r1]
ldr r0, =gUnknown_0862337C
- bl Window_AddFromTemplate
+ bl AddWindow
ldr r2, =0x00001823
adds r1, r5, r2
strb r0, [r1]
@081CE0F6:
- bl TextBox_ResetSomeField
+ bl DeactivateAllTextPrinters
b @081CDFB0
.pool
@081CE118:
@@ -861097,7 +861098,7 @@ sub_81CDE94: ; 81CDE94
lsls r1, 5
adds r0, r5, r1
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
bl sub_81CDD5C
cmp r0, 0x1
beq @081CE19C
@@ -861106,15 +861107,15 @@ sub_81CDE94: ; 81CDE94
ldr r2, =0x00001821
adds r0, r5, r2
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r1, =0x00001822
adds r0, r5, r1
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldr r2, =0x00001823
adds r0, r5, r2
ldrb r0, [r0]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
b @081CDFB0
.pool
@081CE1C8:
@@ -861819,7 +861820,7 @@ sub_81CE754: ; 81CE754
adds r0, r6, r1
ldrb r0, [r0]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
bl sub_81CDD5C
cmp r0, 0x1
beq @081CE7A6
@@ -861829,7 +861830,7 @@ sub_81CE754: ; 81CE754
adds r0, r6, r1
ldrb r0, [r0]
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
b @081CE924
.pool
@081CE7B8:
@@ -861951,7 +861952,7 @@ sub_81CE754: ; 81CE754
adds r0, r6, r1
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081CE8D2
@081CE8C4:
movs r1, 0xC1
@@ -861959,7 +861960,7 @@ sub_81CE754: ; 81CE754
adds r0, r6, r1
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081CE8D2:
bl sub_81CDD5C
cmp r0, 0x1
@@ -861978,7 +861979,7 @@ sub_81CE754: ; 81CE754
adds r0, r6, r1
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081CE910
.pool
@081CE904:
@@ -861986,7 +861987,7 @@ sub_81CE754: ; 81CE754
adds r0, r6, r1
ldrb r0, [r0]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081CE910:
ldr r0, =0x00002908
adds r1, r6, r0
@@ -862016,12 +862017,12 @@ sub_81CE934: ; 81CE934
adds r0, r4, r1
ldrb r0, [r0]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =0x00001823
adds r4, r0
ldrb r0, [r4]
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -862417,22 +862418,22 @@ sub_81CECA0: ; 81CECA0
lsls r1, 5
adds r0, r4, r1
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
bl sub_81CDD5C
cmp r0, 0x1
bne @081CECEC
ldr r1, =0x00001821
adds r0, r4, r1
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
ldr r1, =0x00001822
adds r0, r4, r1
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
ldr r1, =0x00001823
adds r0, r4, r1
ldrb r0, [r0]
- bl Window_Remove
+ bl RemoveWindow
b @081CECF0
.pool
@081CECEC:
@@ -863363,7 +863364,7 @@ sub_81CF3F8: ; 81CF3F8
adds r4, r0, 0
bl sub_81C8234
ldrb r0, [r4, 0x8]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0x8
bl sub_81C7650
pop {r4}
@@ -863859,14 +863860,14 @@ sub_81CF7C8: ; 81CF7C8
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_086235B4
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
ldrb r0, [r4, 0x8]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
bl sub_81CF7F4
pop {r4}
@@ -863930,7 +863931,7 @@ sub_81CF7F4: ; 81CF7F4
mov r1, r8
ldrb r0, [r1, 0x8]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -864749,7 +864750,7 @@ sub_81CFE98: ; 81CFE98
adds r4, r0, 0
bl sub_81C8234
ldrb r0, [r4, 0x8]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0xA
bl sub_81C7650
pop {r4}
@@ -865233,11 +865234,11 @@ sub_81D024C: ; 81D024C
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_086237D4
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
bl sub_81CFB38
adds r2, r0, 0
ldrh r0, [r4, 0x8]
@@ -865245,7 +865246,7 @@ sub_81D024C: ; 81D024C
bl sub_81D02B0
ldrb r0, [r4, 0x8]
movs r1, 0x1
- bl Window_CopyToVram
+ bl CopyWindowToVram
adds r0, r4, 0
bl sub_81D0288
pop {r4}
@@ -865268,7 +865269,7 @@ sub_81D0288: ; 81D0288
bl sub_81D02B0
ldrb r0, [r5, 0x8]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r4,r5}
pop {r0}
bx r0
@@ -866247,13 +866248,13 @@ sub_81D09F4: ; 81D09F4
bl sub_81C763C
adds r4, r0, 0
ldrb r0, [r4, 0xA]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r4, 0x8]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r4, 0xC]
- bl Window_Remove
+ bl RemoveWindow
ldrb r0, [r4, 0xE]
- bl Window_Remove
+ bl RemoveWindow
adds r0, r4, 0
bl sub_81D1178
movs r0, 0x9
@@ -866770,11 +866771,11 @@ sub_81D0E60: ; 81D0E60
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BB8
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0xA]
lsls r0, 24
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
bl sub_81D0E84
pop {r4}
@@ -866809,7 +866810,7 @@ sub_81D0E84: ; 81D0E84
bl sub_81AFC28
ldrb r0, [r5, 0xA]
movs r1, 0x44
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r5, 0xA]
add r1, sp, 0xC
str r1, [sp]
@@ -866823,7 +866824,7 @@ sub_81D0E84: ; 81D0E84
bl box_print
ldrb r0, [r5, 0xA]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -866846,7 +866847,7 @@ sub_81D0EFC: ; 81D0EFC
bl memcpy
ldrb r0, [r7, 0xA]
movs r1, 0x44
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
cmp r5, 0x18
bhi @081D0F60
lsls r1, r5, 3
@@ -866917,7 +866918,7 @@ sub_81D0EFC: ; 81D0EFC
@081D0FAA:
ldrb r0, [r7, 0xA]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081D0FB2:
add sp, 0x10
pop {r3}
@@ -866933,11 +866934,11 @@ sub_81D0FCC: ; 81D0FCC
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BC4
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
bl sub_81D0FF0
pop {r4}
@@ -866954,7 +866955,7 @@ sub_81D0FF0: ; 81D0FF0
ldrb r5, [r0, 0x8]
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r4, =0x02021ec4
mov r6, sp
adds r6, 0xD
@@ -867020,7 +867021,7 @@ sub_81D0FF0: ; 81D0FF0
bl Print
adds r0, r4, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x10
pop {r4-r7}
pop {r0}
@@ -867033,14 +867034,14 @@ sub_81D10A4: ; 81D10A4
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BE8
- bl Window_AddFromTemplate
+ bl AddWindow
strh r0, [r4, 0xC]
lsls r0, 24
lsrs r0, 24
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0xC]
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
adds r0, r4, 0
bl sub_81D10D0
pop {r4}
@@ -867095,7 +867096,7 @@ sub_81D10D0: ; 81D10D0
mov r1, r8
ldrb r0, [r1, 0xC]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
@@ -868735,7 +868736,7 @@ sub_81D1C84: ; 81D1C84
orrs r1, r0
str r1, [sp]
mov r0, sp
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r6, 0x2]
b @081D1CE0
.pool
@@ -868743,7 +868744,7 @@ sub_81D1C84: ; 81D1C84
lsls r0, r4, 3
ldr r1, =gUnknown_086253E8
adds r0, r1
- bl Window_AddFromTemplate
+ bl AddWindow
strb r0, [r5]
@081D1CE0:
ldr r0, =0x0203cf48
@@ -868774,9 +868775,9 @@ sub_81D1D04: ; 81D1D04
movs r1, 0
bl sub_8198070
ldrb r0, [r4]
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldrb r0, [r4]
- bl Window_Remove
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -870249,8 +870250,8 @@ sub_81D2824: ; 81D2824
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_08625510
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
@@ -870263,7 +870264,7 @@ sub_81D2824: ; 81D2824
@081D284A:
adds r0, r4, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -870272,7 +870273,7 @@ sub_81D2824: ; 81D2824
cmp r5, 0
bne @081D287C
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0
movs r2, 0x1
@@ -870282,7 +870283,7 @@ sub_81D2824: ; 81D2824
.pool
@081D287C:
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0
movs r2, 0x1
@@ -870290,9 +870291,9 @@ sub_81D2824: ; 81D2824
bl SetWindowBorderStyle
@081D288E:
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
movs r1, 0
movs r2, 0x1
@@ -870356,7 +870357,7 @@ sub_81D28FC: ; 81D28FC
mov r9, r0
movs r0, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EFA31
movs r0, 0x1
adds r1, r5, 0
@@ -870428,7 +870429,7 @@ sub_81D28FC: ; 81D28FC
bne @081D29C4
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081D2AB6
.pool
@081D29C4:
@@ -870456,7 +870457,7 @@ sub_81D28FC: ; 81D28FC
ldr r1, =gUnknown_085EFA52
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
adds r4, r0, 0x4
ldrb r1, [r6, 0x4]
add r0, sp, 0xC
@@ -870560,7 +870561,7 @@ sub_81D2ACC: ; 81D2ACC
bl sub_816137C
movs r0, 0x1
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EFA3E
movs r0, 0x1
adds r1, r5, 0
@@ -870614,7 +870615,7 @@ sub_81D2ACC: ; 81D2ACC
bne @081D2B6C
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @081D2BB8
.pool
@081D2B6C:
@@ -870652,7 +870653,7 @@ sub_81D2ACC: ; 81D2ACC
bl Print
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@081D2BB8:
add sp, 0xC
pop {r3}
@@ -870690,7 +870691,7 @@ sub_81D2BF4: ; 81D2BF4
adds r4, r0, 0
movs r0, 0x3
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =0x03003014
ldrb r0, [r2]
movs r1, 0x1
@@ -870721,9 +870722,9 @@ sub_81D2BF4: ; 81D2BF4
thumb_func_start sub_81D2C3C
sub_81D2C3C: ; 81D2C3C
push {lr}
- bl run_remoboxes
+ bl RunTextPrinters
movs r0, 0x3
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -872096,7 +872097,7 @@ sub_81D3640: ; 81D3640
lsls r1, 24
lsrs r1, 24
str r3, [sp, 0x28]
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
add r2, sp, 0xC
ldrh r0, [r5]
ldrh r1, [r6]
@@ -872250,7 +872251,7 @@ sub_81D3784: ; 81D3784
lsls r1, 24
lsrs r1, 24
str r2, [sp, 0x28]
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
add r1, sp, 0xC
ldrh r0, [r5]
strh r0, [r1]
@@ -876701,7 +876702,7 @@ sub_81D5C8C: ; 81D5C8C
bl sub_81D56B0
movs r0, 0
movs r1, 0
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EF88A
movs r0, 0x1
adds r1, r5, 0
@@ -876815,10 +876816,10 @@ sub_81D5C8C: ; 81D5C8C
cmp r0, 0x3
ble @081D5CD6
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
bl sub_81D5710
add sp, 0xC
pop {r3-r5}
@@ -887208,7 +887209,7 @@ sub_81DB384: ; 81DB384
lsrs r0, 24
lsls r2, 16
asrs r2, 16
- bl font_get_width_of_string
+ bl GetStringWidth
cmp r4, r0
bgt @081DB39E
movs r0, 0
@@ -887233,7 +887234,7 @@ GetMaxWidthInMenuTable: ; 81DB3A8
ldr r1, [r5]
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
cmp r0, r6
ble @081DB3C4
adds r6, r0, 0
@@ -887270,7 +887271,7 @@ sub_81DB3D8: ; 81DB3D8
ldr r1, [r0]
movs r0, 0x1
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
cmp r0, r6
ble @081DB404
adds r6, r0, 0
@@ -887305,7 +887306,7 @@ sub_81DB41C: ; 81DB41C
lsrs r0, 26
ldr r1, [r5]
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
cmp r0, r7
ble @081DB442
adds r7, r0, 0
@@ -887369,7 +887370,7 @@ sub_81DB494: ; 81DB494
lsrs r0, 24
adds r1, r5, 0
movs r2, 0
- bl font_get_width_of_string
+ bl GetStringWidth
b @081DB4BA
@081DB4B6:
adds r4, r0, 0
diff --git a/asm/main.s b/asm/main.s
index ddb172dd7..cbbf4a291 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -26,7 +26,7 @@ Main:
bl sound_sources_off
bl ClearDma3Requests
bl gpu_init_bgs
- bl fboxes_set_default_ptr
+ bl SetDefaultFontsPointer
ldr r0, =0x02000000
movs r1, 0xE0
lsls r1, 9
diff --git a/asm/main_menu.s b/asm/main_menu.s
index 35fafa5c8..e21067040 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -1,5 +1,6 @@
- thumb_func_start c2_title_menu_3
-c2_title_menu_3: ; 802F6B0
+ thumb_func_start CB2_MainMenu
+; void CB2_MainMenu()
+CB2_MainMenu: ; 802F6B0
push {lr}
bl run_active_tasks
bl call_obj_callbacks
@@ -7,41 +8,42 @@ c2_title_menu_3: ; 802F6B0
bl fade_and_return_progress_probably
pop {r0}
bx r0
- thumb_func_end c2_title_menu_3
+ thumb_func_end CB2_MainMenu
- thumb_func_start sub_802F6C8
-sub_802F6C8: ; 802F6C8
+ thumb_func_start VBlankCB_MainMenu
+; void VBlankCB_MainMenu()
+VBlankCB_MainMenu: ; 802F6C8
push {lr}
bl copy_super_sprites_to_oam
bl copy_queue_process
bl copy_pal_bg_faded_to_pal_ram
pop {r0}
bx r0
- thumb_func_end sub_802F6C8
+ thumb_func_end VBlankCB_MainMenu
- thumb_func_start c2_title_menu_2
-; void c2_title_menu_2()
-c2_title_menu_2: ; 802F6DC
+ thumb_func_start CB2_InitMainMenu
+; void CB2_InitMainMenu()
+CB2_InitMainMenu: ; 802F6DC
push {lr}
movs r0, 0
- bl init_title_menu
+ bl InitMainMenu
pop {r0}
bx r0
- thumb_func_end c2_title_menu_2
+ thumb_func_end CB2_InitMainMenu
- thumb_func_start c2_title_menu_2_dupe
-; void c2_title_menu_2_dupe()
-c2_title_menu_2_dupe: ; 802F6E8
+ thumb_func_start CB2_ReinitMainMenu
+; void CB2_ReinitMainMenu()
+CB2_ReinitMainMenu: ; 802F6E8
push {lr}
movs r0, 0x1
- bl init_title_menu
+ bl InitMainMenu
pop {r0}
bx r0
- thumb_func_end c2_title_menu_2_dupe
+ thumb_func_end CB2_ReinitMainMenu
- thumb_func_start init_title_menu
-; void init_title_menu(int useless_param)
-init_title_menu: ; 802F6F4
+ thumb_func_start InitMainMenu
+; void InitMainMenu(BOOL affects_palette_maybe)
+InitMainMenu: ; 802F6F4
push {r4,r5,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -166,11 +168,11 @@ init_title_menu: ; 802F6F4
movs r2, 0
bl bg_change_y_offset
ldr r0, =gUnknown_082FF038
- bl Window_InitFromTemplates
- bl TextBox_ResetSomeField
+ bl InitWindows
+ bl DeactivateAllTextPrinters
ldr r1, =0x000001d5
movs r0, 0
- bl unknown_title_pattern_data_to_vram
+ bl LoadMainMenuWindowFrameTiles
movs r0, 0x40
movs r1, 0
bl lcd_io_set
@@ -194,9 +196,9 @@ init_title_menu: ; 802F6F4
bl lcd_io_set
movs r0, 0x1
bl enable_irqs
- ldr r0, =sub_802F6C8
+ ldr r0, =VBlankCB_MainMenu
bl SetVBlankCallback
- ldr r0, =c2_title_menu_3
+ ldr r0, =CB2_MainMenu
bl set_callback2
movs r1, 0xC1
lsls r1, 6
@@ -206,7 +208,7 @@ init_title_menu: ; 802F6F4
bl gpu_sync_bg_show
movs r0, 0x1
bl gpu_sync_bg_hide
- ldr r0, =task_init_title_menu_graphics
+ ldr r0, =Task_MainMenuCheckSaveFile
movs r1, 0
bl AddTask
movs r0, 0
@@ -215,11 +217,11 @@ init_title_menu: ; 802F6F4
pop {r1}
bx r1
.pool
- thumb_func_end init_title_menu
+ thumb_func_end InitMainMenu
- thumb_func_start task_init_title_menu_graphics
-; void task_init_title_menu_graphics(int task_id)
-task_init_title_menu_graphics: ; 802F8D8
+ thumb_func_start Task_MainMenuCheckSaveFile
+; void Task_MainMenuCheckSaveFile(u8 taskId)
+Task_MainMenuCheckSaveFile: ; 802F8D8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -299,12 +301,12 @@ task_init_title_menu_graphics: ; 802F8D8
mov r0, r8
subs r0, 0x8
adds r0, r7, r0
- ldr r1, =task_init_title_menu_graphics_2
+ ldr r1, =Task_MainMenuCheckBattery
b @0802F9FC
.pool
@0802F990:
ldr r0, =gUnknown_085E8405
- bl draw_text_box
+ bl CreateMainMenuErrorWindow
strh r5, [r4]
mov r0, r8
subs r0, 0x8
@@ -313,11 +315,11 @@ task_init_title_menu_graphics: ; 802F8D8
.pool
@0802F9A4:
ldr r0, =gUnknown_085E83C2
- bl draw_text_box
+ bl CreateMainMenuErrorWindow
mov r0, r8
subs r0, 0x8
adds r0, r7, r0
- ldr r1, =task_init_title_menu_save_file_corrupt
+ ldr r1, =Task_WaitForSaveFileErrorWindow
str r1, [r0]
movs r0, 0x1
strh r0, [r4]
@@ -337,18 +339,18 @@ task_init_title_menu_graphics: ; 802F8D8
adds r0, r6
lsls r0, 3
adds r0, r1
- ldr r1, =task_init_title_menu_graphics_2
+ ldr r1, =Task_MainMenuCheckBattery
b @0802F9FC
.pool
@0802F9EC:
ldr r0, =gUnknown_085E8440
- bl draw_text_box
+ bl CreateMainMenuErrorWindow
mov r0, r8
subs r0, 0x8
adds r0, r7, r0
strh r5, [r0, 0x8]
@0802F9FA:
- ldr r1, =task_init_title_menu_save_file_corrupt
+ ldr r1, =Task_WaitForSaveFileErrorWindow
@0802F9FC:
str r1, [r0]
@0802F9FE:
@@ -398,16 +400,17 @@ task_init_title_menu_graphics: ; 802F8D8
pop {r0}
bx r0
.pool
- thumb_func_end task_init_title_menu_graphics
+ thumb_func_end Task_MainMenuCheckSaveFile
- thumb_func_start task_init_title_menu_save_file_corrupt
-task_init_title_menu_save_file_corrupt: ; 802FA5C
+ thumb_func_start Task_WaitForSaveFileErrorWindow
+; void Task_WaitForSaveFileErrorWindow(u8 taskId)
+Task_WaitForSaveFileErrorWindow: ; 802FA5C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl run_remoboxes
+ bl RunTextPrinters
movs r0, 0x7
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0802FA98
@@ -418,7 +421,7 @@ task_init_title_menu_save_file_corrupt: ; 802FA5C
cmp r0, 0
beq @0802FA98
movs r0, 0x7
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, =gUnknown_082FF070
bl sub_8032250
ldr r1, =0x03005e00
@@ -426,17 +429,18 @@ task_init_title_menu_save_file_corrupt: ; 802FA5C
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, =task_init_title_menu_graphics_2
+ ldr r1, =Task_MainMenuCheckBattery
str r1, [r0]
@0802FA98:
pop {r4}
pop {r0}
bx r0
.pool
- thumb_func_end task_init_title_menu_save_file_corrupt
+ thumb_func_end Task_WaitForSaveFileErrorWindow
- thumb_func_start task_init_title_menu_graphics_2
-task_init_title_menu_graphics_2: ; 802FAB0
+ thumb_func_start Task_MainMenuCheckBattery
+; void Task_MainMenuCheckBattery(u8 taskId)
+Task_MainMenuCheckBattery: ; 802FAB0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -479,35 +483,36 @@ task_init_title_menu_graphics_2: ; 802FAB0
adds r1, r4
lsls r1, 3
adds r1, r0
- ldr r0, =task_init_title_menu_graphics_3
+ ldr r0, =Task_DisplayMainMenu
str r0, [r1]
b @0802FB3C
.pool
@0802FB28:
ldr r0, =gUnknown_085E8453
- bl draw_text_box
+ bl CreateMainMenuErrorWindow
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r1
- ldr r1, =task_init_title_menu_battery_dry
+ ldr r1, =Task_WaitForBatteryDryErrorWindow
str r1, [r0]
@0802FB3C:
pop {r4,r5}
pop {r0}
bx r0
.pool
- thumb_func_end task_init_title_menu_graphics_2
+ thumb_func_end Task_MainMenuCheckBattery
- thumb_func_start task_init_title_menu_battery_dry
-task_init_title_menu_battery_dry: ; 802FB50
+ thumb_func_start Task_WaitForBatteryDryErrorWindow
+; void Task_WaitForBatteryDryErrorWindow(u8 taskId)
+Task_WaitForBatteryDryErrorWindow: ; 802FB50
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl run_remoboxes
+ bl RunTextPrinters
movs r0, 0x7
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
cmp r0, 0
bne @0802FB8C
@@ -518,7 +523,7 @@ task_init_title_menu_battery_dry: ; 802FB50
cmp r0, 0
beq @0802FB8C
movs r0, 0x7
- bl Window_FillTileMap
+ bl ClearWindowTileMap
ldr r0, =gUnknown_082FF070
bl sub_8032250
ldr r1, =0x03005e00
@@ -526,18 +531,18 @@ task_init_title_menu_battery_dry: ; 802FB50
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, =task_init_title_menu_graphics_3
+ ldr r1, =Task_DisplayMainMenu
str r1, [r0]
@0802FB8C:
pop {r4}
pop {r0}
bx r0
.pool
- thumb_func_end task_init_title_menu_battery_dry
+ thumb_func_end Task_WaitForBatteryDryErrorWindow
- thumb_func_start task_init_title_menu_graphics_3
-; void task_init_title_menu_graphics_3(int task_id)
-task_init_title_menu_graphics_3: ; 802FBA4
+ thumb_func_start Task_DisplayMainMenu
+; void Task_DisplayMainMenu(u8 taskId)
+Task_DisplayMainMenu: ; 802FBA4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -658,10 +663,10 @@ task_init_title_menu_graphics_3: ; 802FBA4
@0802FCBC:
movs r0, 0
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_082FF0E0
str r5, [sp]
movs r4, 0x1
@@ -684,33 +689,33 @@ task_init_title_menu_graphics_3: ; 802FBA4
movs r3, 0x1
bl box_print
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r4, =gUnknown_082FF038
ldr r5, =0x000001d5
adds r0, r4, 0
adds r1, r5, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r4, 0x8
b @0802FED4
.pool
@0802FD44:
movs r0, 0x2
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x4
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_082FF0E0
str r5, [sp]
movs r4, 0x1
@@ -743,45 +748,45 @@ task_init_title_menu_graphics_3: ; 802FBA4
bl box_print
bl fmt_savegame
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x4
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x4
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r4, =gUnknown_082FF048
ldr r5, =0x000001d5
adds r0, r4, 0
adds r1, r5, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r0, r4, 0
adds r0, 0x8
adds r1, r5, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r4, 0x10
b @0802FED4
.pool
@0802FE00:
movs r0, 0x2
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x4
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x5
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_082FF0E0
str r5, [sp]
movs r4, 0x1
@@ -823,61 +828,61 @@ task_init_title_menu_graphics_3: ; 802FBA4
bl box_print
bl fmt_savegame
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x4
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x4
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x5
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r4, =gUnknown_082FF048
ldr r5, =0x000001d5
adds r0, r4, 0
adds r1, r5, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r0, r4, 0
adds r0, 0x8
adds r1, r5, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r0, r4, 0
adds r0, 0x10
adds r1, r5, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r4, 0x18
@0802FED4:
adds r0, r4, 0
adds r1, r5, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
b @0803005E
.pool
@0802FEFC:
movs r0, 0x2
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x4
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x5
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x6
movs r1, 0xAA
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r5, =gUnknown_082FF0E0
str r5, [sp]
movs r4, 0x1
@@ -928,51 +933,51 @@ task_init_title_menu_graphics_3: ; 802FBA4
bl box_print
bl fmt_savegame
movs r0, 0x2
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x3
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x4
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x5
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x6
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x2
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x3
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x4
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x5
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0x6
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r5, =gUnknown_082FF048
ldr r4, =0x000001d5
adds r0, r5, 0
adds r1, r4, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r0, r5, 0
adds r0, 0x8
adds r1, r4, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r0, r5, 0
adds r0, 0x10
adds r1, r4, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r0, r5, 0
adds r0, 0x18
adds r1, r4, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
adds r0, r5, 0
adds r0, 0x20
adds r1, r4, 0
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
ldr r0, =gUnknown_082FF0F4
ldr r4, =0x02022d06
adds r1, r4, 0
@@ -1017,7 +1022,7 @@ task_init_title_menu_graphics_3: ; 802FBA4
adds r1, r2, r7
lsls r1, 3
adds r1, r0
- ldr r0, =task_title_menu_highlight_selected_menu_items
+ ldr r0, =Task_HighlightSelectedMainMenuItem
str r0, [r1]
@0803006C:
add sp, 0x10
@@ -1028,11 +1033,11 @@ task_init_title_menu_graphics_3: ; 802FBA4
pop {r0}
bx r0
.pool
- thumb_func_end task_init_title_menu_graphics_3
+ thumb_func_end Task_DisplayMainMenu
- thumb_func_start task_title_menu_highlight_selected_menu_items
-; void task_title_menu_highlight_selected_menu_items(int task_id)
-task_title_menu_highlight_selected_menu_items: ; 80300B0
+ thumb_func_start Task_HighlightSelectedMainMenuItem
+; void Task_HighlightSelectedMainMenuItem(u8 taskId)
+Task_HighlightSelectedMainMenuItem: ; 80300B0
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -1045,17 +1050,18 @@ task_title_menu_highlight_selected_menu_items: ; 80300B0
ldrb r1, [r4, 0xA]
movs r3, 0x24
ldrsh r2, [r4, r3]
- bl title_menu_highlight_selected_menu_items
- ldr r0, =task_title_menu_handle_input
+ bl HighlightSelectedMainMenuItem
+ ldr r0, =Task_HandleMainMenuInput
str r0, [r4]
pop {r4}
pop {r0}
bx r0
.pool
- thumb_func_end task_title_menu_highlight_selected_menu_items
+ thumb_func_end Task_HighlightSelectedMainMenuItem
- thumb_func_start title_menu_handle_input
-title_menu_handle_input: ; 80300E0
+ thumb_func_start HandleMainMenuInput
+; u8 HandleMainMenuInput(u8 taskId)
+HandleMainMenuInput: ; 80300E0
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -1084,7 +1090,7 @@ title_menu_handle_input: ; 80300E0
adds r0, r7, 0
subs r0, 0x8
adds r0, r4, r0
- ldr r1, =title_menu_handle_keypad_a_pressed
+ ldr r1, =Task_HandleMainMenuAPressed
str r1, [r0]
b @08030240
.pool
@@ -1114,7 +1120,7 @@ title_menu_handle_input: ; 80300E0
adds r0, r7, 0
subs r0, 0x8
adds r0, r4, r0
- ldr r1, =sub_8030544
+ ldr r1, =Task_HandleMainMenuBPressed
str r1, [r0]
b @08030240
.pool
@@ -1222,15 +1228,16 @@ title_menu_handle_input: ; 80300E0
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end title_menu_handle_input
+ thumb_func_end HandleMainMenuInput
- thumb_func_start task_title_menu_handle_input
-task_title_menu_handle_input: ; 803024C
+ thumb_func_start Task_HandleMainMenuInput
+; void Task_HandleMainMenuInput(u8 taskId)
+Task_HandleMainMenuInput: ; 803024C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl title_menu_handle_input
+ bl HandleMainMenuInput
lsls r0, 24
cmp r0, 0
beq @0803026C
@@ -1239,18 +1246,18 @@ task_title_menu_handle_input: ; 803024C
adds r1, r4
lsls r1, 3
adds r1, r0
- ldr r0, =task_title_menu_highlight_selected_menu_items
+ ldr r0, =Task_HighlightSelectedMainMenuItem
str r0, [r1]
@0803026C:
pop {r4}
pop {r0}
bx r0
.pool
- thumb_func_end task_title_menu_handle_input
+ thumb_func_end Task_HandleMainMenuInput
- thumb_func_start title_menu_handle_keypad_a_pressed
-; void title_menu_handle_keypad_a_pressed(int task_id)
-title_menu_handle_keypad_a_pressed: ; 803027C
+ thumb_func_start Task_HandleMainMenuAPressed
+; void Task_HandleMainMenuAPressed(int task_id)
+Task_HandleMainMenuAPressed: ; 803027C
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -1471,7 +1478,7 @@ title_menu_handle_keypad_a_pressed: ; 803027C
.pool
@08030460:
ldr r0, =0x030022c0
- ldr r1, =c2_title_menu_2_dupe
+ ldr r1, =CB2_ReinitMainMenu
str r1, [r0, 0x8]
ldr r0, =c2_options_menu
b @0803048A
@@ -1499,7 +1506,7 @@ title_menu_handle_keypad_a_pressed: ; 803027C
adds r0, r1
movs r4, 0
strh r4, [r0, 0xA]
- ldr r1, =sub_80305A4
+ ldr r1, =Task_DisplayMainMenuInvalidActionError
str r1, [r0]
ldr r0, =0x02037714
movs r2, 0xF1
@@ -1538,7 +1545,7 @@ title_menu_handle_keypad_a_pressed: ; 803027C
b @08030536
.pool
@08030514:
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
cmp r5, 0x2
beq @08030528
ldr r1, =0x02022d06
@@ -1560,10 +1567,11 @@ title_menu_handle_keypad_a_pressed: ; 803027C
pop {r0}
bx r0
.pool
- thumb_func_end title_menu_handle_keypad_a_pressed
+ thumb_func_end Task_HandleMainMenuAPressed
- thumb_func_start sub_8030544
-sub_8030544: ; 8030544
+ thumb_func_start Task_HandleMainMenuBPressed
+; void Task_HandleMainMenuBPressed(u8 taskId)
+Task_HandleMainMenuBPressed: ; 8030544
push {r4,r5,lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -1592,7 +1600,7 @@ sub_8030544: ; 8030544
@08030578:
ldr r0, =0x02022d06
strh r4, [r0]
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r0, =c2_title_screen_1
bl set_callback2
adds r0, r5, 0
@@ -1602,10 +1610,11 @@ sub_8030544: ; 8030544
pop {r0}
bx r0
.pool
- thumb_func_end sub_8030544
+ thumb_func_end Task_HandleMainMenuBPressed
- thumb_func_start sub_80305A4
-sub_80305A4: ; 80305A4
+ thumb_func_start Task_DisplayMainMenuInvalidActionError
+; void Task_DisplayMainMenuInvalidActionError(u8 taskId)
+Task_DisplayMainMenuInvalidActionError: ; 80305A4
push {r4,r5,lr}
sub sp, 0x8
lsls r0, 24
@@ -1656,17 +1665,17 @@ sub_80305A4: ; 80305A4
b @08030622
@08030602:
ldr r0, =gUnknown_085E82BE
- bl draw_text_box
+ bl CreateMainMenuErrorWindow
b @08030622
.pool
@08030610:
ldr r0, =gUnknown_085E82E5
- bl draw_text_box
+ bl CreateMainMenuErrorWindow
b @08030622
.pool
@0803061C:
ldr r0, =gUnknown_085E8328
- bl draw_text_box
+ bl CreateMainMenuErrorWindow
@08030622:
ldr r0, =0x03005e00
lsls r1, r5, 2
@@ -1686,9 +1695,9 @@ sub_80305A4: ; 80305A4
b @08030658
.pool
@0803064C:
- bl run_remoboxes
+ bl RunTextPrinters
movs r0, 0x7
- bl a_pressed_maybe
+ bl IsTextPrinterActive
lsls r0, 16
@08030658:
cmp r0, 0
@@ -1712,7 +1721,7 @@ sub_80305A4: ; 80305A4
movs r2, 0
movs r3, 0x10
bl sub_80A1AD4
- ldr r0, =sub_8030544
+ ldr r0, =Task_HandleMainMenuBPressed
str r0, [r4]
@08030688:
add sp, 0x8
@@ -1720,11 +1729,11 @@ sub_80305A4: ; 80305A4
pop {r0}
bx r0
.pool
- thumb_func_end sub_80305A4
+ thumb_func_end Task_DisplayMainMenuInvalidActionError
- thumb_func_start title_menu_highlight_selected_menu_items
-; void title_menu_highlight_selected_menu_items(u8 a1, u8 selected_menu_item, u16 a3)
-title_menu_highlight_selected_menu_items: ; 8030698
+ thumb_func_start HighlightSelectedMainMenuItem
+; void HighlightSelectedMainMenuItem(u8 a1, u8 selectedMenuItem, u16 a3)
+HighlightSelectedMainMenuItem: ; 8030698
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -1858,7 +1867,7 @@ title_menu_highlight_selected_menu_items: ; 8030698
pop {r0}
bx r0
.pool
- thumb_func_end title_menu_highlight_selected_menu_items
+ thumb_func_end HighlightSelectedMainMenuItem
thumb_func_start task_new_game_prof_birch_speech_1
; void task_new_game_prof_birch_speech_1(int task_id)
@@ -2052,10 +2061,10 @@ task_new_game_prof_birch_speech_3: ; 8030928
.pool
@08030970:
ldr r0, =gUnknown_082FF080
- bl Window_InitFromTemplates
+ bl InitWindows
movs r0, 0
movs r1, 0xF3
- bl unknown_title_pattern_data_to_vram
+ bl LoadMainMenuWindowFrameTiles
movs r0, 0
movs r1, 0xFC
movs r2, 0xF0
@@ -2064,10 +2073,10 @@ task_new_game_prof_birch_speech_3: ; 8030928
movs r1, 0x1
bl unknown_rbox_to_vram
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
movs r0, 0
bl sub_8032318
ldr r0, =0x02021fc4
@@ -2909,7 +2918,7 @@ task_new_game_prof_birch_speech_17: ; 8031090
lsrs r5, r0, 24
cmp r5, 0
bne @080310EC
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -3564,7 +3573,7 @@ task_new_game_prof_birch_speech_part2_12: ; 8031630
ands r0, r1
cmp r0, 0
bne @08031666
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -3777,24 +3786,24 @@ new_game_prof_birch_speech_part2_start: ; 8031678
orrs r0, r1
strh r0, [r4]
strh r2, [r3]
- ldr r0, =sub_802F6C8
+ ldr r0, =VBlankCB_MainMenu
bl SetVBlankCallback
- ldr r0, =c2_title_menu_3
+ ldr r0, =CB2_MainMenu
bl set_callback2
ldr r0, =gUnknown_082FF080
- bl Window_InitFromTemplates
+ bl InitWindows
movs r0, 0
movs r1, 0xF3
- bl unknown_title_pattern_data_to_vram
+ bl LoadMainMenuWindowFrameTiles
movs r0, 0
movs r1, 0xFC
movs r2, 0xF0
bl copy_textbox_border_tile_patterns_to_vram
movs r0, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -4398,10 +4407,10 @@ sub_8031D74: ; 8031D74
push {lr}
ldr r0, =gUnknown_082FF088
movs r1, 0xF3
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
movs r0, 0x1
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldr r2, =gUnknown_082FF118
movs r0, 0x1
movs r1, 0x2
@@ -4411,10 +4420,10 @@ sub_8031D74: ; 8031D74
movs r2, 0
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
movs r0, 0x1
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x1
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
pop {r0}
bx r0
.pool
@@ -4473,15 +4482,15 @@ set_default_player_name: ; 8031DC4
.pool
thumb_func_end set_default_player_name
- thumb_func_start draw_text_box
-; void draw_text_box(void *text_ptr)
-draw_text_box: ; 8031E18
+ thumb_func_start CreateMainMenuErrorWindow
+; void CreateMainMenuErrorWindow(u8 *str)
+CreateMainMenuErrorWindow: ; 8031E18
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
movs r0, 0x7
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
movs r0, 0x2
@@ -4494,13 +4503,13 @@ draw_text_box: ; 8031E18
movs r3, 0
bl Print
movs r0, 0x7
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
movs r0, 0x7
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldr r0, =gUnknown_082FF070
ldr r1, =0x000001d5
- bl write_textbox_border_to_bg_tilemap
+ bl DrawMainMenuWindowFrame
ldr r1, =0x000009e7
movs r0, 0x40
bl lcd_io_set
@@ -4512,7 +4521,7 @@ draw_text_box: ; 8031E18
pop {r0}
bx r0
.pool
- thumb_func_end draw_text_box
+ thumb_func_end CreateMainMenuErrorWindow
thumb_func_start fmt_savegame
fmt_savegame: ; 8031E7C
@@ -4752,8 +4761,9 @@ fmt_badges: ; 8032014
.pool
thumb_func_end fmt_badges
- thumb_func_start unknown_title_pattern_data_to_vram
-unknown_title_pattern_data_to_vram: ; 80320A4
+ thumb_func_start LoadMainMenuWindowFrameTiles
+; void LoadMainMenuWindowFrameTiles(u8 bgId, u16 tileOffset)
+LoadMainMenuWindowFrameTiles: ; 80320A4
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -4784,11 +4794,11 @@ unknown_title_pattern_data_to_vram: ; 80320A4
pop {r0}
bx r0
.pool
- thumb_func_end unknown_title_pattern_data_to_vram
+ thumb_func_end LoadMainMenuWindowFrameTiles
- thumb_func_start write_textbox_border_to_bg_tilemap
-; void write_textbox_border_to_bg_tilemap(struct rbox_template *box, int base_tile_num)
-write_textbox_border_to_bg_tilemap: ; 80320EC
+ thumb_func_start DrawMainMenuWindowFrame
+; void DrawMainMenuWindowFrame(struct WindowTemplate *template, u16 baseTileNum)
+DrawMainMenuWindowFrame: ; 80320EC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4958,7 +4968,7 @@ write_textbox_border_to_bg_tilemap: ; 80320EC
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end write_textbox_border_to_bg_tilemap
+ thumb_func_end DrawMainMenuWindowFrame
thumb_func_start sub_8032250
sub_8032250: ; 8032250
@@ -5050,14 +5060,14 @@ sub_80322E0: ; 80322E0
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_FillTileMap
+ bl ClearWindowTileMap
cmp r4, 0x1
bne @0803230E
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0803230E:
pop {r4,r5}
pop {r0}
@@ -5077,7 +5087,7 @@ sub_8032318: ; 8032318
lsrs r6, 24
movs r0, 0x1
movs r1, 0x6
- bl fbox_get_field
+ bl GetFontAttribute
mov r9, r0
mov r0, r9
lsls r0, 24
@@ -5085,7 +5095,7 @@ sub_8032318: ; 8032318
mov r9, r0
movs r0, 0x1
movs r1, 0
- bl fbox_get_field
+ bl GetFontAttribute
mov r8, r0
mov r0, r8
lsls r0, 24
@@ -5093,19 +5103,19 @@ sub_8032318: ; 8032318
mov r8, r0
movs r0, 0x1
movs r1, 0x1
- bl fbox_get_field
+ bl GetFontAttribute
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
adds r0, r6, 0
movs r1, 0x3
- bl Window_GetField
+ bl GetWindowAttribute
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0x4
- bl Window_GetField
+ bl GetWindowAttribute
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -5117,10 +5127,10 @@ sub_8032318: ; 8032318
mov r1, r9
movs r2, 0
movs r3, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
adds r0, r6, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x8
pop {r3,r4}
mov r8, r3
@@ -5223,14 +5233,14 @@ unknown_rbox_to_vram: ; 803243C
bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl Window_WriteStandardTileMap
+ bl PutWindowTileMap
cmp r4, 0x1
bne @0803246A
adds r0, r5, 0
movs r1, 0x3
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0803246A:
pop {r4,r5}
pop {r0}
diff --git a/asm/pixel_buffer.s b/asm/pixel_buffer.s
index 207372f19..199c748bb 100644
--- a/asm/pixel_buffer.s
+++ b/asm/pixel_buffer.s
@@ -1,5 +1,6 @@
- thumb_func_start sub_8002BDC
-sub_8002BDC: ; 8002BDC
+ thumb_func_start BlitSurface4BitWithoutColorKey
+; void BlitSurface4BitWithoutColorKey(struct Surface *src, struct Surface *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height)
+BlitSurface4BitWithoutColorKey: ; 8002BDC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -26,18 +27,18 @@ sub_8002BDC: ; 8002BDC
str r7, [sp, 0xC]
movs r4, 0xFF
str r4, [sp, 0x10]
- bl PixelBlock_CopyRect4Bpp
+ bl BlitSurface4Bit
add sp, 0x14
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8002BDC
+ thumb_func_end BlitSurface4BitWithoutColorKey
- thumb_func_start PixelBlock_CopyRect4Bpp
-; void PixelBlock_CopyRect4Bpp(struct PixelBlock *src_pixels_data, struct PixelBlock *dest_pixels_data, u16 src_x, u16 src_y, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a9)
-PixelBlock_CopyRect4Bpp: ; 8002C20
+ thumb_func_start BlitSurface4Bit
+; void BlitSurface4Bit(struct Surface *src, struct Surface *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey)
+BlitSurface4Bit: ; 8002C20
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -288,11 +289,11 @@ PixelBlock_CopyRect4Bpp: ; 8002C20
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end PixelBlock_CopyRect4Bpp
+ thumb_func_end BlitSurface4Bit
- thumb_func_start PixelBlock_FillRect4Bpp
-; int PixelBlock_FillRect4Bpp(struct PixelBlock *pixels_data, u16 x, u16 y, u16 w, u16 h, u8 fill_value)
-PixelBlock_FillRect4Bpp: ; 8002E00
+ thumb_func_start FillSurfaceRect4Bit
+; void FillSurfaceRect4Bit(struct Surface *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
+FillSurfaceRect4Bit: ; 8002E00
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -400,11 +401,11 @@ PixelBlock_FillRect4Bpp: ; 8002E00
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end PixelBlock_FillRect4Bpp
+ thumb_func_end FillSurfaceRect4Bit
- thumb_func_start PixelBlock_CopyRect4BppTo8Bpp
-; void PixelBlock_CopyRect4BppTo8Bpp(struct PixelBlock *src_pixels_data, struct PixelBlock *dest_pixels_data, u16 src_x, u16 src_y, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, int a9, int a10)
-PixelBlock_CopyRect4BppTo8Bpp: ; 8002EC8
+ thumb_func_start BlitSurface4BitTo8Bit
+; void BlitSurface4BitTo8Bit(struct Surface *src, struct Surface *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey, u8 paletteOffset)
+BlitSurface4BitTo8Bit: ; 8002EC8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -717,11 +718,11 @@ PixelBlock_CopyRect4BppTo8Bpp: ; 8002EC8
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end PixelBlock_CopyRect4BppTo8Bpp
+ thumb_func_end BlitSurface4BitTo8Bit
- thumb_func_start PixelBlock_FillRect8Bpp
-; void PixelBlock_FillRect8Bpp(struct PixelBlock *pixels_data, u16 x, u16 y, u16 w, u16 h, char fill_value)
-PixelBlock_FillRect8Bpp: ; 8003118
+ thumb_func_start FillSurfaceRect8Bit
+; void FillSurfaceRect8Bit(struct Surface *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue)
+FillSurfaceRect8Bit: ; 8003118
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -810,4 +811,4 @@ PixelBlock_FillRect8Bpp: ; 8003118
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end PixelBlock_FillRect8Bpp
+ thumb_func_end FillSurfaceRect8Bit
diff --git a/asm/text_renderer.s b/asm/text_renderer.s
index 26cb4ed62..8b43a5bd4 100644
--- a/asm/text_renderer.s
+++ b/asm/text_renderer.s
@@ -1,15 +1,15 @@
- thumb_func_start fboxes_set_ptr
-; void fboxes_set_ptr(struct fbox *ptr)
-fboxes_set_ptr: ; 80045A4
+ thumb_func_start SetFontsPointer
+; void SetFontsPointer(struct FontInfo *fonts)
+SetFontsPointer: ; 80045A4
ldr r1, =0x03002f80
str r0, [r1]
bx lr
.pool
- thumb_func_end fboxes_set_ptr
+ thumb_func_end SetFontsPointer
- thumb_func_start TextBox_ResetSomeField
-; void TextBox_ResetSomeField()
-TextBox_ResetSomeField: ; 80045B0
+ thumb_func_start DeactivateAllTextPrinters
+; void DeactivateAllTextPrinters()
+DeactivateAllTextPrinters: ; 80045B0
push {lr}
ldr r1, =0x020201b0
movs r2, 0
@@ -23,10 +23,10 @@ TextBox_ResetSomeField: ; 80045B0
pop {r0}
bx r0
.pool
- thumb_func_end TextBox_ResetSomeField
+ thumb_func_end DeactivateAllTextPrinters
thumb_func_start Print
-; int Print(u8 windowId, u8 fontId, int char_cursor, char x, char y, u8 a6, int a7)
+; u16 Print(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void ( *callback)(u16, struct TextPrinter *))
Print: ; 80045D0
push {r4-r7,lr}
mov r7, r8
@@ -102,7 +102,7 @@ Print: ; 80045D0
mov r0, sp
mov r1, r8
adds r2, r7, 0
- bl remo_copy
+ bl AddTextPrinter
lsls r0, 16
lsrs r0, 16
add sp, 0x10
@@ -114,9 +114,9 @@ Print: ; 80045D0
.pool
thumb_func_end Print
- thumb_func_start remo_copy
-; int remo_copy(struct TextBox *x, u8 text_speed, int a3)
-remo_copy: ; 800467C
+ thumb_func_start AddTextPrinter
+; u16 AddTextPrinter(struct TextPrinter *textPrinter, u8 speed, void ( *callback)(u16, struct TextPrinter *))
+AddTextPrinter: ; 800467C
push {r4-r7,lr}
adds r6, r0, 0
mov r12, r2
@@ -167,7 +167,7 @@ remo_copy: ; 800467C
lsls r1, r2, 28
lsrs r1, 28
lsrs r2, 4
- bl GenerateFontHalfRowLut
+ bl GenerateFontHalfRowLookupTable
cmp r5, 0xFF
beq @08004718
cmp r5, 0
@@ -206,7 +206,7 @@ remo_copy: ; 800467C
cmp r4, r7
bhi @08004740
ldr r0, =0x0202018c
- bl fbox_exec
+ bl RenderFont
cmp r0, 0x1
bne @0800472C
@08004740:
@@ -215,7 +215,7 @@ remo_copy: ; 800467C
ldr r0, =0x0202018c
ldrb r0, [r0, 0x4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@0800474E:
ldr r2, =0x020201b0
ldrb r1, [r6, 0x4]
@@ -235,11 +235,11 @@ remo_copy: ; 800467C
pop {r1}
bx r1
.pool
- thumb_func_end remo_copy
+ thumb_func_end AddTextPrinter
- thumb_func_start run_remoboxes
-; void run_remoboxes()
-run_remoboxes: ; 8004778
+ thumb_func_start RunTextPrinters
+; void RunTextPrinters()
+RunTextPrinters: ; 8004778
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -257,7 +257,7 @@ run_remoboxes: ; 8004778
cmp r0, 0
beq @080047E8
mov r0, r8
- bl fbox_exec
+ bl RenderFont
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0x1
@@ -275,7 +275,7 @@ run_remoboxes: ; 8004778
@080047BE:
ldrb r0, [r5]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
@080047C6:
ldr r1, =0x020201b0
adds r0, r1, 0
@@ -306,10 +306,11 @@ run_remoboxes: ; 8004778
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end run_remoboxes
+ thumb_func_end RunTextPrinters
- thumb_func_start a_pressed_maybe
-a_pressed_maybe: ; 8004800
+ thumb_func_start IsTextPrinterActive
+; BOOL IsTextPrinterActive(u8 id)
+IsTextPrinterActive: ; 8004800
lsls r0, 24
lsrs r0, 24
ldr r2, =0x020201b0
@@ -320,11 +321,11 @@ a_pressed_maybe: ; 8004800
ldrb r0, [r1, 0x1B]
bx lr
.pool
- thumb_func_end a_pressed_maybe
+ thumb_func_end IsTextPrinterActive
- thumb_func_start fbox_exec
-; int fbox_exec(struct TextBox *x)
-fbox_exec: ; 8004818
+ thumb_func_start RenderFont
+; u16 RenderFont(struct TextPrinter *textPrinter)
+RenderFont: ; 8004818
push {r4,lr}
adds r4, r0, 0
@0800481C:
@@ -346,10 +347,11 @@ fbox_exec: ; 8004818
pop {r1}
bx r1
.pool
- thumb_func_end fbox_exec
+ thumb_func_end RenderFont
- thumb_func_start GenerateFontHalfRowLut
-GenerateFontHalfRowLut: ; 8004844
+ thumb_func_start GenerateFontHalfRowLookupTable
+; void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor)
+GenerateFontHalfRowLookupTable: ; 8004844
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -805,10 +807,11 @@ GenerateFontHalfRowLut: ; 8004844
pop {r0}
bx r0
.pool
- thumb_func_end GenerateFontHalfRowLut
+ thumb_func_end GenerateFontHalfRowLookupTable
- thumb_func_start save_remo_colors
-save_remo_colors: ; 8004BE0
+ thumb_func_start SaveTextColors
+; void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
+SaveTextColors: ; 8004BE0
ldr r3, =0x030009ea
ldrh r3, [r3]
strb r3, [r1]
@@ -820,18 +823,19 @@ save_remo_colors: ; 8004BE0
strb r0, [r2]
bx lr
.pool
- thumb_func_end save_remo_colors
+ thumb_func_end SaveTextColors
- thumb_func_start restore_remo_colors
-restore_remo_colors: ; 8004C00
+ thumb_func_start RestoreTextColors
+; void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
+RestoreTextColors: ; 8004C00
push {lr}
ldrb r0, [r0]
ldrb r1, [r1]
ldrb r2, [r2]
- bl GenerateFontHalfRowLut
+ bl GenerateFontHalfRowLookupTable
pop {r0}
bx r0
- thumb_func_end restore_remo_colors
+ thumb_func_end RestoreTextColors
thumb_func_start DecompressGlyphTile
; void DecompressGlyphTile(u16 *src, u32 *dest)
@@ -998,8 +1002,9 @@ DecompressGlyphTile: ; 8004C10
.pool
thumb_func_end DecompressGlyphTile
- thumb_func_start sub_8004D58
-sub_8004D58: ; 8004D58
+ thumb_func_start GetLastTextColor
+; u8 GetLastTextColor(u8 colorType)
+GetLastTextColor: ; 8004D58
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1035,10 +1040,10 @@ sub_8004D58: ; 8004D58
@08004D9A:
pop {r1}
bx r1
- thumb_func_end sub_8004D58
+ thumb_func_end GetLastTextColor
thumb_func_start CopyGlyphToWindow
-; int CopyGlyphToWindow(struct TextBox *x)
+; int CopyGlyphToWindow(struct TextPrinter *x)
CopyGlyphToWindow: ; 8004DA0
push {r4-r7,lr}
mov r7, r10
@@ -1740,9 +1745,9 @@ CopyGlyphToWindow: ; 8004DA0
.pool
thumb_func_end CopyGlyphToWindow
- thumb_func_start Text_ClearHorizontalSpan
-; void Text_ClearHorizontalSpan(TextBox *textBox, int width)
-Text_ClearHorizontalSpan: ; 80052C8
+ thumb_func_start ClearTextSpan
+; void ClearTextSpan(TextPrinter *textPrinter, u32 width)
+ClearTextSpan: ; 80052C8
push {r4-r6,lr}
sub sp, 0x10
adds r4, r0, 0
@@ -1784,17 +1789,17 @@ Text_ClearHorizontalSpan: ; 80052C8
lsrs r0, 24
str r0, [sp, 0x4]
add r0, sp, 0x8
- bl PixelBlock_FillRect4Bpp
+ bl FillSurfaceRect4Bit
@0800531E:
add sp, 0x10
pop {r4-r6}
pop {r0}
bx r0
.pool
- thumb_func_end Text_ClearHorizontalSpan
+ thumb_func_end ClearTextSpan
thumb_func_start Font0Func
-; int Font0Func(struct TextBox *x)
+; int Font0Func(struct TextPrinter *x)
Font0Func: ; 800533C
push {lr}
adds r2, r0, 0
@@ -1816,7 +1821,7 @@ Font0Func: ; 800533C
strb r0, [r3, 0x1]
@08005360:
adds r0, r2, 0
- bl font_render_b
+ bl RenderText
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -1824,7 +1829,7 @@ Font0Func: ; 800533C
thumb_func_end Font0Func
thumb_func_start Font1Func
-; int Font1Func(struct TextBox *x)
+; int Font1Func(struct TextPrinter *x)
Font1Func: ; 8005370
push {lr}
adds r2, r0, 0
@@ -1848,7 +1853,7 @@ Font1Func: ; 8005370
strb r0, [r3, 0x1]
@08005398:
adds r0, r2, 0
- bl font_render_b
+ bl RenderText
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -1856,7 +1861,7 @@ Font1Func: ; 8005370
thumb_func_end Font1Func
thumb_func_start Font2Func
-; int Font2Func(struct TextBox *x)
+; int Font2Func(struct TextPrinter *x)
Font2Func: ; 80053A8
push {lr}
adds r2, r0, 0
@@ -1880,7 +1885,7 @@ Font2Func: ; 80053A8
strb r0, [r3, 0x1]
@080053D0:
adds r0, r2, 0
- bl font_render_b
+ bl RenderText
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -1888,7 +1893,7 @@ Font2Func: ; 80053A8
thumb_func_end Font2Func
thumb_func_start Font3Func
-; int Font3Func(struct TextBox *x)
+; int Font3Func(struct TextPrinter *x)
Font3Func: ; 80053E0
push {lr}
adds r2, r0, 0
@@ -1912,7 +1917,7 @@ Font3Func: ; 80053E0
strb r0, [r3, 0x1]
@08005408:
adds r0, r2, 0
- bl font_render_b
+ bl RenderText
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -1920,7 +1925,7 @@ Font3Func: ; 80053E0
thumb_func_end Font3Func
thumb_func_start Font4Func
-; int Font4Func(struct TextBox *x)
+; int Font4Func(struct TextPrinter *x)
Font4Func: ; 8005418
push {lr}
adds r2, r0, 0
@@ -1944,7 +1949,7 @@ Font4Func: ; 8005418
strb r0, [r3, 0x1]
@08005440:
adds r0, r2, 0
- bl font_render_b
+ bl RenderText
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -1952,7 +1957,7 @@ Font4Func: ; 8005418
thumb_func_end Font4Func
thumb_func_start Font5Func
-; int Font5Func(struct TextBox *x)
+; int Font5Func(struct TextPrinter *x)
Font5Func: ; 8005450
push {lr}
adds r2, r0, 0
@@ -1976,7 +1981,7 @@ Font5Func: ; 8005450
strb r0, [r3, 0x1]
@08005478:
adds r0, r2, 0
- bl font_render_b
+ bl RenderText
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -1984,7 +1989,7 @@ Font5Func: ; 8005450
thumb_func_end Font5Func
thumb_func_start Font7Func
-; int Font7Func(struct TextBox *x)
+; int Font7Func(struct TextPrinter *x)
Font7Func: ; 8005488
push {lr}
adds r2, r0, 0
@@ -2008,7 +2013,7 @@ Font7Func: ; 8005488
strb r0, [r3, 0x1]
@080054B0:
adds r0, r2, 0
- bl font_render_b
+ bl RenderText
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -2016,7 +2021,7 @@ Font7Func: ; 8005488
thumb_func_end Font7Func
thumb_func_start Font8Func
-; int Font8Func(struct TextBox *x)
+; int Font8Func(struct TextPrinter *x)
Font8Func: ; 80054C0
push {lr}
adds r2, r0, 0
@@ -2040,16 +2045,16 @@ Font8Func: ; 80054C0
strb r0, [r3, 0x1]
@080054E8:
adds r0, r2, 0
- bl font_render_b
+ bl RenderText
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
thumb_func_end Font8Func
- thumb_func_start sub_80054F8
-; void sub_80054F8(TextBox *textBox)
-sub_80054F8: ; 80054F8
+ thumb_func_start TextPrinterInitDownArrowCounters
+; void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter)
+TextPrinterInitDownArrowCounters: ; 80054F8
push {lr}
adds r2, r0, 0
adds r2, 0x14
@@ -2075,11 +2080,11 @@ sub_80054F8: ; 80054F8
@08005524:
pop {r0}
bx r0
- thumb_func_end sub_80054F8
+ thumb_func_end TextPrinterInitDownArrowCounters
- thumb_func_start remo_draw_bouncing_down_arrow
-; int remo_draw_bouncing_down_arrow(TextBox *x)
-remo_draw_bouncing_down_arrow: ; 8005528
+ thumb_func_start TextPrinterDrawDownArrow
+; void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter)
+TextPrinterDrawDownArrow: ; 8005528
push {r4-r7,lr}
sub sp, 0x18
adds r5, r0, 0
@@ -2119,7 +2124,7 @@ remo_draw_bouncing_down_arrow: ; 8005528
str r4, [sp]
movs r4, 0x10
str r4, [sp, 0x4]
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldr r0, [r7]
lsls r0, 30
lsrs r0, 31
@@ -2153,10 +2158,10 @@ remo_draw_bouncing_down_arrow: ; 8005528
str r2, [sp, 0x14]
adds r1, r7, 0
movs r2, 0
- bl Window_CopyPixelRectToWindow
+ bl BlitSurfaceRectToWindow
ldrb r0, [r5, 0x4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
ldrb r0, [r6, 0x1]
movs r1, 0x20
negs r1, r1
@@ -2183,11 +2188,11 @@ remo_draw_bouncing_down_arrow: ; 8005528
pop {r0}
bx r0
.pool
- thumb_func_end remo_draw_bouncing_down_arrow
+ thumb_func_end TextPrinterDrawDownArrow
- thumb_func_start remo_clear_down_arrow
-; int remo_clear_down_arrow(TextBox *x)
-remo_clear_down_arrow: ; 8005600
+ thumb_func_start TextPrinterClearDownArrow
+; void TextPrinterClearDownArrow(struct TextPrinter *textPrinter)
+TextPrinterClearDownArrow: ; 8005600
push {r4,r5,lr}
sub sp, 0x8
adds r5, r0, 0
@@ -2203,19 +2208,19 @@ remo_clear_down_arrow: ; 8005600
str r4, [sp]
movs r4, 0x10
str r4, [sp, 0x4]
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
ldrb r0, [r5, 0x4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end remo_clear_down_arrow
+ thumb_func_end TextPrinterClearDownArrow
- thumb_func_start remo_is_it_time_to_continue_autopilot
-; int remo_is_it_time_to_continue_autopilot(struct TextBox *x)
-remo_is_it_time_to_continue_autopilot: ; 8005634
+ thumb_func_start TextPrinterWaitAutoMode
+; BOOL TextPrinterWaitAutoMode(struct TextPrinter *textPrinter)
+TextPrinterWaitAutoMode: ; 8005634
push {lr}
adds r1, r0, 0
adds r1, 0x14
@@ -2231,10 +2236,11 @@ remo_is_it_time_to_continue_autopilot: ; 8005634
@0800564A:
pop {r1}
bx r1
- thumb_func_end remo_is_it_time_to_continue_autopilot
+ thumb_func_end TextPrinterWaitAutoMode
- thumb_func_start remo_is_it_time_to_continue_plus_down_arrow
-remo_is_it_time_to_continue_plus_down_arrow: ; 8005650
+ thumb_func_start TextPrinterWaitWithDownArrow
+; BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter)
+TextPrinterWaitWithDownArrow: ; 8005650
push {r4,lr}
adds r2, r0, 0
movs r4, 0
@@ -2245,14 +2251,14 @@ remo_is_it_time_to_continue_plus_down_arrow: ; 8005650
cmp r0, 0
beq @08005674
adds r0, r2, 0
- bl remo_is_it_time_to_continue_autopilot
+ bl TextPrinterWaitAutoMode
lsls r0, 24
lsrs r4, r0, 24
b @0800568E
.pool
@08005674:
adds r0, r2, 0
- bl remo_draw_bouncing_down_arrow
+ bl TextPrinterDrawDownArrow
ldr r0, =0x030022c0
ldrh r1, [r0, 0x2E]
movs r0, 0x3
@@ -2268,10 +2274,11 @@ remo_is_it_time_to_continue_plus_down_arrow: ; 8005650
pop {r1}
bx r1
.pool
- thumb_func_end remo_is_it_time_to_continue_plus_down_arrow
+ thumb_func_end TextPrinterWaitWithDownArrow
- thumb_func_start remo_is_it_time_to_continue
-remo_is_it_time_to_continue: ; 800569C
+ thumb_func_start TextPrinterWait
+; BOOL TextPrinterWait(struct TextPrinter *textPrinter)
+TextPrinterWait: ; 800569C
push {r4,lr}
adds r2, r0, 0
movs r4, 0
@@ -2282,7 +2289,7 @@ remo_is_it_time_to_continue: ; 800569C
cmp r0, 0
beq @080056C0
adds r0, r2, 0
- bl remo_is_it_time_to_continue_autopilot
+ bl TextPrinterWaitAutoMode
lsls r0, 24
lsrs r4, r0, 24
b @080056D4
@@ -2303,10 +2310,11 @@ remo_is_it_time_to_continue: ; 800569C
pop {r1}
bx r1
.pool
- thumb_func_end remo_is_it_time_to_continue
+ thumb_func_end TextPrinterWait
- thumb_func_start draw_bouncing_down_arrow_2
-draw_bouncing_down_arrow_2: ; 80056E0
+ thumb_func_start DrawDownArrow
+; void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, BOOL drawArrow, u8 *counter, u8 *yCoordIndex)
+DrawDownArrow: ; 80056E0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2348,7 +2356,7 @@ draw_bouncing_down_arrow_2: ; 80056E0
adds r0, r5, 0
mov r2, r8
adds r3, r7, 0
- bl Window_FillPixelRect
+ bl FillWindowPixelRect
cmp r4, 0
bne @0800579A
ldr r0, =0x03003014
@@ -2388,10 +2396,10 @@ draw_bouncing_down_arrow_2: ; 80056E0
adds r0, r5, 0
adds r1, r6, 0
movs r2, 0
- bl Window_CopyPixelRectToWindow
+ bl BlitSurfaceRectToWindow
adds r0, r5, 0
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
mov r1, r9
strb r4, [r1]
mov r5, r10
@@ -2408,11 +2416,11 @@ draw_bouncing_down_arrow_2: ; 80056E0
pop {r0}
bx r0
.pool
- thumb_func_end draw_bouncing_down_arrow_2
+ thumb_func_end DrawDownArrow
- thumb_func_start font_render_b
-; int font_render_b(struct TextBox *x)
-font_render_b: ; 80057B4
+ thumb_func_start RenderText
+; u16 RenderText(struct TextPrinter *textPrinter)
+RenderText: ; 80057B4
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r6, 0
@@ -2681,7 +2689,7 @@ font_render_b: ; 80057B4
lsls r2, 24
lsrs r2, 28
@08005A06:
- bl GenerateFontHalfRowLut
+ bl GenerateFontHalfRowLookupTable
@08005A0A:
movs r0, 0x2
b @08005D6E
@@ -2773,7 +2781,7 @@ font_render_b: ; 80057B4
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r6, 0x6]
strb r0, [r6, 0x8]
ldrb r0, [r6, 0x7]
@@ -2799,7 +2807,7 @@ font_render_b: ; 80057B4
ble @08005A0A
adds r0, r6, 0
adds r1, r4, 0
- bl Text_ClearHorizontalSpan
+ bl ClearTextSpan
ldrb r0, [r6, 0x8]
adds r0, r4
b @08005C6E
@@ -2829,7 +2837,7 @@ font_render_b: ; 80057B4
@08005B18:
adds r0, r6, 0
adds r1, r4, 0
- bl Text_ClearHorizontalSpan
+ bl ClearTextSpan
ldrb r0, [r6, 0x8]
adds r0, r4
b @08005C6E
@@ -2863,7 +2871,7 @@ font_render_b: ; 80057B4
@08005B4E:
strb r0, [r6, 0x1C]
adds r0, r6, 0
- bl sub_80054F8
+ bl TextPrinterInitDownArrowCounters
@08005B56:
movs r0, 0x3
b @08005D6E
@@ -2886,7 +2894,7 @@ font_render_b: ; 80057B4
adds r1, r3, 0
ldrb r2, [r6, 0x8]
ldrb r3, [r6, 0x9]
- bl TextBox_DrawKeypadIcon
+ bl DrawKeypadIcon
ldr r1, =0x03002f90
adds r1, 0x80
strb r0, [r1]
@@ -2972,7 +2980,7 @@ font_render_b: ; 80057B4
ble @08005C70
adds r0, r6, 0
adds r1, r4, 0
- bl Text_ClearHorizontalSpan
+ bl ClearTextSpan
ldrb r0, [r6, 0x8]
adds r0, r4
b @08005C6E
@@ -3007,7 +3015,7 @@ font_render_b: ; 80057B4
.pool
@08005C78:
adds r0, r6, 0
- bl remo_is_it_time_to_continue
+ bl TextPrinterWait
lsls r0, 16
cmp r0, 0
bne @08005C86
@@ -3018,7 +3026,7 @@ font_render_b: ; 80057B4
b @08005B56
@08005C8C:
adds r0, r6, 0
- bl remo_is_it_time_to_continue_plus_down_arrow
+ bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
bne @08005C9A
@@ -3030,7 +3038,7 @@ font_render_b: ; 80057B4
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl Window_FastFillPixels
+ bl FillWindowPixelBuffer
ldrb r0, [r6, 0x6]
movs r1, 0
strb r0, [r6, 0x8]
@@ -3040,14 +3048,14 @@ font_render_b: ; 80057B4
b @08005B56
@08005CB8:
adds r0, r6, 0
- bl remo_is_it_time_to_continue_plus_down_arrow
+ bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
bne @08005CC6
b @08005B56
@08005CC6:
adds r0, r6, 0
- bl remo_clear_down_arrow
+ bl TextPrinterClearDownArrow
ldrb r1, [r6, 0x5]
ldr r0, =0x03002f80
ldr r2, [r0]
@@ -3083,7 +3091,7 @@ font_render_b: ; 80057B4
orrs r3, r1
lsrs r3, 24
movs r1, 0
- bl Window_ScrollVertically
+ bl ScrollWindow
movs r0, 0
b @08005D38
.pool
@@ -3096,14 +3104,14 @@ font_render_b: ; 80057B4
lsrs r3, 24
movs r1, 0
adds r2, r4, 0
- bl Window_ScrollVertically
+ bl ScrollWindow
ldrb r0, [r6, 0x1F]
subs r0, r4
@08005D38:
strb r0, [r6, 0x1F]
ldrb r0, [r6, 0x4]
movs r1, 0x2
- bl Window_CopyToVram
+ bl CopyWindowToVram
b @08005B56
@08005D44:
strb r0, [r6, 0x1C]
@@ -3135,10 +3143,11 @@ font_render_b: ; 80057B4
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end font_render_b
+ thumb_func_end RenderText
- thumb_func_start sub_8005D74
-sub_8005D74: ; 8005D74
+ thumb_func_start GetStringWidthFixedWidthFont
+; u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing)
+GetStringWidthFixedWidthFont: ; 8005D74
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3262,7 +3271,7 @@ sub_8005D74: ; 8005D74
ble @08005E78
adds r0, r7, 0
movs r1, 0
- bl fbox_get_field
+ bl GetFontAttribute
add r0, r8
lsls r0, 24
lsrs r0, 24
@@ -3273,9 +3282,10 @@ sub_8005D74: ; 8005D74
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8005D74
+ thumb_func_end GetStringWidthFixedWidthFont
thumb_func_start GetFontWidthFunc
+; u8 GetFontWidthFunc(u16 glyphId)
GetFontWidthFunc: ; 8005EA8
push {r4,lr}
lsls r0, 24
@@ -3304,9 +3314,9 @@ GetFontWidthFunc: ; 8005EA8
bx r1
thumb_func_end GetFontWidthFunc
- thumb_func_start font_get_width_of_string
-; unsigned int font_get_width_of_string(u8 a1, u8 *s, u16 a3)
-font_get_width_of_string: ; 8005ED8
+ thumb_func_start GetStringWidth
+; u32 GetStringWidth(u8 fontId, u8 *str, u16 letterSpacing)
+GetStringWidth: ; 8005ED8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3340,7 +3350,7 @@ font_get_width_of_string: ; 8005ED8
bne @08005F24
adds r0, r6, 0
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -3508,7 +3518,7 @@ font_get_width_of_string: ; 8005ED8
bne @0800611C
ldrb r0, [r4]
movs r1, 0x2
- bl fbox_get_field
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -3558,7 +3568,7 @@ font_get_width_of_string: ; 8005ED8
@080060D6:
adds r4, 0x1
ldrb r0, [r4]
- bl Font_ReturnsValueFromLUT
+ bl GetKeypadIconWidth
lsls r0, 24
lsrs r0, 24
@080060E2:
@@ -3615,11 +3625,11 @@ font_get_width_of_string: ; 8005ED8
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end font_get_width_of_string
+ thumb_func_end GetStringWidth
- thumb_func_start font_render_some
-; int font_render_some(char *pixels, u8 font, int a3)
-font_render_some: ; 8006140
+ thumb_func_start RenderTextFont9
+; u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str)
+RenderTextFont9: ; 8006140
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3638,7 +3648,7 @@ font_render_some: ; 8006140
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl save_remo_colors
+ bl SaveTextColors
movs r0, 0x1
str r0, [sp, 0x8]
movs r0, 0
@@ -3648,7 +3658,7 @@ font_render_some: ; 8006140
movs r0, 0x1
movs r1, 0
movs r2, 0x3
- bl GenerateFontHalfRowLut
+ bl GenerateFontHalfRowLookupTable
adds r7, r6, 0
movs r6, 0
@08006182:
@@ -3744,7 +3754,7 @@ font_render_some: ; 8006140
@08006266:
ldr r1, [sp, 0xC]
mov r2, r10
- bl GenerateFontHalfRowLut
+ bl GenerateFontHalfRowLookupTable
b @080062B8
@08006270:
adds r0, r7, r6
@@ -3795,7 +3805,7 @@ font_render_some: ; 8006140
adds r1, 0x1
mov r2, sp
adds r2, 0x2
- bl restore_remo_colors
+ bl RestoreTextColors
movs r0, 0x1
add sp, 0x10
pop {r3-r5}
@@ -3806,10 +3816,11 @@ font_render_some: ; 8006140
pop {r1}
bx r1
.pool
- thumb_func_end font_render_some
+ thumb_func_end RenderTextFont9
- thumb_func_start TextBox_DrawKeypadIcon
-TextBox_DrawKeypadIcon: ; 80062E8
+ thumb_func_start DrawKeypadIcon
+; u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y)
+DrawKeypadIcon: ; 80062E8
push {r4,r5,lr}
sub sp, 0x18
lsls r0, 24
@@ -3838,17 +3849,18 @@ TextBox_DrawKeypadIcon: ; 80062E8
adds r1, r5, 0
movs r2, 0
movs r3, 0
- bl Window_CopyPixelRectToWindow
+ bl BlitSurfaceRectToWindow
adds r0, r4, 0
add sp, 0x18
pop {r4,r5}
pop {r1}
bx r1
.pool
- thumb_func_end TextBox_DrawKeypadIcon
+ thumb_func_end DrawKeypadIcon
- thumb_func_start sub_8006338
-sub_8006338: ; 8006338
+ thumb_func_start GetKeypadIconTileOffset
+; u8 GetKeypadIconTileOffset(u8 keypadIconId)
+GetKeypadIconTileOffset: ; 8006338
lsls r0, 24
ldr r1, =gKeypadIcons
lsrs r0, 22
@@ -3856,10 +3868,11 @@ sub_8006338: ; 8006338
ldrb r0, [r0]
bx lr
.pool
- thumb_func_end sub_8006338
+ thumb_func_end GetKeypadIconTileOffset
- thumb_func_start Font_ReturnsValueFromLUT
-Font_ReturnsValueFromLUT: ; 8006348
+ thumb_func_start GetKeypadIconWidth
+; u8 GetKeypadIconWidth(u8 keypadIconId)
+GetKeypadIconWidth: ; 8006348
lsls r0, 24
ldr r1, =gKeypadIcons
lsrs r0, 22
@@ -3867,10 +3880,11 @@ Font_ReturnsValueFromLUT: ; 8006348
ldrb r0, [r0, 0x2]
bx lr
.pool
- thumb_func_end Font_ReturnsValueFromLUT
+ thumb_func_end GetKeypadIconWidth
- thumb_func_start sub_8006358
-sub_8006358: ; 8006358
+ thumb_func_start GetKeypadIconHeight
+; u8 GetKeypadIconHeight(u8 keypadIconId)
+GetKeypadIconHeight: ; 8006358
lsls r0, 24
ldr r1, =gKeypadIcons
lsrs r0, 22
@@ -3878,20 +3892,22 @@ sub_8006358: ; 8006358
ldrb r0, [r0, 0x3]
bx lr
.pool
- thumb_func_end sub_8006358
+ thumb_func_end GetKeypadIconHeight
- thumb_func_start fboxes_set_default_ptr
-fboxes_set_default_ptr: ; 8006368
+ thumb_func_start SetDefaultFontsPointer
+; void SetDefaultFontsPointer()
+SetDefaultFontsPointer: ; 8006368
push {lr}
ldr r0, =gFontInfos
- bl fboxes_set_ptr
+ bl SetFontsPointer
pop {r0}
bx r0
.pool
- thumb_func_end fboxes_set_default_ptr
+ thumb_func_end SetDefaultFontsPointer
- thumb_func_start fbox_get_field
-fbox_get_field: ; 8006378
+ thumb_func_start GetFontAttribute
+; u8 GetFontAttribute(u8 fontId, u8 attributeId)
+GetFontAttribute: ; 8006378
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -3995,7 +4011,7 @@ fbox_get_field: ; 8006378
pop {r1}
bx r1
.pool
- thumb_func_end fbox_get_field
+ thumb_func_end GetFontAttribute
thumb_func_start GetMenuCursorDimensionByFont
; u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension)
@@ -4013,6 +4029,7 @@ GetMenuCursorDimensionByFont: ; 8006460
thumb_func_end GetMenuCursorDimensionByFont
thumb_func_start DecompressGlyphFont0
+; void DecompressGlyphFont0(u16 glyphId, BOOL isJapanese)
DecompressGlyphFont0: ; 8006478
push {r4,r5,lr}
lsls r0, 16
@@ -4101,6 +4118,7 @@ DecompressGlyphFont0: ; 8006478
thumb_func_end DecompressGlyphFont0
thumb_func_start GetGlyphWidthFont0
+; u8 GetGlyphWidthFont0(u16 glyphId, BOOL isJapanese)
GetGlyphWidthFont0: ; 8006540
push {lr}
lsls r0, 16
@@ -4120,6 +4138,7 @@ GetGlyphWidthFont0: ; 8006540
thumb_func_end GetGlyphWidthFont0
thumb_func_start DecompressGlyphFont7
+; void DecompressGlyphFont7(u16 glyphId, BOOL isJapanese)
DecompressGlyphFont7: ; 8006560
push {r4-r6,lr}
lsls r0, 16
@@ -4208,6 +4227,7 @@ DecompressGlyphFont7: ; 8006560
thumb_func_end DecompressGlyphFont7
thumb_func_start GetGlyphWidthFont7
+; u8 GetGlyphWidthFont7(u16 glyphId, BOOL isJapanese)
GetGlyphWidthFont7: ; 8006628
push {lr}
lsls r0, 16
@@ -4227,7 +4247,7 @@ GetGlyphWidthFont7: ; 8006628
thumb_func_end GetGlyphWidthFont7
thumb_func_start DecompressGlyphFont8
-; void DecompressGlyphFont8(u16 glyphIndex, bool japanese)
+; void DecompressGlyphFont8(u16 glyphId, BOOL isJapanese)
DecompressGlyphFont8: ; 8006648
push {r4,r5,lr}
lsls r0, 16
@@ -4316,6 +4336,7 @@ DecompressGlyphFont8: ; 8006648
thumb_func_end DecompressGlyphFont8
thumb_func_start GetGlyphWidthFont8
+; u8 GetGlyphWidthFont8(u16 glyphId, BOOL isJapanese)
GetGlyphWidthFont8: ; 8006710
push {lr}
lsls r0, 16
@@ -4335,6 +4356,7 @@ GetGlyphWidthFont8: ; 8006710
thumb_func_end GetGlyphWidthFont8
thumb_func_start DecompressGlyphFont2
+; void DecompressGlyphFont2(u16 glyphId, BOOL isJapanese)
DecompressGlyphFont2: ; 8006730
push {r4-r6,lr}
lsls r0, 16
@@ -4437,6 +4459,7 @@ DecompressGlyphFont2: ; 8006730
thumb_func_end DecompressGlyphFont2
thumb_func_start GetGlyphWidthFont2
+; u8 GetGlyphWidthFont2(u16 glyphId, BOOL isJapanese)
GetGlyphWidthFont2: ; 800681C
push {lr}
lsls r0, 16
@@ -4457,7 +4480,7 @@ GetGlyphWidthFont2: ; 800681C
thumb_func_end GetGlyphWidthFont2
thumb_func_start DecompressGlyphFont1
-; void DecompressGlyphFont1(int a1, int japanese)
+; void DecompressGlyphFont1(u16 glyphId, BOOL isJapanese)
DecompressGlyphFont1: ; 8006840
push {r4-r6,lr}
lsls r0, 16
@@ -4546,6 +4569,7 @@ DecompressGlyphFont1: ; 8006840
thumb_func_end DecompressGlyphFont1
thumb_func_start GetGlyphWidthFont1
+; u8 GetGlyphWidthFont1(u16 glyphId, BOOL isJapanese)
GetGlyphWidthFont1: ; 8006908
push {lr}
lsls r0, 16
@@ -4565,6 +4589,7 @@ GetGlyphWidthFont1: ; 8006908
thumb_func_end GetGlyphWidthFont1
thumb_func_start DecompressGlyphFont9
+; void DecompressGlyphFont9(u16 glyphId)
DecompressGlyphFont9: ; 8006928
push {r4,r5,lr}
lsls r0, 16
diff --git a/asm/window.s b/asm/window.s
index ae41062eb..2bf67e269 100644
--- a/asm/window.s
+++ b/asm/window.s
@@ -3,9 +3,9 @@ nullsub_8: ; 80031BC
bx lr
thumb_func_end nullsub_8
- thumb_func_start Window_InitFromTemplates
-; int Window_InitFromTemplates(struct rbox_template *template)
-Window_InitFromTemplates: ; 80031C0
+ thumb_func_start InitWindows
+; BOOL16 InitWindows(struct WindowTemplate *templates)
+InitWindows: ; 80031C0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -108,7 +108,7 @@ Window_InitFromTemplates: ; 80031C0
adds r4, r0, 0
cmp r4, 0
bne @080032A8
- bl Window_FreeMemory
+ bl FreeAllWindowBuffers
b @08003250
.pool
@080032A8:
@@ -213,11 +213,11 @@ Window_InitFromTemplates: ; 80031C0
pop {r1}
bx r1
.pool
- thumb_func_end Window_InitFromTemplates
+ thumb_func_end InitWindows
- thumb_func_start Window_AddFromTemplate
-; int Window_AddFromTemplate(struct rbox_template *template)
-Window_AddFromTemplate: ; 8003380
+ thumb_func_start AddWindow
+; u16 AddWindow(struct WindowTemplate *template)
+AddWindow: ; 8003380
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -379,11 +379,11 @@ Window_AddFromTemplate: ; 8003380
pop {r1}
bx r1
.pool
- thumb_func_end Window_AddFromTemplate
+ thumb_func_end AddWindow
- thumb_func_start Window_AddFromTemplateWithoutAllocatingMemory
-; int Window_AddFromTemplateWithoutAllocatingMemory(struct rbox_template *template)
-Window_AddFromTemplateWithoutAllocatingMemory: ; 80034D8
+ thumb_func_start AddWindowWithoutTileMap
+; int AddWindowWithoutTileMap(struct WindowTemplate *template)
+AddWindowWithoutTileMap: ; 80034D8
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
@@ -459,11 +459,11 @@ Window_AddFromTemplateWithoutAllocatingMemory: ; 80034D8
pop {r1}
bx r1
.pool
- thumb_func_end Window_AddFromTemplateWithoutAllocatingMemory
+ thumb_func_end AddWindowWithoutTileMap
- thumb_func_start Window_Remove
-; int Window_Remove(int rbox_id)
-Window_Remove: ; 8003574
+ thumb_func_start RemoveWindow
+; void RemoveWindow(u8 windowId)
+RemoveWindow: ; 8003574
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -525,11 +525,11 @@ Window_Remove: ; 8003574
pop {r0}
bx r0
.pool
- thumb_func_end Window_Remove
+ thumb_func_end RemoveWindow
- thumb_func_start Window_FreeMemory
-; void Window_FreeMemory()
-Window_FreeMemory: ; 8003604
+ thumb_func_start FreeAllWindowBuffers
+; void FreeAllWindowBuffers()
+FreeAllWindowBuffers: ; 8003604
push {r4-r6,lr}
ldr r4, =0x03002f70
movs r5, 0x3
@@ -569,11 +569,11 @@ Window_FreeMemory: ; 8003604
pop {r0}
bx r0
.pool
- thumb_func_end Window_FreeMemory
+ thumb_func_end FreeAllWindowBuffers
- thumb_func_start Window_CopyToVram
-; void Window_CopyToVram(u8 rbox_id, u8 mode)
-Window_CopyToVram: ; 8003658
+ thumb_func_start CopyWindowToVram
+; void CopyWindowToVram(u8 windowId, u8 mode)
+CopyWindowToVram: ; 8003658
push {r4-r6,lr}
sub sp, 0xC
lsls r0, 24
@@ -637,11 +637,11 @@ Window_CopyToVram: ; 8003658
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end Window_CopyToVram
+ thumb_func_end CopyWindowToVram
- thumb_func_start Window_CopyRectToVram
-; void Window_CopyRectToVram(int rbox_id, int mode, int x, int y, int w, int h)
-Window_CopyRectToVram: ; 80036D8
+ thumb_func_start CopyWindowRectToVram
+; void CopyWindowRectToVram(int rbox_id, int mode, int x, int y, int w, int h)
+CopyWindowRectToVram: ; 80036D8
push {r4-r7,lr}
sub sp, 0xC
adds r6, r0, 0
@@ -731,11 +731,11 @@ Window_CopyRectToVram: ; 80036D8
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end Window_CopyRectToVram
+ thumb_func_end CopyWindowRectToVram
- thumb_func_start Window_WriteStandardTileMap
-; void Window_WriteStandardTileMap(int rbox_id)
-Window_WriteStandardTileMap: ; 800378C
+ thumb_func_start PutWindowTileMap
+; void PutWindowTileMap(u8 windowId)
+PutWindowTileMap: ; 800378C
push {r4,lr}
sub sp, 0x1C
lsls r0, 24
@@ -781,11 +781,11 @@ Window_WriteStandardTileMap: ; 800378C
pop {r0}
bx r0
.pool
- thumb_func_end Window_WriteStandardTileMap
+ thumb_func_end PutWindowTileMap
- thumb_func_start Window_WriteStandardTileMapRectOverridePalette
-; void Window_WriteStandardTileMapRectOverridePalette(u8 rbox_id, u8 x, u8 y, u8 w, u8 h, u8 palette)
-Window_WriteStandardTileMapRectOverridePalette: ; 80037EC
+ thumb_func_start PutWindowRectTileMapOverridePalette
+; void PutWindowRectTileMapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot)
+PutWindowRectTileMapOverridePalette: ; 80037EC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -876,11 +876,11 @@ Window_WriteStandardTileMapRectOverridePalette: ; 80037EC
pop {r0}
bx r0
.pool
- thumb_func_end Window_WriteStandardTileMapRectOverridePalette
+ thumb_func_end PutWindowRectTileMapOverridePalette
- thumb_func_start Window_FillTileMap
-; void Window_FillTileMap(int rbox_id)
-Window_FillTileMap: ; 80038A4
+ thumb_func_start ClearWindowTileMap
+; void ClearWindowTileMap(u8 windowId)
+ClearWindowTileMap: ; 80038A4
push {r4,lr}
sub sp, 0x18
lsls r0, 24
@@ -916,11 +916,11 @@ Window_FillTileMap: ; 80038A4
pop {r0}
bx r0
.pool
- thumb_func_end Window_FillTileMap
+ thumb_func_end ClearWindowTileMap
- thumb_func_start Window_WriteStandardTileMapRect
-; void Window_WriteStandardTileMapRect(u8 rbox_id, u8 x, u8 y, u8 w, u8 h)
-Window_WriteStandardTileMapRect: ; 80038F4
+ thumb_func_start PutWindowRectTileMap
+; void PutWindowRectTileMap(u8 windowId, u8 x, u8 y, u8 width, u8 height)
+PutWindowRectTileMap: ; 80038F4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1007,11 +1007,11 @@ Window_WriteStandardTileMapRect: ; 80038F4
pop {r0}
bx r0
.pool
- thumb_func_end Window_WriteStandardTileMapRect
+ thumb_func_end PutWindowRectTileMap
- thumb_func_start Window_CopyWholePixelBlockToWindow
-; void Window_CopyWholePixelBlockToWindow(u8 rbox_id, int a2, u16 x, u16 y, u16 w, u16 h)
-Window_CopyWholePixelBlockToWindow: ; 80039A4
+ thumb_func_start BlitSurfaceToWindow
+; void BlitSurfaceToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height)
+BlitSurfaceToWindow: ; 80039A4
push {r4,r5,lr}
sub sp, 0x18
ldr r4, [sp, 0x24]
@@ -1034,16 +1034,16 @@ Window_CopyWholePixelBlockToWindow: ; 80039A4
str r5, [sp, 0x14]
movs r2, 0
movs r3, 0
- bl Window_CopyPixelRectToWindow
+ bl BlitSurfaceRectToWindow
add sp, 0x18
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end Window_CopyWholePixelBlockToWindow
+ thumb_func_end BlitSurfaceToWindow
- thumb_func_start Window_CopyPixelRectToWindow
-; void Window_CopyPixelRectToWindow(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h)
-Window_CopyPixelRectToWindow: ; 80039DC
+ thumb_func_start BlitSurfaceRectToWindow
+; void BlitSurfaceRectToWindow(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight)
+BlitSurfaceRectToWindow: ; 80039DC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1123,7 +1123,7 @@ Window_CopyPixelRectToWindow: ; 80039DC
movs r0, 0
str r0, [sp, 0x10]
add r0, sp, 0x14
- bl PixelBlock_CopyRect4Bpp
+ bl BlitSurface4Bit
add sp, 0x24
pop {r3-r5}
mov r8, r3
@@ -1133,11 +1133,11 @@ Window_CopyPixelRectToWindow: ; 80039DC
pop {r0}
bx r0
.pool
- thumb_func_end Window_CopyPixelRectToWindow
+ thumb_func_end BlitSurfaceRectToWindow
- thumb_func_start Window_copy_pixels_rect_3
-; void Window_copy_pixels_rect_3(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11)
-Window_copy_pixels_rect_3: ; 8003A9C
+ thumb_func_start BlitSurfaceRectToWindowWithColorKey
+; void BlitSurfaceRectToWindowWithColorKey(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 colorKey)
+BlitSurfaceRectToWindowWithColorKey: ; 8003A9C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1221,7 +1221,7 @@ Window_copy_pixels_rect_3: ; 8003A9C
ldr r6, [sp, 0x24]
str r6, [sp, 0x10]
add r0, sp, 0x14
- bl PixelBlock_CopyRect4Bpp
+ bl BlitSurface4Bit
add sp, 0x28
pop {r3-r5}
mov r8, r3
@@ -1231,11 +1231,11 @@ Window_copy_pixels_rect_3: ; 8003A9C
pop {r0}
bx r0
.pool
- thumb_func_end Window_copy_pixels_rect_3
+ thumb_func_end BlitSurfaceRectToWindowWithColorKey
- thumb_func_start Window_FillPixelRect
-; void Window_FillPixelRect(u8 rbox_id, char fill_value, u16 x, u16 y, u16 w, u16 h)
-Window_FillPixelRect: ; 8003B64
+ thumb_func_start FillWindowPixelRect
+; void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height)
+FillWindowPixelRect: ; 8003B64
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -1290,7 +1290,7 @@ Window_FillPixelRect: ; 8003B64
add r0, sp, 0x8
adds r1, r2, 0
mov r2, r9
- bl PixelBlock_FillRect4Bpp
+ bl FillSurfaceRect4Bit
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -1299,10 +1299,11 @@ Window_FillPixelRect: ; 8003B64
pop {r0}
bx r0
.pool
- thumb_func_end Window_FillPixelRect
+ thumb_func_end FillWindowPixelRect
- thumb_func_start Window_CopyToPixels
-Window_CopyToPixels: ; 8003BF0
+ thumb_func_start CopyToWindowPixelBuffer
+; void CopyToWindowPixelBuffer(u8 windowId, u8 *src, u32 size, u16 tileOffset)
+CopyToWindowPixelBuffer: ; 8003BF0
push {r4-r6,lr}
adds r6, r1, 0
lsls r0, 24
@@ -1343,11 +1344,11 @@ Window_CopyToPixels: ; 8003BF0
pop {r0}
bx r0
.pool
- thumb_func_end Window_CopyToPixels
+ thumb_func_end CopyToWindowPixelBuffer
- thumb_func_start Window_FastFillPixels
-; void Window_FastFillPixels(u8 rbox_id, int value)
-Window_FastFillPixels: ; 8003C48
+ thumb_func_start FillWindowPixelBuffer
+; void FillWindowPixelBuffer(u8 rbox_id, u32 fillValue)
+FillWindowPixelBuffer: ; 8003C48
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
@@ -1383,11 +1384,11 @@ Window_FastFillPixels: ; 8003C48
pop {r0}
bx r0
.pool
- thumb_func_end Window_FastFillPixels
+ thumb_func_end FillWindowPixelBuffer
- thumb_func_start Window_ScrollVertically
-; void Window_ScrollVertically(u8 windowId, u8 direction, u8 distance, u8 fillValue)
-Window_ScrollVertically: ; 8003C94
+ thumb_func_start ScrollWindow
+; void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue)
+ScrollWindow: ; 8003C94
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1909,10 +1910,10 @@ Window_ScrollVertically: ; 8003C94
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end Window_ScrollVertically
+ thumb_func_end ScrollWindow
thumb_func_start CallWindowFunction
-; void CallWindowFunction(u8 windowId, void ( *functionPointer)(s8, s8, s8, s8))
+; void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8))
CallWindowFunction: ; 8004058
push {r4-r6,lr}
mov r6, r8
@@ -1953,8 +1954,9 @@ CallWindowFunction: ; 8004058
.pool
thumb_func_end CallWindowFunction
- thumb_func_start Window_SetField
-Window_SetField: ; 80040A8
+ thumb_func_start SetWindowAttribute
+; BOOL SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
+SetWindowAttribute: ; 80040A8
push {lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -2032,10 +2034,11 @@ Window_SetField: ; 80040A8
pop {r1}
bx r1
.pool
- thumb_func_end Window_SetField
+ thumb_func_end SetWindowAttribute
- thumb_func_start Window_GetField
-Window_GetField: ; 800414C
+ thumb_func_start GetWindowAttribute
+; u32 GetWindowAttribute(u8 windowId, u8 attributeId)
+GetWindowAttribute: ; 800414C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -2137,10 +2140,10 @@ Window_GetField: ; 800414C
@0800422A:
pop {r1}
bx r1
- thumb_func_end Window_GetField
+ thumb_func_end GetWindowAttribute
thumb_func_start GetNumActiveWindowsOnBg
-; int GetNumActiveWindowsOnBg(int bg_id)
+; u8 GetNumActiveWindowsOnBg(u8 bgId)
GetNumActiveWindowsOnBg: ; 8004230
push {r4,lr}
lsls r0, 24
@@ -2172,9 +2175,9 @@ nullsub_9: ; 800425C
bx lr
thumb_func_end nullsub_9
- thumb_func_start Window_AddFromTemplate8Bpp
-; int Window_AddFromTemplate8Bpp(struct rbox_template *template)
-Window_AddFromTemplate8Bpp: ; 8004260
+ thumb_func_start AddWindow8Bit
+; u16 AddWindow8Bit(struct WindowTemplate *template)
+AddWindow8Bit: ; 8004260
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2257,7 +2260,7 @@ Window_AddFromTemplate8Bpp: ; 8004260
cmp r4, 0
bne @08004338
adds r0, r7, 0
- bl GetNumActiveWindowsOnBgDuplicate
+ bl GetNumActiveWindowsOnBg8Bit
lsls r0, 24
cmp r0, 0
bne @08004322
@@ -2300,11 +2303,11 @@ Window_AddFromTemplate8Bpp: ; 8004260
pop {r1}
bx r1
.pool
- thumb_func_end Window_AddFromTemplate8Bpp
+ thumb_func_end AddWindow8Bit
- thumb_func_start Window_FillPixels8Bpp
-; void Window_FillPixels8Bpp(u8 rbox_id, char value)
-Window_FillPixels8Bpp: ; 8004368
+ thumb_func_start FillWindowPixelBuffer8Bit
+; void FillWindowPixelBuffer8Bit(u8 windowId, u8 fillValue)
+FillWindowPixelBuffer8Bit: ; 8004368
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -2338,11 +2341,11 @@ Window_FillPixels8Bpp: ; 8004368
pop {r0}
bx r0
.pool
- thumb_func_end Window_FillPixels8Bpp
+ thumb_func_end FillWindowPixelBuffer8Bit
- thumb_func_start Window_FillPixelRect8Bpp
-; void Window_FillPixelRect8Bpp(u8 a1, char fill_value, u16 x, u16 y, u16 w, u16 h)
-Window_FillPixelRect8Bpp: ; 80043A8
+ thumb_func_start FillWindowPixelRect8Bit
+; void FillWindowPixelRect8Bit(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height)
+FillWindowPixelRect8Bit: ; 80043A8
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -2397,7 +2400,7 @@ Window_FillPixelRect8Bpp: ; 80043A8
add r0, sp, 0x8
adds r1, r2, 0
mov r2, r9
- bl PixelBlock_FillRect8Bpp
+ bl FillSurfaceRect8Bit
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -2406,11 +2409,11 @@ Window_FillPixelRect8Bpp: ; 80043A8
pop {r0}
bx r0
.pool
- thumb_func_end Window_FillPixelRect8Bpp
+ thumb_func_end FillWindowPixelRect8Bit
- thumb_func_start Window_CopyPixelRectToWindow4BppTo8Bpp
-; void Window_CopyPixelRectToWindow4BppTo8Bpp(u8 rbox_id, void *pixels, u16 src_x, u16 src_y, u16 src_w, int src_h, u16 dest_x, u16 dest_y, u16 dest_w, u16 dest_h, u8 a11)
-Window_CopyPixelRectToWindow4BppTo8Bpp: ; 8004434
+ thumb_func_start BlitSurfaceRectToWindow4BitTo8Bit
+; void BlitSurfaceRectToWindow4BitTo8Bit(u8 rbox_id, u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 paletteOffset)
+BlitSurfaceRectToWindow4BitTo8Bit: ; 8004434
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2496,7 +2499,7 @@ Window_CopyPixelRectToWindow4BppTo8Bpp: ; 8004434
ldr r6, [sp, 0x28]
str r6, [sp, 0x14]
add r0, sp, 0x18
- bl PixelBlock_CopyRect4BppTo8Bpp
+ bl BlitSurface4BitTo8Bit
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@@ -2506,10 +2509,11 @@ Window_CopyPixelRectToWindow4BppTo8Bpp: ; 8004434
pop {r0}
bx r0
.pool
- thumb_func_end Window_CopyPixelRectToWindow4BppTo8Bpp
+ thumb_func_end BlitSurfaceRectToWindow4BitTo8Bit
- thumb_func_start Window_CopyToVram8Bpp
-Window_CopyToVram8Bpp: ; 8004500
+ thumb_func_start CopyWindowToVram8Bit
+; void CopyWindowToVram8Bit(u8 windowId, u8 mode)
+CopyWindowToVram8Bit: ; 8004500
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -2565,11 +2569,11 @@ Window_CopyToVram8Bpp: ; 8004500
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end Window_CopyToVram8Bpp
+ thumb_func_end CopyWindowToVram8Bit
- thumb_func_start GetNumActiveWindowsOnBgDuplicate
-; int GetNumActiveWindowsOnBgDuplicate(int bg_id)
-GetNumActiveWindowsOnBgDuplicate: ; 8004578
+ thumb_func_start GetNumActiveWindowsOnBg8Bit
+; int GetNumActiveWindowsOnBg8Bit(int bg_id)
+GetNumActiveWindowsOnBg8Bit: ; 8004578
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -2593,4 +2597,4 @@ GetNumActiveWindowsOnBgDuplicate: ; 8004578
pop {r1}
bx r1
.pool
- thumb_func_end GetNumActiveWindowsOnBgDuplicate
+ thumb_func_end GetNumActiveWindowsOnBg8Bit
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 15:47:15 +0000