summaryrefslogtreecommitdiff
path: root/src/field_player_avatar.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-11-20 10:50:22 -0500
committerGriffinR <griffin.g.richards@gmail.com>2021-11-20 10:50:22 -0500
commit7e38583a5dc00b37a5ad7df94d4489c3150def8c (patch)
tree309858c09c2b7bd3ef21ea391c98456175a5f740 /src/field_player_avatar.c
parentb2c74cae8456cfa10a27a3a2d4b97971fd964b6d (diff)
Rotating Gate -> dir stair warp
Diffstat (limited to 'src/field_player_avatar.c')
-rw-r--r--src/field_player_avatar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index cebfcc328..16426cdc4 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -491,14 +491,14 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
{
PlayerJumpLedge(direction);
}
- else if (collision == COLLISION_ROTATING_GATE)
+ else if (collision == COLLISION_DIRECTIONAL_STAIR_WARP)
{
PlayerFaceDirection(direction);
}
else if (collision != COLLISION_STOP_SURFING
&& collision != COLLISION_LEDGE_JUMP
&& collision != COLLISION_PUSHED_BOULDER
- && collision != COLLISION_ROTATING_GATE)
+ && collision != COLLISION_DIRECTIONAL_STAIR_WARP)
{
PlayerNotOnBikeCollide(direction);
}
@@ -559,7 +559,7 @@ static u8 CheckForPlayerAvatarCollision(u8 direction)
x = playerObjEvent->currentCoords.x;
y = playerObjEvent->currentCoords.y;
if (IsDirectionalStairWarpMetatileBehavior(MapGridGetMetatileBehaviorAt(x, y), direction))
- return 8;
+ return COLLISION_DIRECTIONAL_STAIR_WARP;
MoveCoords(direction, &x, &y);
return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
}