From e60a0b161ce79f31dc4e469da308b43dfb4eca4c Mon Sep 17 00:00:00 2001
From: Ariel A <24759293+aarant@users.noreply.github.com>
Date: Tue, 21 Jun 2022 22:03:37 -0400
Subject: [PATCH] Updated FOLLOWER_SAFE_MOVEMENT logic.

---
 src/scrcmd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 2461b0d960..58be7085f5 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -105,6 +105,7 @@ bool8 ScrCmd_nop1(struct ScriptContext *ctx)
 
 bool8 ScrCmd_end(struct ScriptContext *ctx)
 {
+    FlagClear(FLAG_SAFE_FOLLOWER_MOVEMENT);
     StopScript(ctx);
     return FALSE;
 }
@@ -295,6 +296,7 @@ bool8 ScrCmd_returnram(struct ScriptContext *ctx)
 
 bool8 ScrCmd_endram(struct ScriptContext *ctx)
 {
+    FlagClear(FLAG_SAFE_FOLLOWER_MOVEMENT);
     ClearRamScript();
     StopScript(ctx);
     return TRUE;
@@ -1270,7 +1272,6 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
 {
     u8 playerObjectId;
     struct ObjectEvent *followerObject = GetFollowerObject();
-    FlagClear(FLAG_SAFE_FOLLOWER_MOVEMENT);
     // Release follower from movement iff it exists and is in the shadowing state
     if (followerObject && gSprites[followerObject->spriteId].data[1] == 0)
         ClearObjectEventMovement(followerObject, &gSprites[followerObject->spriteId]);
@@ -1287,7 +1288,6 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
 {
     u8 playerObjectId;
     struct ObjectEvent *followerObject = GetFollowerObject();
-    FlagClear(FLAG_SAFE_FOLLOWER_MOVEMENT);
     // Release follower from movement iff it exists and is in the shadowing state
     if (followerObject && gSprites[followerObject->spriteId].data[1] == 0)
         ClearObjectEventMovement(followerObject, &gSprites[followerObject->spriteId]);