diff options
Diffstat (limited to 'data/scripts/cloudTops')
| -rw-r--r-- | data/scripts/cloudTops/script_CutsceneMiscObjectMysteriousCloud.inc (renamed from data/scripts/cloudTops/script_Object6AMysteriousCloud.inc) | 4 | ||||
| -rw-r--r-- | data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc (renamed from data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc) | 6 | ||||
| -rw-r--r-- | data/scripts/cloudTops/script_EzloTalkPoW.inc | 4 | ||||
| -rw-r--r-- | data/scripts/cloudTops/script_GregalSick.inc | 10 | ||||
| -rw-r--r-- | data/scripts/cloudTops/script_Npc4EFirstCloud.inc | 4 | ||||
| -rw-r--r-- | data/scripts/cloudTops/script_Npc4EKinstoneFused.inc | 2 | ||||
| -rw-r--r-- | data/scripts/cloudTops/script_WindTribespeople6.inc | 6 |
7 files changed, 18 insertions, 18 deletions
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 |