summaryrefslogtreecommitdiff
path: root/maps/Route5.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route5.asm')
-rw-r--r--maps/Route5.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/Route5.asm b/maps/Route5.asm
index 951bba75c..047774506 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -2,14 +2,14 @@ const_value set 2
const ROUTE5_POKEFAN_M
Route5_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
db 0
-PokefanMScript_0x1adb19:
- jumptextfaceplayer UnknownText_0x1adb22
+Route5PokefanMScript:
+ jumptextfaceplayer Route5PokefanMText
Route5UndergroundPathSign:
jumptext Route5UndergroundPathSignText
@@ -17,7 +17,7 @@ Route5UndergroundPathSign:
HouseForSaleSign:
jumptext HouseForSaleSignText
-UnknownText_0x1adb22:
+Route5PokefanMText:
text "The road is closed"
line "until the problem"
@@ -45,19 +45,19 @@ Route5_MapEventHeader:
.Warps:
db 4
- warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_ENTRANCE
+ warp_def $f, $11, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
warp_def $11, $8, 1, ROUTE_5_SAFFRON_CITY_GATE
warp_def $11, $9, 2, ROUTE_5_SAFFRON_CITY_GATE
warp_def $b, $a, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 2
- signpost 17, 17, SIGNPOST_READ, Route5UndergroundPathSign
- signpost 11, 10, SIGNPOST_READ, HouseForSaleSign
+ bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign
+ bg_event 11, 10, BGEVENT_READ, HouseForSaleSign
-.PersonEvents:
+.ObjectEvents:
db 1
- person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
+ object_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH