summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authoroctorock <79596758+octorock@users.noreply.github.com>2021-03-04 21:11:00 +0100
committeroctorock <79596758+octorock@users.noreply.github.com>2021-03-06 14:53:33 +0100
commite94df6de4adbd708b888d8bfef1649f5b0f5a711 (patch)
treecb867379a12181ba3108b3c718a3666586911cf5 /data/scripts
parent223cf98a5181a5eeed412b5c3570f4d369ed3735 (diff)
Move all scripts to data/scripts.s
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/ezlo_angry.inc (renamed from data/scripts/ezlo_angry.s)2
-rw-r--r--data/scripts/npc4e_fusion.inc19
2 files changed, 19 insertions, 2 deletions
diff --git a/data/scripts/ezlo_angry.s b/data/scripts/ezlo_angry.inc
index b8a3f705..d7a8a893 100644
--- a/data/scripts/ezlo_angry.s
+++ b/data/scripts/ezlo_angry.inc
@@ -1,5 +1,3 @@
-.include "asm/macros/script.inc"
-
SCRIPT_START gUnk_080126FC
sub_0807E004
sub_0807EBC0 0x0040
diff --git a/data/scripts/npc4e_fusion.inc b/data/scripts/npc4e_fusion.inc
new file mode 100644
index 00000000..68262d0e
--- /dev/null
+++ b/data/scripts/npc4e_fusion.inc
@@ -0,0 +1,19 @@
+SCRIPT_START gUnk_08016030
+sub_0807E004
+sub_0807E40C 0x0009
+sub_0807E050 0x002a
+sub_0807E014
+sub_0807E6AC 0x00000001
+sub_0807EF80 0x0010
+sub_0807E680 0x003c
+sub_0807EBC0 0x0020
+sub_0807ECF4 0x0080
+sub_0807E680 0x001e
+sub_0807EF80 0x0010
+sub_0807E5F8 0x0000008
+.short 0xffff
+.short 0x0c6a
+.short 0xfff0
+.short 0x0000
+.short 0xffff
+.short 0x0000 \ No newline at end of file