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

removeobject and removeobjectat macros work properly with npc followers (#6889)

Browse Source
This commit is contained in:
Bivurnum 2025-05-26 16:40:00 -05:00 committed by GitHub
parent 983f8e34a1
commit a967f36091
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/follower_npc.c
View File

@ -1022,6 +1022,13 @@ void NPCFollow(struct ObjectEvent *npc, u32 state, bool32 ignoreScriptActive)
else if (ArePlayerFieldControlsLocked() && !ignoreScriptActive)
return;
// If the follower's object has been removed, create a new one and set it to reappear.
if (!follower->active)
{
CreateFollowerNPCAvatar();
SetFollowerNPCData(FNPC_DATA_WARP_END, FNPC_WARP_REAPPEAR);
}
// Restore post warp behavior after setobjectxy.
if (GetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR) == FNPC_DOOR_NO_POS_SET)
SetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR, FNPC_DOOR_NONE);