From e94df6de4adbd708b888d8bfef1649f5b0f5a711 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Thu, 4 Mar 2021 21:11:00 +0100 Subject: Move all scripts to data/scripts.s --- data/scripts/ezlo_angry.inc | 231 +++++++++++++++++++++++++++++++++++++++++ data/scripts/ezlo_angry.s | 233 ------------------------------------------ data/scripts/npc4e_fusion.inc | 19 ++++ 3 files changed, 250 insertions(+), 233 deletions(-) create mode 100644 data/scripts/ezlo_angry.inc delete mode 100644 data/scripts/ezlo_angry.s create mode 100644 data/scripts/npc4e_fusion.inc (limited to 'data/scripts') diff --git a/data/scripts/ezlo_angry.inc b/data/scripts/ezlo_angry.inc new file mode 100644 index 00000000..d7a8a893 --- /dev/null +++ b/data/scripts/ezlo_angry.inc @@ -0,0 +1,231 @@ +SCRIPT_START gUnk_080126FC +sub_0807E004 +sub_0807EBC0 0x0040 +sub_0807EF80 0x0007 +sub_0807E014 +sub_0807E930 0x0020 +sub_0807E6AC 0x00000004 +sub_0807E930 0x0022 +sub_0807E10C sub_0807F3C8 +sub_0807EAD0 0x1102, 0x000c +sub_0807EA94 +sub_0807E930 0x0020 +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E930 0x0021 +sub_0807E10C sub_0807F3C8 +sub_0807EAD0 0x1103,0x000c +sub_0807EA94 +sub_0807E930 0x0020 +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807EF80 0x0004 +sub_0807E680 0x003c +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807EF80 0x0011 +sub_0807E930 0x001c +sub_0807EAD0 0x1105,0x000c +sub_0807EA94 +sub_0807E930 0x0020 +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E930 0x0022 +sub_0807E10C sub_0807F3C8 +sub_0807EAD0 0x1106,0x000c +sub_0807EA94 +sub_0807E930 0x001c +sub_0807E10C sub_0806D96C // Ezlo Angry FX +sub_0807EAD0 0x1107,0x000c +sub_0807EA94 +sub_0807E930 0x0020 +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E930 0x0021 +sub_0807E10C sub_0807F3C8 // Ezlo Angry FX +sub_0807EAD0 0x1108,0x000c +sub_0807EA94 +sub_0807E930 0x001c +sub_0807E10C sub_0806D96C// Ezlo Angry FX +sub_0807EAD0 0x1109,0x000c +sub_0807EA94 +sub_0807E930 0x0020 +sub_0807EF80 0x000a +sub_0807E9D4 +sub_0807E5F8 0x00000008 +sub_0807E014 +sub_0807E004 +sub_0807E260 0x0000 +sub_0807E050 0x0028 +sub_0807E2E4 +sub_0807E064 0xfff0 +sub_0807E014 +sub_0807E864 +sub_0807E10C sub_0806D944 // Ezlo look at player +sub_0807E930 0x0010 +sub_0807EAD0 0x1114,0x000c +sub_0807EA94 +sub_0807E930 0x0020 +sub_0807E878 +sub_0807E024 0xffd0 +sub_0807E864 +sub_0807E9DC +sub_0807E124 sub_0807F5B0,0x0000003c +sub_0807E10C sub_080791D0 +sub_0807E014 +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807EF80 0x000b +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E10C sub_0806D944// Ezlo look at player +sub_0807E930 0x0010 +sub_0807EAD0 0x110a,0x000c +sub_0807EA94 +sub_0807E930 0x001f +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E930 0x0010 +sub_0807EAD0 0x110b,0x000c +sub_0807EA94 +sub_0807E930 0x001f +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807EF80 0x0004 +sub_0807E680 0x003c +sub_0807E930 0x0010 +sub_0807EAD0 0x110c,0x000c +sub_0807EA94 +sub_0807E930 0x001f +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E930 0x0010 +sub_0807EAD0 0x110d,0x000c +sub_0807EA94 +sub_0807E930 0x001f +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E930 0x0010 +sub_0807EAD0 0x110e,0x000c +sub_0807EA94 +sub_0807E930 0x0018 +sub_0807EBC0 0x0080 +sub_0807E10C sub_0806D908 +sub_0807EC1C 0x0010 +sub_0807EF80 0x000a +sub_0807E9D4 +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E014 +sub_0807E004 +sub_0807E10C sub_0806D944 // Ezlo look at player +sub_0807E2E4 +sub_0807E050 0x000e +sub_0807E2A8 0x3030 +sub_0807E064 0x0020 +sub_0807E024 0xffe6 +sub_0807E864 +sub_0807E930 0x0010 +sub_0807E014 +sub_0807EAD0 0x1115,0x000c +sub_0807EA94 +sub_0807E930 0x0018 +sub_0807E878 +sub_0807E024 0xffcc +sub_0807E014 +sub_0807E864 +sub_0807E10C sub_0807F9A4 +sub_0807E10C sub_0807DF28 +sub_0807EB8C +sub_0807E10C sub_0806D944 // Ezlo look at player +sub_0807E930 0x0010 +sub_0807EAD0 0x110f,0x000c +sub_0807E930 0x0018 +sub_0807EBC0 0x0080 +sub_0807E10C sub_0806D908 +sub_0807EC1C 0x0050 +sub_0807EA94 +sub_0807E10C sub_0807DF50 +sub_0807E878 +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E014 +sub_0807E004 +sub_0807E10C sub_0806D944 // Ezlo look at player +sub_0807E2E4 +sub_0807E050 0x000e +sub_0807E2A8 0x3030 +sub_0807E064 0x0020 +sub_0807E024 0xffe6 +sub_0807E864 +sub_0807E930 0x0010 +sub_0807E014 +sub_0807EAD0 0x1115,0x000c +sub_0807EA94 +sub_0807E930 0x0018 +sub_0807E878 +sub_0807E024 0xffcc +sub_0807E014 +sub_0807E864 +sub_0807E10C sub_0807F9A4 +sub_0807E10C sub_0807DF28 +sub_0807EB8C +sub_0807E10C sub_0806D944 // Ezlo look at player +sub_0807E930 0x0010 +sub_0807EAD0 0x1110,0x000c +sub_0807E930 0x0018 +sub_0807EBC0 0x0080 +sub_0807E10C sub_0806D908 +sub_0807EC1C 0x0050 +sub_0807E930 0x0018 +sub_0807EA94 +sub_0807E10C sub_0807DF50 +sub_0807E878 +sub_0807E5F8 0x00000008 +sub_0807E6AC 0x00000004 +sub_0807E014 +sub_0807E004 +sub_0807E10C sub_0806D944 // Ezlo look at player +sub_0807E2E4 +sub_0807E050 0x000e +sub_0807E2A8 0x3030 +sub_0807E064 0x0020 +sub_0807E024 0xffe6 +sub_0807E864 +sub_0807E930 0x0010 +sub_0807E014 +sub_0807EAD0 0x1115,0x000c +sub_0807EA94 +sub_0807E930 0x0018 +sub_0807E878 +sub_0807E024 0xffcc +sub_0807E014 +sub_0807E864 +sub_0807E10C sub_0807F9A4 +sub_0807E10C sub_0807DF28 +sub_0807EFE4 +sub_0807EF80 0x000b +sub_0807EB8C +sub_0807E10C sub_0806D944 // Ezlo look at player +sub_0807E930 0x0010 +sub_0807EAD0 0x1111,0x000c +sub_0807E930 0x0018 +sub_0807EBC0 0x0080 +sub_0807E10C sub_0806D8A0 +sub_0807EE30 +sub_0807E064 0xfffc +sub_0807E930 0x001f +sub_0807EA94 +sub_0807E8C4 0x08012b18 +sub_0807E10C sub_0806D9A4 +sub_0807EF80 0x0008 +sub_0807E680 0x0078 +sub_0807EFAC 0x000e +sub_0807E004 +sub_0807E8E4_2 +sub_0807EB28 0x1112 +sub_0807E014 +sub_0807EA94 +sub_0807E5F8 0x00000008 +sub_0807EF80 0x0006 +SCRIPT_END \ No newline at end of file diff --git a/data/scripts/ezlo_angry.s b/data/scripts/ezlo_angry.s deleted file mode 100644 index b8a3f705..00000000 --- a/data/scripts/ezlo_angry.s +++ /dev/null @@ -1,233 +0,0 @@ -.include "asm/macros/script.inc" - -SCRIPT_START gUnk_080126FC -sub_0807E004 -sub_0807EBC0 0x0040 -sub_0807EF80 0x0007 -sub_0807E014 -sub_0807E930 0x0020 -sub_0807E6AC 0x00000004 -sub_0807E930 0x0022 -sub_0807E10C sub_0807F3C8 -sub_0807EAD0 0x1102, 0x000c -sub_0807EA94 -sub_0807E930 0x0020 -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E930 0x0021 -sub_0807E10C sub_0807F3C8 -sub_0807EAD0 0x1103,0x000c -sub_0807EA94 -sub_0807E930 0x0020 -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807EF80 0x0004 -sub_0807E680 0x003c -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807EF80 0x0011 -sub_0807E930 0x001c -sub_0807EAD0 0x1105,0x000c -sub_0807EA94 -sub_0807E930 0x0020 -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E930 0x0022 -sub_0807E10C sub_0807F3C8 -sub_0807EAD0 0x1106,0x000c -sub_0807EA94 -sub_0807E930 0x001c -sub_0807E10C sub_0806D96C // Ezlo Angry FX -sub_0807EAD0 0x1107,0x000c -sub_0807EA94 -sub_0807E930 0x0020 -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E930 0x0021 -sub_0807E10C sub_0807F3C8 // Ezlo Angry FX -sub_0807EAD0 0x1108,0x000c -sub_0807EA94 -sub_0807E930 0x001c -sub_0807E10C sub_0806D96C// Ezlo Angry FX -sub_0807EAD0 0x1109,0x000c -sub_0807EA94 -sub_0807E930 0x0020 -sub_0807EF80 0x000a -sub_0807E9D4 -sub_0807E5F8 0x00000008 -sub_0807E014 -sub_0807E004 -sub_0807E260 0x0000 -sub_0807E050 0x0028 -sub_0807E2E4 -sub_0807E064 0xfff0 -sub_0807E014 -sub_0807E864 -sub_0807E10C sub_0806D944 // Ezlo look at player -sub_0807E930 0x0010 -sub_0807EAD0 0x1114,0x000c -sub_0807EA94 -sub_0807E930 0x0020 -sub_0807E878 -sub_0807E024 0xffd0 -sub_0807E864 -sub_0807E9DC -sub_0807E124 sub_0807F5B0,0x0000003c -sub_0807E10C sub_080791D0 -sub_0807E014 -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807EF80 0x000b -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E10C sub_0806D944// Ezlo look at player -sub_0807E930 0x0010 -sub_0807EAD0 0x110a,0x000c -sub_0807EA94 -sub_0807E930 0x001f -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E930 0x0010 -sub_0807EAD0 0x110b,0x000c -sub_0807EA94 -sub_0807E930 0x001f -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807EF80 0x0004 -sub_0807E680 0x003c -sub_0807E930 0x0010 -sub_0807EAD0 0x110c,0x000c -sub_0807EA94 -sub_0807E930 0x001f -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E930 0x0010 -sub_0807EAD0 0x110d,0x000c -sub_0807EA94 -sub_0807E930 0x001f -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E930 0x0010 -sub_0807EAD0 0x110e,0x000c -sub_0807EA94 -sub_0807E930 0x0018 -sub_0807EBC0 0x0080 -sub_0807E10C sub_0806D908 -sub_0807EC1C 0x0010 -sub_0807EF80 0x000a -sub_0807E9D4 -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E014 -sub_0807E004 -sub_0807E10C sub_0806D944 // Ezlo look at player -sub_0807E2E4 -sub_0807E050 0x000e -sub_0807E2A8 0x3030 -sub_0807E064 0x0020 -sub_0807E024 0xffe6 -sub_0807E864 -sub_0807E930 0x0010 -sub_0807E014 -sub_0807EAD0 0x1115,0x000c -sub_0807EA94 -sub_0807E930 0x0018 -sub_0807E878 -sub_0807E024 0xffcc -sub_0807E014 -sub_0807E864 -sub_0807E10C sub_0807F9A4 -sub_0807E10C sub_0807DF28 -sub_0807EB8C -sub_0807E10C sub_0806D944 // Ezlo look at player -sub_0807E930 0x0010 -sub_0807EAD0 0x110f,0x000c -sub_0807E930 0x0018 -sub_0807EBC0 0x0080 -sub_0807E10C sub_0806D908 -sub_0807EC1C 0x0050 -sub_0807EA94 -sub_0807E10C sub_0807DF50 -sub_0807E878 -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E014 -sub_0807E004 -sub_0807E10C sub_0806D944 // Ezlo look at player -sub_0807E2E4 -sub_0807E050 0x000e -sub_0807E2A8 0x3030 -sub_0807E064 0x0020 -sub_0807E024 0xffe6 -sub_0807E864 -sub_0807E930 0x0010 -sub_0807E014 -sub_0807EAD0 0x1115,0x000c -sub_0807EA94 -sub_0807E930 0x0018 -sub_0807E878 -sub_0807E024 0xffcc -sub_0807E014 -sub_0807E864 -sub_0807E10C sub_0807F9A4 -sub_0807E10C sub_0807DF28 -sub_0807EB8C -sub_0807E10C sub_0806D944 // Ezlo look at player -sub_0807E930 0x0010 -sub_0807EAD0 0x1110,0x000c -sub_0807E930 0x0018 -sub_0807EBC0 0x0080 -sub_0807E10C sub_0806D908 -sub_0807EC1C 0x0050 -sub_0807E930 0x0018 -sub_0807EA94 -sub_0807E10C sub_0807DF50 -sub_0807E878 -sub_0807E5F8 0x00000008 -sub_0807E6AC 0x00000004 -sub_0807E014 -sub_0807E004 -sub_0807E10C sub_0806D944 // Ezlo look at player -sub_0807E2E4 -sub_0807E050 0x000e -sub_0807E2A8 0x3030 -sub_0807E064 0x0020 -sub_0807E024 0xffe6 -sub_0807E864 -sub_0807E930 0x0010 -sub_0807E014 -sub_0807EAD0 0x1115,0x000c -sub_0807EA94 -sub_0807E930 0x0018 -sub_0807E878 -sub_0807E024 0xffcc -sub_0807E014 -sub_0807E864 -sub_0807E10C sub_0807F9A4 -sub_0807E10C sub_0807DF28 -sub_0807EFE4 -sub_0807EF80 0x000b -sub_0807EB8C -sub_0807E10C sub_0806D944 // Ezlo look at player -sub_0807E930 0x0010 -sub_0807EAD0 0x1111,0x000c -sub_0807E930 0x0018 -sub_0807EBC0 0x0080 -sub_0807E10C sub_0806D8A0 -sub_0807EE30 -sub_0807E064 0xfffc -sub_0807E930 0x001f -sub_0807EA94 -sub_0807E8C4 0x08012b18 -sub_0807E10C sub_0806D9A4 -sub_0807EF80 0x0008 -sub_0807E680 0x0078 -sub_0807EFAC 0x000e -sub_0807E004 -sub_0807E8E4_2 -sub_0807EB28 0x1112 -sub_0807E014 -sub_0807EA94 -sub_0807E5F8 0x00000008 -sub_0807EF80 0x0006 -SCRIPT_END \ No newline at end of file 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 -- cgit v1.2.3