summaryrefslogtreecommitdiff
path: root/maps/Route17.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route17.asm')
-rw-r--r--maps/Route17.asm16
1 files changed, 7 insertions, 9 deletions
diff --git a/maps/Route17.asm b/maps/Route17.asm
index c8be61da2..b2c1a820d 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -4,13 +4,13 @@ const_value set 2
const ROUTE17_BIKER3
const ROUTE17_BIKER4
-Route17_MapScriptHeader:
+Route17_MapScripts:
.SceneScripts:
db 0
.MapCallbacks:
db 1
- dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike
+ callback MAPCALLBACK_NEWMAP, .AlwaysOnBike
.AlwaysOnBike:
setflag ENGINE_ALWAYS_ON_BIKE
@@ -62,12 +62,10 @@ TrainerBikerGlenn:
end
Route17HiddenMaxEther:
- dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER
-
+ hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER
Route17HiddenMaxElixer:
- dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER
-
+ hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER
BikerRileySeenText:
text "Hey, you! You're"
@@ -134,14 +132,14 @@ BikerCharlesAfterBattleText:
cont "Take it easy!"
done
-Route17_MapEventHeader:
+Route17_MapEvents:
; filler
db 0, 0
.Warps:
db 2
- warp_def 17, 82, 1, ROUTE_17_18_GATE
- warp_def 17, 83, 2, ROUTE_17_18_GATE
+ warp_def 17, 82, 1, ROUTE_17_ROUTE_18_GATE
+ warp_def 17, 83, 2, ROUTE_17_ROUTE_18_GATE
.CoordEvents:
db 0