diff options
| author | Melody <melody@pallet.town> | 2018-12-02 07:17:54 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-02 15:08:19 -0500 |
| commit | bad5323642a0db0875ca6213370b1947c1fc105a (patch) | |
| tree | f1d7db2b43a2a8229094fc21d2917c93a05d1fe5 /data/maps/Route108/scripts.inc | |
| parent | 2912ec0e37360ede1bae882f0ea2457ec336f16f (diff) | |
cleans up trainer battle scripts
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
Diffstat (limited to 'data/maps/Route108/scripts.inc')
| -rw-r--r-- | data/maps/Route108/scripts.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index a833dcc5f..16ecc381d 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -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 |