diff options
Diffstat (limited to 'maps/Route4.asm')
| -rw-r--r-- | maps/Route4.asm | 59 |
1 files changed, 26 insertions, 33 deletions
diff --git a/maps/Route4.asm b/maps/Route4.asm index a0bf7c4bc..c7722e3a9 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,21 +1,19 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE4_YOUNGSTER const ROUTE4_LASS1 const ROUTE4_LASS2 const ROUTE4_POKE_BALL Route4_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script + trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperHankAfterBattleText waitbutton @@ -23,10 +21,10 @@ TrainerBirdKeeperHank: end TrainerPicnickerHope: - trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script + trainer PICNICKER, HOPE, EVENT_BEAT_PICNICKER_HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerHopeAfterBattleText waitbutton @@ -34,10 +32,10 @@ TrainerPicnickerHope: end TrainerPicnickerSharon: - trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script + trainer PICNICKER, SHARON, EVENT_BEAT_PICNICKER_SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerSharonAfterBattleText waitbutton @@ -51,7 +49,7 @@ Route4HPUp: itemball HP_UP Route4HiddenUltraBall: - hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_ROUTE_4_HIDDEN_ULTRA_BALL BirdKeeperHankSeenText: text "I'm raising my" @@ -121,24 +119,19 @@ MtMoonSquareSignText: done Route4_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def 2, 5, 2, MOUNT_MOON - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign - bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall - -.ObjectEvents: - db 4 - object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 - object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 - object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 - object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP + db 0, 0 ; filler + + db 1 ; warp events + warp_event 2, 5, MOUNT_MOON, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign + bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall + + db 4 ; object events + object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 + object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 + object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 + object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP |