diff options
Diffstat (limited to 'maps/Route41.asm')
| -rw-r--r-- | maps/Route41.asm | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/maps/Route41.asm b/maps/Route41.asm index 4b66164dd..4307ff3b4 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -11,14 +11,12 @@ 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 @@ -29,7 +27,7 @@ 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 @@ -40,7 +38,7 @@ 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 @@ -51,7 +49,7 @@ 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 @@ -62,7 +60,7 @@ 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 @@ -73,7 +71,7 @@ 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 @@ -84,7 +82,7 @@ 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 @@ -95,7 +93,7 @@ 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 @@ -106,7 +104,7 @@ 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 @@ -117,7 +115,7 @@ 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 @@ -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,25 +340,20 @@ SwimmerfWendyAfterBattleText: done Route41_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.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 + db 4 ; warp events + warp_event 12, 17, 1, WHIRL_ISLAND_NW + warp_event 36, 19, 1, WHIRL_ISLAND_NE + warp_event 12, 37, 1, WHIRL_ISLAND_SW + warp_event 36, 45, 1, WHIRL_ISLAND_SE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther -.ObjectEvents: - db 10 + 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 |