diff options
Diffstat (limited to 'maps/Route34.asm')
| -rw-r--r-- | maps/Route34.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route34.asm b/maps/Route34.asm index d4811773..a0496422 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE34_YOUNGSTER1 const ROUTE34_YOUNGSTER2 const ROUTE34_YOUNGSTER3 @@ -13,9 +13,9 @@ const ROUTE34_COOLTRAINER_F3 Route34_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: @@ -641,23 +641,23 @@ DayCareSignText: Route34_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events warp_event 13, 37, ROUTE_34_ILEX_FOREST_GATE, 1 warp_event 14, 37, ROUTE_34_ILEX_FOREST_GATE, 2 warp_event 11, 14, DAY_CARE, 1 warp_event 11, 15, DAY_CARE, 2 warp_event 13, 15, DAY_CARE, 3 - db 0 ; coord events + def_coord_events - db 5 ; bg events + def_bg_events bg_event 12, 6, BGEVENT_READ, Route34Sign bg_event 13, 33, BGEVENT_READ, Route34TrainerTips bg_event 10, 13, BGEVENT_READ, DayCareSign bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion - db 12 ; object events + def_object_events object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 object_event 15, 33, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerYoungsterSamuel, -1 object_event 17, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1 |