Identify some `.asm_*` labels

6 files changed, 21 insertions, 21 deletions

diff --git a/engine/overworld/field_move_messages.asm b/engine/overworld/field_move_messages.asm
index 520ef8ad..d75ffc21 100644
--- a/engine/overworld/field_move_messages.asm
+++ b/engine/overworld/field_move_messages.asm
@@ -32,7 +32,7 @@ IsSurfingAllowed:
 	ret nz
 	CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
 	ret z
-	ld hl, CoordsData_cdf7
+	ld hl, SeafoamIslandsB4FStairsCoords
 	call ArePlayerCoordsInArray
 	ret nc
 	ld hl, wd728
@@ -45,7 +45,7 @@ IsSurfingAllowed:
 	ld hl, CyclingIsFunText
 	jp PrintText
 
-CoordsData_cdf7:
+SeafoamIslandsB4FStairsCoords:
 	dbmapcoord  7, 11
 	db -1 ; end
 
diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm
index 31fdc257..8f88b138 100644
--- a/engine/overworld/missable_objects.asm
+++ b/engine/overworld/missable_objects.asm
@@ -23,9 +23,9 @@ LoadMissableObjects:
 	ld de, MissableObjects     ; calculate difference between out pointer and the base pointer
 	ld a, l
 	sub e
-	jr nc, .asm_f13c
+	jr nc, .noCarry
 	dec h
-.asm_f13c
+.noCarry
 	ld l, a
 	ld a, h
 	sub d
diff --git a/engine/overworld/pathfinding.asm b/engine/overworld/pathfinding.asm
index 1925dbbc..d067345e 100644
--- a/engine/overworld/pathfinding.asm
+++ b/engine/overworld/pathfinding.asm
@@ -14,22 +14,22 @@ FindPathToPlayer:
 	call CalcDifference
 	ld d, a
 	and a
-	jr nz, .asm_f8da
+	jr nz, .stillHasYProgress
 	ldh a, [hFindPathFlags]
 	set 0, a ; current end of path matches the player's Y coordinate
 	ldh [hFindPathFlags], a
-.asm_f8da
+.stillHasYProgress
 	ldh a, [hFindPathXProgress]
 	ld b, a
 	ldh a, [hNPCPlayerXDistance] ; X distance in steps
 	call CalcDifference
 	ld e, a
 	and a
-	jr nz, .asm_f8ec
+	jr nz, .stillHasXProgress
 	ldh a, [hFindPathFlags]
 	set 1, a ; current end of path matches the player's X coordinate
 	ldh [hFindPathFlags], a
-.asm_f8ec
+.stillHasXProgress
 	ldh a, [hFindPathFlags]
 	cp $3 ; has the end of the path reached the player's position?
 	jr z, .done
diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm
index 70326754..8d652cdf 100644
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -101,10 +101,10 @@ IsPlayerFacingEdgeOfMap::
 	ld b, a
 	ld a, [wXCoord]
 	ld c, a
-	ld de, .asm_c41e
+	ld de, .return
 	push de
 	jp hl
-.asm_c41e
+.return
 	pop bc
 	pop de
 	pop hl
@@ -239,11 +239,11 @@ PrintSafariZoneSteps::
 	call PlaceString
 	ld a, [wNumSafariBalls]
 	cp 10
-	jr nc, .asm_c56d
+	jr nc, .tenOrMore
 	hlcoord 5, 3
 	ld a, " "
 	ld [hl], a
-.asm_c56d
+.tenOrMore
 	hlcoord 6, 3
 	ld de, wNumSafariBalls
 	lb bc, 1, 2
diff --git a/engine/overworld/spinners.asm b/engine/overworld/spinners.asm
index 0ac6380d..98b478c4 100644
--- a/engine/overworld/spinners.asm
+++ b/engine/overworld/spinners.asm
@@ -11,18 +11,18 @@ LoadSpinnerArrowTiles::
 	ld a, [wCurMapTileset]
 	cp FACILITY
 	ld hl, FacilitySpinnerArrows
-	jr z, .asm_44ff6
+	jr z, .gotSpinnerArrows
 	ld hl, GymSpinnerArrows
-.asm_44ff6
+.gotSpinnerArrows
 	ld a, [wSimulatedJoypadStatesIndex]
 	bit 0, a
-	jr nz, .asm_45001
-	ld de, $18
+	jr nz, .alternateGraphics
+	ld de, 6 * 4
 	add hl, de
-.asm_45001
+.alternateGraphics
 	ld a, $4
 	ld bc, $0
-.asm_45006
+.loop
 	push af
 	push hl
 	push bc
@@ -46,7 +46,7 @@ LoadSpinnerArrowTiles::
 	pop hl
 	pop af
 	dec a
-	jr nz, .asm_45006
+	jr nz, .loop
 	ret
 
 INCLUDE "data/tilesets/spinner_tiles.asm"
diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm
index fa5cf626..d36e1169 100644
--- a/engine/overworld/tilesets.asm
+++ b/engine/overworld/tilesets.asm
@@ -35,13 +35,13 @@ LoadTilesetHeader:
 	call IsInArray
 	pop de
 	pop hl
-	jr c, .asm_c797
+	jr c, .dungeon
 	ld a, [wCurMapTileset]
 	ld b, a
 	ldh a, [hPreviousTileset]
 	cp b
 	jr z, .done
-.asm_c797
+.dungeon
 	ld a, [wDestinationWarpID]
 	cp $ff
 	jr z, .done