Rename managers

This commit is contained in:
octorock
2022-05-01 11:43:19 +02:00
parent 3afbd0e901
commit 60e33b636d
231 changed files with 4964 additions and 4235 deletions
@@ -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
@@ -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
@@ -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
@@ -117,5 +117,5 @@ SCRIPT_START script_Npc4EIntroCastle
SetSyncFlag 0x08000000
SetSyncFlag 0x00800000
WaitForSyncFlagAndClear 0x01000000
CallWithArg CreateManager36, 0x00000002
CallWithArg CreateRepeatedSoundManager, 0x00000002
_0807F0C8 0xffff, 0x0000
@@ -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
@@ -33,5 +33,5 @@ SCRIPT_START script_Object69MinishVaati
WaitUntilTextboxCloses
MessageFromTargetPos TEXT_VAATI, 0x10, 0x000c
WaitUntilTextboxCloses
CallWithArg CreateManager36, 0x00000001
CallWithArg CreateRepeatedSoundManager, 0x00000001
_0807F0C8 0xffff, 0x0000
@@ -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
@@ -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
@@ -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
@@ -18,5 +18,5 @@ SCRIPT_START script_Npc4EFixedEverything
WaitUntilTextboxCloses
MessageFromTargetPos TEXT_VAATI2, 0x5e, 0x000e
WaitUntilTextboxCloses
CallWithArg CreateManager36, 0x00000001
CallWithArg CreateRepeatedSoundManager, 0x00000001
_0807F0C8 0xffff, 0x0000
@@ -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
@@ -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
@@ -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
@@ -43,5 +43,5 @@ script_0800DBCA:
SetSyncFlag 0x00000001
StopBgm
Call sub_08094F98
CallWithArg CreateManager36, 0x00000001
CallWithArg CreateRepeatedSoundManager, 0x00000001
_0807F0C8 0xffff, 0x0000
@@ -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
+1 -1
View File
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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