diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-07-12 22:35:20 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-12 22:35:20 -0500 |
commit | fce542610429f6ff18f406fe5f9ef8b09fc97962 (patch) | |
tree | daa7dd03c630d0f34968bb24c81ba9e88dceeb3b /src/battle/battle_setup.c | |
parent | 6ac3d87d11143461c37e6d0a2bba1fd77a1bd21d (diff) |
Use map type constants in map headers
Diffstat (limited to 'src/battle/battle_setup.c')
-rw-r--r-- | src/battle/battle_setup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 8c5f68902..e8a3ef451 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -12,9 +12,7 @@ #include "fieldmap.h" #include "fldeff_poison.h" #include "main.h" -#include "constants/maps.h" #include "metatile_behavior.h" -#include "constants/opponents.h" #include "palette.h" #include "random.h" #include "overworld.h" @@ -22,15 +20,18 @@ #include "script.h" #include "script_pokemon_80C4.h" #include "secret_base.h" -#include "constants/songs.h" #include "sound.h" -#include "constants/species.h" #include "starter_choose.h" #include "string_util.h" #include "strings.h" #include "task.h" #include "text.h" #include "trainer.h" +#include "constants/map_types.h" +#include "constants/maps.h" +#include "constants/opponents.h" +#include "constants/songs.h" +#include "constants/species.h" extern u16 gSpecialVar_Result; |