dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #241 from GriffinRichards/doc-viridian

Browse Source 
Document Viridian City scripts and adjacent routes
This commit is contained in:
PikalaxALT
2020-01-26 15:32:39 -05:00
committed by GitHub
parent 905912e278 97d2555fad
commit a2c6174ee9
63 changed files with 853 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+4 -4
View File
@@ -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.