diff options
Diffstat (limited to 'maps/Route9.asm')
| -rw-r--r-- | maps/Route9.asm | 59 |
1 files changed, 26 insertions, 33 deletions
diff --git a/maps/Route9.asm b/maps/Route9.asm index cd1831f98..fa3d07313 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE9_YOUNGSTER1 const ROUTE9_LASS1 const ROUTE9_YOUNGSTER2 @@ -7,17 +7,15 @@ const_value set 2 const ROUTE9_POKEFAN_M2 Route9_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCamperDean: - trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script + trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperDeanAfterBattleText waitbutton @@ -25,10 +23,10 @@ TrainerCamperDean: end TrainerPicnickerHeidi: - trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script + trainer PICNICKER, HEIDI, EVENT_BEAT_PICNICKER_HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerHeidiAfterBattleText waitbutton @@ -36,10 +34,10 @@ TrainerPicnickerHeidi: end TrainerCamperSid: - trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script + trainer CAMPER, SID, EVENT_BEAT_CAMPER_SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperSidAfterBattleText waitbutton @@ -47,10 +45,10 @@ TrainerCamperSid: end TrainerPicnickerEdna: - trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script + trainer PICNICKER, EDNA, EVENT_BEAT_PICNICKER_EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerEdnaAfterBattleText waitbutton @@ -58,10 +56,10 @@ TrainerPicnickerEdna: end TrainerHikerTim: - trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script + trainer HIKER, TIM, EVENT_BEAT_HIKER_TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerTimAfterBattleText waitbutton @@ -69,10 +67,10 @@ TrainerHikerTim: end TrainerHikerSidney: - trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script + trainer HIKER, SIDNEY, EVENT_BEAT_HIKER_SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerSidneyAfterBattleText waitbutton @@ -83,7 +81,7 @@ Route9Sign: jumptext Route9SignText Route9HiddenEther: - hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ROUTE_9_HIDDEN_ETHER CamperDeanSeenText: text "I came to explore" @@ -206,26 +204,21 @@ Route9SignText: done Route9_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 48, 15, 1, ROCK_TUNNEL_1F + db 1 ; warp events + warp_event 48, 15, ROCK_TUNNEL_1F, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 15, 7, BGEVENT_READ, Route9Sign + db 2 ; bg events + bg_event 15, 7, BGEVENT_READ, Route9Sign bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther -.ObjectEvents: - db 6 + db 6 ; object events object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1 - object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 - object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 + object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 + object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 object_event 12, 15, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 - object_event 28, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1 + object_event 28, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1 object_event 36, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1 |