label script functions

14 files changed, 54 insertions, 54 deletions

diff --git a/data/scripts/graveyard/script_DampeInside.inc b/data/scripts/graveyard/script_DampeInside.inc
index 4f7b7f6f..c722ae55 100644
--- a/data/scripts/graveyard/script_DampeInside.inc
+++ b/data/scripts/graveyard/script_DampeInside.inc
@@ -2,8 +2,8 @@
 SCRIPT_START script_DampeInside
 	CheckEntityInteractType
 	JumpIfNot script_080095DE
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	DoPostScriptAction 0x0001
 	Call sub_0806BE84
 	WaitUntilTextboxCloses
@@ -15,6 +15,6 @@ SCRIPT_START script_DampeInside
 	WaitUntilTextboxCloses
 	_0807F078 0x003c, 0x0001
 script_08009622:
-	_0807E878
+	EnablePlayerControl
 	DoPostScriptAction 0x0000
 	Jump script_080095DE
diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc
index fd0d90a2..653e1ee5 100644
--- a/data/scripts/graveyard/script_DampeOuside.inc
+++ b/data/scripts/graveyard/script_DampeOuside.inc
@@ -20,8 +20,8 @@ script_08009646:
 script_08009660:
 	CheckEntityInteractType
 	JumpIfNot script_08009660
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	DoPostScriptAction 0x0001
 	Call sub_0806BEC8
 	WaitUntilTextboxCloses
@@ -31,6 +31,6 @@ script_08009660:
 	_0807F078 0x003c, 0x0002
 	Call sub_0806BEFC
 script_0800968E:
-	_0807E878
+	EnablePlayerControl
 	DoPostScriptAction 0x0000
 	Jump script_08009660
diff --git a/data/scripts/graveyard/script_GhostBrothers.inc b/data/scripts/graveyard/script_GhostBrothers.inc
index 4f734e51..b9fed2f1 100644
--- a/data/scripts/graveyard/script_GhostBrothers.inc
+++ b/data/scripts/graveyard/script_GhostBrothers.inc
@@ -2,7 +2,7 @@
 SCRIPT_START script_GhostBrothers
 	BeginBlock
 	Call sub_08065D00
-	_0807EB44 0x0004
+	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
@@ -10,11 +10,11 @@ SCRIPT_START script_GhostBrothers
 script_0800975A:
 	CheckEntityInteractType
 	JumpIfNot script_0800975A
-	_0807E864
-	_0807EB74
+	SetPlayerIdle
+	FacePlayer
 	DoPostScriptAction 0x0000
 	Call sub_08065F64
 	WaitUntilTextboxCloses
-	_0807E878
+	EnablePlayerControl
 	Jump script_0800975A
 	.2byte 0x0000
diff --git a/data/scripts/graveyard/script_Gina.inc b/data/scripts/graveyard/script_Gina.inc
index 2f0422c7..bb427371 100644
--- a/data/scripts/graveyard/script_Gina.inc
+++ b/data/scripts/graveyard/script_Gina.inc
@@ -1,7 +1,7 @@
 @ Graveyard Gina
 SCRIPT_START script_Gina
 	BeginBlock
-	_0807EB44 0x0004
+	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
 	EndBlock
@@ -10,19 +10,19 @@ SCRIPT_START script_Gina
 script_0800B934:
 	CheckEntityInteractType
 	JumpIfNot script_0800B934
-	_0807E864 
-	_0807EB74 
+	SetPlayerIdle 
+	FacePlayer 
 	MessageFromTarget 0x3f19
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x005f
-	_0807E878
+	EnablePlayerControl
 	Jump script_0800B934
 script_0800B94E:
 	CheckEntityInteractType
 	JumpIfNot script_0800B94E
-	_0807E864 
-	_0807EB74 
+	SetPlayerIdle 
+	FacePlayer 
 	MessageFromTarget 0x3f1a
 	WaitUntilTextboxCloses
-	_0807E878 
+	EnablePlayerControl 
 	Jump script_0800B94E
diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc
index 631a1c19..c310b55e 100644
--- a/data/scripts/graveyard/script_GraveyardHouseDoor.inc
+++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc
@@ -9,8 +9,8 @@ SCRIPT_START script_GraveyardHouseDoor
 script_080096AC:
 	CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
 	JumpIfNot script_080096AC
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	Call sub_0807DF28
 	StartPlayerScript script_PlayerAtGraveyardHouseDoor
 	WaitForSyncFlagAndClear 0x00000001
@@ -24,7 +24,7 @@ script_080096EC:
 	CheckGlobalFlag 0x0020
 	JumpIfNot script_080096EC
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 script_080096FC:
 	Call sub_0808692C
 SCRIPT_END
diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc
index e43be1bd..9979e761 100644
--- a/data/scripts/graveyard/script_GreatFairyArrows.inc
+++ b/data/scripts/graveyard/script_GreatFairyArrows.inc
@@ -6,8 +6,8 @@ script_0800B618:
 	CheckPlayerInRegion 0x0078, 0x00b8, 0x1060
 	JumpIfNot script_0800B618
 	Call sub_08079184
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	StartPlayerScript script_PlayerAtGreatFairy
 	WaitForSyncFlagAndClear 0x00000004
 	SetRoomFlag 0x0000
@@ -20,7 +20,7 @@ script_0800B618:
 	JumpIfNot script_0800B684
 	Wait 0x000f
 	MessageNoOverlap 0x0584
-	CallWithArg sub_0807F970, 0x0000058b
+	CallWithArg CheckMessageEqual, 0x0000058b
 	JumpIf script_0800B68E
 	CallWithArg sub_08087424, 0x00000000
 	Wait 0x00b4
@@ -35,12 +35,12 @@ script_0800B68E:
 	GivePlayerItem 0x0066
 script_0800B698:
 	WaitPlayerGetItem
-	_0807EB8C
+	FaceAwayFromPlayer
 	Wait 0x001e
 	MessageNoOverlap 0x057f
 	WaitUntilTextboxCloses
 script_0800B6A6:
-	_0807E778 0x0004
+	SetFadeTime 0x0004
 	DoFade7
 	WaitForFadeFinish
 	Call sub_080873FC
@@ -49,5 +49,5 @@ script_0800B6A6:
 	CameraTargetPlayer
 	Wait 0x001e
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 SCRIPT_END
diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc
index f1b2e0fc..fc690dc8 100644
--- a/data/scripts/graveyard/script_KingGustav.inc
+++ b/data/scripts/graveyard/script_KingGustav.inc
@@ -2,34 +2,34 @@
 SCRIPT_START script_KingGustav
 	BeginBlock
 	DoPostScriptAction 0x0008
-	Call sub_0807F180
+	Call SetCollisionLayer2
 	EndBlock
 script_0800D962:
 	CheckPlayerInRegion 0x0118, 0x0038, 0x3050
 	JumpIfNot script_0800D962
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	Call sub_0807DF28
 	StartPlayerScript script_PlayerAtKingGustav
 	WaitForSyncFlagAndClear 0x00000001
 	Wait 0x003c
-	_0807EB44 0x0004
+	SetAnimationState 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0007
 	PlaySound SFX_ELEMENT_FLOAT
-	SetEntity0x20 0xffff8000
+	SetEntityVelocity 0xffff8000
 	MessageNoOverlap 0x1701
 	WaitUntilTextboxCloses
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000002
 	MessageNoOverlap 0x1702
 	WaitUntilTextboxCloses
-	SetEntity0x20 0x00010000
+	SetEntityVelocity 0x00010000
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000002
-	_0807F050 0x006d
+	GiveKinstone 0x006d
 	WaitPlayerGetItem
-	_0807EB28 0x1703
+	EzloMessage 0x1703
 	WaitUntilTextboxCloses
 	Wait 0x003c
 	SetLocalFlag 0x0032
@@ -37,7 +37,7 @@ script_0800D962:
 	SetIntVariable 0x00000001
 	Call sub_0806DA1C
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_Object69CrowStealingKey.inc
index 9c0bf816..47cf61f9 100644
--- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc
+++ b/data/scripts/graveyard/script_Object69CrowStealingKey.inc
@@ -1,10 +1,10 @@
 @ Graveyard OBJECT_69 Crow stealing key cutscene
 SCRIPT_START script_Object69CrowStealingKey
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	Call sub_0807DF28
 	PlaySound SFX_1F3
-	Call sub_0807F40C
+	Call CreatePlayerQuestionMark
 	_0807E8E4_1
 	Wait 0x000a
 	_0807E8E4_3
@@ -21,9 +21,9 @@ SCRIPT_START script_Object69CrowStealingKey
 	SetGlobalFlag 0x0020
 	_0807E8E4_3
 	Wait 0x001e
-	_0807EB28 0x2809
+	EzloMessage 0x2809
 	WaitUntilTextboxCloses
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/graveyard/script_Object69GetKeyBack.inc b/data/scripts/graveyard/script_Object69GetKeyBack.inc
index 7c9b1a25..b6e1073b 100644
--- a/data/scripts/graveyard/script_Object69GetKeyBack.inc
+++ b/data/scripts/graveyard/script_Object69GetKeyBack.inc
@@ -35,13 +35,13 @@ script_080098E0:
 .endif
 .endif
 .endif
-	_0807E864
-	Call sub_0807F9A4
+	SetPlayerIdle
+	Call WaitForPlayerNormal
 	Call sub_0807DF28
-	_0807EB28 0x280a
+	EzloMessage 0x280a
 	WaitUntilTextboxCloses
 	Call sub_0807DF50
-	_0807E878
+	EnablePlayerControl
 script_08009910:
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/graveyard/script_Object97FirstCrow.inc b/data/scripts/graveyard/script_Object97FirstCrow.inc
index 4c5e2c80..0c997c0f 100644
--- a/data/scripts/graveyard/script_Object97FirstCrow.inc
+++ b/data/scripts/graveyard/script_Object97FirstCrow.inc
@@ -1,10 +1,10 @@
 @ Graveyard OBJECT_97 Crow stealing the key? first crow that makes link loose the key
 SCRIPT_START script_Object97FirstCrow
 	BeginBlock
-	_0807E930 0x0003
+	SetAnimation 0x0003
 	DoPostScriptAction 0x0007
 	SetEntitySpeed 0x0300
-	Call sub_0807F348
+	Call SetPriorityMessage
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000002
 	PlaySound SFX_123
diff --git a/data/scripts/graveyard/script_Object97SecondCrow.inc b/data/scripts/graveyard/script_Object97SecondCrow.inc
index 131fe158..169a3ff5 100644
--- a/data/scripts/graveyard/script_Object97SecondCrow.inc
+++ b/data/scripts/graveyard/script_Object97SecondCrow.inc
@@ -1,10 +1,10 @@
 @ Graveyard OBJECT_97 Crow stealing the key? Second crow that picks up the key
 SCRIPT_START script_Object97SecondCrow
 	BeginBlock
-	_0807E930 0x0003
+	SetAnimation 0x0003
 	DoPostScriptAction 0x0007
 	SetEntitySpeed 0x0300
-	Call sub_0807F348
+	Call SetPriorityMessage
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000008
 	Call sub_0809E0A0
diff --git a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc
index 5d193069..cbb2b2d3 100644
--- a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc
+++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor
 	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x01a0, 0x01b0
-	_0807EB44 0x0000
+	SetAnimationState 0x0000
 	DoPostScriptAction 0x0000
 	Wait 0x000a
 	DoPostScriptAction 0x0004
@@ -11,6 +11,6 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor
 	SetSyncFlag 0x00000001
 	DoPostScriptAction 0x000d
 	SetEntitySpeed 0x0100
-	_0807ECC4 0x0010
+	WalkSouth 0x0010
 	Call sub_080791BC
 SCRIPT_END
diff --git a/data/scripts/graveyard/script_PlayerAtKingGustav.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc
index d1214171..d2f7d3bd 100644
--- a/data/scripts/graveyard/script_PlayerAtKingGustav.inc
+++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_PlayerAtKingGustav
 	EndBlock
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0118, 0x0060
-	_0807EB44 0x0000
+	SetAnimationState 0x0000
 	DoPostScriptAction 0x0000
 	SetSyncFlag 0x00000001
 	Call sub_080791BC
diff --git a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc
index c805299a..6133e319 100644
--- a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc
+++ b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc
@@ -1,17 +1,17 @@
 @ Player when crow steals key
 SCRIPT_START script_PlayerGetKeyStolen
 	PlaySound SFX_PLY_VO6
-	_0807EB44 0x0004
+	SetAnimationState 0x0004
 	PlaySound SFX_86
 	Call sub_0807F36C
 	SetEntitySpeed 0x0400
-	_0807ECF4 0x0004
+	WalkWest 0x0004
 	Call sub_0807F1E8
 	Wait 0x001e
 	SetSyncFlag 0x00000040
 	WaitForSyncFlagAndClear 0x00000020
 	PlaySound SFX_PLY_JUMP
-	_0807EB44 0x0004
+	SetAnimationState 0x0004
 	Call sub_0807F210
 	_0807EF3C 0x0200, 0x0020
 	DoPostScriptAction 0x0000