From 12b2a296074c982ab5b5e442848bbcc921b53d8b Mon Sep 17 00:00:00 2001
From: Bivurnum <147376167+Bivurnum@users.noreply.github.com>
Date: Wed, 18 Jun 2025 15:50:55 -0500
Subject: [PATCH] Bug fix: clear follower npc surf blob on white out (#7153)

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

diff --git a/src/follower_npc.c b/src/follower_npc.c
index 336312b485..0a8cde49c8 100644
--- a/src/follower_npc.c
+++ b/src/follower_npc.c
@@ -1183,7 +1183,7 @@ void FollowerNPC_HandleSprite(void)
     {
         TryUpdateFollowerNPCSpriteUnderwater();
     }
-    else
+    else if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ON_FOOT)
     {
         SetFollowerNPCSprite(FOLLOWER_NPC_SPRITE_INDEX_NORMAL);
     }
diff --git a/src/overworld.c b/src/overworld.c
index d9a688c7b5..d827d46a2c 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -1816,6 +1816,7 @@ void CB2_WhiteOut(void)
         else
             gFieldCallback = FieldCB_WarpExitFadeFromBlack;
         state = 0;
+        SetFollowerNPCData(FNPC_DATA_SURF_BLOB, FNPC_SURF_BLOB_NONE);
         DoMapLoadLoop(&state);
         SetFieldVBlankCallback();
         SetMainCallback1(CB1_Overworld);