Mart constants

3 files changed, 46 insertions, 3 deletions

diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index 775991a87..801115c31 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -1817,7 +1817,7 @@
 	const EVENT_OLIVINE_LIGHTHOUSE_JASMINE
 	const EVENT_OLIVINE_GYM_JASMINE
 	const EVENT_LAKE_OF_RAGE_LANCE
-	const EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
+	const EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
 	const EVENT_TEAM_ROCKET_BASE_B2F_LANCE
 	const EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
 	const EVENT_DRAGONS_DEN_CLAIR
@@ -1914,7 +1914,7 @@
 	const EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
 	const EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
 	const EVENT_LAKE_OF_RAGE_CIVILIANS
-	const EVENT_MAHOGANY_MART_OWNERS
+	const EVENT_MAHOGANY_MARTTYPE_OWNERS
 	const EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
 	const EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
 	const EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 80f27a5f6..4a144515f 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -369,3 +369,46 @@ ITEMMENU_NOUSE              EQU 0
 ITEMMENU_CURRENT            EQU 4
 ITEMMENU_PARTY              EQU 5
 ITEMMENU_CLOSE              EQU 6
+
+	const_def
+	const MARTTYPE_STANDARD
+	const MARTTYPE_BITTER
+	const MARTTYPE_BARGAIN
+	const MARTTYPE_PHARMACY
+	const MARTTYPE_ROOFTOP
+
+	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/map_constants.asm b/constants/map_constants.asm
index 0880a4f1e..79fcc63b8 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -82,7 +82,7 @@ MAP_NONE   EQU 0
 	mapgroup OLIVINE_LIGHTHOUSE_4F,                       9, 10 ; 45
 	mapgroup OLIVINE_LIGHTHOUSE_5F,                       9, 10 ; 46
 	mapgroup OLIVINE_LIGHTHOUSE_6F,                       9, 10 ; 47
-	mapgroup MAHOGANY_MART_1F,                            4,  4 ; 48
+	mapgroup MAHOGANY_MARTTYPE_1F,                            4,  4 ; 48
 	mapgroup TEAM_ROCKET_BASE_B1F,                        9, 15 ; 49
 	mapgroup TEAM_ROCKET_BASE_B2F,                        9, 15 ; 50
 	mapgroup TEAM_ROCKET_BASE_B3F,                        9, 15 ; 51