From f28218a6f18203abcd3b99c2cc6c270733a187db Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Wed, 10 Feb 2021 13:43:55 +0000
Subject: [PATCH] complain if [end] is missing

---
 tools/msg/combine.py                  | 15 +++++++--------
 tools/msg/parse_compile.py            |  3 ++-
 tools/splat_ext/PaperMarioMessages.py |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tools/msg/combine.py b/tools/msg/combine.py
index d0ebb8be8b..57b1123e02 100755
--- a/tools/msg/combine.py
+++ b/tools/msg/combine.py
@@ -65,12 +65,12 @@ if __name__ == "__main__":
             if message.index is None:
                 message.index = section_get_unused_id(section)
 
-            if message.name:
-                if message.name in names:
-                    print(f"error: multiple messages with name '{message.name}'")
-                    exit(1)
-                else:
-                    names.add(message.name)
+            # if message.name:
+            #     if message.name in names:
+            #         print(f"error: multiple messages with name '{message.name}'")
+            #         exit(1)
+            #     else:
+            #         names.add(message.name)
 
                 # if message.header_file_index in messages_by_file:
                 #     messages_by_file[message.header_file_index].add(message)
@@ -78,8 +78,7 @@ if __name__ == "__main__":
                 #     messages_by_file[message.header_file_index] = set([message])
 
             if message.index in section:
-                print(f"error: multiple messages allocated to id {section_idx:02X}:{message.index:03X}")
-                exit(1)
+                print(f"warning: multiple messages allocated to id {section_idx:02X}:{message.index:03X}")
 
             section[message.index] = message
 
diff --git a/tools/msg/parse_compile.py b/tools/msg/parse_compile.py
index 48afb26e90..649dedd468 100755
--- a/tools/msg/parse_compile.py
+++ b/tools/msg/parse_compile.py
@@ -907,7 +907,8 @@ if __name__ == "__main__":
                 else:
                     if source[0] == "}":
                         if not explicit_end:
-                            message.bytes += [0xFD]
+                            print(f"{filename}:{lineno}: warning: string lacks an [end] command")
+                            #message.bytes += [0xFD]
                         explicit_end = False
 
                         # padding
diff --git a/tools/splat_ext/PaperMarioMessages.py b/tools/splat_ext/PaperMarioMessages.py
index ca141c7117..4ab16f8a00 100644
--- a/tools/splat_ext/PaperMarioMessages.py
+++ b/tools/splat_ext/PaperMarioMessages.py
@@ -467,6 +467,8 @@ class N64SegPaperMarioMessages(N64Segment):
                 else:
                     raise ValueError(value)
 
+        self.write_markup("[end]")
+
     def write_markup(self, markup):
         self.f.write(re.sub("\n", "\n    ", markup))