Merge pull request #9 from kiij/issue-6

Don't split menus across files, fixes #6

Author: Lyrositor

CCScriptWriter/CCScriptWriter.py

@@ -455,6 +455,8 @@ def getText(self, i, stop=None, dataType=False):
         block = ""
         start = i
         text = False
+        normal_block_expect_02 = False
+
         while True:
             if stop and stop == i:
                 break
@@ -471,6 +473,10 @@ def getText(self, i, stop=None, dataType=False):
                         length = self.getLength(i)
                     block += "[{}".format(FormatHex(c))
 
+                    # Mark if we expect an [02] before the end of the block
+                    if c == 0x19:
+                        normal_block_expect_02 = True
+
                     # Get the rest of the control code.
                     codeEnd = i + length
                     while i < codeEnd:
@@ -479,7 +485,10 @@ def getText(self, i, stop=None, dataType=False):
                     block += "]"
 
                     # Stop if this is a block-ending character.
-                    if c == 0x02 or c == 0x0A:
+                    if c == 0x02 and normal_block_expect_02:
+                        # But don't stop if we expect an [02] that doesn't end the block
+                        normal_block_expect_02 = False
+                    elif c == 0x02 or c == 0x0A:
                         break
                 # Check if it's a special character.
                 elif c == 0x52 or c == 0x8b or c == 0x8c or c == 0x8d:
@@ -737,4 +746,4 @@ def main():
         print("\rProgram execution aborted.")
 
 if __name__ == "__main__":
-    main()
+    main()