Name some script commands

18 files changed, 44 insertions, 44 deletions

diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc
index 21346968..ee83a886 100644
--- a/data/scripts/dhc/script_KingDaltusStone.inc
+++ b/data/scripts/dhc/script_KingDaltusStone.inc
@@ -42,7 +42,7 @@ script_0800E3C8:
 	MessageNoOverlap 0x240c
 	WaitUntilTextboxCloses
 	Wait 0x000f
-	_0807F034 0x0053
+	GivePlayerItem 0x0053
 	WaitPlayerGetItem
 	SetLocalFlag 0x0071
 	_0807E878
diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
index a604a7b8..7862193e 100644
--- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
+++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
@@ -15,8 +15,8 @@ script_0800DB7C:
 	_0807EB28 0x1648
 	WaitUntilTextboxCloses
 	Call sub_0804D7EC
-	_0807E5F8 0x00000001
-	WaitForSomething2 0x00000002
+	SetSyncFlag 0x00000001
+	WaitForSyncFlagAndClear 0x00000002
 	Call sub_0807DF50
 	_0807E878
 script_0800DBCA:
@@ -29,18 +29,18 @@ script_0800DBCA:
 	Call sub_0807F3F8
 	Wait 0x003c
 	StartPlayerScript script_PlayerRescuedZelda
-	WaitForSomething2 0x00000004
-	_0807E5F8 0x00000001
-	WaitForSomething2 0x00000002
-	_0807E5F8 0x00000001
+	WaitForSyncFlagAndClear 0x00000004
+	SetSyncFlag 0x00000001
+	WaitForSyncFlagAndClear 0x00000002
+	SetSyncFlag 0x00000001
 	StartPlayerScript script_PlayerAfterDefeatingV2
-	WaitForSomething2 0x00000006
+	WaitForSyncFlagAndClear 0x00000006
 	MessageFromTargetPos 0x1643, 0x0002
 	WaitUntilTextboxCloses
 	_0807EB28 0x1645
 	WaitUntilTextboxCloses
 	Call sub_0807F3F8
-	_0807E5F8 0x00000001
+	SetSyncFlag 0x00000001
 	StopBgm
 	Call sub_08094F98
 	CallWithArg CreateManager36, 0x00000001
diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
index b1cc0f18..901ce247 100644
--- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
+++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
@@ -3,15 +3,15 @@ SCRIPT_START script_Npc4ECastleCollapsing
 	Wait 0x003c
 	PlayBgm BGM_CASTLE_COLLAPSE
 	StartPlayerScript script_PlayerStonesFall
-	WaitForSomething2 0x00000006
+	WaitForSyncFlagAndClear 0x00000006
 	_0807EB28 0x1646
 	WaitUntilTextboxCloses
-	_0807E5F8 0x00000001
+	SetSyncFlag 0x00000001
 	StartPlayerScript script_PlayerCastleCollapsing
 	CameraTargetPlayer
 	_0807E778 0x0004
 	_0807E80C 0x00000000
-	WaitFor_2
+	WaitForFadeFinish
 	CallWithArg DeleteManager36, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	SetLocalFlag 0x0079
diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc
index d1c4dc6f..c2f60ee1 100644
--- a/data/scripts/dhc/script_Npc4EV3Defeated.inc
+++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc
@@ -20,8 +20,8 @@ script_0800A0FE:
 	_0807E778 0x0002
 	DoFade6
 	EndBlock
-	WaitFor_2
-	WaitForSomething2 0x00000004
+	WaitForFadeFinish
+	WaitForSyncFlagAndClear 0x00000004
 	CallWithArg sub_0806DA1C, 0x00000006
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/dhc/script_Object69CastleEscape.inc b/data/scripts/dhc/script_Object69CastleEscape.inc
index 677a4280..ffd72119 100644
--- a/data/scripts/dhc/script_Object69CastleEscape.inc
+++ b/data/scripts/dhc/script_Object69CastleEscape.inc
@@ -4,8 +4,8 @@ SCRIPT_START script_Object69CastleEscape
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	StartPlayerScript script_PlayerCastleEscape
-	WaitForSomething2 0x00000001
-	WaitForSomething2 0x00000002
+	WaitForSyncFlagAndClear 0x00000001
+	WaitForSyncFlagAndClear 0x00000002
 	_0807EB28 0x1647
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x007a
diff --git a/data/scripts/dhc/script_Object69V2Defeated.inc b/data/scripts/dhc/script_Object69V2Defeated.inc
index 74a59508..9d356a54 100644
--- a/data/scripts/dhc/script_Object69V2Defeated.inc
+++ b/data/scripts/dhc/script_Object69V2Defeated.inc
@@ -11,9 +11,9 @@ SCRIPT_START script_Object69V2Defeated
 	WaitUntilTextboxCloses
 	SetRoomFlag 0x0000
 	Wait 0x001e
-	_0807E5F8 0x00000001
+	SetSyncFlag 0x00000001
 	StartPlayerScript script_PlayerV2Defeated
-	WaitForSomething2 0x00000002
+	WaitForSyncFlagAndClear 0x00000002
 	Call sub_0807DF50
 	_0807E878
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/dhc/script_Object69VaatiWithZelda.inc b/data/scripts/dhc/script_Object69VaatiWithZelda.inc
index 4f71ba77..e66a3b15 100644
--- a/data/scripts/dhc/script_Object69VaatiWithZelda.inc
+++ b/data/scripts/dhc/script_Object69VaatiWithZelda.inc
@@ -15,11 +15,11 @@ script_0800DA64:
 	SetEntityPositionRelative 0x0078, 0x0080
 	CameraTargetEntity
 	Call sub_0807F5C0
-	_0807E5F8 0x00000001
-	WaitForSomething2 0x00000002
+	SetSyncFlag 0x00000001
+	WaitForSyncFlagAndClear 0x00000002
 	MessageFromTargetPos 0x162d, 0x0002
 	WaitUntilTextboxCloses
-	_0807E5F8 0x00000001
+	SetSyncFlag 0x00000001
 	Wait 0x001e
 	MessageFromTargetPos 0x162e, 0x0002
 	WaitUntilTextboxCloses
diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc
index 6431badd..77dc7aaa 100644
--- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc
+++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc
@@ -13,8 +13,8 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap
 	_0807EF3C 0xff80, 0x0000
 	PlaySound SFX_143
 	_0807E930 0x0004
-	_0807E5F8 0x00000002
+	SetSyncFlag 0x00000002
 	Wait 0x003c
-	_0807E5F8 0x00000004
+	SetSyncFlag 0x00000004
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc
index 1854ede1..093a1833 100644
--- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc
+++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap2
 	DoPostScriptAction 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
 	EndBlock
-	WaitForSomething 0x00000002
+	WaitForSyncFlag 0x00000002
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc
index 56ce6d79..8c72e4c3 100644
--- a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc
+++ b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_PlayerAfterDefeatingV2
 	DoPostScriptAction 0x0000
 	_0807ECC4 0x0010
 	DoPostScriptAction 0x000c
-	_0807E5F8 0x00000004
+	SetSyncFlag 0x00000004
 	Call sub_080791BC
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc
index 565fce6f..dff8b0a0 100644
--- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc
+++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc
@@ -6,6 +6,6 @@ SCRIPT_START script_PlayerCastleCollapsing
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	_0807EEF4 0x0000, 0x0080
-	_0807E5F8 0x00000004
+	SetSyncFlag 0x00000004
 	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc
index ea20bf30..997799ad 100644
--- a/data/scripts/dhc/script_PlayerCastleEscape.inc
+++ b/data/scripts/dhc/script_PlayerCastleEscape.inc
@@ -6,6 +6,6 @@ SCRIPT_START script_PlayerCastleEscape
 	_0807EDD4 0x0198, 0x01c8
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	_0807E5F8 0x00000001
+	SetSyncFlag 0x00000001
 	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc
index d4412b4b..23a6112c 100644
--- a/data/scripts/dhc/script_PlayerRescuedZelda.inc
+++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_PlayerRescuedZelda
 	_0807EDD4 0x0078, 0x00a0
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
-	_0807E5F8 0x00000004
+	SetSyncFlag 0x00000004
 	Call sub_080791BC
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/dhc/script_PlayerStonesFall.inc b/data/scripts/dhc/script_PlayerStonesFall.inc
index e1ba8278..5f9e57d1 100644
--- a/data/scripts/dhc/script_PlayerStonesFall.inc
+++ b/data/scripts/dhc/script_PlayerStonesFall.inc
@@ -5,6 +5,6 @@ SCRIPT_START script_PlayerStonesFall
 	DoPostScriptAction 0x0000
 	CallWithArg sub_0807F238, 0x000003c5
 	Call sub_0807F304
-	_0807E5F8 0x00000004
+	SetSyncFlag 0x00000004
 	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/dhc/script_PlayerV2Defeated.inc b/data/scripts/dhc/script_PlayerV2Defeated.inc
index 62cbbc18..33f6d785 100644
--- a/data/scripts/dhc/script_PlayerV2Defeated.inc
+++ b/data/scripts/dhc/script_PlayerV2Defeated.inc
@@ -3,10 +3,10 @@ SCRIPT_START script_PlayerV2Defeated
 	BeginBlock
 	SetEntitySpeed 0x00c0
 	EndBlock
-	WaitForSomething2 0x00000001
+	WaitForSyncFlagAndClear 0x00000001
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x00a8, 0x002c
-	_0807E5F8 0x00000002
+	SetSyncFlag 0x00000002
 	Call sub_080791BC
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/dhc/script_VaatiWithZelda.inc b/data/scripts/dhc/script_VaatiWithZelda.inc
index 84ff00d4..252052f3 100644
--- a/data/scripts/dhc/script_VaatiWithZelda.inc
+++ b/data/scripts/dhc/script_VaatiWithZelda.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_VaatiWithZelda
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0014
 	EndBlock
-	WaitForSomething2 0x00000001
+	WaitForSyncFlagAndClear 0x00000001
 	Wait 0x003c
 	DoPostScriptAction 0x0004
 	Wait 0x003c
@@ -14,8 +14,8 @@ SCRIPT_START script_VaatiWithZelda
 	Call sub_0807F2D4
 	DoPostScriptAction 0x0000
 	Wait 0x003c
-	_0807E5F8 0x00000002
-	WaitForSomething2 0x00000001
+	SetSyncFlag 0x00000002
+	WaitForSyncFlagAndClear 0x00000001
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0014
 SCRIPT_END
diff --git a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc
index 0f35ea99..c52b1a81 100644
--- a/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc
+++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc
@@ -4,9 +4,9 @@ SCRIPT_START script_ZeldaAfterDefeatingV2
 	DoPostScriptAction 0x000a
 	Call sub_08066E38
 	EndBlock
-	WaitForSomething2 0x00000001
+	WaitForSyncFlagAndClear 0x00000001
 	CallWithArg sub_0807F8E8, 0x00000000
-	_0807E5F8 0x00000002
+	SetSyncFlag 0x00000002
 script_0800DCD0:
 	CheckRoomFlag 0x0000
 	JumpIfNot script_0800DCD0
@@ -14,7 +14,7 @@ script_0800DCD0:
 	Wait 0x003c
 	DoPostScriptAction 0x0010
 	SetEntityPositionRelative 0x0078, 0x0068
-	WaitForSomething2 0x00000001
+	WaitForSyncFlagAndClear 0x00000001
 	StopBgm
 	Call sub_08066E50
 	PlaySound SFX_1C9
@@ -36,8 +36,8 @@ script_0800DCD0:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	Wait 0x003c
-	_0807E5F8 0x00000002
-	WaitForSomething2 0x00000001
+	SetSyncFlag 0x00000002
+	WaitForSyncFlagAndClear 0x00000001
 	SetEntitySpeed 0x0100
 	_0807EEF4 0x0000, 0x0008
 	_0807EB44 0x0004
@@ -46,8 +46,8 @@ script_0800DCD0:
 	Call sub_08066E80
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	_0807E5F8 0x00000002
-	WaitForSomething2 0x00000001
+	SetSyncFlag 0x00000002
+	WaitForSyncFlagAndClear 0x00000001
 	DoPostScriptAction 0x0004
 	Wait 0x003c
 	_0807EB44 0x0002
@@ -61,8 +61,8 @@ script_0800DCD0:
 	Wait 0x000a
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	_0807E5F8 0x00000002
-	WaitForSomething2 0x00000001
+	SetSyncFlag 0x00000002
+	WaitForSyncFlagAndClear 0x00000001
 	SetEntitySpeed 0x0100
 	_0807EEF4 0x0000, 0x0080
 SCRIPT_END
diff --git a/data/scripts/dhc/script_ZeldaCastleEscape.inc b/data/scripts/dhc/script_ZeldaCastleEscape.inc
index c6553c8e..83fd2afd 100644
--- a/data/scripts/dhc/script_ZeldaCastleEscape.inc
+++ b/data/scripts/dhc/script_ZeldaCastleEscape.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_ZeldaCastleEscape
 	_0807EDD4 0x0198, 0x01a8
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	_0807E5F8 0x00000002
+	SetSyncFlag 0x00000002
 	Call sub_08066D4C
 	DoPostScriptAction 0x0006
 SCRIPT_END