diff options
Diffstat (limited to 'maps/Route15.asm')
| -rw-r--r-- | maps/Route15.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route15.asm b/maps/Route15.asm index b539866d1..32db439ea 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -203,13 +203,13 @@ Route15_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3 - warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4 + warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3 + warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4 db 0 ; coord events db 1 ; bg events - bg_event 19, 9, BGEVENT_READ, Route15Sign + bg_event 19, 9, BGEVENT_READ, Route15Sign db 7 ; object events object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 @@ -218,4 +218,4 @@ Route15_MapEvents: object_event 27, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 object_event 30, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1 object_event 20, 10, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1 - object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP + object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP |