diff options
author | Garak <garakmon@gmail.com> | 2018-08-08 12:19:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 12:19:07 -0400 |
commit | 4ebe2448a4dff2e36ca3c11496c68bcf3767b6cc (patch) | |
tree | c19885fa4e4801de0f777efe1adfe7db34893a44 /data/maps/RusturfTunnel/scripts.inc | |
parent | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (diff) | |
parent | fce8a1b817d2033d2203c341dfa12d1115f564ca (diff) |
Merge pull request #11 from pret/master
merge with source repo
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 13fb80043..6c3f759cc 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -310,7 +310,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA faceplayer playbgm MUS_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 - trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 + trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 giveitem_std ITEM_DEVON_GOODS closemessage @@ -415,6 +415,6 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 end_movement RusturfTunnel_EventScript_15CACD:: @ 815CACD - trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 msgbox RusturfTunnel_Text_1948C4, 6 end |