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/battle | |
| parent | 6c5d1c4a3de2f1a2d1855a542a6a5d53e4daf936 (diff) | |
| parent | 68cf5eb3cbff3b0eac6cd348c7e6c594c287d67b (diff) | |
Merge pull request #10 from pret/master
sync with source repo
Diffstat (limited to 'src/battle')
| -rw-r--r-- | src/battle/battle_bg.c | 3 | ||||
| -rw-r--r-- | src/battle/battle_setup.c | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/battle/battle_bg.c b/src/battle/battle_bg.c index 5a2a1efa3..4928708e0 100644 --- a/src/battle/battle_bg.c +++ b/src/battle/battle_bg.c @@ -1,6 +1,5 @@ #include "global.h" #include "battle.h" -#include "constants/songs.h" #include "decompress.h" #include "ewram.h" #include "graphics.h" @@ -13,6 +12,8 @@ #include "trainer.h" #include "trig.h" #include "sound.h" +#include "constants/map_types.h" +#include "constants/songs.h" extern u16 gBattleTypeFlags; 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; |