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 | |
| parent | ccba86d292a0e4c8a0e07325ac4fb25e5a58dc89 (diff) | |
Rename objects
Diffstat (limited to 'data/scripts')
265 files changed, 696 insertions, 696 deletions
diff --git a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc index 0374c53f..874dff2a 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc @@ -12,7 +12,7 @@ script_0800B268: SetPlayerIdle CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_LEFT JumpIf script_0800B2E2 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800B268 .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc index d6a16ee9..7abd69e1 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc @@ -12,7 +12,7 @@ script_0800B298: SetPlayerIdle CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_MIDDLE JumpIf script_0800B2E2 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800B298 .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc index 7c2c12b9..c4549d85 100644 --- a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc @@ -12,7 +12,7 @@ script_0800B2C8: SetPlayerIdle CheckKinstoneFused KINSTONE_CASTOR_WILDS_STATUE_RIGHT JumpIf script_0800B2E2 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800B2C8 script_0800B2E2: diff --git a/data/scripts/castorWilds/script_Object69.inc b/data/scripts/castorWilds/script_CutsceneOrchestrator.inc index d0f00c78..d64f1ee5 100644 --- a/data/scripts/castorWilds/script_Object69.inc +++ b/data/scripts/castorWilds/script_CutsceneOrchestrator.inc @@ -1,5 +1,5 @@ -@ Castor Wilds OBJECT_69? -SCRIPT_START script_Object69 +@ Castor Wilds CUTSCENE_ORCHESTRATOR? +SCRIPT_START script_CutsceneOrchestrator BeginBlock SetSyncFlag 0x00000000 CheckLocalFlag HIKYOU_00_SEKIZOU @@ -8,13 +8,13 @@ SCRIPT_START script_Object69 EndBlock script_0800B216: WaitForSyncFlagAndClear 0x00000001 - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems MoveEntityToPlayer CameraTargetEntity _0807EDD4 0x0068, 0x0380 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 - Call sub_0807DF50 + Call EnablePauseMenu Wait 0x000c CameraTargetPlayer Wait 0x0008 diff --git a/data/scripts/castorWilds/script_Object69DarknutFight.inc b/data/scripts/castorWilds/script_CutsceneOrchestratorDarknutFight.inc index 3e4bcff0..c68e4894 100644 --- a/data/scripts/castorWilds/script_Object69DarknutFight.inc +++ b/data/scripts/castorWilds/script_CutsceneOrchestratorDarknutFight.inc @@ -1,7 +1,7 @@ -@ Castor Wilds OBJECT_69 darknut fight for kinstone piece -SCRIPT_START script_Object69DarknutFight +@ Castor Wilds CUTSCENE_ORCHESTRATOR darknut fight for kinstone piece +SCRIPT_START script_CutsceneOrchestratorDarknutFight BeginBlock - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetLocalFlag 0x0039 SetPlayerIdle EndBlock @@ -15,6 +15,6 @@ SCRIPT_START script_Object69DarknutFight PlayBgm BGM_FIGHT_THEME EzloMessage TEXT_TREASURE_GUARDIAN, 0x01 EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_GreatFairyRupees.inc b/data/scripts/castorWilds/script_GreatFairyRupees.inc index eaaf8aa3..b9374fa2 100644 --- a/data/scripts/castorWilds/script_GreatFairyRupees.inc +++ b/data/scripts/castorWilds/script_GreatFairyRupees.inc @@ -1,4 +1,4 @@ -@ Lake Hylia Great Fairy OBJECT_69 +@ Lake Hylia Great Fairy CUTSCENE_ORCHESTRATOR SCRIPT_START script_GreatFairyRupees BeginBlock EndBlock diff --git a/data/scripts/castorWilds/script_MalonAtRanch.inc b/data/scripts/castorWilds/script_MalonAtRanch.inc index af08ade6..e8e545cc 100644 --- a/data/scripts/castorWilds/script_MalonAtRanch.inc +++ b/data/scripts/castorWilds/script_MalonAtRanch.inc @@ -8,10 +8,10 @@ SCRIPT_START script_MalonAtRanch script_0800B5FA: CheckEntityInteractType JumpIfNot script_0800B5FA - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_LON_LON, 0x09 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 Jump script_0800B5FA diff --git a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc b/data/scripts/cloudTops/script_CutsceneMiscObjectMysteriousCloud.inc index 686d63dd..8d3bd190 100644 --- a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc +++ b/data/scripts/cloudTops/script_CutsceneMiscObjectMysteriousCloud.inc @@ -1,5 +1,5 @@ -@ Cloud Tops OBJECT_6A Mysterious Cloud -SCRIPT_START script_Object6AMysteriousCloud +@ Cloud Tops CUTSCENE_MISC_OBJECT Mysterious Cloud +SCRIPT_START script_CutsceneMiscObjectMysteriousCloud BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x0011 diff --git a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc index 8053cca1..f2ee4050 100644 --- a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc @@ -1,5 +1,5 @@ -@ Cloud Tops OBJECT_69 great whirlwind revealed -SCRIPT_START script_Object69GreatWhirlwindRevealed +@ Cloud Tops CUTSCENE_ORCHESTRATOR great whirlwind revealed +SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed BeginBlock Call SetPriorityHighest SetEntitySpeed 0x0700 @@ -18,7 +18,7 @@ SCRIPT_START script_Object69GreatWhirlwindRevealed CameraTargetPlayer Call sub_0807FBCC EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_EzloTalkPoW.inc b/data/scripts/cloudTops/script_EzloTalkPoW.inc index bfbb2d42..a0f641f9 100644 --- a/data/scripts/cloudTops/script_EzloTalkPoW.inc +++ b/data/scripts/cloudTops/script_EzloTalkPoW.inc @@ -1,11 +1,11 @@ @ Ezlo talk after getting wind element SCRIPT_START script_EzloTalkPoW SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x05 WaitUntilTextboxCloses SetLocalFlagByBank FLAG_BANK_1, 0x0005 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc index 460e3969..1466280d 100644 --- a/data/scripts/cloudTops/script_GregalSick.inc +++ b/data/scripts/cloudTops/script_GregalSick.inc @@ -13,9 +13,9 @@ script_08014B48: JumpIf script_08014B70 CheckEntityInteractType JumpIfNot script_08014B48 - EndBlock - SetPlayerIdle - FacePlayer + EndBlock + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_WIND_TRIBE, 0x01 WaitUntilTextboxCloses Wait 0x000f @@ -24,7 +24,7 @@ script_08014B48: script_08014B70: EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetSyncFlag 0x00000001 DoPostScriptAction 0x0004 WaitForSyncFlagAndClear 0x00000002 @@ -45,7 +45,7 @@ script_08014B70: PlaySound SFX_SECRET SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08014BE8: SetAnimation 0x0010 diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index bec3df8e..7ee1968c 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -15,12 +15,12 @@ script_0800D636: _0807E9F0 Call sub_0806DAAC JumpIf script_0800D650 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800D636 script_0800D650: SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call sub_0807FBC4 Call sub_0807FBA0 SetEntitySpeed 0x0700 diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index 8f86a3a7..9a46581f 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -5,7 +5,7 @@ SCRIPT_START script_Npc4EKinstoneFused CameraTargetPlayer Call sub_0807FBCC EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu script_0800D6AE: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cloudTops/script_WindTribespeople6.inc b/data/scripts/cloudTops/script_WindTribespeople6.inc index 7e59ddc0..056361ae 100644 --- a/data/scripts/cloudTops/script_WindTribespeople6.inc +++ b/data/scripts/cloudTops/script_WindTribespeople6.inc @@ -14,10 +14,10 @@ SCRIPT_START script_WindTribespeople6 script_08014AAC: FacePlayerAndCheckDist JumpIfNot script_08014AAC - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_WIND_TRIBE, 0x0a WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_08014AAC .2byte 0x0000 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 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 diff --git a/data/scripts/fow/script_Object89Mazaal.inc b/data/scripts/fow/script_MazaalBossObjectMazaal.inc index 75e0eb0b..229c43e9 100644 --- a/data/scripts/fow/script_Object89Mazaal.inc +++ b/data/scripts/fow/script_MazaalBossObjectMazaal.inc @@ -1,5 +1,5 @@ -@ Mazaal OBJECT_89 -SCRIPT_START script_Object89Mazaal +@ Mazaal MAZAAL_BOSS_OBJECT +SCRIPT_START script_MazaalBossObjectMazaal BeginBlock EndBlock DisablePlayerControl diff --git a/data/scripts/graveyard/script_Object6AKingsGravestone.inc b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc index b8a09309..21c7d682 100644 --- a/data/scripts/graveyard/script_Object6AKingsGravestone.inc +++ b/data/scripts/graveyard/script_CutsceneMiscObjectKingsGravestone.inc @@ -1,5 +1,5 @@ -@ Graveyard OBJECT_6A Kings gravestone? or King ghost representation? -SCRIPT_START script_Object6AKingsGravestone +@ Graveyard CUTSCENE_MISC_OBJECT Kings gravestone? or King ghost representation? +SCRIPT_START script_CutsceneMiscObjectKingsGravestone BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_CutsceneOrchestratorCrowStealingKey.inc index 0608e6ef..3332a806 100644 --- a/data/scripts/graveyard/script_Object69CrowStealingKey.inc +++ b/data/scripts/graveyard/script_CutsceneOrchestratorCrowStealingKey.inc @@ -1,8 +1,8 @@ -@ Graveyard OBJECT_69 Crow stealing key cutscene -SCRIPT_START script_Object69CrowStealingKey +@ Graveyard CUTSCENE_ORCHESTRATOR Crow stealing key cutscene +SCRIPT_START script_CutsceneOrchestratorCrowStealingKey SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems PlaySound SFX_1F3 Call CreatePlayerQuestionMark _0807E8E4_1 @@ -23,7 +23,7 @@ SCRIPT_START script_Object69CrowStealingKey Wait 0x001e EzloMessage TEXT_DAMPE, 0x09 WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/graveyard/script_Object69GetKeyBack.inc b/data/scripts/graveyard/script_CutsceneOrchestratorGetKeyBack.inc index 222c1abf..4e3600bd 100644 --- a/data/scripts/graveyard/script_Object69GetKeyBack.inc +++ b/data/scripts/graveyard/script_CutsceneOrchestratorGetKeyBack.inc @@ -1,5 +1,5 @@ -@ Graveyard OBJECT_69 When getting the key back -SCRIPT_START script_Object69GetKeyBack +@ Graveyard CUTSCENE_ORCHESTRATOR When getting the key back +SCRIPT_START script_CutsceneOrchestratorGetKeyBack BeginBlock EndBlock script_080098D8: @@ -13,10 +13,10 @@ script_080098E0: SetLocalFlag HAKA_KEY_GET SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_DAMPE, 0x0a WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08009910: DoPostScriptAction 0x0006 diff --git a/data/scripts/graveyard/script_Gina.inc b/data/scripts/graveyard/script_Gina.inc index b463e667..392beb0a 100644 --- a/data/scripts/graveyard/script_Gina.inc +++ b/data/scripts/graveyard/script_Gina.inc @@ -10,8 +10,8 @@ SCRIPT_START script_Gina script_0800B934: CheckEntityInteractType JumpIfNot script_0800B934 - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageFromTarget TEXT_TINGLE, 0x19 WaitUntilTextboxCloses SetLocalFlag 0x005f @@ -20,9 +20,9 @@ script_0800B934: script_0800B94E: CheckEntityInteractType JumpIfNot script_0800B94E - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageFromTarget TEXT_TINGLE, 0x1a WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_0800B94E diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc index 1b69dfe4..b318103b 100644 --- a/data/scripts/graveyard/script_GraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc @@ -11,7 +11,7 @@ script_080096AC: JumpIfNot script_080096AC SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtGraveyardHouseDoor WaitForSyncFlagAndClear 0x00000001 PlaySound SFX_111 @@ -23,7 +23,7 @@ script_080096AC: script_080096EC: CheckGlobalFlag HAKA_KEY_LOST JumpIfNot script_080096EC - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_080096FC: Call sub_0808692C diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc index eec55eb1..1e95b4fd 100644 --- a/data/scripts/graveyard/script_GreatFairyArrows.inc +++ b/data/scripts/graveyard/script_GreatFairyArrows.inc @@ -1,4 +1,4 @@ -@ Graveyard Great Fairy OBJECT_69 +@ Graveyard Great Fairy CUTSCENE_ORCHESTRATOR SCRIPT_START script_GreatFairyArrows BeginBlock EndBlock @@ -16,7 +16,7 @@ script_0800B618: JumpIf script_0800B7A2 MessageNoOverlap TEXT_ITEM_GET, 0x83 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_0800B684 Wait 0x000f MessageNoOverlap TEXT_ITEM_GET, 0x84 @@ -48,6 +48,6 @@ script_0800B6A6: WaitForFadeFinish CameraTargetPlayer Wait 0x001e - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SCRIPT_END diff --git a/data/scripts/graveyard/script_Object97FirstCrow.inc b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc index 0c997c0f..267d3ca2 100644 --- a/data/scripts/graveyard/script_Object97FirstCrow.inc +++ b/data/scripts/graveyard/script_KeyStealingTakkuriFirstCrow.inc @@ -1,5 +1,5 @@ -@ Graveyard OBJECT_97 Crow stealing the key? first crow that makes link loose the key -SCRIPT_START script_Object97FirstCrow +@ Graveyard CAMERA_TARGET7 Crow stealing the key? first crow that makes link loose the key +SCRIPT_START script_CameraTarget7FirstCrow BeginBlock SetAnimation 0x0003 DoPostScriptAction 0x0007 diff --git a/data/scripts/graveyard/script_Object97SecondCrow.inc b/data/scripts/graveyard/script_KeyStealingTakkuriSecondCrow.inc index 169a3ff5..b628cccd 100644 --- a/data/scripts/graveyard/script_Object97SecondCrow.inc +++ b/data/scripts/graveyard/script_KeyStealingTakkuriSecondCrow.inc @@ -1,5 +1,5 @@ -@ Graveyard OBJECT_97 Crow stealing the key? Second crow that picks up the key -SCRIPT_START script_Object97SecondCrow +@ Graveyard CAMERA_TARGET7 Crow stealing the key? Second crow that picks up the key +SCRIPT_START script_CameraTarget7SecondCrow BeginBlock SetAnimation 0x0003 DoPostScriptAction 0x0007 diff --git a/data/scripts/graveyard/script_KingGustav.inc b/data/scripts/graveyard/script_KingGustav.inc index 4d921ed4..4f31f650 100644 --- a/data/scripts/graveyard/script_KingGustav.inc +++ b/data/scripts/graveyard/script_KingGustav.inc @@ -9,7 +9,7 @@ script_0800D962: JumpIfNot script_0800D962 SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtKingGustav WaitForSyncFlagAndClear 0x00000001 Wait 0x003c @@ -36,7 +36,7 @@ script_0800D962: PlaySound SFX_113 SetIntVariable 0x00000001 Call sub_0806DA1C - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc b/data/scripts/hyruleCastle/script_CutsceneOrchestratorSanctuaryEntrance.inc index 21539ca0..23e785e5 100644 --- a/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc +++ b/data/scripts/hyruleCastle/script_CutsceneOrchestratorSanctuaryEntrance.inc @@ -1,16 +1,16 @@ -@ Hyrule Castle OBJECT_69 Sanctuary Entrance -SCRIPT_START script_Object69SanctuaryEntrance +@ Hyrule Castle CUTSCENE_ORCHESTRATOR Sanctuary Entrance +SCRIPT_START script_CutsceneOrchestratorSanctuaryEntrance CheckPlayerInRegion 0x0088, 0x0048, 0x3030 - JumpIfNot script_Object69SanctuaryEntrance + JumpIfNot script_CutsceneOrchestratorSanctuaryEntrance SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtSanctuaryEntrance WaitForSyncFlagAndClear 0x00000001 EzloMessage TEXT_VAATI, 0x2d WaitUntilTextboxCloses SetLocalFlag NAKANIWA_00_EZERO - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/hyruleCastle/script_SmithAtCastle.inc b/data/scripts/hyruleCastle/script_SmithAtCastle.inc index 8ad1fc7d..d9b5cc62 100644 --- a/data/scripts/hyruleCastle/script_SmithAtCastle.inc +++ b/data/scripts/hyruleCastle/script_SmithAtCastle.inc @@ -10,8 +10,8 @@ script_080092B2: script_080092BA: CheckEntityInteractType JumpIfNot script_080092BA - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_PROLOGUE, 0x5e WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/hyruleCastle/script_StoneZelda.inc b/data/scripts/hyruleCastle/script_StoneZelda.inc index b26c8e2b..e93879fb 100644 --- a/data/scripts/hyruleCastle/script_StoneZelda.inc +++ b/data/scripts/hyruleCastle/script_StoneZelda.inc @@ -8,10 +8,10 @@ SCRIPT_START script_StoneZelda script_08009300: CheckEntityInteractType JumpIfNot script_08009300 - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_PROLOGUE, 0x71 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_08009300 .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc index 65737141..9c0ce824 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc @@ -14,5 +14,5 @@ script_08011A44: CallWithArg sub_0807F3D8, 0x00000000 MessageFromTarget TEXT_VAATI, 0x20 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_08011A44 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc index 12f0c775..36916c9c 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc @@ -16,7 +16,7 @@ script_08011A7C: JumpIf script_08011AFA MessageFromTarget TEXT_VAATI, 0x20 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_08011A7C .2byte 0x0000 BeginBlock @@ -33,6 +33,6 @@ script_08011AC4: CallWithArg sub_0807F3D8, 0x00000000 MessageFromTarget TEXT_VAATI, 0x22 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_08011AC4 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc index 6dc11ee1..c9b4026c 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc @@ -4,14 +4,14 @@ SCRIPT_START script_GuardGarden7 JumpIfNot script_GuardGarden7 SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems script_08011AFA: MessageFromTargetPos TEXT_VAATI, 0x21, 0x0007 WaitUntilTextboxCloses SetLocalFlag MAENIWA_00_WARP CallWithArg sub_0806DA1C, 0x00000003 EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc index 6ceb9aff..ba48a45d 100644 --- a/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc @@ -1,11 +1,11 @@ @ Hyrule Castle Guard kicking Link out of garden SCRIPT_START script_GuardGarden8 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems MessageFromTargetPos TEXT_VAATI, 0x20, 0x000c WaitUntilTextboxCloses - EnablePlayerControl - Call sub_0807DF50 + EnablePlayerControl + Call EnablePauseMenu DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc index 1fb7f15b..2c67d555 100644 --- a/data/scripts/hyruleTown/script_Anju.inc +++ b/data/scripts/hyruleTown/script_Anju.inc @@ -14,7 +14,7 @@ script_0801015A: JumpIf script_0801019E MessageFromTargetPos TEXT_ANJU, 0x01, 0x0000 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_080101A6 Call sub_080A1608 WaitUntilTextboxCloses @@ -37,7 +37,7 @@ script_080101AC: EndBlock Call sub_080A1270 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems MessageFromTargetPos TEXT_ANJU, 0x04, 0x0007 WaitUntilTextboxCloses StopBgm @@ -69,7 +69,7 @@ script_080101AC: WaitUntilTextboxCloses Call sub_080A14A8 script_08010240: - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl CallWithArg sub_0807F5B0, 0x00000000 ClearRoomFlag 0x0001 diff --git a/data/scripts/hyruleTown/script_AnjuInside.inc b/data/scripts/hyruleTown/script_AnjuInside.inc index f1774b30..7c47b996 100644 --- a/data/scripts/hyruleTown/script_AnjuInside.inc +++ b/data/scripts/hyruleTown/script_AnjuInside.inc @@ -9,9 +9,9 @@ SCRIPT_START script_AnjuInside script_08010132: CheckEntityInteractType JumpIfNot script_08010132 - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageFromTarget TEXT_CAFE, 0x22 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_08010132 diff --git a/data/scripts/hyruleTown/script_BedAtSimons.inc b/data/scripts/hyruleTown/script_BedAtSimons.inc index 3d37f36d..d9c88b19 100644 --- a/data/scripts/hyruleTown/script_BedAtSimons.inc +++ b/data/scripts/hyruleTown/script_BedAtSimons.inc @@ -1,4 +1,4 @@ -@ OBJECT_5B Bed at Simons +@ BED_COVER Bed at Simons @ also at Inn @ also at Links house later SCRIPT_START script_BedAtSimons diff --git a/data/scripts/hyruleTown/script_Beedle.inc b/data/scripts/hyruleTown/script_Beedle.inc index 54013fad..4b58971b 100644 --- a/data/scripts/hyruleTown/script_Beedle.inc +++ b/data/scripts/hyruleTown/script_Beedle.inc @@ -10,7 +10,7 @@ script_08010502: CheckEntityInteractType JumpIfNot script_08010502 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems FacePlayer CallWithArg sub_0807F3D8, 0x00000008 CheckRoomFlag 0x000e @@ -68,7 +68,7 @@ script_080105DC: MessageNoOverlap TEXT_PICOLYTE, 0x0e script_080105E0: WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_08010502 .2byte 0x0000 @@ -81,10 +81,10 @@ script_080105E0: script_08010602: CheckEntityInteractType JumpIfNot script_08010602 - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageFromTarget TEXT_EMPTY, 0x01 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 Jump script_08010602 diff --git a/data/scripts/hyruleTown/script_Carlov.inc b/data/scripts/hyruleTown/script_Carlov.inc index d91f44f0..5939aa30 100644 --- a/data/scripts/hyruleTown/script_Carlov.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -16,7 +16,7 @@ script_08014462: MessageFromTarget TEXT_BURLOV, 0x02 MessageFromTarget TEXT_BURLOV, 0x03 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_080144F0 DoPostScriptAction 0x0001 Wait 0x008c @@ -29,7 +29,7 @@ script_080144A2: Call sub_0806E250 JumpIfNot script_080144B8 MessageFromTarget TEXT_BURLOV, 0x0b - _0807EB38 + _0807EB38 JumpTable script_080144B8, script_080144C0 script_080144B8: ClearLocalFlag 0x0093 @@ -51,7 +51,7 @@ script_080144C8: SetRoomFlag 0x0000 SetLocalFlag 0x0092 _0807EEF4 0x0000, 0xffa0 - Call sub_0807DF38 + Call DisablePauseMenu Jump script_080144FC script_080144F0: SetAnimation 0x0009 diff --git a/data/scripts/hyruleTown/script_Carlov2.inc b/data/scripts/hyruleTown/script_Carlov2.inc index ac3178a5..de16ca9f 100644 --- a/data/scripts/hyruleTown/script_Carlov2.inc +++ b/data/scripts/hyruleTown/script_Carlov2.inc @@ -60,8 +60,8 @@ script_0801472E_2: JumpIfNot script_0801463A CheckLocalFlag 0x005e JumpIf script_080146A0 - SetPlayerIdle - FaceAwayFromPlayer + SetPlayerIdle + FaceAwayFromPlayer MessageFromTargetPos TEXT_CARLOV, 0x2b, 0x000c Jump script_080147CE script_08014672: diff --git a/data/scripts/hyruleTown/script_CarlovChest.inc b/data/scripts/hyruleTown/script_CarlovChest.inc index 00c7e8a0..b0cc0227 100644 --- a/data/scripts/hyruleTown/script_CarlovChest.inc +++ b/data/scripts/hyruleTown/script_CarlovChest.inc @@ -27,6 +27,6 @@ script_08014938: WaitForSyncFlagAndClear 0x00000008 Call sub_0806E1FC Wait 0x001e - Call sub_0807DF50 + Call EnablePauseMenu SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_CarlovGame.inc b/data/scripts/hyruleTown/script_CarlovGame.inc index a43af767..0ffd8964 100644 --- a/data/scripts/hyruleTown/script_CarlovGame.inc +++ b/data/scripts/hyruleTown/script_CarlovGame.inc @@ -6,12 +6,12 @@ SCRIPT_START script_CarlovGame DoPostScriptAction 0x000a EndBlock SetPlayerIdle - Call sub_0807DF38 + Call DisablePauseMenu Wait 0x0010 CheckLocalFlag 0x0093 JumpIf script_080148B6 MessageFromTargetPos 0x4215, 0x000c - EnablePlayerControl + EnablePlayerControl script_0801482E: CheckSyncFlagAndClear 0x00000001 JumpIf script_08014862 @@ -24,7 +24,7 @@ script_0801482E: Wait 0x0020 SetAnimation 0x0002 MessageFromTargetPos 0x4215, 0x000c - EnablePlayerControl + EnablePlayerControl Jump script_0801482E script_08014862: SetAnimation 0x0008 @@ -51,7 +51,7 @@ script_0801488E: SetAnimation 0x0002 script_080148B6: MessageFromTargetPos 0x4216, 0x000c - EnablePlayerControl + EnablePlayerControl Jump script_0801488E script_080148C2: SetAnimation 0x0008 diff --git a/data/scripts/hyruleTown/script_CarlovWon.inc b/data/scripts/hyruleTown/script_CarlovWon.inc index 4a65f5ea..7bc3f890 100644 --- a/data/scripts/hyruleTown/script_CarlovWon.inc +++ b/data/scripts/hyruleTown/script_CarlovWon.inc @@ -7,12 +7,12 @@ SCRIPT_START script_CarlovWon DoPostScriptAction 0x000a EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call sub_0806E20C WaitUntilTextboxCloses Call sub_0806E23C ClearLocalFlag 0x0093 ClearLocalFlag 0x0092 - Call sub_0807DF50 + Call EnablePauseMenu Jump script_080144FC .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Object6ACarlov.inc b/data/scripts/hyruleTown/script_CutsceneMiscObjectCarlov.inc index 3b20ad73..7c5c6c1a 100644 --- a/data/scripts/hyruleTown/script_Object6ACarlov.inc +++ b/data/scripts/hyruleTown/script_CutsceneMiscObjectCarlov.inc @@ -1,5 +1,5 @@ -@ Hyrule Town OBJECT_69 at Carlov 2 -SCRIPT_START script_Object6ACarlov +@ Hyrule Town CUTSCENE_ORCHESTRATOR at Carlov 2 +SCRIPT_START script_CutsceneMiscObjectCarlov BeginBlock SetEntityPositionRelative 0x01f8, 0x00e0 CheckLocalFlag 0x005e diff --git a/data/scripts/hyruleTown/script_Object6ACarlov2.inc b/data/scripts/hyruleTown/script_CutsceneMiscObjectCarlov2.inc index 37f468b2..c7a0e571 100644 --- a/data/scripts/hyruleTown/script_Object6ACarlov2.inc +++ b/data/scripts/hyruleTown/script_CutsceneMiscObjectCarlov2.inc @@ -1,5 +1,5 @@ -@ Hyrule Town OBJECT_69 at Carlov -SCRIPT_START script_Object6ACarlov2 +@ Hyrule Town CUTSCENE_ORCHESTRATOR at Carlov +SCRIPT_START script_CutsceneMiscObjectCarlov2 BeginBlock DoPostScriptAction 0x0008 SetAnimationState 0x0004 @@ -26,26 +26,26 @@ script_08014632: CheckRoomFlag 0x0000 JumpIfNot script_08014632 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems script_08014642: CheckRoomFlag 0x0009 JumpIf script_08014642 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_080145F8 .else CheckRoomFlag 0x0000 JumpIfNot script_080145F8 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems script_08014608: CheckRoomFlag 0x0004 JumpIf script_08014608 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000008 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_080145F8 .endif diff --git a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc b/data/scripts/hyruleTown/script_CutsceneMiscObjectPreventPlayerLeaveCarlov.inc index 274526e2..eebe0f10 100644 --- a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc +++ b/data/scripts/hyruleTown/script_CutsceneMiscObjectPreventPlayerLeaveCarlov.inc @@ -1,5 +1,5 @@ -@ Hyrule Town OBJECT_69 at Carlov. Prevent from leaving if already paid. -SCRIPT_START script_Object6APreventPlayerLeaveCarlov +@ Hyrule Town CUTSCENE_ORCHESTRATOR at Carlov. Prevent from leaving if already paid. +SCRIPT_START script_CutsceneMiscObjectPreventPlayerLeaveCarlov BeginBlock EndBlock script_0801454C: diff --git a/data/scripts/hyruleTown/script_Object69AllBooksCollected.inc b/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc index dabc4629..148ddcf9 100644 --- a/data/scripts/hyruleTown/script_Object69AllBooksCollected.inc +++ b/data/scripts/hyruleTown/script_CutsceneOrchestratorAllBooksCollected.inc @@ -1,5 +1,5 @@ -@ Library OBJECT_69 all books collected -SCRIPT_START script_Object69AllBooksCollected +@ Library CUTSCENE_ORCHESTRATOR all books collected +SCRIPT_START script_CutsceneOrchestratorAllBooksCollected BeginBlock SetEntityPositionRelative 0x0068, 0x0068 _0807F0B4 0x0004 diff --git a/data/scripts/hyruleTown/script_Object69Rem.inc b/data/scripts/hyruleTown/script_CutsceneOrchestratorRem.inc index 727fe03a..09360ab2 100644 --- a/data/scripts/hyruleTown/script_Object69Rem.inc +++ b/data/scripts/hyruleTown/script_CutsceneOrchestratorRem.inc @@ -1,5 +1,5 @@ -@ OBJECT_69 in Rems shoe shop ? -SCRIPT_START script_Object69Rem +@ CUTSCENE_ORCHESTRATOR in Rems shoe shop ? +SCRIPT_START script_CutsceneOrchestratorRem BeginBlock CheckLocalFlag 0x0062 JumpIfNot script_0801319A diff --git a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc b/data/scripts/hyruleTown/script_CutsceneOrchestratorSimonsSimulation.inc index 0a1a958a..b0a4eed7 100644 --- a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc +++ b/data/scripts/hyruleTown/script_CutsceneOrchestratorSimonsSimulation.inc @@ -1,5 +1,5 @@ -@ Simons Simulation OBJECT_69 -SCRIPT_START script_Object69SimonsSimulation +@ Simons Simulation CUTSCENE_ORCHESTRATOR +SCRIPT_START script_CutsceneOrchestratorSimonsSimulation BeginBlock DisablePlayerControl EndBlock diff --git a/data/scripts/hyruleTown/script_Din.inc b/data/scripts/hyruleTown/script_Din.inc index 142de31e..3382477f 100644 --- a/data/scripts/hyruleTown/script_Din.inc +++ b/data/scripts/hyruleTown/script_Din.inc @@ -19,7 +19,7 @@ script_08011C9A: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_HAPPY_HEARTH, 0x15 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011C9A @@ -38,7 +38,7 @@ script_08011CC2: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_GORMAN_ORACLES, 0x5 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_08011D0E EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/hyruleTown/script_Din2.inc b/data/scripts/hyruleTown/script_Din2.inc index 720aac69..cf4f02a1 100644 --- a/data/scripts/hyruleTown/script_Din2.inc +++ b/data/scripts/hyruleTown/script_Din2.inc @@ -27,7 +27,7 @@ script_08011E96: script_08011ECC: MessageNoOverlap TEXT_GORMAN_ORACLES, 0x11 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_08011EF4 script_08011ED8: EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_DinAlone.inc b/data/scripts/hyruleTown/script_DinAlone.inc index e98d4e73..61ddd2c3 100644 --- a/data/scripts/hyruleTown/script_DinAlone.inc +++ b/data/scripts/hyruleTown/script_DinAlone.inc @@ -14,7 +14,7 @@ script_080121DE: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_HAPPY_HEARTH, 0x27 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_080121DE diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc index 79d38921..578f3182 100644 --- a/data/scripts/hyruleTown/script_DinMovedIn.inc +++ b/data/scripts/hyruleTown/script_DinMovedIn.inc @@ -27,7 +27,7 @@ script_0801205E: script_08012070: MessageNoOverlap TEXT_GORMAN_ORACLES, 0x24 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_0801209E CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIfNot script_0801209A diff --git a/data/scripts/hyruleTown/script_Emma.inc b/data/scripts/hyruleTown/script_Emma.inc index 428e4ed2..e3e87ca5 100644 --- a/data/scripts/hyruleTown/script_Emma.inc +++ b/data/scripts/hyruleTown/script_Emma.inc @@ -10,7 +10,7 @@ script_0800E832: JumpIfNot script_0800E832 SetPlayerIdle SetAnimationState 0x0004 - BeginBlock + BeginBlock MessageFromTarget TEXT_HAPPY_HEARTH, 0x01 CallWithArg sub_0807F854, 0x00010032 CallWithArg sub_0807F854, 0x000200c8 @@ -20,7 +20,7 @@ script_0800E832: _0807EB38 JumpTable script_0800E910, script_RentSmallRoom, script_RentRegularRoom, script_0800E872 script_0800E872: @ Rent large room - BeginBlock + BeginBlock MessageFromTarget TEXT_HAPPY_HEARTH, 0x05 CallWithArg sub_0807F854, 0x00010190 EndBlock diff --git a/data/scripts/hyruleTown/script_Farore.inc b/data/scripts/hyruleTown/script_Farore.inc index 9bba60bb..3477a9fb 100644 --- a/data/scripts/hyruleTown/script_Farore.inc +++ b/data/scripts/hyruleTown/script_Farore.inc @@ -19,7 +19,7 @@ script_08011DF2: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_HAPPY_HEARTH, 0x14 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011DF2 @@ -38,7 +38,7 @@ script_08011E1A: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_GORMAN_ORACLES, 0x04 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_08011E66 EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/hyruleTown/script_Farore2.inc b/data/scripts/hyruleTown/script_Farore2.inc index 2f42cdf9..0f3e9303 100644 --- a/data/scripts/hyruleTown/script_Farore2.inc +++ b/data/scripts/hyruleTown/script_Farore2.inc @@ -27,7 +27,7 @@ script_08011FAE: script_08011FE4: MessageNoOverlap TEXT_GORMAN_ORACLES, 0x10 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_0801200C script_08011FF0: EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_FaroreAlone.inc b/data/scripts/hyruleTown/script_FaroreAlone.inc index e47fa2cf..03a869de 100644 --- a/data/scripts/hyruleTown/script_FaroreAlone.inc +++ b/data/scripts/hyruleTown/script_FaroreAlone.inc @@ -14,7 +14,7 @@ script_0801224E: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_HAPPY_HEARTH, 0x26 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_0801224E diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc index 4732a156..1ea10abe 100644 --- a/data/scripts/hyruleTown/script_FaroreMovedIn.inc +++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc @@ -27,7 +27,7 @@ script_08012176: script_08012188: MessageNoOverlap TEXT_GORMAN_ORACLES, 0x1e WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_080121B6 CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIfNot script_080121B2 diff --git a/data/scripts/hyruleTown/script_FirstHouseDoor.inc b/data/scripts/hyruleTown/script_FirstHouseDoor.inc index 5d96b82a..ef285b52 100644 --- a/data/scripts/hyruleTown/script_FirstHouseDoor.inc +++ b/data/scripts/hyruleTown/script_FirstHouseDoor.inc @@ -10,7 +10,7 @@ script_0801091C: JumpIfNot script_0801091C SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems CheckRoomFlag 0x0001 JumpIf script_08010942 EzloMessage TEXT_EZLO, 0x62 @@ -18,7 +18,7 @@ script_0801091C: script_08010942: StartPlayerScript script_PlayerAtInnDoor WaitForSyncFlagAndClear 0x00000001 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0801091C Call sub_0808692C diff --git a/data/scripts/hyruleTown/script_GoronMerchant.inc b/data/scripts/hyruleTown/script_GoronMerchant.inc index f7586f60..460e9226 100644 --- a/data/scripts/hyruleTown/script_GoronMerchant.inc +++ b/data/scripts/hyruleTown/script_GoronMerchant.inc @@ -26,7 +26,7 @@ script_08010804: JumpIfNot script_08010804 EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems FacePlayer CheckGlobalFlag GORON_KAKERA_L JumpIfNot script_08010858 @@ -47,7 +47,7 @@ script_08010858: script_08010860: EndBlock SetPlayerIdle - Call sub_0807DF38 + Call DisablePauseMenu FacePlayer Call sub_08069660 WaitUntilTextboxCloses @@ -80,7 +80,7 @@ script_080108B2: Call sub_0807F83C script_080108BA: WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/hyruleTown/script_InnDoor.inc b/data/scripts/hyruleTown/script_InnDoor.inc index 7b71f660..ef260171 100644 --- a/data/scripts/hyruleTown/script_InnDoor.inc +++ b/data/scripts/hyruleTown/script_InnDoor.inc @@ -4,7 +4,7 @@ SCRIPT_START script_InnDoor JumpIfNot script_InnDoor SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtInnDoor WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 @@ -12,6 +12,6 @@ SCRIPT_START script_InnDoor EzloMessage TEXT_EZLO, 0x63 WaitUntilTextboxCloses script_08010900: - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_InnDoor diff --git a/data/scripts/hyruleTown/script_MalonHyruleTown.inc b/data/scripts/hyruleTown/script_MalonHyruleTown.inc index 1040f382..377db839 100644 --- a/data/scripts/hyruleTown/script_MalonHyruleTown.inc +++ b/data/scripts/hyruleTown/script_MalonHyruleTown.inc @@ -11,10 +11,10 @@ script_08014F4A: CheckEntityInteractType JumpIfNot script_08014F4A SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems FacePlayer DoPostScriptAction 0x0000 - BeginBlock + BeginBlock MessageNoOverlap TEXT_MILK, 0x0b CallWithArg sub_0807F854, 0x00010064 EndBlock @@ -37,7 +37,7 @@ script_08014FA2: MessageNoOverlap TEXT_MILK, 0x0f script_08014FA6: WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetAnimationState 0x0004 SetAnimation 0x000e diff --git a/data/scripts/hyruleTown/script_Nayru.inc b/data/scripts/hyruleTown/script_Nayru.inc index bb6dc953..e311efcc 100644 --- a/data/scripts/hyruleTown/script_Nayru.inc +++ b/data/scripts/hyruleTown/script_Nayru.inc @@ -19,7 +19,7 @@ script_08011D46: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_HAPPY_HEARTH, 0x13 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08011D46 @@ -38,7 +38,7 @@ script_08011D6E: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_GORMAN_ORACLES, 0x03 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_08011DBA EnablePlayerControl SetAnimationState 0x0004 diff --git a/data/scripts/hyruleTown/script_Nayru2.inc b/data/scripts/hyruleTown/script_Nayru2.inc index 1ae9f73b..ab085b28 100644 --- a/data/scripts/hyruleTown/script_Nayru2.inc +++ b/data/scripts/hyruleTown/script_Nayru2.inc @@ -27,7 +27,7 @@ script_08011F22: script_08011F58: MessageNoOverlap TEXT_GORMAN_ORACLES, 0x0f WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_08011F80 script_08011F64: EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_NayruAlone.inc b/data/scripts/hyruleTown/script_NayruAlone.inc index de24f35d..6fbd687d 100644 --- a/data/scripts/hyruleTown/script_NayruAlone.inc +++ b/data/scripts/hyruleTown/script_NayruAlone.inc @@ -14,7 +14,7 @@ script_08012216: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_HAPPY_HEARTH, 0x25 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_08012216 diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc index 3b88280c..8a143338 100644 --- a/data/scripts/hyruleTown/script_NayruMovedIn.inc +++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc @@ -27,7 +27,7 @@ script_080120EA: script_080120FC: MessageNoOverlap TEXT_GORMAN_ORACLES, 0x18 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_0801212A CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIfNot script_08012126 diff --git a/data/scripts/hyruleTown/script_Phonograph.inc b/data/scripts/hyruleTown/script_Phonograph.inc index a8f110a7..12071bc5 100644 --- a/data/scripts/hyruleTown/script_Phonograph.inc +++ b/data/scripts/hyruleTown/script_Phonograph.inc @@ -7,15 +7,15 @@ script_0800BA46: CheckEntityInteractType JumpIfNot script_0800BA46 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems MessageFromTarget TEXT_PHONOGRAPH, 0x01 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_0800BA6C StopBgm Call sub_0806E964 PlayBGM script_0800BA6C: - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800BA46 diff --git a/data/scripts/hyruleTown/script_PhonographDoor.inc b/data/scripts/hyruleTown/script_PhonographDoor.inc index 4b22769f..2db79521 100644 --- a/data/scripts/hyruleTown/script_PhonographDoor.inc +++ b/data/scripts/hyruleTown/script_PhonographDoor.inc @@ -9,7 +9,7 @@ SCRIPT_START script_PhonographDoor EndBlock SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 @@ -17,7 +17,7 @@ SCRIPT_START script_PhonographDoor EzloMessage TEXT_EZLO, 0x64 WaitUntilTextboxCloses script_080109DE: - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_PhonographDoor script_080109EA: diff --git a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc index b782d895..84ce25b0 100644 --- a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc +++ b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc @@ -1,7 +1,7 @@ @ Player sleeping at Inn SCRIPT_START script_PlayerSleepingInn BeginBlock - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetPlayerIdle ModHealth 0x00a0 EndBlock @@ -14,7 +14,7 @@ script_08010A78: JumpIfNot script_08010A78 DoPostScriptAction 0x0014 EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu Call ResetPlayerAnimationAndAction SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Rem.inc b/data/scripts/hyruleTown/script_Rem.inc index df8e054d..fa58f73d 100644 --- a/data/scripts/hyruleTown/script_Rem.inc +++ b/data/scripts/hyruleTown/script_Rem.inc @@ -20,7 +20,7 @@ script_08012F48: script_08012F50: Call sub_0806A96C JumpIfNot script_08012F50 - SetPlayerIdle + SetPlayerIdle MessageNoOverlap TEXT_REM, 0x01 WaitUntilTextboxCloses SetLocalFlag 0x0061 diff --git a/data/scripts/hyruleTown/script_RemFallingAsleep.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc index a4ca2e30..36e0a0de 100644 --- a/data/scripts/hyruleTown/script_RemFallingAsleep.inc +++ b/data/scripts/hyruleTown/script_RemFallingAsleep.inc @@ -4,7 +4,7 @@ SCRIPT_START script_RemFallingAsleep CheckLocalFlag 0x0060 JumpIf script_08012FD2 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtRem SetLocalFlag 0x0060 ClearLocalFlag 0x0061 @@ -13,7 +13,7 @@ SCRIPT_START script_RemFallingAsleep SetAction 0x0004 Call sub_0806A958 CallWithArg sub_0807F93C, 0x0000f2f4 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetLocalFlag 0x0062 Jump script_08012FFA @@ -36,7 +36,7 @@ script_08013006: TriggerInteract BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EndBlock PlaySound SFX_TASK_COMPLETE InitItemGetSequence ITEM_QST_MUSHROOM @@ -68,7 +68,7 @@ script_08013006: MessageNoOverlap TEXT_REM, 0x06 WaitUntilTextboxCloses SetAction 0x0001 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_0801308A: Call sub_0806A96C diff --git a/data/scripts/hyruleTown/script_RentRegularRoom.inc b/data/scripts/hyruleTown/script_RentRegularRoom.inc index 98e52f5b..e1b15506 100644 --- a/data/scripts/hyruleTown/script_RentRegularRoom.inc +++ b/data/scripts/hyruleTown/script_RentRegularRoom.inc @@ -1,6 +1,6 @@ @ Hyrule Town Inn Emma after renting regular room SCRIPT_START script_RentRegularRoom - BeginBlock + BeginBlock MessageFromTarget TEXT_HAPPY_HEARTH, 0x04 CallWithArg sub_0807F854, 0x000100c8 EndBlock diff --git a/data/scripts/hyruleTown/script_RentSmallRoom.inc b/data/scripts/hyruleTown/script_RentSmallRoom.inc index 672d530b..d214c5c8 100644 --- a/data/scripts/hyruleTown/script_RentSmallRoom.inc +++ b/data/scripts/hyruleTown/script_RentSmallRoom.inc @@ -1,6 +1,6 @@ @ Hyrule Town Inn Emma after renting small room SCRIPT_START script_RentSmallRoom - BeginBlock + BeginBlock MessageFromTarget TEXT_HAPPY_HEARTH, 0x03 CallWithArg sub_0807F854, 0x00010032 EndBlock diff --git a/data/scripts/hyruleTown/script_Simon.inc b/data/scripts/hyruleTown/script_Simon.inc index a6ac0e6c..7508f54a 100644 --- a/data/scripts/hyruleTown/script_Simon.inc +++ b/data/scripts/hyruleTown/script_Simon.inc @@ -12,21 +12,21 @@ SCRIPT_START script_Simon SetAnimationState 0x0006 DoPostScriptAction 0x0004 Wait 0x003c - FaceAwayFromPlayer + FaceAwayFromPlayer MessageNoOverlap TEXT_SIMON, 0x07 WaitUntilTextboxCloses SetAnimationState 0x0004 ClearGlobalFlag MAROYA_WAKEUP - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08011B84: CheckEntityInteractType JumpIfNot script_08011B84 - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_SIMON, 0x01 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_08011BA4 script_08011B9A: EnablePlayerControl diff --git a/data/scripts/hyruleTown/script_SimonsDoor.inc b/data/scripts/hyruleTown/script_SimonsDoor.inc index 2d1cf455..c63209c3 100644 --- a/data/scripts/hyruleTown/script_SimonsDoor.inc +++ b/data/scripts/hyruleTown/script_SimonsDoor.inc @@ -4,7 +4,7 @@ SCRIPT_START script_SimonsDoor JumpIfNot script_SimonsDoor SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 @@ -12,7 +12,7 @@ SCRIPT_START script_SimonsDoor EzloMessage TEXT_EZLO, 0x63 WaitUntilTextboxCloses script_08010994: - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_SimonsDoor diff --git a/data/scripts/hyruleTown/script_StockwellBuy.inc b/data/scripts/hyruleTown/script_StockwellBuy.inc index 436ae4dd..fb286772 100644 --- a/data/scripts/hyruleTown/script_StockwellBuy.inc +++ b/data/scripts/hyruleTown/script_StockwellBuy.inc @@ -12,7 +12,7 @@ SCRIPT_START script_StockwellBuy WaitUntilTextboxCloses FaceAwayFromPlayer Wait 0x001e - MessageNoOverlapVar + MessageNoOverlapVar script_080143AC: WaitUntilTextboxCloses Wait 0x001e diff --git a/data/scripts/hyruleTown/script_StockwellDogFood.inc b/data/scripts/hyruleTown/script_StockwellDogFood.inc index bdfea1ef..8d72f459 100644 --- a/data/scripts/hyruleTown/script_StockwellDogFood.inc +++ b/data/scripts/hyruleTown/script_StockwellDogFood.inc @@ -2,14 +2,14 @@ SCRIPT_START script_StockwellDogFood EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call sub_080654FC SetAnimation 0x0001 Call sub_080654EC Wait 0x003c MessageNoOverlap TEXT_STOCKWELL, 0x16 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_080143FA SetIntVariable 0x00000002 Call sub_08065528 @@ -30,13 +30,13 @@ script_080143FA: Call LoadMenu .ifndef EU Wait 0x001e - FaceAwayFromPlayer + FaceAwayFromPlayer MessageNoOverlap TEXT_STOCKWELL, 0x22 WaitUntilTextboxCloses .endif script_0801443E: SetAnimation 0x0004 SetAction 0x0001 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SCRIPT_END diff --git a/data/scripts/hyruleTown/script_TownMinish4.inc b/data/scripts/hyruleTown/script_TownMinish4.inc index a8a7fe74..157b132a 100644 --- a/data/scripts/hyruleTown/script_TownMinish4.inc +++ b/data/scripts/hyruleTown/script_TownMinish4.inc @@ -15,7 +15,7 @@ script_0800ED98: script_0800EDB6: EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems CheckLocalFlag 0x00ae JumpIf script_0800EE3E Wait 0x000a @@ -31,7 +31,7 @@ script_0800EDB6: SetIntVariable 0x00000503 Call LoadMenu SetSyncFlag 0x00000040 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetLocalFlag 0x00ae Jump script_0800ED98 @@ -47,6 +47,6 @@ script_0800EE12: script_0800EE3E: MessageFromTarget TEXT_HAGEN, 0x16 WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800ED98 diff --git a/data/scripts/hyruleTown/script_TownMinish5.inc b/data/scripts/hyruleTown/script_TownMinish5.inc index 844ec579..4150b552 100644 --- a/data/scripts/hyruleTown/script_TownMinish5.inc +++ b/data/scripts/hyruleTown/script_TownMinish5.inc @@ -15,7 +15,7 @@ script_0800EE58: script_0800EE76: EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems CheckLocalFlag 0x00ae JumpIf script_0800EEFE Wait 0x000a @@ -31,7 +31,7 @@ script_0800EE76: SetIntVariable 0x00000503 Call LoadMenu SetSyncFlag 0x00000008 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetLocalFlag 0x00ae Jump script_0800EE58 @@ -47,7 +47,7 @@ script_0800EED2: script_0800EEFE: MessageFromTarget TEXT_HAGEN, 0x15 WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800EE58 MessageFromTarget TEXT_HAGEN, 0x07 diff --git a/data/scripts/hyruleTown/script_Wheaton.inc b/data/scripts/hyruleTown/script_Wheaton.inc index 981e7588..2d1e3a70 100644 --- a/data/scripts/hyruleTown/script_Wheaton.inc +++ b/data/scripts/hyruleTown/script_Wheaton.inc @@ -15,7 +15,7 @@ script_08010686: Call GetConditionSet MessageFromTargetTable TEXT_BAKERY << 8 | 0x08, TEXT_BAKERY << 8 | 0x09 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 Jump script_08010686 .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc index f2fec457..8f0ff044 100644 --- a/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc +++ b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc @@ -12,7 +12,7 @@ script_0800BC18: Wait 0x003c MessageNoOverlap TEXT_KINSTONE, 0x07 WaitUntilTextboxCloses - BeginBlock + BeginBlock SetAnimationState 0x0000 SetAnimation 0x0004 EndBlock diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc index a227cebc..944bc020 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSpark.inc @@ -1,5 +1,5 @@ -@ OBJECT_B3 spark in all fusing kinstone cutscenes -SCRIPT_START script_ObjectB3KinstoneSpark +@ KINSTONE_SPARK spark in all fusing kinstone cutscenes +SCRIPT_START script_KinstoneSparkKinstoneSpark BeginBlock SetEntitySpeed 0x0180 SetAnimation 0x0004 diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc index 44d5e43f..e8d78eee 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkFromBottom.inc @@ -1,5 +1,5 @@ -@ Hyrule Town OBJECT_B3 Kinstone spark red from bottom -SCRIPT_START script_ObjectB3KinstoneSparkFromBottom +@ Hyrule Town KINSTONE_SPARK Kinstone spark red from bottom +SCRIPT_START script_KinstoneSparkKinstoneSparkFromBottom BeginBlock SetEntitySpeed 0x0120 SetAnimation 0x0004 diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc index e77f34d3..21d715b9 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoron.inc @@ -1,6 +1,6 @@ -@ OBJECT_B3 during Goron cutscene +@ KINSTONE_SPARK during Goron cutscene @ blue from top -SCRIPT_START script_ObjectB3KinstoneSparkGoron +SCRIPT_START script_KinstoneSparkKinstoneSparkGoron BeginBlock SetEntitySpeed 0x0100 SetAnimation 0x0004 diff --git a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc index 3a35b424..3a9aada3 100644 --- a/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc +++ b/data/scripts/kinstoneFusion/script_KinstoneSparkKinstoneSparkGoronMerchang.inc @@ -1,6 +1,6 @@ -@ OBJECT_B3 in Goron Merchant arriving Kinstone cutscene +@ KINSTONE_SPARK in Goron Merchant arriving Kinstone cutscene @ blue from left to right -SCRIPT_START script_ObjectB3KinstoneSparkGoronMerchang +SCRIPT_START script_KinstoneSparkKinstoneSparkGoronMerchang BeginBlock SetEntitySpeed 0x0180 SetAnimation 0x0004 diff --git a/data/scripts/lakeHylia/script_Object69AfterToD.inc b/data/scripts/lakeHylia/script_CutsceneOrchestratorAfterToD.inc index 09903bbe..1396bb8f 100644 --- a/data/scripts/lakeHylia/script_Object69AfterToD.inc +++ b/data/scripts/lakeHylia/script_CutsceneOrchestratorAfterToD.inc @@ -1,5 +1,5 @@ -@ After ToD OBJECT_69 Cutscene -SCRIPT_START script_Object69AfterToD +@ After ToD CUTSCENE_ORCHESTRATOR Cutscene +SCRIPT_START script_CutsceneOrchestratorAfterToD SetPlayerIdle script_0800AFB2: EndBlock @@ -8,11 +8,11 @@ script_0800AFB2: ComparePlayerAction PLAYER_NORMAL JumpIfNot script_0800AFB2 EndBlock - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x04 WaitUntilTextboxCloses SetLocalFlagByBank FLAG_BANK_1, 0x0004 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/lakeHylia/script_EzloTalkOcarina.inc b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc index 3a4dc602..bb91aefe 100644 --- a/data/scripts/lakeHylia/script_EzloTalkOcarina.inc +++ b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc @@ -3,10 +3,10 @@ SCRIPT_START script_EzloTalkOcarina EndBlock SetPlayerIdle Call WaitForPlayerNormalOrTalkEzlo - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_EZLO, 0x5f WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/lakeHylia/script_KingGustafHologram.inc b/data/scripts/lakeHylia/script_KingGustafHologram.inc index d6b47c30..0c3d6af7 100644 --- a/data/scripts/lakeHylia/script_KingGustafHologram.inc +++ b/data/scripts/lakeHylia/script_KingGustafHologram.inc @@ -6,7 +6,7 @@ SCRIPT_START script_KingGustafHologram script_08012368: CheckLocalFlag 0x0004 JumpIfNot script_08012368 - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetPlayerIdle StopBgm BeginBlock @@ -45,7 +45,7 @@ script_08012368: WaitUntilTextboxCloses SetIntVariable 0x00000203 Call LoadMenu - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/lonLonRanch/scriptMalonInside.inc b/data/scripts/lonLonRanch/scriptMalonInside.inc index 14da44c1..73e7d807 100644 --- a/data/scripts/lonLonRanch/scriptMalonInside.inc +++ b/data/scripts/lonLonRanch/scriptMalonInside.inc @@ -14,7 +14,7 @@ script_08014F0C: DoPostScriptAction 0x0000 MessageNoOverlap TEXT_LON_LON, 0x0e WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetAnimationState 0x0004 SetAnimation 0x000a Jump script_08014F0C diff --git a/data/scripts/lonLonRanch/script_GoronPunching.inc b/data/scripts/lonLonRanch/script_GoronPunching.inc index 44c7f7b2..ebe77add 100644 --- a/data/scripts/lonLonRanch/script_GoronPunching.inc +++ b/data/scripts/lonLonRanch/script_GoronPunching.inc @@ -7,7 +7,7 @@ SCRIPT_START script_GoronPunching Call sub_080694B0 EndBlock script_0800B9CA: - Call sub_0807F434 + Call CheckInteractType JumpTable script_0800B9CA, script_0800B9D8, script_0800B9F4 script_0800B9D8: SetPlayerIdle @@ -29,7 +29,7 @@ script_0800B9F4: JumpIf script_0800BA24 WaitUntilTextboxCloses Call sub_080694EC - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800B9CA script_0800BA24: @@ -37,6 +37,6 @@ script_0800BA24: _0807E9DC _0807E9D4 Call sub_080694EC - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800B9CA diff --git a/data/scripts/lonLonRanch/script_MalonLostKey.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc index 4495e9d2..951b43ae 100644 --- a/data/scripts/lonLonRanch/script_MalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -18,8 +18,8 @@ script_0800B4D4: FacePlayer DoPostScriptAction 0x0000 MessageFromTarget TEXT_LON_LON, 0x0b - EndBlock - EnablePlayerControl + EndBlock + EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0001 Jump script_0800B4BC diff --git a/data/scripts/lonLonRanch/script_TalonGotKey.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc index f169300f..7cb713e4 100644 --- a/data/scripts/lonLonRanch/script_TalonGotKey.inc +++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc @@ -19,7 +19,7 @@ SCRIPT_START script_TalonGotKey PlaySound SFX_TASK_COMPLETE InitItemGetSequence ITEM_QST_LONLON_KEY WaitPlayerGetItem - FaceAwayFromPlayer + FaceAwayFromPlayer MessageFromTarget TEXT_LON_LON, 0x0c WaitUntilTextboxCloses Wait 0x0014 diff --git a/data/scripts/lonLonRanch/script_TalonInside.inc b/data/scripts/lonLonRanch/script_TalonInside.inc index 854ab1db..75a00919 100644 --- a/data/scripts/lonLonRanch/script_TalonInside.inc +++ b/data/scripts/lonLonRanch/script_TalonInside.inc @@ -10,7 +10,7 @@ script_08014E64: CheckEntityInteractType JumpIfNot script_08014E64 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems FacePlayer CallWithArg sub_0807F78C, 0x00000022 WaitUntilTextboxCloses @@ -31,7 +31,7 @@ script_08014EB8: MessageNoOverlap TEXT_EMPTY, 0x02 script_08014EBC: WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_08014E64 .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_TalonInside2.inc b/data/scripts/lonLonRanch/script_TalonInside2.inc index 1e445f39..52005ef2 100644 --- a/data/scripts/lonLonRanch/script_TalonInside2.inc +++ b/data/scripts/lonLonRanch/script_TalonInside2.inc @@ -9,10 +9,10 @@ SCRIPT_START script_TalonInside2 script_08014EE0: CheckEntityInteractType JumpIfNot script_08014EE0 - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageNoOverlap TEXT_LON_LON, 0x0d WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_08014EE0 .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_08012C98.inc b/data/scripts/minishWoods/script_08012C98.inc index 164d5899..261f66a9 100644 --- a/data/scripts/minishWoods/script_08012C98.inc +++ b/data/scripts/minishWoods/script_08012C98.inc @@ -1,4 +1,4 @@ -@ Minish Woods OBJECT_69 ? +@ Minish Woods CUTSCENE_ORCHESTRATOR ? @ Ezlo Trigger to explain how portals work SCRIPT_START script_08012C98 CheckGlobalFlag EZERO_1ST @@ -12,11 +12,11 @@ script_08012CA0: JumpIf script_08012CD2 EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_EZLO_PORTAL, 0x02 WaitUntilTextboxCloses SetLocalFlag MORI_00_KOBITO - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08012CD2: DoPostScriptAction 0x0006 diff --git a/data/scripts/minishWoods/script_08012D18.inc b/data/scripts/minishWoods/script_08012D18.inc index bb9f5fbc..1a50f2fa 100644 --- a/data/scripts/minishWoods/script_08012D18.inc +++ b/data/scripts/minishWoods/script_08012D18.inc @@ -1,4 +1,4 @@ -@ Minish Woods OBJECT_69 2? +@ Minish Woods CUTSCENE_ORCHESTRATOR 2? SCRIPT_START script_08012D18 EndBlock BeginBlock @@ -11,12 +11,12 @@ SCRIPT_START script_08012D18 EndBlock SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_FINDING_EZLO, 0x1a WaitUntilTextboxCloses StartPlayerScript script_PlayerCannotEnter WaitForSyncFlagAndClear 0x00000001 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_08012D18 script_08012D68: diff --git a/data/scripts/minishWoods/script_BombMinish.inc b/data/scripts/minishWoods/script_BombMinish.inc index e6f05c05..2be316b6 100644 --- a/data/scripts/minishWoods/script_BombMinish.inc +++ b/data/scripts/minishWoods/script_BombMinish.inc @@ -17,7 +17,7 @@ script_08009F36: JumpIfNot script_08009F36 EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems DoPostScriptAction 0x000b StartPlayerScript script_PlayerAtBombMinish WaitForSyncFlagAndClear 0x00000002 @@ -28,7 +28,7 @@ script_08009F36: GivePlayerItem ITEM_BOMBBAG WaitPlayerGetItem DoPostScriptAction 0x000a - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08009F84: EndBlock @@ -63,11 +63,11 @@ script_08009FDC: Call sub_08060158 CheckEntityInteractType JumpIfNot script_08009FDC - EndBlock - SetPlayerIdle + EndBlock + SetPlayerIdle MessageNoOverlap TEXT_BELARI, 0x0e WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_0800A002 EnablePlayerControl Jump script_08009FDC @@ -77,7 +77,7 @@ script_0800A002: Call sub_08060318 WaitPlayerGetItem Wait 0x0008 - FaceAwayFromPlayer + FaceAwayFromPlayer MessageFromTarget TEXT_BELARI, 0x13 WaitUntilTextboxCloses SetLocalFlag 0x00b0 @@ -94,14 +94,14 @@ script_0800A024: JumpIf script_0800A052 MessageNoOverlap TEXT_BELARI, 0x14 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_0800A002 EnablePlayerControl Jump script_0800A024 script_0800A052: MessageNoOverlap TEXT_BELARI, 0x11 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIf script_0800A064 EnablePlayerControl Jump script_0800A024 @@ -111,9 +111,9 @@ script_0800A064: Call sub_08060318 WaitPlayerGetItem Wait 0x0008 - FaceAwayFromPlayer + FaceAwayFromPlayer MessageFromTarget TEXT_BELARI, 0x10 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_0800A024 .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_Object69PotionBlue.inc b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc index c61be4e8..3856ef0a 100644 --- a/data/scripts/minishWoods/script_Object69PotionBlue.inc +++ b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc @@ -1,5 +1,5 @@ -@ Syrup OBJECT_69 Potion -SCRIPT_START script_Object69PotionBlue +@ Syrup CUTSCENE_ORCHESTRATOR Potion +SCRIPT_START script_CutsceneOrchestratorPotionBlue BeginBlock Call sub_080787B4 EndBlock @@ -9,7 +9,7 @@ script_08016146: SetPlayerIdle GetInventoryValue ITEM_BOTTLE_BLUE_POTION MessageFromTargetTable TEXT_SYRUP << 8 | 0x03, TEXT_SYRUP << 8 | 0x02, TEXT_SYRUP << 8 | 0x02, TEXT_SYRUP << 8 | 0x02 - CheckTextboxResult + CheckTextboxResult JumpIfNot script_0801618A CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIf script_08016172 diff --git a/data/scripts/minishWoods/script_Object69PotionRed.inc b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc index ded6314e..4000dbfb 100644 --- a/data/scripts/minishWoods/script_Object69PotionRed.inc +++ b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc @@ -1,5 +1,5 @@ -@ OBJECT_69 in witch hut? -SCRIPT_START script_Object69PotionRed +@ CUTSCENE_ORCHESTRATOR in witch hut? +SCRIPT_START script_CutsceneOrchestratorPotionRed BeginBlock Call sub_080787B4 EndBlock @@ -9,7 +9,7 @@ script_0801619A: SetPlayerIdle GetInventoryValue ITEM_BOTTLE_RED_POTION MessageFromTargetTable TEXT_SYRUP << 8 | 0x05, TEXT_SYRUP << 8 | 0x04, TEXT_SYRUP << 8 | 0x04, TEXT_SYRUP << 8 | 0x04 - CheckTextboxResult + CheckTextboxResult JumpIfNot script_080161E2 CheckBottleContaining ITEM_BOTTLE_EMPTY JumpIf script_080161C6 @@ -24,7 +24,7 @@ script_080161D8: .ifndef EU WaitPlayerGetItem WaitUntilTextboxCloses - FaceAwayFromPlayer + FaceAwayFromPlayer MessageNoOverlap TEXT_SYRUP, 0x06 .else MessageFromTarget TEXT_SYRUP, 0x06 diff --git a/data/scripts/minishWoods/script_EzloTalkDWS.inc b/data/scripts/minishWoods/script_EzloTalkDWS.inc index 63444bca..5ed9d332 100644 --- a/data/scripts/minishWoods/script_EzloTalkDWS.inc +++ b/data/scripts/minishWoods/script_EzloTalkDWS.inc @@ -1,11 +1,11 @@ @ Minish Woods Ezlo talks after finishing earth temple SCRIPT_START script_EzloTalkDWS SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x01 WaitUntilTextboxCloses SetLocalFlagByBank FLAG_BANK_1, 0x0001 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc index afe8f513..4801bbc1 100644 --- a/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc +++ b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc @@ -9,12 +9,12 @@ SCRIPT_START script_EzloTalkMinishPortal ComparePlayerAction PLAYER_USEPORTAL JumpIf script_EzloTalkMinishPortal SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EndBlock EzloMessage TEXT_EZLO_PORTAL, 0x03 WaitUntilTextboxCloses SetLocalFlag MORI_ENTRANCE_1ST - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/minishWoods/script_Festari.inc b/data/scripts/minishWoods/script_Festari.inc index 6ba566ec..29f2a843 100644 --- a/data/scripts/minishWoods/script_Festari.inc +++ b/data/scripts/minishWoods/script_Festari.inc @@ -12,7 +12,7 @@ script_0800C650: script_0800C652: TriggerInteract SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems CheckLocalFlag 0x0082 JumpIf script_0800C684 CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 @@ -33,7 +33,7 @@ script_0800C684: DoPostScriptAction 0x0015 Wait 0x000a SetLocalFlag 0x0080 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C652 script_0800C6B6: @@ -44,7 +44,7 @@ script_0800C6B6: WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C652 script_0800C6DC: @@ -68,7 +68,7 @@ script_0800C712: WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C652 script_0800C730: @@ -79,7 +79,7 @@ script_0800C730: WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C652 script_0800C756: @@ -88,6 +88,6 @@ script_0800C756: WaitUntilTextboxCloses DoPostScriptAction 0x0015 Wait 0x000a - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C652 diff --git a/data/scripts/minishWoods/script_ForestMinish10.inc b/data/scripts/minishWoods/script_ForestMinish10.inc index 8e5ac8ef..9ee0b042 100644 --- a/data/scripts/minishWoods/script_ForestMinish10.inc +++ b/data/scripts/minishWoods/script_ForestMinish10.inc @@ -16,7 +16,7 @@ script_0800CD92: script_0800CDA6: EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems CheckLocalFlag 0x009d JumpIf script_0800CDC4 SetLocalFlag 0x009d @@ -40,7 +40,7 @@ script_0800CDEC: JumpIfNot script_0800CE14 MessageNoOverlap TEXT_FOREST_MINISH, 0x4b WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE InitItemGetSequence ITEM_BOTTLE_HALF_MILK @@ -51,7 +51,7 @@ script_0800CE14: JumpIfNot script_0800CF40 MessageNoOverlap TEXT_FOREST_MINISH, 0x4b WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE InitItemGetSequence ITEM_BOTTLE_MILK @@ -80,7 +80,7 @@ script_0800CE6E: JumpIfNot script_0800CF40 MessageNoOverlap TEXT_FOREST_MINISH, 0x4c WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE InitItemGetSequence ITEM_BOTTLE_MINERAL_WATER @@ -108,7 +108,7 @@ script_0800CECE: JumpIfNot script_0800CF40 MessageNoOverlap TEXT_FOREST_MINISH, 0x4d WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE InitItemGetSequence ITEM_BOTTLE_RED_POTION @@ -119,7 +119,7 @@ script_0800CECE: MessageNoOverlap TEXT_FOREST_MINISH, 0x47 script_0800CF02: WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_0800CF0C: EndBlock @@ -131,18 +131,18 @@ script_0800CF0C: script_0800CF20: EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems script_0800CF2A: MessageNoOverlap TEXT_FOREST_MINISH, 0x40 WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800CF0C script_0800CF3C: MessageNoOverlap TEXT_FOREST_MINISH, 0x4a script_0800CF40: WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800CD92 .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_Gentari.inc b/data/scripts/minishWoods/script_Gentari.inc index b9cd8c4e..0a534bc4 100644 --- a/data/scripts/minishWoods/script_Gentari.inc +++ b/data/scripts/minishWoods/script_Gentari.inc @@ -7,7 +7,7 @@ SCRIPT_START script_Gentari script_0800C780: TriggerInteract SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtGentari WaitForSyncFlagAndClear 0x00000001 CheckInventory1 ITEM_EARTH_ELEMENT @@ -18,7 +18,7 @@ script_0800C780: MessageFromTarget TEXT_FOREST_MINISH, 0x22 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C780 script_0800C7C0: @@ -29,7 +29,7 @@ script_0800C7C0: WaitUntilTextboxCloses EzloMessage TEXT_FINDING_EZLO, 0x31 WaitUntilTextboxCloses - FaceAwayFromPlayer + FaceAwayFromPlayer MessageFromTarget TEXT_FINDING_EZLO, 0x32 WaitUntilTextboxCloses SetIntVariable 0x00000103 @@ -39,7 +39,7 @@ script_0800C7C0: Wait 0x000a DoPostScriptAction 0x0000 SetLocalFlag 0x0081 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C780 script_0800C80A: @@ -47,7 +47,7 @@ script_0800C80A: WaitUntilTextboxCloses Wait 0x000a SetAnimation 0x0000 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C780 script_0800C824: @@ -64,8 +64,8 @@ script_0800C824: Wait 0x003c PlaySound SFX_SECRET Wait 0x003c - FacePlayer - FaceAwayFromPlayer + FacePlayer + FaceAwayFromPlayer MessageFromTarget TEXT_FINDING_EZLO, 0x36 WaitUntilTextboxCloses EzloMessage TEXT_FINDING_EZLO, 0x37 @@ -73,12 +73,12 @@ script_0800C824: Wait 0x000a SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_0800C87C: TriggerInteract SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems FacePlayer SetIntVariable 0x00000008 Call sub_0807F3D8 @@ -86,7 +86,7 @@ script_0800C87C: WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C87C script_0800C8AE: @@ -94,6 +94,6 @@ script_0800C8AE: WaitUntilTextboxCloses Wait 0x000a DoPostScriptAction 0x0000 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800C780 diff --git a/data/scripts/minishWoods/script_Syrup.inc b/data/scripts/minishWoods/script_Syrup.inc index 57a2af86..41d3ff92 100644 --- a/data/scripts/minishWoods/script_Syrup.inc +++ b/data/scripts/minishWoods/script_Syrup.inc @@ -26,7 +26,7 @@ script_080160E0: JumpIfNot script_0801611A MessageFromTarget TEXT_SYRUP, 0x07 WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_08016132 BuyItem ITEM_NONE, 0x0000 JumpIf script_0801610C @@ -36,7 +36,7 @@ script_080160E0: script_0801610C: WaitPlayerGetItem .ifndef EU - FaceAwayFromPlayer + FaceAwayFromPlayer MessageFromTarget TEXT_SYRUP, 0x0d .else MessageFromTarget TEXT_SYRUP, 0x08 diff --git a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc b/data/scripts/mtCrenel/script_CutsceneMiscObjectBrokenSword.inc index 86a041b4..89efa304 100644 --- a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc +++ b/data/scripts/mtCrenel/script_CutsceneMiscObjectBrokenSword.inc @@ -1,5 +1,5 @@ -@ Mines OBJECT_6A Broken Sword on Table? -SCRIPT_START script_Object6ABrokenSword +@ Mines CUTSCENE_MISC_OBJECT Broken Sword on Table? +SCRIPT_START script_CutsceneMiscObjectBrokenSword BeginBlock CheckInventory1 ITEM_FIRE_ELEMENT JumpIf script_0800D24C diff --git a/data/scripts/mtCrenel/script_Object6ARepairedSword.inc b/data/scripts/mtCrenel/script_CutsceneMiscObjectRepairedSword.inc index d857059e..6b673eca 100644 --- a/data/scripts/mtCrenel/script_Object6ARepairedSword.inc +++ b/data/scripts/mtCrenel/script_CutsceneMiscObjectRepairedSword.inc @@ -1,5 +1,5 @@ -@ Mines OBJECT_6A Repaired Sword on Table? -SCRIPT_START script_Object6ARepairedSword +@ Mines CUTSCENE_MISC_OBJECT Repaired Sword on Table? +SCRIPT_START script_CutsceneMiscObjectRepairedSword BeginBlock DoPostScriptAction 0x0008 EndBlock diff --git a/data/scripts/mtCrenel/script_EzloTalkCoF.inc b/data/scripts/mtCrenel/script_EzloTalkCoF.inc index fe3c5a82..72fc02c3 100644 --- a/data/scripts/mtCrenel/script_EzloTalkCoF.inc +++ b/data/scripts/mtCrenel/script_EzloTalkCoF.inc @@ -1,11 +1,11 @@ @ Mountain Ezlo text after beating CoF SCRIPT_START script_EzloTalkCoF SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x02 WaitUntilTextboxCloses SetLocalFlagByBank FLAG_BANK_1, 0x0002 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc index 8cc43395..311d82d7 100644 --- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc +++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc @@ -1,4 +1,4 @@ -@ Mountain Great Fairy OBJECT_69 +@ Mountain Great Fairy CUTSCENE_ORCHESTRATOR SCRIPT_START script_GreatFairyBombs BeginBlock EndBlock @@ -34,8 +34,8 @@ script_0800B7A2: SetFade7 WaitForFadeFinish ModHealth 0x00a0 - SetFade6 - WaitForFadeFinish + SetFade6 + WaitForFadeFinish MessageNoOverlap TEXT_ITEM_GET, 0x7f WaitUntilTextboxCloses Jump script_0800B6A6 diff --git a/data/scripts/mtCrenel/script_Melari.inc b/data/scripts/mtCrenel/script_Melari.inc index 59c02f84..74632ed9 100644 --- a/data/scripts/mtCrenel/script_Melari.inc +++ b/data/scripts/mtCrenel/script_Melari.inc @@ -30,7 +30,7 @@ script_0800CFFA: JumpIfNot script_0800CFFA EndBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems CheckInventory1 ITEM_GREEN_SWORD JumpIfNot script_0800D032 FacePlayer @@ -112,6 +112,6 @@ script_0800D17C: WaitUntilTextboxCloses Wait 0x000f EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu Jump script_0800CFFA .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_Object69FixBridge.inc b/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc index 5f3afa2b..4d285787 100644 --- a/data/scripts/northHyruleField/script_Object69FixBridge.inc +++ b/data/scripts/northHyruleField/script_CutsceneOrchestratorFixBridge.inc @@ -1,5 +1,5 @@ -@ Outside Caste OBJECT_69 Fix bridge -SCRIPT_START script_Object69FixBridge +@ Outside Caste CUTSCENE_ORCHESTRATOR Fix bridge +SCRIPT_START script_CutsceneOrchestratorFixBridge BeginBlock SetLocalFlag SOUGEN_06_SLIDE SetPlayerIdle diff --git a/data/scripts/npc/script_08012C48.inc b/data/scripts/npc/script_08012C48.inc index 18d2a03d..18ba3fce 100644 --- a/data/scripts/npc/script_08012C48.inc +++ b/data/scripts/npc/script_08012C48.inc @@ -1,4 +1,4 @@ -@ OBJECT_6A in sub_08095954 ? +@ CUTSCENE_MISC_OBJECT in sub_08095954 ? SCRIPT_START script_08012C48 BeginBlock DoPostScriptAction 0x0007 diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc index 8dbcf6d5..1a0c3f0b 100644 --- a/data/scripts/npc/script_BladeBrothers.inc +++ b/data/scripts/npc/script_BladeBrothers.inc @@ -12,7 +12,7 @@ script_08016204: CheckEntityInteractType JumpIfNot script_08016204 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems FacePlayer Call sub_08068CA0 JumpIf script_0801633E @@ -44,14 +44,14 @@ script_08016262: Call sub_08068F14 Call sub_08068BB4 CallWithArg EquipItem, 0x00010001 - Call sub_08068B84 - Call sub_0807F2A8 + Call BladeBrothers_StartPlayerDemonstration + Call WaitForPlayerMacro Call sub_08068BD0 Wait 0x001e Call sub_08068E18 WaitUntilTextboxCloses Call sub_08068EB4 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_080162CC: EndBlock @@ -72,7 +72,7 @@ script_080162F6: EndBlock DisablePlayerControl Call WaitForPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetPlayerIdle StopBgm PlaySound SFX_TASK_COMPLETE @@ -82,7 +82,7 @@ script_080162F6: script_0801631C: Call sub_08068E30 WaitUntilTextboxCloses - Call sub_08068C6C + Call BladeBrothers_GetScroll WaitPlayerGetItem WaitUntilTextboxCloses Jump script_08016346 @@ -94,7 +94,7 @@ script_0801633E: Call sub_08068E48 WaitUntilTextboxCloses script_08016346: - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl SetAnimationState 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc index 2aa74c78..9d281c12 100644 --- a/data/scripts/npc/script_Farmer.inc +++ b/data/scripts/npc/script_Farmer.inc @@ -6,24 +6,24 @@ SCRIPT_START script_Farmer CallWithArg sub_0806BC94, 0x00000000 EndBlock script_0800B0E8: - Call sub_0807F434 + Call CheckInteractType JumpTable script_0800B0E8, script_0800B0F6, script_0800B134 script_0800B0F6: SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call WaitForAnimDone FacePlayer CallWithArg sub_0806BC94, 0x00000004 Call sub_0806BCE8 WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 script_0800B134: SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call WaitForAnimDone FacePlayer CallWithArg sub_0806BC94, 0x00000004 @@ -34,7 +34,7 @@ script_0800B134: .endif Call sub_0806BCC0 script_0800B160: - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 diff --git a/data/scripts/npc/script_ForestMinish13.inc b/data/scripts/npc/script_ForestMinish13.inc index 00460f2c..28f13d5e 100644 --- a/data/scripts/npc/script_ForestMinish13.inc +++ b/data/scripts/npc/script_ForestMinish13.inc @@ -4,8 +4,8 @@ SCRIPT_START script_ForestMinish13 _0807E9D4 EndBlock script_08016612: - TriggerInteract - SetPlayerIdle + TriggerInteract + SetPlayerIdle MessageFromTarget TEXT_LOCATIONS, 0x02 WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc index d7a22778..aa780c91 100644 --- a/data/scripts/npc/script_MysteriousWall.inc +++ b/data/scripts/npc/script_MysteriousWall.inc @@ -12,12 +12,12 @@ script_0800B98A: _0807EA4C _0807E9F0 JumpIf script_0800B99E - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800B98A script_0800B99E: Call sub_0806F188 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_0800B9AC: DoPostScriptAction 0x0006 diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc index 09d94fef..130ad98a 100644 --- a/data/scripts/npc/script_Windcrest.inc +++ b/data/scripts/npc/script_Windcrest.inc @@ -10,7 +10,7 @@ script_0800B024: CheckEntityInteractType JumpIfNot script_0800B024 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems CheckGlobalFlag WARP_1ST JumpIf script_0800B082 CheckGlobalFlag WARP_MONUMENT @@ -42,7 +42,7 @@ script_0800B082: EzloMessage TEXT_EZLO, 0x5e WaitUntilTextboxCloses script_0800B09C: - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_08013F94.inc b/data/scripts/sanctuary/script_08013F94.inc index 473b9fa3..ad0a871e 100644 --- a/data/scripts/sanctuary/script_08013F94.inc +++ b/data/scripts/sanctuary/script_08013F94.inc @@ -15,12 +15,12 @@ script_08013FA4: EndBlock Call WaitForPlayerNormalOrTalkEzlo DisablePlayerControl - Call sub_0807DF38 + Call DisablePauseMenu Wait 0x0078 EzloMessage TEXT_PANEL_TUTORIAL, 0x05 WaitUntilTextboxCloses SetLocalFlag 0x007d - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08013FE0: DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6AEarthElement.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElement.inc index 6754c480..210b7d8a 100644 --- a/data/scripts/sanctuary/script_Object6AEarthElement.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElement.inc @@ -1,5 +1,5 @@ -@ Sanctuary second time OBJECT_6A Earth Element -SCRIPT_START script_Object6AEarthElement +@ Sanctuary second time CUTSCENE_MISC_OBJECT Earth Element +SCRIPT_START script_CutsceneMiscObjectEarthElement BeginBlock DoPostScriptAction 0x0007 Call SetCollisionLayer2 diff --git a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc index e6a7c7b8..29d74646 100644 --- a/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectEarthElementFloating.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A floating Earth Element -SCRIPT_START script_Object6AEarthElementFloating +@ Sanctuary CUTSCENE_MISC_OBJECT floating Earth Element +SCRIPT_START script_CutsceneMiscObjectEarthElementFloating BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0000 diff --git a/data/scripts/sanctuary/script_Object6AFireElement.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElement.inc index e82683c5..fccf6d76 100644 --- a/data/scripts/sanctuary/script_Object6AFireElement.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElement.inc @@ -1,5 +1,5 @@ -@ Sanctuary second time OBJECT_6A Fire Element -SCRIPT_START script_Object6AFireElement +@ Sanctuary second time CUTSCENE_MISC_OBJECT Fire Element +SCRIPT_START script_CutsceneMiscObjectFireElement BeginBlock DoPostScriptAction 0x0007 Call SetCollisionLayer2 diff --git a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc index 65938a07..b45d6891 100644 --- a/data/scripts/sanctuary/script_Object6AFireElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectFireElementFloating.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A floating Fire Element -SCRIPT_START script_Object6AFireElementFloating +@ Sanctuary CUTSCENE_MISC_OBJECT floating Fire Element +SCRIPT_START script_CutsceneMiscObjectFireElementFloating BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0002 diff --git a/data/scripts/sanctuary/script_Object6ASword2.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSword2.inc index 8723ac1a..2626f172 100644 --- a/data/scripts/sanctuary/script_Object6ASword2.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSword2.inc @@ -1,5 +1,5 @@ -@ Sanctuary second time OBJECT_6A sword? -SCRIPT_START script_Object6ASword2 +@ Sanctuary second time CUTSCENE_MISC_OBJECT sword? +SCRIPT_START script_CutsceneMiscObjectSword2 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0009 diff --git a/data/scripts/sanctuary/script_Object6ASword3.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSword3.inc index 1cd22b94..7d0745cf 100644 --- a/data/scripts/sanctuary/script_Object6ASword3.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSword3.inc @@ -1,5 +1,5 @@ -@ Sanctuary third time OBJECT_6A ? -SCRIPT_START script_Object6ASword3 +@ Sanctuary third time CUTSCENE_MISC_OBJECT ? +SCRIPT_START script_CutsceneMiscObjectSword3 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x000a diff --git a/data/scripts/sanctuary/script_Object6ASwordChange1.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordChange1.inc index 6285b5c4..4069fbd8 100644 --- a/data/scripts/sanctuary/script_Object6ASwordChange1.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordChange1.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A Sword charging? -SCRIPT_START script_Object6ASwordChange1 +@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging? +SCRIPT_START script_CutsceneMiscObjectSwordChange1 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge10.inc index 31fd102a..a3858810 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge10.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge10.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A Sword charging 5? -SCRIPT_START script_Object6ASwordCharge10 +@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 5? +SCRIPT_START script_CutsceneMiscObjectSwordCharge10 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0015 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge11.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge11.inc index 9bc8084e..5a160ea7 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge11.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge11.inc @@ -1,10 +1,10 @@ -@ Sanctuary third time OBJECT_6A ? -SCRIPT_START script_Object6ASwordCharge11 +@ Sanctuary third time CUTSCENE_MISC_OBJECT ? +SCRIPT_START script_CutsceneMiscObjectSwordCharge11 CheckSyncFlagAndClear 0x00020000 JumpIf script_08014264 Wait 0x0008 CallWithArg sub_08095EAC, 0x00000000 - Jump script_Object6ASwordCharge11 + Jump script_CutsceneMiscObjectSwordCharge11 script_08014264: CallWithArg sub_08095EAC, 0x00000001 Jump script_08014264 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge2.inc index 4fbd87f4..dd3adb40 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge2.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge2.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A Sword charging 2? -SCRIPT_START script_Object6ASwordCharge2 +@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 2? +SCRIPT_START script_CutsceneMiscObjectSwordCharge2 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0001 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge3.inc index 79a859c2..66905ff2 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge3.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge3.inc @@ -1,5 +1,5 @@ -@ Sanctuary second time OBJECT_6A sword charging? -SCRIPT_START script_Object6ASwordCharge3 +@ Sanctuary second time CUTSCENE_MISC_OBJECT sword charging? +SCRIPT_START script_CutsceneMiscObjectSwordCharge3 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0002 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge4.inc index dd4a6123..a65de2da 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge4.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge4.inc @@ -1,5 +1,5 @@ -@ Sanctuary third time OBJECT_6A ? -SCRIPT_START script_Object6ASwordCharge4 +@ Sanctuary third time CUTSCENE_MISC_OBJECT ? +SCRIPT_START script_CutsceneMiscObjectSwordCharge4 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0003 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge5.inc index 8dc55e5f..5c775a3b 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge5.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge5.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A Sword charging 3? -SCRIPT_START script_Object6ASwordCharge5 +@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 3? +SCRIPT_START script_CutsceneMiscObjectSwordCharge5 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0004 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge6.inc index 1a080034..b7369be8 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge6.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge6.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A Sword charging 3? -SCRIPT_START script_Object6ASwordCharge6 +@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 3? +SCRIPT_START script_CutsceneMiscObjectSwordCharge6 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0005 diff --git a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge7.inc index ab1e6db4..3c3dbe7d 100644 --- a/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge7.inc @@ -1,5 +1,5 @@ -@ Sanctuary second time OBJECT_6A sword charging? -SCRIPT_START script_Objet6ASwordCharge7 +@ Sanctuary second time CUTSCENE_MISC_OBJECT sword charging? +SCRIPT_START script_CutsceneMiscObjectSwordCharge7 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge8.inc index d86e5dce..28aa4a44 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge8.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge8.inc @@ -1,5 +1,5 @@ -@ Sanctuary third time OBJECT_6A ? -SCRIPT_START script_Object6ASwordCharge8 +@ Sanctuary third time CUTSCENE_MISC_OBJECT ? +SCRIPT_START script_CutsceneMiscObjectSwordCharge8 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0007 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge9.inc index 7b1b20c0..317ba5a6 100644 --- a/data/scripts/sanctuary/script_Object6ASwordCharge9.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordCharge9.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A Sword charging 4? -SCRIPT_START script_Object6ASwordCharge9 +@ Sanctuary CUTSCENE_MISC_OBJECT Sword charging 4? +SCRIPT_START script_CutsceneMiscObjectSwordCharge9 BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0014 diff --git a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordInPedestal.inc index b2096d46..f20ef241 100644 --- a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectSwordInPedestal.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A Sword in pedestal -SCRIPT_START script_Object6ASwordInPedestal +@ Sanctuary CUTSCENE_MISC_OBJECT Sword in pedestal +SCRIPT_START script_CutsceneMiscObjectSwordInPedestal BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0008 diff --git a/data/scripts/sanctuary/script_Object6ATextBoard.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc index 43b5a709..520adfe2 100644 --- a/data/scripts/sanctuary/script_Object6ATextBoard.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A text board -SCRIPT_START script_Object6ATextBoard +@ Sanctuary CUTSCENE_MISC_OBJECT text board +SCRIPT_START script_CutsceneMiscObjectTextBoard BeginBlock CheckLocalFlag 0x007a JumpIf script_08013C2A diff --git a/data/scripts/sanctuary/script_Object6AWaterElement.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElement.inc index e0617edf..3a895aa1 100644 --- a/data/scripts/sanctuary/script_Object6AWaterElement.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElement.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A Water Element -SCRIPT_START script_Object6AWaterElement +@ Sanctuary CUTSCENE_MISC_OBJECT Water Element +SCRIPT_START script_CutsceneMiscObjectWaterElement BeginBlock DoPostScriptAction 0x0007 Call SetCollisionLayer2 diff --git a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc index 9625d7c8..6d52dba8 100644 --- a/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWaterElementFloating.inc @@ -1,5 +1,5 @@ @ Sanctuary second time floating water element -SCRIPT_START script_Object6AWaterElementFloating +SCRIPT_START script_CutsceneMiscObjectWaterElementFloating BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0004 diff --git a/data/scripts/sanctuary/script_Object6AWindElement.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElement.inc index ab7eb8f0..fc11c969 100644 --- a/data/scripts/sanctuary/script_Object6AWindElement.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElement.inc @@ -1,5 +1,5 @@ -@ Sanctuary OBJECT_6A Wind Element -SCRIPT_START script_Object6AWindElement +@ Sanctuary CUTSCENE_MISC_OBJECT Wind Element +SCRIPT_START script_CutsceneMiscObjectWindElement BeginBlock DoPostScriptAction 0x0007 Call SetCollisionLayer2 diff --git a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc index 3ee4e871..c764dc05 100644 --- a/data/scripts/sanctuary/script_Object6AWindElementFloating.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectWindElementFloating.inc @@ -1,5 +1,5 @@ -@ Sanctuary third time OBJECT_6A ? -SCRIPT_START script_Object6AWindElementFloating +@ Sanctuary third time CUTSCENE_MISC_OBJECT ? +SCRIPT_START script_CutsceneMiscObjectWindElementFloating BeginBlock DoPostScriptAction 0x0007 SetAnimation 0x0006 diff --git a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc index 2cfbd8b8..a39258b4 100644 --- a/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc +++ b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc @@ -18,13 +18,13 @@ script_08013FF0: Call WaitForPlayerNormal BeginBlock SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EndBlock EzloMessage TEXT_PANEL_TUTORIAL, 0x08 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary WaitForSyncFlagAndClear 0x00000001 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_08013FF0 script_0801404C: diff --git a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc index 2c8bed4b..cd82075c 100644 --- a/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc +++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc @@ -29,7 +29,7 @@ SCRIPT_START script_Npc4EFinalSwordRumble CameraTargetPlayer SetLocalFlag 0x007c Call sub_08053250 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc index dcc7d6c7..50f58794 100644 --- a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc +++ b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc @@ -13,9 +13,9 @@ script_0801427C: script_08014298: CheckEntityInteractType JumpIfNot script_08014298 - SetPlayerIdle + SetPlayerIdle MessageFromTargetPos 0x0647, 0x000c WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_08014298 .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc index a5b9e51e..12cce538 100644 --- a/data/scripts/sanctuary/script_Npc4EPedestal.inc +++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc @@ -11,36 +11,36 @@ script_080134F8: CheckEntityInteractType JumpIfNot script_080134F8 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtPedestal WaitForSyncFlagAndClear 0x00000001 - CallWithArg sub_08095A1C, script_Object6ASwordInPedestal + CallWithArg sub_08095A1C, script_CutsceneMiscObjectSwordInPedestal PlaySound SFX_ELEMENT_PLACE Wait 0x005a BeginBlock PlaySound SFX_ELEMENT_FLOAT - CallWithArg sub_08095D54, script_Object6AEarthElementFloating - CallWithArg sub_08095D54, script_Object6AFireElementFloating + CallWithArg sub_08095D54, script_CutsceneMiscObjectEarthElementFloating + CallWithArg sub_08095D54, script_CutsceneMiscObjectFireElementFloating EndBlock WaitForSyncFlagAndClear 0x18000000 BeginBlock PlaySound SFX_ELEMENT_CHARGE - CallWithArg sub_08095D8C, script_Object6ASwordChange1 - CallWithArg sub_08095D8C, script_Object6ASwordCharge2 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordChange1 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge2 EndBlock Wait 0x001e BeginBlock PlaySound SFX_1D0 - CallWithArg sub_08095D8C, script_Object6ASwordCharge5 - CallWithArg sub_08095D8C, script_Object6ASwordCharge6 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge5 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge6 EndBlock Wait 0x003c CallWithArg CreateRepeatedSoundManager, 0x00000000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00002000 PlaySound SFX_1D2 - CallWithArg sub_08095D8C, script_Object6ASwordCharge9 - CallWithArg sub_08095D8C, script_Object6ASwordCharge10 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge9 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge10 SetSyncFlag 0x00000400 WaitForSyncFlagAndClear 0x00004000 Wait 0x0078 diff --git a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc index 5a51a5df..d83db674 100644 --- a/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc +++ b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc @@ -14,12 +14,12 @@ script_08013B1E: EndBlock SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_PANEL_TUTORIAL, 0x07 WaitUntilTextboxCloses StartPlayerScript script_PlayerSanctuary WaitForSyncFlagAndClear 0x00000001 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_08013B1E .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc index c6d2b619..7fac00e4 100644 --- a/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc @@ -6,7 +6,7 @@ script_08013CA6: JumpIfNot script_08013CA6 SetPlayerIdle Call WaitForPlayerNormal - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call CreatePlayerExclamationMark Wait 0x003c _0807F0B4 0x0001 @@ -20,7 +20,7 @@ script_08013CA6: EzloMessage TEXT_PANEL_TUTORIAL, 0x04 WaitUntilTextboxCloses SetLocalFlag 0x0079 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc index 3b76a072..5da4a9ad 100644 --- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc @@ -11,37 +11,37 @@ script_0801373C: CheckEntityInteractType JumpIfNot script_0801373C SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtPedestal WaitForSyncFlagAndClear 0x00000001 - CallWithArg sub_08095A1C, script_Object6ASword2 + CallWithArg sub_08095A1C, script_CutsceneMiscObjectSword2 PlaySound SFX_ELEMENT_PLACE Wait 0x005a BeginBlock PlaySound SFX_ELEMENT_FLOAT - CallWithArg sub_08095D54, script_Object6AWaterElementFloating + CallWithArg sub_08095D54, script_CutsceneMiscObjectWaterElementFloating EndBlock WaitForSyncFlagAndClear 0x20000000 BeginBlock PlaySound SFX_ELEMENT_CHARGE - CallWithArg sub_08095D8C, script_Object6ASwordChange1 - CallWithArg sub_08095D8C, script_Object6ASwordCharge2 - CallWithArg sub_08095D8C, script_Object6ASwordCharge3 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordChange1 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge2 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge3 EndBlock Wait 0x001e BeginBlock PlaySound SFX_1D0 - CallWithArg sub_08095D8C, script_Object6ASwordCharge5 - CallWithArg sub_08095D8C, script_Object6ASwordCharge6 - CallWithArg sub_08095D8C, script_Objet6ASwordCharge7 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge5 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge6 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge7 EndBlock Wait 0x003c CallWithArg CreateRepeatedSoundManager, 0x00000000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00002000 PlaySound SFX_1D2 - CallWithArg sub_08095D8C, script_Object6ASwordCharge9 - CallWithArg sub_08095D8C, script_Object6ASwordCharge10 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge9 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge10 SetSyncFlag 0x00000400 WaitForSyncFlagAndClear 0x00004000 SetSyncFlag 0x00000800 @@ -75,7 +75,7 @@ script_0801373C: SetSyncFlag 0x00040000 SetLocalFlag 0x007b Call sub_08053250 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc index ecd6d4b6..ed7ce571 100644 --- a/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc +++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc @@ -18,7 +18,7 @@ SCRIPT_START script_Npc4ESpawnTextBoard CameraTargetPlayer SetLocalFlag 0x007a Call sub_08053250 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index bd8b7e61..3bab3e34 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -11,39 +11,39 @@ script_080138D0: CheckEntityInteractType JumpIfNot script_080138D0 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems StartPlayerScript script_PlayerAtPedestal WaitForSyncFlagAndClear 0x00000001 - CallWithArg sub_08095A1C, script_Object6ASword3 + CallWithArg sub_08095A1C, script_CutsceneMiscObjectSword3 PlaySound SFX_ELEMENT_PLACE Wait 0x005a BeginBlock PlaySound SFX_ELEMENT_FLOAT - CallWithArg sub_08095D54, script_Object6AWindElementFloating + CallWithArg sub_08095D54, script_CutsceneMiscObjectWindElementFloating EndBlock WaitForSyncFlagAndClear 0x40000000 BeginBlock PlaySound SFX_ELEMENT_CHARGE - CallWithArg sub_08095D8C, script_Object6ASwordChange1 - CallWithArg sub_08095D8C, script_Object6ASwordCharge2 - CallWithArg sub_08095D8C, script_Object6ASwordCharge3 - CallWithArg sub_08095D8C, script_Object6ASwordCharge4 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordChange1 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge2 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge3 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge4 EndBlock Wait 0x001e BeginBlock PlaySound SFX_1D0 - CallWithArg sub_08095D8C, script_Object6ASwordCharge5 - CallWithArg sub_08095D8C, script_Object6ASwordCharge6 - CallWithArg sub_08095D8C, script_Objet6ASwordCharge7 - CallWithArg sub_08095D8C, script_Object6ASwordCharge8 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge5 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge6 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge7 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge8 EndBlock Wait 0x003c CallWithArg CreateRepeatedSoundManager, 0x00000000 SetSyncFlag 0x00000200 WaitForSyncFlagAndClear 0x00002000 PlaySound SFX_1D2 - CallWithArg sub_08095D8C, script_Object6ASwordCharge9 - CallWithArg sub_08095D8C, script_Object6ASwordCharge10 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge9 + CallWithArg sub_08095D8C, script_CutsceneMiscObjectSwordCharge10 SetSyncFlag 0x00000400 WaitForSyncFlagAndClear 0x00004000 SetSyncFlag 0x00000800 @@ -85,9 +85,9 @@ script_080138D0: .endif Call NPC4E_SaveEquippedItems CallWithArg EquipItem, 0x00010001 - CallWithArg SetInputMacro, gUnk_080049FE + CallWithArg SetPlayerMacro, gUnk_080049FE Wait 0x00c8 - CallWithArg SetInputMacro, 0x00000000 + CallWithArg SetPlayerMacro, 0x00000000 Call NPC4E_RestoreEquippedItems script_08013A8E: .ifndef EU diff --git a/data/scripts/sanctuary/script_PlayerGetElement.inc b/data/scripts/sanctuary/script_PlayerGetElement.inc index 71bf1bb6..c73af53c 100644 --- a/data/scripts/sanctuary/script_PlayerGetElement.inc +++ b/data/scripts/sanctuary/script_PlayerGetElement.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerGetElement BeginBlock SetEntitySpeed 0x0140 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EndBlock Wait 0x0078 PlayBgm BGM_ELEMENT_THEME diff --git a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc index ed6b1b3e..7ef157da 100644 --- a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc @@ -1,6 +1,6 @@ @ Player at Sanctuary draw final sword SCRIPT_START script_PlayerPickUpFinalSword - CallWithArg sub_08095E7C, script_Object6ASwordCharge11 + CallWithArg sub_08095E7C, script_CutsceneMiscObjectSwordCharge11 PlaySound SFX_1D3 CallWithArg SetPlayerAnimation2, 0x000008e3 Call sub_08096028 diff --git a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc b/data/scripts/southHyruleField/script_CutsceneOrchestratorLinksHouseBed.inc index 67767627..3355b498 100644 --- a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc +++ b/data/scripts/southHyruleField/script_CutsceneOrchestratorLinksHouseBed.inc @@ -1,5 +1,5 @@ -@ Links house OBJECT_69 bed -SCRIPT_START script_Object69LinksHouseBed +@ Links house CUTSCENE_ORCHESTRATOR bed +SCRIPT_START script_CutsceneOrchestratorLinksHouseBed BeginBlock EndBlock script_08009DF0: @@ -11,7 +11,7 @@ script_08009DF0: EzloMessage TEXT_SMITH, 0x07 CheckTextboxResult JumpIfNot script_08009E4E - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetFadeTime 0x0002 SetFade5 WaitForFadeFinish @@ -23,7 +23,7 @@ script_08009DF0: Wait 0x000f WaitUntilTextboxCloses EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu DoPostScriptAction 0x0006 SCRIPT_END script_08009E4E: diff --git a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc index dc707d43..cc3556b4 100644 --- a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc +++ b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc @@ -1,7 +1,7 @@ @ Player waking up after rest SCRIPT_START script_PlayerWakeAfterRest BeginBlock - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EndBlock WaitForSyncFlagAndClear 0x00000002 SetFadeTime 0x0002 diff --git a/data/scripts/unused/script_0800B828.inc b/data/scripts/unused/script_0800B828.inc index 89a36e66..c14c7a3c 100644 --- a/data/scripts/unused/script_0800B828.inc +++ b/data/scripts/unused/script_0800B828.inc @@ -6,8 +6,8 @@ SCRIPT_START script_0800B828 DoPostScriptAction 0x000a EndBlock script_0800B836: - TriggerInteract - SetPlayerIdle + TriggerInteract + SetPlayerIdle MessageFromTarget TEXT_EMPTY, 0x01 WaitUntilTextboxCloses Wait 0x000f @@ -43,8 +43,8 @@ script_0800B87E: script_0800B89E: CheckEntityInteractType JumpIfNot script_0800B89E - SetPlayerIdle - FacePlayer + SetPlayerIdle + FacePlayer MessageFromTarget TEXT_EMPTY, 0x01 WaitUntilTextboxCloses Wait 0x000f diff --git a/data/scripts/unused/script_0800D84C.inc b/data/scripts/unused/script_0800D84C.inc index 0ac50278..31058f54 100644 --- a/data/scripts/unused/script_0800D84C.inc +++ b/data/scripts/unused/script_0800D84C.inc @@ -6,9 +6,9 @@ script_0800D850: CheckRoomFlag 0x0000 JumpIfNot script_0800D850 SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Wait 0x003c - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/unused/script_08012C68.inc b/data/scripts/unused/script_08012C68.inc index a0701123..f4c081b7 100644 --- a/data/scripts/unused/script_08012C68.inc +++ b/data/scripts/unused/script_08012C68.inc @@ -9,8 +9,8 @@ SCRIPT_START script_08012C68 script_08012C7E: CheckEntityInteractType JumpIfNot script_08012C7E - SetPlayerIdle - _0807E8E4_0 + SetPlayerIdle + _0807E8E4_0 MessageFromTarget TEXT_FINDING_EZLO, 0x1d WaitUntilTextboxCloses SetGlobalFlag ENTRANCE_OK diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc index e25f9903..e6357030 100644 --- a/data/scripts/unused/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -34,7 +34,7 @@ SCRIPT_START script_08016482 MessageNoOverlap 0x0601 MessageFromTargetPos_1 TEXT_LOCATIONS, 0x01 MessageFromTargetTable TEXT_LOCATIONS << 8 | 0x01, TEXT_LOCATIONS << 8 | 0x02, TEXT_LOCATIONS << 8 | 0x03 - MessageNoOverlapVar + MessageNoOverlapVar EzloMessage TEXT_LOCATIONS, 0x02 _0807EB38 SetAnimationState 0x0000 diff --git a/data/scripts/veilFalls/script_BigGoron3.inc b/data/scripts/veilFalls/script_BigGoron3.inc index e06e322b..c3d78354 100644 --- a/data/scripts/veilFalls/script_BigGoron3.inc +++ b/data/scripts/veilFalls/script_BigGoron3.inc @@ -7,7 +7,7 @@ script_0800934E: CheckEntityInteractType JumpIfNot script_0800934E SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems Call sub_0806D638 _0807F0B4 0x0001 CameraTargetEntity @@ -23,6 +23,6 @@ script_08009376: Wait 0x002d _0807F0B4 0x0004 EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu Jump script_0800934E SCRIPT_END diff --git a/data/scripts/veilFalls/script_BigGoronTalk.inc b/data/scripts/veilFalls/script_BigGoronTalk.inc index c77e34ca..fe571bf7 100644 --- a/data/scripts/veilFalls/script_BigGoronTalk.inc +++ b/data/scripts/veilFalls/script_BigGoronTalk.inc @@ -23,9 +23,9 @@ script_080093DA: JumpIf script_080093EE SetIntVariable 0x00001d04 script_080093EE: - MessageNoOverlapVar + MessageNoOverlapVar WaitUntilTextboxCloses - CheckTextboxResult + CheckTextboxResult JumpIfNot script_08009376 Wait 0x001e MessageNoOverlap TEXT_GORONS, 0x08 @@ -39,7 +39,7 @@ script_080093EE: SetLocalFlag DAIGORON_EXCHG SetLocalFlag DAIGORON_SHIELD Call sub_0806D5D4 - FaceAwayFromPlayer + FaceAwayFromPlayer MessageNoOverlap TEXT_GORONS, 0x09 WaitUntilTextboxCloses Wait 0x000a diff --git a/data/scripts/veilFalls/script_Object6AMirrorShield.inc b/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc index ad578502..bc49bebb 100644 --- a/data/scripts/veilFalls/script_Object6AMirrorShield.inc +++ b/data/scripts/veilFalls/script_CutsceneMiscObjectMirrorShield.inc @@ -1,5 +1,5 @@ -@ Veil Falls OBJECT_6A Mirror Shield being spit out -SCRIPT_START script_Object6AMirrorShield +@ Veil Falls CUTSCENE_MISC_OBJECT Mirror Shield being spit out +SCRIPT_START script_CutsceneMiscObjectMirrorShield BeginBlock Call sub_0806D804 SetEntitySpeed 0x0180 diff --git a/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc b/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc index a17305b5..051cfe84 100644 --- a/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc +++ b/data/scripts/veilFalls/script_CutsceneMiscObjectVeilFallsTop.inc @@ -1,5 +1,5 @@ -@ OBJECT_6A in Veil Falls Top? -SCRIPT_START script_Object6AVeilFallsTop +@ CUTSCENE_MISC_OBJECT in Veil Falls Top? +SCRIPT_START script_CutsceneMiscObjectVeilFallsTop BeginBlock Call sub_0806D7C4 SetEntitySpeed 0x0080 diff --git a/data/scripts/veilFalls/script_MinishVillageObjectLeftStone.inc b/data/scripts/veilFalls/script_MinishVillageObjectLeftStone.inc new file mode 100644 index 00000000..8005afe9 --- /dev/null +++ b/data/scripts/veilFalls/script_MinishVillageObjectLeftStone.inc @@ -0,0 +1,5 @@ +@ Veil Falls MINISH_VILLAGE_OBJECT left stone +SCRIPT_START script_MinishVillageObjectLeftStone + OffsetEntityPosition 0xfff0, 0x0000 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc b/data/scripts/veilFalls/script_MinishVillageObjectLeftStoneOpening.inc index 05eff443..3d552cdb 100644 --- a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc +++ b/data/scripts/veilFalls/script_MinishVillageObjectLeftStoneOpening.inc @@ -1,8 +1,8 @@ -@ Waterfalls OBJECT_3E during kinstone cutscene? -SCRIPT_START script_Object3ELeftStoneOpening +@ Waterfalls MINISH_VILLAGE_OBJECT during kinstone cutscene? +SCRIPT_START script_MinishVillageObjectLeftStoneOpening BeginBlock CheckKinstoneFused KINSTONE_9 - JumpIf script_Object3ELeftStone + JumpIf script_MinishVillageObjectLeftStone EndBlock WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0010 diff --git a/data/scripts/veilFalls/script_MinishVillageObjectRightStone.inc b/data/scripts/veilFalls/script_MinishVillageObjectRightStone.inc new file mode 100644 index 00000000..1353f6c2 --- /dev/null +++ b/data/scripts/veilFalls/script_MinishVillageObjectRightStone.inc @@ -0,0 +1,5 @@ +@ Veil Falls MINISH_VILLAGE_OBJECT right stone +SCRIPT_START script_MinishVillageObjectRightStone + OffsetEntityPosition 0x0010, 0x0000 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc b/data/scripts/veilFalls/script_MinishVillageObjectRightStoneOpening.inc index a320d555..f5194dff 100644 --- a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc +++ b/data/scripts/veilFalls/script_MinishVillageObjectRightStoneOpening.inc @@ -1,8 +1,8 @@ -@ Waterfalls OBJECT_3E during kinstone cutscene? -SCRIPT_START script_Object3ERightStoneOpening +@ Waterfalls MINISH_VILLAGE_OBJECT during kinstone cutscene? +SCRIPT_START script_MinishVillageObjectRightStoneOpening BeginBlock CheckKinstoneFused KINSTONE_9 - JumpIf script_Object3ERightStone + JumpIf script_MinishVillageObjectRightStone EndBlock WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0010 diff --git a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc index 736af241..6bac4d40 100644 --- a/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc +++ b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc @@ -14,7 +14,7 @@ script_08015FE4: SetPlayerIdle CheckKinstoneFused KINSTONE_9 JumpIf script_08015FFE - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_08015FE4 script_08015FFE: diff --git a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc index ce541b3c..49eddb72 100644 --- a/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc +++ b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc @@ -6,7 +6,7 @@ SCRIPT_START script_NPC4ESouurceOfTheFlowOpening PlaySound SFX_SECRET EzloMessage TEXT_EZLO, 0x1f WaitUntilTextboxCloses - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl script_08016028: DoPostScriptAction 0x0006 diff --git a/data/scripts/veilFalls/script_Object3ELeftStone.inc b/data/scripts/veilFalls/script_Object3ELeftStone.inc deleted file mode 100644 index d92ea126..00000000 --- a/data/scripts/veilFalls/script_Object3ELeftStone.inc +++ /dev/null @@ -1,5 +0,0 @@ -@ Veil Falls OBJECT_3E left stone -SCRIPT_START script_Object3ELeftStone - OffsetEntityPosition 0xfff0, 0x0000 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/veilFalls/script_Object3ERightStone.inc b/data/scripts/veilFalls/script_Object3ERightStone.inc deleted file mode 100644 index 76e0ddbd..00000000 --- a/data/scripts/veilFalls/script_Object3ERightStone.inc +++ /dev/null @@ -1,5 +0,0 @@ -@ Veil Falls OBJECT_3E right stone -SCRIPT_START script_Object3ERightStone - OffsetEntityPosition 0x0010, 0x0000 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/westernWood/script_MoblinLady.inc b/data/scripts/westernWood/script_MoblinLady.inc index df8e7fcf..14b466f9 100644 --- a/data/scripts/westernWood/script_MoblinLady.inc +++ b/data/scripts/westernWood/script_MoblinLady.inc @@ -8,8 +8,8 @@ SCRIPT_START script_MoblinLady script_08012338: CheckEntityInteractType JumpIfNot script_08012338 - FacePlayer - SetPlayerIdle + FacePlayer + SetPlayerIdle MessageFromTarget TEXT_PERCY, 0x04 WaitUntilTextboxCloses CheckLocalFlag 0x0042 diff --git a/data/scripts/westernWood/script_MoblinLadyDisguised.inc b/data/scripts/westernWood/script_MoblinLadyDisguised.inc index 4f0809c8..5da1318b 100644 --- a/data/scripts/westernWood/script_MoblinLadyDisguised.inc +++ b/data/scripts/westernWood/script_MoblinLadyDisguised.inc @@ -22,7 +22,7 @@ script_08012298: Call sub_08061FD8 MessageFromTarget TEXT_PERCY, 0x02 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl SetGlobalFlag DASHBOOTS Jump script_08012284 script_080122BA: @@ -41,7 +41,7 @@ script_080122CE: Call sub_08061FD8 MessageFromTarget TEXT_PERCY, 0x03 WaitUntilTextboxCloses - EnablePlayerControl + EnablePlayerControl Jump script_080122BA script_080122EC: EndBlock diff --git a/data/scripts/windRuins/script_EzloTalkFoW.inc b/data/scripts/windRuins/script_EzloTalkFoW.inc index 6c2cb205..53791ef7 100644 --- a/data/scripts/windRuins/script_EzloTalkFoW.inc +++ b/data/scripts/windRuins/script_EzloTalkFoW.inc @@ -1,11 +1,11 @@ @ Ezlo talk after Wind Ruins SCRIPT_START script_EzloTalkFoW SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems EzloMessage TEXT_EZLO_ELEMENTS_DONE, 0x03 WaitUntilTextboxCloses SetLocalFlagByBank FLAG_BANK_1, 0x0003 - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc index 4b05dec7..aca66f3f 100644 --- a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc +++ b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc @@ -8,7 +8,7 @@ SCRIPT_START script_Npc4EReceiveOcarina script_0800D8F4: CheckInventory1 ITEM_OCARINA JumpIfNot script_0800D8F4 - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems SetPlayerIdle WaitPlayerGetItem EzloMessage TEXT_VAATI, 0x25 @@ -17,7 +17,7 @@ script_0800D8F4: SetIntVariable 0x00000000 Call sub_0806DA1C EnablePlayerControl - Call sub_0807DF50 + Call EnablePauseMenu script_0800D924: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc index 79244332..84713eee 100644 --- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc +++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc @@ -10,13 +10,13 @@ script_0800D88E: CheckEntityInteractType JumpIfNot script_0800D88E SetPlayerIdle - Call sub_0807DF28 + Call DisablePauseMenuAndPutAwayItems CheckLocalFlag 0x0045 JumpIf script_0800D8B0 StartPlayerScript script_PlayerAtTextboard WaitForSyncFlagAndClear 0x00000001 script_0800D8B0: - _0807E8E4_0 + _0807E8E4_0 MessageNoOverlap TEXT_VAATI, 0x24 WaitUntilTextboxCloses CheckInventory1 ITEM_OCARINA @@ -28,7 +28,7 @@ script_0800D8CE: CheckLocalFlag 0x0045 JumpIfNot script_0800D8CE script_0800D8D6: - Call sub_0807DF50 + Call EnablePauseMenu EnablePlayerControl Jump script_0800D88E .2byte 0x0000 |