diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-26 18:24:39 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-26 18:24:39 -0400 |
| commit | d160ca467920d97245c012b8dd0cb8be6d06620a (patch) | |
| tree | 294fa7011b22853896dc622d291b0a5be08a752a /constants/constants.inc | |
| parent | 0e75d957d675564977b2e442c16822bab390aa2c (diff) | |
| parent | 3c8091393ca12b8eeb26f236a997b70eea5688c6 (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'constants/constants.inc')
| -rw-r--r-- | constants/constants.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/constants/constants.inc b/constants/constants.inc index 650ba4703..3928d63d6 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -13,6 +13,7 @@ .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" |