From 96656fdc69964c2f4d7e0ce2c3dbfd1729f75af0 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 10 Jul 2022 21:11:03 -0400
Subject: Identify some `.asm_*` labels

---
 engine/overworld/field_move_messages.asm |  4 ++--
 engine/overworld/pathfinding.asm         |  8 ++++----
 engine/overworld/player_state.asm        |  4 ++--
 engine/overworld/spinners.asm            | 14 +++++++-------
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'engine/overworld')

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/pathfinding.asm b/engine/overworld/pathfinding.asm
index a824d337..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_f76a
+	jr nz, .stillHasYProgress
 	ldh a, [hFindPathFlags]
 	set 0, a ; current end of path matches the player's Y coordinate
 	ldh [hFindPathFlags], a
-.asm_f76a
+.stillHasYProgress
 	ldh a, [hFindPathXProgress]
 	ld b, a
 	ldh a, [hNPCPlayerXDistance] ; X distance in steps
 	call CalcDifference
 	ld e, a
 	and a
-	jr nz, .asm_f77c
+	jr nz, .stillHasXProgress
 	ldh a, [hFindPathFlags]
 	set 1, a ; current end of path matches the player's X coordinate
 	ldh [hFindPathFlags], a
-.asm_f77c
+.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 c966c128..4e37523b 100644
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -103,10 +103,10 @@ IsPlayerFacingEdgeOfMap::
 	ld b, a
 	ld a, [wXCoord]
 	ld c, a
-	ld de, .returnaddress
+	ld de, .return
 	push de
 	jp hl
-.returnaddress
+.return
 	pop bc
 	pop de
 	pop hl
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"
-- 
cgit v1.3.1-sl0p