From b3f9c8bf7c51f28275e62da7ed413c3354ca9fb8 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Wed, 19 Jun 2024 10:25:44 -0400 Subject: [PATCH] GetSidewaysStairsCollision cant descend stairs into water --- src/event_object_movement.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 1bf74a7818..a9147902c9 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -4732,6 +4732,10 @@ u8 GetSidewaysStairsCollision(struct ObjectEvent *objectEvent, u8 dir, u8 curren if ((dir == DIR_SOUTH || dir == DIR_NORTH) && collision != COLLISION_NONE) return collision; + // cant descend stairs into water + if (MetatileBehavior_IsSurfableFishableWater(nextBehavior)) + return collision; + if (MetatileBehavior_IsSidewaysStairsLeftSide(nextBehavior)) { //moving ONTO left side stair