diff options
Diffstat (limited to 'maps/Route41.asm')
| -rw-r--r-- | maps/Route41.asm | 91 |
1 files changed, 42 insertions, 49 deletions
diff --git a/maps/Route41.asm b/maps/Route41.asm index 4b66164dd..d851a41e5 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE41_OLIVINE_RIVAL1 const ROUTE41_OLIVINE_RIVAL2 const ROUTE41_OLIVINE_RIVAL3 @@ -11,17 +11,15 @@ const_value set 2 const ROUTE41_SWIMMER_GIRL5 Route41_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSwimmerfKaylee: - trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script + trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfKayleeAfterBattleText waitbutton @@ -29,10 +27,10 @@ TrainerSwimmerfKaylee: end TrainerSwimmerfSusie: - trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script + trainer SWIMMERF, SUSIE, EVENT_BEAT_SWIMMERF_SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfSusieAfterBattleText waitbutton @@ -40,10 +38,10 @@ TrainerSwimmerfSusie: end TrainerSwimmerfDenise: - trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script + trainer SWIMMERF, DENISE, EVENT_BEAT_SWIMMERF_DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfDeniseAfterBattleText waitbutton @@ -51,10 +49,10 @@ TrainerSwimmerfDenise: end TrainerSwimmerfKara: - trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script + trainer SWIMMERF, KARA, EVENT_BEAT_SWIMMERF_KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfKaraAfterBattleText waitbutton @@ -62,10 +60,10 @@ TrainerSwimmerfKara: end TrainerSwimmerfWendy: - trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script + trainer SWIMMERF, WENDY, EVENT_BEAT_SWIMMERF_WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfWendyAfterBattleText waitbutton @@ -73,10 +71,10 @@ TrainerSwimmerfWendy: end TrainerSwimmermCharlie: - trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script + trainer SWIMMERM, CHARLIE, EVENT_BEAT_SWIMMERM_CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermCharlieAfterBattleText waitbutton @@ -84,10 +82,10 @@ TrainerSwimmermCharlie: end TrainerSwimmermGeorge: - trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script + trainer SWIMMERM, GEORGE, EVENT_BEAT_SWIMMERM_GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermGeorgeAfterBattleText waitbutton @@ -95,10 +93,10 @@ TrainerSwimmermGeorge: end TrainerSwimmermBerke: - trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script + trainer SWIMMERM, BERKE, EVENT_BEAT_SWIMMERM_BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermBerkeAfterBattleText waitbutton @@ -106,10 +104,10 @@ TrainerSwimmermBerke: end TrainerSwimmermKirk: - trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script + trainer SWIMMERM, KIRK, EVENT_BEAT_SWIMMERM_KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermKirkAfterBattleText waitbutton @@ -117,10 +115,10 @@ TrainerSwimmermKirk: end TrainerSwimmermMathew: - trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script + trainer SWIMMERM, MATHEW, EVENT_BEAT_SWIMMERM_MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermMathewAfterBattleText waitbutton @@ -132,7 +130,7 @@ Route41Rock: jumpstd smashrock Route41HiddenMaxEther: - hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_41_HIDDEN_MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" @@ -342,32 +340,27 @@ SwimmerfWendyAfterBattleText: done Route41_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 12, 17, 1, WHIRL_ISLAND_NW - warp_def 36, 19, 1, WHIRL_ISLAND_NE - warp_def 12, 37, 1, WHIRL_ISLAND_SW - warp_def 36, 45, 1, WHIRL_ISLAND_SE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther - -.ObjectEvents: - db 10 - object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 - object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 12, 17, WHIRL_ISLAND_NW, 1 + warp_event 36, 19, WHIRL_ISLAND_NE, 1 + warp_event 12, 37, WHIRL_ISLAND_SW, 1 + warp_event 36, 45, WHIRL_ISLAND_SE, 1 + + db 0 ; coord events + + db 1 ; bg events + bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther + + db 10 ; object events + object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 + object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 object_event 32, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermKirk, -1 object_event 19, 46, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermMathew, -1 - object_event 17, 4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 + object_event 17, 4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 object_event 23, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1 object_event 27, 34, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1 object_event 44, 28, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfKara, -1 - object_event 9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 + object_event 9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 |