diff options
| author | Made-s <made111@gmx.de> | 2018-01-06 19:09:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 19:09:47 +0100 |
| commit | 8906ac68e7c5caf7c62597abf16affafc2bb05a3 (patch) | |
| tree | 3c523aa3c85e1d112f06b34283ddc076d0916891 /data/scripts/maps | |
| parent | f813e926e6438c04167a563225b9fca0939fa758 (diff) | |
| parent | b396c6038cec6eba5eed46ed8f70f6a465acc2a6 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'data/scripts/maps')
| -rw-r--r-- | data/scripts/maps/MtChimney_CableCarStation.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/Route112_CableCarStation.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index aefc68bda..6b0858bc5 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -48,7 +48,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp - special sub_8123218 + special CableCar waitstate release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index adbea780e..0264342ea 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -49,7 +49,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp - special sub_8123218 + special CableCar waitstate release end |