diff options
| -rw-r--r-- | common_syms/window.txt | 5 | ||||
| -rw-r--r-- | include/window.h | 6 | ||||
| -rw-r--r-- | src/window.c | 7 | ||||
| -rw-r--r-- | sym_common.txt | 9 |
4 files changed, 17 insertions, 10 deletions
diff --git a/common_syms/window.txt b/common_syms/window.txt new file mode 100644 index 000000000..e1b52a24f --- /dev/null +++ b/common_syms/window.txt @@ -0,0 +1,5 @@ +filler_03002F58 +filler_03002F5C +gUnknown_03002F60 +filler_03002F64 +gUnknown_03002F70 diff --git a/include/window.h b/include/window.h index b630cd316..d52f07e94 100644 --- a/include/window.h +++ b/include/window.h @@ -68,5 +68,11 @@ void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, u8 *pixels, u16 srcX, u16 src void CopyWindowToVram8Bit(u8 windowId, u8 mode); extern struct Window gWindows[]; +extern void* gUnknown_03002F70[]; +extern u32 filler_03002F58; +extern u32 filler_03002F5C; +extern u32 filler_03002F64; + +extern u8 gUnknown_03002F60; #endif // GUARD_WINDOW_H diff --git a/src/window.c b/src/window.c index 3913b5800..40dfd5aa5 100644 --- a/src/window.c +++ b/src/window.c @@ -2,8 +2,11 @@ #include "window.h" #include "malloc.h" -extern u8 gUnknown_03002F60; -extern void* gUnknown_03002F70[]; +u32 filler_03002F58; +u32 filler_03002F5C; +u8 gUnknown_03002F60; +u32 filler_03002F64; +void *gUnknown_03002F70[4]; extern u32 gUnneededFireRedVariable; #define WINDOWS_MAX 32 diff --git a/sym_common.txt b/sym_common.txt index 9641c28b9..dacc91d10 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -1,14 +1,7 @@ .space 0x8 .include "main.o" .include "bg.o" - - .align 4 -gUnknown_03002F60: @ 3002F60 - .space 0x10 - -gUnknown_03002F70: @ 3002F70 - .space 0x10 - + .include "window.o" .include "text.o" .include "sprite.o" .include "link.o" |