diff options
Diffstat (limited to 'maps/Route42.asm')
| -rw-r--r-- | maps/Route42.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route42.asm b/maps/Route42.asm index 7c0bc2be..9af6bbd7 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE42_FISHER const ROUTE42_POKEFAN_M const ROUTE42_SUPER_NERD @@ -9,9 +9,9 @@ const ROUTE42_POKE_BALL2 Route42_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerFisherChris: trainer FISHER, CHRIS1, EVENT_BEAT_FISHER_CHRIS, FisherChrisSeenText, FisherChrisBeatenText, 0, .Script @@ -244,23 +244,23 @@ Route42Sign2Text: Route42_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3 warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4 warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1 warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2 warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3 - db 0 ; coord events + def_coord_events - db 5 ; bg events + def_bg_events bg_event 4, 10, BGEVENT_READ, Route42Sign1 bg_event 7, 5, BGEVENT_READ, MtMortarSign1 bg_event 45, 9, BGEVENT_READ, MtMortarSign2 bg_event 54, 8, BGEVENT_READ, Route42Sign2 bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion - db 8 ; object events + def_object_events object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherChris, -1 object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 |