diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
| commit | 13efa1ef62b3e23e2b0662e318ed155893e17e88 (patch) | |
| tree | 57ae51e1b35c38d24d69e090dbf39b27a687d17b /constants | |
| parent | d31600e70e53fb252fe67e8c427ecb7498719b86 (diff) | |
| parent | 7defc27b994069715e5749245700d20dd740e4f0 (diff) | |
fixing conflicts
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/constants.inc | 1 | ||||
| -rw-r--r-- | constants/item_data_constants.inc | 5 |
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 |