summaryrefslogtreecommitdiff
path: root/data/scripts/cutscene
diff options
context:
space:
mode:
authorHenny022p <73211432+Henny022p@users.noreply.github.com>2026-02-08 18:32:38 +0100
committerGitHub <noreply@github.com>2026-02-08 18:32:38 +0100
commit5ab63f00e522ff69c5bc987e379f0163943f2833 (patch)
tree53622222ac729c6ab6dc75ef7f9bafa8031daf18 /data/scripts/cutscene
parent73901a0a012d55ebb66a4627dcb246d19737fcb5 (diff)
parent5b2cafdc894823d57beee8f3947a391d881d91de (diff)
Merge pull request #701 from Henny022p/cleanup/250302HEADmaster
Various code cleanup changes
Diffstat (limited to 'data/scripts/cutscene')
-rw-r--r--data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok1.inc2
-rw-r--r--data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok2.inc2
-rw-r--r--data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok3.inc2
-rw-r--r--data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok4.inc2
-rw-r--r--data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite1.inc2
-rw-r--r--data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite2.inc2
-rw-r--r--data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite3.inc2
-rw-r--r--data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite4.inc2
-rw-r--r--data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc2
9 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok1.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok1.inc
index bd05025c..d3c6348e 100644
--- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok1.inc
+++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok1.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_CutsceneMiscObjectOctorok1
SetAnimation 0x0001
EndBlock
WaitForSyncFlagAndClear 0x00000001
- Call CreateDust
+ Call CreateDeathFx
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok2.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok2.inc
index 895d4380..769c3789 100644
--- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok2.inc
+++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok2.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_CutsceneMiscObjectOctorok2
SetAnimation 0x0002
EndBlock
WaitForSyncFlagAndClear 0x00000002
- Call CreateDust
+ Call CreateDeathFx
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok3.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok3.inc
index a82a9f9a..55a985c4 100644
--- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok3.inc
+++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok3.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_CutsceneMiscObjectOctorok3
SetAnimation 0x0000
EndBlock
WaitForSyncFlagAndClear 0x00000004
- Call CreateDust
+ Call CreateDeathFx
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok4.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok4.inc
index 6c524c65..7f233dbb 100644
--- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok4.inc
+++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectOctorok4.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_CutsceneMiscObjectOctorok4
SetAnimation 0x0003
EndBlock
WaitForSyncFlagAndClear 0x00000008
- Call CreateDust
+ Call CreateDeathFx
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite1.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite1.inc
index b555f6a6..03dd568f 100644
--- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite1.inc
+++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite1.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_CutsceneMiscObjectTektite1
SetAnimation 0x0000
EndBlock
WaitForSyncFlagAndClear 0x00000001
- Call CreateDust
+ Call CreateDeathFx
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite2.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite2.inc
index 0b83e353..fdfef66c 100644
--- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite2.inc
+++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite2.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_CutsceneMiscObjectTektite2
SetAnimation 0x0000
EndBlock
WaitForSyncFlagAndClear 0x00000002
- Call CreateDust
+ Call CreateDeathFx
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite3.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite3.inc
index bc2a4e2f..dc4e6b22 100644
--- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite3.inc
+++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite3.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_CutsceneMiscObjectTektite3
SetAnimation 0x0000
EndBlock
WaitForSyncFlagAndClear 0x00000004
- Call CreateDust
+ Call CreateDeathFx
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite4.inc b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite4.inc
index 517fb04b..8e8cd0ce 100644
--- a/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite4.inc
+++ b/data/scripts/cutscene/outro/script_CutsceneMiscObjectTektite4.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_CutsceneMiscObjectTektite4
SetAnimation 0x0000
EndBlock
WaitForSyncFlagAndClear 0x00000008
- Call CreateDust
+ Call CreateDeathFx
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
diff --git a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc
index 91afc910..1b7d5df7 100644
--- a/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc
+++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc
@@ -39,7 +39,7 @@ SCRIPT_START script_MinishEzloGoodbye
Wait 0x001e
SetSyncFlag 0x00000020
StopBgm
- Call CreateDust
+ Call CreateDeathFx
Call sub_0806305C
Call sub_080630A4
_0807EF3C 0x0000, 0x0020