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_2.c | |
| parent | 435167674968749684710d7ad5c4f628c6b4ae86 (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
Merge branch 'master' into decompile_use_pokeblock
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index 006a5e467..52530f6b3 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -11,12 +11,12 @@ #include "palette.h" #include "task.h" #include "event_data.h" -#include "species.h" +#include "constants/species.h" #include "berry.h" #include "text.h" #include "item.h" -#include "items.h" -#include "hold_effects.h" +#include "constants/items.h" +#include "constants/hold_effects.h" #include "link.h" #include "bg.h" #include "dma3.h" @@ -26,18 +26,18 @@ #include "m4a.h" #include "window.h" #include "random.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "battle_message.h" #include "sprite.h" #include "util.h" #include "trig.h" #include "battle_ai_script_commands.h" -#include "battle_move_effects.h" +#include "constants/battle_move_effects.h" #include "battle_controllers.h" #include "pokedex.h" -#include "abilities.h" -#include "moves.h" +#include "constants/abilities.h" +#include "constants/moves.h" #include "trainer_classes.h" #include "evolution_scene.h" #include "roamer.h" |