diff options
author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 00:07:36 +0100 |
---|---|---|
committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 00:07:36 +0100 |
commit | 6fae3c9b75221ac611871fe5ec4bca057f6f79a2 (patch) | |
tree | 051f350cbce1c2547902fe8982fcda4b55f89bc1 /data/scripts/maps/RusturfTunnel.inc | |
parent | 0bbbc1c6dfc6c2b8646276de94cedab9ddc8bc4b (diff) | |
parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) |
Merge branch 'master' into battle_anim
Diffstat (limited to 'data/scripts/maps/RusturfTunnel.inc')
-rw-r--r-- | data/scripts/maps/RusturfTunnel.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index d50e7cec0..050cf28c2 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -148,7 +148,7 @@ RusturfTunnel_EventScript_15C91B:: @ 815C91B return RusturfTunnel_EventScript_15C92D:: @ 815C92D - playse 21 + playse SE_PIN applymovement 1, RusturfTunnel_Movement_1A0833 waitmovement 0 applymovement 1, RusturfTunnel_Movement_1A0835 @@ -309,7 +309,7 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 RusturfTunnel_EventScript_15C9EA:: @ 815C9EA lock faceplayer - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 |