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/RusturfTunnel/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/RusturfTunnel/scripts.inc')
-rw-r--r-- | data/maps/RusturfTunnel/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index bdef05258..b507c29b4 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -313,7 +313,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 faceplayer playbgm MUS_AQA_0, 0 msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 + trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0 msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage @@ -426,7 +426,7 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB + trainerbattle_normal TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE end |