summaryrefslogtreecommitdiff
path: root/constants/constants.inc
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-02-11 19:22:06 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-02-11 19:22:06 -0500
commitea347199a21f7a6c01a395e507db872ac1781e79 (patch)
tree625ec0a6469b40573d165ceee0855e969af45929 /constants/constants.inc
parentf39053ee3023b02139784f88d346b3b57853c307 (diff)
parent14a76793e596d612efd273169c4172922c270f13 (diff)
Merge branch 'master' into link
Diffstat (limited to 'constants/constants.inc')
-rw-r--r--constants/constants.inc2
1 files changed, 0 insertions, 2 deletions
diff --git a/constants/constants.inc b/constants/constants.inc
index 99c3d3c73..10d582eb1 100644
--- a/constants/constants.inc
+++ b/constants/constants.inc
@@ -1,11 +1,9 @@
.include "constants/gba_constants.inc"
.include "constants/misc_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/trainer_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
.include "constants/berry_constants.inc"