diff options
| author | YamaArashi <shadow962@live.com> | 2016-10-09 16:07:48 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-10-09 16:07:48 -0700 |
| commit | e29af253cee26e42697458ff46112506d6aca076 (patch) | |
| tree | 1852c78d1512e25f187ebabbdacb886dc137d355 | |
| parent | 0a32b5feb1ae85d0f8e27c5f5d199e1b931b0776 (diff) | |
define start menu variables in C
| -rw-r--r-- | src/start_menu.c | 7 | ||||
| -rw-r--r-- | sym_bss.txt | 12 | ||||
| -rw-r--r-- | sym_ewram.txt | 1 |
3 files changed, 5 insertions, 15 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 35f8330cd..4c2bd19ba 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -63,12 +63,13 @@ struct MenuItem { u8 (*callback)(void); }; -extern u8 (*saveDialogCallback)(void); +static u8 (*saveDialogCallback)(void); +static u8 gUnknown_030006AC; +static bool8 gUnknown_030006AD; + extern bool8 gUnknown_020297EC; extern u16 gSaveFileStatus; -extern u8 gUnknown_030006AC; extern u16 gScriptResult; -extern bool8 gUnknown_030006AD; extern u8 (*gCallback_03004AE8)(void); extern u8 gUnknown_03004860; extern struct MenuItem gStartMenuItems[]; diff --git a/sym_bss.txt b/sym_bss.txt index 30d3b10d0..3be327b3f 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -84,17 +84,7 @@ gUnknown_030005A6: @ 30005A6 .include "src/field_message_box.o" .include "src/text_window.o" .include "src/script.o" - - .align 2 -saveDialogCallback: @ 30006A8 - .space 0x4 - -gUnknown_030006AC: @ 30006AC - .space 0x1 - -gUnknown_030006AD: @ 30006AD - .space 0x3 - + .include "src/start_menu.o" .include "src/menu.o" .align 2 diff --git a/sym_ewram.txt b/sym_ewram.txt index 5a2989119..2f0d0674c 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -467,7 +467,6 @@ gUnknown_0202E8FA: @ 202E8FA .space 0x2 .include "src/start_menu.o" - .include "src/menu.o" .align 2 |