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/Route112/scripts.inc
+7 -7
View File
@@ -61,12 +61,12 @@ Route112_EventScript_1F1E61:: @ 81F1E61
end
Route112_EventScript_1F1E6A:: @ 81F1E6A
trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA
trainerbattle_normal TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA
msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE
end
Route112_EventScript_1F1E81:: @ 81F1E81
trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
trainerbattle_normal TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route112_EventScript_1F1ECC
@@ -83,27 +83,27 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD
end
Route112_EventScript_1F1ECC:: @ 81F1ECC
trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7
trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7
msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE
end
Route112_EventScript_1F1EE3:: @ 81F1EE3
trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC
trainerbattle_normal TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC
msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE
end
Route112_EventScript_1F1EFA:: @ 81F1EFA
trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36
trainerbattle_normal TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36
msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE
end
Route112_EventScript_1F1F11:: @ 81F1F11
trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF
trainerbattle_normal TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF
msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE
end
Route112_EventScript_1F1F28:: @ 81F1F28
trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F
trainerbattle_normal TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F
msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE
end