From 54af254b05f5f9a64f749322719e32cdb913d2c8 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sun, 4 Aug 2024 12:27:41 -0400 Subject: [PATCH] fix ObjectMovingOnRockStairs with follower with merrps system --- src/field_player_avatar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 0b9ec8aa24..3c2b65a3b2 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -2499,7 +2499,7 @@ bool8 ObjectMovingOnRockStairs(struct ObjectEvent *objectEvent, u8 direction) s16 y = objectEvent->currentCoords.y; // TODO followers on sideways stairs - if (IsFollowerVisible() && (objectEvent->isPlayer || objectEvent->localId == OBJ_EVENT_ID_FOLLOWER)) + if (IsFollowerVisible() && GetFollowerObject() != NULL && (objectEvent->isPlayer || objectEvent->localId == OBJ_EVENT_ID_FOLLOWER)) return FALSE; switch (direction)