Rename objects

This commit is contained in:
octorock
2022-07-23 12:43:43 +02:00
parent ccba86d292
commit 852effa474
671 changed files with 5779 additions and 5277 deletions
@@ -1,5 +1,5 @@
@ DHC Vaati defeated OBJECT_6A Minish Cap?
SCRIPT_START script_Object6AV3DefeatedMinishCap
@ DHC Vaati defeated CUTSCENE_MISC_OBJECT Minish Cap?
SCRIPT_START script_CutsceneMiscObjectV3DefeatedMinishCap
BeginBlock
SetEntitySpeed 0x0080
DoPostScriptAction 0x0007
@@ -7,7 +7,7 @@ SCRIPT_START script_Object6AV3DefeatedMinishCap
SetAnimation 0x0002
SetEntityPositionRelative 0x00b0, 0x0080
CallWithArg SetEntityHeight, 0xff800000
CallWithArg sub_080960C4, script_Object6AV3DefeatedMinishCap2
CallWithArg sub_080960C4, script_CutsceneMiscObjectV3DefeatedMinishCap2
EndBlock
PlaySound SFX_SPARKLES
_0807EF3C 0xff80, 0x0000
@@ -1,5 +1,5 @@
@ DHC Vaati defeated OBJECT_6A Minish Cap?
SCRIPT_START script_Object6AV3DefeatedMinishCap2
@ DHC Vaati defeated CUTSCENE_MISC_OBJECT Minish Cap?
SCRIPT_START script_CutsceneMiscObjectV3DefeatedMinishCap2
BeginBlock
DoPostScriptAction 0x0007
DoPostScriptAction 0x000b
@@ -1,5 +1,5 @@
@ DHC OBJECT_69 Towards Vaati in room with Ball&Chain soldier
SCRIPT_START script_Object69BallAndChainSoldierRoom
@ DHC CUTSCENE_ORCHESTRATOR Towards Vaati in room with Ball&Chain soldier
SCRIPT_START script_CutsceneOrchestratorBallAndChainSoldierRoom
BeginBlock
Call SetPriorityPlayerEvent
EndBlock
@@ -1,15 +1,15 @@
@ DHC OBJECT_69 trying to escape the collapsing castle
SCRIPT_START script_Object69CastleEscape
@ DHC CUTSCENE_ORCHESTRATOR trying to escape the collapsing castle
SCRIPT_START script_CutsceneOrchestratorCastleEscape
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
StartPlayerScript script_PlayerCastleEscape
WaitForSyncFlagAndClear 0x00000001
WaitForSyncFlagAndClear 0x00000002
EzloMessage TEXT_VAATI2, 0x47
WaitUntilTextboxCloses
SetLocalFlag 0x007a
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
@@ -0,0 +1,8 @@
@ CUTSCENE_ORCHESTRATOR somewhere in DHC?
SCRIPT_START script_CutsceneOrchestratorDHC
BeginBlock
CheckLocalFlag 0x0086
JumpIfNot script_CutsceneOrchestratorKillDarkNut
DoPostScriptAction 0x0006
EndBlock
SCRIPT_END
@@ -1,5 +1,5 @@
@ DHC OBJECT_69 Towards Vaati room with Dark Nuts
SCRIPT_START script_Object69DarkNutsRoom
@ DHC CUTSCENE_ORCHESTRATOR Towards Vaati room with Dark Nuts
SCRIPT_START script_CutsceneOrchestratorDarkNutsRoom
BeginBlock
EndBlock
CheckLocalFlag 0x007e
@@ -1,5 +1,5 @@
@ DHC OBJECT_69 Towards Vaati in room with Keatons
SCRIPT_START script_Object69KeatonsRoom
@ DHC CUTSCENE_ORCHESTRATOR Towards Vaati in room with Keatons
SCRIPT_START script_CutsceneOrchestratorKeatonsRoom
BeginBlock
EndBlock
CheckLocalFlag 0x007d
@@ -1,5 +1,5 @@
@ DHC OBJECT_69 Kill first Dark Nut
SCRIPT_START script_Object69KillDarkNut
@ DHC CUTSCENE_ORCHESTRATOR Kill first Dark Nut
SCRIPT_START script_CutsceneOrchestratorKillDarkNut
EndBlock
script_0800E5D8:
CheckLocalFlag 0x0086
@@ -1,15 +1,15 @@
@ DHC OBJECT_69 V1 defeated
SCRIPT_START script_Object69V1Defeated
@ DHC CUTSCENE_ORCHESTRATOR V1 defeated
SCRIPT_START script_CutsceneOrchestratorV1Defeated
EndBlock
script_0800DFB6:
CheckRoomFlag 0x0001
JumpIfNot script_0800DFB6
StopBgm
SetPlayerIdle
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
PlaySound SFX_EVAPORATE
CallWithArg sub_0806DA1C, 0x00000004
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
@@ -1,7 +1,7 @@
@ DHC OBJECT_69 After defeating V2
SCRIPT_START script_Object69V2Defeated
@ DHC CUTSCENE_ORCHESTRATOR After defeating V2
SCRIPT_START script_CutsceneOrchestratorV2Defeated
BeginBlock
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
SetPlayerIdle
EndBlock
StopBgm
@@ -14,7 +14,7 @@ SCRIPT_START script_Object69V2Defeated
SetSyncFlag 0x00000001
StartPlayerScript script_PlayerV2Defeated
WaitForSyncFlagAndClear 0x00000002
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
@@ -1,7 +1,7 @@
@ DHC OBJECT_69 V2 intro
SCRIPT_START script_Object69V2Intro
@ DHC CUTSCENE_ORCHESTRATOR V2 intro
SCRIPT_START script_CutsceneOrchestratorV2Intro
BeginBlock
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
SetPlayerIdle
EndBlock
StopBgm
@@ -12,21 +12,21 @@ script_0800DFFE:
CheckRoomFlag 0x0000
JumpIfNot script_0800DFFE
PlayBgm BGM_VAATI_TRANSFIGURED
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
script_0800E012:
@ Defeated
CheckRoomFlag 0x0002
JumpIfNot script_0800E012
SetPlayerIdle
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
SetLocalFlag 0x007b
MessageFromTargetPos TEXT_VAATI2, 0x39, 0x000c
WaitUntilTextboxCloses
Wait 0x0096
PlaySound SFX_EVAPORATE
CallWithArg sub_0806DA1C, 0x00000005
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
@@ -1,5 +1,5 @@
@ DHC OBJECT_69 Vaati with Zelda
SCRIPT_START script_Object69VaatiWithZelda
@ DHC CUTSCENE_ORCHESTRATOR Vaati with Zelda
SCRIPT_START script_CutsceneOrchestratorVaatiWithZelda
BeginBlock
EndBlock
script_0800DA64:
@@ -7,7 +7,7 @@ script_0800DA64:
JumpIfNot script_0800DA64
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
_0807E8E4_0
Call CreatePlayerExclamationMark
Wait 0x003c
@@ -23,7 +23,7 @@ script_0800DA64:
Wait 0x001e
MessageFromTargetPos TEXT_VAATI2, 0x2e, 0x0002
WaitUntilTextboxCloses
_0807E8E4_0
_0807E8E4_0
CallWithArg SetPlayerPos, 0x00780138
_0807F0B4 0x0004
CameraTargetPlayer
@@ -40,7 +40,7 @@ script_0800DA64:
Wait 0x003c
SetRoomFlag 0x0001
SetLocalFlag 0x0077
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
+1 -1
View File
@@ -14,5 +14,5 @@ script_0800E44C:
CallWithArg sub_0807F3D8, 0x00000000
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x05
WaitUntilTextboxCloses
EnablePlayerControl
EnablePlayerControl
Jump script_0800E44C
+1 -1
View File
@@ -14,7 +14,7 @@ script_0800E484:
CallWithArg sub_0807F3D8, 0x00000000
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x07
WaitUntilTextboxCloses
EnablePlayerControl
EnablePlayerControl
Jump script_0800E484
+1 -1
View File
@@ -45,5 +45,5 @@ script_0800E1E0:
CallWithArg sub_0807F3D8, 0x00000000
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x01
WaitUntilTextboxCloses
EnablePlayerControl
EnablePlayerControl
Jump script_0800E1E0
+3 -3
View File
@@ -73,10 +73,10 @@ script_0800E312:
SetPlayerIdle
FacePlayer
CallWithArg sub_0807F3D8, 0x00000000
EndBlock
EndBlock
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x04
WaitUntilTextboxCloses
EnablePlayerControl
EnablePlayerControl
Jump script_0800E2AE
script_0800E32E:
CheckEntityInteractType
@@ -86,6 +86,6 @@ script_0800E32E:
CallWithArg sub_0807F3D8, 0x00000000
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x03
WaitUntilTextboxCloses
EnablePlayerControl
EnablePlayerControl
Jump script_0800E32E
.2byte 0x0000
+4 -4
View File
@@ -37,8 +37,8 @@ script_0800E3BE:
script_0800E3C8:
CheckEntityInteractType
JumpIfNot script_0800E3C8
SetPlayerIdle
FacePlayer
SetPlayerIdle
FacePlayer
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0c
WaitUntilTextboxCloses
Wait 0x000f
@@ -53,8 +53,8 @@ script_0800E3E8:
script_0800E3EE:
CheckEntityInteractType
JumpIfNot script_0800E3EE
SetPlayerIdle
FacePlayer
SetPlayerIdle
FacePlayer
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x0d
WaitUntilTextboxCloses
Wait 0x000f
@@ -38,8 +38,8 @@ script_0800E12E:
script_0800E138:
CheckEntityInteractType
JumpIfNot script_0800E138
SetPlayerIdle
FacePlayer
SetPlayerIdle
FacePlayer
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x02
WaitUntilTextboxCloses
Wait 0x000f
@@ -8,8 +8,8 @@ SCRIPT_START script_MinisterPothoCell
script_0800E41A:
CheckEntityInteractType
JumpIfNot script_0800E41A
SetPlayerIdle
FacePlayer
SetPlayerIdle
FacePlayer
MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x06
WaitUntilTextboxCloses
Wait 0x000f
@@ -7,7 +7,7 @@ script_0800DB7C:
JumpIf script_0800DB7C
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
_0807F0B4 0x0001
SetEntityPositionRelative 0x0078, 0x0078
CameraTargetEntity
@@ -17,14 +17,14 @@ script_0800DB7C:
Call sub_0804D7EC
SetSyncFlag 0x00000001
WaitForSyncFlagAndClear 0x00000002
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
script_0800DBCA:
CheckRoomFlag 0x0000
JumpIfNot script_0800DBCA
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
Call sub_0804D810
Call CreatePlayerExclamationMark
Wait 0x003c
@@ -16,7 +16,7 @@ SCRIPT_START script_Npc4ECastleCollapsing
_0807F0C8 0x0000, 0x0000
SetLocalFlag 0x0079
CallWithArg sub_0806DA1C, 0x00000002
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END
+2 -2
View File
@@ -6,7 +6,7 @@ script_0800A0FE:
JumpIfNot script_0800A0FE
BeginBlock
SetPlayerIdle
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
StopBgm
.ifndef EU
Call sub_0807FBFC
@@ -15,7 +15,7 @@ script_0800A0FE:
Call sub_0807F844
_0807E8E4_3
CallWithArg SetPlayerPos, 0x00d00060
CallWithArg sub_08094AE8, script_Object6AV3DefeatedMinishCap
CallWithArg sub_08094AE8, script_CutsceneMiscObjectV3DefeatedMinishCap
PlaySound SFX_APPARATE
SetFadeTime 0x0002
SetFade6
-8
View File
@@ -1,8 +0,0 @@
@ OBJECT_69 somewhere in DHC?
SCRIPT_START script_Object69DHC
BeginBlock
CheckLocalFlag 0x0086
JumpIfNot script_Object69KillDarkNut
DoPostScriptAction 0x0006
EndBlock
SCRIPT_END
+2 -2
View File
@@ -7,7 +7,7 @@ SCRIPT_START script_Vaati1Intro
EndBlock
SetPlayerIdle
Call WaitForPlayerNormal
Call sub_0807DF28
Call DisablePauseMenuAndPutAwayItems
StopBgm
_0807E8E4_2
Wait 0x005a
@@ -33,7 +33,7 @@ SCRIPT_START script_Vaati1Intro
CameraTargetPlayer
Call WaitForCameraTouchRoomBorder
SetLocalFlag 0x0078
Call sub_0807DF50
Call EnablePauseMenu
EnablePlayerControl
DoPostScriptAction 0x0006
SCRIPT_END