From ea75a09dac6a5cc2c1c0cfb0d4fe1a07bf4f4878 Mon Sep 17 00:00:00 2001
From: Bivurnum <147376167+Bivurnum@users.noreply.github.com>
Date: Sat, 7 Jun 2025 02:54:07 -0500
Subject: [PATCH] Clear saved follower NPC door warp when doing dive warp
 (#7065)

---
 src/field_screen_effect.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 9ac99465ca..7b17f53666 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -528,6 +528,7 @@ void DoDiveWarp(void)
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
     PlayRainStoppingSoundEffect();
+    SetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR, FNPC_DOOR_NONE);
     gFieldCallback = FieldCB_DefaultWarpExit;
     CreateTask(Task_WarpAndLoadMap, 10);
 }