ReplaceChrisSprite -> UpdatePlayerSprite

9 files changed, 19 insertions, 19 deletions

diff --git a/data/special_pointers.asm b/data/special_pointers.asm
index 39207e73..b7e4d213 100644
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -71,7 +71,7 @@ SpecialsPointers::
 	add_special UpdateTimePals
 	add_special ClearTilemap
 	add_special UpdateSprites
-	add_special ReplaceChrisSprite
+	add_special UpdatePlayerSprite
 	add_special GameCornerPrizeMonCheckDex
 	add_special UnusedSetSeenMon
 	add_special WaitSFX, 3
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 2b0dbc39..e4be7d29 100644
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -67,7 +67,7 @@ ShakeHeadbuttTree:
 	ld bc, wVirtualOAMEnd - wVirtualOAMSprite36
 	xor a
 	call ByteFill
-	call ReplaceChrisSprite
+	call UpdatePlayerSprite
 	ret
 
 HeadbuttTreeGFX:
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 2f9d57f8..c894d9bd 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -401,7 +401,7 @@ UsedSurfScript:
 	readmem wBuffer2
 	writevar VAR_MOVEMENT
 
-	special ReplaceChrisSprite
+	special UpdatePlayerSprite
 	special PlayMapMusic
 ; step into the water (slow_step DIR, step_end)
 	special SurfStartStep
@@ -607,7 +607,7 @@ FlyFunction:
 	newloadmap MAPSETUP_TELEPORT
 	callasm FlyToAnim
 	special WaitSFX
-	special ReplaceChrisSprite
+	special UpdatePlayerSprite
 	callasm _ClearSprites
 	end
 
@@ -1585,7 +1585,7 @@ PutTheRodAway:
 	ld a, $1
 	ld [wPlayerAction], a
 	call UpdateSprites
-	call ReplaceChrisSprite
+	call UpdatePlayerSprite
 	ret
 
 RodBiteText:
@@ -1693,13 +1693,13 @@ Script_GetOnBike:
 	writetext GotOnBikeText
 	waitbutton
 	closetext
-	special ReplaceChrisSprite
+	special UpdatePlayerSprite
 	end
 
 Script_GetOnBike_Register:
 	loadvar VAR_MOVEMENT, PLAYER_BIKE
 	closetext
-	special ReplaceChrisSprite
+	special UpdatePlayerSprite
 	end
 
 ; unused
@@ -1715,7 +1715,7 @@ Script_GetOffBike:
 
 FinishGettingOffBike:
 	closetext
-	special ReplaceChrisSprite
+	special UpdatePlayerSprite
 	special PlayMapMusic
 	end
 
diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm
index aec3c949..206f2358 100644
--- a/engine/overworld/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -141,7 +141,7 @@ SkipUpdateMapSprites:
 	set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
 	ret
 
-CheckReplaceChrisSprite::
+CheckUpdatePlayerSprite::
 	nop
 	call .CheckBiking
 	jr c, .ok
@@ -152,7 +152,7 @@ CheckReplaceChrisSprite::
 	ret
 
 .ok
-	call ReplaceChrisSprite
+	call UpdatePlayerSprite
 	ret
 
 .CheckBiking:
diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm
index 05b15ea9..4c5dbcf6 100644
--- a/engine/overworld/overworld.asm
+++ b/engine/overworld/overworld.asm
@@ -1,5 +1,5 @@
-_ReplaceChrisSprite::
-	call GetChrisSprite
+_UpdatePlayerSprite::
+	call GetPlayerSprite
 	ld a, [wUsedSprites]
 	ld c, a
 	ld a, [wUsedSprites + 1]
@@ -39,11 +39,11 @@ RefreshSprites::
 	ld bc, SPRITE_GFX_LIST_CAPACITY * 2
 	ld hl, wUsedSprites
 	call ByteFill
-	call GetChrisSprite
+	call GetPlayerSprite
 	call AddMapSprites
 	ret
 
-GetChrisSprite:
+GetPlayerSprite:
 	ld a, [wPlayerState]
 	ld c, a
 ; Get Chris's sprite.
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 6747c0ef..7fcac6af 100644
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -784,7 +784,7 @@ ENDM
 	push bc
 	ld a, PLAYER_NORMAL
 	ld [wPlayerState], a
-	call ReplaceChrisSprite ; UpdateSprites
+	call UpdatePlayerSprite ; UpdateSprites
 	pop bc
 	ret
 
diff --git a/home/gfx.asm b/home/gfx.asm
index 3ba6dbfe..1a01b6c5 100644
--- a/home/gfx.asm
+++ b/home/gfx.asm
@@ -26,8 +26,8 @@ FarCopyBytesDouble_DoubleBankSwitch::
 	rst Bankswitch
 	ret
 
-ReplaceChrisSprite::
-	farcall _ReplaceChrisSprite
+UpdatePlayerSprite::
+	farcall _UpdatePlayerSprite
 	ret
 
 LoadStandardFont::
diff --git a/home/warp_connection.asm b/home/warp_connection.asm
index 7207208e..3c4c5929 100644
--- a/home/warp_connection.asm
+++ b/home/warp_connection.asm
@@ -90,7 +90,7 @@ RefreshMapSprites::
 	call ResetBGWindow
 	call GetMovementPermissions
 	farcall RefreshPlayerSprite
-	farcall CheckReplaceChrisSprite
+	farcall CheckUpdatePlayerSprite
 	ld hl, wPlayerSpriteSetupFlags
 	bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
 	jr nz, .skip
diff --git a/home/window.asm b/home/window.asm
index 41893a98..c903cdd8 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -37,7 +37,7 @@ CloseText::
 	ld a, $90
 	ldh [hWY], a
 	farcall _ClearSprites
-	call ReplaceChrisSprite
+	call UpdatePlayerSprite
 	ld hl, wEnteredMapFromContinue
 	res 7, [hl]
 	call ResetBGWindow