summaryrefslogtreecommitdiff
path: root/maps/Route5.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route5.asm')
-rw-r--r--maps/Route5.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/Route5.asm b/maps/Route5.asm
index c8b429505..e1413523a 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -1,8 +1,8 @@
Route5_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
PokefanMScript_0x1adb19:
@@ -40,21 +40,21 @@ Route5_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $f, $11, 1, GROUP_ROUTE_5_UNDERGROUND_ENTRANCE, MAP_ROUTE_5_UNDERGROUND_ENTRANCE
warp_def $11, $8, 1, GROUP_ROUTE_5_SAFFRON_CITY_GATE, MAP_ROUTE_5_SAFFRON_CITY_GATE
warp_def $11, $9, 2, GROUP_ROUTE_5_SAFFRON_CITY_GATE, MAP_ROUTE_5_SAFFRON_CITY_GATE
warp_def $b, $a, 1, GROUP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, MAP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 17, 17, $0, MapRoute5Signpost0Script
- signpost 11, 10, $0, MapRoute5Signpost1Script
+ signpost 17, 17, SIGNPOST_READ, MapRoute5Signpost0Script
+ signpost 11, 10, SIGNPOST_READ, MapRoute5Signpost1Script
- ; people-events
+.PersonEvents:
db 1
- person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, EVENT_771
+ person_event SPRITE_POKEFAN_M, 20, 21, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH