From acdeb438a8296d92105b5b9c7ff1d5aa074c15b2 Mon Sep 17 00:00:00 2001
From: Ariel Antonitis <arant@mit.edu>
Date: Tue, 16 Jun 2020 22:05:52 -0400
Subject: [PATCH] Fixed fly callback logic.

---
 src/overworld.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/overworld.c b/src/overworld.c
index d8b0284c11..140aefd964 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -1604,9 +1604,6 @@ static void CB2_LoadMapOnReturnToFieldCableClub(void)
 
 void CB2_ReturnToField(void)
 {
-    if (gFieldCallback == FieldCallback_Fly) { // Destroy follower if flying away
-      RemoveFollowingPokemon();
-    }
     if (IsUpdateLinkStateCBActive() == TRUE)
     {
         SetMainCallback2(CB2_ReturnToFieldLink);
@@ -1950,7 +1947,11 @@ static bool32 ReturnToFieldLocal(u8 *state)
         sub_80867D8();
         ResumeMap(FALSE);
         sub_8086A68();
-        UpdateFollowingPokemon(); // TODO: Update all dynamic graphicsIds
+        if (gFieldCallback == FieldCallback_Fly) {
+          RemoveFollowingPokemon();
+        } else {
+          UpdateFollowingPokemon(); // TODO: Update all dynamic graphicsIds
+        }
         SetCameraToTrackPlayer();
         (*state)++;
         break;