diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-26 15:32:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-26 15:32:39 -0500 |
| commit | a2c6174ee995f8980bcd38d3199ab2e395cca2ae (patch) | |
| tree | b5a1b7af6d63cd1064db1a59e9961e5906c0ebf4 /asm/macros | |
| parent | 905912e2784c116e28dfe22a95b149f7ef00f640 (diff) | |
| parent | 97d2555fad45c046862b97cf84c443b6935928a6 (diff) | |
Merge pull request #241 from GriffinRichards/doc-viridian
Document Viridian City scripts and adjacent routes
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 7e95af9f4..51f8e7330 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -652,7 +652,7 @@ .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script - .elseif \type == TRAINER_BATTLE_TUTORIAL + .elseif \type == TRAINER_BATTLE_EARLY_RIVAL .4byte \pointer1 @ text .4byte \pointer2 @ text .endif @@ -699,9 +699,9 @@ trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, \trainer, 0, \lose_text .endm - @ - .macro trainerbattle_tutorial trainer:req, unk:req, intro_text:req, lose_text:req - trainerbattle TRAINER_BATTLE_TUTORIAL, \trainer, \unk, \intro_text, \lose_text + @ Starts a trainer battle with victory text if the player loses. If flags is nonzero, the player will be healed after battle (and its assumed to be the tutorial battle) + .macro trainerbattle_earlyrival trainer:req, flags:req, defeat_text:req, victory_text:req + trainerbattle TRAINER_BATTLE_EARLY_RIVAL, \trainer, \flags, \defeat_text, \victory_text .endm @ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes. |