diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 11:42:59 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 11:42:59 +0100 |
| commit | f4ab21ee67eb3d254e086c95467ac08b08a6014c (patch) | |
| tree | b54ca1eb6800b5c07b94c134e401f2e4ef00dc79 /src/battle_util.c | |
| parent | 435167674968749684710d7ad5c4f628c6b4ae86 (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
Merge branch 'master' into decompile_use_pokeblock
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index e67d22d64..1a624641d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1,14 +1,14 @@ #include "global.h" #include "battle.h" -#include "abilities.h" -#include "moves.h" -#include "hold_effects.h" +#include "constants/abilities.h" +#include "constants/moves.h" +#include "constants/hold_effects.h" #include "pokemon.h" -#include "species.h" +#include "constants/species.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "util.h" -#include "battle_move_effects.h" +#include "constants/battle_move_effects.h" #include "battle_scripts.h" #include "random.h" #include "text.h" |