diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /src/main.c | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c index b88326cda..77f668e6f 100644 --- a/src/main.c +++ b/src/main.c @@ -9,7 +9,6 @@ #include "random.h" #include "dma3.h" #include "gba/flash_internal.h" -#include "battle.h" #include "help_system.h" #include "sound.h" #include "new_menu_helpers.h" @@ -17,12 +16,11 @@ #include "overworld.h" #include "sprite.h" #include "play_time.h" -#include "pokemon.h" #include "intro.h" #include "battle_controllers.h" #include "scanline_effect.h" #include "save_failed_screen.h" -#include "battle.h" +#include "quest_log.h" extern u32 intr_main[]; @@ -80,9 +78,6 @@ static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7; EWRAM_DATA u8 gDecompressionBuffer[0x4000] = {0}; EWRAM_DATA u16 gTrainerId = 0; -extern bool8 gWirelessCommType; -extern bool8 gUnknown_3005E88; - static void UpdateLinkAndCallCallbacks(void); static void InitMainCallbacks(void); static void CallCallbacks(void); @@ -181,7 +176,7 @@ static void InitMainCallbacks(void) gSaveBlock2Ptr = &gSaveBlock2; gSaveBlock1Ptr = &gSaveBlock1; gSaveBlock2.encryptionKey = 0; - gUnknown_3005E88 = FALSE; + gUnknown_3005E88 = 0; } static void CallCallbacks(void) |