summaryrefslogtreecommitdiff
path: root/maps/ViridianMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/ViridianMart.asm')
-rw-r--r--maps/ViridianMart.asm39
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm
index 3354ca59c..441cf81b7 100644
--- a/maps/ViridianMart.asm
+++ b/maps/ViridianMart.asm
@@ -1,60 +1,53 @@
-ViridianMart_MapScriptHeader: ; 0x9b5e5
- ; trigger count
+ViridianMart_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x9b5e7
-ClerkScript_0x9b5e7: ; 0x9b5e7
+ClerkScript_0x9b5e7:
loadfont
pokemart $0, $0012
loadmovesprites
end
-; 0x9b5ee
-LassScript_0x9b5ee: ; 0x9b5ee
+LassScript_0x9b5ee:
jumptextfaceplayer UnknownText_0x9b5f4
-; 0x9b5f1
-CooltrainerMScript_0x9b5f1: ; 0x9b5f1
+CooltrainerMScript_0x9b5f1:
jumptextfaceplayer UnknownText_0x9b61a
-; 0x9b5f4
-UnknownText_0x9b5f4: ; 0x9b5f4
+UnknownText_0x9b5f4:
text "The GYM LEADER"
line "here is totally"
cont "cool."
done
-; 0x9b61a
-UnknownText_0x9b61a: ; 0x9b61a
+UnknownText_0x9b61a:
text "Have you been to"
line "CINNABAR?"
para "It's an island way"
line "south of here."
done
-; 0x9b657
-ViridianMart_MapEventHeader: ; 0x9b657
+ViridianMart_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 4, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
warp_def $7, $3, 4, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, $ffff
- person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, $ffff
- person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, $ffff
-; 0x9b68e
+ person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x9b5e7, -1
+ person_event SPRITE_LASS, 6, 11, OW_UP | $1, $2, -1, -1, $0, 0, LassScript_0x9b5ee, -1
+ person_event SPRITE_COOLTRAINER_M, 10, 5, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x9b5f1, -1