diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/field_moves.asm | 2 | ||||
| -rw-r--r-- | engine/events/overworld.asm | 12 | ||||
| -rw-r--r-- | engine/overworld/map_setup.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/overworld.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/player_movement.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/warp_connection.asm | 2 |
6 files changed, 12 insertions, 12 deletions
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 |