9 files changed, 26 insertions, 26 deletions
diff --git a/data/scripts/graveyard/script_Object6AKingsGravestone.inc b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc
index b8a09309..21c7d682 100644
--- a/data/scripts/graveyard/script_Object6AKingsGravestone.inc
+++ b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc
@@ -1,5 +1,5 @@
-@ Graveyard OBJECT_6A Kings gravestone? or King ghost representation?
-SCRIPT_START script_Object6AKingsGravestone
+@ Graveyard CUTSCENE_MISC_OBJECT Kings gravestone? or King ghost representation?
+SCRIPT_START script_CutsceneMiscObjectKingsGravestone
 	BeginBlock
 	DoPostScriptAction 0x0008
 	SetEntitySpeed 0x0080
diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_CutsceneOrchestratorCrowStealingKey.inc
index 0608e6ef..3332a806 100644
--- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc
+++ b/data/scripts/graveyard/script_CutsceneOrchestratorCrowStealingKey.inc
@@ -1,8 +1,8 @@
-@ Graveyard OBJECT_69 Crow stealing key cutscene
-SCRIPT_START script_Object69CrowStealingKey
+@ Graveyard CUTSCENE_ORCHESTRATOR Crow stealing key cutscene
+SCRIPT_START script_CutsceneOrchestratorCrowStealingKey
 	SetPlayerIdle
 	Call WaitForPlayerNormal
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	PlaySound SFX_1F3
 	Call CreatePlayerQuestionMark
 	_0807E8E4_1
@@ -23,7 +23,7 @@ SCRIPT_START script_Object69CrowStealingKey
 	Wait 0x001e
 	EzloMessage TEXT_DAMPE, 0x09
 	WaitUntilTextboxCloses
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/graveyard/script_Object69GetKeyBack.inc b/data/scripts/graveyard/script_CutsceneOrchestratorGetKeyBack.inc
index 222c1abf..4e3600bd 100644
--- a/data/scripts/graveyard/script_Object69GetKeyBack.inc
+++ b/data/scripts/graveyard/script_CutsceneOrchestratorGetKeyBack.inc
@@ -1,5 +1,5 @@
-@ Graveyard OBJECT_69 When getting the key back
-SCRIPT_START script_Object69GetKeyBack
+@ Graveyard CUTSCENE_ORCHESTRATOR When getting the key back
+SCRIPT_START script_CutsceneOrchestratorGetKeyBack
 	BeginBlock
 	EndBlock
 script_080098D8:
@@ -13,10 +13,10 @@ script_080098E0:
 	SetLocalFlag HAKA_KEY_GET
 	SetPlayerIdle
 	Call WaitForPlayerNormal
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	EzloMessage TEXT_DAMPE, 0x0a
 	WaitUntilTextboxCloses
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 script_08009910:
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/graveyard/script_Gina.inc b/data/scripts/graveyard/script_Gina.inc
index b463e667..392beb0a 100644
--- a/data/scripts/graveyard/script_Gina.inc
+++ b/data/scripts/graveyard/script_Gina.inc
@@ -10,8 +10,8 @@ SCRIPT_START script_Gina
 script_0800B934:
 	CheckEntityInteractType
 	JumpIfNot script_0800B934
-	SetPlayerIdle 
-	FacePlayer 
+	SetPlayerIdle
+	FacePlayer
 	MessageFromTarget TEXT_TINGLE, 0x19
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x005f
@@ -20,9 +20,9 @@ script_0800B934:
 script_0800B94E:
 	CheckEntityInteractType
 	JumpIfNot script_0800B94E
-	SetPlayerIdle 
-	FacePlayer 
+	SetPlayerIdle
+	FacePlayer
 	MessageFromTarget TEXT_TINGLE, 0x1a
 	WaitUntilTextboxCloses
-	EnablePlayerControl 
+	EnablePlayerControl
 	Jump script_0800B94E
diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc
index 1b69dfe4..b318103b 100644
--- a/data/scripts/graveyard/script_GraveyardHouseDoor.inc
+++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc
@@ -11,7 +11,7 @@ script_080096AC:
 	JumpIfNot script_080096AC
 	SetPlayerIdle
 	Call WaitForPlayerNormal
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	StartPlayerScript script_PlayerAtGraveyardHouseDoor
 	WaitForSyncFlagAndClear 0x00000001
 	PlaySound SFX_111
@@ -23,7 +23,7 @@ script_080096AC:
 script_080096EC:
 	CheckGlobalFlag HAKA_KEY_LOST
 	JumpIfNot script_080096EC
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 script_080096FC:
 	Call sub_0808692C
diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc
index eec55eb1..1e95b4fd 100644
--- a/data/scripts/graveyard/script_GreatFairyArrows.inc
+++ b/data/scripts/graveyard/script_GreatFairyArrows.inc
@@ -1,4 +1,4 @@
-@ Graveyard Great Fairy OBJECT_69
+@ Graveyard Great Fairy CUTSCENE_ORCHESTRATOR
 SCRIPT_START script_GreatFairyArrows
 	BeginBlock
 	EndBlock
@@ -16,7 +16,7 @@ script_0800B618:
 	JumpIf script_0800B7A2
 	MessageNoOverlap TEXT_ITEM_GET, 0x83
 	WaitUntilTextboxCloses
-	CheckTextboxResult 
+	CheckTextboxResult
 	JumpIfNot script_0800B684
 	Wait 0x000f
 	MessageNoOverlap TEXT_ITEM_GET, 0x84
@@ -48,6 +48,6 @@ script_0800B6A6:
 	WaitForFadeFinish
 	CameraTargetPlayer
 	Wait 0x001e
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 SCRIPT_END
diff --git a/data/scripts/graveyard/script_Object97FirstCrow.inc b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc
index 0c997c0f..267d3ca2 100644
--- a/data/scripts/graveyard/script_Object97FirstCrow.inc
+++ b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc
@@ -1,5 +1,5 @@
-@ Graveyard OBJECT_97 Crow stealing the key? first crow that makes link loose the key
-SCRIPT_START script_Object97FirstCrow
+@ Graveyard CAMERA_TARGET7 Crow stealing the key? first crow that makes link loose the key
+SCRIPT_START script_CameraTarget7FirstCrow
 	BeginBlock
 	SetAnimation 0x0003
 	DoPostScriptAction 0x0007
diff --git a/data/scripts/graveyard/script_Object97SecondCrow.inc b/data/scripts/graveyard/script_KeyStealingTakkuriSecondCrow.inc
index 169a3ff5..b628cccd 100644
--- a/data/scripts/graveyard/script_Object97SecondCrow.inc
+++ b/data/scripts/graveyard/script_KeyStealingTakkuriSecondCrow.inc
@@ -1,5 +1,5 @@
-@ Graveyard OBJECT_97 Crow stealing the key? Second crow that picks up the key
-SCRIPT_START script_Object97SecondCrow
+@ Graveyard CAMERA_TARGET7 Crow stealing the key? Second crow that picks up the key
+SCRIPT_START script_CameraTarget7SecondCrow
 	BeginBlock
 	SetAnimation 0x0003
 	DoPostScriptAction 0x0007
diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc
index 4d921ed4..4f31f650 100644
--- a/data/scripts/graveyard/script_KingGustav.inc
+++ b/data/scripts/graveyard/script_KingGustav.inc
@@ -9,7 +9,7 @@ script_0800D962:
 	JumpIfNot script_0800D962
 	SetPlayerIdle
 	Call WaitForPlayerNormal
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	StartPlayerScript script_PlayerAtKingGustav
 	WaitForSyncFlagAndClear 0x00000001
 	Wait 0x003c
@@ -36,7 +36,7 @@ script_0800D962:
 	PlaySound SFX_113
 	SetIntVariable 0x00000001
 	Call sub_0806DA1C
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END