summaryrefslogtreecommitdiff
path: root/maps/Route6SaffronGate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route6SaffronGate.asm')
-rw-r--r--maps/Route6SaffronGate.asm35
1 files changed, 14 insertions, 21 deletions
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm
index 7d4bc40c0..33d8b5029 100644
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -1,19 +1,17 @@
-Route6SaffronGate_MapScriptHeader: ; 0x1926e3
- ; trigger count
+Route6SaffronGate_MapScriptHeader:
+.MapTriggers:
db 1
; triggers
dw UnknownScript_0x1926e9, $0000
- ; callback count
+.MapCallbacks:
db 0
-; 0x1926e9
-UnknownScript_0x1926e9: ; 0x1926e9
+UnknownScript_0x1926e9:
end
-; 0x1926ea
-OfficerScript_0x1926ea: ; 0x1926ea
+OfficerScript_0x1926ea:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -22,16 +20,14 @@ OfficerScript_0x1926ea: ; 0x1926ea
closetext
loadmovesprites
end
-; 0x1926f8
-UnknownScript_0x1926f8: ; 0x1926f8
+UnknownScript_0x1926f8:
writetext UnknownText_0x1927cb
closetext
loadmovesprites
end
-; 0x1926fe
-UnknownText_0x1926fe: ; 0x1926fe
+UnknownText_0x1926fe:
text "Welcome to SAFFRON"
line "CITY, home of the"
cont "MAGNET TRAIN!"
@@ -51,35 +47,32 @@ UnknownText_0x1926fe: ; 0x1926fe
para "with the POWER"
line "PLANT."
done
-; 0x1927cb
-UnknownText_0x1927cb: ; 0x1927cb
+UnknownText_0x1927cb:
text "The MAGNET TRAIN"
line "is the most famous"
para "thing about SAF-"
line "FRON."
done
-; 0x192807
-Route6SaffronGate_MapEventHeader: ; 0x192807
+Route6SaffronGate_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $0, $4, 12, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $0, $5, 13, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $7, $4, 2, GROUP_ROUTE_6, MAP_ROUTE_6
warp_def $7, $5, 2, GROUP_ROUTE_6, MAP_ROUTE_6
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 1
- person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, $ffff
-; 0x19282e
+ person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x1926ea, -1