diff options
Diffstat (limited to 'maps/Route41.asm')
| -rw-r--r-- | maps/Route41.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route41.asm b/maps/Route41.asm index 85fc3242..8272b93a 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE41_OLIVINE_RIVAL1 const ROUTE41_OLIVINE_RIVAL2 const ROUTE41_OLIVINE_RIVAL3 @@ -11,9 +11,9 @@ const ROUTE41_SWIMMER_GIRL5 Route41_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerSwimmerfKaylee: trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script @@ -342,18 +342,18 @@ SwimmerfWendyAfterBattleText: Route41_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 12, 17, WHIRL_ISLAND_NW, 1 warp_event 36, 19, WHIRL_ISLAND_NE, 1 warp_event 12, 37, WHIRL_ISLAND_SW, 1 warp_event 36, 45, WHIRL_ISLAND_SE, 1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther - db 10 ; object events + def_object_events object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 |