diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 18:09:24 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 18:09:24 -0500 |
| commit | 31d31d326034fde26dedaf2dadb1c608e00fb92f (patch) | |
| tree | be13ed87df14390256c9a3e582fb11adbe4090b8 /asm/macros | |
| parent | 26f7ba482384ad4f63063797a527b7fb33572aa1 (diff) | |
Sync compare macros, some event_scripts.s doc, begin map_scripts constants
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/event.inc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 19293e527..b6526f96f 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -234,14 +234,12 @@ .endm @ 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 + @ Any values between 0x4000 to 0x40FF and 0x8000 to 0x8014 are considered event variable identifiers + .macro compare var:req, arg:req + .if ((\arg >= VARS_START && \arg <= VARS_END) || (\arg >= SPECIAL_VARS_START && \arg <= SPECIAL_VARS_END)) + compare_var_to_var \var, \arg .else - .error "Invalid arguments for 'compare'" + compare_var_to_value \var, \arg .endif .endm @@ -1424,7 +1422,7 @@ .endm .macro case condition, dest - compare_var_to_value 0x8000, \condition + compare_var_to_value VAR_0x8000, \condition goto_if_eq \dest .endm @@ -1461,5 +1459,5 @@ .macro set_gym_trainers gym:req setvar VAR_0x8008, \gym - call EventScript_1A6B18 + call EventScript_SetGymTrainers .endm |