From 32526f92f8cf439c7bf66d37dd097ffab4ba560d Mon Sep 17 00:00:00 2001
From: dawnDus <96957561+dawndus@users.noreply.github.com>
Date: Fri, 4 Feb 2022 19:31:16 -0500
Subject: [PATCH] TSC Fixes: - <CLR should not reset <FAC - Last character \n
 bugfix

---
 src/scripting/tsc/text_script.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/scripting/tsc/text_script.rs b/src/scripting/tsc/text_script.rs
index aa446d3..9c25668 100644
--- a/src/scripting/tsc/text_script.rs
+++ b/src/scripting/tsc/text_script.rs
@@ -238,11 +238,11 @@ impl TextScriptVM {
         self.flags.0 = 0;
         self.current_illustration = None;
         self.illustration_state = IllustrationState::Hidden;
+        self.face = 0;
         self.clear_text_box();
     }
 
     pub fn clear_text_box(&mut self) {
-        self.face = 0;
         self.item = 0;
         self.current_line = TextScriptLine::Line1;
         self.line_1.clear();
@@ -375,7 +375,7 @@ impl TextScriptVM {
                             _ => {}
                         }
 
-                        if remaining > 1 {
+                        if remaining > 1 || new_line {
                             let ticks = if state.textscript_vm.flags.fast() || state.textscript_vm.flags.cutscene_skip()
                             {
                                 0
@@ -424,7 +424,11 @@ impl TextScriptVM {
                         state.textscript_vm.line_1.clear();
                         state.textscript_vm.line_1.append(&mut state.textscript_vm.line_2);
                         state.textscript_vm.line_2.append(&mut state.textscript_vm.line_3);
-                        state.textscript_vm.state = TextScriptExecutionState::Msg(event, ip, remaining, ticks);
+                        if remaining == 0 {
+                            state.textscript_vm.state = TextScriptExecutionState::Running(event, ip);
+                        } else {
+                            state.textscript_vm.state = TextScriptExecutionState::Msg(event, ip, remaining, ticks);
+                        }
                     } else {
                         state.textscript_vm.state =
                             TextScriptExecutionState::MsgNewLine(event, ip, remaining, ticks, counter);