diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-08-19 13:26:22 -0500 |
| commit | bbe876153c2a0903a30b37734874bf63ca6d8a10 (patch) | |
| tree | 7efa03650e784e7ff6ac7d479b5315194a4081fb /src/field_specials.c | |
| parent | 300f2274f381b5a700b6a67847c3b9f97c67a541 (diff) | |
| parent | c2218920d57c883dc83078c2d1d7cf3af82babbb (diff) | |
Merge remote-tracking branch 'upstream/master' into ice
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index e8c83b376..043945a2f 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -18,10 +18,6 @@ #include "string_util.h" #include "strings.h" #include "pokeblock.h" -#include "constants/species.h" -#include "constants/abilities.h" -#include "constants/moves.h" -#include "constants/weather.h" #include "text.h" #include "wallclock.h" #include "tv.h" @@ -36,6 +32,11 @@ #include "field_weather.h" #include "pokemon_summary_screen.h" #include "random.h" +#include "constants/abilities.h" +#include "constants/event_object_movement_constants.h" +#include "constants/moves.h" +#include "constants/species.h" +#include "constants/weather.h" #if ENGLISH #define CHAR_DECIMAL_SEPARATOR CHAR_PERIOD |