From 84e8df98fb2b24dcc887bd7a5b8bce5512be6006 Mon Sep 17 00:00:00 2001
From: Ariel A <24759293+aarant@users.noreply.github.com>
Date: Fri, 10 Feb 2023 20:07:24 -0500
Subject: [PATCH] Fix bug with ledge jumps and invisible followers.

---
 src/event_object_movement.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 9a94f1a875..741257fc4a 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -5048,6 +5048,11 @@ bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Spri
     ClearObjectEventMovement(objectEvent, sprite);
 
     if (objectEvent->invisible) { // Animate exiting pokeball
+      // Player is jumping, but follower is invisible
+      if (PlayerGetCopyableMovement() == COPY_MOVE_JUMP2) {
+        sprite->sTypeFuncId = 0; // return to shadowing state
+        return FALSE;
+      }
       MoveObjectEventToMapCoords(objectEvent, targetX, targetY);
       ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_EXIT_POKEBALL);
       objectEvent->singleMovementActive = 1;