diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-05 01:16:28 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-05 01:16:28 -0500 |
| commit | deac7fd3706ea9de855330881e2555a8c70d72f3 (patch) | |
| tree | d2e63e9261813498b09c255e2b7a1afd6e872c7f /asm/macros | |
| parent | 5b5fedfc78a9f2751d001a92c65be86e3ffefcc1 (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
remove nogba support, crap implementation is crap
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 |