From bc322f444f9de958eb4b7fd27d34c09b6d5a5a4e Mon Sep 17 00:00:00 2001
From: AstrandPallas <dawnmorningstar1999@gmail.com>
Date: Sun, 15 Feb 2026 01:15:35 -0800
Subject: [PATCH] Add unified _MACRO_MSG macro for all message types

Adds _MACRO_MSG to EvMacroType and processUnifiedMacro() to
MacroAssembler. Supports TALKMSG, TALK_KEYWAIT, EASY_OBJ_MSG,
EASY_BOARD_MSG, and ADD_CUSTUM_WIN_LABEL via a single macro:
_MACRO_MSG('TYPE', 'bundle', 'label', 'text')

Old macros (_MACRO_TALKMSG etc.) still work for backward compat.
---
 src/evAssembler.py | 32 ++++++++++++++++++++++++++++++++
 src/ev_macro.py    |  1 +
 2 files changed, 33 insertions(+)

diff --git a/src/evAssembler.py b/src/evAssembler.py
index 1db3ea9..4692d52 100644
--- a/src/evAssembler.py
+++ b/src/evAssembler.py
@@ -569,12 +569,44 @@ def process(self, macro, commands, strTbl, tags):
             evCmdType = textMacroMap[macro.cmdType]
             return self.processTextMacro(evCmdType, macro, commands, strTbl, tags)
 
+        if macro.cmdType == EvMacroType._MACRO_MSG:
+            return self.processUnifiedMacro(macro, commands, strTbl, tags)
+
         raise RuntimeError(
             "Invalid EvMacro: {} at {}:{}:{}".format(
                 macro, self.fileName, macro.line, macro.column
             )
         )
 
+    def processUnifiedMacro(self, macro, commands, strTbl, tags):
+        """Handle _MACRO_MSG('TYPE', 'bundle', 'label', 'text', ...) by dispatching to processTextMacro."""
+        if not macro.args:
+            raise RuntimeError("_MACRO_MSG is missing message type argument at {}:{}:{}".format(
+                self.fileName, macro.line, macro.column))
+
+        msgTypeArg = macro.args[0]
+        if msgTypeArg.argType != EvArgType.MacroString:
+            raise RuntimeError("_MACRO_MSG first argument must be a string type name at {}:{}:{}".format(
+                self.fileName, msgTypeArg.line, msgTypeArg.column))
+
+        unifiedTypeMap = {
+            'TALKMSG': EvCmdType._TALKMSG,
+            'TALK_KEYWAIT': EvCmdType._TALK_KEYWAIT,
+            'EASY_OBJ_MSG': EvCmdType._EASY_OBJ_MSG,
+            'EASY_BOARD_MSG': EvCmdType._EASY_BOARD_MSG,
+            'ADD_CUSTUM_WIN_LABEL': EvCmdType._ADD_CUSTUM_WIN_LABEL,
+        }
+
+        evCmdType = unifiedTypeMap.get(msgTypeArg.data)
+        if evCmdType is None:
+            raise RuntimeError("Unknown message type '{}' in _MACRO_MSG at {}:{}:{}. Valid types: {}".format(
+                msgTypeArg.data, self.fileName, msgTypeArg.line, msgTypeArg.column,
+                ', '.join(unifiedTypeMap.keys())))
+
+        # Create a new macro with args shifted (skip the type arg)
+        shifted = EvMacro(macro.cmdType, macro.args[1:], macro.line, macro.column)
+        return self.processTextMacro(evCmdType, shifted, commands, strTbl, tags)
+
 class evAssembler(evListener):
     def __init__(self, fileName, commands=None, flags=None, works=None, sysflags=None):
         self.fileName = fileName
diff --git a/src/ev_macro.py b/src/ev_macro.py
index 24cdb81..806f6a0 100644
--- a/src/ev_macro.py
+++ b/src/ev_macro.py
@@ -6,6 +6,7 @@ class EvMacroType(IntEnum):
     _MACRO_TALK_KEYWAIT = auto()
     _MACRO_EASY_OBJ_MSG = auto()
     _MACRO_ADD_CUSTUM_WIN_LABEL = auto()
+    _MACRO_MSG = auto()
 
     def isValid(self):
         return self != EvMacroType.Invalid
\ No newline at end of file