Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-30 22:07:24 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed bug with followers and cross-map scripting events.

Browse Source
This commit is contained in:
Ariel Antonitis
2021-06-12 00:35:15 -04:00
parent e4b9bb75e2
commit 3568c2a882
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/event_object_movement.c
View File

@@ -2064,7 +2064,9 @@ void RemoveObjectEventsOutsideView(void)
{
struct ObjectEvent *objectEvent = &gObjectEvents[i];
if (objectEvent->active && !objectEvent->isPlayer)
// Followers should not go OOB, or their sprites may be freed early during a cross-map scripting event,
// such as Wally's Ralts catch sequence
if (objectEvent->active && !objectEvent->isPlayer && objectEvent->localId != OBJ_EVENT_ID_FOLLOWER)
RemoveObjectEventIfOutsideView(objectEvent);
}
}