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

Make setobjextxy work with npc followers during ON_WARP map script (#6913)

Browse Source
This commit is contained in:
Bivurnum 2025-05-26 11:59:14 -05:00 committed by GitHub
parent 494a04cd76
commit 46e2e676c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/follower_npc.h
View File

@ -44,7 +44,8 @@ enum FollowerNPCSpriteTypes
enum FollowerNPCDoorStairsStates
{
FNPC_DOOR_NONE,
FNPC_DOOR_NEEDS_TO_EXIT
FNPC_DOOR_NEEDS_TO_EXIT,
FNPC_DOOR_NO_POS_SET
};
enum FollowerNPCWarpEndStates

20
src/follower_npc.c
View File

@ -1022,6 +1022,10 @@ void NPCFollow(struct ObjectEvent *npc, u32 state, bool32 ignoreScriptActive)
else if (ArePlayerFieldControlsLocked() && !ignoreScriptActive)
return;
// 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);
// Follower changes to normal sprite after getting off surf blob.
if (GetFollowerNPCData(FNPC_DATA_CURRENT_SPRITE) == FOLLOWER_NPC_SPRITE_INDEX_SURF && !CheckFollowerNPCFlag(PLAYER_AVATAR_FLAG_SURFING) && follower->fieldEffectSpriteId == 0)
{
@ -1250,7 +1254,6 @@ void FollowerNPC_WarpSetEnd(void)
{
struct ObjectEvent *player;
struct ObjectEvent *follower;
u32 toY;
if (!PlayerHasFollowerNPC())
return;
@ -1258,11 +1261,20 @@ void FollowerNPC_WarpSetEnd(void)
player = &gObjectEvents[gPlayerAvatar.objectEventId];
follower = &gObjectEvents[GetFollowerNPCObjectId()];
SetFollowerNPCData(FNPC_DATA_WARP_END, FNPC_WARP_REAPPEAR);
PlayerLogCoordinates(player);
toY = GetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR) == FNPC_DOOR_NEEDS_TO_EXIT ? (player->currentCoords.y - 1) : player->currentCoords.y;
MoveObjectEventToMapCoords(follower, player->currentCoords.x, toY);
// Skip setting position if setobjectxy was used during ON_WARP_INTO_MAP_TABLE.
if (GetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR) == FNPC_DOOR_NO_POS_SET)
{
SetFollowerNPCData(FNPC_DATA_WARP_END, FNPC_WARP_NONE);
SetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR, FNPC_DOOR_NONE);
}
else
{
u32 toY = GetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR) == FNPC_DOOR_NEEDS_TO_EXIT ? (player->currentCoords.y - 1) : player->currentCoords.y;
MoveObjectEventToMapCoords(follower, player->currentCoords.x, toY);
SetFollowerNPCData(FNPC_DATA_WARP_END, FNPC_WARP_REAPPEAR);
}
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ON_FOOT)
SetFollowerNPCSprite(FOLLOWER_NPC_SPRITE_INDEX_NORMAL);

2
src/overworld.c
View File

@ -2432,9 +2432,9 @@ static void InitObjectEventsLocal(void)
SetPlayerAvatarTransitionFlags(player->transitionFlags);
ResetInitialPlayerAvatarState();
TrySpawnObjectEvents(0, 0);
FollowerNPC_HandleSprite();
UpdateFollowingPokemon();
TryRunOnWarpIntoMapScript();
FollowerNPC_HandleSprite();
}
static void InitObjectEventsReturnToField(void)

4
src/scrcmd.c
View File

@ -1421,6 +1421,10 @@ bool8 ScrCmd_setobjectxy(struct ScriptContext *ctx)
Script_RequestEffects(SCREFF_V1 | SCREFF_HARDWARE);
// Don't do follower NPC post-warp position set after setobjectxy.
if (localId == OBJ_EVENT_ID_NPC_FOLLOWER)
SetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR, FNPC_DOOR_NO_POS_SET);
TryMoveObjectEventToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y);
return FALSE;
}