Fade documentation

28 files changed, 47 insertions, 47 deletions

diff --git a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc
index 764464ad..3c3d8b38 100644
--- a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc
+++ b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_IntroCameraTarget
 	PlayBgm BGM_MINISH_CAP
 	SetFadeTime 0x0002
 	@ Fade in
-	DoFade4
+	SetFade4
 	WaitForFadeFinish @ TODO wait for fade to be finished
 	Wait 0x0078
 	SetSyncFlag 0x00000004
diff --git a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc
index 9acf2548..7a526696 100644
--- a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc
+++ b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_Npc4EOutsideLinksHouse
 	Call sub_0807DF28
 	EndBlock
 	SetFadeTime 0x0010
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	SetSyncFlag 0x00000001
 	WaitForSyncFlagAndClear 0x00000002
diff --git a/data/scripts/cutscene/intro/script_SmithIntro.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc
index ae998135..832e37cb 100644
--- a/data/scripts/cutscene/intro/script_SmithIntro.inc
+++ b/data/scripts/cutscene/intro/script_SmithIntro.inc
@@ -32,7 +32,7 @@ SCRIPT_START script_SmithIntro
 	DoPostScriptAction 0x0000
 	Wait 0x001e
 	SetFadeTime 0x0002
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_08053634
 SCRIPT_END
diff --git a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc
index 164293e8..0b496f45 100644
--- a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc
+++ b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_ZeldaLeaveLinksHouse
 	_0807EDD4 0x0078, 0x0098
 	DoPostScriptAction 0x0008
 	SetFadeTime 0x0010
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_08053634
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc
index 79078065..97319c8f 100644
--- a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc
+++ b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc
@@ -19,7 +19,7 @@ SCRIPT_START script_PlayerWakingUpInHyruleCastle
 	EndBlock
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 script_08009EA4:
 	Call CheckAnyKeyPressed
diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
index 0e733e50..a25fa93f 100644
--- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
+++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_Npc4EMonsters
 	SetSyncFlag 0x00800000
 	WaitForSyncFlagAndClear 0x01000000
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	WaitForFadeFinish
 	Wait 0x003c
 	PlaySound SFX_SPIRITS_RELEASE
@@ -23,7 +23,7 @@ SCRIPT_START script_Npc4EMonsters
 	SetSyncFlag 0x00000010
 	WaitForSyncFlagAndClear 0x00000020
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	CallWithArg DeleteManager36, 0x00000002
 	_0807F0C8 0x0000, 0x0000
diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
index 722006a3..9e1c5a94 100644
--- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
+++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
@@ -18,7 +18,7 @@ SCRIPT_START script_Npc4EIntroCastle
 	WaitUntilTextboxCloses
 	StopBgm
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_08064180
 	Call sub_08064180
@@ -39,7 +39,7 @@ SCRIPT_START script_Npc4EIntroCastle
 	Wait 0x000a
 	_0807F0B4 0x0001
 	SetFadeTime 0x0001
-	DoFade4
+	SetFade4
 	SetSyncFlag 0x0002a800
 	WaitForSyncFlagAndClear 0x00055000
 	SetEntityPositionRelative 0x01f8, 0x0078
diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
index 1b23ef0d..0f8cf461 100644
--- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
+++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
@@ -19,7 +19,7 @@ SCRIPT_START script_Npc4EIntroTown
 	SetEntityPositionRelative 0x00c8, 0x0148
 	Call sub_0807F844
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	StartPlayerScript script_PlayerIntro1
 	SetSyncFlag 0x00000002
diff --git a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc
index b6217240..9706a139 100644
--- a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc
+++ b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc
@@ -20,7 +20,7 @@ SCRIPT_START script_Object69CameraTarget
 	WaitForSyncFlagAndClear 0x00001000
 	StopBgm
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	SetRoomFlag 0x0001
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc
index 8f2e5cee..cc7d99f5 100644
--- a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc
+++ b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_Object69MinishVaati
 	EndBlock
 	PlayBgm BGM_EZLO_STORY
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	Wait 0x003c
 	SetSyncFlag 0x00000080
diff --git a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc
index 411aae34..79a9e79c 100644
--- a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc
+++ b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc
@@ -135,7 +135,7 @@ script_08015104:
 	_0807F0B4 0x0004
 	CameraTargetEntity
 	SetFadeTime 0x0100
-	DoFade4
+	SetFade4
 	_0807E80C 0x00000000
 	EndBlock
 	StartPlayerScript script_PlayerSeenOriginStory
diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
index 75cd30d5..804f04ec 100644
--- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
@@ -54,7 +54,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing
 	Call sub_0808D280
 	Wait 0x0078
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_0807FB94 @ Roll Credits
 	MoveEntityToPlayer
@@ -62,7 +62,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing
 	_0807F0B4 0x0004
 	CameraTargetPlayer
 	SetSyncFlag 0x80000000
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	Call sub_0807DF50
 	EnablePlayerControl
diff --git a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc
index 0430d9ce..c3879751 100644
--- a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc
@@ -9,12 +9,12 @@ SCRIPT_START script_Npc4EUnfreezeCastleStaff
 	Wait 0x003c
 	PlaySound SFX_EVAPORATE
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	WaitForFadeFinish
 	SetSyncFlag 0x00000001
 	PlaySound SFX_APPARATE
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	Wait 0x001e
 	SetSyncFlag 0x00000002
diff --git a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc
index a0dc7eb6..b8dd72eb 100644
--- a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc
+++ b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_Object3EPictureBackRoom
 	StartPlayerScript script_PlayerMoveToPicture
 	WaitForSyncFlagAndClear 0x00000002
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	LoadRoomEntityList gUnk_080F5680
 	StartPlayerScript script_PlayerSanctuaryIntro
@@ -45,7 +45,7 @@ SCRIPT_START script_Object3EPictureBackRoom
 	WaitForSyncFlagAndClear 0x00000040
 	SetFadeMask 0xffff7fff
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	StopBgm
 	_0807E858 0x0000
@@ -56,7 +56,7 @@ SCRIPT_START script_Object3EPictureBackRoom
 	WaitUntilTextboxCloses
 	SetFadeMask 0xffffffff
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000002
diff --git a/data/scripts/cutscene/takeover/script_Object69Takeover.inc b/data/scripts/cutscene/takeover/script_Object69Takeover.inc
index 773a0fef..5aba0ef9 100644
--- a/data/scripts/cutscene/takeover/script_Object69Takeover.inc
+++ b/data/scripts/cutscene/takeover/script_Object69Takeover.inc
@@ -23,7 +23,7 @@ script_08015BF0:
 	Call sub_0807FBC4
 	CameraTargetPlayer
 	SetFadeTime 0x0100
-	DoFade4
+	SetFade4
 	_0807E80C 0x00000000
 	EndBlock
 	SetFadeTime 0x0004
diff --git a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc
index dea65804..0503d6ce 100644
--- a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc
+++ b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_Object69TakeoverCutscene
 	CameraTargetEntity
 	EndBlock
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	Wait 0x003c
 	_0807F0B4 0x0004
@@ -39,14 +39,14 @@ SCRIPT_START script_Object69TakeoverCutscene
 	SetSyncFlag 0x00000010
 	WaitForSyncFlagAndClear 0x00000020
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	SetSyncFlag 0x00000010
 	LoadRoomEntityList gUnk_080FCE30
 	StopBgm
 	Wait 0x0078
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	PlayBgm BGM_DIGGING_CAVE
 	SetSyncFlag 0x00000040
@@ -60,7 +60,7 @@ SCRIPT_START script_Object69TakeoverCutscene
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000008
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	StopBgm
 	SetRoomFlag 0x0000
diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc
index 09f214d5..6788d7e5 100644
--- a/data/scripts/dhc/script_Npc4EV3Defeated.inc
+++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc
@@ -18,7 +18,7 @@ script_0800A0FE:
 	CallWithArg sub_08094AE8, script_Object6AV3DefeatedMinishCap
 	PlaySound SFX_APPARATE
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	EndBlock
 	WaitForFadeFinish
 	WaitForSyncFlagAndClear 0x00000004
diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc
index 9979e761..c032efd8 100644
--- a/data/scripts/graveyard/script_GreatFairyArrows.inc
+++ b/data/scripts/graveyard/script_GreatFairyArrows.inc
@@ -41,10 +41,10 @@ script_0800B698:
 	WaitUntilTextboxCloses
 script_0800B6A6:
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	WaitForFadeFinish
 	Call sub_080873FC
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	CameraTargetPlayer
 	Wait 0x001e
diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc
index 6e931df0..627bc9b1 100644
--- a/data/scripts/hyruleTown/script_Anju.inc
+++ b/data/scripts/hyruleTown/script_Anju.inc
@@ -42,7 +42,7 @@ script_080101AC:
 	WaitUntilTextboxCloses
 	StopBgm
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	CallWithArg SetPlayerPos, 0x03400378
 	Call SetPlayerActionNormal
@@ -57,7 +57,7 @@ script_080101AC:
 	CameraTargetPlayer
 	EndBlock
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	PlayBGM
 	Call sub_080A13B4
diff --git a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc
index c432019d..b782d895 100644
--- a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc
+++ b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_PlayerSleepingInn
 	EndBlock
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 script_08010A78:
 	Call CheckAnyKeyPressed
diff --git a/data/scripts/lakeHylia/script_KingGustafHologram.inc b/data/scripts/lakeHylia/script_KingGustafHologram.inc
index 295cd219..a79fcdc2 100644
--- a/data/scripts/lakeHylia/script_KingGustafHologram.inc
+++ b/data/scripts/lakeHylia/script_KingGustafHologram.inc
@@ -12,7 +12,7 @@ script_08012368:
 	BeginBlock
 	SetFadeTime 0x0004
 	SetFadeMask 0x00007fff
-	DoFade5
+	SetFade5
 	_0807E858 0x0080
 	EndBlock
 	WaitForFadeFinish
@@ -36,7 +36,7 @@ script_08012368:
 	BeginBlock
 	SetFadeTime 0x0004
 	SetFadeMask 0xffffffff
-	DoFade4
+	SetFade4
 	_0807E858 0x0080
 	EndBlock
 	WaitForFadeFinish
diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc
index 05470c3d..bfde8c90 100644
--- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc
+++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc
@@ -31,10 +31,10 @@ script_0800B7A2:
 	MessageNoOverlap 0x0590
 	WaitUntilTextboxCloses
 	SetFadeTime 0x0010
-	DoFade7
+	SetFade7
 	WaitForFadeFinish
 	ModHealth 0x00a0
-	DoFade6 
+	SetFade6 
 	WaitForFadeFinish 
 	MessageNoOverlap 0x057f
 	WaitUntilTextboxCloses
diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc
index 6662c61f..6abf95dc 100644
--- a/data/scripts/sanctuary/script_Npc4EPedestal.inc
+++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc
@@ -58,13 +58,13 @@ script_080134F8:
 	Call WaitForPlayerFrameHiBit
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	PlaySound SFX_EVAPORATE
 	WaitForFadeFinish
 	Wait 0x003c
 	SetSyncFlag 0x00000010
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	PlaySound SFX_109
 	MessageFromTargetPos 0x0503, 0x000c
diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
index 155c1dbf..e36bf5f1 100644
--- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
@@ -61,13 +61,13 @@ script_0801373C:
 	Call WaitForPlayerFrameHiBit
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	PlaySound SFX_EVAPORATE
 	WaitForFadeFinish
 	Wait 0x003c
 	SetSyncFlag 0x00000010
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	PlaySound SFX_109
 	MessageFromTargetPos 0x0504, 0x000c
diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
index 36e26a82..ae46129d 100644
--- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
@@ -66,13 +66,13 @@ script_080138D0:
 	Call WaitForPlayerFrameHiBit
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	PlaySound SFX_EVAPORATE
 	WaitForFadeFinish
 	Wait 0x003c
 	SetSyncFlag 0x00000010
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	PlaySound SFX_109
 	MessageFromTargetPos 0x0505, 0x000c
diff --git a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc
index 2474bfb8..95402c27 100644
--- a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc
+++ b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc
@@ -13,7 +13,7 @@ script_08009DF0:
 	JumpIfNot script_08009E4E
 	Call sub_0807DF28
 	SetFadeTime 0x0002
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_0804E864
 	Wait 0x001e
diff --git a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc
index e7d0ce43..dc707d43 100644
--- a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc
+++ b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_PlayerWakeAfterRest
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000002
 	SetFadeTime 0x0002
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	DoPostScriptAction 0x0014
 	Wait 0x001e
diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc
index 4d1bcbe0..2e4770e6 100644
--- a/data/scripts/unused/script_08016482.inc
+++ b/data/scripts/unused/script_08016482.inc
@@ -2,10 +2,10 @@
 SCRIPT_START script_08016482
 	FadeInvert
 	Nop2 0x0080
-	DoFade4
-	DoFade5
-	DoFade6
-	DoFade7
+	SetFade4
+	SetFade5
+	SetFade6
+	SetFade7
 	_0807E800 0x00000000
 	_0807E80C 0x00000000
 	_0807E858_0