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 A 2022-04-30 17:14:39 -04:00
commit 4534dcf1c4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/event_object_movement.c
View file

@ -1686,7 +1686,7 @@ struct Pokemon * GetFirstLiveMon(void) { // Return address of first conscious pa
struct ObjectEvent * GetFollowerObject(void) { // Return follower ObjectEvent or NULL struct ObjectEvent * GetFollowerObject(void) { // Return follower ObjectEvent or NULL
u8 i; u8 i;
for (i=0; i < OBJECT_EVENTS_COUNT; i++) { for (i=0; i < OBJECT_EVENTS_COUNT; i++) {
if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER) if (gObjectEvents[i].localId == OBJ_EVENT_ID_FOLLOWER && gObjectEvents[i].active)
return &gObjectEvents[i]; return &gObjectEvents[i];
} }
return NULL; return NULL;
@ -1776,7 +1776,8 @@ void UpdateFollowingPokemon(void) { // Update following pokemon if any
.graphicsId = OBJ_EVENT_GFX_OW_MON, .graphicsId = OBJ_EVENT_GFX_OW_MON,
.x = gSaveBlock1Ptr->pos.x, .x = gSaveBlock1Ptr->pos.x,
.y = gSaveBlock1Ptr->pos.y, .y = gSaveBlock1Ptr->pos.y,
.elevation = 3, // If player active, copy player elevation
.elevation = gObjectEvents[gPlayerAvatar.objectEventId].active ? gObjectEvents[gPlayerAvatar.objectEventId].currentElevation : 3,
.movementType = MOVEMENT_TYPE_FOLLOW_PLAYER, .movementType = MOVEMENT_TYPE_FOLLOW_PLAYER,
}; };
objEvent = &gObjectEvents[SpawnSpecialObjectEvent(&template)]; objEvent = &gObjectEvents[SpawnSpecialObjectEvent(&template)];