Mart constants

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

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

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

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

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

maps/AzaleaMart.asm

@@ -7,7 +7,7 @@ AzaleaMart_MapScriptHeader:
 
 ClerkScript_0x18e040:
 	loadfont
-	pokemart $0, $0003
+	pokemart MARTTYPE_STANDARD, MART_AZALEA
 	loadmovesprites
 	end
 

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

maps/BlackthornMart.asm

@@ -7,7 +7,7 @@ BlackthornMart_MapScriptHeader:
 
 ClerkScript_0x195a5d:
 	loadfont
-	pokemart $0, $0011
+	pokemart MARTTYPE_STANDARD, MART_BLACKTHORN
 	loadmovesprites
 	end
 

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
 

maps/CeladonDeptStore3F.asm

@@ -8,7 +8,7 @@ CeladonDeptStore3F_MapScriptHeader:
 ClerkScript_0x70d29:
 	faceplayer
 	loadfont
-	pokemart $0, $0019
+	pokemart MARTTYPE_STANDARD, MART_CELADON_3F
 	loadmovesprites
 	end
 

maps/CeladonDeptStore4F.asm

@@ -8,7 +8,7 @@ CeladonDeptStore4F_MapScriptHeader:
 ClerkScript_0x70f0d:
 	faceplayer
 	loadfont
-	pokemart $0, $001a
+	pokemart MARTTYPE_STANDARD, MART_CELADON_4F
 	loadmovesprites
 	end
 

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
 

maps/CeruleanMart.asm

@@ -7,7 +7,7 @@ CeruleanMart_MapScriptHeader:
 
 ClerkScript_0x188ac0:
 	loadfont
-	pokemart $0, $0014
+	pokemart MARTTYPE_STANDARD, MART_CERULEAN
 	loadmovesprites
 	end
 

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
 

maps/CianwoodPharmacy.asm

@@ -32,7 +32,7 @@ CianwoodPharmacist:
 	end
 
 .Mart
-	pokemart $3, $0004
+	pokemart MARTTYPE_PHARMACY, MART_CIANWOOD
 	loadmovesprites
 	end
 

maps/EcruteakMart.asm

@@ -7,7 +7,7 @@ EcruteakMart_MapScriptHeader:
 
 ClerkScript_0x99c3b:
 	loadfont
-	pokemart $0, $000e
+	pokemart MARTTYPE_STANDARD, MART_ECRUTEAK
 	loadmovesprites
 	end
 

maps/FuchsiaMart.asm

@@ -7,7 +7,7 @@ FuchsiaMart_MapScriptHeader:
 
 ClerkScript_0x195ce8:
 	loadfont
-	pokemart $0, $001d
+	pokemart MARTTYPE_STANDARD, MART_FUCHSIA
 	loadmovesprites
 	end
 

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
 

maps/GoldenrodDeptStore3F.asm

@@ -8,7 +8,7 @@ GoldenrodDeptStore3F_MapScriptHeader:
 ClerkScript_0x55db8:
 	faceplayer
 	loadfont
-	pokemart $0, $0007
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_3F
 	loadmovesprites
 	end
 

maps/GoldenrodDeptStore4F.asm

@@ -8,7 +8,7 @@ GoldenrodDeptStore4F_MapScriptHeader:
 ClerkScript_0x55ee9:
 	faceplayer
 	loadfont
-	pokemart $0, $0008
+	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_4F
 	loadmovesprites
 	end