From 01335fa453a90d9f48ce6d8f92a947cd1782b23c Mon Sep 17 00:00:00 2001
From: Ariel A <24759293+aarant@users.noreply.github.com>
Date: Thu, 23 Jun 2022 22:13:21 -0400
Subject: [PATCH] Unfreeze follower object during lockall (if safe movement
 flag set). MSGBOX_SIGN no longer freezes follower.

---
 data/scripts/std_msgbox.inc | 2 ++
 src/scrcmd.c                | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc
index c46da56cbf..40026c8ea0 100644
--- a/data/scripts/std_msgbox.inc
+++ b/data/scripts/std_msgbox.inc
@@ -8,11 +8,13 @@ Std_MsgboxNPC:
 	return
 
 Std_MsgboxSign:
+  setflag FLAG_SAFE_FOLLOWER_MOVEMENT
 	lockall
 	message NULL
 	waitmessage
 	waitbuttonpress
 	releaseall
+  clearflag FLAG_SAFE_FOLLOWER_MOVEMENT
 	return
 
 Std_MsgboxDefault:
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 79b13534ab..a648bf105c 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1248,8 +1248,11 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
     }
     else
     {
+        struct ObjectEvent *followerObj = GetFollowerObject();
         FreezeObjects_WaitForPlayer();
         SetupNativeScript(ctx, IsFreezePlayerFinished);
+        if (FlagGet(FLAG_SAFE_FOLLOWER_MOVEMENT) && followerObj) // Unfreeze follower object (conditionally)
+            UnfreezeObjectEvent(followerObj);
         return TRUE;
     }
 }