summaryrefslogtreecommitdiff
path: root/maps/Route31VioletGate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route31VioletGate.asm')
-rw-r--r--maps/Route31VioletGate.asm34
1 files changed, 14 insertions, 20 deletions
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm
index 8fa1b26c6..032b0f141 100644
--- a/maps/Route31VioletGate.asm
+++ b/maps/Route31VioletGate.asm
@@ -1,52 +1,46 @@
-Route31VioletGate_MapScriptHeader: ; 0x197632
- ; trigger count
+Route31VioletGate_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x197634
-OfficerScript_0x197634: ; 0x197634
+OfficerScript_0x197634:
jumptextfaceplayer UnknownText_0x19763a
-; 0x197637
-CooltrainerFScript_0x197637: ; 0x197637
+CooltrainerFScript_0x197637:
jumptextfaceplayer UnknownText_0x197661
-; 0x19763a
-UnknownText_0x19763a: ; 0x19763a
+UnknownText_0x19763a:
text "Hi there!"
line "Did you visit"
cont "SPROUT TOWER?"
done
-; 0x197661
-UnknownText_0x197661: ; 0x197661
+UnknownText_0x197661:
text "I came too far"
line "out. I'd better"
cont "phone home!"
done
-; 0x19768c
-Route31VioletGate_MapEventHeader: ; 0x19768c
+Route31VioletGate_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $4, $0, 8, GROUP_VIOLET_CITY, MAP_VIOLET_CITY
warp_def $5, $0, 9, GROUP_VIOLET_CITY, MAP_VIOLET_CITY
warp_def $4, $9, 1, GROUP_ROUTE_31, MAP_ROUTE_31
warp_def $5, $9, 2, GROUP_ROUTE_31, MAP_ROUTE_31
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, $ffff
- person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, $ffff
-; 0x1976c0
+ person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x197634, -1
+ person_event SPRITE_COOLTRAINER_F, 6, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerFScript_0x197637, -1