From 015a0fea0361e274849943ff40bb3205ff932df6 Mon Sep 17 00:00:00 2001
From: Bivurnum <147376167+Bivurnum@users.noreply.github.com>
Date: Wed, 8 Oct 2025 12:10:33 -0500
Subject: [PATCH] Bug Fix: NPC follower not inheriting facing direction upon
 creation (#7895)

---
 src/follower_npc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/follower_npc.c b/src/follower_npc.c
index 11b066c12c..8bc3a61697 100644
--- a/src/follower_npc.c
+++ b/src/follower_npc.c
@@ -187,6 +187,7 @@ static void TurnNPCIntoFollower(u32 localId, u32 followerFlags, u32 setScript, c
     u32 npcY = gObjectEvents[eventObjId].currentCoords.y;
     const u8 *script;
     u32 flag;
+    u16 facingDirection = gObjectEvents[eventObjId].facingDirection;
 
     flag = GetObjectEventFlagIdByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     // If the object does not have an event flag, don't create follower.
@@ -210,7 +211,7 @@ static void TurnNPCIntoFollower(u32 localId, u32 followerFlags, u32 setScript, c
     SetFollowerNPCData(FNPC_DATA_OBJ_ID, TrySpawnObjectEventTemplate(&npc, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, npcX, npcY));
     follower = &gObjectEvents[GetFollowerNPCData(FNPC_DATA_OBJ_ID)];
     MoveObjectEventToMapCoords(follower, npcX, npcY);
-    ObjectEventTurn(follower, gObjectEvents[eventObjId].facingDirection);
+    ObjectEventTurn(follower, facingDirection);
     follower->movementType = MOVEMENT_TYPE_NONE;
     gSprites[follower->spriteId].callback = MovementType_None;