diff options
Diffstat (limited to 'maps/Route13.asm')
| -rw-r--r-- | maps/Route13.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/Route13.asm b/maps/Route13.asm index 88753afbb..c97a54830 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -6,14 +6,12 @@ const_value set 2 const ROUTE13_POKEFAN_M3 Route13_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokefanmAlex: - trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script + trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script .Script: end_if_just_battled @@ -24,7 +22,7 @@ TrainerPokefanmAlex: end TrainerPokefanmJoshua: - trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script + trainer POKEFANM, JOSHUA, EVENT_BEAT_POKEFANM_JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script .Script: end_if_just_battled @@ -35,7 +33,7 @@ TrainerPokefanmJoshua: end TrainerBirdKeeperPerry: - trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script + trainer BIRD_KEEPER, PERRY, EVENT_BEAT_BIRD_KEEPER_PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script .Script: end_if_just_battled @@ -46,7 +44,7 @@ TrainerBirdKeeperPerry: end TrainerBirdKeeperBret: - trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script + trainer BIRD_KEEPER, BRET, EVENT_BEAT_BIRD_KEEPER_BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script .Script: end_if_just_battled @@ -57,7 +55,7 @@ TrainerBirdKeeperBret: end TrainerHikerKenny: - trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script + trainer HIKER, KENNY, EVENT_BEAT_HIKER_KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script .Script: end_if_just_battled @@ -77,7 +75,7 @@ Route13DirectionsSign: jumptext Route13DirectionsSignText Route13HiddenCalcium: - hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM + hiddenitem CALCIUM, EVENT_ROUTE_13_HIDDEN_CALCIUM PokefanmAlexSeenText: text "Bow down before my" @@ -192,24 +190,19 @@ Route13DirectionsSignText: done Route13_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 29, 13, BGEVENT_READ, Route13TrainerTips bg_event 41, 11, BGEVENT_READ, Route13Sign bg_event 17, 13, BGEVENT_READ, Route13DirectionsSign bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium -.ObjectEvents: - db 5 + db 5 ; object events object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1 object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1 object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 |