diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-07-23 12:43:43 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-07-25 22:45:55 +0200 |
| commit | 852effa474c159398014da736ade6f0fea454de7 (patch) | |
| tree | 97da22c4758ca4156dc9fb7ac123c7a3b0a9e9f5 /data/scripts/cutscene | |
| parent | ccba86d292a0e4c8a0e07325ac4fb25e5a58dc89 (diff) | |
Rename objects
Diffstat (limited to 'data/scripts/cutscene')
69 files changed, 186 insertions, 186 deletions
diff --git a/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_CutsceneMiscObjectLeftBullyingOctorok.inc index 3a0fb547..b1683231 100644 --- a/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc +++ b/data/scripts/cutscene/ezlo/script_CutsceneMiscObjectLeftBullyingOctorok.inc @@ -1,5 +1,5 @@ -@ First look at Ezlo OBJECT_6A left octorok -SCRIPT_START script_Object6ALeftBullyingOctorok +@ First look at Ezlo CUTSCENE_MISC_OBJECT left octorok +SCRIPT_START script_CutsceneMiscObjectLeftBullyingOctorok BeginBlock SetAnimationState 0x0002 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_CutsceneMiscObjectRightBullyingOctorok.inc index c64fa666..887129f6 100644 --- a/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc +++ b/data/scripts/cutscene/ezlo/script_CutsceneMiscObjectRightBullyingOctorok.inc @@ -1,5 +1,5 @@ -@ First look at Ezlo OBJECT_6A right octorok -SCRIPT_START script_Object6ARightBullyingOctorok +@ First look at Ezlo CUTSCENE_MISC_OBJECT right octorok +SCRIPT_START script_CutsceneMiscObjectRightBullyingOctorok BeginBlock SetAnimationState 0x0006 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/ezlo/script_EzloCap.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc index 734aa26c..0c5328b2 100644 --- a/data/scripts/cutscene/ezlo/script_EzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -131,7 +131,7 @@ script_08012904: script_08012920: SetPlayerIdle SetAnimation 0x0010 - EndBlock + EndBlock MessageFromTargetPos TEXT_FINDING_EZLO, 0x15, 0x000c WaitUntilTextboxCloses SetAnimation 0x0018 @@ -141,7 +141,7 @@ script_0801293A: EndBlock SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems FaceAwayFromPlayer Call sub_0806D944 SetAnimation 0x0010 @@ -151,7 +151,7 @@ script_0801293A: Call sub_0806D908 WalkForward 0x0050 WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 @@ -167,7 +167,7 @@ script_08012984: script_080129A0: SetPlayerIdle SetAnimation 0x0010 - EndBlock + EndBlock MessageFromTargetPos TEXT_FINDING_EZLO, 0x15, 0x000c WaitUntilTextboxCloses SetAnimation 0x0018 @@ -177,7 +177,7 @@ script_080129BA: EndBlock SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems FaceAwayFromPlayer Call sub_0806D944 SetAnimation 0x0010 @@ -188,7 +188,7 @@ script_080129BA: WalkForward 0x0050 SetAnimation 0x0018 WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 @@ -204,7 +204,7 @@ script_08012A08: script_08012A24: SetPlayerIdle SetAnimation 0x0010 - EndBlock + EndBlock MessageFromTargetPos TEXT_FINDING_EZLO, 0x15, 0x000c WaitUntilTextboxCloses SetAnimation 0x0018 @@ -214,7 +214,7 @@ script_08012A3E: EndBlock SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StopBgm DoPostScriptAction 0x000b FaceAwayFromPlayer diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc index 5e685039..015df913 100644 --- a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc +++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc @@ -9,11 +9,11 @@ script_0801248A: StopBgm SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtFirstLookAtEzlo MessageFromTargetPos TEXT_FINDING_EZLO, 0x01, 0x0007 WaitUntilTextboxCloses - CameraTargetPlayer + CameraTargetPlayer SetFadeTime 0x0004 _0807E80C 0x00000000 WaitForFadeFinish @@ -48,7 +48,7 @@ script_0801248A: SetFadeTime 0x0004 _0807E800 0x00000000 WaitForFadeFinish - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl PlayBGM script_08012566: @@ -56,7 +56,7 @@ script_08012566: JumpIfNot script_08012566 SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call sub_0806DC7C StopBgm StartPlayerScript script_PlayerEzloBeingBullied @@ -82,14 +82,14 @@ script_08012566: WaitForSyncFlagAndClear 0x00000008 StopBgm PlayBgm BGM_FIGHT_THEME2 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetSyncFlag 0x00000050 LoadRoomEntityList gUnk_080F51D0 WaitForSyncFlagAndClear 0x00000008 SetPlayerIdle Call WaitForPlayerNormalOrTalkEzlo - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems PlaySound SFX_SECRET StopBgm SetSyncFlag 0x00000004 @@ -115,7 +115,7 @@ script_08012566: Call sub_0806DCA0 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 @@ -129,7 +129,7 @@ script_08012566: Call sub_08054570 SetGlobalFlag EZERO_1ST CallWithArg ResetPlayerFlag, PL_NO_CAP - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_Object69Intro.inc b/data/scripts/cutscene/intro/script_CutsceneOrchestratorIntro.inc index 7fb2799d..200cefb1 100644 --- a/data/scripts/cutscene/intro/script_Object69Intro.inc +++ b/data/scripts/cutscene/intro/script_CutsceneOrchestratorIntro.inc @@ -1,7 +1,7 @@ -@ Intro smith OBJECT_69 ? -SCRIPT_START script_Object69Intro +@ Intro smith CUTSCENE_ORCHESTRATOR ? +SCRIPT_START script_CutsceneOrchestratorIntro BeginBlock - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetPlayerIdle SetSyncFlag 0x00000000 EndBlock @@ -10,7 +10,7 @@ SCRIPT_START script_Object69Intro SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000001 SetGlobalFlag ZELDA_CHASE - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Call PlayerSetNormalAndCollide SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_Object69Intro2.inc b/data/scripts/cutscene/intro/script_CutsceneOrchestratorIntro2.inc index 2da80def..c3449ea0 100644 --- a/data/scripts/cutscene/intro/script_Object69Intro2.inc +++ b/data/scripts/cutscene/intro/script_CutsceneOrchestratorIntro2.inc @@ -1,5 +1,5 @@ -@ Intro unknown second OBJECT_69 -SCRIPT_START script_Object69Intro2 +@ Intro unknown second CUTSCENE_ORCHESTRATOR +SCRIPT_START script_CutsceneOrchestratorIntro2 Wait 0x003c script_08009A38: Call sub_08066258 diff --git a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc index 7a526696..60b87ab5 100644 --- a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Npc4EOutsideLinksHouse Call sub_0807F844 Call SetPriorityMessage SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EndBlock SetFadeTime 0x0010 SetFade6 @@ -14,7 +14,7 @@ SCRIPT_START script_Npc4EOutsideLinksHouse WaitForSyncFlagAndClear 0x00000002 _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_PlayerIntro.inc b/data/scripts/cutscene/intro/script_PlayerIntro.inc index 37f2071f..81dbc1e2 100644 --- a/data/scripts/cutscene/intro/script_PlayerIntro.inc +++ b/data/scripts/cutscene/intro/script_PlayerIntro.inc @@ -1,7 +1,7 @@ @ Intro Player SCRIPT_START script_PlayerIntro BeginBlock - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetPlayerIdle SetLocalFlag 0x0046 EndBlock @@ -19,6 +19,6 @@ SCRIPT_START script_PlayerIntro @ Give control to the player? Call sub_08053250 EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_SmithIntro2.inc b/data/scripts/cutscene/intro/script_SmithIntro2.inc index 939099ab..ca938451 100644 --- a/data/scripts/cutscene/intro/script_SmithIntro2.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro2.inc @@ -12,7 +12,7 @@ SCRIPT_START script_SmithIntro2 Wait 0x000a SetPlayerIdle StartPlayerScript script_PlayerMoveToSmith - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems WaitForSyncFlagAndClear 0x00000008 _0807EDD4 0x0080, 0x005c SetAnimationState 0x0006 @@ -20,7 +20,7 @@ SCRIPT_START script_SmithIntro2 Wait 0x000f DoPostScriptAction 0x0001 MessageFromTargetPos TEXT_PROLOGUE, 0x09, 0x0000 - _0807E8E4_1 + _0807E8E4_1 WaitUntilTextboxCloses DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 @@ -57,10 +57,10 @@ script_08009C4C: script_08009C50: CheckEntityInteractType JumpIfNot script_08009C50 - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_PROLOGUE, 0x0e - EnablePlayerControl + EnablePlayerControl Jump script_08009C50 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc index bb48633d..d7758486 100644 --- a/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc +++ b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc @@ -11,7 +11,7 @@ SCRIPT_START script_ZeldaOutsideLinksHouse EndBlock WaitForSyncFlagAndClear 0x00000001 Call sub_08066E08 - SetPlayerIdle + SetPlayerIdle MessageFromTargetPos TEXT_PROLOGUE, 0x10, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000002 @@ -24,28 +24,28 @@ script_08014D1E: EndBlock SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems MessageNoOverlap TEXT_PROLOGUE, 0x12 WaitUntilTextboxCloses WalkNorth 0x0040 SetAnimationState 0x0004 Call sub_08066E08 SetEntityPositionRelative 0x01f8, 0x00c8 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08014D60: @ Between trees CallWithArg sub_0807F6B4, 0x000000e8 JumpIf script_08014D60 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems MessageNoOverlap TEXT_PROLOGUE, 0x13 WaitUntilTextboxCloses WalkNorth 0x0040 SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetEntityPositionRelative 0x01e8, 0x0028 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08014D96: @ Before hyrule town entry @@ -53,12 +53,12 @@ script_08014D96: JumpIfNot script_08014D96 SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems MessageNoOverlap TEXT_PROLOGUE, 0x14 WaitUntilTextboxCloses WalkNorth 0x0018 SetLocalFlag SOUGEN_01_ZELDA - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index f6b42f78..16bebcaf 100644 --- a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -33,7 +33,7 @@ SCRIPT_START script_ZeldaTalkToSmith Wait 0x001e BeginBlock SetGlobalFlag START - Call sub_0807DF50 + Call EnablePauseMenu Call ResetPlayerAnimationAndAction EnablePlayerControl EndBlock diff --git a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc index b2f0d8f3..be79b6e2 100644 --- a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc +++ b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc @@ -8,7 +8,7 @@ script_08008E12: JumpIfNot script_08008E12 SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems _0807F0B4 0x0001 CameraTargetEntity WaitForPlayerEnterRoom @@ -70,7 +70,7 @@ script_08008E12: CameraTargetPlayer SetGlobalFlag TABIDACHI Call sub_0806DCC0 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc index 56c562d3..21c34c99 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc @@ -1,7 +1,7 @@ @ Intro Hyrule Castle Player Sleeping SCRIPT_START script_PlayerWakingUpInHyruleCastle BeginBlock - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetPlayerIdle SetLocalFlag CASTLE_04_MEZAME EndBlock @@ -16,6 +16,6 @@ script_08009EA4: Wait 0x000a Call sub_08053250 EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc index 558ff346..074c3e75 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc @@ -1,20 +1,20 @@ -@ Intro Outside Castle OBJECT_69 1? +@ Intro Outside Castle CUTSCENE_ORCHESTRATOR 1? SCRIPT_START script_080157AC CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot script_080157AC SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_080157DA: CheckPlayerInRegion 0x0250, 0x0230, 0x3040 JumpIfNot script_080157DA SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call CreatePlayerExclamationMark Wait 0x003c SetSyncFlag 0x00000001 @@ -37,7 +37,7 @@ script_080157DA: WaitUntilTextboxCloses SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Call sub_08066F94 SetSyncFlag 0x00000008 @@ -49,7 +49,7 @@ script_08015888: ComparePlayerAction PLAYER_SLEEP JumpIf script_08015888 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems _0807F0B4 0x0002 SetEntityPositionRelative 0x0248, 0x0208 CameraTargetEntity @@ -59,14 +59,14 @@ script_08015888: WaitUntilTextboxCloses SetSyncFlag 0x00000008 Wait 0x0078 - _0807E8E4_2 + _0807E8E4_2 MessageFromTargetPos TEXT_PROLOGUE, 0x68, 0x0002 WaitUntilTextboxCloses SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 SetLocalFlag SOUGEN_06_AKINDO Call sub_08066FB8 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc index f56416aa..28987c7e 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc @@ -1,4 +1,4 @@ -@ OBJECT_6A in sub_080954AC ? businessScrubPrologue? +@ CUTSCENE_MISC_OBJECT in sub_080954AC ? businessScrubPrologue? SCRIPT_START script_08015B14 BeginBlock SetAnimation 0x0018 diff --git a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc index 96e7d0de..9e445dcd 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc @@ -1,4 +1,4 @@ -@ Intro Outside Castle OBJECT_69 2? +@ Intro Outside Castle CUTSCENE_ORCHESTRATOR 2? SCRIPT_START script_08015B34 EndBlock BeginBlock @@ -10,12 +10,12 @@ SCRIPT_START script_08015B34 EndBlock SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems MessageFromTargetPos TEXT_FESTIVAL, 0x06, 0x0002 WaitUntilTextboxCloses StartPlayerScript script_PlayerAtIntroBusinessScrub4 WaitForSyncFlagAndClear 0x00000004 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_08015B34 script_08015B7E: diff --git a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index fd4db7bc..0e44b4ea 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -57,7 +57,7 @@ script_08015A32: JumpIf script_08015A54 CheckEntityInteractType JumpIfNot script_08015A32 - EndBlock + EndBlock MessageFromTargetPos TEXT_PROLOGUE, 0x67, 0x0002 WaitUntilTextboxCloses Jump script_08015A32 diff --git a/data/scripts/cutscene/introCeremony/script_CutsceneMiscObjectMonsterFromChest.inc b/data/scripts/cutscene/introCeremony/script_CutsceneMiscObjectMonsterFromChest.inc new file mode 100644 index 00000000..2f81753f --- /dev/null +++ b/data/scripts/cutscene/introCeremony/script_CutsceneMiscObjectMonsterFromChest.inc @@ -0,0 +1,6 @@ +@ Intro Ceremony CUTSCENE_MISC_OBJECT Monster from Chest +SCRIPT_START script_CutsceneMiscObjectMonsterFromChest + WaitForSyncFlag 0x20000000 + Call sub_0809567C +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc b/data/scripts/cutscene/introCeremony/script_CutsceneMiscObjectSwordInChest.inc index 2932134e..18c227d5 100644 --- a/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc +++ b/data/scripts/cutscene/introCeremony/script_CutsceneMiscObjectSwordInChest.inc @@ -1,5 +1,5 @@ -@ Intro Ceremony OBJECT_6A Sword in Chest -SCRIPT_START script_Object6ASwordInChest +@ Intro Ceremony CUTSCENE_MISC_OBJECT Sword in Chest +SCRIPT_START script_CutsceneMiscObjectSwordInChest BeginBlock Call sub_08095330 EndBlock diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index 41c30e2c..1aa6c7fa 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -30,7 +30,7 @@ SCRIPT_START script_Npc4EMonsters Call NPC4E_SaveEquippedItems Call SetPlayerActionNormal CallWithArg EquipItem, ITEM_SHIELD - CallWithArg SetInputMacro, gUnk_080049F6 + CallWithArg SetPlayerMacro, gUnk_080049F6 _0807F0B4 0x0001 SetEntityPositionRelative 0x01f8, 0x0068 SetSyncFlag 0x00000004 @@ -41,7 +41,7 @@ SCRIPT_START script_Npc4EMonsters PlaySound SFX_1C3 SetSyncFlag 0x20000000 Wait 0x0078 - CallWithArg SetInputMacro, 0x00000000 + CallWithArg SetPlayerMacro, 0x00000000 Call NPC4E_RestoreEquippedItems SetSyncFlag 0x40000000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index ceb2a7d6..d9a9df96 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -10,11 +10,11 @@ SCRIPT_START script_Npc4EVaatiAttacking Call NPC4E_SaveEquippedItems Call SetPlayerActionNormal CallWithArg EquipItem, ITEM_SHIELD - CallWithArg SetInputMacro, gUnk_080049F6 + CallWithArg SetPlayerMacro, gUnk_080049F6 Wait 0x001e SetSyncFlag 0x00000100 WaitForSyncFlagAndClear 0x00000200 - CallWithArg SetInputMacro, 0x00000000 + CallWithArg SetPlayerMacro, 0x00000000 Call NPC4E_RestoreEquippedItems Wait 0x003c SetSyncFlag 0x08000000 diff --git a/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc b/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc deleted file mode 100644 index 786aa81e..00000000 --- a/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc +++ /dev/null @@ -1,6 +0,0 @@ -@ Intro Ceremony OBJECT_6A Monster from Chest -SCRIPT_START script_Object6AMonsterFromChest - WaitForSyncFlag 0x20000000 - Call sub_0809567C -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc b/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc index 03506c59..c0bd8053 100644 --- a/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc @@ -1,4 +1,4 @@ -@ Intro Ceremony OBJECT_6A Zelda shine or something? +@ Intro Ceremony CUTSCENE_MISC_OBJECT Zelda shine or something? SCRIPT_START script_ZeldaMagic WaitForSyncFlag 0x40000000 DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc b/data/scripts/cutscene/introTown/script_CutsceneOrchestratorIntroTown.inc index 126b882c..0fff2007 100644 --- a/data/scripts/cutscene/introTown/script_Object69IntroTown.inc +++ b/data/scripts/cutscene/introTown/script_CutsceneOrchestratorIntroTown.inc @@ -1,5 +1,5 @@ -@ Intro Hyrule Town OBJECT_69 ? -SCRIPT_START script_Object69IntroTown +@ Intro Hyrule Town CUTSCENE_ORCHESTRATOR ? +SCRIPT_START script_CutsceneOrchestratorIntroTown CheckLocalFlag MACHI_01_DEMO JumpIf script_0800FD50 WaitForSyncFlagAndClear 0x00000010 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc index e0d5f3de..cd6a0d9b 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EIntroCastle SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerIntroCastle WaitForSyncFlagAndClear 0x00000400 SetInventoryValue ITEM_QST_SWORD, 0x0002 diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index 88fb3f40..0a7ccb4a 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Npc4EIntroTown CheckLocalFlag MACHI_01_DEMO JumpIf script_0800FA4C SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x00c8, 0x0148 Call sub_0807F844 SetFadeTime 0x0002 @@ -29,12 +29,12 @@ SCRIPT_START script_Npc4EIntroTown @ Zelda ran off. Give control to the player _0807F0B4 0x0004 CameraTargetPlayer - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetSyncFlag 0x00000010 WaitForSyncFlagAndClear 0x00000004 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerIntro2 WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x00000002 @@ -43,11 +43,11 @@ SCRIPT_START script_Npc4EIntroTown WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl WaitForSyncFlagAndClear 0x00000004 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerIntro3 WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x00000002 @@ -56,11 +56,11 @@ SCRIPT_START script_Npc4EIntroTown WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl WaitForSyncFlagAndClear 0x00000004 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerIntro4 WaitForSyncFlagAndClear 0x00000001 SetSyncFlag 0x00000002 @@ -69,12 +69,12 @@ SCRIPT_START script_Npc4EIntroTown WaitUntilTextboxCloses SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000004 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl @ Wait for Link at Pina WaitForSyncFlagAndClear 0x00000004 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call sub_08063C5C PlaySound SFX_CUCCO_MINIGAME_BELL Wait 0x001e @@ -92,7 +92,7 @@ SCRIPT_START script_Npc4EIntroTown WaitForSyncFlagAndClear 0x00000001 MessageFromTargetPos TEXT_PROLOGUE, 0x22, 0x000e WaitUntilTextboxCloses - _0807E8E4_0 + _0807E8E4_0 Call sub_08063C14 Call sub_08094CDC Wait 0x001e @@ -120,13 +120,13 @@ SCRIPT_START script_Npc4EIntroTown Call sub_08063C74 Wait 0x003c Call sub_08063C14 - _0807E8E4_0 + _0807E8E4_0 MessageFromTargetPos TEXT_PROLOGUE, 0x28, 0x000e WaitUntilTextboxCloses - _0807E8E4_1 + _0807E8E4_1 MessageFromTargetPos TEXT_PROLOGUE, 0x29, 0x0000 WaitUntilTextboxCloses - _0807E8E4_0 + _0807E8E4_0 MessageFromTargetPos TEXT_PROLOGUE, 0x2a, 0x000e WaitUntilTextboxCloses Call sub_08063C14 @@ -152,14 +152,14 @@ SCRIPT_START script_Npc4EIntroTown CallWithArg EquipItem, ITEM_SHIELD SetIntVariable 0x000000ff Call sub_0807F5B0 - CallWithArg SetInputMacro, gUnk_080049D6 + CallWithArg SetPlayerMacro, gUnk_080049D6 Wait 0x00b7 SetIntVariable 0x00000000 Call sub_0807F5B0 MessageFromTargetPos TEXT_PROLOGUE, 0x2c, 0x0000 WaitUntilTextboxCloses @ Give control back to the player - CallWithArg SetInputMacro, 0x00000000 + CallWithArg SetPlayerMacro, 0x00000000 Call NPC4E_RestoreEquippedItems _0807F0B4 0x0004 CameraTargetPlayer @@ -167,7 +167,7 @@ SCRIPT_START script_Npc4EIntroTown SetSyncFlag 0x00000002 Call sub_08063C44 SetLocalFlag MACHI_01_DEMO - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_0800FA4C: DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index b836eab4..fa1a008d 100644 --- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -100,7 +100,7 @@ script_0800F2EA: SetAnimation 0x0008 MessageFromTargetPos TEXT_MINISH2, 0x08, 0x000c WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_0800F1E6 script_0800F314: EndBlock diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc index 8f5da1bd..747f8a64 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc @@ -23,12 +23,12 @@ script_0800F3EA: BeginBlock CheckEntityInteractType JumpIfNot script_0800F402 - EndBlock - SetPlayerIdle - FacePlayer + EndBlock + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_MINISH2, 0x37 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl script_0800F402: CheckSyncFlagAndClear 0x00000004 JumpIfNot script_0800F3EA diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc index 344d2556..e181fe47 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc @@ -22,12 +22,12 @@ script_0800F478: BeginBlock CheckEntityInteractType JumpIfNot script_0800F490 - EndBlock - SetPlayerIdle - FacePlayer + EndBlock + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_MINISH2, 0x38 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl script_0800F490: CheckSyncFlagAndClear 0x00000008 JumpIfNot script_0800F478 diff --git a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc index 3714f838..18cb648c 100644 --- a/data/scripts/cutscene/kinstones/script_KidKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc @@ -22,12 +22,12 @@ script_0800F50C: BeginBlock CheckEntityInteractType JumpIfNot script_0800F524 - EndBlock - SetPlayerIdle - FacePlayer + EndBlock + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_MINISH2, 0x39 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl script_0800F524: CheckSyncFlagAndClear 0x00000010 JumpIfNot script_0800F50C diff --git a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc index b3ba7abc..952b62d8 100644 --- a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc @@ -9,7 +9,7 @@ script_0800F09A: JumpIfNot script_0800F09A SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems LoadRoomEntityList gUnk_080EE8AC StartPlayerScript script_PlayerAtFirstKinstone WaitForSyncFlagAndClear 0x00000001 @@ -18,7 +18,7 @@ script_0800F09A: MessageFromTargetPos TEXT_MINISH2, 0x01, 0x000c WaitUntilTextboxCloses WaitForSyncFlagAndClear 0x000003c0 - _0807E8E4_0 + _0807E8E4_0 MessageFromTargetPos TEXT_MINISH2, 0x02, 0x000c WaitUntilTextboxCloses GivePlayerItem ITEM_KINSTONE_BAG @@ -29,19 +29,19 @@ script_0800F09A: MessageFromTargetPos TEXT_MINISH2, 0x03, 0x000c WaitUntilTextboxCloses SetSyncFlag 0x00000002 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl WaitForSyncFlagAndClear 0x00000040 script_0800F11A: CheckKinstoneFused KINSTONE_32 JumpIfNot script_0800F11A SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetSyncFlag 0x0000001e Wait 0x003c _0807E8E4_1 WaitForSyncFlagAndClear 0x000003c0 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc b/data/scripts/cutscene/minishVillage/script_CutsceneOrchestratorVillageIntro.inc index 85224902..77cf5424 100644 --- a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_CutsceneOrchestratorVillageIntro.inc @@ -1,5 +1,5 @@ -@ Minish Village OBJECT_69 Intro Cutscene? -SCRIPT_START script_Object69VillageIntro +@ Minish Village CUTSCENE_ORCHESTRATOR Intro Cutscene? +SCRIPT_START script_CutsceneOrchestratorVillageIntro BeginBlock SetAnimationState 0x0004 SetEntitySpeed 0x0300 @@ -9,7 +9,7 @@ script_0800C928: JumpIfNot script_0800C928 SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtVillageIntro WaitForSyncFlagAndClear 0x00000002 Wait 0x003c @@ -39,7 +39,7 @@ script_0800C928: Wait 0x003c SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00000400 - _0807E8E4_0 + _0807E8E4_0 MessageFromTarget TEXT_FINDING_EZLO, 0x26 Call CreatePlayerQuestionMark WaitUntilTextboxCloses @@ -55,12 +55,12 @@ script_0800C928: WaitForSyncFlagAndClear 0x00040000 SetSyncFlag 0x00008000 WaitForSyncFlagAndClear 0x00010000 - _0807E8E4_3 + _0807E8E4_3 MessageFromTarget TEXT_FINDING_EZLO, 0x27 WaitUntilTextboxCloses SetSyncFlag 0x00002000 WaitForSyncFlagAndClear 0x00004000 - _0807E8E4_1 + _0807E8E4_1 MessageFromTarget TEXT_FINDING_EZLO, 0x28 WaitUntilTextboxCloses SetSyncFlag 0x00000200 @@ -77,7 +77,7 @@ script_0800C928: EzloMessage TEXT_FINDING_EZLO, 0x29 WaitUntilTextboxCloses SetLocalFlag 0x008d - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc index 786b7314..4055742b 100644 --- a/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectDarkMagic.inc @@ -1,5 +1,5 @@ -@ Ezlo Cutscene OBJECT_6A dark magic -SCRIPT_START script_Object6ADarkMagic +@ Ezlo Cutscene CUTSCENE_MISC_OBJECT dark magic +SCRIPT_START script_CutsceneMiscObjectDarkMagic BeginBlock SetAnimation 0x0000 SetEntitySpeed 0x0200 diff --git a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc index e2bdafd8..2bc226f6 100644 --- a/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneMiscObjectMinishCap.inc @@ -1,5 +1,5 @@ -@ Ezlo Cutscene OBJECT_6A Minish Cap -SCRIPT_START script_Object6AMinishCap +@ Ezlo Cutscene CUTSCENE_MISC_OBJECT Minish Cap +SCRIPT_START script_CutsceneMiscObjectMinishCap BeginBlock DoPostScriptAction 0x0007 SetEntitySpeed 0x0040 diff --git a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorCameraTarget.inc index 71f644a8..d40c6efb 100644 --- a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorCameraTarget.inc @@ -1,5 +1,5 @@ -@ Ezlo Cutscene OBJECT_69 Camera Target? -SCRIPT_START script_Object69CameraTarget +@ Ezlo Cutscene CUTSCENE_ORCHESTRATOR Camera Target? +SCRIPT_START script_CutsceneOrchestratorCameraTarget SetSyncFlag 0x00000800 WaitForSyncFlagAndClear 0x00001000 PlaySound SFX_125 diff --git a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc index 7260dc62..e18c6468 100644 --- a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorMinishVaati.inc @@ -1,5 +1,5 @@ -@ Ezlo Cutscene OBJECT_69 MinishVaati -SCRIPT_START script_Object69MinishVaati +@ Ezlo Cutscene CUTSCENE_ORCHESTRATOR MinishVaati +SCRIPT_START script_CutsceneOrchestratorMinishVaati BeginBlock _0807F0B4 0x0007 SetEntityPositionRelative 0x0078, 0x0068 diff --git a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc index f698efd0..a51f7c15 100644 --- a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc +++ b/data/scripts/cutscene/originStory/script_CutsceneOrchestratorVaatiAppears.inc @@ -1,5 +1,5 @@ -@ Outside Castle OBJECT_69 Vaati appearance -SCRIPT_START script_Object69VaatiAppears +@ Outside Castle CUTSCENE_ORCHESTRATOR Vaati appearance +SCRIPT_START script_CutsceneOrchestratorVaatiAppears BeginBlock SetEntityPositionRelative 0x01f8, 0x00e0 Call sub_08054564 @@ -9,7 +9,7 @@ script_08014FCC: JumpIfNot script_08014FCC SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StopBgm _0807F0B4 0x0001 CameraTargetEntity @@ -70,7 +70,7 @@ script_08014FCC: Wait 0x000a LoadRoomEntityList gUnk_080F7FC0 PlayBgm BGM_FIGHT_THEME - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08015104: CheckRoomFlag 0x0000 @@ -78,7 +78,7 @@ script_08015104: @ Defeated Moblins SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StopBgm StartPlayerScript script_PlayerDefeatedMoblins WaitForSyncFlagAndClear 0x00000001 @@ -143,7 +143,7 @@ script_08015104: CameraTargetPlayer Call sub_08054570 PlayBGM - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_Vaati.inc b/data/scripts/cutscene/originStory/script_Vaati.inc index 7028936b..1cfdea96 100644 --- a/data/scripts/cutscene/originStory/script_Vaati.inc +++ b/data/scripts/cutscene/originStory/script_Vaati.inc @@ -30,7 +30,7 @@ SCRIPT_START script_Vaati WaitForSyncFlagAndClear 0x00000800 SetAnimationState 0x0004 DoPostScriptAction 0x0014 - CallWithArg sub_0809545C, script_Object6ADarkMagic + CallWithArg sub_0809545C, script_CutsceneMiscObjectDarkMagic PlaySound SFX_1C4 Wait 0x0078 DoPostScriptAction 0x0016 diff --git a/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectEzloDismounting.inc index 322badb2..94da24a2 100644 --- a/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectEzloDismounting.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Ezlo moving from Links head -SCRIPT_START script_Object6AEzloDismounting +@ Outro CUTSCENE_MISC_OBJECT Ezlo moving from Links head +SCRIPT_START script_CutsceneMiscObjectEzloDismounting BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b diff --git a/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectEzloFinalMagic.inc index 1ec52e42..3ebbb8de 100644 --- a/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectEzloFinalMagic.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Ezlo final magic shrinking -SCRIPT_START script_Object6AEzloFinalMagic +@ Outro CUTSCENE_MISC_OBJECT Ezlo final magic shrinking +SCRIPT_START script_CutsceneMiscObjectEzloFinalMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b diff --git a/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc index b9e0c5ff..6888f3eb 100644 --- a/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectMinishCapOutro.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Minish Cap -SCRIPT_START script_Object6AMinishCapOutro +@ Outro CUTSCENE_MISC_OBJECT Minish Cap +SCRIPT_START script_CutsceneMiscObjectMinishCapOutro BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 @@ -10,7 +10,7 @@ SCRIPT_START script_Object6AMinishCapOutro WaitForSyncFlagAndClear 0x00000008 PlaySound SFX_SPARKLES ClearSyncFlag 0x00000800 - CallWithArg sub_080960C4, script_Object6AEzloDismounting + CallWithArg sub_080960C4, script_CutsceneMiscObjectEzloDismounting SetAnimation 0x0002 Call sub_08094B0C _0807EDD4 0x0068, 0x0088 diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok1.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok1.inc index 4ee080a3..bd05025c 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok1.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok1.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Octorok 1 -SCRIPT_START script_Object6AOctorok1 +@ Outro CUTSCENE_MISC_OBJECT Octorok 1 +SCRIPT_START script_CutsceneMiscObjectOctorok1 BeginBlock SetAnimationState 0x0002 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok2.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok2.inc index 83c0bd16..895d4380 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok2.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok2.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Octorok 2 -SCRIPT_START script_Object6AOctorok2 +@ Outro CUTSCENE_MISC_OBJECT Octorok 2 +SCRIPT_START script_CutsceneMiscObjectOctorok2 BeginBlock SetAnimationState 0x0004 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok3.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok3.inc index abacdb6f..a82a9f9a 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok3.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok3.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Octorok 3 -SCRIPT_START script_Object6AOctorok3 +@ Outro CUTSCENE_MISC_OBJECT Octorok 3 +SCRIPT_START script_CutsceneMiscObjectOctorok3 BeginBlock SetAnimationState 0x0000 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_Object6AOctorok4.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok4.inc index f52e72f8..6c524c65 100644 --- a/data/scripts/cutscene/outro/script_Object6AOctorok4.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok4.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Octorok 4 -SCRIPT_START script_Object6AOctorok4 +@ Outro CUTSCENE_MISC_OBJECT Octorok 4 +SCRIPT_START script_CutsceneMiscObjectOctorok4 BeginBlock SetAnimationState 0x0006 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_Object6ATektite1.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite1.inc index 9a83a445..b555f6a6 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite1.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite1.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Tektite 1 -SCRIPT_START script_Object6ATektite1 +@ Outro CUTSCENE_MISC_OBJECT Tektite 1 +SCRIPT_START script_CutsceneMiscObjectTektite1 BeginBlock SetAnimationState 0x0002 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_Object6ATektite2.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite2.inc index 417ac068..0b83e353 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite2.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite2.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Tektite 2 -SCRIPT_START script_Object6ATektite2 +@ Outro CUTSCENE_MISC_OBJECT Tektite 2 +SCRIPT_START script_CutsceneMiscObjectTektite2 BeginBlock SetAnimationState 0x0004 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_Object6ATektite3.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite3.inc index 6f877941..bc2a4e2f 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite3.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite3.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Tektite 3 -SCRIPT_START script_Object6ATektite3 +@ Outro CUTSCENE_MISC_OBJECT Tektite 3 +SCRIPT_START script_CutsceneMiscObjectTektite3 BeginBlock SetAnimationState 0x0000 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_Object6ATektite4.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite4.inc index 94669abf..517fb04b 100644 --- a/data/scripts/cutscene/outro/script_Object6ATektite4.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite4.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Tektite 4 -SCRIPT_START script_Object6ATektite4 +@ Outro CUTSCENE_MISC_OBJECT Tektite 4 +SCRIPT_START script_CutsceneMiscObjectTektite4 BeginBlock SetAnimationState 0x0006 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTheLittleHat.inc index 248601ee..344977a4 100644 --- a/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTheLittleHat.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A The Little Hat (Green) -SCRIPT_START script_Object6ATheLittleHat +@ Outro CUTSCENE_MISC_OBJECT The Little Hat (Green) +SCRIPT_START script_CutsceneMiscObjectTheLittleHat BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectZeldaMagic.inc index 612c3676..2dff8b77 100644 --- a/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc +++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectZeldaMagic.inc @@ -1,5 +1,5 @@ -@ Outro OBJECT_6A Zelda glowing? -SCRIPT_START script_Object6AZeldaMagic +@ Outro CUTSCENE_MISC_OBJECT Zelda glowing? +SCRIPT_START script_CutsceneMiscObjectZeldaMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b diff --git a/data/scripts/cutscene/outro/script_EzloCapOutro.inc b/data/scripts/cutscene/outro/script_EzloCapOutro.inc index 3151f9ac..5d0daa98 100644 --- a/data/scripts/cutscene/outro/script_EzloCapOutro.inc +++ b/data/scripts/cutscene/outro/script_EzloCapOutro.inc @@ -15,7 +15,7 @@ SCRIPT_START script_EzloCapOutro DoPostScriptAction 0x0007 PlaySound SFX_SPARKLES ClearSyncFlag 0x00000800 - CallWithArg sub_080960C4, script_Object6AEzloDismounting + CallWithArg sub_080960C4, script_CutsceneMiscObjectEzloDismounting Wait 0x003c _0807EDD4 0x0088, 0x0068 Wait 0x0078 diff --git a/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc index 59336b95..3bdb84c3 100644 --- a/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc +++ b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc @@ -1,4 +1,4 @@ -@ Outro OBJECT_6A Ezlo and Zelda magic +@ Outro CUTSCENE_MISC_OBJECT Ezlo and Zelda magic SCRIPT_START script_EzloZeldaMagic BeginBlock DoPostScriptAction 0x0007 diff --git a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc index db38ceb7..abe8787a 100644 --- a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc @@ -33,7 +33,7 @@ SCRIPT_START script_MinishEzloGoodbye Call WaitForAnimDone SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 - CallWithArg sub_080960C4, script_Object6AEzloFinalMagic + CallWithArg sub_080960C4, script_CutsceneMiscObjectEzloFinalMagic SetAnimation 0x0012 Call WaitForAnimDone Wait 0x001e diff --git a/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc index 0b71e502..932856b9 100644 --- a/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc +++ b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EDHCEntrance BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x0198, 0x01c8 Call sub_0807F844 EndBlock diff --git a/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc index 793d59c2..c7a29ddd 100644 --- a/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc +++ b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EDHCThrone BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x0088, 0x0068 Call sub_0807F844 EndBlock diff --git a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc index 443859c8..a802c19a 100644 --- a/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc +++ b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EFixedEverything BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 _0807E8E4_3 diff --git a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc index e974cfe8..7501d914 100644 --- a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc +++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EHyruleCastleEntrance BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x00d8, 0x01c8 Call sub_0807F844 PlaySound SFX_APPARATE diff --git a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc index 9509aee2..1b69617f 100644 --- a/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc +++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EHyruleCastleThrone BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x0088, 0x0070 Call sub_0807F844 PlaySound SFX_APPARATE diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc index 4ad2e6eb..d6887242 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc @@ -64,7 +64,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing SetSyncFlag 0x80000000 SetFade4 WaitForFadeFinish - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc index 1e34a26f..1d024a10 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EMinishWoods BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x0378, 0x0178 Call sub_0807F844 EndBlock diff --git a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc index 91889416..b20394c2 100644 --- a/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EMtCrenel BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x0128, 0x0058 Call sub_0807F844 EndBlock diff --git a/data/scripts/cutscene/outro/script_Npc4EOutro.inc b/data/scripts/cutscene/outro/script_Npc4EOutro.inc index bb1c0e42..218448f7 100644 --- a/data/scripts/cutscene/outro/script_Npc4EOutro.inc +++ b/data/scripts/cutscene/outro/script_Npc4EOutro.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EOutro BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x0088, 0x0080 Call sub_0807F844 _0807E8E4_3 diff --git a/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc index 2b2e2bb6..1dc735ec 100644 --- a/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc +++ b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4ESanctuaryEntrance BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x0088, 0x0148 Call sub_0807F844 EndBlock diff --git a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc index c3879751..05176a82 100644 --- a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc +++ b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Npc4EUnfreezeCastleStaff BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetEntityPositionRelative 0x00f8, 0x01b8 Call sub_0807F844 EndBlock diff --git a/data/scripts/cutscene/outro/script_ZeldaOutro.inc b/data/scripts/cutscene/outro/script_ZeldaOutro.inc index 92bbcf27..8c4c8e95 100644 --- a/data/scripts/cutscene/outro/script_ZeldaOutro.inc +++ b/data/scripts/cutscene/outro/script_ZeldaOutro.inc @@ -29,7 +29,7 @@ SCRIPT_START script_ZeldaOutro SetAnimationState 0x0004 DoPostScriptAction 0x0000 PlaySound SFX_SPARKLES - CallWithArg sub_080960C4, script_Object6AZeldaMagic + CallWithArg sub_080960C4, script_CutsceneMiscObjectZeldaMagic SetSyncFlag 0x00000080 WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_143 diff --git a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc b/data/scripts/cutscene/reveal/script_MinishVillageObjectPictureBackRoom.inc index 0dd4a2c3..d43fdf38 100644 --- a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc +++ b/data/scripts/cutscene/reveal/script_MinishVillageObjectPictureBackRoom.inc @@ -1,10 +1,10 @@ -@ Sanctuary OBJECT_3E Look at picture in back room -SCRIPT_START script_Object3EPictureBackRoom +@ Sanctuary MINISH_VILLAGE_OBJECT Look at picture in back room +SCRIPT_START script_MinishVillageObjectPictureBackRoom CheckPlayerInRegion 0x0098, 0x0038, 0x2060 - JumpIfNot script_Object3EPictureBackRoom + JumpIfNot script_MinishVillageObjectPictureBackRoom SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtPicture WaitForSyncFlagAndClear 0x00000002 EzloMessage TEXT_VAATI2, 0x01 @@ -23,7 +23,7 @@ SCRIPT_START script_Object3EPictureBackRoom CameraTargetEntity Call sub_080536B8 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems WaitForFadeFinish MessageFromTargetPos TEXT_VAATI2, 0x02, 0x000c WaitUntilTextboxCloses @@ -65,7 +65,7 @@ SCRIPT_START script_Object3EPictureBackRoom SetLocalFlag 0x0078 PlayBgm BGM_CASTLE_COLLAPSE SetGlobalFlag SEIIKI_BGM - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/takeover/script_Object69Takeover.inc b/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeover.inc index 6c4419f4..de38ef92 100644 --- a/data/scripts/cutscene/takeover/script_Object69Takeover.inc +++ b/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeover.inc @@ -1,5 +1,5 @@ -@ Western Wood OBJECT_69 Cutscene -SCRIPT_START script_Object69Takeover +@ Western Wood CUTSCENE_ORCHESTRATOR Cutscene +SCRIPT_START script_CutsceneOrchestratorTakeover BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -8,7 +8,7 @@ script_08015BF0: JumpIfNot script_08015BF0 SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call sub_0807FBC4 StartPlayerScript script_PlayerAtTakeover WaitForSyncFlagAndClear 0x00000100 @@ -34,7 +34,7 @@ script_08015BF0: WaitUntilTextboxCloses SetLocalFlag SOUGEN_08_TORITSUKI Call sub_0807FBCC - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc b/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc index 0503d6ce..0ea36fde 100644 --- a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc +++ b/data/scripts/cutscene/takeover/script_CutsceneOrchestratorTakeoverCutscene.inc @@ -1,5 +1,5 @@ -@ Western Wood Cutscene OBJECT_69 in Castle -SCRIPT_START script_Object69TakeoverCutscene +@ Western Wood Cutscene CUTSCENE_ORCHESTRATOR in Castle +SCRIPT_START script_CutsceneOrchestratorTakeoverCutscene BeginBlock _0807F0B4 0x0007 SetEntityPositionRelative 0x0088, 0x0068 |