diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
| commit | 46fa2557d777096803ff90ba95d5500a9c03d2c5 (patch) | |
| tree | ded4f0e046be43e371631fca3ac013d96fa244e0 /src/battle_ai_switch_items.c | |
| parent | 930fea6fad24692773b930ec7448c59d599844b8 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
merge mail with master, fix conflicts
Diffstat (limited to 'src/battle_ai_switch_items.c')
| -rw-r--r-- | src/battle_ai_switch_items.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index f5b6c7fe4..b3fccb17f 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -1,13 +1,13 @@ #include "global.h" #include "battle.h" #include "battle_controllers.h" -#include "abilities.h" -#include "moves.h" +#include "constants/abilities.h" +#include "constants/moves.h" #include "pokemon.h" -#include "species.h" -#include "rng.h" +#include "constants/species.h" +#include "random.h" #include "util.h" -#include "items.h" +#include "constants/items.h" #include "pokemon_item_effects.h" extern u8 gActiveBank; |