summaryrefslogtreecommitdiff
path: root/maps/CherrygroveMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CherrygroveMart.asm')
-rw-r--r--maps/CherrygroveMart.asm48
1 files changed, 19 insertions, 29 deletions
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm
index b971bb8bd..56f613467 100644
--- a/maps/CherrygroveMart.asm
+++ b/maps/CherrygroveMart.asm
@@ -1,27 +1,24 @@
-CherrygroveMart_MapScriptHeader: ; 0x196808
- ; trigger count
+CherrygroveMart_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x19680a
-ClerkScript_0x19680a: ; 0x19680a
+ClerkScript_0x19680a:
loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x196817
pokemart $0, $0000
loadmovesprites
end
-; 0x196817
-UnknownScript_0x196817: ; 0x196817
+UnknownScript_0x196817:
pokemart $0, $0001
loadmovesprites
end
-; 0x19681d
-CooltrainerMScript_0x19681d: ; 0x19681d
+CooltrainerMScript_0x19681d:
faceplayer
loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@@ -30,36 +27,31 @@ CooltrainerMScript_0x19681d: ; 0x19681d
closetext
loadmovesprites
end
-; 0x19682b
-UnknownScript_0x19682b: ; 0x19682b
+UnknownScript_0x19682b:
writetext UnknownText_0x196873
closetext
loadmovesprites
end
-; 0x196831
-YoungsterScript_0x196831: ; 0x196831
+YoungsterScript_0x196831:
jumptextfaceplayer UnknownText_0x1968a0
-; 0x196834
-UnknownText_0x196834: ; 0x196834
+UnknownText_0x196834:
text "They're fresh out"
line "of # BALLS!"
para "When will they get"
line "more of them?"
done
-; 0x196873
-UnknownText_0x196873: ; 0x196873
+UnknownText_0x196873:
text "# BALLS are in"
line "stock! Now I can"
cont "catch #MON!"
done
-; 0x1968a0
-UnknownText_0x1968a0: ; 0x1968a0
+UnknownText_0x1968a0:
text "When I was walking"
line "in the grass, a"
@@ -73,26 +65,24 @@ UnknownText_0x1968a0: ; 0x1968a0
para "You should keep an"
line "ANTIDOTE with you."
done
-; 0x196934
-CherrygroveMart_MapEventHeader: ; 0x196934
+CherrygroveMart_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY
warp_def $7, $3, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_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_0x19680a, $ffff
- person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, $ffff
- person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, $ffff
-; 0x19696b
+ person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x19680a, -1
+ person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x19681d, -1
+ person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196831, -1