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

Fixed bug where followers appeared underwater.

Browse source
This commit is contained in:
Ariel Antonitis 2021-04-24 18:47:13 -04:00
parent a36d6c3c2c
commit 7456e3ce14
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/event_object_movement.c
View file

@ -1716,7 +1716,7 @@ void UpdateFollowingPokemon(void) { // Update following pokemon if any
void RemoveFollowingPokemon(void) { // Remove follower object. Idempotent.
struct ObjectEvent *objectEvent = GetFollowerObject();
if (objectEvent == NULL)
if (objectEvent == NULL)g
return;
RemoveObjectEvent(objectEvent);
}
@ -1727,7 +1727,9 @@ static bool8 IsFollowerVisible(void) { // Determine whether follower *should* be
|| MetatileBehavior_IsSurfableWaterOrUnderwater(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior)
|| MetatileBehavior_IsSurfableWaterOrUnderwater(gObjectEvents[gPlayerAvatar.objectEventId].previousMetatileBehavior)
|| MetatileBehavior_IsForcedMovementTile(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior)
|| MetatileBehavior_IsForcedMovementTile(gObjectEvents[gPlayerAvatar.objectEventId].previousMetatileBehavior));
|| MetatileBehavior_IsForcedMovementTile(gObjectEvents[gPlayerAvatar.objectEventId].previousMetatileBehavior)
|| gWeatherPtr->currWeather == WEATHER_UNDERWATER
|| gWeatherPtr->currWeather == WEATHER_UNDERWATER_BUBBLES);
}
static bool8 SpeciesHasType(u16 species, u8 type) {