diff --git a/include/code_8004AA0.h b/include/code_8004AA0.h index 2eec0fac4..eeb012926 100644 --- a/include/code_8004AA0.h +++ b/include/code_8004AA0.h @@ -18,6 +18,20 @@ typedef struct unkStruct_202EE8C extern unkStruct_202EE8C gUnknown_202EE8C[32]; +// size: 0x4DD8 +struct UnkBgStruct +{ + OpenedFile *unk0[5]; + u8 padding[0x4C4C - 0x14]; + unkStruct_202EE8C unk4C4C[16]; + u32 unk4DCC; + u32 unk4DD0; + /* 0x4DD4 */ s16 xoffset; + /* 0x4DD6 */ s16 yoffset; +}; + +extern struct UnkBgStruct *gUnknown_203B0E4; + // size: Variable typedef struct unkDataFor8004AA4 { diff --git a/include/code_8010EF0.h b/include/code_8010EF0.h deleted file mode 100644 index 213deb020..000000000 --- a/include/code_8010EF0.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef GUARD_CODE_8010EF0_H -#define GUARD_CODE_8010EF0_H - -#include "file_system.h" -#include "structs/rgb.h" - -// size: 0x18 -typedef struct unkStruct_202EE8C -{ - u32 unk0; - u16 unk4; - s16 unk6; - RGB *unk8; - RGB *unkC; - RGB *unk10; - RGB unk14; -} unkStruct_202EE8C; - -// size: 0x4DD8 -struct UnkBgStruct -{ - OpenedFile *unk0[5]; - u8 padding[0x4C4C - 0x14]; - unkStruct_202EE8C unk4C4C[16]; - u32 unk4DCC; - u32 unk4DD0; - /* 0x4DD4 */ s16 xoffset; - /* 0x4DD6 */ s16 yoffset; -}; - -void sub_8010EF0(void); - -#endif diff --git a/src/code_8010EF0.c b/src/code_8010EF0.c index 700d5778e..56830b55d 100644 --- a/src/code_8010EF0.c +++ b/src/code_8010EF0.c @@ -1,9 +1,5 @@ #include "global.h" -#include "code_8010EF0.h" - -extern struct UnkBgStruct *gUnknown_203B0E4; - -extern void CloseFile(OpenedFile *); +#include "code_8004AA0.h" void sub_8010EF0(void) { diff --git a/src/code_80118A4.c b/src/code_80118A4.c index ea9549427..e0e0d7069 100644 --- a/src/code_80118A4.c +++ b/src/code_80118A4.c @@ -17,20 +17,6 @@ #include "event_flag.h" #include "file_system.h" -// size: 0x4DD8 -struct UnkBgStruct -{ - OpenedFile *unk0[5]; - u8 padding[0x4C4C - 0x14]; - unkStruct_202EE8C unk4C4C[16]; - u32 unk4DCC; - u32 unk4DD0; - /* 0x4DD4 */ s16 xoffset; - /* 0x4DD6 */ s16 yoffset; -}; -extern struct UnkBgStruct *gUnknown_203B0E4; - - extern const u16 gUnknown_80D4144[8]; EWRAM_DATA u32 gUnknown_202DE1C = {0};