Rename managers

25 files changed, 246 insertions, 246 deletions

diff --git a/data/const/manager/enterRoomTextboxManager.s b/data/const/manager/enterRoomTextboxManager.s
new file mode 100644
index 00000000..9b1984ac
--- /dev/null
+++ b/data/const/manager/enterRoomTextboxManager.s
@@ -0,0 +1,21 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+gUnk_08108DE8:: @ 08108DE8
+	.incbin "enterRoomTextboxManager/gUnk_08108DE8.bin"
+
+EnterRoomTextboxManager_Actions:: @ 08108E28 
+	.4byte sub_0805E140
+	.4byte sub_0805E18C
+
+gUnk_08108E30:: @ 08108E30
+	.incbin "enterRoomTextboxManager/gUnk_08108E30.bin"
+
+gUnk_08108E48:: @ 08108E48
+	.incbin "enterRoomTextboxManager/gUnk_08108E48.bin"
+
+gUnk_08108E60:: @ 08108E60
+	.incbin "enterRoomTextboxManager/gUnk_08108E60.bin"
diff --git a/data/const/manager/holeManager.s b/data/const/manager/holeManager.s
new file mode 100644
index 00000000..1ad9d330
--- /dev/null
+++ b/data/const/manager/holeManager.s
@@ -0,0 +1,194 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+    .align 2
+
+HoleManager_Actions:: @ 08108668
+	.4byte sub_0805B048
+	.4byte sub_0805B168
+
+gUnk_08108670:: @ 08108670
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_08108670_EU.bin"
+.else
+	.incbin "holeManager/gUnk_08108670_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_0810867C:: @ 0810867C
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_0810867C_EU.bin"
+.else
+	.incbin "holeManager/gUnk_0810867C_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_08108688:: @ 08108688
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_08108688_EU.bin"
+.else
+	.incbin "holeManager/gUnk_08108688_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_08108694:: @ 08108694
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_08108694_EU.bin"
+.else
+	.incbin "holeManager/gUnk_08108694_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086A0:: @ 081086A0
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086A0_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086A0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+	.incbin "holeManager/gUnk_081086A0_2.bin"
+
+gUnk_081086AC:: @ 081086AC
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086AC_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086AC_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086B8:: @ 081086B8
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086B8_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086B8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086C4:: @ 081086C4
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086C4_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086C4_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086D0:: @ 081086D0
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086D0_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086D0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+.ifdef EU
+    @ TODO only small differences
+	.incbin "holeManager/gUnk_081086D0_2_EU.bin"
+.else
+	.incbin "holeManager/gUnk_081086D0_3_USA-JP-DEMO_USA-DEMO_JP.bin"
+.endif
+
+gUnk_081086DC:: @ 081086DC
+	.incbin "holeManager/gUnk_081086DC.bin"
+
+gUnk_081086E4:: @ 081086E4
+	.incbin "holeManager/gUnk_081086E4.bin"
+
+gUnk_081086EC:: @ 081086EC
+	.incbin "holeManager/gUnk_081086EC.bin"
+
+gUnk_081086F4:: @ 081086F4
+	.incbin "holeManager/gUnk_081086F4.bin"
+
+gUnk_081086FC:: @ 081086FC
+	.incbin "holeManager/gUnk_081086FC.bin"
+
+gUnk_08108704:: @ 08108704
+	.incbin "holeManager/gUnk_08108704.bin"
+
+gUnk_0810870C:: @ 0810870C
+	.incbin "holeManager/gUnk_0810870C.bin"
+
+gUnk_08108714:: @ 08108714
+	.incbin "holeManager/gUnk_08108714.bin"
+
+gUnk_0810871C:: @ 0810871C
+	.incbin "holeManager/gUnk_0810871C.bin"
+
+gUnk_08108724:: @ 08108724
+	.incbin "holeManager/gUnk_08108724.bin"
+
+gUnk_0810872C:: @ 0810872C
+	.incbin "holeManager/gUnk_0810872C.bin"
+
+gUnk_08108734:: @ 08108734
+	.incbin "holeManager/gUnk_08108734.bin"
+
+gUnk_0810873C:: @ 0810873C
+	.incbin "holeManager/gUnk_0810873C.bin"
+
+gUnk_08108744:: @ 08108744
+	.incbin "holeManager/gUnk_08108744.bin"
+
+gUnk_0810874C:: @ 0810874C
+	.incbin "holeManager/gUnk_0810874C.bin"
+
+gUnk_08108754:: @ 08108754
+	.incbin "holeManager/gUnk_08108754.bin"
+
+gUnk_0810875C:: @ 0810875C
+	.incbin "holeManager/gUnk_0810875C.bin"
+
+gUnk_08108764:: @ 08108764
+	.incbin "holeManager/gUnk_08108764.bin"
+	.4byte gUnk_08108670
+	.incbin "holeManager/gUnk_08108764_1.bin"
+	.4byte gUnk_08108688
+	.incbin "holeManager/gUnk_08108764_2.bin"
+	.4byte gUnk_0810875C
+	.incbin "holeManager/gUnk_08108764_3.bin"
+	.4byte gUnk_08108694
+	.incbin "holeManager/gUnk_08108764_4.bin"
+	.4byte gUnk_081086A0
+	.incbin "holeManager/gUnk_08108764_5.bin"
+	.4byte gUnk_081086AC
+	.incbin "holeManager/gUnk_08108764_6.bin"
+	.4byte gUnk_081086DC
+	.incbin "holeManager/gUnk_08108764_7.bin"
+	.4byte gUnk_081086E4
+	.incbin "holeManager/gUnk_08108764_8.bin"
+	.4byte gUnk_081086EC
+	.incbin "holeManager/gUnk_08108764_9.bin"
+	.4byte gUnk_081086F4
+	.incbin "holeManager/gUnk_08108764_10.bin"
+	.4byte gUnk_0810867C
+	.incbin "holeManager/gUnk_08108764_11.bin"
+	.4byte gUnk_081086FC
+	.incbin "holeManager/gUnk_08108764_12.bin"
+	.4byte gUnk_08108704
+	.incbin "holeManager/gUnk_08108764_13.bin"
+	.4byte gUnk_0810870C
+	.incbin "holeManager/gUnk_08108764_14.bin"
+	.4byte gUnk_08108714
+	.incbin "holeManager/gUnk_08108764_15.bin"
+	.4byte gUnk_0810871C
+	.incbin "holeManager/gUnk_08108764_16.bin"
+	.4byte gUnk_08108724
+	.incbin "holeManager/gUnk_08108764_17.bin"
+	.4byte gUnk_0810872C
+	.incbin "holeManager/gUnk_08108764_18.bin"
+	.4byte gUnk_08108734
+	.incbin "holeManager/gUnk_08108764_19.bin"
+	.4byte gUnk_0810873C
+	.incbin "holeManager/gUnk_08108764_20.bin"
+	.4byte gUnk_08108744
+	.incbin "holeManager/gUnk_08108764_21.bin"
+	.4byte gUnk_0810874C
+	.incbin "holeManager/gUnk_08108764_22.bin"
+	.4byte gUnk_08108754
+	.incbin "holeManager/gUnk_08108764_23.bin"
+	.4byte gUnk_081086B8
+	.incbin "holeManager/gUnk_08108764_24.bin"
+	.4byte gUnk_081086C4
+	.incbin "holeManager/gUnk_08108764_25.bin"
+	.4byte gUnk_081086D0
+	.incbin "holeManager/gUnk_08108764_26.bin"
diff --git a/data/const/manager/manager1A.s b/data/const/manager/manager1A.s
deleted file mode 100644
index 72ee0c84..00000000
--- a/data/const/manager/manager1A.s
+++ /dev/null
@@ -1,194 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108668:: @ 08108668
-	.4byte sub_0805B048
-	.4byte sub_0805B168
-
-gUnk_08108670:: @ 08108670
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_08108670_EU.bin"
-.else
-	.incbin "manager1A/gUnk_08108670_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_0810867C:: @ 0810867C
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_0810867C_EU.bin"
-.else
-	.incbin "manager1A/gUnk_0810867C_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108688:: @ 08108688
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_08108688_EU.bin"
-.else
-	.incbin "manager1A/gUnk_08108688_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_08108694:: @ 08108694
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_08108694_EU.bin"
-.else
-	.incbin "manager1A/gUnk_08108694_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086A0:: @ 081086A0
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086A0_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086A0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-	.incbin "manager1A/gUnk_081086A0_2.bin"
-
-gUnk_081086AC:: @ 081086AC
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086AC_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086AC_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086B8:: @ 081086B8
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086B8_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086B8_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086C4:: @ 081086C4
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086C4_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086C4_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086D0:: @ 081086D0
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086D0_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086D0_1_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-.ifdef EU
-    @ TODO only small differences
-	.incbin "manager1A/gUnk_081086D0_2_EU.bin"
-.else
-	.incbin "manager1A/gUnk_081086D0_3_USA-JP-DEMO_USA-DEMO_JP.bin"
-.endif
-
-gUnk_081086DC:: @ 081086DC
-	.incbin "manager1A/gUnk_081086DC.bin"
-
-gUnk_081086E4:: @ 081086E4
-	.incbin "manager1A/gUnk_081086E4.bin"
-
-gUnk_081086EC:: @ 081086EC
-	.incbin "manager1A/gUnk_081086EC.bin"
-
-gUnk_081086F4:: @ 081086F4
-	.incbin "manager1A/gUnk_081086F4.bin"
-
-gUnk_081086FC:: @ 081086FC
-	.incbin "manager1A/gUnk_081086FC.bin"
-
-gUnk_08108704:: @ 08108704
-	.incbin "manager1A/gUnk_08108704.bin"
-
-gUnk_0810870C:: @ 0810870C
-	.incbin "manager1A/gUnk_0810870C.bin"
-
-gUnk_08108714:: @ 08108714
-	.incbin "manager1A/gUnk_08108714.bin"
-
-gUnk_0810871C:: @ 0810871C
-	.incbin "manager1A/gUnk_0810871C.bin"
-
-gUnk_08108724:: @ 08108724
-	.incbin "manager1A/gUnk_08108724.bin"
-
-gUnk_0810872C:: @ 0810872C
-	.incbin "manager1A/gUnk_0810872C.bin"
-
-gUnk_08108734:: @ 08108734
-	.incbin "manager1A/gUnk_08108734.bin"
-
-gUnk_0810873C:: @ 0810873C
-	.incbin "manager1A/gUnk_0810873C.bin"
-
-gUnk_08108744:: @ 08108744
-	.incbin "manager1A/gUnk_08108744.bin"
-
-gUnk_0810874C:: @ 0810874C
-	.incbin "manager1A/gUnk_0810874C.bin"
-
-gUnk_08108754:: @ 08108754
-	.incbin "manager1A/gUnk_08108754.bin"
-
-gUnk_0810875C:: @ 0810875C
-	.incbin "manager1A/gUnk_0810875C.bin"
-
-gUnk_08108764:: @ 08108764
-	.incbin "manager1A/gUnk_08108764.bin"
-	.4byte gUnk_08108670
-	.incbin "manager1A/gUnk_08108764_1.bin"
-	.4byte gUnk_08108688
-	.incbin "manager1A/gUnk_08108764_2.bin"
-	.4byte gUnk_0810875C
-	.incbin "manager1A/gUnk_08108764_3.bin"
-	.4byte gUnk_08108694
-	.incbin "manager1A/gUnk_08108764_4.bin"
-	.4byte gUnk_081086A0
-	.incbin "manager1A/gUnk_08108764_5.bin"
-	.4byte gUnk_081086AC
-	.incbin "manager1A/gUnk_08108764_6.bin"
-	.4byte gUnk_081086DC
-	.incbin "manager1A/gUnk_08108764_7.bin"
-	.4byte gUnk_081086E4
-	.incbin "manager1A/gUnk_08108764_8.bin"
-	.4byte gUnk_081086EC
-	.incbin "manager1A/gUnk_08108764_9.bin"
-	.4byte gUnk_081086F4
-	.incbin "manager1A/gUnk_08108764_10.bin"
-	.4byte gUnk_0810867C
-	.incbin "manager1A/gUnk_08108764_11.bin"
-	.4byte gUnk_081086FC
-	.incbin "manager1A/gUnk_08108764_12.bin"
-	.4byte gUnk_08108704
-	.incbin "manager1A/gUnk_08108764_13.bin"
-	.4byte gUnk_0810870C
-	.incbin "manager1A/gUnk_08108764_14.bin"
-	.4byte gUnk_08108714
-	.incbin "manager1A/gUnk_08108764_15.bin"
-	.4byte gUnk_0810871C
-	.incbin "manager1A/gUnk_08108764_16.bin"
-	.4byte gUnk_08108724
-	.incbin "manager1A/gUnk_08108764_17.bin"
-	.4byte gUnk_0810872C
-	.incbin "manager1A/gUnk_08108764_18.bin"
-	.4byte gUnk_08108734
-	.incbin "manager1A/gUnk_08108764_19.bin"
-	.4byte gUnk_0810873C
-	.incbin "manager1A/gUnk_08108764_20.bin"
-	.4byte gUnk_08108744
-	.incbin "manager1A/gUnk_08108764_21.bin"
-	.4byte gUnk_0810874C
-	.incbin "manager1A/gUnk_08108764_22.bin"
-	.4byte gUnk_08108754
-	.incbin "manager1A/gUnk_08108764_23.bin"
-	.4byte gUnk_081086B8
-	.incbin "manager1A/gUnk_08108764_24.bin"
-	.4byte gUnk_081086C4
-	.incbin "manager1A/gUnk_08108764_25.bin"
-	.4byte gUnk_081086D0
-	.incbin "manager1A/gUnk_08108764_26.bin"
diff --git a/data/const/manager/manager39.s b/data/const/manager/manager39.s
deleted file mode 100644
index fe22ce51..00000000
--- a/data/const/manager/manager39.s
+++ /dev/null
@@ -1,21 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08108DE8:: @ 08108DE8
-	.incbin "manager39/gUnk_08108DE8.bin"
-
-gUnk_08108E28:: @ 08108E28 
-	.4byte sub_0805E140
-	.4byte sub_0805E18C
-
-gUnk_08108E30:: @ 08108E30
-	.incbin "manager39/gUnk_08108E30.bin"
-
-gUnk_08108E48:: @ 08108E48
-	.incbin "manager39/gUnk_08108E48.bin"
-
-gUnk_08108E60:: @ 08108E60
-	.incbin "manager39/gUnk_08108E60.bin"
diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
index 702005bb..41c30e2c 100644
--- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
+++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
@@ -25,7 +25,7 @@ SCRIPT_START script_Npc4EMonsters
 	SetFadeTime 0x0002
 	SetFade6
 	WaitForFadeFinish
-	CallWithArg DeleteManager36, 0x00000002
+	CallWithArg DeleteRepeatedSoundManager, 0x00000002
 	_0807F0C8 0x0000, 0x0000
 	Call NPC4E_SaveEquippedItems
 	Call SetPlayerActionNormal
@@ -52,5 +52,5 @@ SCRIPT_START script_Npc4EMonsters
 	WaitUntilTextboxCloses
 	MessageFromTargetPos TEXT_PROLOGUE, 0x46, 0x0000
 	WaitUntilTextboxCloses
-	CallWithArg CreateManager36, 0x00000002
+	CallWithArg CreateRepeatedSoundManager, 0x00000002
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
index ab1afa7b..ceb2a7d6 100644
--- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
+++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
@@ -23,7 +23,7 @@ SCRIPT_START script_Npc4EVaatiAttacking
 	Wait 0x000f
 	PlaySound SFX_125
 	CallWithArg sub_0807FB28, 0x00000003
-	CallWithArg DeleteManager36, 0x00000002
+	CallWithArg DeleteRepeatedSoundManager, 0x00000002
 	_0807F0C8 0x0000, 0x0000
 	SetSyncFlag 0x00000010
 	WaitForSyncFlagAndClear 0x00000020
diff --git a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc
index 5236e03b..d34dd18e 100644
--- a/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc
+++ b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc
@@ -77,7 +77,7 @@ SCRIPT_START script_VaatiIntroCeremony
 	Wait 0x001e
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00000100
-	Call sub_08066CA4
+	Call Vaati_Evaporate
 	DoPostScriptAction 0x0008
 	Wait 0x0078
 	SetSyncFlag 0x00000200
diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
index cc1a7213..e0d5f3de 100644
--- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
+++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
@@ -117,5 +117,5 @@ SCRIPT_START script_Npc4EIntroCastle
 	SetSyncFlag 0x08000000
 	SetSyncFlag 0x00800000
 	WaitForSyncFlagAndClear 0x01000000
-	CallWithArg CreateManager36, 0x00000002
+	CallWithArg CreateRepeatedSoundManager, 0x00000002
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc
index 0f02d560..71f644a8 100644
--- a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc
+++ b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_Object69CameraTarget
 	WaitForSyncFlagAndClear 0x00010000
 	SetSyncFlag 0x00048000
 	WaitForSyncFlagAndClear 0x00010000
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	MessageFromTargetPos TEXT_VAATI, 0x12, 0x000c
 	WaitUntilTextboxCloses
diff --git a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc
index d856f427..7260dc62 100644
--- a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc
+++ b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc
@@ -33,5 +33,5 @@ SCRIPT_START script_Object69MinishVaati
 	WaitUntilTextboxCloses
 	MessageFromTargetPos TEXT_VAATI, 0x10, 0x000c
 	WaitUntilTextboxCloses
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc
index 2d149f47..e2bdafd8 100644
--- a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc
+++ b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc
@@ -6,13 +6,13 @@ SCRIPT_START script_Object6AMinishCap
 	Call sub_08094B80
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000080
-	CallWithArg CreateManager36, 0x00000003
+	CallWithArg CreateRepeatedSoundManager, 0x00000003
 	Call sub_08094B0C
 	_0807EDD4 0x0078, 0x0068
 	SetSyncFlag 0x00000100
 	WaitForSyncFlagAndClear 0x00000080
 	_0807EF3C 0xff80, 0x0000
-	CallWithArg DeleteManager36, 0x00000003
+	CallWithArg DeleteRepeatedSoundManager, 0x00000003
 	Wait 0x003c
 	SetSyncFlag 0x00000100
 	WaitForSyncFlagAndClear 0x00000080
diff --git a/data/scripts/cutscene/originStory/script_Vaati.inc b/data/scripts/cutscene/originStory/script_Vaati.inc
index ac8c49a7..7028936b 100644
--- a/data/scripts/cutscene/originStory/script_Vaati.inc
+++ b/data/scripts/cutscene/originStory/script_Vaati.inc
@@ -39,7 +39,7 @@ SCRIPT_START script_Vaati
 	DoPostScriptAction 0x0000
 	SetSyncFlag 0x00001000
 	WaitForSyncFlagAndClear 0x00000800
-	Call sub_08066CA4
+	Call Vaati_Evaporate
 	DoPostScriptAction 0x0008
 	Wait 0x0078
 	SetSyncFlag 0x00001000
diff --git a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc
index f356d65f..b84a1abf 100644
--- a/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc
+++ b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_VaatiAppearsAgain
 	Call SetPriorityPlayerEvent
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000002
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e9
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x001e
diff --git a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc
index 539958c6..443859c8 100644
--- a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc
@@ -18,5 +18,5 @@ SCRIPT_START script_Npc4EFixedEverything
 	WaitUntilTextboxCloses
 	MessageFromTargetPos TEXT_VAATI2, 0x5e, 0x000e
 	WaitUntilTextboxCloses
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
index 502217ac..4ad2e6eb 100644
--- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
@@ -9,7 +9,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing
 	OffsetEntityPosition 0x0000, 0xffe0
 	Call WaitForCameraTouchRoomBorder
 	Wait 0x003c
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	Wait 0x003c
 	SetSyncFlag 0x00000002
diff --git a/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc
index 7619f004..fe207440 100644
--- a/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc
+++ b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_VaatiSanctuary
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000020
 	SetEntityPositionRelative 0x0098, 0x0048
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e9
 	DoPostScriptAction 0x0007
 	SetSyncFlag 0x00000040
@@ -26,7 +26,7 @@ SCRIPT_START script_VaatiSanctuary
 	DoPostScriptAction 0x0000
 	SetSyncFlag 0x00000040
 	WaitForSyncFlagAndClear 0x00000020
-	Call sub_08066CA4
+	Call Vaati_Evaporate
 	DoPostScriptAction 0x0008
 	Wait 0x0078
 	SetSyncFlag 0x00000040
diff --git a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc
index 8e730e8f..73e49128 100644
--- a/data/scripts/cutscene/takeover/script_VaatiTakeover.inc
+++ b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_VaatiTakeover
 	DoPostScriptAction 0x001d
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000010
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e9
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x001e
@@ -18,13 +18,13 @@ SCRIPT_START script_VaatiTakeover
 	DoPostScriptAction 0x0000
 	SetSyncFlag 0x00000020
 	WaitForSyncFlagAndClear 0x00000010
-	Call sub_08066CA4
+	Call Vaati_Evaporate
 	DoPostScriptAction 0x0008
 	Wait 0x00bc
 	SetSyncFlag 0x00000020
 	WaitForSyncFlagAndClear 0x00000010
 	SetEntityPositionRelative 0x0088, 0x0068
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e8
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x001e
diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
index cdab5391..41879a11 100644
--- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
+++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc
@@ -43,5 +43,5 @@ script_0800DBCA:
 	SetSyncFlag 0x00000001
 	StopBgm
 	Call sub_08094F98
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
index 018b2feb..47ac41a5 100644
--- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
+++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_Npc4ECastleCollapsing
 	SetFadeTime 0x0004
 	_0807E80C 0x00000000
 	WaitForFadeFinish
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	SetLocalFlag 0x0079
 	CallWithArg sub_0806DA1C, 0x00000002
diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc
index c5af958a..5d465b53 100644
--- a/data/scripts/dhc/script_Vaati1Intro.inc
+++ b/data/scripts/dhc/script_Vaati1Intro.inc
@@ -17,7 +17,7 @@ SCRIPT_START script_Vaati1Intro
 	_0807F0B4 0x0001
 	CameraTargetEntity
 	Call WaitForCameraTouchRoomBorder
-	Call sub_08066C94
+	Call Vaati_Apparate
 	Wait 0x00e9
 	DoPostScriptAction 0x0007
 	MessageFromTargetPos TEXT_VAATI2, 0x2f, 0x0002
diff --git a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc
index 46d7f708..2c8bed4b 100644
--- a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc
+++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble
 .endif
 	SetSyncFlag 0x00000008
 	Wait 0x0078
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	Wait 0x003c
 	_0807F0B4 0x0004
diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc
index ee42d5ef..a5b9e51e 100644
--- a/data/scripts/sanctuary/script_Npc4EPedestal.inc
+++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc
@@ -35,7 +35,7 @@ script_080134F8:
 	CallWithArg sub_08095D8C, script_Object6ASwordCharge6
 	EndBlock
 	Wait 0x003c
-	CallWithArg CreateManager36, 0x00000000
+	CallWithArg CreateRepeatedSoundManager, 0x00000000
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00002000
 	PlaySound SFX_1D2
@@ -45,7 +45,7 @@ script_080134F8:
 	WaitForSyncFlagAndClear 0x00004000
 	Wait 0x0078
 	SetSyncFlag 0x00000060
-	CallWithArg DeleteManager36, 0x00000000
+	CallWithArg DeleteRepeatedSoundManager, 0x00000000
 	Wait 0x0078
 	SetSyncFlag 0x00000080
 	WaitForSyncFlagAndClear 0x00000100
@@ -70,5 +70,5 @@ script_080134F8:
 	MessageFromTargetPos TEXT_ITEM_GET, 0x03, 0x000c
 	WaitUntilTextboxCloses
 	SetSyncFlag 0x00040000
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000
diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
index 46453d34..3b76a072 100644
--- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
@@ -36,7 +36,7 @@ script_0801373C:
 	CallWithArg sub_08095D8C, script_Objet6ASwordCharge7
 	EndBlock
 	Wait 0x003c
-	CallWithArg CreateManager36, 0x00000000
+	CallWithArg CreateRepeatedSoundManager, 0x00000000
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00002000
 	PlaySound SFX_1D2
@@ -48,7 +48,7 @@ script_0801373C:
 	WaitForSyncFlagAndClear 0x00008000
 	Wait 0x0078
 	SetSyncFlag 0x00000060
-	CallWithArg DeleteManager36, 0x00000000
+	CallWithArg DeleteRepeatedSoundManager, 0x00000000
 	Wait 0x0078
 	SetSyncFlag 0x00000080
 	WaitForSyncFlagAndClear 0x00000100
diff --git a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc
index 4ba0ef71..ecd6d4b6 100644
--- a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc
+++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard
 	Wait 0x003c
 	SetSyncFlag 0x00000004
 	Wait 0x0078
-	CallWithArg DeleteManager36, 0x00000001
+	CallWithArg DeleteRepeatedSoundManager, 0x00000001
 	_0807F0C8 0x0000, 0x0000
 	StartPlayerScript script_PlayerTextBoardAppears
 	WaitForSyncFlagAndClear 0x00000002
diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
index 02c82868..bd8b7e61 100644
--- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
@@ -38,7 +38,7 @@ script_080138D0:
 	CallWithArg sub_08095D8C, script_Object6ASwordCharge8
 	EndBlock
 	Wait 0x003c
-	CallWithArg CreateManager36, 0x00000000
+	CallWithArg CreateRepeatedSoundManager, 0x00000000
 	SetSyncFlag 0x00000200
 	WaitForSyncFlagAndClear 0x00002000
 	PlaySound SFX_1D2
@@ -52,7 +52,7 @@ script_080138D0:
 	WaitForSyncFlagAndClear 0x00010000
 	Wait 0x0078
 	SetSyncFlag 0x00000060
-	CallWithArg DeleteManager36, 0x00000000
+	CallWithArg DeleteRepeatedSoundManager, 0x00000000
 	Wait 0x0078
 	SetSyncFlag 0x00000080
 	WaitForSyncFlagAndClear 0x00000100
@@ -94,5 +94,5 @@ script_08013A8E:
 	CheckRoomFlag 0x0004
 	JumpIfNot script_08013A8E
 .endif
-	CallWithArg CreateManager36, 0x00000001
+	CallWithArg CreateRepeatedSoundManager, 0x00000001
 	_0807F0C8 0xffff, 0x0000