summaryrefslogtreecommitdiff
path: root/data/maps/CaveOfOrigin_B1F/scripts.inc
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-17 21:17:46 -0500
committerGriffinR <griffin.richards@comcast.net>2019-12-17 21:17:46 -0500
commit23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (patch)
tree9e276d9e08c46e9fe4f92af636d53f1dda33190a /data/maps/CaveOfOrigin_B1F/scripts.inc
parentddfa0c6298f4c4dcde9b40782bbdf41867bff761 (diff)
parentf8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff)
Merge master into doc-tower
Diffstat (limited to 'data/maps/CaveOfOrigin_B1F/scripts.inc')
-rw-r--r--data/maps/CaveOfOrigin_B1F/scripts.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index 378819f43..552f3b095 100644
--- a/data/maps/CaveOfOrigin_B1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
@@ -50,12 +50,12 @@ CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT
closemessage
playse SE_KAIDAN
- fadescreenspeed 1, 4
+ fadescreenspeed FADE_TO_BLACK, 4
setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
setvar VAR_SOOTOPOLIS_CITY_STATE, 3
removeobject 1
clearflag FLAG_HIDE_SKY_PILLAR_WALLACE
- fadescreen 0
+ fadescreen FADE_FROM_BLACK
release
end