diff options
| author | huderlem <huderlem@gmail.com> | 2019-12-17 19:26:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 19:26:04 -0600 |
| commit | 45eefac5b9d25015671341f5f8888dc602d1a293 (patch) | |
| tree | c2d5f2f056d753bb65dfd36ec3ca7d27419f2c31 /data/maps/Route119_WeatherInstitute_2F/scripts.inc | |
| parent | edb5df1716beb4ea81ef0493a3fac0a43cc6eae5 (diff) | |
| parent | 4879c1eab27b0a01410d6c56c0a25b8152b166b8 (diff) | |
Merge pull request #934 from GriffinRichards/constants-fade
Use fadescreen constants
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 0433877a5..7363b1331 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 EVENT_OBJ_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 |