From 77887be2512b4b8af688dc4552bdb4490d35e65b Mon Sep 17 00:00:00 2001
From: Rangi42 <remy.oukaour+rangi42@gmail.com>
Date: Mon, 20 Nov 2023 18:53:23 -0500
Subject: Identify `wSavedCoordIndex` and its other usages

---
 engine/gfx/sprite_oam.asm          | 4 ++--
 engine/items/item_effects.asm      | 2 +-
 engine/menus/pokedex.asm           | 2 +-
 engine/overworld/auto_movement.asm | 4 ++--
 engine/overworld/movement.asm      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engine')

diff --git a/engine/gfx/sprite_oam.asm b/engine/gfx/sprite_oam.asm
index 4a31ab5e..8704814f 100644
--- a/engine/gfx/sprite_oam.asm
+++ b/engine/gfx/sprite_oam.asm
@@ -28,7 +28,7 @@ PrepareOAMData::
 	inc e
 	inc e
 	ld a, [de] ; [x#SPRITESTATEDATA1_IMAGEINDEX]
-	ld [wSpriteImageIndexBackup], a
+	ld [wSavedSpriteImageIndex], a
 	cp $ff ; off-screen (don't draw)
 	jr nz, .visible
 
@@ -98,7 +98,7 @@ PrepareOAMData::
 	push bc
 	ld b, a
 
-	ld a, [wSpriteImageIndexBackup]
+	ld a, [wSavedSpriteImageIndex]
 	swap a                   ; high nybble determines sprite used (0 is always player sprite, next are some npcs)
 	and $f
 
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 927f54cb..12c7dade 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -740,7 +740,7 @@ ItemUseSurfboard:
 	ld a, b
 	ld [wSimulatedJoypadStatesEnd], a
 	xor a
-	ld [wWastedByteCD39], a
+	ld [wUnusedCD39], a
 	inc a
 	ld [wSimulatedJoypadStatesIndex], a
 	ret
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 3411f729..96bae343 100644
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -36,7 +36,7 @@ ShowPokedexMenu:
 	ld [wCurrentMenuItem], a
 	ld [wLastMenuItem], a
 	ldh [hJoy7], a
-	ld [wWastedByteCD3A], a
+	ld [wUnusedCD3A], a
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	pop af
 	ld [wListScrollOffset], a
diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm
index 75816886..53b70c19 100644
--- a/engine/overworld/auto_movement.asm
+++ b/engine/overworld/auto_movement.asm
@@ -17,7 +17,7 @@ PlayerStepOutFromDoor::
 	ret
 .notStandingOnDoor
 	xor a
-	ld [wWastedByteCD3A], a
+	ld [wUnusedCD3A], a
 	ld [wSimulatedJoypadStatesIndex], a
 	ld [wSimulatedJoypadStatesEnd], a
 	ld hl, wd736
@@ -39,7 +39,7 @@ _EndNPCMovementScript::
 	ld [wNPCMovementScriptSpriteOffset], a
 	ld [wNPCMovementScriptPointerTableNum], a
 	ld [wNPCMovementScriptFunctionNum], a
-	ld [wWastedByteCD3A], a
+	ld [wUnusedCD3A], a
 	ld [wSimulatedJoypadStatesIndex], a
 	ld [wSimulatedJoypadStatesEnd], a
 	ret
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index e08da61a..eb186f1e 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -179,7 +179,7 @@ UpdateNPCSprite:
 	res 0, [hl]
 	xor a
 	ld [wSimulatedJoypadStatesIndex], a
-	ld [wWastedByteCD3A], a
+	ld [wUnusedCD3A], a
 	ret
 .next
 	cp WALK
-- 
cgit v1.3.1-sl0p