From 16babe87fc7fb102cc7fc9ff76b34b18b5338202 Mon Sep 17 00:00:00 2001
From: Ariel A <24759293+aarant@users.noreply.github.com>
Date: Sun, 14 Aug 2022 14:36:49 -0400
Subject: [PATCH] Follower pokemon now disappears when teleporting. Fixed GF's
 incorrect GFX id on Route 123.

---
 data/maps/Route123/map.json | 2 +-
 include/party_menu.h        | 1 +
 src/fldeff_teleport.c       | 2 +-
 src/party_menu.c            | 6 ++++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
index 695b50acd4..dd9a65201f 100644
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -559,7 +559,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
       "x": 14,
       "y": 12,
       "elevation": 3,
diff --git a/include/party_menu.h b/include/party_menu.h
index 7f51d08c9f..8542b9ea43 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -44,6 +44,7 @@ u8 GetAilmentFromStatus(u32 status);
 u8 GetMonAilment(struct Pokemon *mon);
 void DisplayPartyMenuStdMessage(u32 stringId);
 bool8 FieldCallback_PrepareFadeInFromMenu(void);
+bool8 FieldCallback_PrepareFadeInForTeleport(void);
 void CB2_ReturnToPartyMenuFromFlyMap(void);
 void LoadHeldItemIcons(void);
 void DrawHeldItemIconsForTrade(u8 *partyCounts, u8 *partySpriteIds, u8 whichParty);
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 3f087e5dab..c17dc9360b 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -14,7 +14,7 @@ bool8 SetUpFieldMove_Teleport(void)
 {
     if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE)
     {
-        gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
+        gFieldCallback2 = FieldCallback_PrepareFadeInForTeleport;
         gPostMenuFieldCallback = FieldCallback_Teleport;
         return TRUE;
     }
diff --git a/src/party_menu.c b/src/party_menu.c
index 016c359cb9..357dce33d0 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -14,6 +14,7 @@
 #include "decompress.h"
 #include "easy_chat.h"
 #include "event_data.h"
+#include "event_object_movement.h"
 #include "evolution_scene.h"
 #include "field_control_avatar.h"
 #include "field_effect.h"
@@ -3742,6 +3743,11 @@ bool8 FieldCallback_PrepareFadeInFromMenu(void)
     return TRUE;
 }
 
+bool8 FieldCallback_PrepareFadeInForTeleport(void) { // same as above, but removes follower pokemon
+    RemoveFollowingPokemon();
+    return FieldCallback_PrepareFadeInFromMenu();
+}
+
 static void Task_FieldMoveWaitForFade(u8 taskId)
 {
     if (IsWeatherNotFadingIn() == TRUE)