diff options
Diffstat (limited to 'maps/Route18.asm')
| -rw-r--r-- | maps/Route18.asm | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/maps/Route18.asm b/maps/Route18.asm index 8cff37f09..23d6cb4ed 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,19 +1,17 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 Route18_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script + trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperBorisAfterBattleText waitbutton @@ -21,10 +19,10 @@ TrainerBirdKeeperBoris: end TrainerBirdKeeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script + trainer BIRD_KEEPER, BOB, EVENT_BEAT_BIRD_KEEPER_BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperBobAfterBattleText waitbutton @@ -78,22 +76,17 @@ Route18SignText: done Route18_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 6, 3, ROUTE_17_ROUTE_18_GATE - warp_def 2, 7, 4, ROUTE_17_ROUTE_18_GATE + db 2 ; warp events + warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3 + warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 9, 5, BGEVENT_READ, Route18Sign + db 1 ; bg events + bg_event 9, 5, BGEVENT_READ, Route18Sign -.ObjectEvents: - db 2 - object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 - object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 + db 2 ; object events + object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 + object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 |