diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 22:52:10 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 22:52:10 +0100 |
| commit | dcecc8aebfd2480d6e79f3c1f54b737ecbb319f8 (patch) | |
| tree | 269aa3818b69d5379194ffff713ed5d7f4576160 /asm/macros | |
| parent | 344b8bffbb969cca8b1c23ddf994c0c8ec6fe1f8 (diff) | |
| parent | 680d3fd7b980578024226eccffe2e01072826227 (diff) | |
merge with master
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/event.inc | 86 |
1 files changed, 85 insertions, 1 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index cf4c9628a..fcbd3a055 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1361,10 +1361,94 @@ @ Supplementary - .macro goto_if_eq dest + .macro goto_if_trainer_not_defeated opponent, dest + checktrainerflag \opponent + goto_if 0, \dest + .endm + + .macro goto_if_trainer_defeated opponent, dest + checktrainerflag \opponent + goto_if 1, \dest + .endm + + .macro call_if_trainer_not_defeated opponent, dest + checktrainerflag \opponent + call_if 0, \dest + .endm + + .macro call_if_trainer_defeated opponent, dest + checktrainerflag \opponent + call_if 1, \dest + .endm + + .macro goto_if_unset flag, dest + checkflag \flag + goto_if 0, \dest + .endm + + .macro goto_if_set flag, dest + checkflag \flag + goto_if 1, \dest + .endm + + .macro goto_if_lt dest @ LESS THAN + goto_if 0, \dest + .endm + + .macro goto_if_eq dest @ EQUAL goto_if 1, \dest .endm + .macro goto_if_gt dest @ GREATER THAN + goto_if 2, \dest + .endm + + .macro goto_if_le dest @ LESS THAN OR EQUAL + goto_if 3, \dest + .endm + + .macro goto_if_ge dest @ GREATER THAN OR EQUAL + goto_if 4, \dest + .endm + + .macro goto_if_ne dest @ NOT EQUAL + goto_if 5, \dest + .endm + + .macro call_if_unset flag, dest + checkflag \flag + call_if 0, \dest + .endm + + .macro call_if_set flag, dest + checkflag \flag + call_if 1, \dest + .endm + + .macro call_if_lt dest @ LESS THAN + call_if 0, \dest + .endm + + .macro call_if_eq dest @ EQUAL + call_if 1, \dest + .endm + + .macro call_if_gt dest @ GREATER THAN + call_if 2, \dest + .endm + + .macro call_if_le dest @ LESS THAN OR EQUAL + call_if 3, \dest + .endm + + .macro call_if_ge dest @ GREATER THAN OR EQUAL + call_if 4, \dest + .endm + + .macro call_if_ne dest @ NOT EQUAL + call_if 5, \dest + .endm + .macro switch var copyvar VAR_SPECIAL_0, \var .endm |