summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/map_setup.asm2
-rwxr-xr-xengine/player_movement.asm7
2 files changed, 4 insertions, 5 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index 5de4f30da..72fe9c07f 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -356,7 +356,7 @@ CheckReplaceKrisSprite: ; 154f7
ld a, [PlayerState]
cp PLAYER_NORMAL
jr z, .nope
- cp PLAYER_SLIP
+ cp PLAYER_SKATE
jr z, .nope
cp PLAYER_SURF
jr z, .surfing
diff --git a/engine/player_movement.asm b/engine/player_movement.asm
index 7ccb36551..5bc3e1f0b 100755
--- a/engine/player_movement.asm
+++ b/engine/player_movement.asm
@@ -42,7 +42,7 @@ DoPlayerMovement:: ; 80000
jr z, .Surf
cp PLAYER_BIKE
jr z, .Normal
- cp PLAYER_SLIP
+ cp PLAYER_SKATE
jr z, .Ice
.Normal:
@@ -750,11 +750,10 @@ DoPlayerMovement:: ; 80000
; 803ca
.BikeCheck: ; 803ca
-
ld a, [PlayerState]
cp PLAYER_BIKE
ret z
- cp PLAYER_SLIP
+ cp PLAYER_SKATE
ret
; 803d3
@@ -824,7 +823,7 @@ CheckStandingOnIce:: ; 80404
call CheckIceTile
jr nc, .yep
ld a, [PlayerState]
- cp PLAYER_SLIP
+ cp PLAYER_SKATE
jr nz, .not_ice
.yep