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/Route105/scripts.inc
+8 -8
View File
@@ -32,37 +32,37 @@ Route105_MapScript2_1EE240: @ 81EE240
.2byte 0
Route105_EventScript_1EE24A:: @ 81EE24A
trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62
trainerbattle_normal TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62
msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE261:: @ 81EE261
trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66
trainerbattle_normal TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66
msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE278:: @ 81EE278
trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA
trainerbattle_normal TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA
msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE28F:: @ 81EE28F
trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0
trainerbattle_normal TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0
msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE2A6:: @ 81EE2A6
trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059
trainerbattle_normal TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059
msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE2BD:: @ 81EE2BD
trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB
trainerbattle_normal TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB
msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE
end
Route105_EventScript_1EE2D4:: @ 81EE2D4
trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
trainerbattle_normal TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route105_EventScript_1EE31F
@@ -79,7 +79,7 @@ Route105_EventScript_1EE300:: @ 81EE300
end
Route105_EventScript_1EE31F:: @ 81EE31F
trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD
trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD
msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE
end