diff options
Diffstat (limited to 'data/scripts/cloudTops')
18 files changed, 72 insertions, 72 deletions
diff --git a/data/scripts/cloudTops/script_EzloTalkPoW.inc b/data/scripts/cloudTops/script_EzloTalkPoW.inc index bba202e7..a8980ffa 100644 --- a/data/scripts/cloudTops/script_EzloTalkPoW.inc +++ b/data/scripts/cloudTops/script_EzloTalkPoW.inc @@ -1,12 +1,12 @@ @ Ezlo talk after getting wind element SCRIPT_START script_EzloTalkPoW - _0807E864 + SetPlayerIdle Call sub_0807DF28 - _0807EB28 0x1c05 + EzloMessage 0x1c05 WaitUntilTextboxCloses SetLocalFlagByBank 0x0100, 0x0005 Call sub_0807DF50 - _0807E878 + EnablePlayerControl DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc index 646b5d39..8f96aa4f 100644 --- a/data/scripts/cloudTops/script_GregalHealthy.inc +++ b/data/scripts/cloudTops/script_GregalHealthy.inc @@ -3,14 +3,14 @@ SCRIPT_START script_GregalHealthy BeginBlock Call sub_0806CD58 DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0006 + SetAnimationState 0x0004 + SetAnimation 0x0006 EndBlock script_08014C42: CheckEntityInteractType JumpIfNot script_08014C42 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer script_08014C4C: Call sub_0806CCD0 JumpIfNot script_08014C4C @@ -30,7 +30,7 @@ script_08014C7C: WaitUntilTextboxCloses script_08014C82: Wait 0x000f - _0807E878 - _0807EB44 0x0004 - _0807E930 0x0006 + EnablePlayerControl + SetAnimationState 0x0004 + SetAnimation 0x0006 Jump script_08014C42 diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc index dac29473..038c7f29 100644 --- a/data/scripts/cloudTops/script_GregalSick.inc +++ b/data/scripts/cloudTops/script_GregalSick.inc @@ -2,7 +2,7 @@ SCRIPT_START script_GregalSick BeginBlock DoPostScriptAction 0x000a - _0807E930 0x0000 + SetAnimation 0x0000 EndBlock CheckLocalFlag 0x0063 JumpIf script_08014BE8 @@ -14,21 +14,21 @@ script_08014B48: CheckEntityInteractType JumpIfNot script_08014B48 EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2f01 WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014B48 script_08014B70: EndBlock - _0807E864 + SetPlayerIdle Call sub_0807DF28 SetSyncFlag 0x00000001 DoPostScriptAction 0x0004 WaitForSyncFlagAndClear 0x00000002 - _0807E930 0x0010 + SetAnimation 0x0010 Call sub_0806CCF8 Wait 0x0014 Call sub_0806CD04 @@ -46,14 +46,14 @@ script_08014B70: SetSyncFlag 0x00000001 WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 - _0807E878 + EnablePlayerControl script_08014BE8: - _0807E930 0x0010 + SetAnimation 0x0010 Call sub_0806CD4C script_08014BF2: CheckEntityInteractType JumpIfNot script_08014BF2 - _0807E864 + SetPlayerIdle CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 @@ -68,5 +68,5 @@ script_08014C1C: WaitUntilTextboxCloses script_08014C22: Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014BF2 diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 14cce552..bec3df8e 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -2,7 +2,7 @@ @ Reponsible for Kinstone cutscenes SCRIPT_START script_Npc4EFirstCloud BeginBlock - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x000b DoPostScriptAction 0x0008 Call sub_0806DAAC @@ -16,10 +16,10 @@ script_0800D636: Call sub_0806DAAC JumpIf script_0800D650 Call sub_0807DF50 - _0807E878 + EnablePlayerControl Jump script_0800D636 script_0800D650: - _0807E864 + SetPlayerIdle Call sub_0807DF28 Call sub_0807FBC4 Call sub_0807FBA0 diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index 91d9eae4..8f86a3a7 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Npc4EKinstoneFused _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807FBCC - _0807E878 + EnablePlayerControl Call sub_0807DF50 script_0800D6AE: DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc index c2d465d4..8053cca1 100644 --- a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc @@ -1,7 +1,7 @@ @ Cloud Tops OBJECT_69 great whirlwind revealed SCRIPT_START script_Object69GreatWhirlwindRevealed BeginBlock - Call sub_0807F360 + Call SetPriorityHighest SetEntitySpeed 0x0700 _0807F0B4 0x0007 CameraTargetEntity @@ -17,7 +17,7 @@ SCRIPT_START script_Object69GreatWhirlwindRevealed _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807FBCC - _0807E878 + EnablePlayerControl Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc b/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc index f2c812eb..686d63dd 100644 --- a/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc +++ b/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Object6AMysteriousCloud BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x0011 - Call sub_0807F158 + Call SetCollisionLayer1 Call sub_0807F738 EndBlock SCRIPT_END diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc index 5dd59161..ceeed89f 100644 --- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PlayerAtSiroc SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0078, 0x0040 - _0807EB44 0x0000 + SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 Call sub_080791BC diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc index 679d1966..94c1d72c 100644 --- a/data/scripts/cloudTops/script_Siroc.inc +++ b/data/scripts/cloudTops/script_Siroc.inc @@ -5,13 +5,13 @@ SCRIPT_START script_Siroc DoPostScriptAction 0x000a EndBlock script_08014AD2: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014AD2 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer StartPlayerScript script_PlayerAtSiroc WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer CheckLocalFlag 0x0064 JumpIf script_08014AFE SetLocalFlag 0x0064 @@ -22,6 +22,6 @@ script_08014AFE: script_08014B02: WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014AD2 .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople1.inc b/data/scripts/cloudTops/script_WindTribespeople1.inc index 987d6b13..94a6feb5 100644 --- a/data/scripts/cloudTops/script_WindTribespeople1.inc +++ b/data/scripts/cloudTops/script_WindTribespeople1.inc @@ -5,17 +5,17 @@ SCRIPT_START script_WindTribespeople1 DoPostScriptAction 0x000a CheckGlobalFlag 0x0058 JumpIf script_08014976 - _0807EB44 0x0004 + SetAnimationState 0x0004 SetEntityPositionRelative 0x0078, 0x0128 script_08014976: EndBlock script_08014978: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014978 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014978 diff --git a/data/scripts/cloudTops/script_WindTribespeople2.inc b/data/scripts/cloudTops/script_WindTribespeople2.inc index 6cf49d01..f8fa2804 100644 --- a/data/scripts/cloudTops/script_WindTribespeople2.inc +++ b/data/scripts/cloudTops/script_WindTribespeople2.inc @@ -7,14 +7,14 @@ SCRIPT_START script_WindTribespeople2 JumpIfNot script_080149C6 EndBlock script_080149AA: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_080149AA - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_080149AA script_080149C6: DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc index 01977684..84c60935 100644 --- a/data/scripts/cloudTops/script_WindTribespeople3.inc +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -6,10 +6,10 @@ SCRIPT_START script_WindTribespeople3 DoPostScriptAction 0x000a EndBlock script_080149DE: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_080149DE - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses CheckLocalFlag 0x0064 @@ -21,10 +21,10 @@ script_080149DE: DoPostScriptAction 0x0001 _0807EDD4 0x0068, 0x00f8 PlaySound SFX_SECRET - _0807EB74 + FacePlayer DoPostScriptAction 0x0000 DoPostScriptAction 0x000a script_08014A20: - _0807E878 + EnablePlayerControl Jump script_080149DE .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople4.inc b/data/scripts/cloudTops/script_WindTribespeople4.inc index 31e036e3..ba6fb854 100644 --- a/data/scripts/cloudTops/script_WindTribespeople4.inc +++ b/data/scripts/cloudTops/script_WindTribespeople4.inc @@ -5,13 +5,13 @@ SCRIPT_START script_WindTribespeople4 DoPostScriptAction 0x000a EndBlock script_08014A36: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014A36 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014A36 .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople5.inc b/data/scripts/cloudTops/script_WindTribespeople5.inc index cf3a995e..698f9bb2 100644 --- a/data/scripts/cloudTops/script_WindTribespeople5.inc +++ b/data/scripts/cloudTops/script_WindTribespeople5.inc @@ -5,13 +5,13 @@ SCRIPT_START script_WindTribespeople5 DoPostScriptAction 0x000a EndBlock script_08014A62: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014A62 - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses Wait 0x000f - _0807E878 + EnablePlayerControl Jump script_08014A62 .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople6.inc b/data/scripts/cloudTops/script_WindTribespeople6.inc index fea83201..0633f743 100644 --- a/data/scripts/cloudTops/script_WindTribespeople6.inc +++ b/data/scripts/cloudTops/script_WindTribespeople6.inc @@ -4,7 +4,7 @@ SCRIPT_START script_WindTribespeople6 DoPostScriptAction 0x000a EndBlock WaitForSyncFlagAndClear 0x00000001 - _0807EB74 + FacePlayer DoPostScriptAction 0x0004 SetSyncFlag 0x00000002 WaitForSyncFlagAndClear 0x00000001 @@ -12,12 +12,12 @@ SCRIPT_START script_WindTribespeople6 WaitUntilTextboxCloses SetSyncFlag 0x00000002 script_08014AAC: - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014AAC - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer MessageNoOverlap 0x2f0a WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014AAC .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople7.inc b/data/scripts/cloudTops/script_WindTribespeople7.inc index a4c71788..72962d45 100644 --- a/data/scripts/cloudTops/script_WindTribespeople7.inc +++ b/data/scripts/cloudTops/script_WindTribespeople7.inc @@ -12,14 +12,14 @@ script_08014CAE: BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 - _0807E30C + FacePlayerAndCheckDist JumpIfNot script_08014CAE EndBlock - _0807E864 - _0807EB74 + SetPlayerIdle + FacePlayer Call sub_0806C90C WaitUntilTextboxCloses - _0807E878 + EnablePlayerControl Jump script_08014CAE script_08014CD4: DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc index 0561a0fb..c5d77432 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc @@ -1,10 +1,10 @@ @ Cloud Tops WindTribespeople great whirlwind revealed 2 SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 BeginBlock - Call sub_0807F360 + Call SetPriorityHighest DoPostScriptAction 0x000b SetEntitySpeed 0x0200 - _0807EB44 0x0004 + SetAnimationState 0x0004 DoPostScriptAction 0x0000 EndBlock WaitForSyncFlagAndClear 0x00000008 @@ -13,14 +13,14 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 PlaySound SFX_123 CallWithArg sub_0807F464, 0x000001e0 _0807EDD4 0x01e0, 0x01d8 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807EB44 0x0002 + SetAnimationState 0x0002 DoPostScriptAction 0x0001 WaitForSyncFlagAndClear 0x00000008 Jump script_0800D80C diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc index 53f64c9b..1bdc67f5 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -1,7 +1,7 @@ @ Cloud Tops WindTribespeople great whirlwind revealed SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2 BeginBlock - Call sub_0807F360 + Call SetPriorityHighest DoPostScriptAction 0x000b SetEntityPositionRelative 0x0268, 0x01d8 SetEntitySpeed 0x0100 @@ -15,11 +15,11 @@ script_0800D80C: _0807EEF4 0x0000, 0xffe0 DoPostScriptAction 0x000e Call sub_0806CA5C - SetEntity0x20 0x00040000 + SetEntityVelocity 0x00040000 PlaySound SFX_F5 script_0800D82A: - CallWithArg sub_0807F8D0, 0xffffe000 - Call sub_0807F8BC + CallWithArg DoGravity, 0xffffe000 + Call CheckEntityOnScreen JumpIf script_0800D82A SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 |