From 79abc885e72bab6644f8bdb269a14daa2fa12aeb Mon Sep 17 00:00:00 2001
From: Bivurnum <147376167+Bivurnum@users.noreply.github.com>
Date: Thu, 29 May 2025 04:04:41 -0500
Subject: [PATCH] Fixes follower NPC not changing state with player after warp
 (#7009)

---
 src/follower_npc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/follower_npc.c b/src/follower_npc.c
index 870668a9d5..f41315f104 100644
--- a/src/follower_npc.c
+++ b/src/follower_npc.c
@@ -1284,7 +1284,15 @@ void FollowerNPC_WarpSetEnd(void)
     }
 
     if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ON_FOOT)
+    {
         SetFollowerNPCSprite(FOLLOWER_NPC_SPRITE_INDEX_NORMAL);
+        SetFollowerNPCData(FNPC_DATA_SURF_BLOB, FNPC_SURF_BLOB_NONE);
+    }
+    else if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
+    {
+        SetFollowerNPCSprite(FOLLOWER_NPC_SPRITE_INDEX_SURF);
+        SetFollowerNPCData(FNPC_DATA_SURF_BLOB, FNPC_SURF_BLOB_RECREATE);
+    }
 
     follower->facingDirection = player->facingDirection;
     follower->movementDirection = player->movementDirection;