diff options
| author | drifloony <drifloony@users.noreply.github.com> | 2017-07-12 22:04:22 -0700 |
|---|---|---|
| committer | drifloony <drifloony@users.noreply.github.com> | 2017-07-12 22:04:22 -0700 |
| commit | 10618d8a4a1694e63de75028677bdb6f5cd53803 (patch) | |
| tree | 15d0f79dfddd02b54d5decd53c9a5ed1e8699738 | |
| parent | 36841bbd93fa18c3d8bb34af477daef883f378f8 (diff) | |
move RAM variables into menu_helpers.c
| -rw-r--r-- | src/menu_helpers.c | 6 | ||||
| -rw-r--r-- | sym_bss.txt | 4 | ||||
| -rw-r--r-- | sym_ewram.txt | 7 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 3c7227629..b80901947 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -14,10 +14,10 @@ #include "task.h" #include "text.h" -extern u8 gUnknown_020388C0[4]; -extern struct YesNoFuncTable gUnknown_020388C4; +static EWRAM_DATA u8 gUnknown_020388C0[4] = {0}; +static EWRAM_DATA struct YesNoFuncTable gUnknown_020388C4 = {0}; -extern TaskFunc gUnknown_0300074C; +static TaskFunc gUnknown_0300074C; extern struct SpritePalette gUnknown_083E5968; diff --git a/sym_bss.txt b/sym_bss.txt index 315bad6bb..e0cb62242 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -136,9 +136,9 @@ gUnknown_03000744: @ 3000744 gUnknown_03000748: @ 3000748 .space 0x4 -gUnknown_0300074C: @ 300074C - .space 0x4 + .include "src/menu_helpers.o" + .align 2 gUnknown_03000750: @ 3000750 .space 0x2 diff --git a/sym_ewram.txt b/sym_ewram.txt index ecb18decb..01dae8c0e 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -802,12 +802,9 @@ gUnknown_020388B8: @ 20388B8 gUnknown_020388BC: @ 20388BC .space 0x4 -gUnknown_020388C0: @ 20388C0 - .space 0x4 - -gUnknown_020388C4: @ 20388C4 - .space 0x8 + .include "src/menu_helpers.o" + .align 2 gUnknown_020388CC: @ 20388CC .space 0x4 |