summaryrefslogtreecommitdiff
path: root/maps/VioletMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VioletMart.asm')
-rw-r--r--maps/VioletMart.asm39
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm
index ce19a3f88..23bc3d6a4 100644
--- a/maps/VioletMart.asm
+++ b/maps/VioletMart.asm
@@ -1,27 +1,23 @@
-VioletMart_MapScriptHeader: ; 0x68293
- ; trigger count
+VioletMart_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x68295
-ClerkScript_0x68295: ; 0x68295
+ClerkScript_0x68295:
loadfont
pokemart $0, $0002
loadmovesprites
end
-; 0x6829c
-GrannyScript_0x6829c: ; 0x6829c
+GrannyScript_0x6829c:
jumptextfaceplayer UnknownText_0x682a2
-; 0x6829f
-CooltrainerMScript_0x6829f: ; 0x6829f
+CooltrainerMScript_0x6829f:
jumptextfaceplayer UnknownText_0x68323
-; 0x682a2
-UnknownText_0x682a2: ; 0x682a2
+UnknownText_0x682a2:
text "When you first"
line "catch a #MON,"
cont "it may be weak."
@@ -34,9 +30,8 @@ UnknownText_0x682a2: ; 0x682a2
line "treat #MON with"
cont "love."
done
-; 0x68323
-UnknownText_0x68323: ; 0x68323
+UnknownText_0x68323:
text "#MON can hold"
line "items like POTION"
cont "and ANTIDOTE."
@@ -47,26 +42,24 @@ UnknownText_0x68323: ; 0x68323
para "to use manmade"
line "items."
done
-; 0x68389
-VioletMart_MapEventHeader: ; 0x68389
+VioletMart_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 1, GROUP_VIOLET_CITY, MAP_VIOLET_CITY
warp_def $7, $3, 1, GROUP_VIOLET_CITY, MAP_VIOLET_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_0x68295, $ffff
- person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, $ffff
- person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, $ffff
-; 0x683c0
+ person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x68295, -1
+ person_event SPRITE_GRANNY, 10, 11, OW_UP | $1, $1, -1, -1, $0, 0, GrannyScript_0x6829c, -1
+ person_event SPRITE_COOLTRAINER_M, 6, 9, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x6829f, -1