diff --git a/Syntaxes/NinjaForce assembler.tmLanguage b/Syntaxes/NinjaForce assembler.tmLanguage
index 15fc25c..2debb62 100644
--- a/Syntaxes/NinjaForce assembler.tmLanguage
+++ b/Syntaxes/NinjaForce assembler.tmLanguage
@@ -6,29 +6,35 @@
s
+ isDisabled
+
name
NinjaForce assembler
patterns
- include
- source.asm.65816
+ match
+ \b(?i:ADC|AND|ASL|BCC|BCS|BEQ|BIT|BMI|BNE|BPL|BRK|BVC|BVS|CLC|CLD|CLI|CLV|CMP|CPX|CPY|DEC|DEX|DEY|EOR|INC|INX|INY|JMP|JSR|LDA|LDX|LDY|LSR|NOP|ORA|PHA|PHP|PLA|PLP|ROL|ROR|RTI|RTS|SBC|SEC|SED|SEI|STA|STX|STY|TAX|TAY|TSX|TXA|TXS|TYA)\b
+ name
+ keyword.mnemonic.6502
- include
- source.asm.65816#long_mnemonics
+ match
+ \b(?i:BRA|PHX|PHY|PLX|PLY|STP|STZ|TRB|TSB|WAI)\b
+ name
+ keyword.mnemonic.65c02
- include
- source.asm.65816#hex_number
+ match
+ \b(?i:BRL|COP|JML|JSL|MVN|MVP|PEA|PEI|PER|PHB|PHD|PHK|PLB|PLD|REP|RTL|SEP|TCD|TCS|TDC|TSC|TXY|TYX|WDM|XBA|XCE)\b
+ name
+ keyword.mnemonic.65816
- include
- source.asm.65816#binary_number
-
-
- include
- source.asm.65816#decimal_number
+ match
+ \b(?i:ADCL|ANDL|CMPL|EORL|LDAL|ORAL|SBCL|STAL)\b
+ name
+ keyword.mnemonic.65816.long
match
@@ -36,6 +42,24 @@
name
keyword.mnemonic.65816.alt
+
+ match
+ %[01]+
+ name
+ constant.numeric.binary
+
+
+ match
+ \b([0-9]+)\b
+ name
+ constant.numeric.decimal
+
+
+ match
+ \$[A-Fa-f0-9]+
+ name
+ constant.numeric.hex
+
match
^[A-Za-z][A-Za-z0-9_]*