summaryrefslogtreecommitdiff
path: root/maps/MahoganyMart1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MahoganyMart1F.asm')
-rw-r--r--maps/MahoganyMart1F.asm10
1 files changed, 5 insertions, 5 deletions
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