dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rotating Gate -> dir stair warp

Browse Source
This commit is contained in:
GriffinR
2021-11-20 10:50:22 -05:00
parent b2c74cae84
commit 7e38583a5d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.fieldmap.h
+1 -1
View File
@@ -310,7 +310,7 @@ enum
COLLISION_STOP_SURFING, COLLISION_STOP_SURFING,
COLLISION_LEDGE_JUMP, COLLISION_LEDGE_JUMP,
COLLISION_PUSHED_BOULDER, COLLISION_PUSHED_BOULDER,
COLLISION_ROTATING_GATE, COLLISION_DIRECTIONAL_STAIR_WARP,
COLLISION_WHEELIE_HOP, COLLISION_WHEELIE_HOP,
COLLISION_ISOLATED_VERTICAL_RAIL, COLLISION_ISOLATED_VERTICAL_RAIL,
COLLISION_ISOLATED_HORIZONTAL_RAIL, COLLISION_ISOLATED_HORIZONTAL_RAIL,
src/bike.c
+1 -1
View File
@@ -180,7 +180,7 @@ static void BikeTransition_MoveDirection(u8 direction)
else if (collision != COLLISION_STOP_SURFING else if (collision != COLLISION_STOP_SURFING
&& collision != COLLISION_LEDGE_JUMP && collision != COLLISION_LEDGE_JUMP
&& collision != COLLISION_PUSHED_BOULDER && collision != COLLISION_PUSHED_BOULDER
&& collision != COLLISION_ROTATING_GATE) && collision != COLLISION_DIRECTIONAL_STAIR_WARP)
PlayerOnBikeCollide(direction); PlayerOnBikeCollide(direction);
} }
else else
src/field_player_avatar.c
+3 -3
View File
@@ -491,14 +491,14 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
{ {
PlayerJumpLedge(direction); PlayerJumpLedge(direction);
} }
else if (collision == COLLISION_ROTATING_GATE) else if (collision == COLLISION_DIRECTIONAL_STAIR_WARP)
{ {
PlayerFaceDirection(direction); PlayerFaceDirection(direction);
} }
else if (collision != COLLISION_STOP_SURFING else if (collision != COLLISION_STOP_SURFING
&& collision != COLLISION_LEDGE_JUMP && collision != COLLISION_LEDGE_JUMP
&& collision != COLLISION_PUSHED_BOULDER && collision != COLLISION_PUSHED_BOULDER
&& collision != COLLISION_ROTATING_GATE) && collision != COLLISION_DIRECTIONAL_STAIR_WARP)
{ {
PlayerNotOnBikeCollide(direction); PlayerNotOnBikeCollide(direction);
} }
@@ -559,7 +559,7 @@ static u8 CheckForPlayerAvatarCollision(u8 direction)
x = playerObjEvent->currentCoords.x; x = playerObjEvent->currentCoords.x;
y = playerObjEvent->currentCoords.y; y = playerObjEvent->currentCoords.y;
if (IsDirectionalStairWarpMetatileBehavior(MapGridGetMetatileBehaviorAt(x, y), direction)) if (IsDirectionalStairWarpMetatileBehavior(MapGridGetMetatileBehaviorAt(x, y), direction))
return 8; return COLLISION_DIRECTIONAL_STAIR_WARP;
MoveCoords(direction, &x, &y); MoveCoords(direction, &x, &y);
return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
} }