summaryrefslogtreecommitdiff
path: root/maps/PewterMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PewterMart.asm')
-rw-r--r--maps/PewterMart.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index b086900a1..b5f172010 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -1,8 +1,8 @@
PewterMart_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
ClerkScript_0x1a2dcb:
@@ -44,19 +44,19 @@ 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, -1
- person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, -1
- person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, -1
+ 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