From d05a5a08573d31adef71afe0c0fdc50f933a020f Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Wed, 10 Mar 2021 15:06:59 -0500 Subject: [PATCH] Temporarily removed follower fly script. --- src/event_object_movement.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index d05928148c..559470005a 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1719,8 +1719,8 @@ bool8 ScrFunc_getfolloweraction(struct ScriptContext *ctx) // Essentially a big ScriptCall(ctx, EventScript_FollowerLovesYou); return FALSE; } - // If map is not flyable, set the script to jump past the fly check - if (!Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType)) + // If map is not flyable, set the script to jump past the fly check TODO: Should followers ask to fly? + if (TRUE || !Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType)) ScriptJump(ctx, EventScript_FollowerEnd); behavior = MapGridGetMetatileBehaviorAt(objEvent->currentCoords.x, objEvent->currentCoords.y); species = GetMonData(mon, MON_DATA_SPECIES);