10 files changed, 19 insertions, 19 deletions
diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm
index e1fc9160..9026960c 100755
--- a/engine/overworld/card_key.asm
+++ b/engine/overworld/card_key.asm
@@ -89,7 +89,7 @@ GetCoordsInFrontOfPlayer:
 	ld d, a
 	ld a, [wXCoord]
 	ld e, a
-	ld a, [wPlayerFacingDirection] ; player's sprite facing direction
+	ld a, [wSpritePlayerStateData1FacingDirection] ; player's sprite facing direction
 	and a
 	jr nz, .notFacingDown
 ; facing down
diff --git a/engine/overworld/check_player_state.asm b/engine/overworld/check_player_state.asm
index b3eab447..2fcb5b9d 100644
--- a/engine/overworld/check_player_state.asm
+++ b/engine/overworld/check_player_state.asm
@@ -90,7 +90,7 @@ IsPlayerFacingEdgeOfMap:
 	push hl
 	push de
 	push bc
-	ld a, [wPlayerFacingDirection] ; player sprite's facing direction
+	ld a, [wSpritePlayerStateData1FacingDirection] ; player sprite's facing direction
 	srl a
 	ld c, a
 	ld b, $0
@@ -160,7 +160,7 @@ IsWarpTileInFrontOfPlayer:
 	ld a, [wCurMap]
 	cp SS_ANNE_5
 	jr z, .ssAnne5
-	ld a, [wPlayerFacingDirection] ; player sprite's facing direction
+	ld a, [wSpritePlayerStateData1FacingDirection] ; player sprite's facing direction
 	srl a
 	ld c, a
 	ld b, 0
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm
index 462e3e8e..bc7d092d 100755
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -188,7 +188,7 @@ ReplaceTreeTileBlock:
 	ld h, [hl]
 	ld l, a
 	add hl, bc
-	ld a, [wPlayerFacingDirection] ; player sprite's facing direction
+	ld a, [wSpritePlayerStateData1FacingDirection] ; player sprite's facing direction
 	and a
 	jr z, .down
 	cp SPRITE_FACING_UP
diff --git a/engine/overworld/get_coords_tile_in_front_of_player.asm b/engine/overworld/get_coords_tile_in_front_of_player.asm
index e8bbc660..67f154bc 100644
--- a/engine/overworld/get_coords_tile_in_front_of_player.asm
+++ b/engine/overworld/get_coords_tile_in_front_of_player.asm
@@ -6,7 +6,7 @@ _GetTileAndCoordsInFrontOfPlayer:
 	ld d, a
 	ld a, [wXCoord]
 	ld e, a
-	ld a, [wPlayerFacingDirection] ; player's sprite facing direction
+	ld a, [wSpritePlayerStateData1FacingDirection] ; player's sprite facing direction
 	and a ; cp SPRITE_FACING_DOWN
 	jr nz, .notFacingDown
 ; facing down
@@ -45,7 +45,7 @@ GetTileTwoStepsInFrontOfPlayer:
 	ld a, [hli]
 	ld d, a
 	ld e, [hl]
-	ld a, [wPlayerFacingDirection] ; player's sprite facing direction
+	ld a, [wSpritePlayerStateData1FacingDirection] ; player's sprite facing direction
 	and a ; cp SPRITE_FACING_DOWN
 	jr nz, .notFacingDown
 ; facing down
diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm
index 9a81dcfc..66815b60 100755
--- a/engine/overworld/hidden_objects.asm
+++ b/engine/overworld/hidden_objects.asm
@@ -61,7 +61,7 @@ CheckForHiddenObject:
 ; checks if the coordinates in front of the player's sprite match Y in b and X in c
 ; [hCoordsInFrontOfPlayerMatch] = $00 if they match, $ff if they don't match
 CheckIfCoordsInFrontOfPlayerMatch:
-	ld a, [wPlayerFacingDirection] ; player's sprite facing direction
+	ld a, [wSpritePlayerStateData1FacingDirection] ; player's sprite facing direction
 	cp SPRITE_FACING_UP
 	jr z, .facingUp
 	cp SPRITE_FACING_LEFT
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index e7874637..a44ddf8b 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -6,7 +6,7 @@ HandleLedges:
 	and a ; OVERWORLD
 	ret nz
 	predef GetTileAndCoordsInFrontOfPlayer
-	ld a, [wPlayerFacingDirection]
+	ld a, [wSpritePlayerStateData1FacingDirection]
 	ld b, a
 	aCoord 8, 9
 	ld c, a
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm
index 32d3d47b..1a877b4a 100755
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -64,7 +64,7 @@ LoadSpriteSetFromMapHeader:
 	call FillMemory
 	ld a, SPRITE_PIKACHU ; load Pikachu separately
 	ld [wSpriteSet], a
-	ld hl, wSprite01SpriteStateData1
+	ld hl, wSprite01StateData1
 	ld a, 14
 .storeVRAMSlotsLoop
 	push af
@@ -86,7 +86,7 @@ LoadSpriteSetFromMapHeader:
 	ld b, 9
 	call CheckIfPictureIDAlreadyLoaded
 .continue
-	ld de, wSprite02SpriteStateData1 - wSprite01SpriteStateData1
+	ld de, wSprite02StateData1 - wSprite01StateData1
 	add hl, de
 	pop af
 	dec a
@@ -251,11 +251,11 @@ ReadSpriteSheetData:
 
 Func_14150:
 	ld a, $1
-	ld [wPlayerSpriteImageBaseOffset], a ; vram slot for player
+	ld [wSpritePlayerStateData2ImageBaseOffset], a ; vram slot for player
 	ld a, $2
-	ld [wPikachuSpriteImageBaseOffset], a ; vram slot for Pikachu
+	ld [wSpritePikachuStateData2ImageBaseOffset], a ; vram slot for Pikachu
 	ld a, $e
-	ld hl, wSprite01SpriteStateData1
+	ld hl, wSprite01StateData1
 .loop
 	ld [hVRAMSlot], a ; store current sprite set slot as a counter
 	ld a, [hl] ; $c1x0 (picture ID)
@@ -263,12 +263,12 @@ Func_14150:
 	jr z, .spriteUnused
 	call Func_14179
 	push hl
-	ld de, (wPlayerSpriteImageBaseOffset) - (wSpriteStateData1) ; $10e
+	ld de, (wSpritePlayerStateData2ImageBaseOffset) - (wSpriteStateData1) ; $10e
 	add hl, de ; get $c2xe (sprite image base offset)
 	ld [hl], a ; write offset
 	pop hl
 .spriteUnused
-	ld de, wSprite02SpriteStateData1 - wSprite01SpriteStateData1
+	ld de, wSprite02StateData1 - wSprite01StateData1
 	add hl, de
 	ld a, [hVRAMSlot]
 	dec a
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index ad4515ff..cc4a818f 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -53,7 +53,7 @@ UpdatePlayerSprite:
 	ld a, SPRITE_FACING_RIGHT
 	jr .next
 .next
-	ld [wPlayerFacingDirection], a ; facing direction
+	ld [wSpritePlayerStateData1FacingDirection], a ; facing direction
 	ld a, [wFontLoaded]
 	bit 0, a
 	jr z, .moving
@@ -89,7 +89,7 @@ UpdatePlayerSprite:
 Func_4e32:
 	ld a, [wSpriteStateData1 + 8]
 	ld b, a
-	ld a, [wPlayerFacingDirection]
+	ld a, [wSpritePlayerStateData1FacingDirection]
 	add b
 	ld [wSpriteStateData1 + 2], a
 	ret
diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm
index dc4ad130..cf3b1284 100755
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -32,7 +32,7 @@ AnimateBoulderDust:
 	jp LoadPlayerSpriteGraphics
 
 GetMoveBoulderDustFunctionPointer:
-	ld a, [wPlayerFacingDirection] ; player's sprite facing direction
+	ld a, [wSpritePlayerStateData1FacingDirection] ; player's sprite facing direction
 	ld hl, MoveBoulderDustFunctionPointerTable
 	ld c, a
 	ld b, $0
diff --git a/engine/overworld/try_pushing_boulder.asm b/engine/overworld/try_pushing_boulder.asm
index a00790b9..8a385345 100644
--- a/engine/overworld/try_pushing_boulder.asm
+++ b/engine/overworld/try_pushing_boulder.asm
@@ -38,7 +38,7 @@ Func_f0a7:
 	jp nz, ResetBoulderPushFlags
 	ld a, [hJoyHeld]
 	ld b, a
-	ld a, [wPlayerFacingDirection] ; player's sprite facing direction
+	ld a, [wSpritePlayerStateData1FacingDirection] ; player's sprite facing direction
 	cp SPRITE_FACING_UP
 	jr z, .pushBoulderUp
 	cp SPRITE_FACING_LEFT