Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug with ledge jumps and invisible followers.

Browse Source
This commit is contained in:
Ariel A 2023-02-10 20:07:24 -05:00
parent 13873727ba
commit 84e8df98fb
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/event_object_movement.c
View File

@ -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;