summaryrefslogtreecommitdiff
path: root/maps/Route8.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route8.asm')
-rw-r--r--maps/Route8.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route8.asm b/maps/Route8.asm
index fbfe3ebcf..9e20e004a 100644
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -1,4 +1,4 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE8_BIKER1
const ROUTE8_BIKER2
const ROUTE8_BIKER3
@@ -7,9 +7,9 @@
const ROUTE8_FRUIT_TREE
Route8_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
TrainerBikerDwayne:
trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script
@@ -173,17 +173,17 @@ Route8UndergroundPathSignText:
Route8_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3
warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4
- db 0 ; coord events
+ def_coord_events
- db 2 ; bg events
+ def_bg_events
bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign
bg_event 10, 5, BGEVENT_READ, Route8LockedDoor
- db 6 ; object events
+ def_object_events
object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1
object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1
object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1