diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-05-31 23:51:20 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-05-31 23:51:20 +0200 |
| commit | bbac5ace3fb87828f288ff583f72a5a51af5a05f (patch) | |
| tree | 70fb8b55e62a1d270e9f3cec927519a34ca17100 /data/scripts/cloudTops | |
| parent | 134f39a0bdad19fc794e19fba56d072d1ab30022 (diff) | |
| parent | 79bbd540a8846e48f97b77ea03d28828bdcca0ae (diff) | |
Merge remote-tracking branch 'upstream/master' into tilemap-docs
Diffstat (limited to 'data/scripts/cloudTops')
9 files changed, 14 insertions, 14 deletions
diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc index cbd342aa..10e0f160 100644 --- a/data/scripts/cloudTops/script_GregalHealthy.inc +++ b/data/scripts/cloudTops/script_GregalHealthy.inc @@ -1,7 +1,7 @@ @ Cloud Tops Gregal healthy SCRIPT_START script_GregalHealthy BeginBlock - Call sub_0806CD58 + Call Gregal_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 SetAnimation 0x0006 diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 26b0a439..6cc75af2 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -5,15 +5,15 @@ SCRIPT_START script_Npc4EFirstCloud SetAnimationState 0x0004 DoPostScriptAction 0x000b DoPostScriptAction 0x0008 - Call sub_0806DAAC + Call NPC4E_IsKinstoneFused JumpIf script_0800D6AE - Call sub_0806DAD0 - CallWithArg sub_0806DA04, 0x00000002 + Call NPC4E_MakeFuserInteractable + CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000002 EndBlock script_0800D636: _0807EA4C _0807E9F0 - Call sub_0806DAAC + Call NPC4E_IsKinstoneFused JumpIf script_0800D650 Call EnablePauseMenu EnablePlayerControl @@ -28,9 +28,9 @@ script_0800D650: CameraTargetEntity MoveTo 0x01e8, 0x01b8 Wait 0x003c - Call sub_0806DAE8 + Call NPC4E_SetPinwheelFlag Wait 0x0078 - Call sub_0806DB44 + Call NPC4E_IsEveryPinwheelActivated JumpIfNot script_Npc4EKinstoneFused LoadRoomEntityList gUnk_080DD730 DoPostScriptAction 0x0006 diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc index ba0c3e98..55efc778 100644 --- a/data/scripts/cloudTops/script_Siroc.inc +++ b/data/scripts/cloudTops/script_Siroc.inc @@ -1,7 +1,7 @@ @ Cloud Tops Windtribespeople Leader Siroc SCRIPT_START script_Siroc BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a EndBlock script_08014AD2: diff --git a/data/scripts/cloudTops/script_WindTribespeople1.inc b/data/scripts/cloudTops/script_WindTribespeople1.inc index 4b962633..e39b027f 100644 --- a/data/scripts/cloudTops/script_WindTribespeople1.inc +++ b/data/scripts/cloudTops/script_WindTribespeople1.inc @@ -1,7 +1,7 @@ @ Cloud Tops WindTribespeople blocking exit SCRIPT_START script_WindTribespeople1 BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a CheckGlobalFlag WARP_EVENT_END JumpIf script_08014976 diff --git a/data/scripts/cloudTops/script_WindTribespeople2.inc b/data/scripts/cloudTops/script_WindTribespeople2.inc index 37a99ee1..3eb9d71b 100644 --- a/data/scripts/cloudTops/script_WindTribespeople2.inc +++ b/data/scripts/cloudTops/script_WindTribespeople2.inc @@ -1,7 +1,7 @@ @ Cloud Top Windtribespeople woman on first floor SCRIPT_START script_WindTribespeople2 BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a CheckGlobalFlag WARP_EVENT_END JumpIfNot script_080149C6 diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc index b10db604..7eee45f5 100644 --- a/data/scripts/cloudTops/script_WindTribespeople3.inc +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -2,7 +2,7 @@ SCRIPT_START script_WindTribespeople3 BeginBlock SetEntitySpeed 0x0080 - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a EndBlock script_080149DE: diff --git a/data/scripts/cloudTops/script_WindTribespeople4.inc b/data/scripts/cloudTops/script_WindTribespeople4.inc index ba6fb854..33f31fe1 100644 --- a/data/scripts/cloudTops/script_WindTribespeople4.inc +++ b/data/scripts/cloudTops/script_WindTribespeople4.inc @@ -1,7 +1,7 @@ @ Cloud Tops Windtribespeople blocking way up SCRIPT_START script_WindTribespeople4 BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a EndBlock script_08014A36: diff --git a/data/scripts/cloudTops/script_WindTribespeople5.inc b/data/scripts/cloudTops/script_WindTribespeople5.inc index 698f9bb2..cb93bd49 100644 --- a/data/scripts/cloudTops/script_WindTribespeople5.inc +++ b/data/scripts/cloudTops/script_WindTribespeople5.inc @@ -1,7 +1,7 @@ @ Cloud Tops Windtribespeople at the bed SCRIPT_START script_WindTribespeople5 BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a EndBlock script_08014A62: diff --git a/data/scripts/cloudTops/script_WindTribespeople7.inc b/data/scripts/cloudTops/script_WindTribespeople7.inc index 36fc4fed..eb33c128 100644 --- a/data/scripts/cloudTops/script_WindTribespeople7.inc +++ b/data/scripts/cloudTops/script_WindTribespeople7.inc @@ -3,7 +3,7 @@ SCRIPT_START script_WindTribespeople7 BeginBlock CheckGlobalFlag KUMOTATSUMAKI JumpIf script_08014CD4 - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a DoPostScriptAction 0x0000 EndBlock |