diff options
Diffstat (limited to 'maps/Route34.asm')
| -rw-r--r-- | maps/Route34.asm | 135 |
1 files changed, 65 insertions, 70 deletions
diff --git a/maps/Route34.asm b/maps/Route34.asm index 786ffb022..8e52a151e 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE34_YOUNGSTER1 const ROUTE34_YOUNGSTER2 const ROUTE34_YOUNGSTER3 @@ -14,11 +14,9 @@ const_value set 2 const ROUTE34_POKE_BALL Route34_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: @@ -56,13 +54,13 @@ Route34_MapScripts: DayCareManScript_Outside: faceplayer opentext - special Special_DayCareManOutside + special DayCareManOutside waitbutton closetext - if_equal TRUE, .end_fail + ifequal TRUE, .end_fail clearflag ENGINE_DAY_CARE_MAN_HAS_EGG checkcode VAR_FACING - if_equal RIGHT, .walk_around_player + ifequal RIGHT, .walk_around_player applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside playsound SFX_ENTER_DOOR disappear ROUTE34_GRAMPS @@ -77,22 +75,22 @@ DayCareManScript_Outside: DayCareMon1Script: opentext - special Special_DayCareMon1 + special DayCareMon1 closetext end DayCareMon2Script: opentext - special Special_DayCareMon2 + special DayCareMon2 closetext end TrainerCamperTodd1: - trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script + trainer CAMPER, TODD1, EVENT_BEAT_CAMPER_TODD, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_CAMPER_TODD - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_TODD iftrue .Rematch @@ -112,8 +110,8 @@ TrainerCamperTodd1: scall .AskNumber2 .FinishAsk: askforphonenumber PHONE_CAMPER_TODD - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext CAMPER, TODD1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -122,11 +120,11 @@ TrainerCamperTodd1: scall .RematchStd winlosstext CamperTodd1BeatenText, 0 copybytetovar wToddFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -213,11 +211,11 @@ TrainerCamperTodd1: end TrainerPicnickerGina1: - trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script + trainer PICNICKER, GINA1, EVENT_BEAT_PICNICKER_GINA, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_GINA - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_GINA iftrue .Rematch @@ -237,8 +235,8 @@ TrainerPicnickerGina1: scall .AskNumber2 .FinishAsk: askforphonenumber PHONE_PICNICKER_GINA - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext PICNICKER, GINA1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -247,11 +245,11 @@ TrainerPicnickerGina1: scall .RematchStd winlosstext PicnickerGina1BeatenText, 0 copybytetovar wGinaFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -353,7 +351,7 @@ TrainerPicnickerGina1: OfficerKeithScript: faceplayer opentext - checknite + checktime NITE iffalse .NoFight checkevent EVENT_BEAT_OFFICER_KEITH iftrue .AfterScript @@ -382,10 +380,10 @@ OfficerKeithScript: end TrainerYoungsterSamuel: - trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script + trainer YOUNGSTER, SAMUEL, EVENT_BEAT_YOUNGSTER_SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterSamuelAfterText waitbutton @@ -393,10 +391,10 @@ TrainerYoungsterSamuel: end TrainerYoungsterIan: - trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script + trainer YOUNGSTER, IAN, EVENT_BEAT_YOUNGSTER_IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterIanAfterText waitbutton @@ -404,10 +402,10 @@ TrainerYoungsterIan: end TrainerPokefanmBrandon: - trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script + trainer POKEFANM, BRANDON, EVENT_BEAT_POKEFANM_BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmBrandonAfterText waitbutton @@ -415,10 +413,10 @@ TrainerPokefanmBrandon: end TrainerCooltrainerfIrene: - trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script + trainer COOLTRAINERF, IRENE, EVENT_BEAT_COOLTRAINERF_IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue .GotSoftSand @@ -434,10 +432,10 @@ TrainerCooltrainerfIrene: end TrainerCooltrainerfJenn: - trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script + trainer COOLTRAINERF, JENN, EVENT_BEAT_COOLTRAINERF_JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue .GotSoftSand @@ -453,10 +451,10 @@ TrainerCooltrainerfJenn: end TrainerCooltrainerfKate: - trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script + trainer COOLTRAINERF, KATE, EVENT_BEAT_COOLTRAINERF_KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue .GotSoftSand @@ -472,8 +470,9 @@ TrainerCooltrainerfKate: closetext end +Route34IlexForestSign: ; unused - jumptext MapRoute34UnusedSignpostText + jumptext Route34IlexForestSignText Route34Sign: jumptext Route34SignText @@ -488,10 +487,10 @@ Route34Nugget: itemball NUGGET Route34HiddenRareCandy: - hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_ROUTE_34_HIDDEN_RARE_CANDY Route34HiddenSuperPotion: - hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ROUTE_34_HIDDEN_SUPER_POTION Route34MovementData_DayCareManWalksBackInside: slow_step LEFT @@ -726,7 +725,8 @@ CooltrainerfKateAfterText: line "startled us." done -MapRoute34UnusedSignpostText: +Route34IlexForestSignText: +; unused text "ILEX FOREST" line "THROUGH THE GATE" done @@ -761,40 +761,35 @@ DayCareSignText: done Route34_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE - warp_def 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE - warp_def 11, 14, 1, DAY_CARE - warp_def 11, 15, 2, DAY_CARE - warp_def 13, 15, 3, DAY_CARE - -.CoordEvents: - db 0 - -.BGEvents: - db 5 - bg_event 12, 6, BGEVENT_READ, Route34Sign + db 0, 0 ; filler + + db 5 ; warp events + warp_event 13, 37, ROUTE_34_ILEX_FOREST_GATE, 1 + warp_event 14, 37, ROUTE_34_ILEX_FOREST_GATE, 2 + warp_event 11, 14, DAY_CARE, 1 + warp_event 11, 15, DAY_CARE, 2 + warp_event 13, 15, DAY_CARE, 3 + + db 0 ; coord events + + db 5 ; bg events + bg_event 12, 6, BGEVENT_READ, Route34Sign bg_event 13, 33, BGEVENT_READ, Route34TrainerTips bg_event 10, 13, BGEVENT_READ, DayCareSign - bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy + bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion -.ObjectEvents: - db 13 - object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 + db 13 ; object events + object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1 object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 - object_event 9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1 + object_event 9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1 object_event 18, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 object_event 15, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34 object_event 14, 18, SPRITE_DAY_CARE_MON_1, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1 object_event 17, 19, SPRITE_DAY_CARE_MON_2, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2 object_event 11, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 - object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 - object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 - object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET + object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 + object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 + object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET |