dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

cleans up trainer battle scripts

Browse Source 
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
This commit is contained in:
Melody
2018-12-02 07:17:54 -05:00
parent 2912ec0e37
commit bad5323642
104 changed files with 723 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/Route134/scripts.inc
+9 -9
View File
@@ -7,47 +7,47 @@ Route134_MapScript1_1F764A: @ 81F764A
end
Route134_EventScript_1F7653:: @ 81F7653
trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB
trainerbattle_normal TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB
msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE
end
Route134_EventScript_1F766A:: @ 81F766A
trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643
trainerbattle_normal TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643
msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE
end
Route134_EventScript_1F7681:: @ 81F7681
trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE
trainerbattle_normal TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE
msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE
end
Route134_EventScript_1F7698:: @ 81F7698
trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1
trainerbattle_normal TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1
msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE
end
Route134_EventScript_1F76AF:: @ 81F76AF
trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745
trainerbattle_normal TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745
msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE
end
Route134_EventScript_1F76C6:: @ 81F76C6
trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1
trainerbattle_normal TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1
msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE
end
Route134_EventScript_1F76DD:: @ 81F76DD
trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10
trainerbattle_normal TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10
msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE
end
Route134_EventScript_1F76F4:: @ 81F76F4
trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B
trainerbattle_normal TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B
msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE
end
Route134_EventScript_1F770B:: @ 81F770B
trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B
trainerbattle_normal TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B
msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE
end