diff options
Diffstat (limited to 'data/scripts/cloudTops')
7 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc index 135e95c0..30c270a4 100644 --- a/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc +++ b/data/scripts/cloudTops/script_CutsceneOrchestratorGreatWhirlwindRevealed.inc @@ -13,7 +13,7 @@ SCRIPT_START script_CutsceneOrchestratorGreatWhirlwindRevealed WaitForSyncFlagAndClear 0x00000004 SetSyncFlag 0x0000000a WaitForSyncFlagAndClear 0x00000004 - _0807EEB4 + MoveToPlayer SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 126ad33e..26b0a439 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -26,7 +26,7 @@ script_0800D650: SetEntitySpeed 0x0700 SetScrollSpeed 7 CameraTargetEntity - _0807EDD4 0x01e8, 0x01b8 + MoveTo 0x01e8, 0x01b8 Wait 0x003c Call sub_0806DAE8 Wait 0x0078 diff --git a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index f4372344..e9766d70 100644 --- a/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -1,6 +1,6 @@ @ Cloud Tops NPC4E after Kinstone has been fused SCRIPT_START script_Npc4EKinstoneFused - _0807EEB4 + MoveToPlayer SetScrollSpeed 4 CameraTargetPlayer Call sub_0807FBCC diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc index ebdfb81b..a6c2bd7b 100644 --- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -3,7 +3,7 @@ SCRIPT_START script_PlayerAtSiroc BeginBlock SetEntitySpeed 0x0100 EndBlock - _0807EDD4 0x0078, 0x0040 + MoveTo 0x0078, 0x0040 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc index 84c60935..b10db604 100644 --- a/data/scripts/cloudTops/script_WindTribespeople3.inc +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -19,7 +19,7 @@ script_080149DE: SetLocalFlag 0x00b1 DoPostScriptAction 0x000b DoPostScriptAction 0x0001 - _0807EDD4 0x0068, 0x00f8 + MoveTo 0x0068, 0x00f8 PlaySound SFX_SECRET FacePlayer DoPostScriptAction 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc index c5d77432..56c3be62 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc @@ -12,7 +12,7 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 Wait 0x003c PlaySound SFX_123 CallWithArg sub_0807F464, 0x000001e0 - _0807EDD4 0x01e0, 0x01d8 + MoveTo 0x01e0, 0x01d8 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc index 76862484..ef4f7130 100644 --- a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -7,12 +7,12 @@ SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2 SetEntitySpeed 0x0100 EndBlock WaitForSyncFlagAndClear 0x00000002 - _0807EDD4 0x01f0, 0x01d8 + MoveTo 0x01f0, 0x01d8 SetSyncFlag 0x00000004 WaitForSyncFlagAndClear 0x00000002 script_0800D80C: SetEntitySpeed 0x0100 - _0807EEF4 0x0000, -32 + MoveToOffset 0x0000, -32 DoPostScriptAction 0x000e Call sub_0806CA5C SetEntityVelocity 0x00040000 |