Rename objects

35 files changed, 97 insertions, 97 deletions

diff --git a/data/scripts/sanctuary/script_08013F94.inc b/data/scripts/sanctuary/script_08013F94.inc
index 473b9fa3..ad0a871e 100644
--- a/data/scripts/sanctuary/script_08013F94.inc
+++ b/data/scripts/sanctuary/script_08013F94.inc
@@ -15,12 +15,12 @@ script_08013FA4:
 	EndBlock
 	Call WaitForPlayerNormalOrTalkEzlo
 	DisablePlayerControl
-	Call sub_0807DF38
+	Call DisablePauseMenu
 	Wait 0x0078
 	EzloMessage TEXT_PANEL_TUTORIAL, 0x05
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x007d
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 script_08013FE0:
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/sanctuary/script_Object6AEarthElement.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElement.inc
index 6754c480..210b7d8a 100644
--- a/data/scripts/sanctuary/script_Object6AEarthElement.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElement.inc
@@ -1,5 +1,5 @@
-@ Sanctuary second time OBJECT_6A Earth Element
-SCRIPT_START script_Object6AEarthElement
+@ Sanctuary second time CUTSCENE_MISC_OBJECT Earth Element
+SCRIPT_START script_CutsceneMiscObjectEarthElement
 	BeginBlock
 	DoPostScriptAction 0x0007
 	Call SetCollisionLayer2
diff --git a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc
index e6a7c7b8..29d74646 100644
--- a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A floating Earth Element
-SCRIPT_START script_Object6AEarthElementFloating
+@ Sanctuary CUTSCENE_MISC_OBJECT floating Earth Element
+SCRIPT_START script_CutsceneMiscObjectEarthElementFloating
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0000
diff --git a/data/scripts/sanctuary/script_Object6AFireElement.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElement.inc
index e82683c5..fccf6d76 100644
--- a/data/scripts/sanctuary/script_Object6AFireElement.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElement.inc
@@ -1,5 +1,5 @@
-@ Sanctuary second time OBJECT_6A Fire Element
-SCRIPT_START script_Object6AFireElement
+@ Sanctuary second time CUTSCENE_MISC_OBJECT Fire Element
+SCRIPT_START script_CutsceneMiscObjectFireElement
 	BeginBlock
 	DoPostScriptAction 0x0007
 	Call SetCollisionLayer2
diff --git a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc
index 65938a07..b45d6891 100644
--- a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A floating Fire Element
-SCRIPT_START script_Object6AFireElementFloating
+@ Sanctuary CUTSCENE_MISC_OBJECT floating Fire Element
+SCRIPT_START script_CutsceneMiscObjectFireElementFloating
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0002
diff --git a/data/scripts/sanctuary/script_Object6ASword2.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSword2.inc
index 8723ac1a..2626f172 100644
--- a/data/scripts/sanctuary/script_Object6ASword2.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSword2.inc
@@ -1,5 +1,5 @@
-@ Sanctuary second time OBJECT_6A sword?
-SCRIPT_START script_Object6ASword2
+@ Sanctuary second time CUTSCENE_MISC_OBJECT sword?
+SCRIPT_START script_CutsceneMiscObjectSword2
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0009
diff --git a/data/scripts/sanctuary/script_Object6ASword3.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSword3.inc
index 1cd22b94..7d0745cf 100644
--- a/data/scripts/sanctuary/script_Object6ASword3.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSword3.inc
@@ -1,5 +1,5 @@
-@ Sanctuary third time OBJECT_6A ?
-SCRIPT_START script_Object6ASword3
+@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
+SCRIPT_START script_CutsceneMiscObjectSword3
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x000a
diff --git a/data/scripts/sanctuary/script_Object6ASwordChange1.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordChange1.inc
index 6285b5c4..4069fbd8 100644
--- a/data/scripts/sanctuary/script_Object6ASwordChange1.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordChange1.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A Sword charging?
-SCRIPT_START script_Object6ASwordChange1
+@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging?
+SCRIPT_START script_CutsceneMiscObjectSwordChange1
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0000
diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge10.inc
index 31fd102a..a3858810 100644
--- a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge10.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A Sword charging 5?
-SCRIPT_START script_Object6ASwordCharge10
+@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 5?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge10
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0015
diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge11.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge11.inc
index 9bc8084e..5a160ea7 100644
--- a/data/scripts/sanctuary/script_Object6ASwordCharge11.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge11.inc
@@ -1,10 +1,10 @@
-@ Sanctuary third time OBJECT_6A ?
-SCRIPT_START script_Object6ASwordCharge11
+@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge11
 	CheckSyncFlagAndClear 0x00020000
 	JumpIf script_08014264
 	Wait 0x0008
 	CallWithArg sub_08095EAC, 0x00000000
-	Jump script_Object6ASwordCharge11
+	Jump script_CutsceneMiscObjectSwordCharge11
 script_08014264:
 	CallWithArg sub_08095EAC, 0x00000001
 	Jump script_08014264
diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge2.inc
index 4fbd87f4..dd3adb40 100644
--- a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge2.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A Sword charging 2?
-SCRIPT_START script_Object6ASwordCharge2
+@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 2?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge2
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0001
diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge3.inc
index 79a859c2..66905ff2 100644
--- a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge3.inc
@@ -1,5 +1,5 @@
-@ Sanctuary second time OBJECT_6A sword charging?
-SCRIPT_START script_Object6ASwordCharge3
+@ Sanctuary second time CUTSCENE_MISC_OBJECT sword charging?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge3
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0002
diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge4.inc
index dd4a6123..a65de2da 100644
--- a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge4.inc
@@ -1,5 +1,5 @@
-@ Sanctuary third time OBJECT_6A ?
-SCRIPT_START script_Object6ASwordCharge4
+@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge4
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0003
diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge5.inc
index 8dc55e5f..5c775a3b 100644
--- a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge5.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A Sword charging 3?
-SCRIPT_START script_Object6ASwordCharge5
+@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 3?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge5
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0004
diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge6.inc
index 1a080034..b7369be8 100644
--- a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge6.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A Sword charging 3?
-SCRIPT_START script_Object6ASwordCharge6
+@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 3?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge6
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0005
diff --git a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge7.inc
index ab1e6db4..3c3dbe7d 100644
--- a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge7.inc
@@ -1,5 +1,5 @@
-@ Sanctuary second time OBJECT_6A sword charging?
-SCRIPT_START script_Objet6ASwordCharge7
+@ Sanctuary second time CUTSCENE_MISC_OBJECT sword charging?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge7
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0006
diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge8.inc
index d86e5dce..28aa4a44 100644
--- a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge8.inc
@@ -1,5 +1,5 @@
-@ Sanctuary third time OBJECT_6A ?
-SCRIPT_START script_Object6ASwordCharge8
+@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge8
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0007
diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge9.inc
index 7b1b20c0..317ba5a6 100644
--- a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge9.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A Sword charging 4?
-SCRIPT_START script_Object6ASwordCharge9
+@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 4?
+SCRIPT_START script_CutsceneMiscObjectSwordCharge9
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0014
diff --git a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordInPedestal.inc
index b2096d46..f20ef241 100644
--- a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordInPedestal.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A Sword in pedestal
-SCRIPT_START script_Object6ASwordInPedestal
+@ Sanctuary CUTSCENE_MISC_OBJECT Sword in pedestal
+SCRIPT_START script_CutsceneMiscObjectSwordInPedestal
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0008
diff --git a/data/scripts/sanctuary/script_Object6ATextBoard.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc
index 43b5a709..520adfe2 100644
--- a/data/scripts/sanctuary/script_Object6ATextBoard.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A text board
-SCRIPT_START script_Object6ATextBoard
+@ Sanctuary CUTSCENE_MISC_OBJECT text board
+SCRIPT_START script_CutsceneMiscObjectTextBoard
 	BeginBlock
 	CheckLocalFlag 0x007a
 	JumpIf script_08013C2A
diff --git a/data/scripts/sanctuary/script_Object6AWaterElement.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElement.inc
index e0617edf..3a895aa1 100644
--- a/data/scripts/sanctuary/script_Object6AWaterElement.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElement.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A Water Element
-SCRIPT_START script_Object6AWaterElement
+@ Sanctuary CUTSCENE_MISC_OBJECT Water Element
+SCRIPT_START script_CutsceneMiscObjectWaterElement
 	BeginBlock
 	DoPostScriptAction 0x0007
 	Call SetCollisionLayer2
diff --git a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc
index 9625d7c8..6d52dba8 100644
--- a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc
@@ -1,5 +1,5 @@
 @ Sanctuary second time floating water element
-SCRIPT_START script_Object6AWaterElementFloating
+SCRIPT_START script_CutsceneMiscObjectWaterElementFloating
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0004
diff --git a/data/scripts/sanctuary/script_Object6AWindElement.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElement.inc
index ab7eb8f0..fc11c969 100644
--- a/data/scripts/sanctuary/script_Object6AWindElement.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElement.inc
@@ -1,5 +1,5 @@
-@ Sanctuary OBJECT_6A Wind Element
-SCRIPT_START script_Object6AWindElement
+@ Sanctuary CUTSCENE_MISC_OBJECT Wind Element
+SCRIPT_START script_CutsceneMiscObjectWindElement
 	BeginBlock
 	DoPostScriptAction 0x0007
 	Call SetCollisionLayer2
diff --git a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc
index 3ee4e871..c764dc05 100644
--- a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc
+++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc
@@ -1,5 +1,5 @@
-@ Sanctuary third time OBJECT_6A ?
-SCRIPT_START script_Object6AWindElementFloating
+@ Sanctuary third time CUTSCENE_MISC_OBJECT ?
+SCRIPT_START script_CutsceneMiscObjectWindElementFloating
 	BeginBlock
 	DoPostScriptAction 0x0007
 	SetAnimation 0x0006
diff --git a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc
index 2cfbd8b8..a39258b4 100644
--- a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc
+++ b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc
@@ -18,13 +18,13 @@ script_08013FF0:
 	Call WaitForPlayerNormal
 	BeginBlock
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	EndBlock
 	EzloMessage TEXT_PANEL_TUTORIAL, 0x08
 	WaitUntilTextboxCloses
 	StartPlayerScript script_PlayerSanctuary
 	WaitForSyncFlagAndClear 0x00000001
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	Jump script_08013FF0
 script_0801404C:
diff --git a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc
index 2c8bed4b..cd82075c 100644
--- a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc
+++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc
@@ -29,7 +29,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble
 	CameraTargetPlayer
 	SetLocalFlag 0x007c
 	Call sub_08053250
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
index dcc7d6c7..50f58794 100644
--- a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
+++ b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
@@ -13,9 +13,9 @@ script_0801427C:
 script_08014298:
 	CheckEntityInteractType
 	JumpIfNot script_08014298
-	SetPlayerIdle 
+	SetPlayerIdle
 	MessageFromTargetPos 0x0647, 0x000c
 	WaitUntilTextboxCloses
-	EnablePlayerControl 
+	EnablePlayerControl
 	Jump script_08014298
 	.2byte 0x0000
diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc
index a5b9e51e..12cce538 100644
--- a/data/scripts/sanctuary/script_Npc4EPedestal.inc
+++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc
@@ -11,36 +11,36 @@ script_080134F8:
 	CheckEntityInteractType
 	JumpIfNot script_080134F8
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	StartPlayerScript script_PlayerAtPedestal
 	WaitForSyncFlagAndClear 0x00000001
-	CallWithArg sub_08095A1C, script_Object6ASwordInPedestal
+	CallWithArg sub_08095A1C, script_CutsceneMiscObjectSwordInPedestal
 	PlaySound SFX_ELEMENT_PLACE
 	Wait 0x005a
 	BeginBlock
 	PlaySound SFX_ELEMENT_FLOAT
-	CallWithArg sub_08095D54, script_Object6AEarthElementFloating
-	CallWithArg sub_08095D54, script_Object6AFireElementFloating
+	CallWithArg sub_08095D54, script_CutsceneMiscObjectEarthElementFloating
+	CallWithArg sub_08095D54, script_CutsceneMiscObjectFireElementFloating
 	EndBlock
 	WaitForSyncFlagAndClear 0x18000000
 	BeginBlock
 	PlaySound SFX_ELEMENT_CHARGE
-	CallWithArg sub_08095D8C, script_Object6ASwordChange1
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge2
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordChange1
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge2
 	EndBlock
 	Wait 0x001e
 	BeginBlock
 	PlaySound SFX_1D0
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge5
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge6
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge5
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge6
 	EndBlock
 	Wait 0x003c
 	CallWithArg CreateRepeatedSoundManager, 0x00000000
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00002000
 	PlaySound SFX_1D2
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge9
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge10
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge9
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge10
 	SetSyncFlag 0x00000400
 	WaitForSyncFlagAndClear 0x00004000
 	Wait 0x0078
diff --git a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc
index 5a51a5df..d83db674 100644
--- a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc
+++ b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc
@@ -14,12 +14,12 @@ script_08013B1E:
 	EndBlock
 	SetPlayerIdle
 	Call WaitForPlayerNormal
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	EzloMessage TEXT_PANEL_TUTORIAL, 0x07
 	WaitUntilTextboxCloses
 	StartPlayerScript script_PlayerSanctuary
 	WaitForSyncFlagAndClear 0x00000001
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	Jump script_08013B1E
 	.2byte 0x0000
diff --git a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc
index c6d2b619..7fac00e4 100644
--- a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc
+++ b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc
@@ -6,7 +6,7 @@ script_08013CA6:
 	JumpIfNot script_08013CA6
 	SetPlayerIdle
 	Call WaitForPlayerNormal
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	Call CreatePlayerExclamationMark
 	Wait 0x003c
 	_0807F0B4 0x0001
@@ -20,7 +20,7 @@ script_08013CA6:
 	EzloMessage TEXT_PANEL_TUTORIAL, 0x04
 	WaitUntilTextboxCloses
 	SetLocalFlag 0x0079
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
index 3b76a072..5da4a9ad 100644
--- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
@@ -11,37 +11,37 @@ script_0801373C:
 	CheckEntityInteractType
 	JumpIfNot script_0801373C
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	StartPlayerScript script_PlayerAtPedestal
 	WaitForSyncFlagAndClear 0x00000001
-	CallWithArg sub_08095A1C, script_Object6ASword2
+	CallWithArg sub_08095A1C, script_CutsceneMiscObjectSword2
 	PlaySound SFX_ELEMENT_PLACE
 	Wait 0x005a
 	BeginBlock
 	PlaySound SFX_ELEMENT_FLOAT
-	CallWithArg sub_08095D54, script_Object6AWaterElementFloating
+	CallWithArg sub_08095D54, script_CutsceneMiscObjectWaterElementFloating
 	EndBlock
 	WaitForSyncFlagAndClear 0x20000000
 	BeginBlock
 	PlaySound SFX_ELEMENT_CHARGE
-	CallWithArg sub_08095D8C, script_Object6ASwordChange1
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge2
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge3
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordChange1
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge2
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge3
 	EndBlock
 	Wait 0x001e
 	BeginBlock
 	PlaySound SFX_1D0
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge5
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge6
-	CallWithArg sub_08095D8C, script_Objet6ASwordCharge7
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge5
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge6
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge7
 	EndBlock
 	Wait 0x003c
 	CallWithArg CreateRepeatedSoundManager, 0x00000000
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00002000
 	PlaySound SFX_1D2
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge9
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge10
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge9
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge10
 	SetSyncFlag 0x00000400
 	WaitForSyncFlagAndClear 0x00004000
 	SetSyncFlag 0x00000800
@@ -75,7 +75,7 @@ script_0801373C:
 	SetSyncFlag 0x00040000
 	SetLocalFlag 0x007b
 	Call sub_08053250
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc
index ecd6d4b6..ed7ce571 100644
--- a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc
+++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc
@@ -18,7 +18,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard
 	CameraTargetPlayer
 	SetLocalFlag 0x007a
 	Call sub_08053250
-	Call sub_0807DF50
+	Call EnablePauseMenu
 	EnablePlayerControl
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
index bd8b7e61..3bab3e34 100644
--- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
@@ -11,39 +11,39 @@ script_080138D0:
 	CheckEntityInteractType
 	JumpIfNot script_080138D0
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	StartPlayerScript script_PlayerAtPedestal
 	WaitForSyncFlagAndClear 0x00000001
-	CallWithArg sub_08095A1C, script_Object6ASword3
+	CallWithArg sub_08095A1C, script_CutsceneMiscObjectSword3
 	PlaySound SFX_ELEMENT_PLACE
 	Wait 0x005a
 	BeginBlock
 	PlaySound SFX_ELEMENT_FLOAT
-	CallWithArg sub_08095D54, script_Object6AWindElementFloating
+	CallWithArg sub_08095D54, script_CutsceneMiscObjectWindElementFloating
 	EndBlock
 	WaitForSyncFlagAndClear 0x40000000
 	BeginBlock
 	PlaySound SFX_ELEMENT_CHARGE
-	CallWithArg sub_08095D8C, script_Object6ASwordChange1
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge2
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge3
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge4
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordChange1
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge2
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge3
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge4
 	EndBlock
 	Wait 0x001e
 	BeginBlock
 	PlaySound SFX_1D0
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge5
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge6
-	CallWithArg sub_08095D8C, script_Objet6ASwordCharge7
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge8
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge5
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge6
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge7
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge8
 	EndBlock
 	Wait 0x003c
 	CallWithArg CreateRepeatedSoundManager, 0x00000000
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00002000
 	PlaySound SFX_1D2
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge9
-	CallWithArg sub_08095D8C, script_Object6ASwordCharge10
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge9
+	CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge10
 	SetSyncFlag 0x00000400
 	WaitForSyncFlagAndClear 0x00004000
 	SetSyncFlag 0x00000800
@@ -85,9 +85,9 @@ script_080138D0:
 .endif
 	Call NPC4E_SaveEquippedItems
 	CallWithArg EquipItem, 0x00010001
-	CallWithArg SetInputMacro, gUnk_080049FE
+	CallWithArg SetPlayerMacro, gUnk_080049FE
 	Wait 0x00c8
-	CallWithArg SetInputMacro, 0x00000000
+	CallWithArg SetPlayerMacro, 0x00000000
 	Call NPC4E_RestoreEquippedItems
 script_08013A8E:
 .ifndef EU
diff --git a/data/scripts/sanctuary/script_PlayerGetElement.inc b/data/scripts/sanctuary/script_PlayerGetElement.inc
index 71bf1bb6..c73af53c 100644
--- a/data/scripts/sanctuary/script_PlayerGetElement.inc
+++ b/data/scripts/sanctuary/script_PlayerGetElement.inc
@@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGetElement
 	BeginBlock
 	SetEntitySpeed 0x0140
 	SetPlayerIdle
-	Call sub_0807DF28
+	Call DisablePauseMenuAndPutAwayItems
 	EndBlock
 	Wait 0x0078
 	PlayBgm BGM_ELEMENT_THEME
diff --git a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc
index ed6b1b3e..7ef157da 100644
--- a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc
+++ b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc
@@ -1,6 +1,6 @@
 @ Player at Sanctuary draw final sword
 SCRIPT_START script_PlayerPickUpFinalSword
-	CallWithArg sub_08095E7C, script_Object6ASwordCharge11
+	CallWithArg sub_08095E7C, script_CutsceneMiscObjectSwordCharge11
 	PlaySound SFX_1D3
 	CallWithArg SetPlayerAnimation2, 0x000008e3
 	Call sub_08096028