From 158dede3f68891fcf1643af65a9e77b242931432 Mon Sep 17 00:00:00 2001 From: engineer124 Date: Thu, 11 Nov 2021 13:47:50 +1100 Subject: [PATCH] Properly split voice files from code --- spec | 1 + src/code/code_8019AF00.c | 16 ---------------- src/code/code_801A4EB0.c | 17 +++++++++++++++++ tools/disasm/files.txt | 1 + 4 files changed, 19 insertions(+), 16 deletions(-) create mode 100644 src/code/code_801A4EB0.c diff --git a/spec b/spec index f3cd6c8ba..c54036abb 100644 --- a/spec +++ b/spec @@ -658,6 +658,7 @@ beginseg include "build/src/code/code_8019AF00.o" include "build/data/code/code_8019AF00.bss.o" include "build/data/code/code_801D55B0.data.o" + include "build/src/code/code_801A4EB0.o" include "build/src/code/code_801A51F0.o" include "build/data/code/code_801A51F0.data.o" include "build/data/code/code_801A51F0.bss.o" diff --git a/src/code/code_8019AF00.c b/src/code/code_8019AF00.c index 8f0d129ad..227384d0a 100644 --- a/src/code/code_8019AF00.c +++ b/src/code/code_8019AF00.c @@ -411,19 +411,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4DF4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4E64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4EB0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4EB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A4FD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A5080.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A50C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A5100.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A510C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8019AF00/func_801A5118.s") diff --git a/src/code/code_801A4EB0.c b/src/code/code_801A4EB0.c new file mode 100644 index 000000000..d3461c8f5 --- /dev/null +++ b/src/code/code_801A4EB0.c @@ -0,0 +1,17 @@ +#include "global.h" + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A4EB0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A4EB8.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A4FD8.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5080.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A50C0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5100.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A510C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5118.s") diff --git a/tools/disasm/files.txt b/tools/disasm/files.txt index b9a7a0dfd..15debf9f5 100644 --- a/tools/disasm/files.txt +++ b/tools/disasm/files.txt @@ -488,6 +488,7 @@ 0x8019AEB0 : "[PADDING]", 0x8019AEC0 : "code_8019AEC0", 0x8019AF00 : "code_8019AF00", + 0x801A4EB0 : "code_801A4EB0", 0x801A51F0 : "code_801A51F0", 0x801A5BC0 : "[PADDING]", 0x801A5BD0 : "code_801A5BD0",