diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-20 18:03:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 18:03:49 -0400 |
| commit | 4dc2ba23f617f0b53a8f4d95e82a71580a808c91 (patch) | |
| tree | 9522877c5990fcc3877e985f0d1c228a1c42593d /constants/constants.inc | |
| parent | c6b4319b682807d714f88857f16287770b483db8 (diff) | |
| parent | aeeff84462973b267e62031a945603d96afed716 (diff) | |
Merge branch 'master' into constants-mapdatasize
Diffstat (limited to 'constants/constants.inc')
| -rw-r--r-- | constants/constants.inc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/constants/constants.inc b/constants/constants.inc index 57b6ae2a5..6eeef5f2b 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -1,10 +1,8 @@ .include "constants/gba_constants.inc" .include "constants/misc_constants.inc" - .include "constants/type_constants.inc" .include "constants/contest_constants.inc" .include "constants/item_data_constants.inc" .include "constants/trainer_constants.inc" - .include "constants/berry_constants.inc" .include "constants/version.inc" .include "constants/battle.inc" .include "constants/battle_text.inc" |