diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-20 10:50:22 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-20 10:50:22 -0500 |
| commit | 7e38583a5dc00b37a5ad7df94d4489c3150def8c (patch) | |
| tree | 309858c09c2b7bd3ef21ea391c98456175a5f740 | |
| parent | b2c74cae8456cfa10a27a3a2d4b97971fd964b6d (diff) | |
Rotating Gate -> dir stair warp
| -rw-r--r-- | include/global.fieldmap.h | 2 | ||||
| -rw-r--r-- | src/bike.c | 2 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 1be9277f4..7ab2c12e4 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -310,7 +310,7 @@ enum COLLISION_STOP_SURFING, COLLISION_LEDGE_JUMP, COLLISION_PUSHED_BOULDER, - COLLISION_ROTATING_GATE, + COLLISION_DIRECTIONAL_STAIR_WARP, COLLISION_WHEELIE_HOP, COLLISION_ISOLATED_VERTICAL_RAIL, COLLISION_ISOLATED_HORIZONTAL_RAIL, diff --git a/src/bike.c b/src/bike.c index b023c9367..4a24fb2a3 100644 --- a/src/bike.c +++ b/src/bike.c @@ -180,7 +180,7 @@ static void BikeTransition_MoveDirection(u8 direction) else if (collision != COLLISION_STOP_SURFING && collision != COLLISION_LEDGE_JUMP && collision != COLLISION_PUSHED_BOULDER - && collision != COLLISION_ROTATING_GATE) + && collision != COLLISION_DIRECTIONAL_STAIR_WARP) PlayerOnBikeCollide(direction); } else 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)); } |