diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
| commit | 44abbae60b6a39e2a1432426005e1860be196abb (patch) | |
| tree | f2405db72863761afcdcda57a88cf6ab0346e4fd /constants/constants.inc | |
| parent | 039c9f4bd8ee6bfb299d4422372804c569eddebd (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
nerge with master, fix conflicts
Diffstat (limited to 'constants/constants.inc')
| -rw-r--r-- | constants/constants.inc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/constants/constants.inc b/constants/constants.inc index fbd4e8af0..99c3d3c73 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -1,20 +1,12 @@ .include "constants/gba_constants.inc" .include "constants/misc_constants.inc" - .include "constants/species_constants.inc" - .include "constants/ability_constants.inc" - .include "constants/move_constants.inc" - .include "constants/item_constants.inc" .include "constants/type_constants.inc" .include "constants/contest_constants.inc" .include "constants/pokemon_data_constants.inc" .include "constants/item_data_constants.inc" .include "constants/battle_move_constants.inc" - .include "constants/easy_chat_constants.inc" .include "constants/trainer_constants.inc" .include "constants/battle_frontier_constants.inc" .include "constants/map_constants.inc" - .include "constants/map_object_constants.inc" .include "constants/berry_constants.inc" - .include "constants/field_object_constants.inc" .include "constants/contest_move_effects.inc" - .include "constants/songs.inc" |