diff options
Diffstat (limited to 'data/scripts/dhc')
24 files changed, 66 insertions, 66 deletions
diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc b/data/scripts/dhc/script_CutsceneMiscObjectV3DefeatedMinishCap.inc index 384e441c..a8613fff 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc +++ b/data/scripts/dhc/script_CutsceneMiscObjectV3DefeatedMinishCap.inc @@ -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 diff --git a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc b/data/scripts/dhc/script_CutsceneMiscObjectV3DefeatedMinishCap2.inc index 200517d3..8f7f7463 100644 --- a/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc +++ b/data/scripts/dhc/script_CutsceneMiscObjectV3DefeatedMinishCap2.inc @@ -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 diff --git a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc b/data/scripts/dhc/script_CutsceneOrchestratorBallAndChainSoldierRoom.inc index 51164ea1..7de4148a 100644 --- a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorBallAndChainSoldierRoom.inc @@ -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 diff --git a/data/scripts/dhc/script_Object69CastleEscape.inc b/data/scripts/dhc/script_CutsceneOrchestratorCastleEscape.inc index 93348aff..c2a77e32 100644 --- a/data/scripts/dhc/script_Object69CastleEscape.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorCastleEscape.inc @@ -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 diff --git a/data/scripts/dhc/script_CutsceneOrchestratorDHC.inc b/data/scripts/dhc/script_CutsceneOrchestratorDHC.inc new file mode 100644 index 00000000..fd58be45 --- /dev/null +++ b/data/scripts/dhc/script_CutsceneOrchestratorDHC.inc @@ -0,0 +1,8 @@ +@ CUTSCENE_ORCHESTRATOR somewhere in DHC? +SCRIPT_START script_CutsceneOrchestratorDHC + BeginBlock + CheckLocalFlag 0x0086 + JumpIfNot script_CutsceneOrchestratorKillDarkNut + DoPostScriptAction 0x0006 + EndBlock +SCRIPT_END diff --git a/data/scripts/dhc/script_Object69DarkNutsRoom.inc b/data/scripts/dhc/script_CutsceneOrchestratorDarkNutsRoom.inc index 12fe4aa3..315fb48b 100644 --- a/data/scripts/dhc/script_Object69DarkNutsRoom.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorDarkNutsRoom.inc @@ -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 diff --git a/data/scripts/dhc/script_Object69KeatonsRoom.inc b/data/scripts/dhc/script_CutsceneOrchestratorKeatonsRoom.inc index 7d754cec..a91c0888 100644 --- a/data/scripts/dhc/script_Object69KeatonsRoom.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorKeatonsRoom.inc @@ -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 diff --git a/data/scripts/dhc/script_Object69KillDarkNut.inc b/data/scripts/dhc/script_CutsceneOrchestratorKillDarkNut.inc index 23a85ddd..f84ec939 100644 --- a/data/scripts/dhc/script_Object69KillDarkNut.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorKillDarkNut.inc @@ -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 diff --git a/data/scripts/dhc/script_Object69V1Defeated.inc b/data/scripts/dhc/script_CutsceneOrchestratorV1Defeated.inc index 0fe8da38..f1d673ca 100644 --- a/data/scripts/dhc/script_Object69V1Defeated.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorV1Defeated.inc @@ -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 diff --git a/data/scripts/dhc/script_Object69V2Defeated.inc b/data/scripts/dhc/script_CutsceneOrchestratorV2Defeated.inc index eb9bf0dd..ccb65722 100644 --- a/data/scripts/dhc/script_Object69V2Defeated.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorV2Defeated.inc @@ -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 diff --git a/data/scripts/dhc/script_Object69V2Intro.inc b/data/scripts/dhc/script_CutsceneOrchestratorV2Intro.inc index edcff907..e18eb5e4 100644 --- a/data/scripts/dhc/script_Object69V2Intro.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorV2Intro.inc @@ -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 diff --git a/data/scripts/dhc/script_Object69VaatiWithZelda.inc b/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc index fe5d2128..dcbe756b 100644 --- a/data/scripts/dhc/script_Object69VaatiWithZelda.inc +++ b/data/scripts/dhc/script_CutsceneOrchestratorVaatiWithZelda.inc @@ -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 diff --git a/data/scripts/dhc/script_GuardCellLeft.inc b/data/scripts/dhc/script_GuardCellLeft.inc index c0f0c031..35bf3f88 100644 --- a/data/scripts/dhc/script_GuardCellLeft.inc +++ b/data/scripts/dhc/script_GuardCellLeft.inc @@ -14,5 +14,5 @@ script_0800E44C: CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x05 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_0800E44C diff --git a/data/scripts/dhc/script_GuardCellRight.inc b/data/scripts/dhc/script_GuardCellRight.inc index 9c23e9ff..42151940 100644 --- a/data/scripts/dhc/script_GuardCellRight.inc +++ b/data/scripts/dhc/script_GuardCellRight.inc @@ -14,7 +14,7 @@ script_0800E484: CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x07 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_0800E484 diff --git a/data/scripts/dhc/script_GuardStone1.inc b/data/scripts/dhc/script_GuardStone1.inc index 06f8aaea..a00354e4 100644 --- a/data/scripts/dhc/script_GuardStone1.inc +++ b/data/scripts/dhc/script_GuardStone1.inc @@ -45,5 +45,5 @@ script_0800E1E0: CallWithArg sub_0807F3D8, 0x00000000 MessageNoOverlap TEXT_BREAK_VAATI_CURSE, 0x01 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_0800E1E0 diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc index 254d6cbc..77848677 100644 --- a/data/scripts/dhc/script_GuardStone2.inc +++ b/data/scripts/dhc/script_GuardStone2.inc @@ -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 diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc index 58b1f75b..0cc87638 100644 --- a/data/scripts/dhc/script_KingDaltusStone.inc +++ b/data/scripts/dhc/script_KingDaltusStone.inc @@ -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 diff --git a/data/scripts/dhc/script_MinishterPothoStone.inc b/data/scripts/dhc/script_MinishterPothoStone.inc index 210e28cf..b4fa78a8 100644 --- a/data/scripts/dhc/script_MinishterPothoStone.inc +++ b/data/scripts/dhc/script_MinishterPothoStone.inc @@ -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 diff --git a/data/scripts/dhc/script_MinisterPothoCell.inc b/data/scripts/dhc/script_MinisterPothoCell.inc index 0016a435..4fabc7ad 100644 --- a/data/scripts/dhc/script_MinisterPothoCell.inc +++ b/data/scripts/dhc/script_MinisterPothoCell.inc @@ -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 diff --git a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc index 41879a11..cadcafdc 100644 --- a/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc @@ -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 diff --git a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc index 47ac41a5..f2b77db5 100644 --- a/data/scripts/dhc/script_Npc4ECastleCollapsing.inc +++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc @@ -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 diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc index e946f42e..730986bc 100644 --- a/data/scripts/dhc/script_Npc4EV3Defeated.inc +++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc @@ -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 diff --git a/data/scripts/dhc/script_Object69DHC.inc b/data/scripts/dhc/script_Object69DHC.inc deleted file mode 100644 index c83d9c0b..00000000 --- a/data/scripts/dhc/script_Object69DHC.inc +++ /dev/null @@ -1,8 +0,0 @@ -@ OBJECT_69 somewhere in DHC? -SCRIPT_START script_Object69DHC - BeginBlock - CheckLocalFlag 0x0086 - JumpIfNot script_Object69KillDarkNut - DoPostScriptAction 0x0006 - EndBlock -SCRIPT_END diff --git a/data/scripts/dhc/script_Vaati1Intro.inc b/data/scripts/dhc/script_Vaati1Intro.inc index 5d465b53..8e7a3d72 100644 --- a/data/scripts/dhc/script_Vaati1Intro.inc +++ b/data/scripts/dhc/script_Vaati1Intro.inc @@ -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 |