diff --git a/Syntaxes/MPW Asm IIgs.sublime-syntax b/Syntaxes/MPW Asm IIgs.sublime-syntax
index cccfad1..22ff28f 100644
--- a/Syntaxes/MPW Asm IIgs.sublime-syntax
+++ b/Syntaxes/MPW Asm IIgs.sublime-syntax
@@ -53,6 +53,10 @@ contexts:
- include: mnemonics-65816-long
- include: mnemonics-65816-alt
+ # toolbox macros
+ - match: \b_[A-Za-z0-9]+\b
+ scope: support.function.macro.toolbox
+
- match: \b((?i)DC|DCB|DS)([.](.))?
scope: meta.dc.directive
@@ -271,7 +275,7 @@ contexts:
scope: keyword.mnemonic.rockwell
mnemonics-65c02-m740:
- - match: \b(?i:CLT|COM|LDM|RRF|SETT|TST)\b
+ - match: \b(?i:CLT|COM|LDM|RRF|SET|TST)\b
scope: keyword.mnemonic.m740
diff --git a/Syntaxes/MPW Asm IIgs.tmLanguage b/Syntaxes/MPW Asm IIgs.tmLanguage
index bbf2ca2..70acc5b 100644
--- a/Syntaxes/MPW Asm IIgs.tmLanguage
+++ b/Syntaxes/MPW Asm IIgs.tmLanguage
@@ -52,7 +52,7 @@
comment
Rockwell/m740
match
- \b(?i:CLT|COM|LDM|RRF|SETT|TST)\b
+ \b(?i:CLT|COM|LDM|RRF|SET|TST)\b
name
keyword.mnemonic.other
diff --git a/Syntaxes/Merlin.sublime-syntax b/Syntaxes/Merlin.sublime-syntax
index ee8e16a..2ae66e4 100644
--- a/Syntaxes/Merlin.sublime-syntax
+++ b/Syntaxes/Merlin.sublime-syntax
@@ -62,6 +62,12 @@ contexts:
- include: mnemonics-65816-long
- include: mnemonics-65816-alt
+ # toolbox macros
+ - match: \b_[A-Za-z0-9]+\b
+ scope: support.function.macro.toolbox
+ - match: ~[A-Za-z0-9]+\b
+ scope: support.function.macro.toolbox
+
- match: \b(?i:DFB|DB|DDB|DA|DW|ADR|ADRL|DS)\b
scope: keyword.directive.data
@@ -132,7 +138,7 @@ contexts:
operand:
- include: comment
- include: numbers
- # - include: strings
+ - include: strings
- include: macro-parm
operand-hex:
diff --git a/Syntaxes/NinjaForce assembler.sublime-syntax b/Syntaxes/NinjaForce assembler.sublime-syntax
index 64fbb76..2fe4e56 100644
--- a/Syntaxes/NinjaForce assembler.sublime-syntax
+++ b/Syntaxes/NinjaForce assembler.sublime-syntax
@@ -43,6 +43,10 @@ contexts:
- include: mnemonics-65816-long
- include: mnemonics-65816-alt
+ # toolbox macros
+ - match: \b_[A-Za-z0-9]+\b
+ scope: support.function.macro.toolbox
+
- match: \b(?i:IMP|INS)\b
scope: keyword.control.import
set: operand-string