summaryrefslogtreecommitdiff
path: root/maps/VermilionMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VermilionMart.asm')
-rw-r--r--maps/VermilionMart.asm39
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm
index 71d301919..2054323ff 100644
--- a/maps/VermilionMart.asm
+++ b/maps/VermilionMart.asm
@@ -1,60 +1,53 @@
-VermilionMart_MapScriptHeader: ; 0x191f7c
- ; trigger count
+VermilionMart_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x191f7e
-ClerkScript_0x191f7e: ; 0x191f7e
+ClerkScript_0x191f7e:
loadfont
pokemart $0, $0016
loadmovesprites
end
-; 0x191f85
-SuperNerdScript_0x191f85: ; 0x191f85
+SuperNerdScript_0x191f85:
jumptextfaceplayer UnknownText_0x191f8b
-; 0x191f88
-BuenaScript_0x191f88: ; 0x191f88
+BuenaScript_0x191f88:
jumptextfaceplayer UnknownText_0x191fca
-; 0x191f8b
-UnknownText_0x191f8b: ; 0x191f8b
+UnknownText_0x191f8b:
text "TEAM ROCKET is no"
line "longer in KANTO."
para "That alone makes"
line "me happy."
done
-; 0x191fca
-UnknownText_0x191fca: ; 0x191fca
+UnknownText_0x191fca:
text "I'm thinking about"
line "going shopping in"
cont "SAFFRON."
done
-; 0x191ff8
-VermilionMart_MapEventHeader: ; 0x191ff8
+VermilionMart_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 5, GROUP_VERMILION_CITY, MAP_VERMILION_CITY
warp_def $7, $3, 5, GROUP_VERMILION_CITY, MAP_VERMILION_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_0x191f7e, $ffff
- person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, $ffff
- person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, $ffff
-; 0x19202f
+ person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x191f7e, -1
+ person_event SPRITE_SUPER_NERD, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x191f85, -1
+ person_event SPRITE_BUENA, 10, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x191f88, -1