diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
| commit | 3d49abfecb20b9b86311cbd83ff92a20761ea256 (patch) | |
| tree | 9e65e0cf9a6ce4ba318f0e144553248e6709eb61 /asm/macros | |
| parent | 501482beadd05c5ade13f6919c3c2cd42c86952d (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/event.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 5176beff3..cf4c9628a 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -229,10 +229,10 @@ @ Generic compare macro which attempts to deduce argument types based on their values @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers .macro compare arg1, arg2 - .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_value \arg1, \arg2 + .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) >= -0xFFFF && (\arg2) <= 0xFFFF) + compare_var_to_value (\arg1), ((\arg2) & 0xFFFF) .else .error "Invalid arguments for 'compare'" .endif |