From 7456e3ce14acc6092302649a258f6cb65474e1d7 Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Sat, 24 Apr 2021 18:47:13 -0400 Subject: [PATCH] Fixed bug where followers appeared underwater. --- src/event_object_movement.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 6265b392a0..0179d43afd 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -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) {