From c3c433439e2f5745782b01ef42e6915783dd5655 Mon Sep 17 00:00:00 2001
From: pkmnsnfrn <pkmnsnfrn@gmail.com>
Date: Sun, 11 Aug 2024 18:01:52 -0700
Subject: [PATCH] Removed ClearMsgBoxCancelableState per
 https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1712963672

---
 include/script.h           |  3 ---
 src/field_control_avatar.c |  4 ++--
 src/scrcmd.c               |  4 ++--
 src/script.c               | 15 ---------------
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/include/script.h b/include/script.h
index fc50c9d424..a8e7656d51 100644
--- a/include/script.h
+++ b/include/script.h
@@ -67,9 +67,6 @@ extern u8 sMsgIsSignPost;
 extern u8 sMsgBoxIsCancelable;
 
 void SetWalkingIntoSignVars(void);
-void MsgSetSignPost(void);
-void ResetFacingNpcOrSignPostVars(void);
 bool32 CanWalkAwayToCancelMsgBox(void);
-void ClearMsgBoxCancelableState(void);
 
 #endif // GUARD_SCRIPT_H
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 40992feae6..6144ca7af0 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -162,7 +162,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
     gSpecialVar_LastTalked = 0;
     gSelectedObjectEvent = 0;
 
-    ResetFacingNpcOrSignPostVars();
+	sMsgIsSignPost = FALSE;
     playerDirection = GetPlayerFacingDirection();
     GetPlayerPosition(&position);
     metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
@@ -1130,7 +1130,7 @@ static u32 GetFacingSignpostType(u16 metatileBehavior, u32 playerDirection)
 static void SetMsgSignPostAndVarFacing(u32 playerDirection)
 {
     SetWalkingIntoSignVars();
-    MsgSetSignPost();
+	sMsgIsSignPost = TRUE;
     gSpecialVar_Facing = playerDirection;
 }
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index e1d6202a04..69c9d961b6 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1290,7 +1290,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
     ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
     ScriptMovement_UnfreezeObjectEvents();
     UnfreezeObjectEvents();
-    ClearMsgBoxCancelableState();
+    sMsgBoxIsCancelable = FALSE;
     return FALSE;
 }
 
@@ -1309,7 +1309,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
     ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
     ScriptMovement_UnfreezeObjectEvents();
     UnfreezeObjectEvents();
-    ClearMsgBoxCancelableState();
+	sMsgBoxIsCancelable = FALSE;
     return FALSE;
 }
 
diff --git a/src/script.c b/src/script.c
index 632af41ff4..7945b57ea9 100644
--- a/src/script.c
+++ b/src/script.c
@@ -513,21 +513,6 @@ void SetWalkingIntoSignVars(void)
     sMsgBoxIsCancelable = TRUE;
 }
 
-void ResetFacingNpcOrSignPostVars(void)
-{
-    sMsgIsSignPost = FALSE;
-}
-
-void MsgSetSignPost(void)
-{
-    sMsgIsSignPost = TRUE;
-}
-
-void ClearMsgBoxCancelableState(void)
-{
-    sMsgBoxIsCancelable = FALSE;
-}
-
 bool32 CanWalkAwayToCancelMsgBox(void)
 {
     return sMsgBoxIsCancelable;