Merge pull request #571 from octorock/data

16 files changed, 18 insertions, 18 deletions

diff --git a/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc
index 932856b9..cedc7e44 100644
--- a/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc
@@ -8,6 +8,6 @@ SCRIPT_START script_Npc4EDHCEntrance
 	EndBlock
 	Wait 0x003c
 	PlaySound SFX_EVAPORATE
-	CallWithArg sub_0806DA1C, 0x0000000a
+	CallWithArg NPC4E_DoScreenTransition, 10
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc
index c7a29ddd..fff5625d 100644
--- a/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc
@@ -8,6 +8,6 @@ SCRIPT_START script_Npc4EDHCThrone
 	EndBlock
 	Wait 0x003c
 	PlaySound SFX_EVAPORATE
-	CallWithArg sub_0806DA1C, 0x00000008
+	CallWithArg NPC4E_DoScreenTransition, 8
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc
index 7501d914..63db5e51 100644
--- a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc
@@ -8,6 +8,6 @@ SCRIPT_START script_Npc4EHyruleCastleEntrance
 	PlaySound SFX_APPARATE
 	EndBlock
 	Wait 0x003c
-	CallWithArg sub_0806DA1C, 0x0000000b
+	CallWithArg NPC4E_DoScreenTransition, 11
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc
index 1b69617f..7b20ad18 100644
--- a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc
@@ -8,6 +8,6 @@ SCRIPT_START script_Npc4EHyruleCastleThrone
 	PlaySound SFX_APPARATE
 	EndBlock
 	Wait 0x003c
-	CallWithArg sub_0806DA1C, 0x00000009
+	CallWithArg NPC4E_DoScreenTransition, 9
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc
index 1d024a10..82308f08 100644
--- a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc
@@ -15,6 +15,6 @@ SCRIPT_START script_Npc4EMinishWoods
 	Wait 0x000a
 	SetSyncFlag 0x00000008
 	Wait 0x003c
-	CallWithArg sub_0806DA1C, 0x0000000d
+	CallWithArg NPC4E_DoScreenTransition, 13
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc
index b20394c2..f1a4b1e4 100644
--- a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc
@@ -15,6 +15,6 @@ SCRIPT_START script_Npc4EMtCrenel
 	Wait 0x001e
 	SetSyncFlag 0x00000008
 	Wait 0x003c
-	CallWithArg sub_0806DA1C, 0x0000000e
+	CallWithArg NPC4E_DoScreenTransition, 14
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cutscene/outro/script_Npc4EOutro.inc b/data/scripts/cutscene/outro/script_Npc4EOutro.inc
index 218448f7..18d62d7a 100644
--- a/data/scripts/cutscene/outro/script_Npc4EOutro.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EOutro.inc
@@ -59,6 +59,6 @@ SCRIPT_START script_Npc4EOutro
 	WaitForSyncFlagAndClear 0x00000100
 	PlayBgm BGM_INTRO_CUTSCENE
 	PlaySound SFX_APPARATE
-	CallWithArg sub_0806DA1C, 0x00000007
+	CallWithArg NPC4E_DoScreenTransition, 7
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc
index 1dc735ec..4e7e7f58 100644
--- a/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc
+++ b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc
@@ -8,6 +8,6 @@ SCRIPT_START script_Npc4ESanctuaryEntrance
 	EndBlock
 	Wait 0x003c
 	PlaySound SFX_EVAPORATE
-	CallWithArg sub_0806DA1C, 0x0000000f
+	CallWithArg NPC4E_DoScreenTransition, 15
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc
index 05176a82..ce7fa7e9 100644
--- a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc
@@ -27,6 +27,6 @@ SCRIPT_START script_Npc4EUnfreezeCastleStaff
 	Wait 0x0002
 	SetSyncFlag 0x00000020
 	Wait 0x0078
-	CallWithArg sub_0806DA1C, 0x0000000c
+	CallWithArg NPC4E_DoScreenTransition, 12
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/dhc/script_CutsceneOrchestratorV1Defeated.inc b/data/scripts/dhc/script_CutsceneOrchestratorV1Defeated.inc
index f1d673ca..1326fb6d 100644
--- a/data/scripts/dhc/script_CutsceneOrchestratorV1Defeated.inc
+++ b/data/scripts/dhc/script_CutsceneOrchestratorV1Defeated.inc
@@ -8,7 +8,7 @@ script_0800DFB6:
 	SetPlayerIdle
 	Call DisablePauseMenuAndPutAwayItems
 	PlaySound SFX_EVAPORATE
-	CallWithArg sub_0806DA1C, 0x00000004
+	CallWithArg NPC4E_DoScreenTransition, 4
 	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/dhc/script_CutsceneOrchestratorV2Intro.inc b/data/scripts/dhc/script_CutsceneOrchestratorV2Intro.inc
index e18eb5e4..26d328cb 100644
--- a/data/scripts/dhc/script_CutsceneOrchestratorV2Intro.inc
+++ b/data/scripts/dhc/script_CutsceneOrchestratorV2Intro.inc
@@ -25,7 +25,7 @@ script_0800E012:
 	WaitUntilTextboxCloses
 	Wait 0x0096
 	PlaySound SFX_EVAPORATE
-	CallWithArg sub_0806DA1C, 0x00000005
+	CallWithArg NPC4E_DoScreenTransition, 5
 	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
index f2b77db5..64d8aa0a 100644
--- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
+++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_Npc4ECastleCollapsing
 	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	SetLocalFlag 0x0079
-	CallWithArg sub_0806DA1C, 0x00000002
+	CallWithArg NPC4E_DoScreenTransition, 2
 	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc
index 730986bc..5d273e1f 100644
--- a/data/scripts/dhc/script_Npc4EV3Defeated.inc
+++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc
@@ -22,7 +22,7 @@ script_0800A0FE:
 	EndBlock
 	WaitForFadeFinish
 	WaitForSyncFlagAndClear 0x00000004
-	CallWithArg sub_0806DA1C, 0x00000006
+	CallWithArg NPC4E_DoScreenTransition, 6
 	DoPostScriptAction 0x0006
 SCRIPT_END
 .ifndef EU
diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc
index 4f31f650..809ac585 100644
--- a/data/scripts/graveyard/script_KingGustav.inc
+++ b/data/scripts/graveyard/script_KingGustav.inc
@@ -34,8 +34,8 @@ script_0800D962:
 	Wait 0x003c
 	SetLocalFlag 0x0032
 	PlaySound SFX_113
-	SetIntVariable 0x00000001
-	Call sub_0806DA1C
+	SetIntVariable 1
+	Call NPC4E_DoScreenTransition
 	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc
index c9b4026c..0ca9ef89 100644
--- a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc
+++ b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc
@@ -9,7 +9,7 @@ script_08011AFA:
 	MessageFromTargetPos TEXT_VAATI, 0x21, 0x0007
 	WaitUntilTextboxCloses
 	SetLocalFlag MAENIWA_00_WARP
-	CallWithArg sub_0806DA1C, 0x00000003
+	CallWithArg NPC4E_DoScreenTransition, 3
 	EnablePlayerControl
 	Call EnablePauseMenu
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc
index aca66f3f..ea84dcac 100644
--- a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc
+++ b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc
@@ -14,8 +14,8 @@ script_0800D8F4:
 	EzloMessage TEXT_VAATI, 0x25
 	WaitUntilTextboxCloses
 	PlaySound SFX_113
-	SetIntVariable 0x00000000
-	Call sub_0806DA1C
+	SetIntVariable 0
+	Call NPC4E_DoScreenTransition
 	EnablePlayerControl
 	Call EnablePauseMenu
 script_0800D924: