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/map_preview_screen.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/map_preview_screen.c')
| -rw-r--r-- | src/map_preview_screen.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c index f3cff7882..33e69a8a0 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -1,11 +1,7 @@ #include "global.h" -#include "gpu_regs.h" -#include "bg.h" -#include "palette.h" -#include "malloc.h" +#include "gflib.h" #include "quest_log.h" #include "new_menu_helpers.h" -#include "window.h" #include "region_map.h" #include "menu.h" #include "field_fadetransition.h" @@ -366,7 +362,7 @@ bool8 MapHasPreviewScreen(u8 mapsec, u8 type) bool32 MapHasPreviewScreen_HandleQLState2(u8 mapsec, u8 type) { - if (gQuestLogState == QL_STATE_2) + if (gQuestLogState == QL_STATE_PLAYBACK) { return FALSE; } |