diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-13 22:22:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 22:22:43 -0400 |
| commit | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (patch) | |
| tree | 6cbdbe8e87708ffca6a49d6b507ed6341b26f4e2 /src/overworld.c | |
| parent | 6c5d1c4a3de2f1a2d1855a542a6a5d53e4daf936 (diff) | |
| parent | 68cf5eb3cbff3b0eac6cd348c7e6c594c287d67b (diff) | |
Merge pull request #10 from pret/master
sync with source repo
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/overworld.c b/src/overworld.c index f6dea1271..a7a203ca2 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -24,7 +24,6 @@ #include "load_save.h" #include "main.h" #include "m4a.h" -#include "constants/maps.h" #include "map_name_popup.h" #include "menu.h" #include "metatile_behavior.h" @@ -38,9 +37,7 @@ #include "script.h" #include "script_pokemon_80C4.h" #include "secret_base.h" -#include "constants/songs.h" #include "sound.h" -#include "constants/species.h" #include "start_menu.h" #include "task.h" #include "tileset_anim.h" @@ -48,6 +45,10 @@ #include "tv.h" #include "scanline_effect.h" #include "wild_encounter.h" +#include "constants/map_types.h" +#include "constants/maps.h" +#include "constants/songs.h" +#include "constants/species.h" #ifdef SAPPHIRE #define LEGENDARY_MUSIC MUS_OOAME // Heavy Rain |