Name some script commands

8 files changed, 25 insertions, 25 deletions

diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc
index 1da04bec..646b5d39 100644
--- a/data/scripts/cloudTops/script_GregalHealthy.inc
+++ b/data/scripts/cloudTops/script_GregalHealthy.inc
@@ -22,7 +22,7 @@ script_08014C56:
 	SetLocalFlag 0x0066
 	MessageNoOverlap 0x2f0d
 	WaitUntilTextboxCloses
-	_0807F034 0x000a
+	GivePlayerItem 0x000a
 	WaitPlayerGetItem
 	Jump script_08014C82
 script_08014C7C:
diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc
index 10661252..dac29473 100644
--- a/data/scripts/cloudTops/script_GregalSick.inc
+++ b/data/scripts/cloudTops/script_GregalSick.inc
@@ -25,9 +25,9 @@ script_08014B70:
 	EndBlock
 	_0807E864
 	Call sub_0807DF28
-	_0807E5F8 0x00000001
+	SetSyncFlag 0x00000001
 	DoPostScriptAction 0x0004
-	WaitForSomething2 0x00000002
+	WaitForSyncFlagAndClear 0x00000002
 	_0807E930 0x0010
 	Call sub_0806CCF8
 	Wait 0x0014
@@ -43,8 +43,8 @@ script_08014B70:
 	Wait 0x0014
 	Call sub_0806CD4C
 	PlaySound SFX_SECRET
-	_0807E5F8 0x00000001
-	WaitForSomething2 0x00000002
+	SetSyncFlag 0x00000001
+	WaitForSyncFlagAndClear 0x00000002
 	Call sub_0807DF50
 	_0807E878
 script_08014BE8:
@@ -60,7 +60,7 @@ script_08014BF2:
 	MessageNoOverlap 0x2f07
 	WaitUntilTextboxCloses
 	SetIntVariable 0x00000064
-	_0807F034 0x003f
+	GivePlayerItem 0x003f
 	WaitPlayerGetItem
 	Jump script_08014C22
 script_08014C1C:
diff --git a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc
index 2e3297b3..c2d465d4 100644
--- a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc
+++ b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc
@@ -7,12 +7,12 @@ SCRIPT_START script_Object69GreatWhirlwindRevealed
 	CameraTargetEntity
 	Call sub_0807FBC4
 	EndBlock
-	_0807E5F8 0x00000008
-	WaitForSomething2 0x00000010
-	_0807E5F8 0x00000002
-	WaitForSomething2 0x00000004
-	_0807E5F8 0x0000000a
-	WaitForSomething2 0x00000004
+	SetSyncFlag 0x00000008
+	WaitForSyncFlagAndClear 0x00000010
+	SetSyncFlag 0x00000002
+	WaitForSyncFlagAndClear 0x00000004
+	SetSyncFlag 0x0000000a
+	WaitForSyncFlagAndClear 0x00000004
 	_0807EEB4
 	_0807F0B4 0x0004
 	CameraTargetPlayer
diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc
index a2a5ef87..5dd59161 100644
--- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc
+++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc
@@ -6,6 +6,6 @@ SCRIPT_START script_PlayerAtSiroc
 	_0807EDD4 0x0078, 0x0040
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
-	_0807E5F8 0x00000001
+	SetSyncFlag 0x00000001
 	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc
index c45610b2..679d1966 100644
--- a/data/scripts/cloudTops/script_Siroc.inc
+++ b/data/scripts/cloudTops/script_Siroc.inc
@@ -10,7 +10,7 @@ script_08014AD2:
 	_0807E864
 	_0807EB74
 	StartPlayerScript script_PlayerAtSiroc
-	WaitForSomething2 0x00000001
+	WaitForSyncFlagAndClear 0x00000001
 	_0807EB74
 	CheckLocalFlag 0x0064
 	JumpIf script_08014AFE
diff --git a/data/scripts/cloudTops/script_WindTribespeople6.inc b/data/scripts/cloudTops/script_WindTribespeople6.inc
index dd9332bf..fea83201 100644
--- a/data/scripts/cloudTops/script_WindTribespeople6.inc
+++ b/data/scripts/cloudTops/script_WindTribespeople6.inc
@@ -3,14 +3,14 @@ SCRIPT_START script_WindTribespeople6
 	BeginBlock
 	DoPostScriptAction 0x000a
 	EndBlock
-	WaitForSomething2 0x00000001
+	WaitForSyncFlagAndClear 0x00000001
 	_0807EB74
 	DoPostScriptAction 0x0004
-	_0807E5F8 0x00000002
-	WaitForSomething2 0x00000001
+	SetSyncFlag 0x00000002
+	WaitForSyncFlagAndClear 0x00000001
 	MessageNoOverlap 0x2f0a
 	WaitUntilTextboxCloses
-	_0807E5F8 0x00000002
+	SetSyncFlag 0x00000002
 script_08014AAC:
 	_0807E30C
 	JumpIfNot script_08014AAC
diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc
index 19d94f87..0561a0fb 100644
--- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc
+++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	EndBlock
-	WaitForSomething2 0x00000008
+	WaitForSyncFlagAndClear 0x00000008
 	DoPostScriptAction 0x0004
 	Wait 0x003c
 	PlaySound SFX_123
@@ -15,12 +15,12 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1
 	_0807EDD4 0x01e0, 0x01d8
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0000
-	_0807E5F8 0x00000010
+	SetSyncFlag 0x00000010
 	PlaySound SFX_PLY_JUMP
 	_0807EF3C 0x0180, 0x0030
 	PlaySound SFX_PLY_JUMP
 	_0807EF3C 0x0180, 0x0030
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0001
-	WaitForSomething2 0x00000008
+	WaitForSyncFlagAndClear 0x00000008
 	Jump script_0800D80C
diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc
index 076d46f1..53f64c9b 100644
--- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc
+++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc
@@ -6,10 +6,10 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2
 	SetEntityPositionRelative 0x0268, 0x01d8
 	SetEntitySpeed 0x0100
 	EndBlock
-	WaitForSomething2 0x00000002
+	WaitForSyncFlagAndClear 0x00000002
 	_0807EDD4 0x01f0, 0x01d8
-	_0807E5F8 0x00000004
-	WaitForSomething2 0x00000002
+	SetSyncFlag 0x00000004
+	WaitForSyncFlagAndClear 0x00000002
 script_0800D80C:
 	SetEntitySpeed 0x0100
 	_0807EEF4 0x0000, 0xffe0
@@ -21,7 +21,7 @@ script_0800D82A:
 	CallWithArg sub_0807F8D0, 0xffffe000
 	Call sub_0807F8BC
 	JumpIf script_0800D82A
-	_0807E5F8 0x00000004
+	SetSyncFlag 0x00000004
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000