diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
| commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
| tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /data/scripts/maps/RusturfTunnel.s | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'data/scripts/maps/RusturfTunnel.s')
| -rw-r--r-- | data/scripts/maps/RusturfTunnel.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/RusturfTunnel.s b/data/scripts/maps/RusturfTunnel.s index bba1933b8..129bef7c9 100644 --- a/data/scripts/maps/RusturfTunnel.s +++ b/data/scripts/maps/RusturfTunnel.s @@ -311,7 +311,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA faceplayer playmusic BGM_EVIL_TEAM, 0 msgbox RusturfTunnel_Text_19419B, 4 - trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 + trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 giveitem ITEM_DEVON_GOODS closebutton @@ -416,6 +416,6 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 step_end RusturfTunnel_EventScript_15CACD:: @ 815CACD - trainerbattle 0, 635, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 msgbox RusturfTunnel_Text_1948C4, 6 end |