summaryrefslogtreecommitdiff
path: root/asm/macros
diff options
context:
space:
mode:
Diffstat (limited to 'asm/macros')
-rw-r--r--asm/macros/event.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 22ea4aaed..489e7c275 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -227,12 +227,9 @@
.endm
@ Generic compare macro which attempts to deduce argument types based on their values
- @ Any negative values are considered local variable indentifiers
@ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers
.macro compare arg1, arg2
- .if (\arg1 < 0) && (\arg2 >= 0 && \arg2 < 0xFF)
- compare_local_to_imm -\arg1, \arg2
- .elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8)
+ .if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8)
compare_var_to_var \arg1, \arg2
.elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF)
compare_var_to_imm \arg1, \arg2