summaryrefslogtreecommitdiff
path: root/engine/overworld
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-16 19:38:00 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-16 19:38:00 -0400
commitf2550fc3c208508aaba3a9c2f26dcd12d81c6bc5 (patch)
tree347d073f87f6a5fa70b077c8f66b6b09575925e4 /engine/overworld
parentf76dabedcc8af56c871e06a4721de4c79bd30908 (diff)
ReplaceKrisSprite -> UpdatePlayerSprite
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/map_setup.asm4
-rw-r--r--engine/overworld/overworld.asm2
-rw-r--r--engine/overworld/player_movement.asm2
-rw-r--r--engine/overworld/warp_connection.asm2
4 files changed, 5 insertions, 5 deletions
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