summaryrefslogtreecommitdiff
path: root/maps/MahoganyMart1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MahoganyMart1F.asm')
-rw-r--r--maps/MahoganyMart1F.asm67
1 files changed, 37 insertions, 30 deletions
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 50aa6c407..3bb527c2c 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -1,3 +1,10 @@
+const_value set 2
+ const MAHOGANYMART1F_PHARMACIST
+ const MAHOGANYMART1F_BLACK_BELT
+ const MAHOGANYMART1F_LANCE
+ const MAHOGANYMART1F_DRAGON
+ const MAHOGANYMART1F_GRANNY
+
MahoganyMart1F_MapScriptHeader:
.MapTriggers:
db 2
@@ -31,83 +38,83 @@ UnknownScript_0x6c362:
PharmacistScript_0x6c367:
faceplayer
- loadfont
+ opentext
checkevent EVENT_DECIDED_TO_HELP_LANCE
iftrue UnknownScript_0x6c375
pokemart MARTTYPE_STANDARD, MART_MAHOGANY_1
- loadmovesprites
+ closetext
end
UnknownScript_0x6c375:
writetext UnknownText_0x6c46b
+ waitbutton
closetext
- loadmovesprites
end
BlackBeltScript_0x6c37b:
faceplayer
- loadfont
+ opentext
checkevent EVENT_DECIDED_TO_HELP_LANCE
iftrue UnknownScript_0x6c389
writetext UnknownText_0x6c494
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x6c389:
writetext UnknownText_0x6c501
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x6c38f:
pause 15
- loadfont
+ opentext
writetext UnknownText_0x6c52a
pause 15
- loadmovesprites
+ closetext
playsound SFX_TACKLE
- applymovement $5, MovementData_0x6c3f6
- applymovement $3, MovementData_0x6c3fb
+ applymovement MAHOGANYMART1F_DRAGON, MovementData_0x6c3f6
+ applymovement MAHOGANYMART1F_BLACK_BELT, MovementData_0x6c3fb
pause 15
- disappear $5
+ disappear MAHOGANYMART1F_DRAGON
pause 15
- applymovement $4, MovementData_0x6c407
- loadfont
+ applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407
+ opentext
writetext UnknownText_0x6c549
+ waitbutton
closetext
- loadmovesprites
- follow $4, PLAYER
- applymovement $4, MovementData_0x6c40a
- applymovement $2, MovementData_0x6c403
- applymovement $4, MovementData_0x6c40e
+ follow MAHOGANYMART1F_LANCE, PLAYER
+ applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40a
+ applymovement MAHOGANYMART1F_PHARMACIST, MovementData_0x6c403
+ applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e
stopfollow
- loadfont
+ opentext
writetext UnknownText_0x6c59e
- closetext
- showemote EMOTE_SHOCK, $2, 10
+ waitbutton
+ showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10
playsound SFX_FAINT
changeblock $6, $2, $1e
reloadmappart
- loadmovesprites
+ closetext
setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
- spriteface $4, LEFT
- loadfont
+ spriteface MAHOGANYMART1F_LANCE, LEFT
+ opentext
writetext UnknownText_0x6c5ba
+ waitbutton
closetext
- loadmovesprites
- applymovement $4, MovementData_0x6c412
+ applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412
playsound SFX_EXIT_BUILDING
- disappear $4
+ disappear MAHOGANYMART1F_LANCE
dotrigger $0
- waitbutton
+ waitsfx
end
GrannyScript_0x6c3ee:
faceplayer
- loadfont
+ opentext
pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2
- loadmovesprites
+ closetext
end
MovementData_0x6c3f6: