diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
| commit | fdd7e7cb848747a1e0ace8a63d29aaa22dfd1140 (patch) | |
| tree | 6ddaed4de52bfcc517d573a8f30c5bd0a1650782 /src/engine/main.c | |
| parent | bb8f652504f886af296ffcaac57bf76cdc893c97 (diff) | |
| parent | 1c1ce902515ccb3ccecde29611711c9b1a3ce955 (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'src/engine/main.c')
| -rw-r--r-- | src/engine/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/main.c b/src/engine/main.c index d7c11b6c8..82a5fffb4 100644 --- a/src/engine/main.c +++ b/src/engine/main.c @@ -7,7 +7,7 @@ #include "load_save.h" #include "m4a.h" #include "play_time.h" -#include "rng.h" +#include "random.h" #include "rom3.h" #include "overworld.h" #include "rtc.h" @@ -70,6 +70,7 @@ bool8 gLinkVSyncDisabled; u32 IntrMain_Buffer[0x200]; u8 gPcmDmaCounter; +EWRAM_DATA u8 gSharedMem[0x20000] = {0}; EWRAM_DATA void (**gFlashTimerIntrFunc)(void) = NULL; static void UpdateLinkAndCallCallbacks(void); |