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/region_map.c | |
parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/region_map.c')
-rw-r--r-- | src/region_map.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/region_map.c b/src/region_map.c index 33cf665d0..81bd4aca4 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1,20 +1,15 @@ #include "global.h" -#include "palette.h" -#include "gpu_regs.h" +#include "gflib.h" #include "scanline_effect.h" #include "task.h" #include "m4a.h" -#include "malloc.h" #include "overworld.h" #include "event_data.h" #include "region_map.h" -#include "window.h" -#include "sound.h" #include "party_menu.h" #include "field_effect.h" #include "new_menu_helpers.h" #include "menu.h" -#include "string_util.h" #include "strings.h" #include "map_preview_screen.h" #include "constants/flags.h" |