Identify some more unnamed labels

6 files changed, 23 insertions, 26 deletions

diff --git a/engine/overworld/cmd_queue.asm b/engine/overworld/cmd_queue.asm
index 5e29689a..3b8d3ed2 100644
--- a/engine/overworld/cmd_queue.asm
+++ b/engine/overworld/cmd_queue.asm
@@ -158,7 +158,7 @@ CmdQueue_Null:
 	ret
 
 CmdQueue_Type1:
-	call Function2ffe
+	call SetXYCompareFlags
 	ret
 
 CmdQueue_Type4:
diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm
index c9889472..e7a882ae 100644
--- a/engine/overworld/decorations.asm
+++ b/engine/overworld/decorations.asm
@@ -827,7 +827,7 @@ WhichSidePutAwayText:
 
 DecoAction_AskWhichSide:
 	call MenuTextbox
-	ld hl, MenuHeader_0x2707e
+	ld hl, DecoSideMenuHeader
 	call GetMenu2
 	call ExitMenu
 	call CopyMenuData
@@ -860,13 +860,13 @@ QueryWhichSide:
 	pop de
 	ret
 
-MenuHeader_0x2707e:
+DecoSideMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 12, 7
-	dw MenuData_0x27086
+	dw .MenuData
 	db 1 ; default option
 
-MenuData_0x27086:
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 3 ; items
 	db "RIGHT SIDE@"
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index d00796b7..46811d2f 100644
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -386,7 +386,7 @@ SetMinTwoStepWildEncounterCooldown:
 Dummy_CheckScriptFlags3Bit5:
 	call CheckBit5_ScriptFlags3
 	ret z
-	call Function2ffe
+	call SetXYCompareFlags
 	ret
 
 RunSceneScript:
@@ -963,7 +963,7 @@ DoPlayerEvent:
 
 PlayerEventScriptPointers:
 ; entries correspond to PLAYEREVENT_* constants
-	dba Invalid_0x96b60         ; PLAYEREVENT_NONE
+	dba InvalidEventScript      ; PLAYEREVENT_NONE
 	dba SeenByTrainerScript     ; PLAYEREVENT_SEENBYTRAINER
 	dba TalkToTrainerScript     ; PLAYEREVENT_TALKTOTRAINER
 	dba FindItemInBallScript    ; PLAYEREVENT_ITEMBALL
@@ -973,12 +973,12 @@ PlayerEventScriptPointers:
 	dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT
 	dba HatchEggScript          ; PLAYEREVENT_HATCH
 	dba ChangeDirectionScript   ; PLAYEREVENT_JOYCHANGEFACING
-	dba Invalid_0x96b60         ; (NUM_PLAYER_EVENTS)
+	dba InvalidEventScript      ; (NUM_PLAYER_EVENTS)
 
-Invalid_0x96b60:
+InvalidEventScript:
 	end
 
-; unused
+UnusedPlayerEventScript: ; unreferenced
 	end
 
 HatchEggScript:
@@ -993,12 +993,12 @@ WarpToNewMapScript:
 FallIntoMapScript:
 	newloadmap MAPSETUP_FALL
 	playsound SFX_KINESIS
-	applymovement PLAYER, MovementData_0x96c48
+	applymovement PLAYER, .SkyfallMovement
 	playsound SFX_STRENGTH
 	scall LandAfterPitfallScript
 	end
 
-MovementData_0x96c48:
+.SkyfallMovement:
 	skyfall
 	step_end
 
diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm
index 45ad8148..c9a9d251 100644
--- a/engine/overworld/init_map.asm
+++ b/engine/overworld/init_map.asm
@@ -64,11 +64,11 @@ ReanchorBGMap_NoOAMUpdate::
 	ldh [hOAMUpdate], a
 	ld a, 3
 	ldh [hBlackOutBGMapThird], a
-.asm_65bc
+.wait_loop
 	call DelayFrame
 	ldh a, [hBlackOutBGMapThird]
 	and a
-	jr nz, .asm_65bc
+	jr nz, .wait_loop
 	pop af
 	ldh [hOAMUpdate], a
 	pop af
diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm
index d20c719b..43465f73 100644
--- a/engine/overworld/overworld.asm
+++ b/engine/overworld/overworld.asm
@@ -168,7 +168,7 @@ LoadUsedSpritesGFX:
 	call GetUsedSprites
 	ret c
 
-	call _LoadMiscTiles
+	call LoadStillSpriteTiles
 	call LoadMiscTiles
 	ret
 
@@ -213,27 +213,24 @@ GetUsedSprites:
 	scf
 	ret
 
-_LoadMiscTiles:
+LoadStillSpriteTiles:
 	ld a, [wUsedSprites + (SPRITE_GFX_LIST_CAPACITY - 2) * 2]
 	and a
-	jr z, .asm_14274
-
+	jr z, .no_still_sprite_1
 	call GetSprite
 	ld hl, vTiles0 tile $78
 	call Get2bpp
-
-.asm_14274
+.no_still_sprite_1
 	ld a, $78
 	ld [wUsedSprites + (SPRITE_GFX_LIST_CAPACITY - 2) * 2 + 1], a
+
 	ld a, [wUsedSprites + (SPRITE_GFX_LIST_CAPACITY - 1) * 2]
 	and a
-	jr z, .asm_14288
-
+	jr z, .no_still_sprite_2
 	call GetSprite
 	ld hl, vTiles0 tile $7c
 	call Get2bpp
-
-.asm_14288
+.no_still_sprite_2
 	ld a, $7c
 	ld [wUsedSprites + (SPRITE_GFX_LIST_CAPACITY - 1) * 2 + 1], a
 	ret
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 7fcac6af..a958429c 100644
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -364,7 +364,7 @@ DoPlayerMovement::
 	and 7
 	ld e, a
 	ld d, 0
-	ld hl, .data_1021e
+	ld hl, .ledge_table
 	add hl, de
 	ld a, [wFacingDirection]
 	and [hl]
@@ -382,7 +382,7 @@ DoPlayerMovement::
 	xor a
 	ret
 
-.data_1021e
+.ledge_table
 	db FACE_RIGHT             ; COLL_HOP_RIGHT
 	db FACE_LEFT              ; COLL_HOP_LEFT
 	db FACE_UP                ; COLL_HOP_UP