diff options
Diffstat (limited to 'maps/Route38.asm')
| -rw-r--r-- | maps/Route38.asm | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/maps/Route38.asm b/maps/Route38.asm index c228429ba..7a3c038c1 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -8,14 +8,12 @@ const_value set 2 const ROUTE38_BUENA2 Route38_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperToby: - trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script + trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script .Script end_if_just_battled @@ -26,7 +24,7 @@ TrainerBirdKeeperToby: end TrainerSailorHarry: - trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script + trainer SAILOR, HARRY, EVENT_BEAT_SAILOR_HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script .Script end_if_just_battled @@ -37,7 +35,7 @@ TrainerSailorHarry: end TrainerLassDana1: - trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script + trainer LASS, DANA1, EVENT_BEAT_LASS_DANA, LassDana1SeenText, LassDana1BeatenText, 0, .Script .Script writecode VAR_CALLERID, PHONE_LASS_DANA @@ -175,7 +173,7 @@ TrainerLassDana1: end TrainerSchoolboyChad1: - trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script + trainer SCHOOLBOY, CHAD1, EVENT_BEAT_SCHOOLBOY_CHAD, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script .Script writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD @@ -292,7 +290,7 @@ TrainerSchoolboyChad1: end TrainerBeautyValerie: - trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script + trainer BEAUTY, VALERIE, EVENT_BEAT_BEAUTY_VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script .Script end_if_just_battled @@ -303,7 +301,7 @@ TrainerBeautyValerie: end TrainerBeautyOlivia: - trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script + trainer BEAUTY, OLIVIA, EVENT_BEAT_BEAUTY_OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script .Script end_if_just_battled @@ -473,24 +471,19 @@ Route38TrainerTipsText: done Route38_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 35, 8, 1, ROUTE_38_ECRUTEAK_GATE - warp_def 35, 9, 2, ROUTE_38_ECRUTEAK_GATE + db 2 ; warp events + warp_event 35, 8, 1, ROUTE_38_ECRUTEAK_GATE + warp_event 35, 9, 2, ROUTE_38_ECRUTEAK_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 33, 7, BGEVENT_READ, Route38Sign bg_event 5, 13, BGEVENT_READ, Route38TrainerTips -.ObjectEvents: - db 7 + db 7 ; object events object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1 |