From f350000b4465e0645bbfb58f4bdd8971e4ef58ab Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 17 Feb 2024 23:49:52 -0300 Subject: [PATCH] =?UTF-8?q?Option=20to=20disabling=20follower=20Pok=C3=A9m?= =?UTF-8?q?on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/constants/event_objects.h | 2 ++ src/event_object_movement.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 0ac58ff49e..72f7b3820c 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -286,6 +286,8 @@ #define OW_SPECIES(x) (((x)->graphicsId & OBJ_EVENT_GFX_SPECIES_MASK) - OBJ_EVENT_GFX_MON_BASE) #define OW_FORM(x) ((x)->graphicsId >> OBJ_EVENT_GFX_SPECIES_BITS) +#define OW_FOLLOWERS_ENABLED FALSE + // If true, follower pokemon will bob up and down // during their idle & walking animations #define OW_MON_BOBBING TRUE diff --git a/src/event_object_movement.c b/src/event_object_movement.c index c536eeee63..078bfe25ea 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -2080,6 +2080,8 @@ void RemoveFollowingPokemon(void) // Determine whether follower *should* be visible static bool32 IsFollowerVisible(void) { + if (OW_FOLLOWERS_ENABLED == FALSE) + return FALSE; return !(TestPlayerAvatarFlags(FOLLOWER_INVISIBLE_FLAGS) || MetatileBehavior_IsSurfableWaterOrUnderwater(gObjectEvents[gPlayerAvatar.objectEventId].previousMetatileBehavior)