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/MtPyre_Summit | |
| parent | db8a5c6c2be2ceedadf836a8e61c71eb0ff6407b (diff) | |
| parent | f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/MtPyre_Summit')
| -rw-r--r-- | data/maps/MtPyre_Summit/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 18ebc4ff7..8bba1984b 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -45,7 +45,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer2 msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 4 removeobject 5 @@ -54,7 +54,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA fadedefaultbgm - fadescreen 0 + fadescreen FADE_FROM_BLACK delay 20 setvar VAR_MT_PYRE_STATE, 1 compare VAR_0x8008, 0 |