summaryrefslogtreecommitdiff
path: root/data/scripts/cloudTops
diff options
context:
space:
mode:
authorCatobat <69204835+Catobat@users.noreply.github.com>2023-04-28 23:36:33 +0200
committerCatobat <69204835+Catobat@users.noreply.github.com>2023-04-28 23:36:33 +0200
commitd5afe1f2dd8721791779bfa790eaefd7c5bc42ab (patch)
tree41dd7e6ff83e81ebbe7cc90049a6ec0831223000 /data/scripts/cloudTops
parent04f4272b14eaa9401f37af791065e81b3bdc222d (diff)
Name a lot of functions about interactable objects
Diffstat (limited to 'data/scripts/cloudTops')
-rw-r--r--data/scripts/cloudTops/script_GregalHealthy.inc2
-rw-r--r--data/scripts/cloudTops/script_Npc4EFirstCloud.inc2
-rw-r--r--data/scripts/cloudTops/script_Siroc.inc2
-rw-r--r--data/scripts/cloudTops/script_WindTribespeople1.inc2
-rw-r--r--data/scripts/cloudTops/script_WindTribespeople2.inc2
-rw-r--r--data/scripts/cloudTops/script_WindTribespeople3.inc2
-rw-r--r--data/scripts/cloudTops/script_WindTribespeople4.inc2
-rw-r--r--data/scripts/cloudTops/script_WindTribespeople5.inc2
-rw-r--r--data/scripts/cloudTops/script_WindTribespeople7.inc2
9 files changed, 9 insertions, 9 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 126ad33e..b5245520 100644
--- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
+++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_Npc4EFirstCloud
DoPostScriptAction 0x0008
Call sub_0806DAAC
JumpIf script_0800D6AE
- Call sub_0806DAD0
+ Call NPC4E_MakeFuserInteractable
CallWithArg sub_0806DA04, 0x00000002
EndBlock
script_0800D636:
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 84c60935..ba5b01cc 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