Mart constants

39 files changed, 98 insertions, 53 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
diff --git a/engine/map_triggers.asm b/engine/map_triggers.asm
index 2b190fa3e..52822f90b 100644
--- a/engine/map_triggers.asm
+++ b/engine/map_triggers.asm
@@ -71,7 +71,7 @@ ENDM
 	trigger_def RUINS_OF_ALPH_OMANYTE_CHAMBER,          wRuinsOfAlphOmanyteChamberTrigger
 	trigger_def RUINS_OF_ALPH_AERODACTYL_CHAMBER,       wRuinsOfAlphAerodactylChamberTrigger
 	trigger_def RUINS_OF_ALPH_INNER_CHAMBER,            wRuinsOfAlphInnerChamberTrigger
-	trigger_def MAHOGANY_MART_1F,                       wMahoganyMart1FTrigger
+	trigger_def MAHOGANY_MARTTYPE_1F,                       wMahoganyMart1FTrigger
 	trigger_def TEAM_ROCKET_BASE_B1F,                   wTeamRocketBaseB1FTrigger
 	trigger_def TEAM_ROCKET_BASE_B2F,                   wTeamRocketBaseB2FTrigger
 	trigger_def TEAM_ROCKET_BASE_B3F,                   wTeamRocketBaseB3FTrigger
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index 5c0df0355..1bb4a61d8 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -489,7 +489,7 @@ InitializeEventsScript:
 	setevent EVENT_ILEX_FOREST_APPRENTICE
 	setevent EVENT_ILEX_FOREST_FARFETCHD
 	setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER
-	setevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
+	setevent EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
 	setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
 	setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
 	setevent EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
@@ -535,7 +535,7 @@ InitializeEventsScript:
 	setevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
 	setevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
 	setevent EVENT_LAKE_OF_RAGE_CIVILIANS
-	setevent EVENT_MAHOGANY_MART_OWNERS
+	setevent EVENT_MAHOGANY_MARTTYPE_OWNERS
 	setevent EVENT_TIN_TOWER_ROOF_HO_OH
 	setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
 	setevent EVENT_KRISS_HOUSE_2F_CONSOLE
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm
index 7be212e78..58331f411 100644
--- a/maps/AzaleaMart.asm
+++ b/maps/AzaleaMart.asm
@@ -7,7 +7,7 @@ AzaleaMart_MapScriptHeader:
 
 ClerkScript_0x18e040:
 	loadfont
-	pokemart $0, $0003
+	pokemart MARTTYPE_STANDARD, MART_AZALEA
 	loadmovesprites
 	end
 
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index ca810cf23..081736b6a 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -47,7 +47,7 @@ ClairScript_0x194e24:
 	setevent EVENT_BEAT_COOLTRAINERM_MIKE
 	setevent EVENT_BEAT_COOLTRAINERF_FRAN
 	setevent EVENT_BEAT_COOLTRAINERF_LOLA
-	clearevent EVENT_MAHOGANY_MART_OWNERS
+	clearevent EVENT_MAHOGANY_MARTTYPE_OWNERS
 	setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
 	clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
 	end
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm
index 93c82feda..10d0a97a2 100644
--- a/maps/BlackthornMart.asm
+++ b/maps/BlackthornMart.asm
@@ -7,7 +7,7 @@ BlackthornMart_MapScriptHeader:
 
 ClerkScript_0x195a5d:
 	loadfont
-	pokemart $0, $0011
+	pokemart MARTTYPE_STANDARD, MART_BLACKTHORN
 	loadmovesprites
 	end
 
diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm
index 83beda0bd..b2fe823da 100644
--- a/maps/CeladonDeptStore2F.asm
+++ b/maps/CeladonDeptStore2F.asm
@@ -8,14 +8,14 @@ CeladonDeptStore2F_MapScriptHeader:
 ClerkScript_0x70bad:
 	faceplayer
 	loadfont
-	pokemart $0, $0017
+	pokemart MARTTYPE_STANDARD, MART_CELADON_2F_1
 	loadmovesprites
 	end
 
 ClerkScript_0x70bb5:
 	faceplayer
 	loadfont
-	pokemart $0, $0018
+	pokemart MARTTYPE_STANDARD, MART_CELADON_2F_2
 	loadmovesprites
 	end
 
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index de920eaf3..c98f2868c 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -8,7 +8,7 @@ CeladonDeptStore3F_MapScriptHeader:
 ClerkScript_0x70d29:
 	faceplayer
 	loadfont
-	pokemart $0, $0019
+	pokemart MARTTYPE_STANDARD, MART_CELADON_3F
 	loadmovesprites
 	end
 
diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm
index 4f88bfb27..e91d4310c 100644
--- a/maps/CeladonDeptStore4F.asm
+++ b/maps/CeladonDeptStore4F.asm
@@ -8,7 +8,7 @@ CeladonDeptStore4F_MapScriptHeader:
 ClerkScript_0x70f0d:
 	faceplayer
 	loadfont
-	pokemart $0, $001a
+	pokemart MARTTYPE_STANDARD, MART_CELADON_4F
 	loadmovesprites
 	end
 
diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm
index a66fb7a12..8ac74edff 100644
--- a/maps/CeladonDeptStore5F.asm
+++ b/maps/CeladonDeptStore5F.asm
@@ -8,14 +8,14 @@ CeladonDeptStore5F_MapScriptHeader:
 ClerkScript_0x71004:
 	faceplayer
 	loadfont
-	pokemart $0, $001b
+	pokemart MARTTYPE_STANDARD, MART_CELADON_5F_1
 	loadmovesprites
 	end
 
 ClerkScript_0x7100c:
 	faceplayer
 	loadfont
-	pokemart $0, $001c
+	pokemart MARTTYPE_STANDARD, MART_CELADON_5F_2
 	loadmovesprites
 	end
 
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm
index 45748c862..af7fdc656 100644
--- a/maps/CeruleanMart.asm
+++ b/maps/CeruleanMart.asm
@@ -7,7 +7,7 @@ CeruleanMart_MapScriptHeader:
 
 ClerkScript_0x188ac0:
 	loadfont
-	pokemart $0, $0014
+	pokemart MARTTYPE_STANDARD, MART_CERULEAN
 	loadmovesprites
 	end
 
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index f2425138a..27ebac628 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -9,12 +9,12 @@ ClerkScript_0x19680a:
 	loadfont
 	checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
 	iftrue UnknownScript_0x196817
-	pokemart $0, 0
+	pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE
 	loadmovesprites
 	end
 
 UnknownScript_0x196817:
-	pokemart $0, $0001
+	pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE_DEX
 	loadmovesprites
 	end
 
diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm
index df3f30453..56f49f2a0 100644
--- a/maps/CianwoodPharmacy.asm
+++ b/maps/CianwoodPharmacy.asm
@@ -32,7 +32,7 @@ CianwoodPharmacist:
 	end
 
 .Mart
-	pokemart $3, $0004
+	pokemart MARTTYPE_PHARMACY, MART_CIANWOOD
 	loadmovesprites
 	end
 
diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm
index ab0acf470..aaf021af9 100644
--- a/maps/EcruteakMart.asm
+++ b/maps/EcruteakMart.asm
@@ -7,7 +7,7 @@ EcruteakMart_MapScriptHeader:
 
 ClerkScript_0x99c3b:
 	loadfont
-	pokemart $0, $000e
+	pokemart MARTTYPE_STANDARD, MART_ECRUTEAK
 	loadmovesprites
 	end
 
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm
index 8c3e55c16..143c91575 100644
--- a/maps/FuchsiaMart.asm
+++ b/maps/FuchsiaMart.asm
@@ -7,7 +7,7 @@ FuchsiaMart_MapScriptHeader:
 
 ClerkScript_0x195ce8:
 	loadfont
-	pokemart $0, $001d
+	pokemart MARTTYPE_STANDARD, MART_FUCHSIA
 	loadmovesprites
 	end
 
diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm
index b5c436ab3..03d53c0f0 100644
--- a/maps/GoldenrodDeptStore2F.asm
+++ b/maps/GoldenrodDeptStore2F.asm
@@ -8,14 +8,14 @@ GoldenrodDeptStore2F_MapScriptHeader:
 ClerkScript_0x55b5d:
 	faceplayer
 	loadfont
-	pokemart $0, $0005
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_1
 	loadmovesprites
 	end
 
 ClerkScript_0x55b65:
 	faceplayer
 	loadfont
-	pokemart $0, $0006
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_2
 	loadmovesprites
 	end
 
diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm
index dd183074e..ca87e0a03 100644
--- a/maps/GoldenrodDeptStore3F.asm
+++ b/maps/GoldenrodDeptStore3F.asm
@@ -8,7 +8,7 @@ GoldenrodDeptStore3F_MapScriptHeader:
 ClerkScript_0x55db8:
 	faceplayer
 	loadfont
-	pokemart $0, $0007
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_3F
 	loadmovesprites
 	end
 
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index ffbae3285..812c406f4 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -8,7 +8,7 @@ GoldenrodDeptStore4F_MapScriptHeader:
 ClerkScript_0x55ee9:
 	faceplayer
 	loadfont
-	pokemart $0, $0008
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_4F
 	loadmovesprites
 	end
 
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index 0d679f50e..fc715179d 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -34,22 +34,22 @@ ClerkScript_0x5609c:
 	jump .onlyheadbutt
 
 .neither:
-	pokemart $0, $0009
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1
 	loadmovesprites
 	end
 
 .onlyheadbutt:
-	pokemart $0, $000a
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_2
 	loadmovesprites
 	end
 
 .onlyrocksmash:
-	pokemart $0, $000b
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_3
 	loadmovesprites
 	end
 
 .both:
-	pokemart $0, $000c
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_4
 	loadmovesprites
 	end
 
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index 8e4beeee4..3a20e8b3d 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -35,7 +35,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
 
 ClerkScript_0x5673f:
 	loadfont
-	pokemart $4, 0
+	pokemart MARTTYPE_ROOFTOP, 0
 	loadmovesprites
 	end
 
diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm
index 52c818492..a294c50ce 100644
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -137,7 +137,7 @@ NurseScript_0x18012c:
 
 ClerkScript_0x18012f:
 	loadfont
-	pokemart $0, $0020
+	pokemart MARTTYPE_STANDARD, MART_INDIGO_PLATEAU
 	loadmovesprites
 	end
 
diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm
index df7a8eb92..7ef69377f 100644
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -70,8 +70,10 @@ KrissHouseRadio:
 	loadmovesprites
 	setevent EVENT_LISTENED_TO_INITIAL_RADIO
 	end
+
 .NormalRadio
 	jumpstd radio1
+
 .AbbreviatedRadio
 	loadfont
 	writetext KrisRadioText4
diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm
index 3ecc820cb..0f03243e6 100644
--- a/maps/LakeofRage.asm
+++ b/maps/LakeofRage.asm
@@ -51,9 +51,9 @@ UnknownScript_0x70035:
 	playsound SFX_WARP_TO
 	applymovement $2, MovementData_0x70155
 	disappear $2
-	clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
+	clearevent EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
 	setevent EVENT_DECIDED_TO_HELP_LANCE
-	domaptrigger MAHOGANY_MART_1F, $1
+	domaptrigger MAHOGANY_MARTTYPE_1F, $1
 	end
 
 UnknownScript_0x7004e:
diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm
index 23be152b3..4271669ad 100644
--- a/maps/LavenderMart.asm
+++ b/maps/LavenderMart.asm
@@ -7,7 +7,7 @@ LavenderMart_MapScriptHeader:
 
 ClerkScript_0x7eb1c:
 	loadfont
-	pokemart $0, $0015
+	pokemart MARTTYPE_STANDARD, MART_LAVENDER
 	loadmovesprites
 	end
 
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 1a07867dd..427911e8b 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -34,7 +34,7 @@ PharmacistScript_0x6c367:
 	loadfont
 	checkevent EVENT_DECIDED_TO_HELP_LANCE
 	iftrue UnknownScript_0x6c375
-	pokemart $0, $000f
+	pokemart MARTTYPE_STANDARD, MART_MAHOGANY_1
 	loadmovesprites
 	end
 
@@ -106,7 +106,7 @@ UnknownScript_0x6c38f:
 GrannyScript_0x6c3ee:
 	faceplayer
 	loadfont
-	pokemart $0, $0010
+	pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2
 	loadmovesprites
 	end
 
@@ -238,6 +238,6 @@ MahoganyMart1F_MapEventHeader:
 	db 5
 	person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
 	person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
-	person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
-	person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
-	person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
+	person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
+	person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
+	person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MARTTYPE_OWNERS
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index f7c1bcc08..7b78e67cc 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -248,7 +248,7 @@ MahoganyTown_MapEventHeader:
 
 .Warps:
 	db 5
-	warp_def $7, $b, 1, MAHOGANY_MART_1F
+	warp_def $7, $b, 1, MAHOGANY_MARTTYPE_1F
 	warp_def $7, $11, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
 	warp_def $d, $6, 1, MAHOGANY_GYM
 	warp_def $d, $f, 1, MAHOGANY_POKECENTER_1F
@@ -271,4 +271,4 @@ MahoganyTown_MapEventHeader:
 	person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x19007e, -1
 	person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
-	person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS
+	person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MARTTYPE_OWNERS
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index 859b3a328..b3287327e 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -8,7 +8,7 @@ MountMoonGiftShop_MapScriptHeader:
 GrampsScript_0x771a8:
 	faceplayer
 	loadfont
-	pokemart $0, $001f
+	pokemart MARTTYPE_STANDARD, MART_MT_MOON
 	loadmovesprites
 	end
 
diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm
index 24a1a4df6..9ec10b3f6 100644
--- a/maps/OlivineMart.asm
+++ b/maps/OlivineMart.asm
@@ -7,7 +7,7 @@ OlivineMart_MapScriptHeader:
 
 ClerkScript_0x9cac7:
 	loadfont
-	pokemart $0, $000d
+	pokemart MARTTYPE_STANDARD, MART_OLIVINE
 	loadmovesprites
 	end
 
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index 67e1af4f4..a830fa962 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -7,7 +7,7 @@ PewterMart_MapScriptHeader:
 
 ClerkScript_0x1a2dcb:
 	loadfont
-	pokemart $0, $0013
+	pokemart MARTTYPE_STANDARD, MART_PEWTER
 	loadmovesprites
 	end
 
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index a7516aa10..964d96eda 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -102,7 +102,7 @@ UnknownScript_0x6006e:
 	setevent EVENT_GOLDENROD_CITY_ROCKET_SCOUT
 	setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
 	setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER
-	clearevent EVENT_MAHOGANY_MART_OWNERS
+	clearevent EVENT_MAHOGANY_MARTTYPE_OWNERS
 	clearflag ENGINE_ROCKETS_IN_MAHOGANY
 	clearevent EVENT_GOLDENROD_CITY_CIVILIANS
 	clearevent EVENT_RADIO_TOWER_CIVILIANS_AFTER
diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm
index ce1016e1a..0f86b355c 100644
--- a/maps/SaffronMart.asm
+++ b/maps/SaffronMart.asm
@@ -7,7 +7,7 @@ SaffronMart_MapScriptHeader:
 
 ClerkScript_0x18a3bf:
 	loadfont
-	pokemart $0, $001e
+	pokemart MARTTYPE_STANDARD, MART_SAFFRON
 	loadmovesprites
 	end
 
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index ea250ae37..6b2378a3a 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -730,7 +730,7 @@ TeamRocketBaseB1F_MapEventHeader:
 
 .Warps:
 	db 4
-	warp_def $2, $1b, 3, MAHOGANY_MART_1F
+	warp_def $2, $1b, 3, MAHOGANY_MARTTYPE_1F
 	warp_def $e, $3, 1, TEAM_ROCKET_BASE_B2F
 	warp_def $f, $5, 4, TEAM_ROCKET_BASE_B1F
 	warp_def $2, $19, 3, TEAM_ROCKET_BASE_B1F
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index a24da7bdd..e303e64ef 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -7,7 +7,7 @@ VermilionMart_MapScriptHeader:
 
 ClerkScript_0x191f7e:
 	loadfont
-	pokemart $0, $0016
+	pokemart MARTTYPE_STANDARD, MART_VERMILION
 	loadmovesprites
 	end
 
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index f395651dc..42b215d20 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -7,7 +7,7 @@ VioletMart_MapScriptHeader:
 
 ClerkScript_0x68295:
 	loadfont
-	pokemart $0, $0002
+	pokemart MARTTYPE_STANDARD, MART_VIOLET
 	loadmovesprites
 	end
 
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index 558f000d3..f6db83302 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -7,7 +7,7 @@ ViridianMart_MapScriptHeader:
 
 ClerkScript_0x9b5e7:
 	loadfont
-	pokemart $0, $0012
+	pokemart MARTTYPE_STANDARD, MART_VIRIDIAN
 	loadmovesprites
 	end
 
diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm
index 8aacb4fe4..e95bd02ef 100644
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -156,7 +156,7 @@ GrannyScript_0x7c132:
 	jump WarehouseEntranceScript_ShopClosed
 
 .Open:
-	pokemart $1, $0021
+	pokemart MARTTYPE_BITTER, MART_UNDERGROUND
 	loadmovesprites
 	end
 
@@ -171,7 +171,7 @@ GrampsScript_0x7c146:
 .CheckMorn:
 	checkmorn
 	iffalse WarehouseEntranceScript_ShopClosed
-	pokemart $2, 0
+	pokemart MARTTYPE_BARGAIN, 0
 	loadmovesprites
 	end
 
diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm
index c79d02a33..1c02fdfc3 100644
--- a/maps/second_map_headers.asm
+++ b/maps/second_map_headers.asm
@@ -325,7 +325,7 @@
 	map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, 0
 	map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, 0
 	map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, 0
-	map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, 0
+	map_header_2 MahoganyMart1F, MAHOGANY_MARTTYPE_1F, $0, 0
 	map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, 0
 	map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0
 	map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0