diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /src/main.c | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c index 76ac3d6d9..0e93fb89f 100644 --- a/src/main.c +++ b/src/main.c @@ -15,7 +15,6 @@ #include "sound.h" extern struct SoundInfo gSoundInfo; -extern u32 gUnknown_3004820; extern u32 IntrMain[]; static void VBlankIntr(void); @@ -93,8 +92,8 @@ void AgbMain() gSoftResetDisabled = FALSE; - if (gUnknown_3004820 != 1) - SetMainCallback2(0); + if (gFlashMemoryPresent != TRUE) + SetMainCallback2(NULL); gUnknown_3001764 = 0; |