diff options
| -rw-r--r-- | src/main.c | 8 | ||||
| -rw-r--r-- | sym_ewram.txt | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c index bfab49c49..ad03860f3 100644 --- a/src/main.c +++ b/src/main.c @@ -96,13 +96,13 @@ u8 gUnknown_3003D84; static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7; -extern u16 gTrainerId; +EWRAM_DATA u8 gDecompressionBuffer[0x4000] = {0}; +EWRAM_DATA u16 gTrainerId = 0; + extern bool8 gUnknown_3005ECC; extern bool8 gWirelessCommType; extern bool8 gUnknown_3005E88; -EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL; - static void UpdateLinkAndCallCallbacks(void); static void InitMainCallbacks(void); static void CallCallbacks(void); @@ -116,7 +116,7 @@ void EnableVCountIntrAtLine150(void); void AgbMain() { RegisterRamReset(RESET_ALL); - *(vu16 *)BG_PLTT = 0x7FFF; + *(vu16 *)BG_PLTT = RGB_WHITE; InitGpuRegManager(); REG_WAITCNT = WAITCNT_PREFETCH_ENABLE | WAITCNT_WS0_S_1 | WAITCNT_WS0_N_3; InitKeys(); diff --git a/sym_ewram.txt b/sym_ewram.txt index dd746ec42..9ad13f3ef 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1,13 +1,15 @@ -gDecompressionBuffer: @ 201C000 - .space 0x4000 - -gTrainerId: @ 2020000 - .space 0x4 + .align 2 + .include "src/main.o" + .align 2 .include "src/malloc.o" + .align 2 .include "src/text_printer.o" + .align 2 .include "src/window.o" + .align 2 .include "src/window_8bpp.o" + .align 2 .include "src/sprite.o" .align 2 |