diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-18 13:16:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-18 13:16:38 -0500 |
| commit | 949509aade2627ded031669c296453c3d0ea9e59 (patch) | |
| tree | 5e8ba850c7592a5cf85dc07971e756b8963ecdfb /data/maps/Route120 | |
| parent | db8a5c6c2be2ceedadf836a8e61c71eb0ff6407b (diff) | |
| parent | f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/Route120')
| -rw-r--r-- | data/maps/Route120/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index c5c00892a..4b7799510 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -225,10 +225,10 @@ Route120_EventScript_StevenBattleKecleon:: @ 81F568B end Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK removeobject 30 @ Invisible Bridge Kecleon removeobject 36 @ Visible Bridge Kecleon - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK goto Route120_EventScript_StevenGiveDeconScope end |