diff options
Diffstat (limited to 'maps/Route8.asm')
| -rw-r--r-- | maps/Route8.asm | 67 |
1 files changed, 30 insertions, 37 deletions
diff --git a/maps/Route8.asm b/maps/Route8.asm index 10df64842..7454c9604 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE8_BIKER1 const ROUTE8_BIKER2 const ROUTE8_BIKER3 @@ -7,17 +7,15 @@ const_value set 2 const ROUTE8_FRUIT_TREE Route8_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBikerDwayne: - trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script + trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerDwayneAfterBattleText waitbutton @@ -25,10 +23,10 @@ TrainerBikerDwayne: end TrainerBikerHarris: - trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script + trainer BIKER, HARRIS, EVENT_BEAT_BIKER_HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerHarrisAfterBattleText waitbutton @@ -36,10 +34,10 @@ TrainerBikerHarris: end TrainerBikerZeke: - trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script + trainer BIKER, ZEKE, EVENT_BEAT_BIKER_ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerZekeAfterBattleText waitbutton @@ -47,10 +45,10 @@ TrainerBikerZeke: end TrainerSupernerdSam: - trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script + trainer SUPER_NERD, SAM, EVENT_BEAT_SUPER_NERD_SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdSamAfterBattleText waitbutton @@ -58,10 +56,10 @@ TrainerSupernerdSam: end TrainerSupernerdTom: - trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script + trainer SUPER_NERD, TOM, EVENT_BEAT_SUPER_NERD_TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdTomAfterBattleText waitbutton @@ -173,27 +171,22 @@ Route8UndergroundPathSignText: done Route8_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 4, 3, ROUTE_8_SAFFRON_GATE - warp_def 4, 5, 4, ROUTE_8_SAFFRON_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign - bg_event 10, 5, BGEVENT_READ, Route8LockedDoor - -.ObjectEvents: - db 6 - object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 - object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3 + warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4 + + db 0 ; coord events + + db 2 ; bg events + bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign + bg_event 10, 5, BGEVENT_READ, Route8LockedDoor + + db 6 ; object events + object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 + object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1 - object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1 + object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1 object_event 31, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1 - object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 + object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 |