summaryrefslogtreecommitdiff
path: root/maps/Route16.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route16.asm')
-rw-r--r--maps/Route16.asm40
1 files changed, 17 insertions, 23 deletions
diff --git a/maps/Route16.asm b/maps/Route16.asm
index 408d7f5b2..1f8306bc9 100644
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -1,46 +1,41 @@
-Route16_MapScriptHeader: ; 0x1ad313
- ; trigger count
+Route16_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 1
; callbacks
dbw 5, UnknownScript_0x1ad318
-; 0x1ad318
-UnknownScript_0x1ad318: ; 0x1ad318
- checkcode $13
+UnknownScript_0x1ad318:
+ checkcode VAR_YCOORD
if_less_than $5, UnknownScript_0x1ad328
- checkcode $12
+ checkcode VAR_XCOORD
if_greater_than $d, UnknownScript_0x1ad328
- setflag $0019
+ setflag ENGINE_ALWAYS_ON_BIKE
return
-; 0x1ad328
-UnknownScript_0x1ad328: ; 0x1ad328
- clearflag $0019
+UnknownScript_0x1ad328:
+ clearflag ENGINE_ALWAYS_ON_BIKE
return
-; 0x1ad32c
-MapRoute16Signpost0Script: ; 0x1ad32c
+MapRoute16Signpost0Script:
jumptext UnknownText_0x1ad32f
-; 0x1ad32f
-UnknownText_0x1ad32f: ; 0x1ad32f
+UnknownText_0x1ad32f:
text "CYCLING ROAD"
para "DOWNHILL COASTING"
line "ALL THE WAY!"
done
-; 0x1ad35c
-Route16_MapEventHeader: ; 0x1ad35c
+Route16_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 5
warp_def $1, $3, 1, GROUP_ROUTE_16_FUCHSIA_SPEECH_HOUSE, MAP_ROUTE_16_FUCHSIA_SPEECH_HOUSE
warp_def $6, $e, 3, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE
@@ -48,13 +43,12 @@ Route16_MapEventHeader: ; 0x1ad35c
warp_def $6, $9, 1, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE
warp_def $7, $9, 2, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 1
- signpost 5, 5, $0, MapRoute16Signpost0Script
+ signpost 5, 5, SIGNPOST_READ, MapRoute16Signpost0Script
- ; people-events
+.PersonEvents:
db 0
-; 0x1ad380