From 8ebeee699651bd1e657d5d9d93ed1f660e0e00cf Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Mon, 31 May 2021 15:55:39 -0700 Subject: [PATCH] Moved symbols in unknown_00BC20 to header file. --- include/unknown_00BC20.h | 65 ++++++++++++++++++++++++++++++++++++++++ src/unknown_00BC20.c | 12 ++------ undefined_syms.txt | 30 ------------------- 3 files changed, 67 insertions(+), 40 deletions(-) create mode 100644 include/unknown_00BC20.h diff --git a/include/unknown_00BC20.h b/include/unknown_00BC20.h new file mode 100644 index 00000000..8c450d30 --- /dev/null +++ b/include/unknown_00BC20.h @@ -0,0 +1,65 @@ +#ifndef _UNKNOWN_00BC20_H_ +#define _UNKNOWN_00BC20_H_ + +#include "types.h" + +/* Size: 0x8 bytes */ +typedef struct unknown800DC6F0 { + union { + s8 unk00; + s32 dummy_force_alignment; // Not sure of a better way to do this. + }; + u16 unk04; + u16 unk06; +} unknown800DC6F0; + +extern unknown800DC6F0 D_800DC6F0; +extern unknown800DC6F0 D_800DC6F8; + +extern s32 D_800DC700; +extern s32 D_800DC704; +extern s16 D_800DC708; +extern s32 D_800DC70C; +extern s16 D_800DC710; +extern s32 D_800DC714; +extern s32 D_800DC718; +extern s8 D_800DC71C; +extern s32 D_800DC720; +extern s16 D_800DC724; +extern s16 D_800DC728; +extern s16 D_800DC72C; +extern u8 D_800DC730; +extern s32 D_800DC734; +extern u8 D_800DC738; +extern s8 D_800DC73C; +extern s8 D_800DC740; +extern s8 D_800DC744; +extern s8 D_800DC748; +extern s32 D_800DC74C; +extern s32 D_800DC750; +extern s32 D_800DC754; +extern s32 D_800DC758; +extern s32 D_800DC75C; +extern s32 D_800DC760; +extern s32 D_800DC764; +extern s32 D_800DC768; + +extern f32 D_800DC76C[15]; + +extern u16 D_800DC7A8[8]; + +extern s16 D_800DC7B8[52]; + +extern s16 D_800DC820[16]; + +extern s8 D_800DC840[8]; + +extern s8 D_800DC848; +extern s32 D_800DC84C[3]; +extern s32 D_800DC858; +extern s32 D_800DC85C; + +extern u8 D_800DC860; +extern u16 D_800DC864; + +#endif \ No newline at end of file diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 71c775ed..d447acfe 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -1,6 +1,8 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x8000B020 */ +#include "unknown_00BC20.h" + #include "types.h" #include "macros.h" #include "structs.h" @@ -9,16 +11,6 @@ /************ .data ************/ -/* Size: 0x8 bytes */ -typedef struct unknown800DC6F0 { - union { - s8 unk00; - s32 dummy_force_alignment; // Not sure of a better way to do this. - }; - u16 unk04; - u16 unk06; -} unknown800DC6F0; - unknown800DC6F0 D_800DC6F0 = { -128, 0x1E, 0x0F }; unknown800DC6F0 D_800DC6F8 = { 3, 0x1E, 0x0F }; diff --git a/undefined_syms.txt b/undefined_syms.txt index 7b07c24e..a2a11ac3 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -67,36 +67,6 @@ D_800D84C0 = 0x800D84C0; D_800D8590 = 0x800D8590; D_800D9790 = 0x800D9790; D_800DA970 = 0x800DA970; -D_800DC6F0 = 0x800DC6F0; -D_800DC6F8 = 0x800DC6F8; -D_800DC700 = 0x800DC700; -D_800DC708 = 0x800DC708; -D_800DC718 = 0x800DC718; -D_800DC71C = 0x800DC71C; -D_800DC720 = 0x800DC720; -D_800DC724 = 0x800DC724; -D_800DC728 = 0x800DC728; -D_800DC72C = 0x800DC72C; -D_800DC730 = 0x800DC730; -D_800DC734 = 0x800DC734; -D_800DC738 = 0x800DC738; -D_800DC73C = 0x800DC73C; -D_800DC740 = 0x800DC740; -D_800DC744 = 0x800DC744; -D_800DC748 = 0x800DC748; -D_800DC74C = 0x800DC74C; -D_800DC754 = 0x800DC754; -D_800DC75C = 0x800DC75C; -D_800DC760 = 0x800DC760; -D_800DC764 = 0x800DC764; -D_800DC768 = 0x800DC768; -D_800DC7A8 = 0x800DC7A8; -D_800DC7B8 = 0x800DC7B8; -D_800DC820 = 0x800DC820; -D_800DC840 = 0x800DC840; -D_800DC848 = 0x800DC848; -D_800DC858 = 0x800DC858; -D_800DC860 = 0x800DC860; D_800DC874 = 0x800DC874; D_800DC87C = 0x800DC87C; D_800DC884 = 0x800DC884;