diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /src/main.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/main.c b/src/main.c index cfdaf2e44..e2c96c78f 100644 --- a/src/main.c +++ b/src/main.c @@ -1,20 +1,14 @@ #include "global.h" -#include "bg.h" -#include "gpu_regs.h" +#include "gflib.h" #include "link.h" #include "link_rfu.h" #include "load_save.h" -#include "main.h" #include "m4a.h" #include "random.h" -#include "dma3.h" #include "gba/flash_internal.h" #include "help_system.h" -#include "sound.h" #include "new_menu_helpers.h" -#include "malloc.h" #include "overworld.h" -#include "sprite.h" #include "play_time.h" #include "intro.h" #include "battle_controllers.h" @@ -207,7 +201,7 @@ static void InitMainCallbacks(void) gSaveBlock2Ptr = &gSaveBlock2; gSaveBlock1Ptr = &gSaveBlock1; gSaveBlock2.encryptionKey = 0; - gUnknown_3005E88 = 0; + gQuestLogPlaybackState = 0; } static void CallCallbacks(void) |