diff options
Diffstat (limited to 'maps/Route25.asm')
| -rw-r--r-- | maps/Route25.asm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/Route25.asm b/maps/Route25.asm index 1183600c9..ad9342144 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -12,13 +12,11 @@ const_value set 2 const ROUTE25_POKE_BALL Route25_MapScripts: -.SceneScripts: - db 2 + db 2 ; scene scripts scene_script .DummyScene0 scene_script .DummyScene1 -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -79,7 +77,7 @@ Route25MistyDate2Script: end TrainerSchoolboyDudley: - trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script + trainer SCHOOLBOY, DUDLEY, EVENT_BEAT_SCHOOLBOY_DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script .Script: end_if_just_battled @@ -90,7 +88,7 @@ TrainerSchoolboyDudley: end TrainerLassEllen: - trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script + trainer LASS, ELLEN, EVENT_BEAT_LASS_ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script .Script: end_if_just_battled @@ -101,7 +99,7 @@ TrainerLassEllen: end TrainerSchoolboyJoe: - trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script + trainer SCHOOLBOY, JOE, EVENT_BEAT_SCHOOLBOY_JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script .Script: end_if_just_battled @@ -112,7 +110,7 @@ TrainerSchoolboyJoe: end TrainerLassLaura: - trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script + trainer LASS, LAURA, EVENT_BEAT_LASS_LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script .Script: end_if_just_battled @@ -123,7 +121,7 @@ TrainerLassLaura: end TrainerCamperLloyd: - trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script + trainer CAMPER, LLOYD, EVENT_BEAT_CAMPER_LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script .Script: end_if_just_battled @@ -134,7 +132,7 @@ TrainerCamperLloyd: end TrainerLassShannon: - trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script + trainer LASS, SHANNON, EVENT_BEAT_LASS_SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script .Script: end_if_just_battled @@ -145,7 +143,7 @@ TrainerLassShannon: end TrainerSupernerdPat: - trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script + trainer SUPER_NERD, PAT, EVENT_BEAT_SUPER_NERD_PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script .Script: end_if_just_battled @@ -191,7 +189,7 @@ Route25Protein: itemball PROTEIN Route25HiddenPotion: - hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION MovementData_0x19efe8: big_step DOWN @@ -430,25 +428,20 @@ BillsHouseSignText: done Route25_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 47, 5, 1, BILLS_HOUSE + db 1 ; warp events + warp_event 47, 5, 1, BILLS_HOUSE -.CoordEvents: - db 2 + db 2 ; coord events coord_event 42, 6, 1, Route25MistyDate1Script coord_event 42, 7, 1, Route25MistyDate2Script -.BGEvents: - db 2 + db 2 ; bg events bg_event 45, 5, BGEVENT_READ, BillsHouseSign bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion -.ObjectEvents: - db 11 + db 11 ; object events object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 |