Name some script commands

10 files changed, 32 insertions, 32 deletions

diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc
index 04e54f7d..631a1c19 100644
--- a/data/scripts/graveyard/script_GraveyardHouseDoor.inc
+++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc
@@ -13,7 +13,7 @@ script_080096AC:
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	StartPlayerScript script_PlayerAtGraveyardHouseDoor
-	WaitForSomething2 0x00000001
+	WaitForSyncFlagAndClear 0x00000001
 	PlaySound SFX_111
 	DoPostScriptAction 0x0008
 	LoadRoomEntityList gUnk_080D9048
diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc
index d78252c3..e43be1bd 100644
--- a/data/scripts/graveyard/script_GreatFairyArrows.inc
+++ b/data/scripts/graveyard/script_GreatFairyArrows.inc
@@ -9,14 +9,14 @@ script_0800B618:
 	_0807E864
 	Call sub_0807F9A4
 	StartPlayerScript script_PlayerAtGreatFairy
-	WaitForSomething2 0x00000004
+	WaitForSyncFlagAndClear 0x00000004
 	SetRoomFlag 0x0000
-	WaitForSomething2 0x00000004
+	WaitForSyncFlagAndClear 0x00000004
 	CheckLocalFlag 0x009e
 	JumpIf script_0800B7A2
 	MessageNoOverlap 0x0583
 	WaitUntilTextboxCloses
-	_0807E3E8 
+	CheckTextboxResult 
 	JumpIfNot script_0800B684
 	Wait 0x000f
 	MessageNoOverlap 0x0584
@@ -32,7 +32,7 @@ script_0800B684:
 script_0800B68E:
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x009e
-	_0807F034 0x0066
+	GivePlayerItem 0x0066
 script_0800B698:
 	WaitPlayerGetItem
 	_0807EB8C
@@ -42,10 +42,10 @@ script_0800B698:
 script_0800B6A6:
 	_0807E778 0x0004
 	DoFade7
-	WaitFor_2
+	WaitForFadeFinish
 	Call sub_080873FC
 	DoFade6
-	WaitFor_2
+	WaitForFadeFinish
 	CameraTargetPlayer
 	Wait 0x001e
 	Call sub_0807DF50
diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc
index 14fceb9f..f1b2e0fc 100644
--- a/data/scripts/graveyard/script_KingGustav.inc
+++ b/data/scripts/graveyard/script_KingGustav.inc
@@ -11,7 +11,7 @@ script_0800D962:
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	StartPlayerScript script_PlayerAtKingGustav
-	WaitForSomething2 0x00000001
+	WaitForSyncFlagAndClear 0x00000001
 	Wait 0x003c
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
@@ -20,13 +20,13 @@ script_0800D962:
 	SetEntity0x20 0xffff8000
 	MessageNoOverlap 0x1701
 	WaitUntilTextboxCloses
-	_0807E5F8 0x00000004
-	WaitForSomething2 0x00000002
+	SetSyncFlag 0x00000004
+	WaitForSyncFlagAndClear 0x00000002
 	MessageNoOverlap 0x1702
 	WaitUntilTextboxCloses
 	SetEntity0x20 0x00010000
-	_0807E5F8 0x00000004
-	WaitForSomething2 0x00000002
+	SetSyncFlag 0x00000004
+	WaitForSyncFlagAndClear 0x00000002
 	_0807F050 0x006d
 	WaitPlayerGetItem
 	_0807EB28 0x1703
diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_Object69CrowStealingKey.inc
index d4eeac98..9c0bf816 100644
--- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc
+++ b/data/scripts/graveyard/script_Object69CrowStealingKey.inc
@@ -9,14 +9,14 @@ SCRIPT_START script_Object69CrowStealingKey
 	Wait 0x000a
 	_0807E8E4_3
 	Wait 0x0032
-	_0807E5F8 0x00000002
-	WaitForSomething2 0x00000004
+	SetSyncFlag 0x00000002
+	WaitForSyncFlagAndClear 0x00000004
 	StartPlayerScript script_PlayerGetKeyStolen
-	WaitForSomething2 0x00000040
-	_0807E5F8 0x00000008
-	WaitForSomething2 0x00000010
-	_0807E5F8 0x00000020
-	WaitForSomething2 0x00000040
+	WaitForSyncFlagAndClear 0x00000040
+	SetSyncFlag 0x00000008
+	WaitForSyncFlagAndClear 0x00000010
+	SetSyncFlag 0x00000020
+	WaitForSyncFlagAndClear 0x00000040
 	_0807F078 0x003c, 0x0000
 	SetGlobalFlag 0x0020
 	_0807E8E4_3
diff --git a/data/scripts/graveyard/script_Object6AKingsGravestone.inc b/data/scripts/graveyard/script_Object6AKingsGravestone.inc
index 57b0a88c..b8a09309 100644
--- a/data/scripts/graveyard/script_Object6AKingsGravestone.inc
+++ b/data/scripts/graveyard/script_Object6AKingsGravestone.inc
@@ -4,12 +4,12 @@ SCRIPT_START script_Object6AKingsGravestone
 	DoPostScriptAction 0x0008
 	SetEntitySpeed 0x0080
 	EndBlock
-	WaitForSomething2 0x00000004
+	WaitForSyncFlagAndClear 0x00000004
 	DoPostScriptAction 0x0007
 	Wait 0x003c
-	_0807E5F8 0x00000002
-	WaitForSomething2 0x00000004
+	SetSyncFlag 0x00000002
+	WaitForSyncFlagAndClear 0x00000004
 	_0807EDD4 0x0118, 0x0060
-	_0807E5F8 0x00000002
+	SetSyncFlag 0x00000002
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/graveyard/script_Object97FirstCrow.inc b/data/scripts/graveyard/script_Object97FirstCrow.inc
index 40e0dd9a..4c5e2c80 100644
--- a/data/scripts/graveyard/script_Object97FirstCrow.inc
+++ b/data/scripts/graveyard/script_Object97FirstCrow.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_Object97FirstCrow
 	SetEntitySpeed 0x0300
 	Call sub_0807F348
 	EndBlock
-	WaitForSomething2 0x00000002
+	WaitForSyncFlagAndClear 0x00000002
 	PlaySound SFX_123
 	Call sub_0807F1A0
 script_08009816:
@@ -15,7 +15,7 @@ script_08009816:
 	_0807EE30
 	JumpIfNot script_08009816
 	EndBlock
-	_0807E5F8 0x00000004
+	SetSyncFlag 0x00000004
 	Call sub_0807FBD4
 	PlaySound SFX_1F3
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/graveyard/script_Object97SecondCrow.inc b/data/scripts/graveyard/script_Object97SecondCrow.inc
index c3b86b00..131fe158 100644
--- a/data/scripts/graveyard/script_Object97SecondCrow.inc
+++ b/data/scripts/graveyard/script_Object97SecondCrow.inc
@@ -6,13 +6,13 @@ SCRIPT_START script_Object97SecondCrow
 	SetEntitySpeed 0x0300
 	Call sub_0807F348
 	EndBlock
-	WaitForSomething2 0x00000008
+	WaitForSyncFlagAndClear 0x00000008
 	Call sub_0809E0A0
 	Call sub_0809E0D4
 	PlaySound SFX_1F3
 	Call sub_0807FBD4
 	PlaySound SFX_1F3
-	_0807E5F8 0x00000010
+	SetSyncFlag 0x00000010
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc
index 4fbb447d..5d193069 100644
--- a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc
+++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor
 	Wait 0x000a
 	DoPostScriptAction 0x0004
 	Wait 0x003c
-	_0807E5F8 0x00000001
+	SetSyncFlag 0x00000001
 	DoPostScriptAction 0x000d
 	SetEntitySpeed 0x0100
 	_0807ECC4 0x0010
diff --git a/data/scripts/graveyard/script_PlayerAtKingGustav.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc
index 92ced678..d1214171 100644
--- a/data/scripts/graveyard/script_PlayerAtKingGustav.inc
+++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc
@@ -7,6 +7,6 @@ SCRIPT_START script_PlayerAtKingGustav
 	_0807EDD4 0x0118, 0x0060
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
-	_0807E5F8 0x00000001
+	SetSyncFlag 0x00000001
 	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc
index 4848e38c..c805299a 100644
--- a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc
+++ b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc
@@ -8,14 +8,14 @@ SCRIPT_START script_PlayerGetKeyStolen
 	_0807ECF4 0x0004
 	Call sub_0807F1E8
 	Wait 0x001e
-	_0807E5F8 0x00000040
-	WaitForSomething2 0x00000020
+	SetSyncFlag 0x00000040
+	WaitForSyncFlagAndClear 0x00000020
 	PlaySound SFX_PLY_JUMP
 	_0807EB44 0x0004
 	Call sub_0807F210
 	_0807EF3C 0x0200, 0x0020
 	DoPostScriptAction 0x0000
-	_0807E5F8 0x00000040
+	SetSyncFlag 0x00000040
 	Call sub_080791BC
 SCRIPT_END
 	.2byte 0x0000