diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-23 22:24:46 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-23 22:24:46 -0400 |
| commit | e36a5059065abf67b878dcec41bb019bab32e613 (patch) | |
| tree | f1f0d6bd18fd68167d518a3c61ced06b57c56e0c | |
| parent | 5c7d04ac84743d16bff16f0297744eb31d5e9e65 (diff) | |
Separate Mart constants from item data constants
| -rw-r--r-- | constants.asm | 1 | ||||
| -rw-r--r-- | constants/item_data_constants.asm | 46 | ||||
| -rw-r--r-- | constants/mart_constants.asm | 44 |
3 files changed, 45 insertions, 46 deletions
diff --git a/constants.asm b/constants.asm index 5dcbc57be..28736a1a9 100644 --- a/constants.asm +++ b/constants.asm @@ -28,6 +28,7 @@ INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_data_constants.asm" INCLUDE "constants/map_object_constants.asm" INCLUDE "constants/map_setup_constants.asm" +INCLUDE "constants/mart_constants.asm" INCLUDE "constants/menu_constants.asm" INCLUDE "constants/mobile_constants.asm" INCLUDE "constants/move_constants.asm" diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm index e503f3057..9d463d7d4 100644 --- a/constants/item_data_constants.asm +++ b/constants/item_data_constants.asm @@ -129,49 +129,3 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct const HELD_BRIGHTPOWDER const HELD_78 const HELD_FOCUS_BAND - - -; mart types (see engine/items/mart.asm) - const_def - const MARTTYPE_STANDARD - const MARTTYPE_BITTER - const MARTTYPE_BARGAIN - const MARTTYPE_PHARMACY - const MARTTYPE_ROOFTOP - -; Marts indexes (see data/items/marts.asm) - const_def - const MART_CHERRYGROVE - const MART_CHERRYGROVE_DEX - const MART_VIOLET - const MART_AZALEA - const MART_CIANWOOD - const MART_GOLDENROD_2F_1 - const MART_GOLDENROD_2F_2 - const MART_GOLDENROD_3F - const MART_GOLDENROD_4F - const MART_GOLDENROD_5F_1 - const MART_GOLDENROD_5F_2 - const MART_GOLDENROD_5F_3 - const MART_GOLDENROD_5F_4 - const MART_OLIVINE - const MART_ECRUTEAK - const MART_MAHOGANY_1 - const MART_MAHOGANY_2 - const MART_BLACKTHORN - const MART_VIRIDIAN - const MART_PEWTER - const MART_CERULEAN - const MART_LAVENDER - const MART_VERMILION - const MART_CELADON_2F_1 - const MART_CELADON_2F_2 - const MART_CELADON_3F - const MART_CELADON_4F - const MART_CELADON_5F_1 - const MART_CELADON_5F_2 - const MART_FUCHSIA - const MART_SAFFRON - const MART_MT_MOON - const MART_INDIGO_PLATEAU - const MART_UNDERGROUND diff --git a/constants/mart_constants.asm b/constants/mart_constants.asm new file mode 100644 index 000000000..c4834f524 --- /dev/null +++ b/constants/mart_constants.asm @@ -0,0 +1,44 @@ +; mart types (see engine/items/mart.asm) + const_def + const MARTTYPE_STANDARD + const MARTTYPE_BITTER + const MARTTYPE_BARGAIN + const MARTTYPE_PHARMACY + const MARTTYPE_ROOFTOP + +; Marts indexes (see data/items/marts.asm) + const_def + const MART_CHERRYGROVE + const MART_CHERRYGROVE_DEX + const MART_VIOLET + const MART_AZALEA + const MART_CIANWOOD + const MART_GOLDENROD_2F_1 + const MART_GOLDENROD_2F_2 + const MART_GOLDENROD_3F + const MART_GOLDENROD_4F + const MART_GOLDENROD_5F_1 + const MART_GOLDENROD_5F_2 + const MART_GOLDENROD_5F_3 + const MART_GOLDENROD_5F_4 + const MART_OLIVINE + const MART_ECRUTEAK + const MART_MAHOGANY_1 + const MART_MAHOGANY_2 + const MART_BLACKTHORN + const MART_VIRIDIAN + const MART_PEWTER + const MART_CERULEAN + const MART_LAVENDER + const MART_VERMILION + const MART_CELADON_2F_1 + const MART_CELADON_2F_2 + const MART_CELADON_3F + const MART_CELADON_4F + const MART_CELADON_5F_1 + const MART_CELADON_5F_2 + const MART_FUCHSIA + const MART_SAFFRON + const MART_MT_MOON + const MART_INDIGO_PLATEAU + const MART_UNDERGROUND |