diff options
Diffstat (limited to 'maps/Route11.asm')
| -rw-r--r-- | maps/Route11.asm | 53 |
1 files changed, 23 insertions, 30 deletions
diff --git a/maps/Route11.asm b/maps/Route11.asm index 353877969..e8f630af4 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE11_YOUNGSTER1 const ROUTE11_YOUNGSTER2 const ROUTE11_YOUNGSTER3 @@ -6,17 +6,15 @@ const_value set 2 const ROUTE11_FRUIT_TREE Route11_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerYoungsterOwen: - trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script + trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterOwenAfterBattleText waitbutton @@ -24,10 +22,10 @@ TrainerYoungsterOwen: end TrainerYoungsterJason: - trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script + trainer YOUNGSTER, JASON, EVENT_BEAT_YOUNGSTER_JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterJasonAfterBattleText waitbutton @@ -35,10 +33,10 @@ TrainerYoungsterJason: end TrainerPsychicHerman: - trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script + trainer PSYCHIC_T, HERMAN, EVENT_BEAT_PSYCHIC_HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicHermanAfterBattleText waitbutton @@ -46,10 +44,10 @@ TrainerPsychicHerman: end TrainerPsychicFidel: - trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script + trainer PSYCHIC_T, FIDEL, EVENT_BEAT_PSYCHIC_FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicFidelAfterBattleText waitbutton @@ -63,7 +61,7 @@ FruitTreeScript_0x68055: fruittree FRUITTREE_ROUTE_11 Route11HiddenRevive: - hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_ROUTE_11_HIDDEN_REVIVE YoungsterOwenSeenText: text "There's no cheat-" @@ -146,24 +144,19 @@ Route11SignText: done Route11_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 2 - bg_event 3, 7, BGEVENT_READ, Route11Sign - bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive + db 2 ; bg events + bg_event 3, 7, BGEVENT_READ, Route11Sign + bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive -.ObjectEvents: - db 5 + db 5 ; object events object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 - object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 - object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 - object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 - object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 + object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 + object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 + object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 + object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 |