summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-05-06 10:05:26 -0700
committerGitHub <noreply@github.com>2018-05-06 10:05:26 -0700
commitf14d2765da6f01eccb08967fd6b22c3bdef2be98 (patch)
treec10e1ee358275b62b8fa660e376913bd0112d3db /constants
parent83ea8d0cd9f8141181d09718c79b8916df945752 (diff)
parent7f2329253f8e2739db0e25fd37aeb6582ba04d26 (diff)
Merge pull request #240 from Slawter666/master
Move gItems to c
Diffstat (limited to 'constants')
-rw-r--r--constants/constants.inc1
-rw-r--r--constants/item_data_constants.inc5
2 files changed, 0 insertions, 6 deletions
diff --git a/constants/constants.inc b/constants/constants.inc
index 28f2b2658..5e133bba4 100644
--- a/constants/constants.inc
+++ b/constants/constants.inc
@@ -2,7 +2,6 @@
.include "constants/misc_constants.inc"
.include "constants/contest_constants.inc"
.include "constants/pokemon_data_constants.inc"
- .include "constants/item_data_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
.include "constants/berry_constants.inc"
diff --git a/constants/item_data_constants.inc b/constants/item_data_constants.inc
deleted file mode 100644
index 07ceb6e3b..000000000
--- a/constants/item_data_constants.inc
+++ /dev/null
@@ -1,5 +0,0 @@
- .set POCKET_ITEMS, 0x01
- .set POCKET_POKE_BALLS, 0x02
- .set POCKET_TM_HM, 0x03
- .set POCKET_BERRIES, 0x04
- .set POCKET_KEY_ITEMS, 0x05