From 13bae5d1b2b4cc45575b22671e476110b8acb2fa Mon Sep 17 00:00:00 2001
From: Bivurnum <147376167+Bivurnum@users.noreply.github.com>
Date: Sun, 16 Nov 2025 13:15:43 -0600
Subject: [PATCH] Bug Fix: NPC Followers not working on slow sideways stairs
 (#8257)

---
 src/field_player_avatar.c | 1 -
 src/follower_npc.c        | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index bb9723443d..aaf28a6dea 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -2774,7 +2774,6 @@ bool8 ObjectMovingOnRockStairs(struct ObjectEvent *objectEvent, u8 direction)
         s16 x = objectEvent->currentCoords.x;
         s16 y = objectEvent->currentCoords.y;
 
-        // TODO followers on sideways stairs
         if (IsFollowerVisible() && GetFollowerObject() != NULL && (objectEvent->isPlayer || objectEvent->localId == OBJ_EVENT_ID_FOLLOWER))
             return FALSE;
 
diff --git a/src/follower_npc.c b/src/follower_npc.c
index 8bc3a61697..1833d555ab 100644
--- a/src/follower_npc.c
+++ b/src/follower_npc.c
@@ -954,6 +954,10 @@ u32 DetermineFollowerNPCState(struct ObjectEvent *follower, u32 state, u32 direc
 
         RETURN_STATE(MOVEMENT_ACTION_WALK_NORMAL_DOWN, direction);
 
+    // Slow stairs.
+    case MOVEMENT_ACTION_WALK_SLOW_STAIRS_DOWN ... MOVEMENT_ACTION_WALK_SLOW_STAIRS_RIGHT:
+        RETURN_STATE(MOVEMENT_ACTION_WALK_SLOW_STAIRS_DOWN, direction);
+
     default:
         return MOVEMENT_INVALID;
     }