diff options
Diffstat (limited to 'maps/Route15.asm')
| -rw-r--r-- | maps/Route15.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route15.asm b/maps/Route15.asm index 9955f77f..7740957a 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE15_YOUNGSTER1 const ROUTE15_YOUNGSTER2 const ROUTE15_YOUNGSTER3 @@ -8,9 +8,9 @@ const ROUTE15_POKE_BALL Route15_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerTeacherColette: trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script @@ -202,16 +202,16 @@ Route15SignText: Route15_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3 warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 19, 9, BGEVENT_READ, Route15Sign - db 7 ; object events + def_object_events object_event 11, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSchoolboyKipp, -1 object_event 11, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyTommy, -1 object_event 33, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 |