diff options
Diffstat (limited to 'maps/Route46.asm')
| -rw-r--r-- | maps/Route46.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/Route46.asm b/maps/Route46.asm index c9e1b94e6..bb0bfd9b3 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -7,14 +7,12 @@ const_value set 2 const ROUTE46_POKE_BALL Route46_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCamperTed: - trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script + trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script .Script: end_if_just_battled @@ -25,7 +23,7 @@ TrainerCamperTed: end TrainerPicnickerErin1: - trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script + trainer PICNICKER, ERIN1, EVENT_BEAT_PICNICKER_ERIN, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN @@ -148,7 +146,7 @@ Route46RematchGiftF: end TrainerHikerBailey: - trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script + trainer HIKER, BAILEY, EVENT_BEAT_HIKER_BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script .Script: end_if_just_battled @@ -251,24 +249,19 @@ Route46SignText: done Route46_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 7, 33, 1, ROUTE_29_ROUTE_46_GATE - warp_def 8, 33, 2, ROUTE_29_ROUTE_46_GATE - warp_def 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE + db 3 ; warp events + warp_event 7, 33, 1, ROUTE_29_ROUTE_46_GATE + warp_event 8, 33, 2, ROUTE_29_ROUTE_46_GATE + warp_event 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 9, 27, BGEVENT_READ, Route46Sign -.ObjectEvents: - db 6 + db 6 ; object events object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 |