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/Route119_WeatherInstitute_2F/scripts.inc | |
| parent | db8a5c6c2be2ceedadf836a8e61c71eb0ff6407b (diff) | |
| parent | f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/Route119_WeatherInstitute_2F/scripts.inc')
| -rw-r--r-- | data/maps/Route119_WeatherInstitute_2F/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 03ec9b6f0..58e8ba758 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -64,7 +64,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS fadedefaultbgm - fadescreen 1 + fadescreen FADE_TO_BLACK setflag FLAG_HIDE_ROUTE_119_TEAM_AQUA setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M removeobject 1 @@ -74,7 +74,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 removeobject 7 applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition waitmovement 0 - fadescreen 0 + fadescreen FADE_FROM_BLACK applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer waitmovement 0 copyobjectxytoperm 5 |