summaryrefslogtreecommitdiff
path: root/maps/PewterMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PewterMart.asm')
-rw-r--r--maps/PewterMart.asm39
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index d41c97cfa..b5f172010 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -1,27 +1,23 @@
-PewterMart_MapScriptHeader: ; 0x1a2dc9
- ; trigger count
+PewterMart_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x1a2dcb
-ClerkScript_0x1a2dcb: ; 0x1a2dcb
+ClerkScript_0x1a2dcb:
loadfont
pokemart $0, $0013
loadmovesprites
end
-; 0x1a2dd2
-YoungsterScript_0x1a2dd2: ; 0x1a2dd2
+YoungsterScript_0x1a2dd2:
jumptextfaceplayer UnknownText_0x1a2dd8
-; 0x1a2dd5
-SuperNerdScript_0x1a2dd5: ; 0x1a2dd5
+SuperNerdScript_0x1a2dd5:
jumptextfaceplayer UnknownText_0x1a2e3a
-; 0x1a2dd8
-UnknownText_0x1a2dd8: ; 0x1a2dd8
+UnknownText_0x1a2dd8:
text "Hi! Check out my"
line "GYARADOS!"
@@ -31,9 +27,8 @@ UnknownText_0x1a2dd8: ; 0x1a2dd8
para "believe how strong"
line "it has become."
done
-; 0x1a2e3a
-UnknownText_0x1a2e3a: ; 0x1a2e3a
+UnknownText_0x1a2e3a:
text "There once was a"
line "weird old man who"
cont "sold MAGIKARP."
@@ -44,26 +39,24 @@ UnknownText_0x1a2e3a: ; 0x1a2e3a
para "LAKE OF RAGE were"
line "excellent."
done
-; 0x1a2eae
-PewterMart_MapEventHeader: ; 0x1a2eae
+PewterMart_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 3, GROUP_PEWTER_CITY, MAP_PEWTER_CITY
warp_def $7, $3, 3, GROUP_PEWTER_CITY, MAP_PEWTER_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_0x1a2dcb, $ffff
- person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, $ffff
- person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, $ffff
-; 0x1a2ee5
+ person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x1a2dcb, -1
+ person_event SPRITE_YOUNGSTER, 6, 13, OW_UP | $1, $2, -1, -1, $0, 0, YoungsterScript_0x1a2dd2, -1
+ person_event SPRITE_SUPER_NERD, 10, 10, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a2dd5, -1