From 60e33b636d7b9dca767b3833ee39affcc626f420 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Sun, 1 May 2022 11:43:19 +0200 Subject: Rename managers --- data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc | 4 ++-- data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc | 2 +- data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc | 2 +- data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc | 2 +- data/scripts/cutscene/originStory/script_Object69CameraTarget.inc | 2 +- data/scripts/cutscene/originStory/script_Object69MinishVaati.inc | 2 +- data/scripts/cutscene/originStory/script_Object6AMinishCap.inc | 4 ++-- data/scripts/cutscene/originStory/script_Vaati.inc | 2 +- data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc | 2 +- data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc | 2 +- data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc | 2 +- data/scripts/cutscene/reveal/script_VaatiSanctuary.inc | 4 ++-- data/scripts/cutscene/takeover/script_VaatiTakeover.inc | 6 +++--- data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc | 2 +- data/scripts/dhc/script_Npc4ECastleCollapsing.inc | 2 +- data/scripts/dhc/script_Vaati1Intro.inc | 2 +- data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc | 2 +- data/scripts/sanctuary/script_Npc4EPedestal.inc | 6 +++--- data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc | 4 ++-- data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc | 2 +- data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc | 6 +++--- 21 files changed, 31 insertions(+), 31 deletions(-) (limited to 'data/scripts') 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 -- cgit v1.2.3