Merge pull request #76 from jiangzhengwenjz/misc

new_menu_helpers, multiboot, hof_pc, play_time, decompress, reset_save_heap, save_location, mail_data, fldeff_*

.gitignore

@@ -42,5 +42,5 @@ build/
 *.DS_Store
 *.pl
 *.bak
-src/data/items.h # Autogenerated by jsonproc
+src/data/items.h
 tools/br_ips/{br_ips,ips_patch}{,.exe}

asm/battle_1.s

@@ -257,7 +257,7 @@ sub_800F380: @ 800F380
 	movs r0, 0
 	movs r1, 0x30
 	movs r2, 0x70
-	bl TextWindow_SetBubbleFrame_841F1C8
+	bl TextWindow_LoadResourcesStdFrame0
 	adds r0, r4, 0
 	adds r0, 0xEC
 	movs r1, 0
@@ -1197,7 +1197,7 @@ sub_800FAE0: @ 800FAE0
 	ldr r0, _0800FB8C @ =gBattle_BG2_Y
 	strh r1, [r0]
 	ldr r0, _0800FB90 @ =gUnknown_8248318
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0800FC26
 	.align 2, 0
 _0800FB64: .4byte gBattleTypeFlags

asm/battle_anim.s

@@ -483,11 +483,11 @@ ScriptCmd_loadspritegfx: @ 8072868
 	lsls r5, r4, 3
 	ldr r0, _080728B8 @ =gUnknown_8399388
 	adds r0, r5, r0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _080728BC @ =gUnknown_8399C90
 	adds r5, r0
 	adds r0, r5, 0
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 	ldr r0, [r6]
 	adds r0, 0x2
 	str r0, [r6]

asm/battle_anim_special.s

@@ -3264,10 +3264,10 @@ sub_80F05B4: @ 80F05B4
 	cmp r0, r1
 	bne _080F05DA
 	adds r0, r4, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _080F05E8 @ =gUnknown_840BFA8
 	adds r0, r5, r0
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 _080F05DA:
 	pop {r4,r5}
 	pop {r0}
@@ -5514,9 +5514,9 @@ _080F177E:
 	cmp r0, r7
 	bne _080F179E
 	ldr r0, _080F17E8 @ =gUnknown_83AD350
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _080F17EC @ =gUnknown_83ADC58
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 _080F179E:
 	ldr r5, _080F17F0 @ =sub_80F181C
 	adds r0, r5, 0
@@ -5941,9 +5941,9 @@ sub_80F1AE0: @ 80F1AE0
 	lsls r4, 24
 	lsrs r4, 24
 	ldr r0, _080F1B08 @ =gUnknown_83AD470
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _080F1B0C @ =gUnknown_83ADD78
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 	ldr r0, _080F1B10 @ =0x0000281d
 	bl IndexOfSpritePaletteTag
 	adds r0, r4, 0

asm/battle_anim_status_effects.s

@@ -26,9 +26,9 @@ sub_8078178: @ 8078178
 	lsrs r0, 24
 	mov r8, r0
 	ldr r0, _08078224 @ =gUnknown_83AD048
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _08078228 @ =gUnknown_83AD950
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 	ldr r1, _0807822C @ =gTasks
 	mov r2, r8
 	lsls r0, r2, 2

asm/battle_gfx_sfx_util.s

@@ -975,7 +975,7 @@ _08034548:
 	ldr r1, [r1]
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_800ECC4
+	bl HandleLoadSpecialPokePic
 _08034562:
 	mov r2, r8
 	lsls r1, r2, 4
@@ -1184,7 +1184,7 @@ sub_80346C4: @ 80346C4
 	ldr r0, _0803474C @ =gTrainerFrontPicPaletteTable
 	adds r5, r0
 	adds r0, r5, 0
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 	add sp, 0x8
 	pop {r3}
 	mov r8, r3
@@ -1262,9 +1262,9 @@ sub_80347A8: @ 80347A8
 	cmp r0, 0
 	bne _080347E0
 	ldr r0, _080347D8 @ =gUnknown_8260208
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _080347DC @ =gUnknown_8260210
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	movs r5, 0x2
 	b _08034802
 	.align 2, 0
@@ -1274,16 +1274,16 @@ _080347DC: .4byte gUnknown_8260210
 _080347E0:
 	ldr r4, _08034828 @ =gUnknown_8260218
 	adds r0, r4, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	adds r4, 0x8
 	adds r0, r4, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r4, _0803482C @ =gUnknown_8260228
 	adds r0, r4, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	adds r4, 0x8
 	adds r0, r4, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	movs r5, 0x4
 _08034802:
 	movs r4, 0
@@ -1296,7 +1296,7 @@ _0803480C:
 	ldrb r0, [r0]
 	lsls r0, 3
 	adds r0, r6
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -1349,14 +1349,14 @@ _08034864:
 	cmp r0, 0
 	beq _08034890
 	ldr r0, _0803488C @ =gUnknown_8260238
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _08034888: .4byte gBattleTypeFlags
 _0803488C: .4byte gUnknown_8260238
 _08034890:
 	ldr r0, _08034898 @ =gUnknown_8260208
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _08034898: .4byte gUnknown_8260208
@@ -1364,7 +1364,7 @@ _0803489C:
 	cmp r4, 0x3
 	bne _080348AC
 	ldr r0, _080348A8 @ =gUnknown_8260210
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _080348A8: .4byte gUnknown_8260210
@@ -1388,7 +1388,7 @@ _080348CC:
 	cmp r4, 0x2
 	bne _080348DC
 	ldr r0, _080348D8 @ =gUnknown_8260218
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _080348D8: .4byte gUnknown_8260218
@@ -1396,7 +1396,7 @@ _080348DC:
 	cmp r4, 0x3
 	bne _080348EC
 	ldr r0, _080348E8 @ =gUnknown_8260220
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _080348E8: .4byte gUnknown_8260220
@@ -1404,7 +1404,7 @@ _080348EC:
 	cmp r4, 0x4
 	bne _080348FC
 	ldr r0, _080348F8 @ =gUnknown_8260228
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _080348F8: .4byte gUnknown_8260228
@@ -1412,7 +1412,7 @@ _080348FC:
 	cmp r4, 0x5
 	bne _0803490C
 	ldr r0, _08034908 @ =gUnknown_8260230
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _08034908: .4byte gUnknown_8260230
@@ -1449,7 +1449,7 @@ _08034944:
 	lsls r0, 3
 	ldr r1, _08034954 @ =gUnknown_8260240
 	adds r0, r1
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	b _0803495A
 	.align 2, 0
 _08034950: .4byte gUnknown_2023BD6
@@ -2911,7 +2911,7 @@ LoadAndCreateEnemyShadowSprites: @ 8035538
 	mov r7, r8
 	push {r7}
 	ldr r0, _08035614 @ =gUnknown_8250A0C
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	movs r0, 0x1
 	bl GetBattlerAtPosition
 	adds r5, r0, 0

asm/battle_interface.s

@@ -2381,7 +2381,7 @@ _08048DC4:
 	bge _08048DB0
 	mov r6, r10
 	adds r0, r4, r6
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _08048E4C @ =gUnknown_826049C
 	adds r0, r4, r0
 	bl LoadSpriteSheet

asm/battle_setup.s

@@ -25,7 +25,7 @@ sub_807F620: @ 807F620
 	.align 2, 0
 _0807F640: .4byte gTasks+0x8
 _0807F644:
-	bl c3_80A0DD8_is_running
+	bl FldEffPoison_IsActive
 	cmp r0, 0
 	bne _0807F686
 	bl sub_812B478

asm/battle_transition.s

@@ -137,7 +137,7 @@ _080D09AC: .4byte gTasks
 Transition_Phase1: @ 80D09B0
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_807B05C
+	bl SetWeatherScreenFadeOut
 	ldr r0, _080D09DC @ =gPlttBufferFaded
 	ldr r1, _080D09E0 @ =gPlttBufferUnfaded
 	ldr r2, _080D09E4 @ =0x04000100

asm/berry_crush_2.s

@@ -2946,7 +2946,7 @@ _0814D1A6:
 	strb r0, [r5, 0xC]
 	b _0814D238
 _0814D1CA:
-	bl sub_80F7858
+	bl DisplayYesNoMenuDefaultYes
 	b _0814D230
 _0814D1D0:
 	bl Menu_ProcessInputNoWrapClearOnChoose

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
@@ -2845,7 +2845,7 @@ sub_814ECE0: @ 814ECE0
 _0814ECF6:
 	lsls r0, r5, 3
 	adds r0, r4
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	adds r0, r5, 0x1
 	lsls r0, 24
 	lsrs r5, r0, 24

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
@@ -498,7 +498,7 @@ _0813D170: .4byte gSaveBlock2Ptr
 _0813D174: .4byte gUnknown_8E85BF4
 _0813D178:
 	ldr r0, _0813D18C @ =gUnknown_84644A8
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 _0813D17E:
 	ldr r1, [r5]
 	adds r1, r6
@@ -510,7 +510,7 @@ _0813D17E:
 _0813D18C: .4byte gUnknown_84644A8
 _0813D190:
 	ldr r0, _0813D1A8 @ =gUnknown_84644B0
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	ldr r0, _0813D1AC @ =gUnknown_203F36C
 	ldr r0, [r0]
 	ldr r1, _0813D1B0 @ =0x0000080c
@@ -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
@@ -3371,7 +3371,7 @@ sub_813E910: @ 813E910
 	movs r0, 0
 	movs r1, 0x13
 	movs r2, 0xD0
-	bl TextWindow_SetBubbleFrame_841F1C8
+	bl TextWindow_LoadResourcesStdFrame0
 	movs r0, 0
 	movs r1, 0xA
 	movs r2, 0xC0
@@ -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

asm/bike.s

@@ -730,7 +730,7 @@ StartTransitionToFlipBikeState: @ 80BD5C8
 	movs r0, 0x1
 	bl SetPlayerAvatarTransitionFlags
 	bl sav1_reset_battle_music_maybe
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	b _080BD618
 	.align 2, 0
 _080BD5F0: .4byte gUnknown_2036E2C

asm/braille_text.s

@@ -1,8 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	.align 2, 0 @ Don't pad with nop.

asm/buy_menu_helpers.s

@@ -28,7 +28,7 @@ _0813F686:
 	movs r0, 0
 	movs r1, 0x13
 	movs r2, 0xE0
-	bl TextWindow_SetBubbleFrame_841F1C8
+	bl TextWindow_LoadResourcesStdFrame0
 	movs r0, 0
 	movs r1, 0xA
 	movs r2, 0xF0
@@ -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

asm/cable_club.s

@@ -55,7 +55,7 @@ sub_808078C: @ 808078C
 	lsrs r4, 24
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	ldr r5, _080807E0 @ =gStringVar4
 	ldr r1, _080807E4 @ =gUnknown_841DF82
 	adds r0, r5, 0

asm/credits.s

@@ -1987,7 +1987,7 @@ _080F49D8:
 	ands r1, r3
 	orrs r1, r2
 	str r1, [r0, 0x4]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _080F4A1C @ =gUnknown_8410E10
 	b _080F4A36
 	.align 2, 0
@@ -2005,7 +2005,7 @@ _080F4A20:
 	strh r1, [r0, 0x4]
 	ldrh r1, [r6, 0x2]
 	strh r1, [r0, 0x6]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _080F4A48 @ =gUnknown_8411BF8
 _080F4A36:
 	movs r1, 0xF8
@@ -2025,7 +2025,7 @@ _080F4A4C:
 	strh r1, [r0, 0x4]
 	ldrh r1, [r6, 0x2]
 	strh r1, [r0, 0x6]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _080F4ADC @ =gUnknown_84129A0
 	movs r1, 0xF8
 	lsls r1, 1
@@ -2107,7 +2107,7 @@ _080F4AFE:
 	strh r1, [r0, 0x4]
 	ldrh r1, [r6, 0x8]
 	strh r1, [r0, 0x6]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _080F4B1C @ =gUnknown_8413318
 	b _080F4B8A
 	.align 2, 0
@@ -2122,7 +2122,7 @@ _080F4B20:
 	strh r1, [r0, 0x4]
 	ldrh r1, [r6, 0x8]
 	strh r1, [r0, 0x6]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _080F4B4C @ =gUnknown_8413318
 	movs r1, 0xF0
 	lsls r1, 1
@@ -2144,7 +2144,7 @@ _080F4B54:
 	strh r1, [r0, 0x4]
 	ldrh r1, [r6, 0x8]
 	strh r1, [r0, 0x6]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _080F4B70 @ =gUnknown_8413854
 	b _080F4B8A
 	.align 2, 0
@@ -2159,7 +2159,7 @@ _080F4B74:
 	strh r1, [r0, 0x4]
 	ldrh r1, [r6, 0x8]
 	strh r1, [r0, 0x6]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _080F4BF0 @ =gUnknown_8413D98
 _080F4B8A:
 	movs r1, 0xF0

asm/decompress.s

@@ -1,887 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start LZDecompressWram
-LZDecompressWram: @ 800EBB4
-	push {lr}
-	bl LZ77UnCompWram
-	pop {r0}
-	bx r0
-	thumb_func_end LZDecompressWram
-
-	thumb_func_start LZDecompressVram
-LZDecompressVram: @ 800EBC0
-	push {lr}
-	bl LZ77UnCompVram
-	pop {r0}
-	bx r0
-	thumb_func_end LZDecompressVram
-
-	thumb_func_start LoadCompressedObjectPic
-LoadCompressedObjectPic: @ 800EBCC
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r0, [r4]
-	ldr r5, _0800EBFC @ =gDecompressionBuffer
-	adds r1, r5, 0
-	bl LZ77UnCompWram
-	str r5, [sp]
-	ldrh r1, [r4, 0x6]
-	lsls r1, 16
-	ldrh r0, [r4, 0x4]
-	orrs r0, r1
-	str r0, [sp, 0x4]
-	mov r0, sp
-	bl LoadSpriteSheet
-	lsls r0, 16
-	lsrs r0, 16
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0800EBFC: .4byte gDecompressionBuffer
-	thumb_func_end LoadCompressedObjectPic
-
-	thumb_func_start LoadCompressedObjectPicOverrideBuffer
-LoadCompressedObjectPicOverrideBuffer: @ 800EC00
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r0, [r4]
-	bl LZ77UnCompWram
-	str r5, [sp]
-	ldrh r1, [r4, 0x6]
-	lsls r1, 16
-	ldrh r0, [r4, 0x4]
-	orrs r0, r1
-	str r0, [sp, 0x4]
-	mov r0, sp
-	bl LoadSpriteSheet
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end LoadCompressedObjectPicOverrideBuffer
-
-	thumb_func_start LoadCompressedObjectPalette
-LoadCompressedObjectPalette: @ 800EC28
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r5, r0, 0
-	ldr r0, [r5]
-	ldr r4, _0800EC54 @ =gDecompressionBuffer
-	adds r1, r4, 0
-	bl LZ77UnCompWram
-	str r4, [sp]
-	ldrh r2, [r5, 0x4]
-	ldr r1, _0800EC58 @ =0xffff0000
-	ldr r0, [sp, 0x4]
-	ands r0, r1
-	orrs r0, r2
-	str r0, [sp, 0x4]
-	mov r0, sp
-	bl LoadSpritePalette
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800EC54: .4byte gDecompressionBuffer
-_0800EC58: .4byte 0xffff0000
-	thumb_func_end LoadCompressedObjectPalette
-
-	thumb_func_start LoadCompressedObjectPaletteOverrideBuffer
-LoadCompressedObjectPaletteOverrideBuffer: @ 800EC5C
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r5, r0, 0
-	adds r4, r1, 0
-	ldr r0, [r5]
-	bl LZ77UnCompWram
-	str r4, [sp]
-	ldrh r2, [r5, 0x4]
-	ldr r1, _0800EC88 @ =0xffff0000
-	ldr r0, [sp, 0x4]
-	ands r0, r1
-	orrs r0, r2
-	str r0, [sp, 0x4]
-	mov r0, sp
-	bl LoadSpritePalette
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800EC88: .4byte 0xffff0000
-	thumb_func_end LoadCompressedObjectPaletteOverrideBuffer
-
-	thumb_func_start DecompressPicFromTable
-DecompressPicFromTable: @ 800EC8C
-	push {r4,r5,lr}
-	adds r3, r0, 0
-	adds r4, r1, 0
-	adds r5, r2, 0
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r5, r0
-	ble _0800ECAC
-	ldr r0, _0800ECA8 @ =gMonFrontPicTable
-	ldr r0, [r0]
-	bl LZ77UnCompWram
-	b _0800ECB4
-	.align 2, 0
-_0800ECA8: .4byte gMonFrontPicTable
-_0800ECAC:
-	ldr r0, [r3]
-	adds r1, r4, 0
-	bl LZ77UnCompWram
-_0800ECB4:
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_800EDAC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end DecompressPicFromTable
-
-	thumb_func_start sub_800ECC4
-sub_800ECC4: @ 800ECC4
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r0, r2, 3
-	ldr r1, _0800ECEC @ =gMonFrontPicTable
-	adds r0, r1
-	movs r1, 0
-	cmp r4, r0
-	bne _0800ECDA
-	movs r1, 0x1
-_0800ECDA:
-	str r1, [sp]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl LoadSpecialPokePic
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800ECEC: .4byte gMonFrontPicTable
-	thumb_func_end sub_800ECC4
-
-	thumb_func_start LoadSpecialPokePic
-LoadSpecialPokePic: @ 800ECF0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	adds r7, r2, 0
-	adds r5, r3, 0
-	ldr r0, [sp, 0x18]
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	cmp r7, 0xC9
-	bne _0800ED6C
-	movs r0, 0xC0
-	lsls r0, 18
-	ands r0, r5
-	lsrs r0, 18
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r5
-	lsrs r1, 12
-	orrs r0, r1
-	movs r1, 0xC0
-	lsls r1, 2
-	ands r1, r5
-	lsrs r1, 6
-	orrs r0, r1
-	movs r1, 0x3
-	ands r1, r5
-	orrs r0, r1
-	movs r1, 0x1C
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0
-	bne _0800ED3E
-	movs r1, 0xC9
-	b _0800ED48
-_0800ED3E:
-	movs r2, 0xCE
-	lsls r2, 1
-	adds r0, r1, r2
-	lsls r0, 16
-	lsrs r1, r0, 16
-_0800ED48:
-	mov r0, r8
-	cmp r0, 0
-	bne _0800ED5C
-	ldr r0, _0800ED58 @ =gMonBackPicTable
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, [r1]
-	b _0800ED78
-	.align 2, 0
-_0800ED58: .4byte gMonBackPicTable
-_0800ED5C:
-	ldr r0, _0800ED68 @ =gMonFrontPicTable
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, [r1]
-	b _0800ED78
-	.align 2, 0
-_0800ED68: .4byte gMonFrontPicTable
-_0800ED6C:
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r7, r0
-	ble _0800ED84
-	ldr r0, _0800ED80 @ =gMonFrontPicTable
-	ldr r0, [r0]
-_0800ED78:
-	adds r1, r4, 0
-	bl LZ77UnCompWram
-	b _0800ED8C
-	.align 2, 0
-_0800ED80: .4byte gMonFrontPicTable
-_0800ED84:
-	ldr r0, [r6]
-	adds r1, r4, 0
-	bl LZ77UnCompWram
-_0800ED8C:
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl sub_800EDAC
-	lsls r0, r7, 16
-	lsrs r0, 16
-	adds r1, r5, 0
-	adds r2, r4, 0
-	mov r3, r8
-	bl DrawSpindaSpots
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end LoadSpecialPokePic
-
-	thumb_func_start sub_800EDAC
-sub_800EDAC: @ 800EDAC
-	push {lr}
-	adds r3, r0, 0
-	movs r0, 0xCD
-	lsls r0, 1
-	cmp r1, r0
-	bne _0800EDC6
-	movs r1, 0x80
-	lsls r1, 4
-	adds r0, r3, r1
-	ldr r2, _0800EDCC @ =0x04000200
-	adds r1, r3, 0
-	bl CpuSet
-_0800EDC6:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800EDCC: .4byte 0x04000200
-	thumb_func_end sub_800EDAC
-
-	thumb_func_start sub_800EDD0
-sub_800EDD0: @ 800EDD0
-	push {lr}
-	ldr r0, [r0]
-	bl LZ77UnCompWram
-	pop {r0}
-	bx r0
-	thumb_func_end sub_800EDD0
-
-	thumb_func_start sub_800EDDC
-sub_800EDDC: @ 800EDDC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x24
-	mov r9, r0
-	str r1, [sp]
-	str r2, [sp, 0x4]
-	adds r5, r3, 0
-	movs r0, 0x1
-	mov r1, r9
-	ands r0, r1
-	cmp r0, 0
-	bne _0800EDFC
-	b _0800EF94
-_0800EDFC:
-	asrs r0, r1, 1
-	adds r0, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp, 0x8]
-	movs r0, 0
-	ldr r2, [sp]
-	cmp r0, r2
-	blt _0800EE10
-	b _0800F024
-_0800EE10:
-	movs r4, 0x8
-	subs r1, r4, r1
-	str r1, [sp, 0x10]
-_0800EE16:
-	movs r7, 0
-	adds r0, 0x1
-	str r0, [sp, 0x14]
-	ldr r0, [sp, 0x10]
-	cmp r7, r0
-	bge _0800EE92
-	ldr r1, [sp, 0x8]
-	lsls r1, 8
-	str r1, [sp, 0x18]
-	movs r2, 0
-	mov r10, r2
-	mov r0, r9
-	movs r4, 0x8
-	subs r0, r4, r0
-	str r0, [sp, 0xC]
-_0800EE34:
-	movs r3, 0
-	asrs r0, r7, 1
-	adds r1, r7, 0
-	movs r2, 0x1
-	ands r1, r2
-	str r1, [sp, 0x20]
-	lsls r0, 8
-	mov r8, r0
-	mov r12, r5
-_0800EE46:
-	lsls r1, r3, 5
-	ldr r4, [sp, 0x18]
-	adds r0, r5, r4
-	adds r0, r1
-	mov r1, r8
-	adds r2, r0, r1
-	mov r1, r12
-	add r1, r8
-	movs r6, 0xF
-_0800EE58:
-	ldr r4, [sp, 0x20]
-	cmp r4, 0
-	bne _0800EE68
-	strb r4, [r1]
-	add r4, sp, 0x20
-	ldrb r4, [r4]
-	strb r4, [r2, 0x10]
-	b _0800EE76
-_0800EE68:
-	mov r0, r10
-	strb r0, [r1, 0x10]
-	movs r4, 0x80
-	lsls r4, 1
-	adds r4, r2, r4
-	str r4, [sp, 0x1C]
-	strb r0, [r4]
-_0800EE76:
-	adds r2, 0x1
-	adds r1, 0x1
-	subs r6, 0x1
-	cmp r6, 0
-	bge _0800EE58
-	movs r0, 0x20
-	add r12, r0
-	adds r3, 0x1
-	cmp r3, 0x7
-	ble _0800EE46
-	adds r7, 0x1
-	ldr r1, [sp, 0xC]
-	cmp r7, r1
-	blt _0800EE34
-_0800EE92:
-	movs r7, 0
-	movs r2, 0
-_0800EE96:
-	movs r6, 0
-	adds r4, r7, 0x1
-	mov r8, r4
-	lsls r4, r7, 5
-_0800EE9E:
-	adds r0, r6, 0x1
-	mov r10, r0
-	lsls r1, r6, 8
-	adds r0, r1, 0
-	adds r0, 0xC0
-	adds r0, r5, r0
-	adds r0, r4
-	adds r1, r5, r1
-	adds r1, r4
-	movs r3, 0x1F
-_0800EEB2:
-	strb r2, [r1]
-	strb r2, [r0]
-	adds r0, 0x1
-	adds r1, 0x1
-	subs r3, 0x1
-	cmp r3, 0
-	bge _0800EEB2
-	mov r6, r10
-	cmp r6, 0x7
-	ble _0800EE9E
-	mov r7, r8
-	cmp r7, 0x1
-	ble _0800EE96
-	mov r1, r9
-	cmp r1, 0x5
-	bne _0800EED8
-	movs r2, 0x90
-	lsls r2, 1
-	adds r5, r2
-_0800EED8:
-	movs r7, 0
-	cmp r7, r9
-	bge _0800EF6E
-_0800EEDE:
-	movs r3, 0
-	adds r7, 0x1
-	mov r8, r7
-	cmp r3, r9
-	bge _0800EF4E
-_0800EEE8:
-	adds r3, 0x1
-	mov r10, r3
-	ldr r4, [sp, 0x4]
-	adds r4, 0x20
-	adds r7, r5, 0
-	adds r7, 0x20
-	movs r0, 0x12
-	adds r0, r5
-	mov r12, r0
-	ldr r2, [sp, 0x4]
-	adds r3, r5, 0
-	movs r6, 0x3
-_0800EF00:
-	ldrb r0, [r2]
-	mov r1, r12
-	strb r0, [r1]
-	ldrb r0, [r2, 0x1]
-	strb r0, [r1, 0x1]
-	ldrb r0, [r2, 0x2]
-	strb r0, [r1, 0x1E]
-	ldrb r0, [r2, 0x3]
-	strb r0, [r1, 0x1F]
-	movs r0, 0x81
-	lsls r0, 1
-	adds r1, r3, r0
-	ldrb r0, [r2, 0x10]
-	strb r0, [r1]
-	ldr r0, _0800EF58 @ =0x00000103
-	adds r1, r3, r0
-	ldrb r0, [r2, 0x11]
-	strb r0, [r1]
-	movs r0, 0x90
-	lsls r0, 1
-	adds r1, r3, r0
-	ldrb r0, [r2, 0x12]
-	strb r0, [r1]
-	ldr r0, _0800EF5C @ =0x00000121
-	adds r1, r3, r0
-	ldrb r0, [r2, 0x13]
-	strb r0, [r1]
-	movs r1, 0x4
-	add r12, r1
-	adds r2, 0x4
-	adds r3, 0x4
-	subs r6, 0x1
-	cmp r6, 0
-	bge _0800EF00
-	str r4, [sp, 0x4]
-	adds r5, r7, 0
-	mov r3, r10
-	cmp r3, r9
-	blt _0800EEE8
-_0800EF4E:
-	mov r2, r9
-	cmp r2, 0x7
-	bne _0800EF60
-	adds r5, 0x20
-	b _0800EF68
-	.align 2, 0
-_0800EF58: .4byte 0x00000103
-_0800EF5C: .4byte 0x00000121
-_0800EF60:
-	mov r4, r9
-	cmp r4, 0x5
-	bne _0800EF68
-	adds r5, 0x60
-_0800EF68:
-	mov r7, r8
-	cmp r7, r9
-	blt _0800EEDE
-_0800EF6E:
-	mov r0, r9
-	cmp r0, 0x7
-	bne _0800EF7C
-	movs r1, 0x80
-	lsls r1, 1
-	adds r5, r1
-	b _0800EF88
-_0800EF7C:
-	mov r2, r9
-	cmp r2, 0x5
-	bne _0800EF88
-	movs r4, 0xF0
-	lsls r4, 1
-	adds r5, r4
-_0800EF88:
-	ldr r0, [sp, 0x14]
-	ldr r1, [sp]
-	cmp r0, r1
-	bge _0800EF92
-	b _0800EE16
-_0800EF92:
-	b _0800F024
-_0800EF94:
-	movs r6, 0
-	ldr r2, [sp]
-	cmp r6, r2
-	bge _0800F024
-_0800EF9C:
-	adds r6, 0x1
-	mov r10, r6
-	mov r4, r9
-	cmp r4, 0x6
-	bne _0800EFB4
-	movs r0, 0
-	movs r3, 0xFF
-_0800EFAA:
-	strb r0, [r5]
-	adds r5, 0x1
-	subs r3, 0x1
-	cmp r3, 0
-	bge _0800EFAA
-_0800EFB4:
-	movs r7, 0
-	cmp r7, r9
-	bge _0800F008
-_0800EFBA:
-	adds r7, 0x1
-	mov r8, r7
-	mov r1, r9
-	lsls r0, r1, 5
-	cmp r1, 0x6
-	bne _0800EFD4
-	movs r1, 0
-	movs r3, 0x1F
-_0800EFCA:
-	strb r1, [r5]
-	adds r5, 0x1
-	subs r3, 0x1
-	cmp r3, 0
-	bge _0800EFCA
-_0800EFD4:
-	adds r1, r0, 0
-	cmp r1, 0
-	ble _0800EFEE
-	adds r3, r1, 0
-_0800EFDC:
-	ldr r2, [sp, 0x4]
-	ldrb r0, [r2]
-	strb r0, [r5]
-	adds r2, 0x1
-	str r2, [sp, 0x4]
-	adds r5, 0x1
-	subs r3, 0x1
-	cmp r3, 0
-	bne _0800EFDC
-_0800EFEE:
-	mov r4, r9
-	cmp r4, 0x6
-	bne _0800F002
-	movs r0, 0
-	movs r3, 0x1F
-_0800EFF8:
-	strb r0, [r5]
-	adds r5, 0x1
-	subs r3, 0x1
-	cmp r3, 0
-	bge _0800EFF8
-_0800F002:
-	mov r7, r8
-	cmp r7, r9
-	blt _0800EFBA
-_0800F008:
-	mov r0, r9
-	cmp r0, 0x6
-	bne _0800F01C
-	movs r0, 0
-	movs r3, 0xFF
-_0800F012:
-	strb r0, [r5]
-	adds r5, 0x1
-	subs r3, 0x1
-	cmp r3, 0
-	bge _0800F012
-_0800F01C:
-	mov r6, r10
-	ldr r1, [sp]
-	cmp r6, r1
-	blt _0800EF9C
-_0800F024:
-	add sp, 0x24
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_800EDDC
-
-	thumb_func_start sub_800F034
-sub_800F034: @ 800F034
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r0, [r4]
-	ldr r0, [r0]
-	lsrs r0, 8
-	bl AllocZeroed
-	adds r5, r0, 0
-	cmp r5, 0
-	beq _0800F06E
-	ldr r0, [r4]
-	adds r1, r5, 0
-	bl LZ77UnCompWram
-	str r5, [sp]
-	ldrh r1, [r4, 0x6]
-	lsls r1, 16
-	ldrh r0, [r4, 0x4]
-	orrs r0, r1
-	str r0, [sp, 0x4]
-	mov r0, sp
-	bl LoadSpriteSheet
-	adds r0, r5, 0
-	bl Free
-	movs r0, 0
-	b _0800F070
-_0800F06E:
-	movs r0, 0x1
-_0800F070:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_800F034
-
-	thumb_func_start sub_800F078
-sub_800F078: @ 800F078
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r0, [r4]
-	ldr r0, [r0]
-	lsrs r0, 8
-	bl AllocZeroed
-	adds r5, r0, 0
-	cmp r5, 0
-	beq _0800F0B8
-	ldr r0, [r4]
-	adds r1, r5, 0
-	bl LZ77UnCompWram
-	str r5, [sp]
-	ldrh r2, [r4, 0x4]
-	ldr r1, _0800F0B4 @ =0xffff0000
-	ldr r0, [sp, 0x4]
-	ands r0, r1
-	orrs r0, r2
-	str r0, [sp, 0x4]
-	mov r0, sp
-	bl LoadSpritePalette
-	adds r0, r5, 0
-	bl Free
-	movs r0, 0
-	b _0800F0BA
-	.align 2, 0
-_0800F0B4: .4byte 0xffff0000
-_0800F0B8:
-	movs r0, 0x1
-_0800F0BA:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_800F078
-
-	thumb_func_start GetDecompressedDataSize
-GetDecompressedDataSize: @ 800F0C4
-	sub sp, 0x4
-	mov r3, sp
-	ldrb r2, [r0, 0x1]
-	mov r1, sp
-	strb r2, [r1]
-	ldrb r1, [r0, 0x2]
-	strb r1, [r3, 0x1]
-	ldrb r0, [r0, 0x3]
-	strb r0, [r3, 0x2]
-	movs r0, 0
-	strb r0, [r3, 0x3]
-	ldr r0, [sp]
-	add sp, 0x4
-	bx lr
-	thumb_func_end GetDecompressedDataSize
-
-	thumb_func_start DecompressPicFromTable_DontHandleDeoxys
-DecompressPicFromTable_DontHandleDeoxys: @ 800F0E0
-	push {lr}
-	adds r3, r0, 0
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r2, r0
-	ble _0800F0FC
-	ldr r0, _0800F0F8 @ =gMonFrontPicTable
-	ldr r0, [r0]
-	bl LZ77UnCompWram
-	b _0800F102
-	.align 2, 0
-_0800F0F8: .4byte gMonFrontPicTable
-_0800F0FC:
-	ldr r0, [r3]
-	bl LZ77UnCompWram
-_0800F102:
-	pop {r0}
-	bx r0
-	thumb_func_end DecompressPicFromTable_DontHandleDeoxys
-
-	thumb_func_start HandleLoadSpecialPokePic_DontHandleDeoxys
-HandleLoadSpecialPokePic_DontHandleDeoxys: @ 800F108
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r0, r2, 3
-	ldr r1, _0800F130 @ =gMonFrontPicTable
-	adds r0, r1
-	movs r1, 0
-	cmp r4, r0
-	bne _0800F11E
-	movs r1, 0x1
-_0800F11E:
-	str r1, [sp]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl LoadSpecialPokePic_DontHandleDeoxys
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800F130: .4byte gMonFrontPicTable
-	thumb_func_end HandleLoadSpecialPokePic_DontHandleDeoxys
-
-	thumb_func_start LoadSpecialPokePic_DontHandleDeoxys
-LoadSpecialPokePic_DontHandleDeoxys: @ 800F134
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	adds r5, r1, 0
-	adds r7, r2, 0
-	adds r4, r3, 0
-	ldr r0, [sp, 0x18]
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	cmp r7, 0xC9
-	bne _0800F1B0
-	movs r0, 0xC0
-	lsls r0, 18
-	ands r0, r4
-	lsrs r0, 18
-	movs r1, 0xC0
-	lsls r1, 10
-	ands r1, r4
-	lsrs r1, 12
-	orrs r0, r1
-	movs r1, 0xC0
-	lsls r1, 2
-	ands r1, r4
-	lsrs r1, 6
-	orrs r0, r1
-	movs r1, 0x3
-	ands r1, r4
-	orrs r0, r1
-	movs r1, 0x1C
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0
-	bne _0800F182
-	movs r1, 0xC9
-	b _0800F18C
-_0800F182:
-	movs r2, 0xCE
-	lsls r2, 1
-	adds r0, r1, r2
-	lsls r0, 16
-	lsrs r1, r0, 16
-_0800F18C:
-	mov r0, r8
-	cmp r0, 0
-	bne _0800F1A0
-	ldr r0, _0800F19C @ =gMonBackPicTable
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, [r1]
-	b _0800F1BC
-	.align 2, 0
-_0800F19C: .4byte gMonBackPicTable
-_0800F1A0:
-	ldr r0, _0800F1AC @ =gMonFrontPicTable
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, [r1]
-	b _0800F1BC
-	.align 2, 0
-_0800F1AC: .4byte gMonFrontPicTable
-_0800F1B0:
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r7, r0
-	ble _0800F1C8
-	ldr r0, _0800F1C4 @ =gMonFrontPicTable
-	ldr r0, [r0]
-_0800F1BC:
-	adds r1, r5, 0
-	bl LZ77UnCompWram
-	b _0800F1D0
-	.align 2, 0
-_0800F1C4: .4byte gMonFrontPicTable
-_0800F1C8:
-	ldr r0, [r6]
-	adds r1, r5, 0
-	bl LZ77UnCompWram
-_0800F1D0:
-	lsls r0, r7, 16
-	lsrs r0, 16
-	adds r1, r4, 0
-	adds r2, r5, 0
-	mov r3, r8
-	bl DrawSpindaSpots
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end LoadSpecialPokePic_DontHandleDeoxys
-
-	.align 2, 0 @ Don't pad with nop.

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

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

asm/evolution_graphics.s

@@ -573,7 +573,7 @@ _080F5D80: .4byte SpriteCB_PostEvoSparkleSet2
 LoadEvoSparkleSpriteAndPal: @ 80F5D84
 	push {lr}
 	ldr r0, _080F5D98 @ =gUnknown_841EEC4
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _080F5D9C @ =gUnknown_841EED4
 	bl LoadSpritePalettes
 	pop {r0}

asm/evolution_scene.s

@@ -1870,7 +1870,7 @@ _080CEDC6:
 	cmp r4, 0
 	bne _080CEE40
 	bl StopMapMusic
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	ldrh r1, [r5, 0xE]
 	movs r0, 0x80
 	orrs r0, r1
@@ -1944,7 +1944,7 @@ _080CEE74:
 	cmp r0, 0
 	bne _080CEE90
 	bl StopMapMusic
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 _080CEE90:
 	movs r2, 0x1A
 	ldrsh r0, [r4, r2]

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

asm/field_control_avatar.s

@@ -320,7 +320,7 @@ sub_806CAC8: @ 806CAC8
 	sub sp, 0x8
 	adds r5, r0, 0
 	bl sub_8069A54
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r6, r0, 24
 	mov r4, sp
@@ -629,7 +629,7 @@ _0806CD54:
 	ldrb r0, [r4, 0x2]
 	cmp r0, 0
 	beq _0806CDC0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	ldrb r1, [r4, 0x2]
@@ -1033,7 +1033,7 @@ _0806D078:
 	lsls r0, 2
 	ldr r1, _0806D098 @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl FieldObjectCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806D0A0

asm/field_effect.s

@@ -608,12 +608,12 @@ CreateTrainerSprite: @ 8083858
 	add r8, r4
 	mov r0, r8
 	adds r1, r7, 0
-	bl LoadCompressedObjectPaletteOverrideBuffer
+	bl LoadCompressedSpritePaletteOverrideBuffer
 	ldr r0, _080838E4 @ =gTrainerFrontPicTable
 	adds r4, r0
 	adds r0, r4, 0
 	adds r1, r7, 0
-	bl LoadCompressedObjectPicOverrideBuffer
+	bl LoadCompressedSpriteSheetOverrideBuffer
 	mov r1, sp
 	ldrh r0, [r4, 0x6]
 	movs r2, 0
@@ -2062,7 +2062,7 @@ _0808438C: .4byte mapldr_08084390
 	thumb_func_start mapldr_08084390
 mapldr_08084390: @ 8084390
 	push {r4,lr}
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl sub_807DC00
 	ldr r0, _080843E8 @ =c3_080843F8
 	movs r1, 0
@@ -2154,7 +2154,7 @@ _08084450: .4byte gPaletteFade
 	thumb_func_start sub_8084454
 sub_8084454: @ 8084454
 	push {lr}
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl pal_fill_for_maplights
 	bl sub_8111CF0
 	bl ScriptContext2_Enable
@@ -2235,7 +2235,7 @@ sub_80844BC: @ 80844BC
 	strb r1, [r0, 0x1]
 	movs r0, 0x1
 	strb r0, [r6, 0x6]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_8063EB8
@@ -2243,7 +2243,7 @@ sub_80844BC: @ 80844BC
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	adds r3, r4, 0
 	adds r3, 0x42
 	ldrb r0, [r3]
@@ -2653,17 +2653,17 @@ sub_8084820: @ 8084820
 	ldr r1, _0808488C @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808484A
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808487E
 _0808484A:
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_8063EB8
@@ -2671,7 +2671,7 @@ _0808484A:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	movs r1, 0
@@ -2885,7 +2885,7 @@ _080849F0: .4byte sub_80847C0
 	thumb_func_start sub_80849F4
 sub_80849F4: @ 80849F4
 	push {lr}
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl pal_fill_for_maplights
 	bl sub_8111CF0
 	bl ScriptContext2_Enable
@@ -2952,7 +2952,7 @@ sub_8084A5C: @ 8084A5C
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	mov r4, sp
 	adds r4, 0x2
 	mov r0, sp
@@ -3192,7 +3192,7 @@ sub_8084C3C: @ 8084C3C
 	ldr r1, _08084C98 @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08084C8A
@@ -3205,7 +3205,7 @@ sub_8084C3C: @ 8084C3C
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldr r0, _08084C9C @ =sub_8084A24
 	bl FindTaskIdByFunc
 	lsls r0, 24
@@ -3317,12 +3317,12 @@ waterfall_1_do_anim_probably: @ 8084D44
 	adds r5, r1, 0
 	bl ScriptContext2_Enable
 	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _08084D74
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	ldr r1, _08084D7C @ =gFieldEffectArguments
 	movs r2, 0xA
 	ldrsh r0, [r4, r2]
@@ -3374,7 +3374,7 @@ sub_8084DA4: @ 8084DA4
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -3390,7 +3390,7 @@ sub_8084DCC: @ 8084DCC
 	adds r5, r0, 0
 	adds r4, r1, 0
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _08084DE2
@@ -3909,7 +3909,7 @@ _080851B8: .4byte sub_8084F44
 	thumb_func_start mapldr_080851BC
 mapldr_080851BC: @ 80851BC
 	push {lr}
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl pal_fill_for_maplights
 	bl sub_8111CF0
 	bl ScriptContext2_Enable
@@ -4070,7 +4070,7 @@ sub_80852C0: @ 80852C0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 _08085308:
 	movs r0, 0
 	pop {r4}
@@ -4084,7 +4084,7 @@ _08085310: .4byte gSprites
 sub_8085314: @ 8085314
 	push {lr}
 	adds r0, r1, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808533E
@@ -4266,7 +4266,7 @@ sub_8085470: @ 8085470
 	adds r4, r1, 0
 	adds r6, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080854E4
@@ -4311,7 +4311,7 @@ _080854C4:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	movs r0, 0x21
 	bl PlaySE
 _080854E4:
@@ -4527,7 +4527,7 @@ sub_808566C: @ 808566C
 	strh r0, [r4, 0x8]
 	movs r0, 0x40
 	strh r0, [r4, 0x22]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x24]
@@ -4641,12 +4641,12 @@ sub_808576C: @ 808576C
 	adds r4, r0, 0
 	adds r6, r1, 0
 	adds r5, r2, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808578A
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080857E4
@@ -4673,7 +4673,7 @@ _0808579E:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r1, [r5]
 	movs r2, 0
 	ldrsh r0, [r5, r2]
@@ -4965,7 +4965,7 @@ _080859C4:
 	thumb_func_start sub_80859D4
 sub_80859D4: @ 80859D4
 	push {lr}
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl pal_fill_for_maplights
 	bl sub_8111CF0
 	bl ScriptContext2_Enable
@@ -5031,7 +5031,7 @@ sub_8085A54: @ 8085A54
 	beq _08085A78
 	movs r0, 0x28
 	bl PlaySE
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x26]
@@ -5125,7 +5125,7 @@ _08085B10:
 	cmp r1, r0
 	bne _08085B58
 	adds r0, r6, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl FieldObjectCheckHeldMovementStatus
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -5200,7 +5200,7 @@ sub_8085BA8: @ 8085BA8
 	bl ScriptContext2_Enable
 	bl player_bitmagic
 	bl CameraObjectReset2
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x26]
@@ -5431,7 +5431,7 @@ _08085D84: .4byte sub_8085B78
 	thumb_func_start mapldr_08085D88
 mapldr_08085D88: @ 8085D88
 	push {lr}
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl pal_fill_for_maplights
 	bl sub_8111CF0
 	bl ScriptContext2_Enable
@@ -5540,7 +5540,7 @@ sub_8085E0C: @ 8085E0C
 	ldrb r0, [r2]
 	lsrs r0, 6
 	strh r0, [r6, 0x24]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r6, 0x26]
@@ -6185,7 +6185,7 @@ sub_8086358: @ 8086358
 	movs r1, 0
 	movs r2, 0
 	bl ChangeBgY
-	bl sub_80F77B8
+	bl Menu_LoadStdPal
 	movs r0, 0x26
 	ldrsh r1, [r4, r0]
 	lsls r0, r1, 4
@@ -6568,7 +6568,7 @@ sub_8086650: @ 8086650
 	movs r1, 0
 	movs r2, 0
 	bl ChangeBgY
-	bl sub_80F77B8
+	bl Menu_LoadStdPal
 	movs r0, 0x26
 	ldrsh r1, [r4, r0]
 	lsls r0, r1, 4
@@ -7050,12 +7050,12 @@ sub_8086A20: @ 8086A20
 	ldr r1, _08086A68 @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086A4A
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086A5C
@@ -7063,7 +7063,7 @@ _08086A4A:
 	bl sub_805CB70
 	adds r0, r4, 0
 	movs r1, 0x45
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -7087,7 +7087,7 @@ sub_8086A6C: @ 8086A6C
 	lsls r0, 2
 	ldr r1, _08086AAC @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl FieldObjectCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086AA2
@@ -7135,9 +7135,9 @@ sub_8086AB4: @ 8086AB4
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	ldrb r0, [r4, 0x18]
 	lsrs r0, 4
 	bl sub_80641C0
@@ -7145,7 +7145,7 @@ sub_8086AB4: @ 8086AB4
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldr r1, _08086B2C @ =gFieldEffectArguments
 	movs r2, 0xA
 	ldrsh r0, [r6, r2]
@@ -7182,7 +7182,7 @@ sub_8086B30: @ 8086B30
 	ldr r1, _08086BA0 @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086B96
@@ -7199,7 +7199,7 @@ sub_8086B30: @ 8086B30
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrb r0, [r4, 0x1A]
 	movs r1, 0x1
 	bl sub_80DC44C
@@ -7302,12 +7302,12 @@ sub_8086C24: @ 8086C24
 	ldr r1, _08086C6C @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086C4E
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086C60
@@ -7315,7 +7315,7 @@ _08086C4E:
 	bl sub_805CBE8
 	adds r0, r4, 0
 	movs r1, 0x45
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -7340,7 +7340,7 @@ sub_8086C70: @ 8086C70
 	ldr r1, _08086CA0 @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086CEE
@@ -7366,7 +7366,7 @@ _08086CAE:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	b _08086CD2
 _08086CC0:
 	movs r0, 0
@@ -7375,7 +7375,7 @@ _08086CC0:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 _08086CD2:
 	ldrb r0, [r4, 0x18]
 	lsls r0, 28
@@ -7405,7 +7405,7 @@ sub_8086CF4: @ 8086CF4
 	lsls r0, 2
 	ldr r1, _08086D30 @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086D26
@@ -7599,12 +7599,12 @@ sub_8086E70: @ 8086E70
 	ldr r1, _08086EC4 @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086E9A
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086EB8
@@ -7617,7 +7617,7 @@ _08086E9A:
 	bl sub_805CB70
 	adds r0, r4, 0
 	movs r1, 0x45
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -7641,7 +7641,7 @@ sub_8086EC8: @ 8086EC8
 	lsls r0, 2
 	ldr r1, _08086F04 @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086EF8
@@ -7732,7 +7732,7 @@ sub_8086F64: @ 8086F64
 	ldr r1, _08086FA4 @ =gMapObjects
 	adds r0, r1
 	movs r1, 0x2
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 _08086F98:
 	pop {r4}
 	pop {r0}
@@ -7765,7 +7765,7 @@ sub_8086FA8: @ 8086FA8
 	bne _08086FEC
 _08086FCE:
 	adds r0, r2, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08086FEC
@@ -7809,7 +7809,7 @@ sub_8086FFC: @ 8086FFC
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 4
 	adds r0, r1
@@ -7824,7 +7824,7 @@ sub_8086FFC: @ 8086FFC
 	strb r0, [r4, 0x1]
 	adds r0, r4, 0
 	movs r1, 0x54
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -8433,12 +8433,12 @@ sub_80874C8: @ 80874C8
 	ldr r1, _080875B8 @ =gMapObjects
 	adds r5, r0, r1
 	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080874F2
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080875AE
@@ -8468,7 +8468,7 @@ _0808751A:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r5, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	bl CameraObjectReset2
 	adds r0, r5, 0
 	movs r1, 0x3
@@ -8688,7 +8688,7 @@ sub_8087698: @ 8087698
 	bl sub_805CB70
 	adds r0, r5, 0
 	movs r1, 0x45
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r6, 0x8]
 	adds r0, 0x1
 	strh r0, [r6, 0x8]
@@ -8713,7 +8713,7 @@ sub_8087710: @ 8087710
 	lsls r0, 2
 	ldr r1, _08087744 @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08087738
@@ -8795,7 +8795,7 @@ _080877B4:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl FieldObjectTurn

asm/field_fadetransition.s

@@ -245,7 +245,7 @@ _0807DCDC:
 sub_807DCE4: @ 807DCE4
 	push {lr}
 	bl ScriptContext2_Enable
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl sub_807DC00
 	ldr r0, _0807DD00 @ =task0A_nop_for_a_while
 	movs r1, 0xA
@@ -277,7 +277,7 @@ _0807DD1C:
 FieldCallback_ReturnToEventScript2: @ 807DD24
 	push {lr}
 	bl ScriptContext2_Enable
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl sub_807DC00
 	ldr r0, _0807DD40 @ =task0A_asap_script_env_2_enable_and_set_ctx_running
 	movs r1, 0xA
@@ -366,7 +366,7 @@ _0807DDCA:
 sub_807DDD0: @ 807DDD0
 	push {lr}
 	bl ScriptContext2_Enable
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl palette_bg_faded_fill_black
 	ldr r0, _0807DDEC @ =task_mpl_807DD60
 	movs r1, 0xA
@@ -434,7 +434,7 @@ _0807DE50:
 sub_807DE58: @ 807DE58
 	push {lr}
 	bl ScriptContext2_Enable
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl palette_bg_faded_fill_black
 	ldr r0, _0807DE74 @ =sub_807DDF0
 	movs r1, 0xA
@@ -563,7 +563,7 @@ _0807DF5E:
 	thumb_func_start sub_807DF64
 sub_807DF64: @ 807DF64
 	push {lr}
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl sub_8111CF0
 	movs r0, 0
 	bl sub_807DE78
@@ -575,7 +575,7 @@ sub_807DF64: @ 807DF64
 	thumb_func_start sub_807DF7C
 sub_807DF7C: @ 807DF7C
 	push {lr}
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl sub_8111CF0
 	movs r0, 0x1
 	bl sub_807DE78
@@ -587,7 +587,7 @@ sub_807DF7C: @ 807DF7C
 	thumb_func_start sub_807DF94
 sub_807DF94: @ 807DF94
 	push {lr}
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl pal_fill_for_maplights
 	bl sub_8111CF0
 	movs r0, 0x28
@@ -730,7 +730,7 @@ _0807E0AE:
 	ldr r1, _0807E0E8 @ =gMapObjects
 	adds r0, r1
 	movs r1, 0x10
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	movs r0, 0x8
 	strh r0, [r4, 0x8]
 	b _0807E206
@@ -783,7 +783,7 @@ _0807E10E:
 	lsls r0, 2
 	ldr r1, _0807E15C @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	b _0807E1F2
 	.align 2, 0
 _0807E158: .4byte sub_807F204
@@ -807,7 +807,7 @@ _0807E160:
 	ldr r1, _0807E194 @ =gMapObjects
 	adds r0, r1
 	movs r1, 0x10
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	movs r0, 0x2
 	strh r0, [r4, 0x8]
 	b _0807E206
@@ -838,7 +838,7 @@ _0807E198:
 	lsls r0, 2
 	ldr r1, _0807E1D8 @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	movs r0, 0x3
 	strh r0, [r4, 0x8]
 	b _0807E206
@@ -929,7 +929,7 @@ _0807E25E:
 	lsls r4, 2
 	ldr r0, _0807E2A4 @ =gMapObjects
 	adds r4, r0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_8063F84
@@ -937,7 +937,7 @@ _0807E25E:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	movs r0, 0x2
 	strh r0, [r5, 0x8]
 	b _0807E2C6
@@ -1112,7 +1112,7 @@ _0807E3E4:
 sub_807E3EC: @ 807E3EC
 	push {lr}
 	bl ScriptContext2_Enable
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl sub_807DC00
 	ldr r0, _0807E408 @ =task_mpl_807E3C8
 	movs r1, 0xA
@@ -1744,7 +1744,7 @@ _0807E8AE:
 	lsls r0, 2
 	adds r0, r4
 	movs r1, 0x11
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	movs r0, 0x2
 	strh r0, [r5, 0x8]
 	b _0807E976
@@ -1776,7 +1776,7 @@ _0807E8F4:
 	lsls r0, 2
 	ldr r1, _0807E93C @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	movs r0, 0
 	bl sub_807DCB0
 	movs r0, 0x3
@@ -1871,12 +1871,12 @@ _0807E9DA:
 	b _0807EA92
 _0807E9E8:
 	adds r0, r6, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0807EA00
 	adds r0, r6, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0807EAB0
@@ -2033,7 +2033,7 @@ _0807EB08:
 	lsrs r0, 7
 	cmp r0, 0
 	beq _0807EB4C
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl GetStepInPlaceDelay16AnimId
@@ -2071,7 +2071,7 @@ sub_807EB64: @ 807EB64
 	lsls r4, 2
 	ldr r0, _0807EBB8 @ =gMapObjects
 	adds r4, r0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl GetStepInPlaceDelay16AnimId
@@ -2188,7 +2188,7 @@ sub_807EC34: @ 807EC34
 	.align 2, 0
 _0807EC6C: .4byte gTasks+0x8
 _0807EC70:
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	bl pal_fill_for_maplights
 	bl ScriptContext2_Enable
 	adds r0, r5, 0x2

asm/field_map_obj.s

@@ -2440,8 +2440,8 @@ _0805F058: .4byte gPlayerAvatar
 _0805F05C: .4byte gMapObjects
 	thumb_func_end SetPlayerAvatarFieldObjectIdAndObjectId
 
-	thumb_func_start sub_805F060
+	thumb_func_start EventObjectSetGraphicsId
-sub_805F060: @ 805F060
+EventObjectSetGraphicsId: @ 805F060
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2625,7 +2625,7 @@ _0805F1BA:
 _0805F1CC: .4byte gSprites
 _0805F1D0: .4byte 0x000003ff
 _0805F1D4: .4byte 0xfffffc00
-	thumb_func_end sub_805F060
+	thumb_func_end EventObjectSetGraphicsId
 
 	thumb_func_start FieldObjectSetGraphicsIdByLocalIdAndMap
 FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
@@ -2652,7 +2652,7 @@ FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
 	ldr r1, _0805F214 @ =gMapObjects
 	adds r0, r1
 	adds r1, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 _0805F20C:
 	add sp, 0x4
 	pop {r4}
@@ -10353,7 +10353,7 @@ mss_npc_reset_oampriv3_1_unk2_unk3: @ 80628C0
 	ldrb r0, [r4]
 	cmp r0, 0
 	bne _080628D8
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	strb r0, [r4]
 _080628D8:
 	movs r0, 0x1
@@ -13097,8 +13097,8 @@ FieldObjectMoveDestCoords: @ 8063C50
 	bx r0
 	thumb_func_end FieldObjectMoveDestCoords
 
-	thumb_func_start FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	thumb_func_start FieldObjectIsMovementOverridden
-FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive: @ 8063C70
+FieldObjectIsMovementOverridden: @ 8063C70
 	push {lr}
 	ldrb r1, [r0]
 	movs r0, 0x42
@@ -13112,7 +13112,7 @@ _08063C80:
 _08063C82:
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	thumb_func_end FieldObjectIsMovementOverridden
 
 	thumb_func_start FieldObjectIsSpecialAnimActive
 FieldObjectIsSpecialAnimActive: @ 8063C88
@@ -13134,8 +13134,8 @@ _08063CA0:
 	bx r1
 	thumb_func_end FieldObjectIsSpecialAnimActive
 
-	thumb_func_start sub_8063CA4
+	thumb_func_start FieldObjectSetHeldMovement
-sub_8063CA4: @ 8063CA4
+FieldObjectSetHeldMovement: @ 8063CA4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -13146,7 +13146,7 @@ sub_8063CA4: @ 8063CA4
 	cmp r0, 0x1
 	beq _08063CC8
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08063CCE
@@ -13180,7 +13180,7 @@ _08063CF4:
 	bx r1
 	.align 2, 0
 _08063CFC: .4byte gSprites
-	thumb_func_end sub_8063CA4
+	thumb_func_end FieldObjectSetHeldMovement
 
 	thumb_func_start FieldObjectForceSetSpecialAnim
 FieldObjectForceSetSpecialAnim: @ 8063D00
@@ -13191,7 +13191,7 @@ FieldObjectForceSetSpecialAnim: @ 8063D00
 	bl FieldObjectClearAnimIfSpecialAnimActive
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -13242,8 +13242,8 @@ FieldObjectClearAnim: @ 8063D34
 _08063D64: .4byte gSprites
 	thumb_func_end FieldObjectClearAnim
 
-	thumb_func_start FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	thumb_func_start FieldObjectCheckHeldMovementStatus
-FieldObjectCheckIfSpecialAnimFinishedOrInactive: @ 8063D68
+FieldObjectCheckHeldMovementStatus: @ 8063D68
 	push {lr}
 	ldrb r1, [r0]
 	lsls r0, r1, 25
@@ -13256,13 +13256,13 @@ _08063D76:
 _08063D78:
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	thumb_func_end FieldObjectCheckHeldMovementStatus
 
-	thumb_func_start FieldObjectClearAnimIfSpecialAnimFinished
+	thumb_func_start FieldObjectClearHeldMovementIfFinished
-FieldObjectClearAnimIfSpecialAnimFinished: @ 8063D7C
+FieldObjectClearHeldMovementIfFinished: @ 8063D7C
 	push {r4,r5,lr}
 	adds r5, r0, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl FieldObjectCheckHeldMovementStatus
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0
@@ -13276,7 +13276,7 @@ _08063D96:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end FieldObjectClearAnimIfSpecialAnimFinished
+	thumb_func_end FieldObjectClearHeldMovementIfFinished
 
 	thumb_func_start FieldObjectGetSpecialAnim
 FieldObjectGetSpecialAnim: @ 8063DA0
@@ -14023,7 +14023,7 @@ FieldObjectFaceOppositeDirection: @ 80642C8
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r4}

asm/field_message_box.s

@@ -65,13 +65,13 @@ _0806939E:
 	movs r1, 0x80
 	lsls r1, 2
 	movs r0, 0
-	bl sub_814FF98
+	bl TextWindow_LoadTilesStdFrame1
 	b _080693E2
 	.align 2, 0
 _080693BC: .4byte gUnknown_203ADFA
 _080693C0: .4byte gTextFlags
 _080693C4:
-	bl sub_8069A38
+	bl IsMsgSignPost
 	lsls r0, 24
 	cmp r0, 0
 	bne _080693D4
@@ -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
@@ -226,7 +226,7 @@ textbox_fdecode_auto_and_task_add: @ 80694C8
 	ldr r0, _080694E0 @ =gStringVar4
 	bl StringExpandPlaceholders
 	movs r0, 0x1
-	bl sub_80F6D5C
+	bl AddTextPrinterDiffStyle
 	bl task_add_textbox
 	pop {r0}
 	bx r0
@@ -238,7 +238,7 @@ _080694E0: .4byte gStringVar4
 textbox_auto_and_task_add: @ 80694E4
 	push {lr}
 	movs r0, 0x1
-	bl sub_80F6D5C
+	bl AddTextPrinterDiffStyle
 	bl task_add_textbox
 	pop {r0}
 	bx r0

asm/field_player_avatar.s

@@ -94,12 +94,12 @@ sub_805B45C: @ 805B45C
 	adds r4, r0, 0
 	lsls r1, 24
 	lsrs r5, r1, 24
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805B4A6
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805B4A6
@@ -845,7 +845,7 @@ _0805B9AC: .4byte gPlayerAvatar
 	thumb_func_start PlayerNotOnBikeNotMoving
 PlayerNotOnBikeNotMoving: @ 805B9B0
 	push {lr}
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl PlayerFaceDirection
@@ -1631,7 +1631,7 @@ PlayerIsAnimActive: @ 805BF7C
 	lsls r0, 2
 	ldr r1, _0805BF9C @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
@@ -1651,7 +1651,7 @@ PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0
 	lsls r0, 2
 	ldr r1, _0805BFC0 @ =gMapObjects
 	adds r0, r1
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl FieldObjectCheckHeldMovementStatus
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
@@ -1737,7 +1737,7 @@ sub_805C024: @ 805C024
 	ldr r1, _0805C068 @ =gMapObjects
 	adds r0, r1
 	adds r1, r5, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805C05E
@@ -1765,7 +1765,7 @@ sub_805C06C: @ 805C06C
 	ldr r1, _0805C0A0 @ =gMapObjects
 	adds r0, r1
 	adds r1, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805C094
@@ -1789,7 +1789,7 @@ sub_805C0A4: @ 805C0A4
 	lsls r1, 24
 	lsrs r5, r1, 24
 	adds r1, r5, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805C0CA
@@ -2404,7 +2404,7 @@ GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
 	adds r0, r3
 	ldrh r0, [r0, 0x12]
 	strh r0, [r5]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r4, 0
@@ -2582,8 +2582,8 @@ _0805C6BC:
 	bx r1
 	thumb_func_end plaer_get_pos_including_state_based_drift
 
-	thumb_func_start player_get_direction_lower_nybble
+	thumb_func_start GetPlayerFacingDirection
-player_get_direction_lower_nybble: @ 805C6C4
+GetPlayerFacingDirection: @ 805C6C4
 	ldr r2, _0805C6DC @ =gMapObjects
 	ldr r0, _0805C6E0 @ =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
@@ -2598,7 +2598,7 @@ player_get_direction_lower_nybble: @ 805C6C4
 	.align 2, 0
 _0805C6DC: .4byte gMapObjects
 _0805C6E0: .4byte gPlayerAvatar
-	thumb_func_end player_get_direction_lower_nybble
+	thumb_func_end GetPlayerFacingDirection
 
 	thumb_func_start player_get_direction_upper_nybble
 player_get_direction_upper_nybble: @ 805C6E4
@@ -3257,7 +3257,7 @@ sub_805CB70: @ 805CB70
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r5, 0x4]
 	lsls r0, r1, 4
 	adds r0, r1
@@ -3318,7 +3318,7 @@ sub_805CBE8: @ 805CBE8
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r5, 0x4]
 	lsls r0, r1, 4
 	adds r0, r1
@@ -3532,19 +3532,19 @@ sub_805CD84: @ 805CD84
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805CE0E
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805CE0E
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	ldrb r0, [r6, 0xC]
 	bl GetStepInPlaceDelay16AnimId
 	adds r1, r0, 0
@@ -3602,19 +3602,19 @@ sub_805CE20: @ 805CE20
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r5, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl FieldObjectCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805CE70
 	adds r0, r4, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl FieldObjectCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805CE70
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	adds r0, r4, 0
 	bl sub_806DE28
 	ldrh r0, [r4, 0x10]
@@ -3704,7 +3704,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC
 	movs r0, 0x1
 	strb r0, [r5, 0x6]
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805CF48
@@ -3836,7 +3836,7 @@ sub_805CFEC: @ 805CFEC
 	movs r2, 0x4
 	bl memcpy
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D054
@@ -3896,7 +3896,7 @@ sub_805D064: @ 805D064
 	movs r2, 0x5
 	bl memcpy
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D094
@@ -3924,7 +3924,7 @@ sub_805D0A4: @ 805D0A4
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D0E8
@@ -4073,12 +4073,12 @@ taskFF_0805D1D4: @ 805D1D4
 	ldr r1, _0805D234 @ =gMapObjects
 	adds r5, r0, r1
 	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D200
 	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D228
@@ -4124,7 +4124,7 @@ sub_805D240: @ 805D240
 	ldr r1, _0805D2B8 @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805D2AE
@@ -4134,7 +4134,7 @@ sub_805D240: @ 805D240
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	ldrb r0, [r4, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
@@ -4503,7 +4503,7 @@ _0805D548:
 	adds r4, r0
 	lsls r4, 2
 	adds r4, r5
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_8063510
@@ -4734,7 +4734,7 @@ _0805D6EA:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
@@ -4827,7 +4827,7 @@ sub_805D7C0: @ 805D7C0
 	adds r4, r0
 	lsls r4, 2
 	adds r4, r5
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_8063500
@@ -4883,7 +4883,7 @@ sub_805D838: @ 805D838
 	adds r4, r0
 	lsls r4, 2
 	adds r4, r5
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_8063500
@@ -4978,7 +4978,7 @@ sub_805D8D8: @ 805D8D8
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_805F060
+	bl EventObjectSetGraphicsId
 	ldrb r1, [r4, 0x18]
 	lsrs r1, 4
 	adds r0, r4, 0
@@ -5131,7 +5131,7 @@ _0805DA2E:
 	bhi _0805DA60
 	movs r0, 0x8
 	strh r0, [r4, 0x24]
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
@@ -5280,7 +5280,7 @@ _0805DB58:
 	b _0805DBFA
 _0805DB5E:
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805DBFA
@@ -5608,7 +5608,7 @@ sub_805DDC8: @ 805DDC8
 	ble _0805DE20
 _0805DDE4:
 	adds r0, r5, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl FieldObjectCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805DE20

asm/field_poison.s

@@ -291,7 +291,7 @@ _080A0668:
 	cmp r7, 0
 	beq _080A067C
 _080A0678:
-	bl overworld_poison_effect
+	bl FldEffPoison_Start
 _080A067C:
 	cmp r6, 0
 	beq _080A0688

asm/field_special_scene.s

@@ -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.

asm/field_specials.s

@@ -413,7 +413,7 @@ sub_80CA8F8: @ 80CA8F8
 	movs r4, 0
 	movs r7, 0
 	movs r5, 0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r0, 0
@@ -510,7 +510,7 @@ sub_80CA9A8: @ 80CA9A8
 	movs r4, 0
 	movs r6, 0
 	movs r5, 0
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r0, 0
@@ -2631,7 +2631,7 @@ _080CB9D2:
 	lsrs r0, 24
 	strh r0, [r5, 0x22]
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	ldr r4, _080CBA70 @ =gUnknown_3005360
 	ldrh r0, [r5, 0xA]
 	strh r0, [r4, 0xC]
@@ -5152,7 +5152,7 @@ sub_80CCD84: @ 80CCD84
 	ldr r0, _080CCDC4 @ =0x00190018
 	cmp r1, r0
 	bne _080CCDC8
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2

asm/field_weather.s

@@ -2672,8 +2672,8 @@ _0807B054: .4byte gUnknown_2037F34
 _0807B058: .4byte 0x000006d3
 	thumb_func_end sub_807B048
 
-	thumb_func_start sub_807B05C
+	thumb_func_start SetWeatherScreenFadeOut
-sub_807B05C: @ 807B05C
+SetWeatherScreenFadeOut: @ 807B05C
 	ldr r0, _0807B068 @ =gUnknown_2037F34
 	ldr r1, _0807B06C @ =0x000006c6
 	adds r0, r1
@@ -2683,7 +2683,7 @@ sub_807B05C: @ 807B05C
 	.align 2, 0
 _0807B068: .4byte gUnknown_2037F34
 _0807B06C: .4byte 0x000006c6
-	thumb_func_end sub_807B05C
+	thumb_func_end SetWeatherScreenFadeOut
 
 	thumb_func_start sub_807B070
 sub_807B070: @ 807B070

asm/fldeff_cut.s

@@ -39,7 +39,7 @@ sub_8097898: @ 8097898
 	cmp r0, 0x1
 	beq _080978E0
 	movs r0, 0x5F
-	bl npc_before_player_of_type
+	bl CheckObjectGraphicsInFrontOfPlayer
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -74,7 +74,7 @@ _080978F8: .4byte FieldCallback_PrepareFadeInFromMenu
 _080978FC: .4byte gPostMenuFieldCallback
 _08097900: .4byte sub_8097984
 _08097904:
-	ldr r4, _0809797C @ =gUnknown_2039A04
+	ldr r4, _0809797C @ =gPlayerFacingPosition
 	adds r1, r4, 0x2
 	adds r0, r4, 0
 	bl PlayerGetDestCoords
@@ -136,7 +136,7 @@ _08097970:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0809797C: .4byte gUnknown_2039A04
+_0809797C: .4byte gPlayerFacingPosition
 _08097980: .4byte 0x0000ffff
 	thumb_func_end sub_8097898
 
@@ -253,7 +253,7 @@ sub_8097A48: @ 8097A48
 	movs r7, 0
 	movs r0, 0x79
 	bl PlaySE
-	ldr r4, _08097B38 @ =gUnknown_2039A04
+	ldr r4, _08097B38 @ =gPlayerFacingPosition
 	adds r1, r4, 0x2
 	adds r0, r4, 0
 	bl PlayerGetDestCoords
@@ -362,7 +362,7 @@ _08097AE2:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08097B38: .4byte gUnknown_2039A04
+_08097B38: .4byte gPlayerFacingPosition
 _08097B3C: .4byte 0x0000ffff
 _08097B40: .4byte gUnknown_2039870
 _08097B44: .4byte gSprites

asm/fldeff_poison.s

@@ -1,98 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start task50_overworld_poison_effect
-task50_overworld_poison_effect: @ 80A0DD8
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	ldr r1, _080A0DFC @ =gTasks+0x8
-	adds r1, r0, r1
-	movs r3, 0
-	ldrsh r0, [r1, r3]
-	cmp r0, 0x1
-	beq _080A0E16
-	cmp r0, 0x1
-	bgt _080A0E00
-	cmp r0, 0
-	beq _080A0E06
-	b _080A0E32
-	.align 2, 0
-_080A0DFC: .4byte gTasks+0x8
-_080A0E00:
-	cmp r0, 0x2
-	beq _080A0E2A
-	b _080A0E32
-_080A0E06:
-	ldrh r0, [r1, 0x2]
-	adds r0, 0x1
-	strh r0, [r1, 0x2]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	ble _080A0E32
-	b _080A0E22
-_080A0E16:
-	ldrh r0, [r1, 0x2]
-	subs r0, 0x1
-	strh r0, [r1, 0x2]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080A0E32
-_080A0E22:
-	ldrh r0, [r1]
-	adds r0, 0x1
-	strh r0, [r1]
-	b _080A0E32
-_080A0E2A:
-	adds r0, r2, 0
-	bl DestroyTask
-	b _080A0E42
-_080A0E32:
-	ldrb r1, [r1, 0x2]
-	lsls r0, r1, 4
-	orrs r0, r1
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0
-	bl Unused_AdjustBgMosaic
-_080A0E42:
-	pop {r0}
-	bx r0
-	thumb_func_end task50_overworld_poison_effect
-
-	thumb_func_start overworld_poison_effect
-overworld_poison_effect: @ 80A0E48
-	push {lr}
-	movs r0, 0x48
-	bl PlaySE
-	ldr r0, _080A0E5C @ =task50_overworld_poison_effect
-	movs r1, 0x50
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080A0E5C: .4byte task50_overworld_poison_effect
-	thumb_func_end overworld_poison_effect
-
-	thumb_func_start c3_80A0DD8_is_running
-c3_80A0DD8_is_running: @ 80A0E60
-	push {lr}
-	ldr r0, _080A0E70 @ =task50_overworld_poison_effect
-	bl FuncIsActiveTask
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080A0E70: .4byte task50_overworld_poison_effect
-	thumb_func_end c3_80A0DD8_is_running
-
-	.align 2, 0 @ Don't pad with nop.

asm/fldeff_strength.s

@@ -1,111 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80D07EC
-sub_80D07EC: @ 80D07EC
-	push {r4,lr}
-	movs r0, 0x8
-	bl TestPlayerAvatarFlags
-	lsls r0, 24
-	cmp r0, 0
-	bne _080D0808
-	movs r0, 0x61
-	bl npc_before_player_of_type
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _080D080C
-_080D0808:
-	movs r0, 0
-	b _080D0826
-_080D080C:
-	ldr r4, _080D082C @ =gSpecialVar_Result
-	bl GetCursorSelectionMonId
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4]
-	ldr r1, _080D0830 @ =gFieldCallback2
-	ldr r0, _080D0834 @ =FieldCallback_PrepareFadeInFromMenu
-	str r0, [r1]
-	ldr r1, _080D0838 @ =gPostMenuFieldCallback
-	ldr r0, _080D083C @ =sub_80D0840
-	str r0, [r1]
-	movs r0, 0x1
-_080D0826:
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080D082C: .4byte gSpecialVar_Result
-_080D0830: .4byte gFieldCallback2
-_080D0834: .4byte FieldCallback_PrepareFadeInFromMenu
-_080D0838: .4byte gPostMenuFieldCallback
-_080D083C: .4byte sub_80D0840
-	thumb_func_end sub_80D07EC
-
-	thumb_func_start sub_80D0840
-sub_80D0840: @ 80D0840
-	push {lr}
-	bl GetCursorSelectionMonId
-	ldr r1, _080D0858 @ =gFieldEffectArguments
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	ldr r0, _080D085C @ =gUnknown_81BE16E
-	bl ScriptContext1_SetupScript
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080D0858: .4byte gFieldEffectArguments
-_080D085C: .4byte gUnknown_81BE16E
-	thumb_func_end sub_80D0840
-
-	thumb_func_start sub_80D0860
-sub_80D0860: @ 80D0860
-	push {lr}
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080D0894 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, _080D0898 @ =sub_80D08A8
-	lsrs r0, r2, 16
-	strh r0, [r1, 0x18]
-	strh r2, [r1, 0x1A]
-	ldr r0, _080D089C @ =gFieldEffectArguments
-	ldr r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _080D08A0 @ =gPlayerParty
-	adds r0, r1
-	ldr r1, _080D08A4 @ =gStringVar1
-	bl GetMonNickname
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080D0894: .4byte gTasks
-_080D0898: .4byte sub_80D08A8
-_080D089C: .4byte gFieldEffectArguments
-_080D08A0: .4byte gPlayerParty
-_080D08A4: .4byte gStringVar1
-	thumb_func_end sub_80D0860
-
-	thumb_func_start sub_80D08A8
-sub_80D08A8: @ 80D08A8
-	push {lr}
-	movs r0, 0x28
-	bl FieldEffectActiveListRemove
-	bl EnableBothScriptContexts
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80D08A8
-
-	.align 2, 0 @ Don't pad with nop.

asm/fldeff_sweetscent.s

@@ -1,262 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80DE0B4
-sub_80DE0B4: @ 80DE0B4
-	push {lr}
-	ldr r1, _080DE0C4 @ =gUnknown_203B0A0
-	movs r0, 0
-	strb r0, [r1, 0x9]
-	bl hm2_sweet_scent
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DE0C4: .4byte gUnknown_203B0A0
-	thumb_func_end sub_80DE0B4
-
-	thumb_func_start sub_80DE0C8
-sub_80DE0C8: @ 80DE0C8
-	ldr r1, _080DE0D8 @ =gFieldCallback2
-	ldr r0, _080DE0DC @ =FieldCallback_PrepareFadeInFromMenu
-	str r0, [r1]
-	ldr r1, _080DE0E0 @ =gPostMenuFieldCallback
-	ldr r0, _080DE0E4 @ =hm2_sweet_scent
-	str r0, [r1]
-	movs r0, 0x1
-	bx lr
-	.align 2, 0
-_080DE0D8: .4byte gFieldCallback2
-_080DE0DC: .4byte FieldCallback_PrepareFadeInFromMenu
-_080DE0E0: .4byte gPostMenuFieldCallback
-_080DE0E4: .4byte hm2_sweet_scent
-	thumb_func_end sub_80DE0C8
-
-	thumb_func_start hm2_sweet_scent
-hm2_sweet_scent: @ 80DE0E8
-	push {lr}
-	movs r0, 0x33
-	bl FieldEffectStart
-	bl GetCursorSelectionMonId
-	ldr r1, _080DE100 @ =gFieldEffectArguments
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DE100: .4byte gFieldEffectArguments
-	thumb_func_end hm2_sweet_scent
-
-	thumb_func_start FldEff_SweetScent
-FldEff_SweetScent: @ 80DE104
-	push {lr}
-	bl sub_807B05C
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080DE12C @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, _080DE130 @ =sub_80DE134
-	lsrs r0, r2, 16
-	strh r0, [r1, 0x18]
-	strh r2, [r1, 0x1A]
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080DE12C: .4byte gTasks
-_080DE130: .4byte sub_80DE134
-	thumb_func_end FldEff_SweetScent
-
-	thumb_func_start sub_80DE134
-sub_80DE134: @ 80DE134
-	push {r4,r5,lr}
-	sub sp, 0x4
-	movs r0, 0xE5
-	bl PlaySE
-	ldr r4, _080DE1B8 @ =gUnknown_203AAB0
-	movs r0, 0x80
-	lsls r0, 3
-	bl Alloc
-	adds r1, r0, 0
-	str r1, [r4]
-	ldr r4, _080DE1BC @ =gPlttBufferUnfaded
-	movs r5, 0x80
-	lsls r5, 1
-	adds r0, r4, 0
-	adds r2, r5, 0
-	bl CpuFastSet
-	ldr r0, _080DE1C0 @ =gPlttBufferFaded
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl CpuFastSet
-	bl GetPlayerAvatarObjectId
-	ldr r2, _080DE1C4 @ =gSprites
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r1, [r1, 0x5]
-	lsrs r1, 4
-	adds r1, 0x10
-	movs r0, 0x1
-	lsls r0, r1
-	mvns r0, r0
-	movs r1, 0x1F
-	str r1, [sp]
-	movs r1, 0x4
-	movs r2, 0
-	movs r3, 0x8
-	bl BeginNormalPaletteFade
-	ldr r0, _080DE1C8 @ =sub_80DE1D0
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080DE1CC @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0x8]
-	movs r0, 0x33
-	bl FieldEffectActiveListRemove
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DE1B8: .4byte gUnknown_203AAB0
-_080DE1BC: .4byte gPlttBufferUnfaded
-_080DE1C0: .4byte gPlttBufferFaded
-_080DE1C4: .4byte gSprites
-_080DE1C8: .4byte sub_80DE1D0
-_080DE1CC: .4byte gTasks
-	thumb_func_end sub_80DE134
-
-	thumb_func_start sub_80DE1D0
-sub_80DE1D0: @ 80DE1D0
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r5, r0, 3
-	ldr r6, _080DE21C @ =gTasks+0x8
-	adds r2, r5, r6
-	ldr r0, _080DE220 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _080DE26C
-	ldrh r3, [r2]
-	movs r7, 0
-	ldrsh r0, [r2, r7]
-	cmp r0, 0x40
-	bne _080DE268
-	strh r1, [r2]
-	bl sub_8082EC0
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080DE228
-	ldr r0, _080DE224 @ =gUnknown_203AAB0
-	ldr r0, [r0]
-	bl Free
-	adds r0, r4, 0
-	bl DestroyTask
-	b _080DE26C
-	.align 2, 0
-_080DE21C: .4byte gTasks+0x8
-_080DE220: .4byte gPaletteFade
-_080DE224: .4byte gUnknown_203AAB0
-_080DE228:
-	adds r0, r6, 0
-	subs r0, 0x8
-	adds r0, r5, r0
-	ldr r1, _080DE260 @ =sub_80DE274
-	str r1, [r0]
-	bl GetPlayerAvatarObjectId
-	ldr r2, _080DE264 @ =gSprites
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r1, [r1, 0x5]
-	lsrs r1, 4
-	adds r1, 0x10
-	movs r0, 0x1
-	lsls r0, r1
-	mvns r0, r0
-	movs r1, 0x1F
-	str r1, [sp]
-	movs r1, 0x4
-	movs r2, 0x8
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	b _080DE26C
-	.align 2, 0
-_080DE260: .4byte sub_80DE274
-_080DE264: .4byte gSprites
-_080DE268:
-	adds r0, r3, 0x1
-	strh r0, [r2]
-_080DE26C:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DE1D0
-
-	thumb_func_start sub_80DE274
-sub_80DE274: @ 80DE274
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _080DE2B0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080DE2AA
-	ldr r4, _080DE2B4 @ =gUnknown_203AAB0
-	ldr r0, [r4]
-	ldr r1, _080DE2B8 @ =gPlttBufferUnfaded
-	movs r2, 0x80
-	lsls r2, 1
-	bl CpuFastSet
-	bl sub_807B070
-	ldr r0, [r4]
-	bl Free
-	ldr r0, _080DE2BC @ =gUnknown_81BE564
-	bl ScriptContext1_SetupScript
-	adds r0, r5, 0
-	bl DestroyTask
-_080DE2AA:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DE2B0: .4byte gPaletteFade
-_080DE2B4: .4byte gUnknown_203AAB0
-_080DE2B8: .4byte gPlttBufferUnfaded
-_080DE2BC: .4byte gUnknown_81BE564
-	thumb_func_end sub_80DE274
-
-	.align 2, 0 @ Don't pad with nop.

asm/hall_of_fame.s

@@ -2322,7 +2322,7 @@ _080F3082:
 	bl Free
 	str r4, [r5]
 _080F3090:
-	bl sub_80CA5A0
+	bl ReturnFromHallOfFamePC
 _080F3094:
 	pop {r4,r5}
 	pop {r0}
@@ -3073,16 +3073,16 @@ 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
 	movs r0, 0x8
 	strb r0, [r1]
 	ldr r0, _080F36F0 @ =gUnknown_840C248
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _080F36F4 @ =gUnknown_840C258
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -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

asm/hof_pc.s

@@ -1,118 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80CA53C
-sub_80CA53C: @ 80CA53C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _080CA56C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080CA564
-	bl FreeAllWindowBuffers
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	adds r0, r4, 0
-	bl DestroyTask
-	ldr r0, _080CA570 @ =sub_80F2978
-	bl SetMainCallback2
-_080CA564:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080CA56C: .4byte gPaletteFade
-_080CA570: .4byte sub_80F2978
-	thumb_func_end sub_80CA53C
-
-	thumb_func_start sub_80CA574
-sub_80CA574: @ 80CA574
-	push {lr}
-	sub sp, 0x4
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	bl ScriptContext2_Enable
-	ldr r0, _080CA59C @ =sub_80CA53C
-	movs r1, 0
-	bl CreateTask
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080CA59C: .4byte sub_80CA53C
-	thumb_func_end sub_80CA574
-
-	thumb_func_start sub_80CA5A0
-sub_80CA5A0: @ 80CA5A0
-	push {lr}
-	ldr r0, _080CA5B4 @ =CB2_ReturnToField
-	bl SetMainCallback2
-	ldr r1, _080CA5B8 @ =gFieldCallback
-	ldr r0, _080CA5BC @ =sub_80CA5C0
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080CA5B4: .4byte CB2_ReturnToField
-_080CA5B8: .4byte gFieldCallback
-_080CA5BC: .4byte sub_80CA5C0
-	thumb_func_end sub_80CA5A0
-
-	thumb_func_start sub_80CA5C0
-sub_80CA5C0: @ 80CA5C0
-	push {lr}
-	sub sp, 0x4
-	bl ScriptContext2_Enable
-	bl sub_8055DC4
-	bl sp109_CreatePCMenu
-	bl sub_809D254
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r0, _080CA5F4 @ =sub_80CA5F8
-	movs r1, 0xA
-	bl CreateTask
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080CA5F4: .4byte sub_80CA5F8
-	thumb_func_end sub_80CA5C0
-
-	thumb_func_start sub_80CA5F8
-sub_80CA5F8: @ 80CA5F8
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, _080CA614 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080CA610
-	adds r0, r2, 0
-	bl DestroyTask
-_080CA610:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080CA614: .4byte gPaletteFade
-	thumb_func_end sub_80CA5F8
-
-	.align 2, 0 @ Don't pad with nop.

asm/intro.s

@@ -305,7 +305,7 @@ c2_copyright_1: @ 80EC820
 	lsls r0, 24
 	cmp r0, 0
 	bne _080EC858
-	bl sub_8054A28
+	bl ResetMenuAndMonGlobals
 	bl Save_ResetSaveCounters
 	movs r0, 0
 	bl Save_LoadGameData
@@ -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 DecompressAndCopyTileDataToVram
-	bl sub_80F6C14
+	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 DecompressAndCopyTileDataToVram
-	bl sub_80F6C14
+	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
@@ -2759,7 +2759,7 @@ sub_80EDC40: @ 80EDC40
 	ldr r4, _080EDCE4 @ =gUnknown_840BBC0
 _080EDC46:
 	adds r0, r4, 0
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	adds r4, 0x8
 	adds r5, 0x1
 	cmp r5, 0x4
@@ -4823,7 +4823,7 @@ sub_80EEBE4: @ 80EEBE4
 	ldr r4, _080EEC04 @ =gUnknown_840BEDC
 _080EEBEA:
 	adds r0, r4, 0
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	adds r4, 0x8
 	adds r5, 0x1
 	cmp r5, 0x6

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
@@ -676,20 +676,20 @@ _0810832C: .4byte gSaveBlock2Ptr
 _08108330: .4byte gUnknown_83D41E4
 _08108334:
 	ldr r0, _0810833C @ =gUnknown_83D41EC
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	b _08108352
 	.align 2, 0
 _0810833C: .4byte gUnknown_83D41EC
 _08108340:
 	ldr r0, _08108348 @ =gUnknown_83D41F4
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	b _08108352
 	.align 2, 0
 _08108348: .4byte gUnknown_83D41F4
 _0810834C:
 	ldr r0, _08108360 @ =gBagSwapSpriteSheet
 _0810834E:
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 _08108352:
 	ldr r0, _08108364 @ =gUnknown_203AD10
 	ldr r1, [r0]
@@ -702,7 +702,7 @@ _08108360: .4byte gBagSwapSpriteSheet
 _08108364: .4byte gUnknown_203AD10
 _08108368:
 	ldr r0, _08108378 @ =gBagSwapSpritePalette
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	ldr r1, [r4]
 	movs r0, 0
 	strb r0, [r1, 0x10]
@@ -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_

asm/itemfinder.s

@@ -1091,7 +1091,7 @@ _0813F470:
 	.4byte _0813F50C
 	.4byte _0813F52C
 _0813F484:
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2

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

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

asm/link_rfu.s

@@ -9465,7 +9465,7 @@ sub_8101A90: @ 8101A90
 	ldr r4, _08101AC0 @ =gUnknown_843F938
 _08101AA2:
 	adds r0, r4, 0
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	adds r4, 0x8
 	adds r5, 0x1
 	cmp r5, 0x3

asm/link_rfu_2.s

@@ -9525,7 +9525,7 @@ sub_80FCEA8: @ 80FCEA8
 	cmp r0, r1
 	bne _080FCEC0
 	adds r0, r4, 0
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 _080FCEC0:
 	ldr r0, _080FCEDC @ =gUnknown_843F27C
 	bl LoadSpritePalette

asm/link_rfu_3.s

@@ -8491,7 +8491,7 @@ sub_811A0B4: @ 811A0B4
 	bl StringExpandPlaceholders
 	movs r0, 0
 	movs r1, 0x1
-	bl sub_80F6E54
+	bl AddTextPrinterWithCustomSpeedForMessage
 	movs r0, 0
 	pop {r4}
 	pop {r1}
@@ -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
@@ -8536,7 +8536,7 @@ _0811A10A:
 	adds r1, r5, 0
 	bl StringExpandPlaceholders
 	movs r0, 0x1
-	bl sub_80F6E08
+	bl AddTextPrinterForMessage
 	ldrb r0, [r4]
 	adds r0, 0x1
 	strb r0, [r4]
@@ -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
@@ -8578,7 +8578,7 @@ _0811A15E:
 	negs r0, r0
 	b _0811A1A4
 _0811A168:
-	bl sub_80F7858
+	bl DisplayYesNoMenuDefaultYes
 	ldrb r0, [r4]
 	adds r0, 0x1
 	strb r0, [r4]
@@ -11381,13 +11381,13 @@ sub_811B66C: @ 811B66C
 	ldr r1, _0811B6C0 @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6D0
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B6C4
@@ -11440,7 +11440,7 @@ sub_811B6E8: @ 811B6E8
 	ldr r1, _0811B72C @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0811B730
@@ -12496,7 +12496,7 @@ sub_811BF00: @ 811BF00
 	b _0811BFEE
 _0811BF1C:
 	ldr r4, _0811BF44 @ =gUnknown_8457116
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, r4
@@ -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
@@ -12967,7 +12967,7 @@ _0811C300:
 	movs r1, 0x1
 	movs r2, 0xD0
 	bl TextWindow_SetStdFrame0_WithPal
-	bl sub_80F77B8
+	bl Menu_LoadStdPal
 	ldr r0, _0811C35C @ =sub_811C1B4
 	bl SetVBlankCallback
 	ldr r1, _0811C360 @ =gMain

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

asm/mail_data.s

@@ -1,626 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start ClearMailData
-ClearMailData: @ 8097C84
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, _08097CAC @ =gSaveBlock1Ptr
-_08097C8A:
-	lsls r1, r4, 3
-	adds r1, r4
-	lsls r1, 2
-	ldr r0, _08097CB0 @ =0x00002cd0
-	adds r1, r0
-	ldr r0, [r5]
-	adds r0, r1
-	bl ClearMailStruct
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _08097C8A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097CAC: .4byte gSaveBlock1Ptr
-_08097CB0: .4byte 0x00002cd0
-	thumb_func_end ClearMailData
-
-	thumb_func_start ClearMailStruct
-ClearMailStruct: @ 8097CB4
-	push {r4-r6,lr}
-	adds r3, r0, 0
-	ldr r0, _08097D04 @ =0x0000ffff
-	adds r4, r0, 0
-	adds r1, r3, 0
-	movs r2, 0x8
-_08097CC0:
-	ldrh r0, [r1]
-	orrs r0, r4
-	strh r0, [r1]
-	adds r1, 0x2
-	subs r2, 0x1
-	cmp r2, 0
-	bge _08097CC0
-	movs r2, 0
-	adds r6, r3, 0
-	adds r6, 0x1A
-	adds r4, r3, 0
-	adds r4, 0x12
-	movs r5, 0xFF
-_08097CDA:
-	adds r1, r4, r2
-	ldrb r0, [r1]
-	orrs r0, r5
-	strb r0, [r1]
-	adds r2, 0x1
-	cmp r2, 0x7
-	ble _08097CDA
-	adds r1, r6, 0
-	movs r2, 0
-	adds r0, r1, 0x3
-_08097CEE:
-	strb r2, [r0]
-	subs r0, 0x1
-	cmp r0, r1
-	bge _08097CEE
-	movs r1, 0
-	movs r0, 0x1
-	strh r0, [r3, 0x1E]
-	strh r1, [r3, 0x20]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097D04: .4byte 0x0000ffff
-	thumb_func_end ClearMailStruct
-
-	thumb_func_start MonHasMail
-MonHasMail: @ 8097D08
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0xC
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	bl ItemIsMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _08097D30
-	adds r0, r4, 0
-	movs r1, 0x40
-	bl GetMonData
-	cmp r0, 0xFF
-	beq _08097D30
-	movs r0, 0x1
-	b _08097D32
-_08097D30:
-	movs r0, 0
-_08097D32:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end MonHasMail
-
-	thumb_func_start sub_8097D38
-sub_8097D38: @ 8097D38
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	mov r8, r0
-	lsls r1, 16
-	lsrs r0, r1, 16
-	str r0, [sp, 0x8]
-	mov r0, sp
-	movs r2, 0
-	ldrb r3, [r0, 0x8]
-	strb r3, [r0]
-	lsrs r1, 24
-	strb r1, [r0, 0x1]
-	add r4, sp, 0x4
-	strb r2, [r4]
-	mov r12, r4
-	mov r9, r4
-	adds r5, r4, 0
-_08097D62:
-	ldr r2, _08097EC0 @ =gSaveBlock1Ptr
-	ldr r0, [r2]
-	ldrb r3, [r5]
-	lsls r1, r3, 3
-	adds r1, r3
-	lsls r1, 2
-	adds r0, r1
-	ldr r1, _08097EC4 @ =0x00002cf0
-	adds r0, r1
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _08097D7C
-	b _08097EE0
-_08097D7C:
-	movs r4, 0
-	ldr r3, _08097EC8 @ =gSaveBlock2Ptr
-	mov r10, r3
-	adds r7, r2, 0
-	mov r5, r12
-	ldr r0, _08097ECC @ =0x0000ffff
-	adds r6, r0, 0
-_08097D8A:
-	ldr r2, [r7]
-	lsls r3, r4, 1
-	ldrb r1, [r5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0
-	ldr r1, _08097ED0 @ =0x00002cd0
-	adds r2, r1
-	adds r2, r3
-	ldrh r0, [r2]
-	orrs r0, r6
-	strh r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x8
-	bls _08097D8A
-	movs r4, 0
-	mov r2, r10
-	ldr r0, [r2]
-	ldrb r0, [r0]
-	cmp r0, 0xFF
-	beq _08097DEE
-	ldr r3, _08097EC8 @ =gSaveBlock2Ptr
-_08097DBC:
-	ldr r0, _08097EC0 @ =gSaveBlock1Ptr
-	ldr r2, [r0]
-	mov r0, r12
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	ldr r1, _08097ED4 @ =0x00002ce2
-	adds r2, r1
-	adds r2, r0
-	ldr r0, [r3]
-	adds r0, r4
-	ldrb r0, [r0]
-	strb r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x6
-	bhi _08097DEE
-	ldr r0, [r3]
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0xFF
-	bne _08097DBC
-_08097DEE:
-	cmp r4, 0x5
-	bhi _08097E16
-	ldr r7, _08097EC0 @ =gSaveBlock1Ptr
-	mov r3, r12
-	ldr r6, _08097ED4 @ =0x00002ce2
-	movs r5, 0
-_08097DFA:
-	ldr r2, [r7]
-	ldrb r1, [r3]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	adds r2, r6
-	adds r2, r0
-	strb r5, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x5
-	bls _08097DFA
-_08097E16:
-	ldr r3, _08097EC0 @ =gSaveBlock1Ptr
-	ldr r2, [r3]
-	mov r0, r12
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	ldr r1, _08097ED4 @ =0x00002ce2
-	adds r2, r1
-	adds r2, r0
-	movs r0, 0xFF
-	strb r0, [r2]
-	movs r4, 0
-	adds r5, r3, 0
-	mov r3, r12
-_08097E36:
-	ldr r2, [r5]
-	ldrb r1, [r3]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	ldr r1, _08097ED8 @ =0x00002cea
-	adds r2, r1
-	adds r2, r0
-	mov r1, r10
-	ldr r0, [r1]
-	adds r0, 0xA
-	adds r0, r4
-	ldrb r0, [r0]
-	strb r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x3
-	bls _08097E36
-	mov r0, r8
-	movs r1, 0xB
-	bl GetBoxMonData
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	mov r0, r8
-	movs r1, 0
-	bl GetBoxMonData
-	adds r1, r0, 0
-	adds r0, r4, 0
-	bl SpeciesToMailSpecies
-	ldr r1, _08097EC0 @ =gSaveBlock1Ptr
-	ldr r3, [r1]
-	mov r4, r9
-	ldrb r2, [r4]
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r3, r1
-	ldr r2, _08097EDC @ =0x00002cee
-	adds r1, r2
-	strh r0, [r1]
-	ldrb r1, [r4]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0
-	ldr r4, _08097EC4 @ =0x00002cf0
-	adds r3, r4
-	mov r0, sp
-	ldrh r0, [r0, 0x8]
-	strh r0, [r3]
-	mov r0, r8
-	movs r1, 0x40
-	mov r2, r9
-	bl SetMonData
-	mov r0, r8
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	mov r1, r9
-	ldrb r0, [r1]
-	b _08097EEE
-	.align 2, 0
-_08097EC0: .4byte gSaveBlock1Ptr
-_08097EC4: .4byte 0x00002cf0
-_08097EC8: .4byte gSaveBlock2Ptr
-_08097ECC: .4byte 0x0000ffff
-_08097ED0: .4byte 0x00002cd0
-_08097ED4: .4byte 0x00002ce2
-_08097ED8: .4byte 0x00002cea
-_08097EDC: .4byte 0x00002cee
-_08097EE0:
-	adds r0, r3, 0x1
-	strb r0, [r4]
-	ldrb r0, [r5]
-	cmp r0, 0x5
-	bhi _08097EEC
-	b _08097D62
-_08097EEC:
-	movs r0, 0xFF
-_08097EEE:
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8097D38
-
-	thumb_func_start SpeciesToMailSpecies
-SpeciesToMailSpecies: @ 8097F00
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xC9
-	bne _08097F18
-	adds r0, r1, 0
-	bl mon_icon_personality_to_unown_id
-	lsls r0, 16
-	ldr r1, _08097F1C @ =0x75300000
-	adds r0, r1
-	lsrs r0, 16
-_08097F18:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08097F1C: .4byte 0x75300000
-	thumb_func_end SpeciesToMailSpecies
-
-	thumb_func_start MailSpeciesToSpecies
-MailSpeciesToSpecies: @ 8097F20
-	push {lr}
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldr r0, _08097F38 @ =0xffff8ad0
-	adds r2, r3, r0
-	lsls r0, r2, 16
-	lsrs r0, 16
-	cmp r0, 0x1B
-	bhi _08097F3C
-	movs r0, 0xC9
-	strh r2, [r1]
-	b _08097F3E
-	.align 2, 0
-_08097F38: .4byte 0xffff8ad0
-_08097F3C:
-	adds r0, r3, 0
-_08097F3E:
-	pop {r1}
-	bx r1
-	thumb_func_end MailSpeciesToSpecies
-
-	thumb_func_start GiveMailToMon2
-GiveMailToMon2: @ 8097F44
-	push {r4-r7,lr}
-	sub sp, 0x8
-	adds r6, r0, 0
-	adds r7, r1, 0
-	ldrh r5, [r7, 0x20]
-	adds r1, r5, 0
-	bl sub_8097D38
-	add r4, sp, 0x4
-	strb r0, [r4]
-	ldrb r2, [r4]
-	cmp r2, 0xFF
-	beq _08097FA8
-	ldr r0, _08097FA0 @ =gSaveBlock1Ptr
-	ldr r1, [r0]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, _08097FA4 @ =0x00002cd0
-	adds r1, r0
-	adds r0, r7, 0
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	adds r0, r6, 0
-	movs r1, 0x40
-	adds r2, r4, 0
-	bl SetMonData
-	mov r0, sp
-	strb r5, [r0]
-	mov r1, sp
-	lsrs r0, r5, 8
-	strb r0, [r1, 0x1]
-	adds r0, r6, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	ldrb r0, [r4]
-	b _08097FAA
-	.align 2, 0
-_08097FA0: .4byte gSaveBlock1Ptr
-_08097FA4: .4byte 0x00002cd0
-_08097FA8:
-	movs r0, 0xFF
-_08097FAA:
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end GiveMailToMon2
-
-	thumb_func_start sub_8097FB4
-sub_8097FB4: @ 8097FB4
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_8097FB4
-
-	thumb_func_start TakeMailFromMon
-TakeMailFromMon: @ 8097FB8
-	push {r4,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	bl MonHasMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _08098008
-	adds r0, r4, 0
-	movs r1, 0x40
-	bl GetMonData
-	add r2, sp, 0x4
-	strb r0, [r2]
-	ldr r0, _08098010 @ =gSaveBlock1Ptr
-	ldr r3, [r0]
-	ldrb r1, [r2]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0
-	ldr r0, _08098014 @ =0x00002cf0
-	adds r3, r0
-	movs r1, 0
-	movs r0, 0
-	strh r0, [r3]
-	movs r0, 0xFF
-	strb r0, [r2]
-	mov r0, sp
-	strb r1, [r0]
-	strb r1, [r0, 0x1]
-	adds r0, r4, 0
-	movs r1, 0x40
-	bl SetMonData
-	adds r0, r4, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-_08098008:
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08098010: .4byte gSaveBlock1Ptr
-_08098014: .4byte 0x00002cf0
-	thumb_func_end TakeMailFromMon
-
-	thumb_func_start sub_8098018
-sub_8098018: @ 8098018
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08098034 @ =gSaveBlock1Ptr
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r2, r1
-	ldr r0, _08098038 @ =0x00002cf0
-	adds r2, r0
-	movs r0, 0
-	strh r0, [r2]
-	bx lr
-	.align 2, 0
-_08098034: .4byte gSaveBlock1Ptr
-_08098038: .4byte 0x00002cf0
-	thumb_func_end sub_8098018
-
-	thumb_func_start sub_809803C
-sub_809803C: @ 809803C
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0xC
-	adds r5, r0, 0
-	mov r0, sp
-	movs r1, 0
-	strb r1, [r0]
-	strb r1, [r0, 0x1]
-	add r1, sp, 0x4
-	movs r0, 0xFF
-	strb r0, [r1]
-	movs r7, 0x6
-	mov r9, r1
-	ldr r0, _080980D0 @ =gSaveBlock1Ptr
-	mov r8, r0
-	ldr r3, _080980D4 @ =0x00002cd0
-_08098060:
-	mov r1, r8
-	ldr r0, [r1]
-	lsls r1, r7, 3
-	adds r1, r7
-	lsls r1, 2
-	adds r4, r0, r1
-	ldr r2, _080980D8 @ =0x00002cf0
-	adds r0, r4, r2
-	ldrh r6, [r0]
-	cmp r6, 0
-	bne _080980DC
-	adds r4, r3
-	adds r0, r5, 0
-	movs r1, 0x40
-	str r3, [sp, 0x8]
-	bl GetMonData
-	mov r1, r8
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldr r3, [sp, 0x8]
-	adds r1, r3
-	ldm r1!, {r0,r2,r3}
-	stm r4!, {r0,r2,r3}
-	ldm r1!, {r0,r2,r3}
-	stm r4!, {r0,r2,r3}
-	ldm r1!, {r0,r2,r3}
-	stm r4!, {r0,r2,r3}
-	adds r0, r5, 0
-	movs r1, 0x40
-	bl GetMonData
-	mov r1, r8
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r2, r1
-	ldr r3, _080980D8 @ =0x00002cf0
-	adds r2, r3
-	strh r6, [r2]
-	adds r0, r5, 0
-	movs r1, 0x40
-	mov r2, r9
-	bl SetMonData
-	adds r0, r5, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	adds r0, r7, 0
-	b _080980E8
-	.align 2, 0
-_080980D0: .4byte gSaveBlock1Ptr
-_080980D4: .4byte 0x00002cd0
-_080980D8: .4byte 0x00002cf0
-_080980DC:
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0xF
-	bls _08098060
-	movs r0, 0xFF
-_080980E8:
-	add sp, 0xC
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809803C
-
-	thumb_func_start ItemIsMail
-ItemIsMail: @ 80980F8
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x84
-	bgt _0809810A
-	cmp r0, 0x79
-	blt _0809810A
-	movs r0, 0x1
-	b _0809810C
-_0809810A:
-	movs r0, 0
-_0809810C:
-	pop {r1}
-	bx r1
-	thumb_func_end ItemIsMail
-
-	.align 2, 0 @ Don't pad with nop.

asm/mailbox_pc.s

@@ -60,7 +60,7 @@ sub_810EBAC: @ 810EBAC
 	strb r0, [r4]
 	ldrb r0, [r4]
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 _0810EBD0:
 	ldrb r0, [r4]
 	pop {r4}

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}
@@ -440,7 +440,7 @@ _080F8448:
 	lsls r0, 24
 	cmp r0, 0
 	beq _080F853C
-	bl sub_8055DC4
+	bl Overworld_PlaySpecialMapMusic
 	b _080F84EA
 _080F8458:
 	ldrh r0, [r4, 0x2]

asm/menu_indicators.s

@@ -180,7 +180,7 @@ AddScrollIndicatorArrowPair: @ 8133A20
 	orrs r0, r1
 	str r0, [sp, 0x8]
 	add r0, sp, 0x4
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldrh r2, [r6, 0xC]
 	cmp r2, r4
 	bne _08133A7C
@@ -727,7 +727,7 @@ ListMenuAddRedOutlineCursorObject: @ 8133E38
 	ands r1, r3
 	orrs r1, r2
 	str r1, [r0, 0x4]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldrh r2, [r6, 0x8]
 	ldr r7, _08133E8C @ =0x0000ffff
 	cmp r2, r7
@@ -1005,7 +1005,7 @@ ListMenuAddRedArrowCursorObject: @ 8134070
 	ands r1, r4
 	orrs r1, r2
 	str r1, [r0, 0x4]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldrh r2, [r5, 0x8]
 	cmp r2, r4
 	bne _081340C4

asm/multiboot.s

@@ -1,924 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start MultiBootInit
-MultiBootInit: @ 800BC20
-	adds r2, r0, 0
-	movs r1, 0
-	strb r1, [r2, 0x1E]
-	strb r1, [r2, 0x18]
-	strb r1, [r2, 0x1D]
-	adds r3, r2, 0
-	adds r3, 0x4A
-	movs r0, 0xF
-	strb r0, [r3]
-	adds r0, r2, 0
-	adds r0, 0x48
-	strb r1, [r0]
-	strh r1, [r2, 0x16]
-	ldr r0, _0800BC4C @ =0x04000134
-	strh r1, [r0]
-	ldr r2, _0800BC50 @ =0x04000128
-	ldr r3, _0800BC54 @ =0x00002003
-	adds r0, r3, 0
-	strh r0, [r2]
-	ldr r0, _0800BC58 @ =0x0400012a
-	strh r1, [r0]
-	bx lr
-	.align 2, 0
-_0800BC4C: .4byte 0x04000134
-_0800BC50: .4byte 0x04000128
-_0800BC54: .4byte 0x00002003
-_0800BC58: .4byte 0x0400012a
-	thumb_func_end MultiBootInit
-
-	thumb_func_start MultiBootMain
-MultiBootMain: @ 800BC5C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	adds r7, r0, 0
-	bl MultiBootCheckComplete
-	cmp r0, 0
-	beq _0800BC72
-	b _0800C03A
-_0800BC72:
-	adds r0, r7, 0
-	adds r0, 0x4A
-	ldrb r1, [r0]
-	mov r10, r0
-	cmp r1, 0xF
-	bls _0800BC86
-	subs r0, r1, 0x1
-	mov r1, r10
-	strb r0, [r1]
-	b _0800C03A
-_0800BC86:
-	adds r1, r7, 0
-	adds r1, 0x48
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _0800BCB0
-	movs r0, 0
-	strb r0, [r1]
-	ldr r0, _0800BCAC @ =0x04000128
-	ldrh r0, [r0]
-	movs r5, 0xFC
-	ands r5, r0
-	cmp r5, 0x8
-	beq _0800BCB0
-	adds r0, r7, 0
-	bl MultiBootInit
-	movs r0, 0x8
-	eors r0, r5
-	b _0800C03C
-	.align 2, 0
-_0800BCAC: .4byte 0x04000128
-_0800BCB0:
-	ldrb r0, [r7, 0x18]
-	cmp r0, 0xDF
-	bls _0800BD02
-	adds r0, r7, 0
-	bl MultiBootHandShake
-	adds r5, r0, 0
-	cmp r5, 0
-	beq _0800BCC4
-	b _0800C03C
-_0800BCC4:
-	adds r0, r7, 0
-	adds r0, 0x4B
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _0800BCE0
-	ldrb r0, [r7, 0x18]
-	cmp r0, 0xE1
-	bls _0800BCE0
-	adds r0, r7, 0
-	bl MultiBootCheckComplete
-	cmp r0, 0
-	bne _0800BCE0
-	b _0800C02A
-_0800BCE0:
-	adds r0, r7, 0
-	bl MultiBootCheckComplete
-	cmp r0, 0
-	beq _0800BCEC
-	b _0800C03A
-_0800BCEC:
-	ldrh r0, [r7, 0x16]
-	cmp r0, 0
-	bne _0800BCFC
-	adds r0, r7, 0
-	bl MultiBootInit
-	movs r0, 0x71
-	b _0800C03C
-_0800BCFC:
-	subs r0, 0x1
-	strh r0, [r7, 0x16]
-	b _0800C03A
-_0800BD02:
-	ldrb r0, [r7, 0x18]
-	cmp r0, 0x2
-	bne _0800BD0A
-	b _0800BE40
-_0800BD0A:
-	cmp r0, 0x2
-	bgt _0800BD18
-	cmp r0, 0
-	beq _0800BD26
-	cmp r0, 0x1
-	beq _0800BDE2
-	b _0800BF78
-_0800BD18:
-	cmp r0, 0xD0
-	bne _0800BD1E
-	b _0800BE8C
-_0800BD1E:
-	cmp r0, 0xD1
-	bne _0800BD24
-	b _0800BF26
-_0800BD24:
-	b _0800BF78
-_0800BD26:
-	movs r3, 0xE
-	movs r5, 0x3
-	ldr r0, _0800BD6C @ =0x04000120
-	ldrh r0, [r0, 0x6]
-	adds r1, r0, 0
-	ldr r0, _0800BD70 @ =0x0000ffff
-	ldrb r2, [r7, 0x1E]
-	adds r6, r2, 0
-	cmp r1, r0
-	bne _0800BD4E
-	adds r4, r1, 0
-	ldr r1, _0800BD74 @ =0x04000126
-_0800BD3E:
-	asrs r3, 1
-	subs r1, 0x2
-	subs r5, 0x1
-	cmp r5, 0
-	beq _0800BD4E
-	ldrh r0, [r1]
-	cmp r0, r4
-	beq _0800BD3E
-_0800BD4E:
-	movs r0, 0xE
-	ands r3, r0
-	strb r3, [r7, 0x1D]
-	movs r5, 0x3
-	ldr r0, _0800BD6C @ =0x04000120
-	ldrh r0, [r0, 0x6]
-	adds r4, r0, 0
-	asrs r0, r2, 3
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0800BD7C
-	ldr r0, _0800BD78 @ =0x00007208
-	b _0800BDA2
-	.align 2, 0
-_0800BD6C: .4byte 0x04000120
-_0800BD70: .4byte 0x0000ffff
-_0800BD74: .4byte 0x04000126
-_0800BD78: .4byte 0x00007208
-_0800BD7C:
-	subs r5, 0x1
-	cmp r5, 0
-	beq _0800BDA8
-	lsls r0, r5, 1
-	ldr r1, _0800BDD0 @ =0x04000120
-	adds r0, r1
-	ldrh r0, [r0]
-	adds r4, r0, 0
-	adds r0, r2, 0
-	asrs r0, r5
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0800BD7C
-	adds r0, r1, 0
-	lsls r0, r5
-	movs r1, 0xE4
-	lsls r1, 7
-	orrs r0, r1
-_0800BDA2:
-	cmp r4, r0
-	beq _0800BD7C
-	movs r3, 0
-_0800BDA8:
-	adds r0, r3, 0
-	ands r0, r6
-	strb r0, [r7, 0x1E]
-	cmp r3, 0
-	bne _0800BDB8
-	movs r0, 0xF
-	mov r2, r10
-	strb r0, [r2]
-_0800BDB8:
-	mov r1, r10
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _0800BDD4
-	ldrb r0, [r7, 0x1D]
-	ldrb r2, [r7, 0x1E]
-	cmp r0, r2
-	beq _0800BDDA
-	adds r0, r7, 0
-	bl MultiBootStartProbe
-	b _0800BDE2
-	.align 2, 0
-_0800BDD0: .4byte 0x04000120
-_0800BDD4:
-	subs r0, 0x1
-	mov r1, r10
-	strb r0, [r1]
-_0800BDDA:
-	ldrb r1, [r7, 0x1E]
-	movs r2, 0xC4
-	lsls r2, 7
-	b _0800BEE2
-_0800BDE2:
-	adds r1, r7, 0
-	adds r1, 0x49
-	movs r0, 0
-	strb r0, [r1]
-	movs r5, 0x3
-	mov r12, r1
-	ldr r3, _0800BE38 @ =gUnknown_3000E6C
-_0800BDF0:
-	lsls r0, r5, 1
-	ldr r2, _0800BE3C @ =0x04000120
-	adds r0, r2
-	ldrh r0, [r0]
-	adds r4, r0, 0
-	asrs r0, r4, 8
-	subs r2, r5, 0x1
-	cmp r0, 0x72
-	bne _0800BE1A
-	lsls r0, r2, 1
-	adds r0, r3
-	strh r4, [r0]
-	movs r0, 0xFF
-	ands r4, r0
-	movs r0, 0x1
-	lsls r0, r5
-	cmp r4, r0
-	bne _0800BE1A
-	ldrb r0, [r1]
-	orrs r4, r0
-	strb r4, [r1]
-_0800BE1A:
-	adds r5, r2, 0
-	cmp r5, 0
-	bne _0800BDF0
-	ldrb r0, [r7, 0x1D]
-	mov r1, r12
-	ldrb r1, [r1]
-	cmp r0, r1
-	bne _0800BDDA
-	movs r0, 0x2
-	strb r0, [r7, 0x18]
-	mov r2, r12
-	ldrb r1, [r2]
-	movs r2, 0xC2
-	lsls r2, 7
-	b _0800BEE2
-	.align 2, 0
-_0800BE38: .4byte gUnknown_3000E6C
-_0800BE3C: .4byte 0x04000120
-_0800BE40:
-	movs r5, 0x3
-	movs r0, 0x49
-	adds r0, r7
-	mov r12, r0
-	mov r4, r12
-	movs r6, 0x1
-	ldr r1, _0800BE84 @ =gUnknown_3000E6C
-	mov r9, r1
-	ldr r2, _0800BE88 @ =0x04000120
-	mov r8, r2
-_0800BE54:
-	ldrb r3, [r4]
-	adds r0, r3, 0
-	asrs r0, r5
-	ands r0, r6
-	subs r2, r5, 0x1
-	cmp r0, 0
-	beq _0800BE7A
-	lsls r0, r5, 1
-	add r0, r8
-	ldrh r1, [r0]
-	lsls r0, r2, 1
-	add r0, r9
-	ldrh r0, [r0]
-	cmp r1, r0
-	beq _0800BE7A
-	adds r0, r6, 0
-	lsls r0, r5
-	eors r3, r0
-	strb r3, [r4]
-_0800BE7A:
-	adds r5, r2, 0
-	cmp r5, 0
-	bne _0800BE54
-	b _0800BFE0
-	.align 2, 0
-_0800BE84: .4byte gUnknown_3000E6C
-_0800BE88: .4byte 0x04000120
-_0800BE8C:
-	movs r3, 0x1
-	movs r5, 0x3
-	movs r0, 0x49
-	adds r0, r7
-	mov r12, r0
-	adds r6, r7, 0
-	adds r6, 0x19
-	ldr r1, _0800BEF0 @ =gUnknown_3000E6C
-	mov r8, r1
-_0800BE9E:
-	lsls r0, r5, 1
-	ldr r2, _0800BEF4 @ =0x04000120
-	adds r0, r2
-	ldrh r0, [r0]
-	adds r4, r0, 0
-	subs r2, r5, 0x1
-	adds r0, r6, r2
-	strb r4, [r0]
-	mov r0, r12
-	ldrb r1, [r0]
-	asrs r1, r5
-	movs r0, 0x1
-	ands r1, r0
-	cmp r1, 0
-	beq _0800BED2
-	asrs r0, r4, 8
-	subs r0, 0x72
-	cmp r0, 0x1
-	bls _0800BEC6
-	b _0800C030
-_0800BEC6:
-	lsls r0, r2, 1
-	add r0, r8
-	ldrh r0, [r0]
-	cmp r4, r0
-	bne _0800BED2
-	movs r3, 0
-_0800BED2:
-	adds r5, r2, 0
-	cmp r5, 0
-	bne _0800BE9E
-	cmp r3, 0
-	bne _0800BEF8
-	ldrb r1, [r7, 0x1C]
-	movs r2, 0xC6
-	lsls r2, 7
-_0800BEE2:
-	adds r0, r2, 0
-	orrs r1, r0
-	adds r0, r7, 0
-	bl MultiBootSend
-	b _0800C03C
-	.align 2, 0
-_0800BEF0: .4byte gUnknown_3000E6C
-_0800BEF4: .4byte 0x04000120
-_0800BEF8:
-	movs r0, 0xD1
-	strb r0, [r7, 0x18]
-	movs r3, 0x11
-	movs r5, 0x3
-	adds r1, r6, 0x2
-_0800BF02:
-	ldrb r0, [r1]
-	adds r3, r0
-	subs r1, 0x1
-	subs r5, 0x1
-	cmp r5, 0
-	bne _0800BF02
-	strb r3, [r7, 0x14]
-	movs r0, 0xFF
-	ands r3, r0
-	movs r1, 0xC8
-	lsls r1, 7
-	adds r0, r1, 0
-	orrs r3, r0
-	adds r0, r7, 0
-	adds r1, r3, 0
-	bl MultiBootSend
-	b _0800C03C
-_0800BF26:
-	movs r5, 0x3
-	movs r2, 0x49
-	ldrb r1, [r2, r7]
-	ldr r2, _0800BF64 @ =0x04000126
-	movs r3, 0x1
-_0800BF30:
-	ldrh r0, [r2]
-	adds r4, r0, 0
-	adds r0, r1, 0
-	asrs r0, r5
-	ands r0, r3
-	cmp r0, 0
-	beq _0800BF44
-	asrs r0, r4, 8
-	cmp r0, 0x73
-	bne _0800C030
-_0800BF44:
-	subs r2, 0x2
-	subs r5, 0x1
-	cmp r5, 0
-	bne _0800BF30
-	adds r0, r7, 0
-	bl MultiBoot
-	adds r5, r0, 0
-	cmp r5, 0
-	bne _0800BF68
-	movs r0, 0xE0
-	strb r0, [r7, 0x18]
-	adds r0, 0xB0
-	strh r0, [r7, 0x16]
-	b _0800C03A
-	.align 2, 0
-_0800BF64: .4byte 0x04000126
-_0800BF68:
-	adds r0, r7, 0
-	bl MultiBootInit
-	movs r0, 0x1E
-	mov r1, r10
-	strb r0, [r1]
-	movs r0, 0x70
-	b _0800C03C
-_0800BF78:
-	movs r5, 0x3
-	movs r2, 0x49
-	adds r2, r7
-	mov r12, r2
-	mov r8, r12
-	movs r0, 0x1
-	mov r9, r0
-_0800BF86:
-	mov r1, r8
-	ldrb r6, [r1]
-	adds r0, r6, 0
-	asrs r0, r5
-	mov r2, r9
-	ands r0, r2
-	cmp r0, 0
-	beq _0800BFC0
-	lsls r0, r5, 1
-	ldr r1, _0800BFDC @ =0x04000120
-	adds r0, r1
-	ldrh r0, [r0]
-	adds r4, r0, 0
-	asrs r2, r4, 8
-	ldrb r0, [r7, 0x18]
-	lsrs r0, 1
-	movs r1, 0x62
-	subs r1, r0
-	mov r3, r9
-	lsls r3, r5
-	cmp r2, r1
-	bne _0800BFBA
-	movs r0, 0xFF
-	ands r4, r0
-	cmp r4, r3
-	beq _0800BFC0
-_0800BFBA:
-	eors r6, r3
-	mov r2, r8
-	strb r6, [r2]
-_0800BFC0:
-	subs r5, 0x1
-	cmp r5, 0
-	bne _0800BF86
-	ldrb r0, [r7, 0x18]
-	cmp r0, 0xC4
-	bne _0800BFE0
-	mov r0, r12
-	ldrb r1, [r0]
-	movs r0, 0xE
-	ands r0, r1
-	strb r0, [r7, 0x1E]
-	strb r5, [r7, 0x18]
-	b _0800BDDA
-	.align 2, 0
-_0800BFDC: .4byte 0x04000120
-_0800BFE0:
-	mov r1, r12
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _0800BFF2
-	adds r0, r7, 0
-	bl MultiBootInit
-	movs r0, 0x50
-	b _0800C03C
-_0800BFF2:
-	ldrb r0, [r7, 0x18]
-	adds r0, 0x2
-	strb r0, [r7, 0x18]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xC4
-	bne _0800C002
-	b _0800BDDA
-_0800C002:
-	ldrb r0, [r7, 0x18]
-	ldr r1, [r7, 0x28]
-	adds r0, r1
-	subs r1, r0, 0x3
-	ldrb r2, [r1]
-	lsls r2, 8
-	subs r0, 0x4
-	ldrb r1, [r0]
-	orrs r1, r2
-	adds r0, r7, 0
-	bl MultiBootSend
-	adds r5, r0, 0
-	cmp r5, 0
-	bne _0800C03C
-	adds r0, r7, 0
-	adds r0, 0x4B
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _0800C03A
-_0800C02A:
-	bl MultiBootWaitSendDone
-	b _0800BC86
-_0800C030:
-	adds r0, r7, 0
-	bl MultiBootInit
-	movs r0, 0x60
-	b _0800C03C
-_0800C03A:
-	movs r0, 0
-_0800C03C:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end MultiBootMain
-
-	thumb_func_start MultiBootSend
-MultiBootSend: @ 800C04C
-	push {r4,lr}
-	adds r2, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	ldr r3, _0800C078 @ =0x04000128
-	ldrh r0, [r3]
-	movs r4, 0x8C
-	ands r4, r0
-	cmp r4, 0x8
-	bne _0800C084
-	ldr r0, _0800C07C @ =0x0400012a
-	strh r1, [r0]
-	ldr r1, _0800C080 @ =0x00002083
-	adds r0, r1, 0
-	strh r0, [r3]
-	adds r1, r2, 0
-	adds r1, 0x48
-	movs r0, 0x1
-	strb r0, [r1]
-	movs r0, 0
-	b _0800C090
-	.align 2, 0
-_0800C078: .4byte 0x04000128
-_0800C07C: .4byte 0x0400012a
-_0800C080: .4byte 0x00002083
-_0800C084:
-	adds r0, r2, 0
-	bl MultiBootInit
-	movs r0, 0x8
-	eors r4, r0
-	adds r0, r4, 0
-_0800C090:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end MultiBootSend
-
-	thumb_func_start MultiBootStartProbe
-MultiBootStartProbe: @ 800C098
-	push {lr}
-	adds r1, r0, 0
-	ldrb r0, [r1, 0x18]
-	cmp r0, 0
-	beq _0800C0AA
-	adds r0, r1, 0
-	bl MultiBootInit
-	b _0800C0B6
-_0800C0AA:
-	adds r2, r1, 0
-	adds r2, 0x4A
-	strb r0, [r2]
-	strb r0, [r1, 0x1E]
-	movs r0, 0x1
-	strb r0, [r1, 0x18]
-_0800C0B6:
-	pop {r0}
-	bx r0
-	thumb_func_end MultiBootStartProbe
-
-	thumb_func_start MultiBootStartMaster
-MultiBootStartMaster: @ 800C0BC
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	adds r6, r1, 0
-	ldr r0, [sp, 0x14]
-	lsls r3, 24
-	lsrs r5, r3, 24
-	lsls r0, 24
-	lsrs r7, r0, 24
-	movs r3, 0
-	ldrb r0, [r4, 0x18]
-	cmp r0, 0
-	bne _0800C0F8
-	ldrb r0, [r4, 0x1E]
-	cmp r0, 0
-	beq _0800C0F8
-	adds r0, r4, 0
-	adds r0, 0x4A
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0800C0F8
-	str r6, [r4, 0x20]
-	adds r2, 0xF
-	movs r0, 0x10
-	negs r0, r0
-	ands r2, r0
-	subs r0, 0xF0
-	adds r1, r2, r0
-	ldr r0, _0800C100 @ =0x0003ff00
-	cmp r1, r0
-	bls _0800C104
-_0800C0F8:
-	adds r0, r4, 0
-	bl MultiBootInit
-	b _0800C178
-	.align 2, 0
-_0800C100: .4byte 0x0003ff00
-_0800C104:
-	adds r0, r6, r2
-	str r0, [r4, 0x24]
-	lsls r1, r7, 24
-	movs r2, 0x80
-	lsls r2, 19
-	adds r0, r1, r2
-	asrs r0, 24
-	adds r2, r1, 0
-	cmp r0, 0x8
-	bhi _0800C164
-	lsls r0, 2
-	ldr r1, _0800C124 @ =_0800C128
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0800C124: .4byte _0800C128
-	.align 2, 0
-_0800C128:
-	.4byte _0800C14C
-	.4byte _0800C14C
-	.4byte _0800C14C
-	.4byte _0800C14C
-	.4byte _0800C156
-	.4byte _0800C15C
-	.4byte _0800C15C
-	.4byte _0800C15C
-	.4byte _0800C15C
-_0800C14C:
-	lsls r3, r5, 3
-	asrs r1, r2, 24
-	movs r0, 0x3
-	subs r0, r1
-	b _0800C162
-_0800C156:
-	movs r0, 0x38
-	adds r3, r5, 0
-	b _0800C162
-_0800C15C:
-	lsls r3, r5, 3
-	asrs r0, r2, 24
-	subs r0, 0x1
-_0800C162:
-	orrs r3, r0
-_0800C164:
-	movs r0, 0x3F
-	ands r3, r0
-	lsls r0, r3, 1
-	movs r2, 0x7F
-	negs r2, r2
-	adds r1, r2, 0
-	orrs r0, r1
-	strb r0, [r4, 0x1C]
-	movs r0, 0xD0
-	strb r0, [r4, 0x18]
-_0800C178:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end MultiBootStartMaster
-
-	thumb_func_start MultiBootCheckComplete
-MultiBootCheckComplete: @ 800C180
-	push {lr}
-	ldrb r0, [r0, 0x18]
-	cmp r0, 0xE9
-	beq _0800C18C
-	movs r0, 0
-	b _0800C18E
-_0800C18C:
-	movs r0, 0x1
-_0800C18E:
-	pop {r1}
-	bx r1
-	thumb_func_end MultiBootCheckComplete
-
-	thumb_func_start MultiBootHandShake
-MultiBootHandShake: @ 800C194
-	push {r4-r6,lr}
-	adds r3, r0, 0
-	ldrb r0, [r3, 0x18]
-	cmp r0, 0xE0
-	beq _0800C1B0
-	cmp r0, 0xE0
-	blt _0800C1C0
-	cmp r0, 0xE8
-	bgt _0800C1C0
-	cmp r0, 0xE7
-	blt _0800C1C0
-	movs r4, 0x3
-	ldrb r5, [r3, 0x1E]
-	b _0800C220
-_0800C1B0:
-	movs r1, 0
-	movs r0, 0xE1
-	strb r0, [r3, 0x18]
-	str r1, [r3, 0x4]
-	movs r0, 0x80
-	lsls r0, 13
-	str r0, [r3]
-	b _0800C212
-_0800C1C0:
-	movs r4, 0x3
-	ldrb r5, [r3, 0x1E]
-	movs r6, 0x1
-	ldr r1, _0800C21C @ =0x04000126
-_0800C1C8:
-	ldrh r0, [r1]
-	adds r2, r0, 0
-	adds r0, r5, 0
-	asrs r0, r4
-	ands r0, r6
-	cmp r0, 0
-	beq _0800C1DC
-	ldr r0, [r3, 0x4]
-	cmp r2, r0
-	bne _0800C1B0
-_0800C1DC:
-	subs r1, 0x2
-	subs r4, 0x1
-	cmp r4, 0
-	bne _0800C1C8
-	ldrb r0, [r3, 0x18]
-	adds r0, 0x1
-	strb r0, [r3, 0x18]
-	ldr r1, [r3]
-	ldrh r0, [r3]
-	str r0, [r3, 0x4]
-	cmp r1, 0
-	bne _0800C20A
-	ldr r0, [r3, 0x28]
-	adds r1, r0, 0
-	adds r1, 0xAC
-	ldrb r1, [r1]
-	adds r0, 0xAD
-	ldrb r0, [r0]
-	lsls r0, 8
-	orrs r1, r0
-	str r1, [r3, 0x4]
-	lsls r1, 5
-	str r1, [r3]
-_0800C20A:
-	ldr r0, [r3]
-	lsrs r0, 5
-	str r0, [r3]
-_0800C210:
-	ldrh r1, [r3]
-_0800C212:
-	adds r0, r3, 0
-	bl MultiBootSend
-	b _0800C278
-	.align 2, 0
-_0800C21C: .4byte 0x04000126
-_0800C220:
-	lsls r0, r4, 1
-	ldr r1, _0800C268 @ =0x04000120
-	adds r0, r1
-	ldrh r0, [r0]
-	adds r2, r0, 0
-	adds r0, r5, 0
-	asrs r0, r4
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _0800C23C
-	ldr r0, [r3, 0x4]
-	cmp r2, r0
-	bne _0800C26C
-_0800C23C:
-	subs r4, 0x1
-	cmp r4, 0
-	bne _0800C220
-	ldrb r0, [r3, 0x18]
-	adds r0, 0x1
-	strb r0, [r3, 0x18]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xE9
-	beq _0800C276
-	ldr r0, [r3, 0x28]
-	adds r1, r0, 0
-	adds r1, 0xAE
-	ldrb r1, [r1]
-	adds r0, 0xAF
-	ldrb r0, [r0]
-	lsls r0, 8
-	orrs r1, r0
-	str r1, [r3]
-	str r1, [r3, 0x4]
-	b _0800C210
-	.align 2, 0
-_0800C268: .4byte 0x04000120
-_0800C26C:
-	adds r0, r3, 0
-	bl MultiBootInit
-	movs r0, 0x71
-	b _0800C278
-_0800C276:
-	movs r0, 0
-_0800C278:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end MultiBootHandShake
-
-	thumb_func_start MultiBootWaitCycles
-MultiBootWaitCycles: @ 800C280
-	mov r2, pc
-	lsrs r2, 24
-	movs r1, 0xC
-	cmp r2, 0x2
-	beq _0800C292
-	movs r1, 0xD
-	cmp r2, 0x8
-	beq _0800C292
-	movs r1, 0x4
-_0800C292:
-	subs r0, r1
-	bgt _0800C292
-	bx lr
-	thumb_func_end MultiBootWaitCycles
-
-	thumb_func_start MultiBootWaitSendDone
-MultiBootWaitSendDone: @ 800C298
-	push {r4,r5,lr}
-	movs r2, 0
-	ldr r3, _0800C2CC @ =0x04000128
-	ldrh r1, [r3]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0800C2BC
-	ldr r5, _0800C2D0 @ =0x0000795c
-	movs r4, 0x80
-_0800C2AC:
-	adds r2, 0x1
-	cmp r2, r5
-	bgt _0800C2BC
-	ldrh r1, [r3]
-	adds r0, r4, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _0800C2AC
-_0800C2BC:
-	movs r0, 0x96
-	lsls r0, 2
-	bl MultiBootWaitCycles
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0800C2CC: .4byte 0x04000128
-_0800C2D0: .4byte 0x0000795c
-	thumb_func_end MultiBootWaitSendDone
-
-	.align 2, 0 @ Don't pad with nop.

asm/new_game.s

@@ -174,8 +174,8 @@ Sav2_ClearSetDefault: @ 8054A18
 	bx r0
 	thumb_func_end Sav2_ClearSetDefault
 
-	thumb_func_start sub_8054A28
+	thumb_func_start ResetMenuAndMonGlobals
-sub_8054A28: @ 8054A28
+ResetMenuAndMonGlobals: @ 8054A28
 	push {lr}
 	ldr r1, _08054A5C @ =gUnknown_2031DB0
 	movs r0, 0
@@ -195,7 +195,7 @@ sub_8054A28: @ 8054A28
 	bx r0
 	.align 2, 0
 _08054A5C: .4byte gUnknown_2031DB0
-	thumb_func_end sub_8054A28
+	thumb_func_end ResetMenuAndMonGlobals
 
 	thumb_func_start sub_8054A60
 sub_8054A60: @ 8054A60

asm/overworld.s

@@ -193,8 +193,8 @@ _08054D68: .4byte 0x00000808
 _08054D6C: .4byte 0x0000404d
 	thumb_func_end Overworld_ResetStateAfterTeleport
 
-	thumb_func_start sub_8054D70
+	thumb_func_start Overworld_ResetStateAfterDigEscRope
-sub_8054D70: @ 8054D70
+Overworld_ResetStateAfterDigEscRope: @ 8054D70
 	push {lr}
 	bl ResetInitialPlayerAvatarState
 	movs r0, 0x83
@@ -230,7 +230,7 @@ _08054DC8: .4byte 0x00000805
 _08054DCC: .4byte 0x00000806
 _08054DD0: .4byte 0x00000808
 _08054DD4: .4byte 0x0000404d
-	thumb_func_end sub_8054D70
+	thumb_func_end Overworld_ResetStateAfterDigEscRope
 
 	thumb_func_start sub_8054DD8
 sub_8054DD8: @ 8054DD8
@@ -1257,7 +1257,7 @@ sub_805550C: @ 805550C
 	ldrh r0, [r0, 0x4]
 	cmp r0, 0x1
 	beq _08055590
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -1858,7 +1858,7 @@ _08055A04: .4byte gUnknown_2031DD4
 	thumb_func_start sub_8055A08
 sub_8055A08: @ 8055A08
 	push {r4,lr}
-	bl player_get_direction_lower_nybble
+	bl GetPlayerFacingDirection
 	ldr r4, _08055A24 @ =gUnknown_2031DD4
 	strb r0, [r4, 0x1]
 	movs r0, 0x2
@@ -2378,8 +2378,8 @@ sub_8055DB8: @ 8055DB8
 	bx r0
 	thumb_func_end sub_8055DB8
 
-	thumb_func_start sub_8055DC4
+	thumb_func_start Overworld_PlaySpecialMapMusic
-sub_8055DC4: @ 8055DC4
+Overworld_PlaySpecialMapMusic: @ 8055DC4
 	push {r4,r5,lr}
 	sub sp, 0x4
 	ldr r0, _08055DD8 @ =gUnknown_2031DD8
@@ -2462,7 +2462,7 @@ _08055E6C:
 	bx r0
 	.align 2, 0
 _08055E74: .4byte 0x00000131
-	thumb_func_end sub_8055DC4
+	thumb_func_end Overworld_PlaySpecialMapMusic
 
 	thumb_func_start Overworld_SetSavedMusic
 Overworld_SetSavedMusic: @ 8055E78
@@ -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
@@ -3833,8 +3833,8 @@ _0805692C:
 _08056934: .4byte gMapHeader
 	thumb_func_end sub_8056918
 
-	thumb_func_start sub_8056938
+	thumb_func_start CB2_ContinueSavedGame
-sub_8056938: @ 8056938
+CB2_ContinueSavedGame: @ 8056938
 	push {lr}
 	bl sub_80569BC
 	bl StopMapMusic
@@ -3880,7 +3880,7 @@ _080569AC:
 _080569B0: .4byte gFieldCallback
 _080569B4: .4byte sub_8056918
 _080569B8: .4byte sub_8056534
-	thumb_func_end sub_8056938
+	thumb_func_end CB2_ContinueSavedGame
 
 	thumb_func_start sub_80569BC
 sub_80569BC: @ 80569BC
@@ -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 ClearScheduledBgCopiesToVram
-	bl reset_temp_tile_data_buffers
+	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

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
@@ -3543,7 +3543,7 @@ sub_81205C8: @ 81205C8
 	bne _081205F2
 	adds r0, r6, 0
 	adds r1, r4, 0
-	bl sub_8097D38
+	bl GiveMailToMon
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xFF
@@ -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]
@@ -7026,7 +7026,7 @@ sub_81220D4: @ 81220D4
 	adds r0, r4, 0
 	movs r1, 0x4F
 	movs r2, 0xE0
-	bl TextWindow_SetBubbleFrame_841F1C8
+	bl TextWindow_LoadResourcesStdFrame0
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r2, 0x4F
@@ -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}
@@ -8013,11 +8013,11 @@ _0812285C: .4byte 0x0000fffc
 sub_8122860: @ 8122860
 	push {lr}
 	ldr r0, _08122878 @ =gUnknown_845A474
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _0812287C @ =gUnknown_845A4EC
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _08122880 @ =gUnknown_845A47C
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -8164,9 +8164,9 @@ _0812297C: .4byte gSprites
 sub_8122980: @ 8122980
 	push {lr}
 	ldr r0, _08122994 @ =gUnknown_845A574
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _08122998 @ =gUnknown_845A57C
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -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
@@ -10776,7 +10776,7 @@ _08123EB2:
 	muls r0, r1
 	ldr r1, _08123EE8 @ =gPlayerParty
 	adds r0, r1
-	bl sub_809803C
+	bl TakeMailFromMon2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xFF
@@ -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

asm/play_time.s

@@ -1,137 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start PlayTimeCounter_Reset
-PlayTimeCounter_Reset: @ 8054814
-	ldr r1, _08054830 @ =gUnknown_3000E7C
-	movs r0, 0
-	strb r0, [r1]
-	ldr r2, _08054834 @ =gSaveBlock2Ptr
-	ldr r3, [r2]
-	movs r1, 0
-	movs r0, 0
-	strh r0, [r3, 0xE]
-	strb r1, [r3, 0x10]
-	ldr r0, [r2]
-	strb r1, [r0, 0x11]
-	ldr r0, [r2]
-	strb r1, [r0, 0x12]
-	bx lr
-	.align 2, 0
-_08054830: .4byte gUnknown_3000E7C
-_08054834: .4byte gSaveBlock2Ptr
-	thumb_func_end PlayTimeCounter_Reset
-
-	thumb_func_start PlayTimeCounter_Start
-PlayTimeCounter_Start: @ 8054838
-	push {lr}
-	ldr r1, _08054854 @ =gUnknown_3000E7C
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r0, _08054858 @ =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrh r1, [r0, 0xE]
-	ldr r0, _0805485C @ =0x000003e7
-	cmp r1, r0
-	bls _08054850
-	bl PlayTimeCounter_SetToMax
-_08054850:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08054854: .4byte gUnknown_3000E7C
-_08054858: .4byte gSaveBlock2Ptr
-_0805485C: .4byte 0x000003e7
-	thumb_func_end PlayTimeCounter_Start
-
-	thumb_func_start sub_8054860
-sub_8054860: @ 8054860
-	ldr r1, _08054868 @ =gUnknown_3000E7C
-	movs r0, 0
-	strb r0, [r1]
-	bx lr
-	.align 2, 0
-_08054868: .4byte gUnknown_3000E7C
-	thumb_func_end sub_8054860
-
-	thumb_func_start PlayTimeCounter_Update
-PlayTimeCounter_Update: @ 805486C
-	push {lr}
-	ldr r0, _080548C8 @ =gUnknown_3000E7C
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _080548C4
-	ldr r2, _080548CC @ =gSaveBlock2Ptr
-	ldr r0, [r2]
-	ldrb r1, [r0, 0x12]
-	adds r1, 0x1
-	movs r3, 0
-	strb r1, [r0, 0x12]
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x12]
-	cmp r0, 0x3B
-	bls _080548C4
-	strb r3, [r1, 0x12]
-	ldr r0, [r2]
-	ldrb r1, [r0, 0x11]
-	adds r1, 0x1
-	strb r1, [r0, 0x11]
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x11]
-	cmp r0, 0x3B
-	bls _080548C4
-	strb r3, [r1, 0x11]
-	ldr r0, [r2]
-	ldrb r1, [r0, 0x10]
-	adds r1, 0x1
-	strb r1, [r0, 0x10]
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x10]
-	cmp r0, 0x3B
-	bls _080548C4
-	strb r3, [r1, 0x10]
-	ldr r0, [r2]
-	ldrh r1, [r0, 0xE]
-	adds r1, 0x1
-	strh r1, [r0, 0xE]
-	lsls r1, 16
-	ldr r0, _080548D0 @ =0x03e70000
-	cmp r1, r0
-	bls _080548C4
-	bl PlayTimeCounter_SetToMax
-_080548C4:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080548C8: .4byte gUnknown_3000E7C
-_080548CC: .4byte gSaveBlock2Ptr
-_080548D0: .4byte 0x03e70000
-	thumb_func_end PlayTimeCounter_Update
-
-	thumb_func_start PlayTimeCounter_SetToMax
-PlayTimeCounter_SetToMax: @ 80548D4
-	ldr r1, _080548F0 @ =gUnknown_3000E7C
-	movs r0, 0x2
-	strb r0, [r1]
-	ldr r2, _080548F4 @ =gSaveBlock2Ptr
-	ldr r3, [r2]
-	ldr r0, _080548F8 @ =0x000003e7
-	strh r0, [r3, 0xE]
-	movs r1, 0x3B
-	strb r1, [r3, 0x10]
-	ldr r0, [r2]
-	strb r1, [r0, 0x11]
-	ldr r0, [r2]
-	strb r1, [r0, 0x12]
-	bx lr
-	.align 2, 0
-_080548F0: .4byte gUnknown_3000E7C
-_080548F4: .4byte gSaveBlock2Ptr
-_080548F8: .4byte 0x000003e7
-	thumb_func_end PlayTimeCounter_SetToMax
-
-	.align 2, 0 @ Don't pad with nop.

asm/player_pc.s

@@ -149,7 +149,7 @@ _080EB77E:
 	strh r0, [r7, 0x14]
 	ldrb r0, [r7, 0x14]
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	movs r0, 0x2
 	movs r1, 0
 	bl GetMenuCursorDimensionByFont
@@ -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
@@ -464,7 +464,7 @@ _080EBA1E:
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	movs r0, 0x2
 	movs r1, 0
 	bl GetMenuCursorDimensionByFont
@@ -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
@@ -1578,7 +1578,7 @@ sub_80EC2FC: @ 80EC2FC
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_80F7858
+	bl DisplayYesNoMenuDefaultYes
 	ldr r1, _080EC31C @ =gTasks
 	lsls r0, r4, 2
 	adds r0, r4
@@ -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

asm/pokeball.s

@@ -2029,9 +2029,9 @@ CreatePokeballSpriteToReleaseMon: @ 804B908
 	lsls r0, 24
 	lsrs r7, r0, 24
 	ldr r0, _0804B9D4 @ =gUnknown_826056C
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _0804B9D8 @ =gUnknown_82605CC
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 	ldr r0, _0804B9DC @ =gUnknown_82606F4
 	mov r1, r9
 	mov r2, r10
@@ -2362,9 +2362,9 @@ sub_804BB98: @ 804BB98
 	lsrs r0, 24
 	mov r9, r0
 	ldr r0, _0804BC3C @ =gUnknown_826056C
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _0804BC40 @ =gUnknown_82605CC
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 	ldr r0, _0804BC44 @ =gUnknown_82606F4
 	adds r1, r6, 0
 	mov r2, r8
@@ -2790,10 +2790,10 @@ LoadBallGfx: @ 804BEF4
 	cmp r0, r1
 	bne _0804BF1C
 	adds r0, r5, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _0804BF58 @ =gUnknown_82605CC
 	adds r0, r6, r0
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 _0804BF1C:
 	cmp r4, 0x6
 	beq _0804BF48

asm/pokedex_area_markers.s

@@ -66,7 +66,7 @@ sub_8134230: @ 8134230
 	ands r2, r5
 	orrs r2, r1
 	str r2, [r0, 0x4]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _081343D0 @ =gUnknown_846341C
 	mov r3, r8
 	lsls r3, 4

asm/pokemon_icon.s

@@ -166,7 +166,7 @@ mon_icon_convert_unown_species_id: @ 8096F5C
 	cmp r2, 0xC9
 	bne _08096F86
 	adds r0, r1, 0
-	bl mon_icon_personality_to_unown_id
+	bl GetUnownLetterByPersonality
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0
@@ -195,8 +195,8 @@ _08096F92:
 	bx r1
 	thumb_func_end mon_icon_convert_unown_species_id
 
-	thumb_func_start mon_icon_personality_to_unown_id
+	thumb_func_start GetUnownLetterByPersonality
-mon_icon_personality_to_unown_id: @ 8096F98
+GetUnownLetterByPersonality: @ 8096F98
 	push {lr}
 	adds r2, r0, 0
 	cmp r2, 0
@@ -228,7 +228,7 @@ _08096FCE:
 _08096FD0:
 	pop {r1}
 	bx r1
-	thumb_func_end mon_icon_personality_to_unown_id
+	thumb_func_end GetUnownLetterByPersonality
 
 	thumb_func_start sub_8096FD4
 sub_8096FD4: @ 8096FD4

asm/pokemon_jump.s

@@ -170,7 +170,7 @@ sub_81476E0: @ 81476E0
 	lsls r0, 3
 	ldr r1, _081477B0 @ =gUnknown_846B42C
 	adds r0, r1
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	movs r2, 0x8
 	ldrsh r0, [r4, r2]
 	lsls r0, 3

asm/pokemon_jump_2.s

@@ -4793,8 +4793,8 @@ _08149DF0:
 	bl InitBgsFromTemplates
 	ldr r0, _08149EEC @ =gUnknown_846D8E4
 	bl InitWindows
-	bl sub_80F6C14
+	bl ResetBgPositions
-	bl reset_temp_tile_data_buffers
+	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
@@ -6777,7 +6777,7 @@ sub_814AD6C: @ 814AD6C
 	ldr r5, _0814ADAC @ =gUnknown_846E0B0
 _0814AD74:
 	adds r0, r5, 0
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	adds r5, 0x8
 	adds r4, 0x1
 	cmp r4, 0x4
@@ -6881,7 +6881,7 @@ _0814AE2A:
 	adds r0, r1
 	ldr r3, [r7, 0x8]
 	mov r1, r8
-	bl sub_800ECC4
+	bl HandleLoadSpecialPokePic
 	mov r3, r8
 	str r3, [sp, 0x18]
 	adds r4, r6, 0
@@ -6903,7 +6903,7 @@ _0814AE2A:
 	ands r1, r5
 	orrs r1, r4
 	str r1, [r0, 0x4]
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	mov r0, r8
 	bl Free
 	mov r0, r10

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
@@ -2446,7 +2446,7 @@ _0811D884:
 	adds r1, r6, 0
 	adds r2, r7, 0
 	mov r3, r10
-	bl sub_800ECC4
+	bl HandleLoadSpecialPokePic
 	mov r0, r8
 	bl GetMonFrontSpritePal
 	adds r1, r4, 0
@@ -3699,7 +3699,7 @@ sub_811E204: @ 811E204
 	sub sp, 0x8
 	mov r10, r0
 	ldr r0, _0811E2E0 @ =gUnknown_84599B8
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _0811E2E4 @ =gUnknown_84599C0
 	bl LoadSpritePalette
 	movs r0, 0
@@ -4148,7 +4148,7 @@ _0811E582:
 sub_811E588: @ 811E588
 	push {lr}
 	ldr r0, _0811E59C @ =gUnknown_84599C8
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	ldr r0, _0811E5A0 @ =gUnknown_84599D0
 	bl LoadSpritePalette
 	pop {r0}
@@ -4216,7 +4216,7 @@ sub_811E5B8: @ 811E5B8
 	str r1, [r4]
 	mov r1, r9
 	strh r1, [r4, 0x4]
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	adds r0, r4, 0
 	bl LoadSpritePalette
 	ldr r0, _0811E674 @ =sub_811E694

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
@@ -7233,7 +7233,7 @@ sub_808F3F8: @ 808F3F8
 	adds r0, r1
 	ldr r5, _0808F474 @ =0x000022bc
 	adds r1, r4, r5
-	bl sub_800ECC4
+	bl HandleLoadSpecialPokePic
 	ldr r1, [r6]
 	ldr r2, _0808F478 @ =0x00000cd8
 	adds r0, r1, r2
@@ -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
@@ -20609,7 +20609,7 @@ _08095B9C:
 	orrs r0, r1
 	str r0, [r2, 0x4]
 	mov r0, r9
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	mov r4, r9
 	ldrh r0, [r4, 0x6]
 	bl GetSpriteTileStartByTag
@@ -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}

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

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

asm/reset_save_heap.s

@@ -1,68 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8079B7C
-sub_8079B7C: @ 8079B7C
-	push {r4,r5,lr}
-	ldr r5, _08079BEC @ =0x04000208
-	ldrh r4, [r5]
-	movs r0, 0
-	strh r0, [r5]
-	movs r0, 0x1
-	bl RegisterRamReset
-	movs r0, 0
-	movs r1, 0x80
-	bl ClearGpuRegBits
-	strh r4, [r5]
-	ldr r1, _08079BF0 @ =gMain
-	ldr r0, _08079BF4 @ =0x00000439
-	adds r1, r0
-	ldrb r2, [r1]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	bl SetSaveBlocksPointers
-	bl sub_8054A28
-	bl Save_ResetSaveCounters
-	movs r0, 0
-	bl Save_LoadGameData
-	ldr r0, _08079BF8 @ =gSaveFileStatus
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _08079BC4
-	cmp r0, 0x2
-	bne _08079BC8
-_08079BC4:
-	bl Sav2_ClearSetDefault
-_08079BC8:
-	ldr r0, _08079BFC @ =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x15]
-	lsls r0, 31
-	lsrs r0, 31
-	bl SetPokemonCryStereo
-	ldr r0, _08079C00 @ =gHeap
-	movs r1, 0xE0
-	lsls r1, 9
-	bl InitHeap
-	ldr r0, _08079C04 @ =sub_8056938
-	bl SetMainCallback2
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08079BEC: .4byte 0x04000208
-_08079BF0: .4byte gMain
-_08079BF4: .4byte 0x00000439
-_08079BF8: .4byte gSaveFileStatus
-_08079BFC: .4byte gSaveBlock2Ptr
-_08079C00: .4byte gHeap
-_08079C04: .4byte sub_8056938
-	thumb_func_end sub_8079B7C
-
-	.align 2, 0 @ Don't pad with nop.

asm/rom6.s

@@ -1,459 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start npc_before_player_of_type
-npc_before_player_of_type: @ 80C97A8
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r4, _080C97E8 @ =gUnknown_2039A04
-	adds r1, r4, 0x2
-	adds r0, r4, 0
-	bl GetXYCoordsOneStepInFrontOfPlayer
-	bl PlayerGetZCoord
-	strb r0, [r4, 0x4]
-	ldrh r0, [r4]
-	ldrh r1, [r4, 0x2]
-	ldrb r2, [r4, 0x4]
-	bl GetFieldObjectIdByXYZ
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080C97EC @ =gMapObjects
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r2, r1, r2
-	ldrb r0, [r2, 0x5]
-	cmp r0, r5
-	bne _080C97F4
-	ldr r1, _080C97F0 @ =gSpecialVar_LastTalked
-	ldrb r0, [r2, 0x8]
-	strh r0, [r1]
-	movs r0, 0x1
-	b _080C97F6
-	.align 2, 0
-_080C97E8: .4byte gUnknown_2039A04
-_080C97EC: .4byte gMapObjects
-_080C97F0: .4byte gSpecialVar_LastTalked
-_080C97F4:
-	movs r0, 0
-_080C97F6:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end npc_before_player_of_type
-
-	thumb_func_start oei_task_add
-oei_task_add: @ 80C97FC
-	push {lr}
-	ldr r0, _080C9818 @ =gUnknown_2039A04
-	adds r1, r0, 0x2
-	bl GetXYCoordsOneStepInFrontOfPlayer
-	ldr r0, _080C981C @ =task08_080C9820
-	movs r1, 0x8
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080C9818: .4byte gUnknown_2039A04
-_080C981C: .4byte task08_080C9820
-	thumb_func_end oei_task_add
-
-	thumb_func_start task08_080C9820
-task08_080C9820: @ 80C9820
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r6, r5, 0
-	bl ScriptContext2_Enable
-	ldr r1, _080C9874 @ =gPlayerAvatar
-	movs r0, 0x1
-	strb r0, [r1, 0x6]
-	ldrb r1, [r1, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080C9878 @ =gMapObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080C9856
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080C98A2
-_080C9856:
-	ldr r0, _080C987C @ =gMapHeader
-	ldrb r0, [r0, 0x17]
-	cmp r0, 0x5
-	bne _080C9888
-	movs r0, 0x3B
-	bl FieldEffectStart
-	ldr r0, _080C9880 @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _080C9884 @ =sub_80C98FC
-	b _080C98A0
-	.align 2, 0
-_080C9874: .4byte gPlayerAvatar
-_080C9878: .4byte gMapObjects
-_080C987C: .4byte gMapHeader
-_080C9880: .4byte gTasks
-_080C9884: .4byte sub_80C98FC
-_080C9888:
-	bl sub_805CB70
-	adds r0, r4, 0
-	movs r1, 0x45
-	bl sub_8063CA4
-	ldr r0, _080C98A8 @ =gTasks
-	lsls r1, r6, 2
-	adds r1, r6
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _080C98AC @ =sub_80C98B0
-_080C98A0:
-	str r0, [r1]
-_080C98A2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C98A8: .4byte gTasks
-_080C98AC: .4byte sub_80C98B0
-	thumb_func_end task08_080C9820
-
-	thumb_func_start sub_80C98B0
-sub_80C98B0: @ 80C98B0
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _080C98EC @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080C98F0 @ =gMapObjects
-	adds r0, r1
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080C98E4
-	movs r0, 0x3B
-	bl FieldEffectStart
-	ldr r0, _080C98F4 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _080C98F8 @ =sub_80C98FC
-	str r0, [r1]
-_080C98E4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C98EC: .4byte gPlayerAvatar
-_080C98F0: .4byte gMapObjects
-_080C98F4: .4byte gTasks
-_080C98F8: .4byte sub_80C98FC
-	thumb_func_end sub_80C98B0
-
-	thumb_func_start sub_80C98FC
-sub_80C98FC: @ 80C98FC
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	movs r0, 0x6
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _080C9980
-	bl player_get_direction_lower_nybble
-	ldr r6, _080C9988 @ =gFieldEffectArguments
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r6, 0x4]
-	cmp r0, 0x1
-	bne _080C9922
-	str r4, [r6, 0x8]
-_080C9922:
-	ldr r1, [r6, 0x4]
-	cmp r1, 0x2
-	bne _080C992C
-	movs r0, 0x1
-	str r0, [r6, 0x8]
-_080C992C:
-	cmp r1, 0x3
-	bne _080C9934
-	movs r0, 0x2
-	str r0, [r6, 0x8]
-_080C9934:
-	cmp r1, 0x4
-	bne _080C993C
-	movs r0, 0x3
-	str r0, [r6, 0x8]
-_080C993C:
-	ldr r5, _080C998C @ =gPlayerAvatar
-	ldrb r0, [r5, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _080C9990 @ =gMapObjects
-	adds r4, r0
-	bl GetPlayerAvatarGraphicsIdByCurrentState
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_805F060
-	ldrb r1, [r5, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080C9994 @ =gSprites
-	adds r0, r1
-	ldrb r1, [r6, 0x8]
-	bl StartSpriteAnim
-	movs r0, 0x6
-	bl FieldEffectActiveListRemove
-	ldr r1, _080C9998 @ =gTasks
-	lsls r0, r7, 2
-	adds r0, r7
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _080C999C @ =sub_80C99A0
-	str r1, [r0]
-_080C9980:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C9988: .4byte gFieldEffectArguments
-_080C998C: .4byte gPlayerAvatar
-_080C9990: .4byte gMapObjects
-_080C9994: .4byte gSprites
-_080C9998: .4byte gTasks
-_080C999C: .4byte sub_80C99A0
-	thumb_func_end sub_80C98FC
-
-	thumb_func_start sub_80C99A0
-sub_80C99A0: @ 80C99A0
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r1, _080C99D0 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldrh r1, [r0, 0x18]
-	lsls r1, 16
-	ldrh r0, [r0, 0x1A]
-	orrs r1, r0
-	bl _call_via_r1
-	ldr r1, _080C99D4 @ =gPlayerAvatar
-	movs r0, 0
-	strb r0, [r1, 0x6]
-	adds r0, r4, 0
-	bl DestroyTask
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C99D0: .4byte gTasks
-_080C99D4: .4byte gPlayerAvatar
-	thumb_func_end sub_80C99A0
-
-	thumb_func_start SetUpFieldMove_RockSmash
-SetUpFieldMove_RockSmash: @ 80C99D8
-	push {lr}
-	movs r0, 0x60
-	bl npc_before_player_of_type
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _080C99EC
-	movs r0, 0
-	b _080C99FA
-_080C99EC:
-	ldr r1, _080C9A00 @ =gFieldCallback2
-	ldr r0, _080C9A04 @ =FieldCallback_PrepareFadeInFromMenu
-	str r0, [r1]
-	ldr r1, _080C9A08 @ =gPostMenuFieldCallback
-	ldr r0, _080C9A0C @ =sub_80C9A10
-	str r0, [r1]
-	movs r0, 0x1
-_080C99FA:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080C9A00: .4byte gFieldCallback2
-_080C9A04: .4byte FieldCallback_PrepareFadeInFromMenu
-_080C9A08: .4byte gPostMenuFieldCallback
-_080C9A0C: .4byte sub_80C9A10
-	thumb_func_end SetUpFieldMove_RockSmash
-
-	thumb_func_start sub_80C9A10
-sub_80C9A10: @ 80C9A10
-	push {lr}
-	bl GetCursorSelectionMonId
-	ldr r1, _080C9A28 @ =gFieldEffectArguments
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	ldr r0, _080C9A2C @ =gUnknown_81BE064
-	bl ScriptContext1_SetupScript
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C9A28: .4byte gFieldEffectArguments
-_080C9A2C: .4byte gUnknown_81BE064
-	thumb_func_end sub_80C9A10
-
-	thumb_func_start oei_rocksmash
-oei_rocksmash: @ 80C9A30
-	push {lr}
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080C9A58 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, _080C9A5C @ =sub_80C9A60
-	lsrs r0, r2, 16
-	strh r0, [r1, 0x18]
-	strh r2, [r1, 0x1A]
-	movs r0, 0x13
-	bl IncrementGameStat
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080C9A58: .4byte gTasks
-_080C9A5C: .4byte sub_80C9A60
-	thumb_func_end oei_rocksmash
-
-	thumb_func_start sub_80C9A60
-sub_80C9A60: @ 80C9A60
-	push {lr}
-	movs r0, 0x7C
-	bl PlaySE
-	movs r0, 0x25
-	bl FieldEffectActiveListRemove
-	bl EnableBothScriptContexts
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80C9A60
-
-	thumb_func_start SetUpFieldMove_Dig
-SetUpFieldMove_Dig: @ 80C9A78
-	push {lr}
-	bl sub_80A1B8C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _080C9A8A
-	movs r0, 0
-	b _080C9A98
-_080C9A8A:
-	ldr r1, _080C9A9C @ =gFieldCallback2
-	ldr r0, _080C9AA0 @ =FieldCallback_PrepareFadeInFromMenu
-	str r0, [r1]
-	ldr r1, _080C9AA4 @ =gPostMenuFieldCallback
-	ldr r0, _080C9AA8 @ =hm2_dig
-	str r0, [r1]
-	movs r0, 0x1
-_080C9A98:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080C9A9C: .4byte gFieldCallback2
-_080C9AA0: .4byte FieldCallback_PrepareFadeInFromMenu
-_080C9AA4: .4byte gPostMenuFieldCallback
-_080C9AA8: .4byte hm2_dig
-	thumb_func_end SetUpFieldMove_Dig
-
-	thumb_func_start hm2_dig
-hm2_dig: @ 80C9AAC
-	push {lr}
-	bl sub_8054D70
-	movs r0, 0x26
-	bl FieldEffectStart
-	bl GetCursorSelectionMonId
-	ldr r1, _080C9AC8 @ =gFieldEffectArguments
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C9AC8: .4byte gFieldEffectArguments
-	thumb_func_end hm2_dig
-
-	thumb_func_start sub_80C9ACC
-sub_80C9ACC: @ 80C9ACC
-	push {lr}
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080C9AF4 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, _080C9AF8 @ =sub_80C9AFC
-	lsrs r0, r2, 16
-	strh r0, [r1, 0x18]
-	strh r2, [r1, 0x1A]
-	movs r0, 0x1
-	bl SetPlayerAvatarTransitionFlags
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080C9AF4: .4byte gTasks
-_080C9AF8: .4byte sub_80C9AFC
-	thumb_func_end sub_80C9ACC
-
-	thumb_func_start sub_80C9AFC
-sub_80C9AFC: @ 80C9AFC
-	push {lr}
-	movs r0, 0x26
-	bl FieldEffectActiveListRemove
-	ldr r0, _080C9B24 @ =sub_80A1C44
-	movs r1, 0x8
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080C9B28 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0x8]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080C9B24: .4byte sub_80A1C44
-_080C9B28: .4byte gTasks
-	thumb_func_end sub_80C9AFC
-
-	.align 2, 0 @ Don't pad with nop.

asm/save_location.s

@@ -1,222 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start IsCurMapInLocationList
-IsCurMapInLocationList: @ 810B6F4
-	push {r4,lr}
-	adds r2, r0, 0
-	ldr r0, _0810B724 @ =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	lsls r1, 8
-	ldrb r0, [r0, 0x5]
-	lsls r0, 24
-	asrs r0, 24
-	adds r0, r1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldrh r0, [r2]
-	ldr r1, _0810B728 @ =0x0000ffff
-	cmp r0, r1
-	beq _0810B734
-	adds r4, r1, 0
-	adds r1, r2, 0
-_0810B71A:
-	ldrh r0, [r1]
-	cmp r0, r3
-	bne _0810B72C
-	movs r0, 0x1
-	b _0810B736
-	.align 2, 0
-_0810B724: .4byte gSaveBlock1Ptr
-_0810B728: .4byte 0x0000ffff
-_0810B72C:
-	adds r1, 0x2
-	ldrh r0, [r1]
-	cmp r0, r4
-	bne _0810B71A
-_0810B734:
-	movs r0, 0
-_0810B736:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end IsCurMapInLocationList
-
-	thumb_func_start IsCurMapPokeCenter
-IsCurMapPokeCenter: @ 810B73C
-	push {lr}
-	ldr r0, _0810B748 @ =gUnknown_845303C
-	bl IsCurMapInLocationList
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0810B748: .4byte gUnknown_845303C
-	thumb_func_end IsCurMapPokeCenter
-
-	thumb_func_start IsCurMapReloadLocation
-IsCurMapReloadLocation: @ 810B74C
-	push {lr}
-	ldr r0, _0810B758 @ =gUnknown_8453092
-	bl IsCurMapInLocationList
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0810B758: .4byte gUnknown_8453092
-	thumb_func_end IsCurMapReloadLocation
-
-	thumb_func_start sub_810B75C
-sub_810B75C: @ 810B75C
-	push {lr}
-	ldr r0, _0810B768 @ =gUnknown_8453094
-	bl IsCurMapInLocationList
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0810B768: .4byte gUnknown_8453094
-	thumb_func_end sub_810B75C
-
-	thumb_func_start TrySetPokeCenterWarpStatus
-TrySetPokeCenterWarpStatus: @ 810B76C
-	push {lr}
-	bl IsCurMapPokeCenter
-	cmp r0, 0
-	bne _0810B788
-	ldr r0, _0810B784 @ =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0xFD
-	ands r0, r1
-	b _0810B792
-	.align 2, 0
-_0810B784: .4byte gSaveBlock2Ptr
-_0810B788:
-	ldr r0, _0810B798 @ =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0x2
-	orrs r0, r1
-_0810B792:
-	strb r0, [r2, 0x9]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810B798: .4byte gSaveBlock2Ptr
-	thumb_func_end TrySetPokeCenterWarpStatus
-
-	thumb_func_start TrySetReloadWarpStatus
-TrySetReloadWarpStatus: @ 810B79C
-	push {lr}
-	bl IsCurMapReloadLocation
-	cmp r0, 0
-	bne _0810B7B8
-	ldr r0, _0810B7B4 @ =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0xFB
-	ands r0, r1
-	b _0810B7C2
-	.align 2, 0
-_0810B7B4: .4byte gSaveBlock2Ptr
-_0810B7B8:
-	ldr r0, _0810B7C8 @ =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0x4
-	orrs r0, r1
-_0810B7C2:
-	strb r0, [r2, 0x9]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810B7C8: .4byte gSaveBlock2Ptr
-	thumb_func_end TrySetReloadWarpStatus
-
-	thumb_func_start sub_810B7CC
-sub_810B7CC: @ 810B7CC
-	push {lr}
-	bl sub_810B75C
-	cmp r0, 0
-	bne _0810B7E8
-	ldr r0, _0810B7E4 @ =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0xF7
-	ands r0, r1
-	b _0810B7F2
-	.align 2, 0
-_0810B7E4: .4byte gSaveBlock2Ptr
-_0810B7E8:
-	ldr r0, _0810B7F8 @ =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0x8
-	orrs r0, r1
-_0810B7F2:
-	strb r0, [r2, 0x9]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810B7F8: .4byte gSaveBlock2Ptr
-	thumb_func_end sub_810B7CC
-
-	thumb_func_start TrySetMapSaveWarpStatus
-TrySetMapSaveWarpStatus: @ 810B7FC
-	push {lr}
-	bl TrySetPokeCenterWarpStatus
-	bl TrySetReloadWarpStatus
-	bl sub_810B7CC
-	pop {r0}
-	bx r0
-	thumb_func_end TrySetMapSaveWarpStatus
-
-	thumb_func_start sub_810B810
-sub_810B810: @ 810B810
-	ldr r0, _0810B828 @ =gSaveBlock2Ptr
-	ldr r2, [r0]
-	adds r2, 0xA8
-	ldr r0, [r2]
-	movs r1, 0x1
-	orrs r0, r1
-	movs r1, 0x10
-	orrs r0, r1
-	movs r1, 0x20
-	orrs r0, r1
-	str r0, [r2]
-	bx lr
-	.align 2, 0
-_0810B828: .4byte gSaveBlock2Ptr
-	thumb_func_end sub_810B810
-
-	thumb_func_start sub_810B82C
-sub_810B82C: @ 810B82C
-	ldr r3, _0810B854 @ =gSaveBlock2Ptr
-	ldr r2, [r3]
-	ldrb r1, [r2, 0x9]
-	movs r0, 0x80
-	orrs r0, r1
-	strb r0, [r2, 0x9]
-	ldr r2, [r3]
-	adds r2, 0xA8
-	ldr r0, [r2]
-	movs r1, 0x2
-	orrs r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	movs r1, 0x8
-	orrs r0, r1
-	movs r1, 0x80
-	lsls r1, 8
-	orrs r0, r1
-	str r0, [r2]
-	bx lr
-	.align 2, 0
-_0810B854: .4byte gSaveBlock2Ptr
-	thumb_func_end sub_810B82C
-
-	.align 2, 0 @ Don't pad with nop.

asm/script_menu.s

@@ -249,7 +249,7 @@ _0809CB02:
 	lsrs r5, r0, 24
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	mov r2, r10
 	cmp r2, 0x1E
 	beq _0809CB32
@@ -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}
@@ -636,7 +636,7 @@ _0809CE08:
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809CE26
-	bl sub_80F7858
+	bl DisplayYesNoMenuDefaultYes
 	adds r0, r4, 0
 	movs r1, 0x50
 	bl CreateTask
@@ -822,7 +822,7 @@ _0809CF08:
 	lsrs r0, 24
 	strh r0, [r4, 0x14]
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	ldrb r0, [r4, 0x14]
 	lsls r5, 27
 	lsrs r5, 24
@@ -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:
@@ -914,8 +914,8 @@ _0809D034:
 _0809D03C: .4byte gSpecialVar_Result
 	thumb_func_end sub_809CFDC
 
-	thumb_func_start sp109_CreatePCMenu
+	thumb_func_start ScrSpecial_CreatePCMenu
-sp109_CreatePCMenu: @ 809D040
+ScrSpecial_CreatePCMenu: @ 809D040
 	push {lr}
 	ldr r0, _0809D060 @ =sub_809CC98
 	bl FuncIsActiveTask
@@ -937,7 +937,7 @@ _0809D068:
 _0809D06A:
 	pop {r1}
 	bx r1
-	thumb_func_end sp109_CreatePCMenu
+	thumb_func_end ScrSpecial_CreatePCMenu
 
 	thumb_func_start sub_809D070
 sub_809D070: @ 809D070
@@ -989,7 +989,7 @@ _0809D0B0:
 	lsrs r6, r0, 24
 	adds r0, r6, 0
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	ldr r2, _0809D128 @ =gUnknown_8417BD3
 	movs r0, 0x22
 	str r0, [sp]
@@ -1050,7 +1050,7 @@ _0809D14C:
 	lsrs r6, r0, 24
 	adds r0, r6, 0
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	mov r0, r8
 	bl FlagGet
 	lsls r0, 24
@@ -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
@@ -1159,8 +1159,8 @@ _0809D24C: .4byte gStringVar4
 _0809D250: .4byte gUnknown_8417BB6
 	thumb_func_end sub_809D070
 
-	thumb_func_start sub_809D254
+	thumb_func_start ScriptMenu_DisplayPCStartupPrompt
-sub_809D254: @ 809D254
+ScriptMenu_DisplayPCStartupPrompt: @ 809D254
 	push {lr}
 	sub sp, 0x10
 	movs r0, 0
@@ -1184,7 +1184,7 @@ sub_809D254: @ 809D254
 	bx r0
 	.align 2, 0
 _0809D284: .4byte gUnknown_81A508A
-	thumb_func_end sub_809D254
+	thumb_func_end ScriptMenu_DisplayPCStartupPrompt
 
 	thumb_func_start sub_809D288
 sub_809D288: @ 809D288
@@ -1326,9 +1326,9 @@ _0809D31C:
 	strb r0, [r1, 0x5]
 	ldrb r0, [r3, 0x12]
 	movs r1, 0x1
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 	movs r0, 0x1
 	b _0809D3C2
 	.align 2, 0
@@ -1613,9 +1613,9 @@ _0809D572:
 	strh r2, [r1, 0x8]
 	strh r5, [r1, 0xC]
 	movs r1, 0x1
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
+	bl ScheduleBgCopyTilemapToVram
 _0809D5F2:
 	movs r0, 0x1
 _0809D5F4:
@@ -1859,7 +1859,7 @@ _0809D7B8:
 	lsrs r7, r0, 24
 	adds r0, r7, 0
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	movs r6, 0
 	mov r5, r9
 	subs r5, 0x2
@@ -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}

asm/script_movement.s

@@ -565,7 +565,7 @@ sub_80977F0: @ 80977F0
 	cmp r0, 0
 	beq _08097838
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809786A
@@ -583,7 +583,7 @@ _08097838:
 _08097850: .4byte gMapObjects
 _08097854:
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809786A

asm/shop.s

@@ -49,7 +49,7 @@ _0809AAF8:
 	strb r0, [r4]
 	ldrb r0, [r4]
 	movs r1, 0
-	bl sub_80F7750
+	bl SetStdWindowBorderStyle
 	movs r0, 0x2
 	movs r1, 0
 	bl GetMenuCursorDimensionByFont
@@ -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

asm/slot_machine.s

@@ -2689,7 +2689,7 @@ sub_8140C0C: @ 8140C0C
 	ldr r4, _08140C3C @ =gUnknown_84655B0
 _08140C12:
 	adds r0, r4, 0
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	adds r4, 0x8
 	adds r5, 0x1
 	cmp r5, 0x2
@@ -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

asm/smokescreen.s

@@ -26,9 +26,9 @@ sub_804A76C: @ 804A76C
 	cmp r0, r1
 	bne _0804A79E
 	adds r0, r5, 0
-	bl sub_800F034
+	bl LoadCompressedSpriteSheetUsingHeap
 	ldr r0, _0804A8AC @ =gUnknown_8250994
-	bl sub_800F078
+	bl LoadCompressedSpritePaletteUsingHeap
 _0804A79E:
 	ldr r0, _0804A8B0 @ =sub_804A8C0
 	bl CreateInvisibleSpriteWithCallback

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
@@ -1179,7 +1179,7 @@ sub_806F69C: @ 806F69C
 	movs r1, 0x1
 	bl sub_80F7768
 	movs r0, 0x1
-	bl sub_80F6E08
+	bl AddTextPrinterForMessage
 	ldr r1, _0806F6CC @ =gUnknown_3000FA9
 	movs r0, 0x1
 	strb r0, [r1]
@@ -1329,7 +1329,7 @@ sub_806F7A8: @ 806F7A8
 	lsrs r0, 24
 	movs r1, 0
 	bl ClearStdWindowAndFrame
-	bl remove_start_menu_window_maybe
+	bl RemoveStartMenuWindow
 	movs r0, 0
 	bl sub_8112EDC
 	bl sub_806FCF4
@@ -1347,7 +1347,7 @@ _0806F7D8: .4byte sub_806F7DC
 	thumb_func_start sub_806F7DC
 sub_806F7DC: @ 806F7DC
 	push {lr}
-	bl sub_80F7858
+	bl DisplayYesNoMenuDefaultYes
 	ldr r1, _0806F7F0 @ =gUnknown_3000FA4
 	ldr r0, _0806F7F4 @ =sub_806F7F8
 	str r0, [r1]
@@ -1451,7 +1451,7 @@ _0806F8A0: .4byte sub_806F8A4
 	thumb_func_start sub_806F8A4
 sub_806F8A4: @ 806F8A4
 	push {lr}
-	bl sub_80F7858
+	bl DisplayYesNoMenuDefaultYes
 	ldr r1, _0806F8B8 @ =gUnknown_3000FA4
 	ldr r0, _0806F8BC @ =sub_806F8DC
 	str r0, [r1]
@@ -1466,7 +1466,7 @@ _0806F8BC: .4byte sub_806F8DC
 	thumb_func_start sub_806F8C0
 sub_806F8C0: @ 806F8C0
 	push {lr}
-	bl sub_80F7880
+	bl DisplayYesNoMenuDefaultNo
 	ldr r1, _0806F8D4 @ =gUnknown_3000FA4
 	ldr r0, _0806F8D8 @ =sub_806F8DC
 	str r0, [r1]
@@ -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
@@ -2198,7 +2198,7 @@ sub_806FEA0: @ 806FEA0
 	lsrs r0, 24
 	movs r1, 0x1
 	bl ClearStdWindowAndFrame
-	bl remove_start_menu_window_maybe
+	bl RemoveStartMenuWindow
 	bl sub_80696C0
 	bl ScriptContext2_Disable
 	pop {r0}

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
@@ -1106,7 +1106,7 @@ _08079248:
 	bne _080792A6
 	bl SeedRngAndSetTrainerId
 	bl SetSaveBlocksPointers
-	bl sub_8054A28
+	bl ResetMenuAndMonGlobals
 	bl Save_ResetSaveCounters
 	movs r0, 0
 	bl Save_LoadGameData
@@ -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
@@ -1704,7 +1704,7 @@ sub_8079708: @ 8079708
 	ldr r4, _08079728 @ =gUnknown_83BFB9C
 _0807970E:
 	adds r0, r4, 0
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	adds r4, 0x8
 	adds r5, 0x1
 	cmp r5, 0x3

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
@@ -7292,7 +7292,7 @@ _08050040:
 	ldr r1, [r1, 0x8]
 	adds r2, r5, 0
 	adds r3, r7, 0
-	bl sub_800ECC4
+	bl HandleLoadSpecialPokePic
 	movs r4, 0
 	b _0805009A
 	.align 2, 0
@@ -7316,7 +7316,7 @@ _0805007C:
 _0805009A:
 	mov r0, r8
 	bl GetMonSpritePalStruct
-	bl LoadCompressedObjectPalette
+	bl LoadCompressedSpritePalette
 	ldr r0, _080500C4 @ =gUnknown_2031DAC
 	ldr r1, [r0]
 	adds r0, r1, 0
@@ -10813,7 +10813,7 @@ _08052042:
 	ldr r1, [r1]
 	ldr r1, [r1, 0x10]
 	ldr r3, [r3, 0x6C]
-	bl sub_800ECC4
+	bl HandleLoadSpecialPokePic
 	ldr r1, [r7]
 	b _080522AC
 	.align 2, 0
@@ -13038,7 +13038,7 @@ _0805349E:
 	ldr r1, [r1]
 	ldr r1, [r1, 0x10]
 	ldr r3, [r3, 0x6C]
-	bl sub_800ECC4
+	bl HandleLoadSpecialPokePic
 	ldr r1, [r7]
 	b _08053708
 	.align 2, 0

asm/trainer_see.s

@@ -601,7 +601,7 @@ _08081F54:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 _08081F82:
@@ -658,12 +658,12 @@ sub_8081FD0: @ 8081FD0
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08081FEE
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08082022
@@ -680,7 +680,7 @@ _08081FEE:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0xE]
 	subs r0, 0x1
 	strh r0, [r5, 0xE]
@@ -688,7 +688,7 @@ _08081FEE:
 _08082014:
 	adds r0, r4, 0
 	movs r1, 0x4A
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -705,12 +705,12 @@ sub_808202C: @ 808202C
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808204A
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820AC
@@ -743,12 +743,12 @@ _0808204A:
 	ldr r1, _080820B8 @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820A2
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820AC
@@ -780,12 +780,12 @@ sub_80820BC: @ 80820BC
 	ldr r1, _080820FC @ =gMapObjects
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820E8
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080820EE
@@ -808,19 +808,19 @@ sub_8082100: @ 8082100
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808211E
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808212C
 _0808211E:
 	adds r0, r4, 0
 	movs r1, 0x67
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -836,7 +836,7 @@ sub_8082134: @ 8082134
 	push {r4,lr}
 	adds r4, r1, 0
 	adds r0, r2, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08082148
@@ -855,19 +855,19 @@ sub_8082150: @ 8082150
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808216E
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808217C
 _0808216E:
 	adds r0, r4, 0
 	movs r1, 0x4A
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -884,7 +884,7 @@ sub_8082184: @ 8082184
 	adds r5, r1, 0
 	adds r4, r2, 0
 	adds r0, r4, 0
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
+	bl FieldObjectCheckHeldMovementStatus
 	lsls r0, 24
 	cmp r0, 0
 	beq _080821CA
@@ -961,7 +961,7 @@ sub_80821DC: @ 80821DC
 	orrs r1, r2
 	strb r1, [r0, 0x5]
 	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	ldrb r0, [r4, 0x18]
 	lsls r0, 28
 	lsrs r0, 28
@@ -970,7 +970,7 @@ sub_80821DC: @ 80821DC
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]
@@ -1069,7 +1069,7 @@ sub_80822CC: @ 80822CC
 	lsls r0, 2
 	ldr r4, _0808234C @ =gMapObjects
 	adds r0, r4
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08082312
@@ -1079,7 +1079,7 @@ sub_80822CC: @ 80822CC
 	adds r0, r1
 	lsls r0, 2
 	adds r0, r4
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808236E
@@ -1104,7 +1104,7 @@ _08082312:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x12]
 	adds r0, 0x1
 	strh r0, [r5, 0x12]
@@ -1160,7 +1160,7 @@ sub_808237C: @ 808237C
 	lsls r0, 2
 	ldr r4, _08082408 @ =gMapObjects
 	adds r0, r4
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+	bl FieldObjectIsMovementOverridden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080823CC
@@ -1170,7 +1170,7 @@ sub_808237C: @ 808237C
 	adds r0, r1
 	lsls r0, 2
 	adds r0, r4
-	bl FieldObjectClearAnimIfSpecialAnimFinished
+	bl FieldObjectClearHeldMovementIfFinished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808242E
@@ -1195,7 +1195,7 @@ _080823CC:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
-	bl sub_8063CA4
+	bl FieldObjectSetHeldMovement
 	ldrh r0, [r5, 0x12]
 	adds r0, 0x1
 	strh r0, [r5, 0x12]

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
@@ -5510,7 +5510,7 @@ sub_812AE70: @ 812AE70
 	ldr r4, _0812AE9C @ =gUnknown_845AF58
 _0812AE76:
 	adds r0, r4, 0
-	bl LoadCompressedObjectPic
+	bl LoadCompressedSpriteSheet
 	adds r4, 0x8
 	adds r5, 0x1
 	cmp r5, 0x4

asm/wild_encounter.s

@@ -482,7 +482,7 @@ _08082A8E:
 	lsrs r0, 16
 	orrs r4, r0
 	adds r0, r4, 0
-	bl GetUnownLetterByPersonality
+	bl GetUnownLetterByPersonalityLoByte
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, r5
@@ -493,8 +493,8 @@ _08082A8E:
 	bx r1
 	thumb_func_end sub_8082A88
 
-	thumb_func_start GetUnownLetterByPersonality
+	thumb_func_start GetUnownLetterByPersonalityLoByte
-GetUnownLetterByPersonality: @ 8082AB8
+GetUnownLetterByPersonalityLoByte: @ 8082AB8
 	push {lr}
 	adds r2, r0, 0
 	movs r0, 0xC0
@@ -520,7 +520,7 @@ GetUnownLetterByPersonality: @ 8082AB8
 	lsrs r0, 24
 	pop {r1}
 	bx r1
-	thumb_func_end GetUnownLetterByPersonality
+	thumb_func_end GetUnownLetterByPersonalityLoByte
 
 	thumb_func_start sub_8082AEC
 sub_8082AEC: @ 8082AEC
@@ -1020,8 +1020,8 @@ _08082EB6:
 _08082EBC: .4byte gSpecialVar_Result
 	thumb_func_end sub_8082E54
 
-	thumb_func_start sub_8082EC0
+	thumb_func_start SweetScentWildEncounter
-sub_8082EC0: @ 8082EC0
+SweetScentWildEncounter: @ 8082EC0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -1108,7 +1108,7 @@ _08082F6E:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8082EC0
+	thumb_func_end SweetScentWildEncounter
 
 	thumb_func_start sub_8082F78
 sub_8082F78: @ 8082F78

berry_fix/payload/include/global.fieldmap.h

@@ -309,7 +309,7 @@ struct Camera
     s32 y;
 };
 
-extern struct EventObject gEventObjects[];
+extern struct EventObject gMapObjects[];
 extern u8 gSelectedEventObject;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;

data/data_83FECCC.s

@@ -553,21 +553,8 @@ gUnknown_841F1C8:: @ 841F1C8
 gTMCaseMainWindowPalette:: @ 841F408
 	.incbin "graphics/tm_case/unk_841F408.gbapal"
 
-gUnknown_841F428:: @ 841F428
+	.section .rodata.841F4B4
-	.incbin "baserom.gba", 0x41F428, 0x4
+	.align 2
-
-gUnknown_841F42C:: @ 841F42C
-	.incbin "baserom.gba", 0x41F42C, 0x10
-
-gUnknown_841F43C:: @ 841F43C
-	.incbin "baserom.gba", 0x41F43C, 0x8
-
-gUnknown_841F444:: @ 841F444
-	.incbin "baserom.gba", 0x41F444, 0x60
-
-gUnknown_841F4A4:: @ 841F4A4
-	.incbin "baserom.gba", 0x41F4A4, 0x10
-
 gUnknown_841F4B4:: @ 841F4B4
 	.incbin "baserom.gba", 0x41F4B4, 0x1F534
 
@@ -982,17 +969,7 @@ gUnknown_8452F6C:: @ 8452F6C
 gUnknown_8452F7C:: @ 8452F7C
 	.incbin "baserom.gba", 0x452F7C, 0xC0
 
-gUnknown_845303C:: @ 845303C
-	.incbin "baserom.gba", 0x45303C, 0x56
-
-gUnknown_8453092:: @ 8453092
-	.incbin "baserom.gba", 0x453092, 0x2
-
-gUnknown_8453094:: @ 8453094
-	.incbin "baserom.gba", 0x453094, 0x4
-
 	.section .rodata.8453F6C
-
 // mailbox_pc.o
 gUnknown_8453FE8:: @ 8453FE8
 	.incbin "baserom.gba", 0x453FE8, 0x18

data/map_event_scripts.inc

@@ -3545,7 +3545,7 @@ CeruleanCave_B1F_EventScript_1BE00C:: @ 81BE00C
 CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C
 	.incbin "baserom.gba", 0x1BE00C, 0x58
 
-gUnknown_81BE064:: @ 81BE064
+EventScript_FldEffRockSmash:: @ 81BE064
 	.incbin "baserom.gba", 0x1BE064, 0xB9
 
 MtEmber_Exterior_EventScript_1BE11D:: @ 81BE11D
@@ -3566,7 +3566,7 @@ SeafoamIslands_B1F_EventScript_1BE11D:: @ 81BE11D
 VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D
 	.incbin "baserom.gba", 0x1BE11D, 0x51
 
-gUnknown_81BE16E:: @ 81BE16E
+EventScript_FldEffStrength:: @ 81BE16E
 	.incbin "baserom.gba", 0x1BE16E, 0x149
 
 gUnknown_81BE2B7:: @ 81BE2B7
@@ -3575,7 +3575,7 @@ gUnknown_81BE2B7:: @ 81BE2B7
 gUnknown_81BE2FF:: @ 81BE2FF
 	.incbin "baserom.gba", 0x1BE2FF, 0x265
 
-gUnknown_81BE564:: @ 81BE564
+EventScript_FailSweetScent:: @ 81BE564
 	.incbin "baserom.gba", 0x1BE564, 0x2A
 
 Route2_EventScript_1BE58E:: @ 81BE58E

data/maps/FiveIsland_RocketWarehouse/scripts.inc

@@ -113,7 +113,7 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
 
 EventScript_1640A2:: @ 81640A2
 	getplayerxy VAR_0x8004, VAR_0x8005
-	specialvar VAR_RESULT, player_get_direction_lower_nybble
+	specialvar VAR_RESULT, GetPlayerFacingDirection
 	compare_var_to_value VAR_RESULT, 2
 	call_if 1, EventScript_16412E
 	msgbox gUnknown_817B7AE

data/specials.inc

@@ -162,7 +162,7 @@ gSpecials:: @ 815FD60
 	def_special sub_80CA758
 	def_special nullsub_75
 	def_special nullsub_75
-	def_special sub_8055DC4
+	def_special Overworld_PlaySpecialMapMusic
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75
@@ -271,8 +271,8 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75
-	def_special sp109_CreatePCMenu
+	def_special ScrSpecial_CreatePCMenu
-	def_special sub_80CA574
+	def_special HallOfFamePCBeginFade
 	def_special sub_80CA618
 	def_special nullsub_75
 	def_special nullsub_75
@@ -296,7 +296,7 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special sub_80CAAAC
 	def_special sub_80CAABC
-	def_special player_get_direction_lower_nybble
+	def_special GetPlayerFacingDirection
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75
@@ -435,7 +435,7 @@ gSpecials:: @ 815FD60
 	def_special sub_809D764
 	def_special sub_809D8C0
 	def_special sub_8147500
-	def_special player_get_direction_lower_nybble
+	def_special GetPlayerFacingDirection
 	def_special sub_80CCDFC
 	def_special sub_80CD008
 	def_special sub_8147594

include/bg.h

@@ -25,6 +25,17 @@ enum
     BG_CTRL_ATTR_WRAPAROUND = 8,
 };
 
+enum AdjustBgMosaicMode
+{
+    BG_MOSAIC_SET,
+    BG_MOSAIC_SET_H,
+    BG_MOSAIC_INC_H,
+    BG_MOSAIC_DEC_H,
+    BG_MOSAIC_SET_V,
+    BG_MOSAIC_INC_V,
+    BG_MOSAIC_DEC_V,
+};
+
 enum BgTileAllocMode
 {
     BG_TILE_FIND_FREE_SPACE,
@@ -71,7 +82,7 @@ u32 ChangeBgY(u8 bg, u32 value, u8 op);
 u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op);
 u32 GetBgY(u8 bg);
 void SetBgAffine(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle);
-u8 Unused_AdjustBgMosaic(u8 a1, u8 a2);
+u8 AdjustBgMosaic(u8 value, u8 mode);
 void SetBgTilemapBuffer(u8 bg, void *tilemap);
 void UnsetBgTilemapBuffer(u8 bg);
 void* GetBgTilemapBuffer(u8 bg);

include/decompress.h

@@ -10,15 +10,13 @@ extern u8 gDecompressionBuffer[0x4000];
 void LZDecompressWram(const void *src, void *dest);
 void LZDecompressVram(const void *src, void *dest);
 
-u16 LoadCompressedObjectPic(const struct CompressedSpriteSheet *src);
+u16 LoadCompressedSpriteSheet(const struct CompressedSpriteSheet *src);
-void LoadCompressedObjectPicOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer);
+void LoadCompressedSpriteSheetOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer);
-bool8 LoadCompressedObjectPicUsingHeap(const struct CompressedSpriteSheet* src);
+bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet* src);
 
-void LoadCompressedObjectPalette(const struct CompressedSpritePalette *src);
+void LoadCompressedSpritePalette(const struct CompressedSpritePalette *src);
-void LoadCompressedObjectPaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer);
+void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer);
-bool8 LoadCompressedObjectPaletteUsingHeap(const struct CompressedSpritePalette *src);
+bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette *src);
-
-bool8 sub_800F078(const struct CompressedSpritePalette *src);
 
 void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
 void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, void* buffer, s32 species);
@@ -27,15 +25,12 @@ void DecompressPicFromTable_DontHandleDeoxys(const struct CompressedSpriteSheet
 void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
 void HandleLoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
 void HandleLoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
-void sub_800ECC4(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
+void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality);
 
 void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
 void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
 void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);
 
-u32 sub_8034974(const u8 *ptr);
-
-void sub_800F034(const struct CompressedSpriteSheet *src);
 u32 GetDecompressedDataSize(const u8 *ptr);
 
 #endif // GUARD_DECOMPRESS_H

include/dma3.h

@@ -3,10 +3,55 @@
 
 #include "global.h"
 
+// Maximum amount of data we will transfer in one operation
+#define MAX_DMA_BLOCK_SIZE 0x1000
+
+#define Dma3CopyLarge_(src, dest, size, bit)               \
+{                                                          \
+    const void *_src = src;                                \
+    void *_dest = dest;                                    \
+    u32 _size = size;                                      \
+    while (1)                                              \
+    {                                                      \
+        if (_size <= MAX_DMA_BLOCK_SIZE)                   \
+        {                                                  \
+            DmaCopy##bit(3, _src, _dest, _size);           \
+            break;                                         \
+        }                                                  \
+        DmaCopy##bit(3, _src, _dest, MAX_DMA_BLOCK_SIZE);  \
+        _src += MAX_DMA_BLOCK_SIZE;                        \
+        _dest += MAX_DMA_BLOCK_SIZE;                       \
+        _size -= MAX_DMA_BLOCK_SIZE;                       \
+    }                                                      \
+}
+
+#define Dma3CopyLarge16_(src, dest, size) Dma3CopyLarge_(src, dest, size, 16)
+#define Dma3CopyLarge32_(src, dest, size) Dma3CopyLarge_(src, dest, size, 32)
+
+#define Dma3FillLarge_(value, dest, size, bit)             \
+{                                                          \
+    void *_dest = dest;                                    \
+    u32 _size = size;                                      \
+    while (1)                                              \
+    {                                                      \
+        if (_size <= MAX_DMA_BLOCK_SIZE)                   \
+        {                                                  \
+            DmaFill##bit(3, value, _dest, _size);          \
+            break;                                         \
+        }                                                  \
+        DmaFill##bit(3, value, _dest, MAX_DMA_BLOCK_SIZE); \
+        _dest += MAX_DMA_BLOCK_SIZE;                       \
+        _size -= MAX_DMA_BLOCK_SIZE;                       \
+    }                                                      \
+}
+
+#define Dma3FillLarge16_(value, dest, size) Dma3FillLarge_(value, dest, size, 16)
+#define Dma3FillLarge32_(value, dest, size) Dma3FillLarge_(value, dest, size, 32)
+
 void ClearDma3Requests(void);
 void ProcessDma3Requests(void);
-int RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode);
+s16 RequestDma3Copy(const void *src, void *dest, u16 size, u8 mode);
-int RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode);
+s16 RequestDma3Fill(s32 value, void *dest, u16 size, u8 mode);
-int CheckForSpaceForDma3Request(s16 index);
+s16 CheckForSpaceForDma3Request(s16 index);
 
 #endif // GUARD_DMA3_H

include/event_scripts.h

@@ -1144,4 +1144,8 @@ extern const u8 gUnknown_81BB084[];
 extern const u8 gUnknown_81BB0DF[];
 extern const u8 gUnknown_81BB156[];
 
+extern const u8 EventScript_FldEffStrength[];
+extern const u8 EventScript_FailSweetScent[];
+extern const u8 EventScript_FldEffRockSmash[];
+
 #endif //GUARD_EVENT_SCRIPTS_H

include/field_map_obj.h

@@ -76,18 +76,20 @@ u8 GetStepInPlaceDelay32AnimId(u32);
 u8 npc_block_way(struct MapObject *, s16, s16, u32);
 void MoveCoords(u8, s16 *, s16 *);
 bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
-u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
+u8 FieldObjectClearHeldMovementIfFinished(struct MapObject *);
 u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z);
 void sub_8063E28(struct MapObject *, struct Sprite *);
-void sub_8063CA4(struct MapObject *, u8);
+void FieldObjectSetHeldMovement(struct MapObject *, u8);
 void npc_coords_shift_still(struct MapObject *);
 void sub_805FE7C(struct MapObject *, u8);
 void npc_set_running_behaviour_etc(struct MapObject *, u8);
 u8 sub_80634F0(u8 direction);
 u8 sub_8063500(u8 a0);
-void sub_805F060(struct MapObject *mapObject, u8 a1);
+void EventObjectSetGraphicsId(struct MapObject *mapObject, u8 a1);
 u8 sub_805EB44(u8, u8, s16, s16);
 void npc_paltag_set_load(u8 mode);
+bool8 FieldObjectIsMovementOverridden(struct MapObject *mapObject);
+u8 FieldObjectCheckHeldMovementStatus(struct MapObject *mapObject);
 
 // Exported data declarations
 

include/field_player_avatar.h

@@ -8,7 +8,7 @@ void SetPlayerAvatarExtraStateTransition(u8, u8);
 u8 GetPlayerAvatarGenderByGraphicsId(u8);
 bool8 TestPlayerAvatarFlags(u8);
 void PlayerGetDestCoords(s16 *, s16 *);
-u8 player_get_direction_lower_nybble(void);
+u8 GetPlayerFacingDirection(void);
 u8 player_get_direction_upper_nybble(void);
 u8 player_get_x22(void);
 
@@ -24,5 +24,9 @@ void sub_805DAE4(u8 direction);
 void SetPlayerAvatarTransitionFlags(u16 a);
 bool8 IsPlayerFacingSurfableFishableWater(void);
 void sub_805D2C0(u8 secondaryId);
+u8 GetPlayerAvatarObjectId(void);
+u8 PlayerGetZCoord(void);
+u8 GetPlayerAvatarGraphicsIdByCurrentState(void);
+void sub_805CB70(void);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H

include/field_weather.h

@@ -14,5 +14,7 @@ void SetSav1WeatherFromCurrMapHeader(void);
 void sub_807B0C4(u16 *, u16 *, u32);
 void PlayRainStoppingSoundEffect(void);
 bool8 sub_807AA70(void);
+void SetWeatherScreenFadeOut(void);
+void sub_807B070(void);
 
 #endif // GUARD_WEATHER_H

include/fldeff.h

@@ -1,7 +1,51 @@
 #ifndef GUARD_FLDEFF_H
 #define GUARD_FLDEFF_H
 
-// rock smash
+#define FLDEFF_CALL_FUNC_IN_DATA() ((void (*)(void))(((u16)gTasks[taskId].data[8] << 16) | (u16)gTasks[taskId].data[9]))();
+
+#define FLDEFF_SET_FUNC_TO_DATA(func)                     \
+gTasks[taskId].data[8] = (u32)func >> 16;                 \
+gTasks[taskId].data[9] = (u32)func;
+
+extern struct MapPosition gPlayerFacingPosition;
+
+bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
 u8 oei_task_add(void);
 
+// flash
+
+// cut
+
+// dig
+bool8 SetUpFieldMove_Dig(void);
+bool8 FldEff_UseDig(void);
+
+// rocksmash
+bool8 SetUpFieldMove_RockSmash(void);
+bool8 FldEff_UseRockSmash(void);
+
+// berrytree
+void nullsub_56(void);
+
+// poison
+void FldEffPoison_Start(void);
+bool32 FldEffPoison_IsActive(void);
+
+// strength
+bool8 SetUpFieldMove_Strength(void);
+bool8 sub_80D0860(void);
+
+// teleport
+bool8 SetUpFieldMove_Teleport(void);
+bool8 FldEff_UseTeleport(void);
+
+// softboiled
+bool8 hm_prepare_dive_probably(void);
+void sub_80E56DC(u8 taskId);
+void sub_80E5724(u8 taskId);
+
+// sweetscent
+bool8 SetUpFieldMove_SweetScent(void);
+bool8 FldEff_SweetScent(void);
+
 #endif // GUARD_FLDEFF_H

include/fldeff_80F9BCC.h

@@ -1,16 +0,0 @@
-#ifndef GUARD_FLDEFF_80F9BCC_H
-#define GUARD_FLDEFF_80F9BCC_H
-
-#include "global.h"
-
-// Exported type declarations
-
-// Exported RAM declarations
-
-// Exported ROM declarations
-
-void sub_80FA5E4(s16 id, s16 x, s16 y);
-void sub_80FA794(s16 x, s16 y);
-void overworld_poison_effect(void);
-
-#endif //GUARD_FLDEFF_80F9BCC_H

include/gba/defines.h

@@ -40,6 +40,9 @@
 #define BG_SCREEN_ADDR(n) (void *)(BG_VRAM + (BG_SCREEN_SIZE * (n)))
 #define BG_TILE_ADDR(n)   (void *)(BG_VRAM + (0x80 * (n)))
 
+#define BG_TILE_H_FLIP(n) (0x400 + (n))
+#define BG_TILE_V_FLIP(n) (0x800 + (n))
+
 // text-mode BG
 #define OBJ_VRAM0      (void *)(VRAM + 0x10000)
 #define OBJ_VRAM0_SIZE 0x8000

include/gba/multiboot.h

@@ -18,9 +18,9 @@ struct MultiBootParam
     u8 response_bit;
     u8 client_bit;
     u8 reserved1;
-    u8 *boot_srcp;
+    const u8 *boot_srcp;
-    u8 *boot_endp;
+    const u8 *boot_endp;
-    u8 *masterp;
+    const u8 *masterp;
     u8 *reserved2[MULTIBOOT_NCHILD];
     u32 system_work2[4];
     u8 sendflag;

include/global.h

@@ -209,7 +209,7 @@ struct SaveBlock2
 {
     /*0x000*/ u8 playerName[PLAYER_NAME_LENGTH];
     /*0x008*/ u8 playerGender; // MALE, FEMALE
-    /*0x009*/ u8 specialSaveWarp;
+    /*0x009*/ u8 specialSaveWarpFlags;
     /*0x00A*/ u8 playerTrainerId[4];
     /*0x00E*/ u16 playTimeHours;
     /*0x010*/ u8 playTimeMinutes;
@@ -726,8 +726,14 @@ struct SaveBlock1
     /*0x3D38*/ struct TrainerTowerLog unkArray[4];
 };
 
-extern struct SaveBlock1* gSaveBlock1Ptr;
+struct MapPosition
+{
+    s16 x;
+    s16 y;
+    s8 height;
+};
 
+extern struct SaveBlock1* gSaveBlock1Ptr;
 extern u8 gReservedSpritePaletteCount;
 
 #endif // GUARD_GLOBAL_H

include/hall_of_fame.h

@@ -7,5 +7,8 @@ void CB2_DoHallOfFameScreen(void);
 void CB2_DoHallOfFameScreenDontSaveData(void);
 void CB2_DoHallOfFamePC(void);
 void sub_8175280(void);
+void sub_80F2978(void);
+void HallOfFamePCBeginFade(void);
+void ReturnFromHallOfFamePC(void);
 
 #endif // GUARD_HALL_OF_FAME_H