ReplaceKrisSprite -> UpdatePlayerSprite

11 files changed, 22 insertions, 22 deletions

diff --git a/data/special_pointers.asm b/data/special_pointers.asm
index 8ed043e5c..ae44993a3 100644
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -67,7 +67,7 @@ SpecialsPointers::
 	add_special UpdateTimePals ; bank 0
 	add_special ClearTilemap ; bank 0
 	add_special UpdateSprites ; bank 0
-	add_special ReplaceKrisSprite ; bank 0
+	add_special UpdatePlayerSprite ; bank 0
 	add_special GameCornerPrizeMonCheckDex
 	add_special UnusedSetSeenMon
 	add_special WaitSFX ; bank 0
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 6220ff343..34224d97a 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -1766,7 +1766,7 @@ First, edit `UsedSurfScript` in [engine/events/overworld.asm](https://github.com
  	readmem wBuffer2
  	writevar VAR_MOVEMENT
 
- 	special ReplaceKrisSprite
+ 	special UpdatePlayerSprite
  	special PlayMapMusic
 -; step into the water (slow_step DIR, step_end)
  	special SurfStartStep
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 4d95d60cd..1cc14bf27 100644
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -72,7 +72,7 @@ ShakeHeadbuttTree:
 	ld hl, vTiles1
 	lb bc, BANK(Font), 12
 	call Get1bpp
-	call ReplaceKrisSprite
+	call UpdatePlayerSprite
 	ret
 
 HeadbuttTreeGFX:
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 58db6106b..824cde120 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -412,7 +412,7 @@ UsedSurfScript:
 	readmem wBuffer2
 	writevar VAR_MOVEMENT
 
-	special ReplaceKrisSprite
+	special UpdatePlayerSprite
 	special PlayMapMusic
 ; step into the water (slow_step DIR, step_end)
 	special SurfStartStep
@@ -628,7 +628,7 @@ FlyFunction:
 .ReturnFromFly:
 	farcall Function561d
 	call DelayFrame
-	call ReplaceKrisSprite
+	call UpdatePlayerSprite
 	farcall LoadOverworldFont
 	ret
 
@@ -1605,7 +1605,7 @@ PutTheRodAway:
 	ld a, $1
 	ld [wPlayerAction], a
 	call UpdateSprites
-	call ReplaceKrisSprite
+	call UpdatePlayerSprite
 	ret
 
 RodBiteText:
@@ -1713,13 +1713,13 @@ Script_GetOnBike:
 	writetext GotOnBikeText
 	waitbutton
 	closetext
-	special ReplaceKrisSprite
+	special UpdatePlayerSprite
 	end
 
 Script_GetOnBike_Register:
 	loadvar VAR_MOVEMENT, PLAYER_BIKE
 	closetext
-	special ReplaceKrisSprite
+	special UpdatePlayerSprite
 	end
 
 ; unused
@@ -1735,7 +1735,7 @@ Script_GetOffBike:
 
 FinishGettingOffBike:
 	closetext
-	special ReplaceKrisSprite
+	special UpdatePlayerSprite
 	special PlayMapMusic
 	end
 
diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm
index 300f911b1..92e706ab3 100644
--- a/engine/overworld/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -142,7 +142,7 @@ SkipUpdateMapSprites:
 	set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
 	ret
 
-CheckReplaceKrisSprite:
+CheckUpdatePlayerSprite:
 	nop
 	call .CheckBiking
 	jr c, .ok
@@ -153,7 +153,7 @@ CheckReplaceKrisSprite:
 	ret
 
 .ok
-	call ReplaceKrisSprite
+	call UpdatePlayerSprite
 	ret
 
 .CheckBiking:
diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm
index 885dd379a..bc44c7662 100644
--- a/engine/overworld/overworld.asm
+++ b/engine/overworld/overworld.asm
@@ -6,7 +6,7 @@ GetEmote2bpp:
 	ldh [rVBK], a
 	ret
 
-_ReplaceKrisSprite::
+_UpdatePlayerSprite::
 	call GetPlayerSprite
 	ld a, [wUsedSprites]
 	ldh [hUsedSpriteIndex], a
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 74ca50d70..e2b92b1cf 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 ReplaceKrisSprite ; UpdateSprites
+	call UpdatePlayerSprite ; UpdateSprites
 	pop bc
 	ret
 
diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm
index c08ca11d7..866480d5c 100644
--- a/engine/overworld/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
@@ -316,7 +316,7 @@ RefreshMapSprites:
 	farcall InitMapNameSign
 	call GetMovementPermissions
 	farcall RefreshPlayerSprite
-	farcall CheckReplaceKrisSprite
+	farcall CheckUpdatePlayerSprite
 	ld hl, wPlayerSpriteSetupFlags
 	bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
 	jr nz, .skip
diff --git a/home/gfx.asm b/home/gfx.asm
index 1d7488191..ede4088ec 100644
--- a/home/gfx.asm
+++ b/home/gfx.asm
@@ -94,8 +94,8 @@ Unreferenced_DMATransfer:
 	ldh [hBGMapMode], a
 	ret
 
-ReplaceKrisSprite::
-	farcall _ReplaceKrisSprite
+UpdatePlayerSprite::
+	farcall _UpdatePlayerSprite
 	ret
 
 LoadStandardFont::
diff --git a/home/window.asm b/home/window.asm
index f428c1a7a..082ec40fc 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -38,7 +38,7 @@ CloseText::
 	call SafeUpdateSprites
 	ld a, $90
 	ldh [hWY], a
-	call ReplaceKrisSprite
+	call UpdatePlayerSprite
 	farcall InitMapNameSign
 	farcall LoadOverworldFont
 	ret
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 018b36175..20b796e1b 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -437,7 +437,7 @@ Pokecenter2F_CheckGender:
 	special SetPlayerPalette
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
 	setflag ENGINE_KRIS_IN_CABLE_CLUB
-	special ReplaceKrisSprite
+	special UpdatePlayerSprite
 	opentext
 	writetext Text_LikeTheLook
 	waitbutton
@@ -463,7 +463,7 @@ Script_WalkOutOfLinkTradeRoom:
 	setval (PAL_NPC_BLUE << 4)
 	special SetPlayerPalette
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
-	special ReplaceKrisSprite
+	special UpdatePlayerSprite
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
 	applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
 	end
@@ -485,7 +485,7 @@ Script_WalkOutOfLinkBattleRoom:
 	setval (PAL_NPC_BLUE << 4)
 	special SetPlayerPalette
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
-	special ReplaceKrisSprite
+	special UpdatePlayerSprite
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
 	applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
 	end
@@ -546,7 +546,7 @@ TimeCapsuleScript_CheckPlayerGender:
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown
 	faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
 	setflag ENGINE_KRIS_IN_CABLE_CLUB
-	special ReplaceKrisSprite
+	special UpdatePlayerSprite
 	opentext
 	writetext Text_LikeTheLook
 	waitbutton
@@ -573,7 +573,7 @@ Script_LeftTimeCapsule:
 	setval (PAL_NPC_BLUE << 4)
 	special SetPlayerPalette
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
-	special ReplaceKrisSprite
+	special UpdatePlayerSprite
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
 	applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
 .Done: