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

Fixes follower NPC not changing state with player after warp (#7009)

Browse Source
This commit is contained in:
Bivurnum 2025-05-29 04:04:41 -05:00 committed by GitHub
parent cc8694d26d
commit 79abc885e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/follower_npc.c
View File

@ -1284,7 +1284,15 @@ void FollowerNPC_WarpSetEnd(void)
}
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ON_FOOT)
{
SetFollowerNPCSprite(FOLLOWER_NPC_SPRITE_INDEX_NORMAL);
SetFollowerNPCData(FNPC_DATA_SURF_BLOB, FNPC_SURF_BLOB_NONE);
}
else if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
{
SetFollowerNPCSprite(FOLLOWER_NPC_SPRITE_INDEX_SURF);
SetFollowerNPCData(FNPC_DATA_SURF_BLOB, FNPC_SURF_BLOB_RECREATE);
}
follower->facingDirection = player->facingDirection;
follower->movementDirection = player->movementDirection;