diff options
| author | Melody <melody@pallet.town> | 2018-12-02 15:10:05 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-02 15:14:29 -0500 |
| commit | a2a99bde115e183267db6bb4b5c1dc73d57284fc (patch) | |
| tree | b5955a26de58feb834007ee84ba036308992e422 | |
| parent | 10725def8e356a6ea9346b1ea3170e1429314db3 (diff) | |
adds req for macro arguments
| -rw-r--r-- | asm/macros/event.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index e7756c317..d66992c35 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -629,7 +629,7 @@ .endm @ If the Trainer flag for Trainer index is not set, this command does absolutely nothing. - .macro trainerbattle type, trainer, local_id, pointer1, pointer2, pointer3, pointer4 + .macro trainerbattle type:req, trainer:req, local_id:req, pointer1:req, pointer2, pointer3, pointer4 .byte 0x5c .byte \type .2byte \trainer @@ -687,10 +687,10 @@ @ Starts a single trainer battle, takes a trainer, intro text, loss text, and an optional event script @ when used with an event script, you can also pass in an optional flag to disable music - .macro trainerbattle_single trainer, intro_text, lose_text, event_script=FALSE, music=TRUE + .macro trainerbattle_single trainer:req, intro_text:req, lose_text:req, event_script=FALSE, music=TRUE .if \event_script == FALSE trainerbattle TRAINER_BATTLE_SINGLE, \trainer, 0, \intro_text, \lose_text - .elseif \event_script != FALSE && \music == TRUE + .elseif \music == TRUE trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, \trainer, 0, \intro_text, \lose_text, \event_script .else trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \event_script @@ -699,10 +699,10 @@ @ Starts a double trainer battle, takes a trainer, intro text, loss text, text for when you have too few pokemon @ and an optional event script, when used with an event script you can pass in an optional flag to disable music - .macro trainerbattle_double trainer, intro_text, lose_text, not_enough_pkmn_text, event_script=FALSE, music=TRUE + .macro trainerbattle_double trainer:req, intro_text:req, lose_text:req, not_enough_pkmn_text:req, event_script=FALSE, music=TRUE .if \event_script == FALSE trainerbattle TRAINER_BATTLE_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text - .elseif \event_script != FALSE && \music == TRUE + .elseif \music == TRUE trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script .else trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text, \event_script @@ -710,17 +710,17 @@ .endm @ Starts a rematch battle, takes a trainer, intro text and loss text - .macro trainerbattle_rematch trainer, intro_text, lose_text + .macro trainerbattle_rematch trainer:req, intro_text:req, lose_text:req trainerbattle TRAINER_BATTLE_REMATCH, \trainer, 0, \intro_text, \lose_text .endm @ Starts a rematch double battle, takes a trainer, intro text, loss text, and text for when you have too few pokemon - .macro trainerbattle_rematch_double trainer, intro_text, lose_text, not_enough_pkmn_text + .macro trainerbattle_rematch_double trainer:req, intro_text:req, lose_text:req, not_enough_pkmn_text:req trainerbattle TRAINER_BATTLE_REMATCH_DOUBLE, \trainer, 0, \intro_text, \lose_text, \not_enough_pkmn_text .endm @ Starts a trainer battle, skipping intro text, takes a trainer and loss text - .macro trainerbattle_no_intro trainer, lose_text + .macro trainerbattle_no_intro trainer:req, lose_text:req trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, \trainer, 0, \lose_text .endm |