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/hyruleCastle | |
| parent | ccba86d292a0e4c8a0e07325ac4fb25e5a58dc89 (diff) | |
Rename objects
Diffstat (limited to 'data/scripts/hyruleCastle')
| -rw-r--r-- | data/scripts/hyruleCastle/script_CutsceneOrchestratorSanctuaryEntrance.inc (renamed from data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc) | 10 | ||||
| -rw-r--r-- | data/scripts/hyruleCastle/script_SmithAtCastle.inc | 4 | ||||
| -rw-r--r-- | data/scripts/hyruleCastle/script_StoneZelda.inc | 6 |
3 files changed, 10 insertions, 10 deletions
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 |