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/Route108/scripts.inc
+7 -7
View File
@@ -2,32 +2,32 @@ Route108_MapScripts:: @ 81EE689
.byte 0
Route108_EventScript_1EE68A:: @ 81EE68A
trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_296D10, Route108_Text_296D3C
trainerbattle_normal TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C
msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6A1:: @ 81EE6A1
trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_296DAF, Route108_Text_296DEA
trainerbattle_normal TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA
msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6B8:: @ 81EE6B8
trainerbattle 0, TRAINER_TARA, 0, Route108_Text_296E33, Route108_Text_296E71
trainerbattle_normal TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71
msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6CF:: @ 81EE6CF
trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_296EC7, Route108_Text_296EFC
trainerbattle_normal TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC
msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6E6:: @ 81EE6E6
trainerbattle 0, TRAINER_CAROLINA, 0, Route108_Text_297094, Route108_Text_2970D7
trainerbattle_normal TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7
msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE
end
Route108_EventScript_1EE6FD:: @ 81EE6FD
trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
trainerbattle_normal TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route108_EventScript_1EE748
@@ -44,7 +44,7 @@ Route108_EventScript_1EE729:: @ 81EE729
end
Route108_EventScript_1EE748:: @ 81EE748
trainerbattle 5, TRAINER_CORY_1, 0, Route108_Text_297011, Route108_Text_297036
trainerbattle_rematch TRAINER_CORY_1, Route108_Text_297011, Route108_Text_297036
msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE
end