summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/berry_crush_3.s6
-rw-r--r--asm/berry_pouch.s64
-rw-r--r--asm/buy_menu_helpers.s2
-rw-r--r--asm/diploma.s6
-rw-r--r--asm/dodrio_berry_picking.s6
-rw-r--r--asm/field_camera.s6
-rw-r--r--asm/field_message_box.s2
-rw-r--r--asm/field_special_scene.s39
-rw-r--r--asm/hall_of_fame.s6
-rw-r--r--asm/intro.s60
-rw-r--r--asm/item_menu.s52
-rw-r--r--asm/learn_move.s2
-rw-r--r--asm/link.s2
-rw-r--r--asm/link_rfu_3.s6
-rw-r--r--asm/mail.s6
-rw-r--r--asm/map_preview_screen.s6
-rw-r--r--asm/new_menu_helpers.s805
-rw-r--r--asm/overworld.s26
-rw-r--r--asm/party_menu.s100
-rw-r--r--asm/player_pc.s20
-rw-r--r--asm/pokemon_jump_2.s18
-rw-r--r--asm/pokemon_special_anim.s6
-rw-r--r--asm/pokemon_storage_system.s30
-rw-r--r--asm/pokemon_summary_screen.s6
-rw-r--r--asm/region_map.s8
-rw-r--r--asm/script_menu.s12
-rw-r--r--asm/shop.s24
-rw-r--r--asm/slot_machine.s14
-rw-r--r--asm/start_menu.s6
-rw-r--r--asm/title_screen.s20
-rw-r--r--asm/trade.s2
-rw-r--r--asm/union_room_chat.s8
32 files changed, 272 insertions, 1104 deletions
diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s
index f447c848f..22c83d3bd 100644
--- a/asm/berry_crush_3.s
+++ b/asm/berry_crush_3.s
@@ -50,7 +50,7 @@ _0814D61C:
movs r1, 0
bl SetGpuReg
bl ScanlineEffect_Stop
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
b _0814D878
_0814D63A:
add r0, sp, 0x8
@@ -175,12 +175,12 @@ _0814D73A:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
b _0814D878
.align 2, 0
_0814D764: .4byte gUnknown_8EAFFC0
_0814D768:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
beq _0814D774
diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s
index 67d189a12..f5ab7f3a7 100644
--- a/asm/berry_pouch.s
+++ b/asm/berry_pouch.s
@@ -100,7 +100,7 @@ sub_813CE00: @ 813CE00
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
- bl do_scheduled_bg_tilemap_copies_to_vram
+ bl DoScheduledBgTilemapCopiesToVram
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -184,7 +184,7 @@ _0813CE84:
.4byte _0813CFBE
_0813CED0:
bl SetVBlankHBlankCallbacksToNull
- bl clear_scheduled_bg_copies_to_vram
+ bl ClearScheduledBgCopiesToVram
b _0813CFD2
_0813CEDA:
bl ScanlineEffect_Stop
@@ -405,7 +405,7 @@ sub_813D07C: @ 813D07C
movs r0, 0x1
bl SetBgTilemapBuffer
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x50
movs r1, 0
bl SetGpuReg
@@ -454,18 +454,18 @@ _0813D10C:
beq _0813D178
b _0813D190
_0813D116:
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
ldr r1, _0813D12C @ =gUnknown_8E859D0
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
b _0813D17E
.align 2, 0
_0813D12C: .4byte gUnknown_8E859D0
_0813D130:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1030,7 +1030,7 @@ sub_813D594: @ 813D594
movs r3, 0x1E
bl SetBgRectPal
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x8
pop {r0}
bx r0
@@ -2111,9 +2111,9 @@ sub_813DE0C: @ 813DE0C
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _0813DE60 @ =gUnknown_203F370
ldrb r0, [r0, 0x4]
cmp r0, 0x4
@@ -2309,9 +2309,9 @@ sub_813DFC8: @ 813DFC8
movs r0, 0
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl sub_813D4B0
@@ -2370,9 +2370,9 @@ _0813E048:
movs r0, 0
bl sub_813EA98
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_813D684
adds r0, r5, 0
bl sub_813DF54
@@ -2395,9 +2395,9 @@ _0813E090:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl sub_813D4B0
@@ -2519,7 +2519,7 @@ _0813E18A:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r5]
movs r1, 0x1
bl sub_813D4B0
@@ -2555,9 +2555,9 @@ sub_813E200: @ 813E200
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
@@ -2659,7 +2659,7 @@ sub_813E2B8: @ 813E2B8
lsrs r0, 24
strh r0, [r5]
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r5]
movs r1, 0x1
bl sub_813D4B0
@@ -2693,9 +2693,9 @@ sub_813E320: @ 813E320
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _0813E378 @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -2964,7 +2964,7 @@ sub_813E568: @ 813E568
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl sub_813D4B0
@@ -3130,7 +3130,7 @@ _0813E6E4:
movs r0, 0
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_813D684
adds r0, r4, 0
bl sub_813E4E4
@@ -3157,7 +3157,7 @@ _0813E718:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_813D684
ldrb r0, [r5]
movs r1, 0x1
@@ -3184,7 +3184,7 @@ sub_813E768: @ 813E768
movs r0, 0
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _0813E7D8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0813E7DC @ =gStringVar1
@@ -3397,9 +3397,9 @@ _0813E946:
movs r0, 0x2
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r4, 0
ldr r3, _0813E99C @ =gUnknown_203F38C
movs r2, 0xFF
@@ -3522,7 +3522,7 @@ _0813EA54:
bl SetWindowBorderStyle
_0813EA60:
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _0813EA74 @ =gUnknown_203F38C
adds r0, r4, r0
ldrb r0, [r0]
@@ -3568,7 +3568,7 @@ sub_813EA98: @ 813EA98
ldrb r0, [r4]
bl RemoveWindow
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -3597,9 +3597,9 @@ sub_813EACC: @ 813EACC
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0xFF
strb r0, [r4]
_0813EB04:
@@ -3656,7 +3656,7 @@ _0813EB44:
movs r3, 0xD
bl DisplayMessageAndContinueTask
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x10
pop {r3}
mov r8, r3
diff --git a/asm/buy_menu_helpers.s b/asm/buy_menu_helpers.s
index ed18eb711..745c8d104 100644
--- a/asm/buy_menu_helpers.s
+++ b/asm/buy_menu_helpers.s
@@ -155,7 +155,7 @@ sub_813F75C: @ 813F75C
movs r3, 0xE
bl DisplayMessageAndContinueTask
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x10
pop {r3}
mov r8, r3
diff --git a/asm/diploma.s b/asm/diploma.s
index cfc70d694..f3fc0871a 100644
--- a/asm/diploma.s
+++ b/asm/diploma.s
@@ -463,7 +463,7 @@ _080F4FB8:
beq _080F4FEE
b _080F4FF8
_080F4FC2:
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
b _080F5000
_080F4FC8:
ldr r1, _080F4FDC @ =gUnknown_84147C0
@@ -472,12 +472,12 @@ _080F4FC8:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
b _080F5000
.align 2, 0
_080F4FDC: .4byte gUnknown_84147C0
_080F4FE0:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index 160208493..35fefbe29 100644
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -11348,7 +11348,7 @@ _08156020:
.align 2, 0
_0815602C: .4byte gUnknown_84758A8
_08156030:
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
b _08156082
_08156036:
ldr r1, _08156040 @ =gUnknown_8475B3C
@@ -11366,12 +11366,12 @@ _08156044:
_0815604C:
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
b _08156082
.align 2, 0
_08156058: .4byte gUnknown_84763CC
_0815605C:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/field_camera.s b/asm/field_camera.s
index 5541c6472..f6cbbd0ef 100644
--- a/asm/field_camera.s
+++ b/asm/field_camera.s
@@ -710,11 +710,11 @@ _0805AAA2:
strh r0, [r3]
_0805AABE:
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x3
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r4}
pop {r0}
bx r0
diff --git a/asm/field_message_box.s b/asm/field_message_box.s
index 46f4c3f8e..ffb214205 100644
--- a/asm/field_message_box.s
+++ b/asm/field_message_box.s
@@ -90,7 +90,7 @@ _080693E2:
strh r0, [r5, 0x8]
b _08069402
_080693EA:
- bl sub_80F6CBC
+ bl RunTextPrinters_CheckPrinter0Active
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
diff --git a/asm/field_special_scene.s b/asm/field_special_scene.s
deleted file mode 100644
index ab436029f..000000000
--- a/asm/field_special_scene.s
+++ /dev/null
@@ -1,39 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .syntax unified
-
- .text
-
- thumb_func_start sub_80A0E78
-sub_80A0E78: @ 80A0E78
- movs r0, 0
- bx lr
- thumb_func_end sub_80A0E78
-
- thumb_func_start nullsub_57
-nullsub_57: @ 80A0E7C
- bx lr
- thumb_func_end nullsub_57
-
- thumb_func_start nullsub_58
-nullsub_58: @ 80A0E80
- bx lr
- thumb_func_end nullsub_58
-
- thumb_func_start nullsub_59
-nullsub_59: @ 80A0E84
- bx lr
- thumb_func_end nullsub_59
-
- thumb_func_start nullsub_60
-nullsub_60: @ 80A0E88
- bx lr
- thumb_func_end nullsub_60
-
- thumb_func_start nullsub_61
-nullsub_61: @ 80A0E8C
- bx lr
- thumb_func_end nullsub_61
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s
index 97bf9ef64..cb988199a 100644
--- a/asm/hall_of_fame.s
+++ b/asm/hall_of_fame.s
@@ -3073,7 +3073,7 @@ sub_80F36BC: @ 80F36BC
bl ScanlineEffect_Stop
bl ResetTasks
bl ResetSpriteData
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
bl ResetAllPicSprites
bl FreeAllSpritePalettes
ldr r1, _080F36EC @ =gReservedSpritePaletteCount
@@ -3174,12 +3174,12 @@ _080F37A4:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
b _080F3854
.align 2, 0
_080F37B8: .4byte gUnknown_840C3BC
_080F37BC:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
beq _080F3854
diff --git a/asm/intro.s b/asm/intro.s
index 909fee72e..c0ac0d4d1 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -381,7 +381,7 @@ _080EC8A0:
bl ResetTasks
bl ResetSpriteData
bl ResetPaletteFade
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
bl sub_80ECA00
add r1, sp, 0x4
movs r0, 0
@@ -445,13 +445,13 @@ _080EC944:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080EC980 @ =gUnknown_8402668
str r4, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r0, _080EC984 @ =gUnknown_840270C
movs r1, 0xD0
movs r2, 0x20
@@ -463,7 +463,7 @@ _080EC97C: .4byte gUnknown_8402650
_080EC980: .4byte gUnknown_8402668
_080EC984: .4byte gUnknown_840270C
_080EC988:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
bne _080EC9C6
@@ -1144,13 +1144,13 @@ _080ECED8:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ECF5C @ =gUnknown_8404F7C
movs r0, 0x1
str r0, [sp]
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
movs r0, 0x1
bl ShowBg
movs r0, 0
@@ -1172,7 +1172,7 @@ _080ECF58: .4byte gUnknown_84048EC
_080ECF5C: .4byte gUnknown_8404F7C
_080ECF60: .4byte sub_80EC9EC
_080ECF64:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1184,15 +1184,15 @@ _080ECF72:
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ECFA0 @ =gUnknown_8403FE8
movs r0, 0x1
str r0, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
- bl sub_80F6C14
+ bl DecompressAndCopyTileDataToVram
+ bl ResetBgPositions
movs r0, 0x1
bl ShowBg
b _080ECFF0
@@ -1200,7 +1200,7 @@ _080ECF72:
_080ECF9C: .4byte gUnknown_8402D54
_080ECFA0: .4byte gUnknown_8403FE8
_080ECFA4:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
bne _080ED094
@@ -1476,14 +1476,14 @@ _080ED1C4:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ED210 @ =gUnknown_8405890
movs r0, 0x1
str r0, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
movs r0, 0x3
bl ShowBg
b _080ED3CA
@@ -1493,7 +1493,7 @@ _080ED208: .4byte gUnknown_840BB90
_080ED20C: .4byte gUnknown_8405414
_080ED210: .4byte gUnknown_8405890
_080ED214:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -1527,39 +1527,39 @@ _080ED222:
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ED310 @ =gUnknown_8405CDC
movs r4, 0x1
str r4, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ED314 @ =gUnknown_8406654
str r6, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ED318 @ =gUnknown_84071D0
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ED31C @ =gUnknown_8405DC4
str r6, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ED320 @ =gUnknown_840644C
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
- bl sub_80F6C14
+ bl DecompressAndCopyTileDataToVram
+ bl ResetBgPositions
movs r0, 0
bl ShowBg
movs r0, 0x1
@@ -1602,7 +1602,7 @@ _080ED320: .4byte gUnknown_840644C
_080ED324: .4byte sub_80ED40C
_080ED328: .4byte sub_80EC9EC
_080ED32C:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
bne _080ED3F6
@@ -1847,13 +1847,13 @@ _080ED4E4:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ED598 @ =gUnknown_8407A50
movs r0, 0x1
str r0, [sp]
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
movs r0, 0x1
bl ShowBg
movs r0, 0
@@ -1862,7 +1862,7 @@ _080ED4E4:
bl HideBg
movs r0, 0x3
bl HideBg
- bl sub_80F6C14
+ bl ResetBgPositions
ldrb r0, [r5, 0x4]
adds r0, 0x1
strb r0, [r5, 0x4]
@@ -1895,7 +1895,7 @@ _080ED590: .4byte gUnknown_840BBA0
_080ED594: .4byte gUnknown_8407470
_080ED598: .4byte gUnknown_8407A50
_080ED59C:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1905,13 +1905,13 @@ _080ED59C:
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ED5F0 @ =gUnknown_8408D98
str r4, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _080ED5F4 @ =gUnknown_203AB00
movs r0, 0x4
strh r0, [r1]
@@ -1935,7 +1935,7 @@ _080ED5F0: .4byte gUnknown_8408D98
_080ED5F4: .4byte gUnknown_203AB00
_080ED5F8: .4byte gUnknown_203AB02
_080ED5FC:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -2730,7 +2730,7 @@ _080EDBF8:
strb r0, [r4, 0x4]
b _080EDC34
_080EDC0C:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
bne _080EDC34
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 4e4c2ebfd..9361136ef 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -170,7 +170,7 @@ sub_8107EE0: @ 8107EE0
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
- bl do_scheduled_bg_tilemap_copies_to_vram
+ bl DoScheduledBgTilemapCopiesToVram
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -254,7 +254,7 @@ _08107F60:
.4byte _081080DE
_08107FB0:
bl SetVBlankHBlankCallbacksToNull
- bl clear_scheduled_bg_copies_to_vram
+ bl ClearScheduledBgCopiesToVram
b _08108104
_08107FBA:
bl ScanlineEffect_Stop
@@ -542,7 +542,7 @@ sub_81081D0: @ 81081D0
movs r0, 0x1
bl SetBgTilemapBuffer
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r1, 0xC1
lsls r1, 6
movs r0, 0
@@ -595,19 +595,19 @@ _08108264:
.4byte _08108340
.4byte _0810834C
_0810827C:
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
ldr r1, _08108294 @ =gUnknown_8E830CC
movs r0, 0
str r0, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
b _08108352
.align 2, 0
_08108294: .4byte gUnknown_8E830CC
_08108298:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2192,7 +2192,7 @@ DisplayItemMessageInBag: @ 8108E70
movs r3, 0xD
bl DisplayMessageAndContinueTask
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -2516,7 +2516,7 @@ sub_8109140: @ 8109140
movs r3, 0x1E
bl SetBgRectPal
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x8
pop {r0}
bx r0
@@ -2619,7 +2619,7 @@ sub_81091D0: @ 81091D0
adds r2, r3
bl DestroyListMenu
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _08109290 @ =gUnknown_203AD10
ldr r0, [r0]
ldrb r1, [r0, 0x5]
@@ -2640,7 +2640,7 @@ _08109242:
movs r3, 0x1
bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _0810928C @ =gUnknown_203ACFC
ldrb r0, [r0, 0x6]
adds r0, r6
@@ -2792,7 +2792,7 @@ _08109358:
movs r0, 0x2
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_8108888
bl sub_81088D8
adds r0, r6, 0
@@ -3374,7 +3374,7 @@ sub_8109854: @ 8109854
movs r2, 0xB
bl CopyToBgTilemapBufferRect
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x8
pop {r0}
bx r0
@@ -3852,7 +3852,7 @@ sub_8109C50: @ 8109C50
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
@@ -4008,7 +4008,7 @@ sub_8109DB0: @ 8109DB0
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl bag_menu_print_cursor_
@@ -4066,7 +4066,7 @@ _08109E20:
movs r0, 0
bl sub_810BA3C
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_8108978
adds r0, r5, 0
bl sub_8109D38
@@ -4089,7 +4089,7 @@ _08109E64:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl bag_menu_print_cursor_
@@ -4234,7 +4234,7 @@ _08109F6E:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r7]
movs r1, 0x1
bl bag_menu_print_cursor_
@@ -4538,7 +4538,7 @@ sub_810A1F8: @ 810A1F8
lsrs r0, 24
strh r0, [r5]
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r5]
movs r1, 0x1
bl bag_menu_print_cursor_
@@ -4582,7 +4582,7 @@ sub_810A288: @ 810A288
movs r0, 0
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl bag_menu_print_cursor_
@@ -4611,7 +4611,7 @@ sub_810A2DC: @ 810A2DC
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _0810A320 @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -5160,7 +5160,7 @@ sub_810A720: @ 810A720
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl bag_menu_print_cursor_
@@ -5339,7 +5339,7 @@ _0810A8BC:
movs r0, 0
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_8108978
adds r0, r4, 0
bl sub_810A690
@@ -5366,7 +5366,7 @@ _0810A8F0:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_8108978
ldrb r0, [r5]
movs r1, 0x1
@@ -5393,7 +5393,7 @@ sub_810A940: @ 810A940
movs r0, 0
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _0810A9B8 @ =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, _0810A9BC @ =gStringVar1
@@ -5690,7 +5690,7 @@ _0810ABBC:
movs r0, 0
bl sub_810BA3C
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_8108978
adds r0, r5, 0
bl sub_810AC40
@@ -5711,7 +5711,7 @@ _0810AC00:
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrb r0, [r4]
movs r1, 0x1
bl bag_menu_print_cursor_
diff --git a/asm/learn_move.s b/asm/learn_move.s
index 4a37c7eae..f00135fda 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -76,7 +76,7 @@ sub_80E469C: @ 80E469C
movs r0, 0
movs r2, 0x2
bl InitBgsFromTemplates
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
ldr r0, _080E4778 @ =gUnknown_83FFA44
bl InitWindows
lsls r0, 16
diff --git a/asm/link.s b/asm/link.s
index 28dc18656..7275ebbd2 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -3288,7 +3288,7 @@ _0800AD30:
cmp r0, 0
beq _0800ADD8
bl DeactivateAllTextPrinters
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
movs r0, 0x52
movs r1, 0
bl SetGpuReg
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s
index 50121e847..8ce369e1f 100644
--- a/asm/link_rfu_3.s
+++ b/asm/link_rfu_3.s
@@ -8503,7 +8503,7 @@ _0811A0DC: .4byte gStringVar4
thumb_func_start sub_811A0E0
sub_811A0E0: @ 811A0E0
push {lr}
- bl sub_80F6CBC
+ bl RunTextPrinters_CheckPrinter0Active
lsls r0, 16
cmp r0, 0
beq _0811A0F0
@@ -8544,7 +8544,7 @@ _0811A10A:
.align 2, 0
_0811A12C: .4byte gStringVar4
_0811A130:
- bl sub_80F6CBC
+ bl RunTextPrinters_CheckPrinter0Active
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -12935,7 +12935,7 @@ _0811C2C0:
movs r0, 0
movs r2, 0x1
bl InitBgsFromTemplates
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
ldr r0, _0811C358 @ =gUnknown_8457198
bl InitWindows
lsls r0, 16
diff --git a/asm/mail.s b/asm/mail.s
index 77f8864ed..23aba36f6 100644
--- a/asm/mail.s
+++ b/asm/mail.s
@@ -240,7 +240,7 @@ _080BEDE0:
b _080BF0F4
_080BEDE6:
bl FreeAllSpritePalettes
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
movs r0, 0x10
movs r1, 0
bl SetGpuReg
@@ -318,13 +318,13 @@ _080BEE88:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
b _080BF0F4
.align 2, 0
_080BEEB0: .4byte gUnknown_83EE9C8
_080BEEB4: .4byte gUnknown_20399C4
_080BEEB8:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
bne _080BEEC4
diff --git a/asm/map_preview_screen.s b/asm/map_preview_screen.s
index be9f5e3c5..01bc7660b 100644
--- a/asm/map_preview_screen.s
+++ b/asm/map_preview_screen.s
@@ -123,7 +123,7 @@ sub_80F819C: @ 80F819C
lsrs r5, r0, 24
cmp r5, 0x1C
beq _080F8224
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
ldr r4, _080F8200 @ =gUnknown_843E9E8
lsls r5, 4
adds r0, r4, 0
@@ -141,7 +141,7 @@ sub_80F819C: @ 80F819C
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
movs r0, 0
bl GetBgTilemapBuffer
cmp r0, 0
@@ -206,7 +206,7 @@ _080F8254: .4byte gUnknown_203ABED
thumb_func_start sub_80F8258
sub_80F8258: @ 80F8258
push {lr}
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
pop {r1}
diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s
index 5e7b10e5b..6c23410d9 100644
--- a/asm/new_menu_helpers.s
+++ b/asm/new_menu_helpers.s
@@ -5,799 +5,6 @@
.text
- thumb_func_start clear_scheduled_bg_copies_to_vram
-clear_scheduled_bg_copies_to_vram: @ 80F6790
- push {lr}
- ldr r0, _080F67A0 @ =gUnknown_203AB58
- movs r1, 0
- movs r2, 0x4
- bl memset
- pop {r0}
- bx r0
- .align 2, 0
-_080F67A0: .4byte gUnknown_203AB58
- thumb_func_end clear_scheduled_bg_copies_to_vram
-
- thumb_func_start schedule_bg_copy_tilemap_to_vram
-schedule_bg_copy_tilemap_to_vram: @ 80F67A4
- lsls r0, 24
- lsrs r0, 24
- ldr r1, _080F67B4 @ =gUnknown_203AB58
- adds r0, r1
- movs r1, 0x1
- strb r1, [r0]
- bx lr
- .align 2, 0
-_080F67B4: .4byte gUnknown_203AB58
- thumb_func_end schedule_bg_copy_tilemap_to_vram
-
- thumb_func_start do_scheduled_bg_tilemap_copies_to_vram
-do_scheduled_bg_tilemap_copies_to_vram: @ 80F67B8
- push {r4,lr}
- ldr r4, _080F6804 @ =gUnknown_203AB58
- ldrb r0, [r4]
- cmp r0, 0x1
- bne _080F67CC
- movs r0, 0
- bl CopyBgTilemapBufferToVram
- movs r0, 0
- strb r0, [r4]
-_080F67CC:
- ldrb r0, [r4, 0x1]
- cmp r0, 0x1
- bne _080F67DC
- movs r0, 0x1
- bl CopyBgTilemapBufferToVram
- movs r0, 0
- strb r0, [r4, 0x1]
-_080F67DC:
- ldrb r0, [r4, 0x2]
- cmp r0, 0x1
- bne _080F67EC
- movs r0, 0x2
- bl CopyBgTilemapBufferToVram
- movs r0, 0
- strb r0, [r4, 0x2]
-_080F67EC:
- ldrb r0, [r4, 0x3]
- cmp r0, 0x1
- bne _080F67FC
- movs r0, 0x3
- bl CopyBgTilemapBufferToVram
- movs r0, 0
- strb r0, [r4, 0x3]
-_080F67FC:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080F6804: .4byte gUnknown_203AB58
- thumb_func_end do_scheduled_bg_tilemap_copies_to_vram
-
- thumb_func_start reset_temp_tile_data_buffers
-reset_temp_tile_data_buffers: @ 80F6808
- push {lr}
- ldr r3, _080F6824 @ =gUnknown_203AB5C
- ldr r1, _080F6828 @ =gUnknown_203AB60
- movs r2, 0
- adds r0, r1, 0
- adds r0, 0x7C
-_080F6814:
- str r2, [r0]
- subs r0, 0x4
- cmp r0, r1
- bge _080F6814
- movs r0, 0
- strh r0, [r3]
- pop {r0}
- bx r0
- .align 2, 0
-_080F6824: .4byte gUnknown_203AB5C
-_080F6828: .4byte gUnknown_203AB60
- thumb_func_end reset_temp_tile_data_buffers
-
- thumb_func_start free_temp_tile_data_buffers_if_possible
-free_temp_tile_data_buffers_if_possible: @ 80F682C
- push {r4-r6,lr}
- bl IsDma3ManagerBusyWithBgCopy
- lsls r0, 24
- cmp r0, 0
- bne _080F6870
- ldr r1, _080F6868 @ =gUnknown_203AB5C
- ldrh r0, [r1]
- cmp r0, 0
- beq _080F6864
- movs r4, 0
- ldrh r1, [r1]
- cmp r4, r1
- bge _080F685E
- ldr r5, _080F686C @ =gUnknown_203AB60
- movs r6, 0
-_080F684C:
- ldr r0, [r5]
- bl Free
- stm r5!, {r6}
- adds r4, 0x1
- ldr r0, _080F6868 @ =gUnknown_203AB5C
- ldrh r0, [r0]
- cmp r4, r0
- blt _080F684C
-_080F685E:
- ldr r1, _080F6868 @ =gUnknown_203AB5C
- movs r0, 0
- strh r0, [r1]
-_080F6864:
- movs r0, 0
- b _080F6872
- .align 2, 0
-_080F6868: .4byte gUnknown_203AB5C
-_080F686C: .4byte gUnknown_203AB60
-_080F6870:
- movs r0, 0x1
-_080F6872:
- pop {r4-r6}
- pop {r1}
- bx r1
- thumb_func_end free_temp_tile_data_buffers_if_possible
-
- thumb_func_start decompress_and_copy_tile_data_to_vram
-decompress_and_copy_tile_data_to_vram: @ 80F6878
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- sub sp, 0x8
- adds r4, r1, 0
- adds r5, r2, 0
- ldr r1, [sp, 0x24]
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
- lsls r3, 16
- lsrs r3, 16
- mov r9, r3
- lsls r1, 24
- lsrs r7, r1, 24
- ldr r6, _080F68D8 @ =gUnknown_203AB5C
- ldrh r0, [r6]
- cmp r0, 0x1F
- bhi _080F68E0
- adds r0, r4, 0
- add r1, sp, 0x4
- bl malloc_and_decompress
- adds r4, r0, 0
- cmp r5, 0
- bne _080F68B0
- ldr r5, [sp, 0x4]
-_080F68B0:
- cmp r4, 0
- beq _080F68D4
- lsls r2, r5, 16
- lsrs r2, 16
- str r7, [sp]
- mov r0, r8
- adds r1, r4, 0
- mov r3, r9
- bl sub_80F6AD0
- ldr r2, _080F68DC @ =gUnknown_203AB60
- ldrh r0, [r6]
- adds r1, r0, 0x1
- strh r1, [r6]
- lsls r0, 16
- lsrs r0, 14
- adds r0, r2
- str r4, [r0]
-_080F68D4:
- adds r0, r4, 0
- b _080F68E2
- .align 2, 0
-_080F68D8: .4byte gUnknown_203AB5C
-_080F68DC: .4byte gUnknown_203AB60
-_080F68E0:
- movs r0, 0
-_080F68E2:
- add sp, 0x8
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end decompress_and_copy_tile_data_to_vram
-
- thumb_func_start sub_80F68F0
-sub_80F68F0: @ 80F68F0
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- sub sp, 0x8
- adds r4, r1, 0
- adds r6, r2, 0
- ldr r1, [sp, 0x24]
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
- lsls r3, 16
- lsrs r3, 16
- mov r9, r3
- lsls r1, 24
- lsrs r7, r1, 24
- ldr r5, _080F6954 @ =gUnknown_203AB5C
- ldrh r0, [r5]
- cmp r0, 0x1F
- bhi _080F695C
- adds r0, r4, 0
- add r1, sp, 0x4
- bl malloc_and_decompress
- adds r4, r0, 0
- ldr r0, [sp, 0x4]
- cmp r0, r6
- bls _080F692A
- str r6, [sp, 0x4]
-_080F692A:
- cmp r4, 0
- beq _080F6950
- ldr r2, [sp, 0x4]
- lsls r2, 16
- lsrs r2, 16
- str r7, [sp]
- mov r0, r8
- adds r1, r4, 0
- mov r3, r9
- bl sub_80F6AD0
- ldr r2, _080F6958 @ =gUnknown_203AB60
- ldrh r0, [r5]
- adds r1, r0, 0x1
- strh r1, [r5]
- lsls r0, 16
- lsrs r0, 14
- adds r0, r2
- str r4, [r0]
-_080F6950:
- adds r0, r4, 0
- b _080F695E
- .align 2, 0
-_080F6954: .4byte gUnknown_203AB5C
-_080F6958: .4byte gUnknown_203AB60
-_080F695C:
- movs r0, 0
-_080F695E:
- add sp, 0x8
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_80F68F0
-
- thumb_func_start DecompressAndLoadBgGfxUsingHeap
-DecompressAndLoadBgGfxUsingHeap: @ 80F696C
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- sub sp, 0x8
- adds r5, r2, 0
- ldr r2, [sp, 0x24]
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
- lsls r3, 16
- lsrs r3, 16
- mov r9, r3
- lsls r2, 24
- lsrs r7, r2, 24
- adds r0, r1, 0
- add r1, sp, 0x4
- bl malloc_and_decompress
- adds r6, r0, 0
- cmp r5, 0
- bne _080F699A
- ldr r5, [sp, 0x4]
-_080F699A:
- cmp r6, 0
- beq _080F69D2
- ldr r0, _080F69E0 @ =task_free_buf_after_copying_tile_data_to_vram
- movs r1, 0
- bl CreateTask
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r2, r5, 16
- lsrs r2, 16
- str r7, [sp]
- mov r0, r8
- adds r1, r6, 0
- mov r3, r9
- bl sub_80F6AD0
- ldr r2, _080F69E4 @ =gTasks
- lsls r1, r4, 2
- adds r1, r4
- lsls r1, 3
- adds r1, r2
- strh r0, [r1, 0x8]
- adds r0, r4, 0
- movs r1, 0x1
- adds r2, r6, 0
- bl SetWordTaskArg
-_080F69D2:
- add sp, 0x8
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_080F69E0: .4byte task_free_buf_after_copying_tile_data_to_vram
-_080F69E4: .4byte gTasks
- thumb_func_end DecompressAndLoadBgGfxUsingHeap
-
- thumb_func_start sub_80F69E8
-sub_80F69E8: @ 80F69E8
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0x8
- adds r4, r2, 0
- ldr r2, [sp, 0x20]
- lsls r0, 24
- lsrs r7, r0, 24
- lsls r3, 16
- lsrs r3, 16
- mov r8, r3
- lsls r2, 24
- lsrs r6, r2, 24
- adds r0, r1, 0
- add r1, sp, 0x4
- bl malloc_and_decompress
- adds r5, r0, 0
- ldr r0, [sp, 0x4]
- cmp r0, r4
- bls _080F6A14
- str r4, [sp, 0x4]
-_080F6A14:
- cmp r5, 0
- beq _080F6A4E
- ldr r0, _080F6A5C @ =task_free_buf_after_copying_tile_data_to_vram
- movs r1, 0
- bl CreateTask
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- ldr r2, [sp, 0x4]
- lsls r2, 16
- lsrs r2, 16
- str r6, [sp]
- adds r0, r7, 0
- adds r1, r5, 0
- mov r3, r8
- bl sub_80F6AD0
- ldr r2, _080F6A60 @ =gTasks
- lsls r1, r4, 2
- adds r1, r4
- lsls r1, 3
- adds r1, r2
- strh r0, [r1, 0x8]
- adds r0, r4, 0
- movs r1, 0x1
- adds r2, r5, 0
- bl SetWordTaskArg
-_080F6A4E:
- add sp, 0x8
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_080F6A5C: .4byte task_free_buf_after_copying_tile_data_to_vram
-_080F6A60: .4byte gTasks
- thumb_func_end sub_80F69E8
-
- thumb_func_start task_free_buf_after_copying_tile_data_to_vram
-task_free_buf_after_copying_tile_data_to_vram: @ 80F6A64
- push {r4,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- ldr r1, _080F6A9C @ =gTasks
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r0, r1
- movs r1, 0x8
- ldrsh r0, [r0, r1]
- bl CheckForSpaceForDma3Request
- lsls r0, 16
- cmp r0, 0
- bne _080F6A94
- adds r0, r4, 0
- movs r1, 0x1
- bl GetWordTaskArg
- bl Free
- adds r0, r4, 0
- bl DestroyTask
-_080F6A94:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080F6A9C: .4byte gTasks
- thumb_func_end task_free_buf_after_copying_tile_data_to_vram
-
- thumb_func_start malloc_and_decompress
-malloc_and_decompress: @ 80F6AA0
- push {r4,r5,lr}
- adds r5, r0, 0
- ldrb r0, [r5, 0x1]
- strb r0, [r1]
- ldrb r0, [r5, 0x2]
- strb r0, [r1, 0x1]
- ldrb r0, [r5, 0x3]
- strb r0, [r1, 0x2]
- movs r0, 0
- strb r0, [r1, 0x3]
- ldr r0, [r1]
- bl Alloc
- adds r4, r0, 0
- cmp r4, 0
- beq _080F6AC8
- adds r0, r5, 0
- adds r1, r4, 0
- bl LZ77UnCompWram
-_080F6AC8:
- adds r0, r4, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end malloc_and_decompress
-
- thumb_func_start sub_80F6AD0
-sub_80F6AD0: @ 80F6AD0
- push {r4,lr}
- adds r4, r1, 0
- ldr r1, [sp, 0x8]
- lsls r0, 24
- lsrs r0, 24
- lsls r2, 16
- lsrs r2, 16
- lsls r3, 16
- lsrs r3, 16
- lsls r1, 24
- lsrs r1, 24
- cmp r1, 0
- beq _080F6AEE
- cmp r1, 0x1
- beq _080F6AF6
-_080F6AEE:
- adds r1, r4, 0
- bl LoadBgTiles
- b _080F6AFC
-_080F6AF6:
- adds r1, r4, 0
- bl LoadBgTilemap
-_080F6AFC:
- lsls r0, 16
- lsrs r0, 16
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_80F6AD0
-
- thumb_func_start SetBgRectPal
-SetBgRectPal: @ 80F6B08
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- sub sp, 0x8
- adds r5, r2, 0
- ldr r4, [sp, 0x28]
- ldr r2, [sp, 0x2C]
- lsls r0, 24
- lsrs r0, 24
- lsls r1, 24
- lsrs r1, 24
- str r1, [sp]
- lsls r5, 24
- lsrs r5, 24
- lsls r3, 24
- lsrs r3, 24
- str r3, [sp, 0x4]
- lsls r4, 24
- lsrs r4, 24
- lsls r2, 24
- lsrs r2, 24
- mov r10, r2
- bl GetBgTilemapBuffer
- mov r8, r0
- adds r0, r5, r4
- cmp r5, r0
- bge _080F6B80
- mov r9, r0
-_080F6B46:
- ldr r3, [sp]
- ldr r1, [sp, 0x4]
- adds r0, r3, r1
- adds r7, r5, 0x1
- cmp r3, r0
- bge _080F6B78
- lsls r6, r5, 5
- ldr r1, _080F6B90 @ =0x00000fff
- mov r12, r1
- mov r1, r10
- lsls r5, r1, 12
- adds r4, r0, 0
-_080F6B5E:
- adds r1, r6, r3
- lsls r1, 1
- add r1, r8
- ldrh r2, [r1]
- mov r0, r12
- ands r0, r2
- orrs r0, r5
- strh r0, [r1]
- adds r0, r3, 0x1
- lsls r0, 24
- lsrs r3, r0, 24
- cmp r3, r4
- blt _080F6B5E
-_080F6B78:
- lsls r0, r7, 24
- lsrs r5, r0, 24
- cmp r5, r9
- blt _080F6B46
-_080F6B80:
- add sp, 0x8
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_080F6B90: .4byte 0x00000fff
- thumb_func_end SetBgRectPal
-
- thumb_func_start sub_80F6B94
-sub_80F6B94: @ 80F6B94
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- sub sp, 0x4
- mov r10, r1
- ldr r1, [sp, 0x24]
- ldr r4, [sp, 0x28]
- lsls r0, 24
- lsrs r0, 24
- lsls r2, 24
- lsrs r2, 24
- mov r9, r2
- lsls r3, 24
- lsrs r3, 24
- str r3, [sp]
- lsls r1, 24
- lsrs r5, r1, 24
- lsls r4, 24
- lsrs r4, 24
- mov r8, r4
- bl GetBgTilemapBuffer
- adds r7, r0, 0
- movs r0, 0
- cmp r0, r8
- bcs _080F6C02
-_080F6BCC:
- movs r2, 0
- adds r6, r0, 0x1
- cmp r2, r5
- bcs _080F6BFA
- adds r4, r0, 0
- muls r4, r5
- ldr r1, [sp]
- adds r0, r1
- lsls r3, r0, 5
-_080F6BDE:
- adds r1, r4, r2
- lsls r1, 1
- add r1, r10
- adds r0, r3, r2
- add r0, r9
- lsls r0, 1
- adds r0, r7
- ldrh r0, [r0]
- strh r0, [r1]
- adds r0, r2, 0x1
- lsls r0, 24
- lsrs r2, r0, 24
- cmp r2, r5
- bcc _080F6BDE
-_080F6BFA:
- lsls r0, r6, 24
- lsrs r0, 24
- cmp r0, r8
- bcc _080F6BCC
-_080F6C02:
- add sp, 0x4
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_80F6B94
-
- thumb_func_start sub_80F6C14
-sub_80F6C14: @ 80F6C14
- push {lr}
- movs r0, 0
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0x1
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0x2
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0x3
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
- movs r0, 0x1
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
- movs r0, 0x2
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
- movs r0, 0x3
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
- pop {r0}
- bx r0
- thumb_func_end sub_80F6C14
-
- thumb_func_start InitStandardTextBoxWindows
-InitStandardTextBoxWindows: @ 80F6C6C
- push {lr}
- ldr r0, _080F6C84 @ =gUnknown_841F42C
- bl InitWindows
- ldr r1, _080F6C88 @ =gUnknown_203ABE0
- movs r0, 0xFF
- strb r0, [r1]
- bl sub_8112EA8
- pop {r0}
- bx r0
- .align 2, 0
-_080F6C84: .4byte gUnknown_841F42C
-_080F6C88: .4byte gUnknown_203ABE0
- thumb_func_end InitStandardTextBoxWindows
-
- thumb_func_start sub_80F6C8C
-sub_80F6C8C: @ 80F6C8C
- push {lr}
- bl FreeAllWindowBuffers
- pop {r0}
- bx r0
- thumb_func_end sub_80F6C8C
-
- thumb_func_start ResetBg0
-ResetBg0: @ 80F6C98
- push {lr}
- movs r0, 0
- movs r1, 0
- movs r2, 0
- bl ChangeBgX
- movs r0, 0
- movs r1, 0
- movs r2, 0
- bl ChangeBgY
- bl DeactivateAllTextPrinters
- bl sub_80F6E9C
- pop {r0}
- bx r0
- thumb_func_end ResetBg0
-
- thumb_func_start sub_80F6CBC
-sub_80F6CBC: @ 80F6CBC
- push {lr}
- bl RunTextPrinters
- movs r0, 0
- bl IsTextPrinterActive
- lsls r0, 16
- lsrs r0, 16
- pop {r1}
- bx r1
- thumb_func_end sub_80F6CBC
-
- thumb_func_start AddTextPrinterParameterized2
-AddTextPrinterParameterized2: @ 80F6CD0
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0x10
- ldr r7, [sp, 0x28]
- ldr r4, [sp, 0x2C]
- mov r8, r4
- ldr r5, [sp, 0x30]
- ldr r6, [sp, 0x34]
- lsls r3, 24
- lsrs r3, 24
- lsls r5, 24
- lsrs r5, 24
- lsls r6, 24
- str r2, [sp]
- mov r2, sp
- movs r4, 0
- strb r0, [r2, 0x4]
- mov r0, sp
- strb r1, [r0, 0x5]
- strb r4, [r0, 0x6]
- movs r1, 0x1
- strb r1, [r0, 0x7]
- strb r4, [r0, 0x8]
- strb r1, [r0, 0x9]
- strb r1, [r0, 0xA]
- strb r1, [r0, 0xB]
- mov r4, sp
- ldrb r2, [r4, 0xC]
- subs r1, 0x11
- adds r0, r1, 0
- ands r0, r2
- strb r0, [r4, 0xC]
- mov r0, sp
- mov r2, r8
- lsls r2, 4
- movs r4, 0xF
- strb r2, [r0, 0xC]
- mov r2, sp
- ands r5, r4
- ldrb r0, [r2, 0xD]
- ands r1, r0
- orrs r1, r5
- strb r1, [r2, 0xD]
- mov r0, sp
- lsrs r6, 20
- ands r1, r4
- orrs r1, r6
- strb r1, [r0, 0xD]
- ldr r2, _080F6D58 @ =gTextFlags
- ldrb r1, [r2]
- movs r0, 0x3
- negs r0, r0
- ands r0, r1
- strb r0, [r2]
- mov r0, sp
- adds r1, r3, 0
- adds r2, r7, 0
- bl AddTextPrinter
- lsls r0, 16
- lsrs r0, 16
- add sp, 0x10
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_080F6D58: .4byte gTextFlags
- thumb_func_end AddTextPrinterParameterized2
-
thumb_func_start sub_80F6D5C
sub_80F6D5C: @ 80F6D5C
push {r4,r5,lr}
@@ -2224,7 +1431,7 @@ sub_80F78E0: @ 80F78E0
sub sp, 0x20
lsls r0, 24
lsrs r1, r0, 24
- ldr r4, _080F7934 @ =gUnknown_203ABE0
+ ldr r4, _080F7934 @ =sStartMenuWindowId
ldrb r0, [r4]
cmp r0, 0xFF
bne _080F792A
@@ -2261,23 +1468,23 @@ _080F792A:
pop {r1}
bx r1
.align 2, 0
-_080F7934: .4byte gUnknown_203ABE0
+_080F7934: .4byte sStartMenuWindowId
_080F7938: .4byte 0x0000013d
thumb_func_end sub_80F78E0
thumb_func_start GetStartMenuWindowId
GetStartMenuWindowId: @ 80F793C
- ldr r0, _080F7944 @ =gUnknown_203ABE0
+ ldr r0, _080F7944 @ =sStartMenuWindowId
ldrb r0, [r0]
bx lr
.align 2, 0
-_080F7944: .4byte gUnknown_203ABE0
+_080F7944: .4byte sStartMenuWindowId
thumb_func_end GetStartMenuWindowId
thumb_func_start remove_start_menu_window_maybe
remove_start_menu_window_maybe: @ 80F7948
push {r4,lr}
- ldr r4, _080F7960 @ =gUnknown_203ABE0
+ ldr r4, _080F7960 @ =sStartMenuWindowId
ldrb r0, [r4]
cmp r0, 0xFF
beq _080F795A
@@ -2289,7 +1496,7 @@ _080F795A:
pop {r0}
bx r0
.align 2, 0
-_080F7960: .4byte gUnknown_203ABE0
+_080F7960: .4byte sStartMenuWindowId
thumb_func_end remove_start_menu_window_maybe
thumb_func_start sub_80F7964
diff --git a/asm/overworld.s b/asm/overworld.s
index 62add03d2..7d28966d7 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -3199,7 +3199,7 @@ _080563EC: .4byte gUnknown_300501C
thumb_func_start CleanupOverworldWindowsAndTilemaps
CleanupOverworldWindowsAndTilemaps: @ 80563F0
push {lr}
- bl sub_80F6C8C
+ bl FreeAllOverworldWindowBuffers
ldr r0, _08056414 @ =gUnknown_300501C
ldr r0, [r0]
bl Free
@@ -3393,7 +3393,7 @@ sub_8056578: @ 8056578
bl BuildOamBuffer
bl UpdatePaletteFade
bl sub_806FFBC
- bl do_scheduled_bg_tilemap_copies_to_vram
+ bl DoScheduledBgTilemapCopiesToVram
pop {r0}
bx r0
thumb_func_end sub_8056578
@@ -4036,7 +4036,7 @@ _08056B04:
.align 2, 0
_08056B10: .4byte gMapHeader
_08056B14:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4178,7 +4178,7 @@ _08056C40:
.align 2, 0
_08056C4C: .4byte gMapHeader
_08056C50:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4367,7 +4367,7 @@ _08056DE0:
.align 2, 0
_08056DEC: .4byte gMapHeader
_08056DF0:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4523,8 +4523,8 @@ sub_8056F08: @ 8056F08
thumb_func_start sub_8056F1C
sub_8056F1C: @ 8056F1C
push {r4,lr}
- bl clear_scheduled_bg_copies_to_vram
- bl reset_temp_tile_data_buffers
+ bl ClearScheduledBgCopiesToVram
+ bl ResetTempTileDataBuffers
movs r0, 0x4C
movs r1, 0
bl SetGpuReg
@@ -4563,11 +4563,11 @@ sub_8056F1C: @ 8056F1C
movs r0, 0x52
bl SetGpuReg
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x3
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08057020 @ =0x00007060
movs r0, 0
bl SetGpuReg
@@ -5078,7 +5078,7 @@ _080573D8:
.align 2, 0
_080573E4: .4byte gMapHeader
_080573E8:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5177,7 +5177,7 @@ _080574B8:
bl BuildOamBuffer
bl UpdatePaletteFade
bl sub_806FFBC
- bl do_scheduled_bg_tilemap_copies_to_vram
+ bl DoScheduledBgTilemapCopiesToVram
cmp r4, 0
beq _080574E0
bl SetFieldVBlankCallback
@@ -5427,7 +5427,7 @@ _080576E0:
.align 2, 0
_080576EC: .4byte gMapHeader
_080576F0:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 9042219e3..996118221 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -189,7 +189,7 @@ sub_811EBA0: @ 811EBA0
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
- bl do_scheduled_bg_tilemap_copies_to_vram
+ bl DoScheduledBgTilemapCopiesToVram
bl UpdatePaletteFade
pop {r0}
bx r0
@@ -278,7 +278,7 @@ _0811EC24:
_0811EC80:
bl SetVBlankHBlankCallbacksToNull
bl ClearVramOamPltt
- bl clear_scheduled_bg_copies_to_vram
+ bl ClearScheduledBgCopiesToVram
b _0811EDFC
_0811EC8E:
bl ScanlineEffect_Stop
@@ -587,7 +587,7 @@ sub_811EECC: @ 811EECC
movs r0, 0x1
bl SetBgTilemapBuffer
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r1, 0x82
lsls r1, 5
movs r0, 0
@@ -649,7 +649,7 @@ _0811EF8C:
ldr r4, _0811EFAC @ =gUnknown_203B0B8
ldr r0, _0811EFB0 @ =gFile_graphics_interface_party_menu_misc_sheet
mov r1, sp
- bl malloc_and_decompress
+ bl MallocAndDecompress
adds r1, r0, 0
str r1, [r4]
ldr r2, [sp]
@@ -883,7 +883,7 @@ sub_811F124: @ 811F124
ldrb r0, [r4, 0x8]
bl PutWindowTilemap
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
b _0811F22A
.align 2, 0
_0811F16C: .4byte gUnknown_203B0A0
@@ -973,7 +973,7 @@ _0811F218:
ldrb r0, [r0, 0x8]
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_0811F22A:
pop {r4,r5}
pop {r0}
@@ -1878,7 +1878,7 @@ _0811F926:
mov r1, r8
bl sub_81227B8
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_0811F934:
add sp, 0x8
pop {r3}
@@ -2000,7 +2000,7 @@ sub_811F9DC: @ 811F9DC
movs r3, 0x12
bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -3392,7 +3392,7 @@ _08120468:
adds r1, r6, 0
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r4-r6}
pop {r0}
bx r0
@@ -3433,7 +3433,7 @@ sub_81204AC: @ 81204AC
adds r1, r5, 0
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r4-r6}
pop {r0}
bx r0
@@ -3467,7 +3467,7 @@ sub_812050C: @ 812050C
adds r1, r5, 0
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r4,r5}
pop {r0}
bx r0
@@ -3514,7 +3514,7 @@ sub_8120558: @ 8120558
adds r1, r6, 0
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r4-r6}
pop {r0}
bx r0
@@ -4121,7 +4121,7 @@ _08120A24:
movs r1, 0
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08120A50 @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -4149,7 +4149,7 @@ sub_8120A58: @ 8120A58
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08120A88 @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -5180,7 +5180,7 @@ _08121224:
movs r1, 0x2
bl CopyWindowToVram
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_08121238:
add sp, 0x14
pop {r4-r6}
@@ -6513,7 +6513,7 @@ sub_8121CE4: @ 8121CE4
movs r0, 0xFF
strb r0, [r4]
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_08121D04:
pop {r4}
pop {r0}
@@ -6627,7 +6627,7 @@ _08121DB0:
movs r3, 0
bl AddTextPrinterParameterized
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_08121DE8:
add sp, 0xC
pop {r4-r6}
@@ -6856,7 +6856,7 @@ _08121F7A:
movs r3, 0x2
bl sub_810F774
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, [r4]
_08121FA2:
ldrb r0, [r0, 0xC]
@@ -7058,7 +7058,7 @@ sub_8122110: @ 8122110
adds r0, r4, 0
bl RemoveWindow
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r4}
pop {r0}
bx r0
@@ -7084,7 +7084,7 @@ sub_8122138: @ 8122138
movs r0, 0xFF
strb r0, [r4, 0xE]
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
b _081221C0
.align 2, 0
_08122168: .4byte gUnknown_203B09C
@@ -7125,7 +7125,7 @@ _0812217A:
ldrb r0, [r4, 0xE]
bl PutWindowTilemap
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_081221C0:
add sp, 0x14
pop {r4,r5}
@@ -8914,7 +8914,7 @@ _08122F56:
ldrb r0, [r6, 0x6]
str r0, [sp, 0x4]
movs r0, 0
- bl sub_80F6B94
+ bl CopyRectIntoAltRect
ldr r1, [r5]
ldrb r2, [r6, 0x8]
ldrb r3, [r6, 0xA]
@@ -8923,7 +8923,7 @@ _08122F56:
ldrb r0, [r6, 0xE]
str r0, [sp, 0x4]
movs r0, 0
- bl sub_80F6B94
+ bl CopyRectIntoAltRect
add r0, sp, 0x8
ldrb r0, [r0]
bl ClearWindowTilemap
@@ -9276,7 +9276,7 @@ _08123228:
bl sub_8123068
_08123256:
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -9369,7 +9369,7 @@ sub_8123270: @ 8123270
ldrb r0, [r6, 0x6]
str r0, [sp, 0x4]
movs r0, 0
- bl sub_80F6B94
+ bl CopyRectIntoAltRect
ldr r0, _08123380 @ =gUnknown_203B0CC
ldr r1, [r0]
ldrb r2, [r6, 0x8]
@@ -9379,7 +9379,7 @@ sub_8123270: @ 8123270
ldrb r0, [r6, 0xE]
str r0, [sp, 0x4]
movs r0, 0
- bl sub_80F6B94
+ bl CopyRectIntoAltRect
movs r0, 0x9
ldrsb r0, [r4, r0]
ldr r1, [r5]
@@ -9454,7 +9454,7 @@ sub_8123388: @ 8123388
ldrb r0, [r0, 0x8]
bl PutWindowTilemap
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
adds r0, r6, 0
bl sub_81235E8
b _08123418
@@ -10537,7 +10537,7 @@ _08123CC8:
bl sub_81202F8
_08123CCE:
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _08123CEC @ =gTasks
lsls r1, r7, 2
adds r1, r7
@@ -13293,7 +13293,7 @@ _08125342:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _0812537C @ =gTasks
lsls r0, r7, 2
adds r0, r7
@@ -13501,7 +13501,7 @@ _0812551C:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08125550 @ =gTasks
mov r2, r9
lsls r0, r2, 2
@@ -13548,7 +13548,7 @@ sub_8125554: @ 8125554
movs r1, 0
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_803539C
ldr r1, _081255B4 @ =gTasks
lsls r0, r5, 2
@@ -13686,7 +13686,7 @@ _08125680:
movs r3, 0x2
bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -13897,7 +13897,7 @@ sub_812580C: @ 812580C
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08125874 @ =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -13984,7 +13984,7 @@ sub_8125898: @ 8125898
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08125950 @ =gTasks
mov r2, r8
lsls r0, r2, 2
@@ -14086,7 +14086,7 @@ _081259F6:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08125A34 @ =gTasks
lsls r0, r6, 2
adds r0, r6
@@ -14225,7 +14225,7 @@ sub_8125AF0: @ 8125AF0
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r4}
pop {r0}
bx r0
@@ -14427,7 +14427,7 @@ _08125C84:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08125CEC @ =gTasks
lsls r0, r7, 2
adds r0, r7
@@ -14956,7 +14956,7 @@ sub_81260D8: @ 81260D8
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08126134 @ =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -15197,7 +15197,7 @@ _081262F6:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _0812632C @ =gTasks
lsls r0, r6, 2
adds r0, r6
@@ -15298,7 +15298,7 @@ sub_8126350: @ 8126350
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08126438 @ =gTasks
mov r2, r8
lsls r0, r2, 2
@@ -15381,7 +15381,7 @@ _0812647C:
movs r1, 0x1
bl sub_811F818
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r4-r7}
pop {r0}
bx r0
@@ -15502,7 +15502,7 @@ sub_8126570: @ 8126570
movs r1, 0x2
bl CopyWindowToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -15533,7 +15533,7 @@ sub_81265BC: @ 81265BC
movs r1, 0x2
bl CopyWindowToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x4
pop {r4}
pop {r0}
@@ -15765,7 +15765,7 @@ sub_8126770: @ 8126770
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldrh r0, [r6]
mov r1, r8
strh r0, [r1, 0xE]
@@ -15829,7 +15829,7 @@ sub_8126804: @ 8126804
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
mov r0, r8
strh r5, [r0, 0xE]
ldr r1, _0812688C @ =gTasks
@@ -16089,7 +16089,7 @@ _08126A4E:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
b _08126ABE
.align 2, 0
_08126A80: .4byte gUnknown_203B09C
@@ -16170,7 +16170,7 @@ sub_8126AFC: @ 8126AFC
movs r1, 0
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08126B58 @ =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -16221,7 +16221,7 @@ sub_8126B60: @ 8126B60
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _08126BC4 @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -17205,7 +17205,7 @@ sub_812734C: @ 812734C
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _0812737C @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -17351,7 +17351,7 @@ _0812746C:
bl sub_81202F8
_08127482:
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _081274A0 @ =gTasks
lsls r1, r6, 2
adds r1, r6
diff --git a/asm/player_pc.s b/asm/player_pc.s
index f9d781513..52218cc67 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -189,7 +189,7 @@ _080EB77E:
movs r3, 0x2
bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _080EB814 @ =gTasks
mov r2, r8
lsls r0, r2, 2
@@ -243,7 +243,7 @@ sub_80EB81C: @ 80EB81C
ldrb r0, [r4, 0x14]
bl RemoveWindow
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -262,7 +262,7 @@ _080EB878:
ldrb r0, [r4, 0x14]
bl RemoveWindow
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
adds r2, r7, 0
subs r2, 0x8
adds r2, r6, r2
@@ -490,7 +490,7 @@ _080EBA1E:
movs r3, 0x2
bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _080EBA88 @ =gUnknown_84021DC
lsls r0, r7, 2
adds r0, r1
@@ -1084,7 +1084,7 @@ sub_80EBEB0: @ 80EBEB0
mov r2, r8
bl AddTextPrinterParameterized
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r4, _080EBF38 @ =gUnknown_203AAC4
adds r0, r4, 0
bl sub_810EC98
@@ -1176,7 +1176,7 @@ _080EBFB6:
mov r2, r8
bl DestroyListMenu
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
mov r1, r8
ldrb r0, [r1, 0xA]
bl RemoveScrollIndicatorArrowPair
@@ -1290,7 +1290,7 @@ sub_80EC094: @ 80EC094
movs r2, 0
bl DestroyListMenu
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_810EDB0
adds r0, r5, 0
bl sub_80EB8BC
@@ -1343,7 +1343,7 @@ sub_80EC0D8: @ 80EC0D8
movs r3, 0x2
bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _080EC154 @ =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -1875,7 +1875,7 @@ sub_80EC53C: @ 80EC53C
adds r0, r4, 0
bl sub_80EBEB0
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _080EC56C @ =gTasks
lsls r0, r4, 2
adds r0, r4
@@ -1900,7 +1900,7 @@ sub_80EC574: @ 80EC574
movs r0, 0x2
bl sub_810EBE0
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r1, _080EC59C @ =gTasks
lsls r0, r4, 2
adds r0, r4
diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s
index a8595db7f..b9bb431cc 100644
--- a/asm/pokemon_jump_2.s
+++ b/asm/pokemon_jump_2.s
@@ -4793,8 +4793,8 @@ _08149DF0:
bl InitBgsFromTemplates
ldr r0, _08149EEC @ =gUnknown_846D8E4
bl InitWindows
- bl sub_80F6C14
- bl reset_temp_tile_data_buffers
+ bl ResetBgPositions
+ bl ResetTempTileDataBuffers
ldr r0, [r6]
bl sub_814AD6C
bl sub_814A9C8
@@ -4807,14 +4807,14 @@ _08149DF0:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _08149EF8 @ =gUnknown_846BA00
movs r4, 0x1
str r4, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r0, _08149EFC @ =gUnknown_846BBB0
movs r1, 0x30
movs r2, 0x20
@@ -4824,13 +4824,13 @@ _08149DF0:
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _08149F04 @ =gUnknown_846C520
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r0, _08149F08 @ =gUnknown_846C8D8
movs r1, 0x10
movs r2, 0x20
@@ -4840,13 +4840,13 @@ _08149DF0:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _08149F10 @ =gUnknown_846D3A8
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r0, _08149F14 @ =gUnknown_846B794
movs r1, 0x20
movs r2, 0x20
@@ -4897,7 +4897,7 @@ _08149F0C: .4byte gUnknown_846C8F8
_08149F10: .4byte gUnknown_846D3A8
_08149F14: .4byte gUnknown_846B794
_08149F18:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
bne _08149F5A
diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s
index 94d451a73..6b09d701e 100644
--- a/asm/pokemon_special_anim.s
+++ b/asm/pokemon_special_anim.s
@@ -1558,7 +1558,7 @@ sub_811D184: @ 811D184
lsls r5, r1, 16
lsrs r5, 16
bl FreeAllWindowBuffers
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
movs r0, 0
movs r1, 0
bl SetGpuReg
@@ -1654,7 +1654,7 @@ _0811D27C: .4byte 0x00001914
thumb_func_start sub_811D280
sub_811D280: @ 811D280
push {lr}
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
beq _0811D290
@@ -2353,7 +2353,7 @@ sub_811D7D4: @ 811D7D4
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
cmp r4, 0x4
beq _0811D818
ldr r0, _0811D814 @ =gUnknown_845963C
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index a4c77e32e..8be5b791f 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -2669,7 +2669,7 @@ _0808CDC0: .4byte gUnknown_20397B0
c2_Box: @ 808CDC4
push {lr}
bl RunTasks
- bl do_scheduled_bg_tilemap_copies_to_vram
+ bl DoScheduledBgTilemapCopiesToVram
bl sub_808EFC8
bl sub_808F99C
bl AnimateSprites
@@ -2835,7 +2835,7 @@ sub_808CF10: @ 808CF10
ldr r1, _0808CF88 @ =gKeyRepeatStartDelay
movs r0, 0x14
strh r0, [r1]
- bl clear_scheduled_bg_copies_to_vram
+ bl ClearScheduledBgCopiesToVram
movs r0, 0x3
bl sub_80F7AD8
ldr r2, _0808CF8C @ =gUnknown_83CE6F8
@@ -6738,7 +6738,7 @@ sub_808EFE4: @ 808EFE4
movs r0, 0x1
bl ShowBg
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -6956,7 +6956,7 @@ sub_808F1D0: @ 808F1D0
bl sub_808F49C
bl sub_808F5E8
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r0}
bx r0
.align 2, 0
@@ -7526,7 +7526,7 @@ _0808F66E:
movs r0, 0
bl sub_80F7E54
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x4
pop {r4}
pop {r0}
@@ -7608,7 +7608,7 @@ _0808F718:
bl sub_80F7E54
_0808F73A:
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _0808F754 @ =gUnknown_20397B0
ldr r0, [r0]
ldr r1, _0808F758 @ =0x000002c7
@@ -7680,7 +7680,7 @@ sub_808F794: @ 808F794
movs r0, 0x1
bl sub_80F7E54
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x8
bl sub_8090B98
ldr r1, [r4]
@@ -7800,7 +7800,7 @@ sub_808F850: @ 808F850
cmp r0, 0x14
beq _0808F8D4
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x1
b _0808F8FE
.align 2, 0
@@ -7822,7 +7822,7 @@ _0808F8D4:
movs r0, 0x2
bl sub_80F7E54
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_0808F8FC:
movs r0, 0
_0808F8FE:
@@ -7859,7 +7859,7 @@ _0808F934:
movs r0, 0x2
bl sub_80F7E54
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x4
pop {r0}
bx r0
@@ -8068,7 +8068,7 @@ sub_808FAA8: @ 808FAA8
movs r0, 0x1
bl sub_80F7E54
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x4
pop {r0}
bx r0
@@ -8318,7 +8318,7 @@ _0808FC7C:
movs r1, 0x2
bl CopyWindowToVram
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -8365,7 +8365,7 @@ sub_808FD20: @ 808FD20
movs r1, 0
bl ClearMenuWindow
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r0}
bx r0
thumb_func_end sub_808FD20
@@ -18963,7 +18963,7 @@ sub_8094E88: @ 8094E88
movs r3, 0x2
bl ProgramAndPlaceMenuCursorOnWindow
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, [r5]
ldr r3, _08094F8C @ =0x00000caa
adds r0, r3
@@ -22334,7 +22334,7 @@ _080968D0:
movs r3, 0x14
bl FillBgTilemapBufferRect
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0xC
pop {r4-r7}
pop {r0}
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 301d7e0d7..f561ad660 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -3197,7 +3197,7 @@ _08135FD8:
.align 2, 0
_08135FE0: .4byte gUnknown_84636C0
_08135FE4:
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
b _08136020
_08135FEA:
ldr r1, _08135FFC @ =gUnknown_8E9A460
@@ -3206,12 +3206,12 @@ _08135FEA:
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
b _08136020
.align 2, 0
_08135FFC: .4byte gUnknown_8E9A460
_08136000:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/region_map.s b/asm/region_map.s
index 519b766c1..01c5a71c7 100644
--- a/asm/region_map.s
+++ b/asm/region_map.s
@@ -595,7 +595,7 @@ _080C02F0: .4byte gUnknown_20399D4
_080C02F4: .4byte 0x00004796
_080C02F8: .4byte gUnknown_83EF25A
_080C02FC:
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
b _080C03C8
_080C0302:
ldr r1, _080C0330 @ =gUnknown_83EF61C
@@ -604,7 +604,7 @@ _080C0302:
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r0, _080C0334 @ =gUnknown_20399D4
ldr r0, [r0]
ldr r2, _080C0338 @ =0x00004796
@@ -617,7 +617,7 @@ _080C0302:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
b _080C03C8
.align 2, 0
_080C0330: .4byte gUnknown_83EF61C
@@ -625,7 +625,7 @@ _080C0334: .4byte gUnknown_20399D4
_080C0338: .4byte 0x00004796
_080C033C: .4byte gUnknown_83F1978
_080C0340:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/script_menu.s b/asm/script_menu.s
index 69e487bcc..54c3d6691 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -308,7 +308,7 @@ _0809CB7A:
mov r3, r10
bl sub_809CC18
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_0809CBA2:
add sp, 0x20
pop {r3-r5}
@@ -845,7 +845,7 @@ _0809CF08:
movs r3, 0x1
bl sub_811030C
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_0809CFB8:
movs r0, 0x1
_0809CFBA:
@@ -1145,7 +1145,7 @@ _0809D1FA:
movs r3, 0xFF
bl sub_809CC18
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -1328,7 +1328,7 @@ _0809D31C:
movs r1, 0x1
bl sub_80F7750
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x1
b _0809D3C2
.align 2, 0
@@ -1615,7 +1615,7 @@ _0809D572:
movs r1, 0x1
bl sub_80F7750
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_0809D5F2:
movs r0, 0x1
_0809D5F4:
@@ -1953,7 +1953,7 @@ _0809D844:
movs r3, 0xFF
bl sub_809CC18
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
_0809D8A8:
add sp, 0xC
pop {r3,r4}
diff --git a/asm/shop.s b/asm/shop.s
index 370f8b296..bac3c3330 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -435,7 +435,7 @@ sub_809ADE4: @ 809ADE4
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
- bl do_scheduled_bg_tilemap_copies_to_vram
+ bl DoScheduledBgTilemapCopiesToVram
pop {r0}
bx r0
thumb_func_end sub_809ADE4
@@ -523,12 +523,12 @@ _0809AEAC:
add r0, sp, 0x8
bl CpuFastSet
bl ScanlineEffect_Stop
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
bl FreeAllSpritePalettes
bl ResetPaletteFade
bl ResetSpriteData
bl ResetTasks
- bl clear_scheduled_bg_copies_to_vram
+ bl ClearScheduledBgCopiesToVram
bl ResetItemMenuIconState
bl sub_809AF6C
lsls r0, 24
@@ -579,7 +579,7 @@ _0809AEAC:
_0809AF4C: .4byte 0x01000100
_0809AF50: .4byte gUnknown_2039934
_0809AF54:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
bne _0809AF64
@@ -721,7 +721,7 @@ sub_809B080: @ 809B080
movs r0, 0
str r0, [sp]
movs r0, 0x1
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r0, _0809B0B4 @ =gUnknown_2039934
ldrb r1, [r0, 0x16]
movs r0, 0xF
@@ -808,7 +808,7 @@ _0809B13C:
bl SetBgRectPal
_0809B14E:
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
add sp, 0x8
pop {r0}
bx r0
@@ -821,13 +821,13 @@ sub_809B15C: @ 809B15C
bl sub_809BAFC
bl sub_813F6D0
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
movs r0, 0x3
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
pop {r0}
bx r0
thumb_func_end sub_809B15C
@@ -2295,7 +2295,7 @@ sub_809BCA0: @ 809BCA0
adds r0, r7, 0
bl sub_809BB44
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
ldr r0, _0809BD50 @ =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0xA4
@@ -2621,7 +2621,7 @@ sub_809BF98: @ 809BF98
bl PutWindowTilemap
_0809BFDC:
movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
+ bl ScheduleBgCopyTilemapToVram
bl sub_809B690
adds r0, r6, 0
subs r0, 0x8
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 680004d4a..c0c8cc397 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -3472,7 +3472,7 @@ _081411D0:
movs r0, 0
movs r1, 0
bl SetGpuReg
- bl sub_80F6C14
+ bl ResetBgPositions
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, _081413A0 @ =gUnknown_8466B10
@@ -3495,20 +3495,20 @@ _081411D0:
bl FillBgTilemapBufferRect_Palette0
movs r0, 0x3
bl CopyBgTilemapBufferToVram
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
ldr r1, _081413AC @ =gUnknown_84659D0
movs r5, 0
str r5, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _081413B0 @ =gUnknown_846653C
str r5, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0xC0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _081413B4 @ =0x0000185c
add r1, r8
movs r0, 0x2
@@ -3563,13 +3563,13 @@ _081411D0:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _081413D4 @ =gUnknown_8466998
str r6, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
movs r0, 0x1
bl CopyBgTilemapBufferToVram
movs r0, 0x2
@@ -3648,7 +3648,7 @@ _081413D8: .4byte gUnknown_841B779
_081413DC: .4byte sub_8141118
_081413E0: .4byte sub_8140E40
_081413E4:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
diff --git a/asm/start_menu.s b/asm/start_menu.s
index cf06662d2..f6c289a64 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -1127,7 +1127,7 @@ _0806F644: .4byte gUnknown_3000FA9
thumb_func_start sub_806F648
sub_806F648: @ 806F648
push {lr}
- bl sub_80F6CBC
+ bl RunTextPrinters_CheckPrinter0Active
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
@@ -1596,7 +1596,7 @@ _0806F9B4: .4byte sub_806FA04
thumb_func_start sub_806F9B8
sub_806F9B8: @ 806F9B8
push {lr}
- bl sub_80F6CBC
+ bl RunTextPrinters_CheckPrinter0Active
lsls r0, 16
cmp r0, 0
bne _0806F9D0
@@ -1638,7 +1638,7 @@ _0806FA00:
thumb_func_start sub_806FA04
sub_806FA04: @ 806FA04
push {lr}
- bl sub_80F6CBC
+ bl RunTextPrinters_CheckPrinter0Active
lsls r0, 16
cmp r0, 0
bne _0806FA1C
diff --git a/asm/title_screen.s b/asm/title_screen.s
index 07a861c86..f7f63287c 100644
--- a/asm/title_screen.s
+++ b/asm/title_screen.s
@@ -113,13 +113,13 @@ _080789F0:
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _08078A9C @ =gUnknown_8EAD390
str r6, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r0, _08078AA0 @ =gUnknown_8EAD5E8
movs r1, 0xD0
movs r2, 0x20
@@ -129,13 +129,13 @@ _080789F0:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _08078AA8 @ =gUnknown_8EADEE4
str r6, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r5, _08078AAC @ =gUnknown_8EAE094
adds r0, r5, 0
movs r1, 0xF0
@@ -146,13 +146,13 @@ _080789F0:
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _08078AB4 @ =gUnknown_8EAE374
str r6, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
adds r0, r5, 0
movs r1, 0xE0
movs r2, 0x20
@@ -162,13 +162,13 @@ _080789F0:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _08078ABC @ =gUnknown_83BF5A8
str r6, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
bl sub_8079708
b _08078B18
.align 2, 0
@@ -184,7 +184,7 @@ _08078AB4: .4byte gUnknown_8EAE374
_08078AB8: .4byte gUnknown_83BF58C
_08078ABC: .4byte gUnknown_83BF5A8
_08078AC0:
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
cmp r0, 0
bne _08078B26
@@ -1641,7 +1641,7 @@ _0807965C:
movs r1, 0xE0
movs r2, 0x20
bl LoadPalette
- bl sub_80F6C14
+ bl ResetBgPositions
movs r1, 0xE0
lsls r1, 8
movs r0, 0
diff --git a/asm/trade.s b/asm/trade.s
index a45cedc3e..b4bfcd30f 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -1909,7 +1909,7 @@ sub_804D638: @ 804D638
lsrs r1, 24
movs r0, 0x1C
bl SetGpuReg
- bl sub_80F6CBC
+ bl RunTextPrinters_CheckPrinter0Active
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s
index 6c917be27..758383cc7 100644
--- a/asm/union_room_chat.s
+++ b/asm/union_room_chat.s
@@ -2999,7 +2999,7 @@ sub_8129B14: @ 8129B14
bl InitBgsFromTemplates
ldr r0, _08129B6C @ =gUnknown_845AA94
bl InitWindows
- bl reset_temp_tile_data_buffers
+ bl ResetTempTileDataBuffers
bl sub_812AD50
ldr r0, [r4]
bl sub_8129BB8
@@ -3199,7 +3199,7 @@ _08129C9C: .4byte gUnknown_203B0E4
sub_8129CA0: @ 8129CA0
push {r4,lr}
adds r4, r0, 0
- bl free_temp_tile_data_buffers_if_possible
+ bl FreeTempTileDataBuffersIfPossible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5224,7 +5224,7 @@ sub_812AC08: @ 812AC08
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _0812AC54 @ =gUnknown_8EAAA6C
movs r0, 0x1
movs r2, 0
@@ -5256,7 +5256,7 @@ sub_812AC58: @ 812AC58
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
+ bl DecompressAndCopyTileDataToVram
ldr r1, _0812AC98 @ =gUnknown_8EA1958
movs r0, 0x2
movs r2, 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-12 10:45:43 +0000