atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'romhack' into lighting

Browse source
This commit is contained in:
Ariel Antonitis 2021-06-12 00:37:06 -04:00
commit 87608392fc
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/event_object_movement.c
View file

@ -2073,7 +2073,9 @@ void RemoveObjectEventsOutsideView(void)
{ {
struct ObjectEvent *objectEvent = &gObjectEvents[i]; 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); RemoveObjectEventIfOutsideView(objectEvent);
} }
} }