diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-05-09 05:10:23 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-05-09 05:10:23 -0500 |
| commit | b570f87152bcde1d108e5e8302ef6d783ecbbbbd (patch) | |
| tree | e00c31c3c2dc5a8c884ab7bdee51bb05ce391cf1 /constants | |
| parent | d66c1c642c60191887fc4dda6d33bb5b8e9ff69c (diff) | |
| parent | f14d2765da6f01eccb08967fd6b22c3bdef2be98 (diff) | |
Merge master from pret
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 |