From 492683eeb6367d86bc84d2040828cbd0de065dd1 Mon Sep 17 00:00:00 2001 From: Evan Date: Sat, 6 Jun 2020 13:19:17 -0600 Subject: [PATCH] fix stairs north dir bug --- src/field_player_avatar.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index b130021912..e156774d42 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -753,6 +753,9 @@ u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u return COLLISION_IMPASSABLE; else if (MetatileBehavior_IsSidewaysStairsLeftSideBottom(metatileBehavior) && (direction == DIR_WEST || direction == DIR_SOUTH)) return COLLISION_IMPASSABLE; + else if ((MetatileBehavior_IsSidewaysStairsLeftSideTop(currentBehavior) || MetatileBehavior_IsSidewaysStairsRightSideTop(currentBehavior)) + && direction == DIR_NORTH && collision == COLLISION_NONE) + return COLLISION_IMPASSABLE; //trying to move north off of top-most tile onto same level doesn't work if (MetatileBehavior_IsSidewaysStairsLeftSide(metatileBehavior)) {