diff options
Diffstat (limited to 'maps/Route35.asm')
| -rw-r--r-- | maps/Route35.asm | 91 |
1 files changed, 52 insertions, 39 deletions
diff --git a/maps/Route35.asm b/maps/Route35.asm index c4175e7b6..68f00f694 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ROUTE35_YOUNGSTER1 + const ROUTE35_YOUNGSTER2 + const ROUTE35_LASS1 + const ROUTE35_LASS2 + const ROUTE35_YOUNGSTER3 + const ROUTE35_FISHER + const ROUTE35_BUG_CATCHER + const ROUTE35_SUPER_NERD + const ROUTE35_OFFICER + const ROUTE35_FRUIT_TREE + const ROUTE35_POKE_BALL + Route35_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +22,11 @@ TrainerBird_keeperBryan: trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, Bird_keeperBryanScript Bird_keeperBryanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cc87 + waitbutton closetext - loadmovesprites end TrainerJugglerIrwin: @@ -21,14 +34,14 @@ TrainerJugglerIrwin: JugglerIrwin1Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN - talkaftercancel - loadfont + end_if_just_battled + opentext checkcellnum PHONE_JUGGLER_IRWIN iftrue UnknownScript_0x19c90f checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19c8ec writetext UnknownText_0x19cd5a - keeptextopen + buttonsound setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19c903 jump UnknownScript_0x19c8ef @@ -75,44 +88,44 @@ TrainerCamperIvan: trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, CamperIvanScript CamperIvanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cac4 + waitbutton closetext - loadmovesprites end TrainerCamperElliot: trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, CamperElliotScript CamperElliotScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cb47 + waitbutton closetext - loadmovesprites end TrainerPicnickerBrooke: trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, PicnickerBrookeScript PicnickerBrookeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cbba + waitbutton closetext - loadmovesprites end TrainerPicnickerKim: trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, PicnickerKimScript PicnickerKimScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cc21 + waitbutton closetext - loadmovesprites end TrainerBug_catcherArnie1: @@ -120,8 +133,8 @@ TrainerBug_catcherArnie1: Bug_catcherArnie1Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_ARNIE iftrue UnknownScript_0x19c9bb checkflag ENGINE_YANMA_SWARM @@ -131,7 +144,7 @@ Bug_catcherArnie1Script: checkevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19c9a4 writetext UnknownText_0x19cdf6 - keeptextopen + buttonsound setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19c903 jump UnknownScript_0x19c9a7 @@ -170,7 +183,7 @@ UnknownScript_0x19c9bb: .LoadFight0 loadtrainer BUG_CATCHER, ARNIE1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 1 clearflag ENGINE_ARNIE end @@ -178,7 +191,7 @@ UnknownScript_0x19c9bb: .LoadFight1 loadtrainer BUG_CATCHER, ARNIE2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 2 clearflag ENGINE_ARNIE end @@ -186,7 +199,7 @@ UnknownScript_0x19c9bb: .LoadFight2 loadtrainer BUG_CATCHER, ARNIE3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 3 clearflag ENGINE_ARNIE end @@ -194,7 +207,7 @@ UnknownScript_0x19c9bb: .LoadFight3 loadtrainer BUG_CATCHER, ARNIE4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 4 clearflag ENGINE_ARNIE end @@ -202,63 +215,63 @@ UnknownScript_0x19c9bb: .LoadFight4 loadtrainer BUG_CATCHER, ARNIE5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ARNIE end UnknownScript_0x19ca2f: writetext UnknownText_0x19ce38 + waitbutton closetext - loadmovesprites end TrainerFirebreatherWalt: trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, FirebreatherWaltScript FirebreatherWaltScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cebc + waitbutton closetext - loadmovesprites end OfficerScript_0x19ca49: faceplayer - loadfont + opentext checknite iffalse UnknownScript_0x19ca73 checkevent EVENT_BEAT_OFFICER_DIRK iftrue UnknownScript_0x19ca6d playmusic MUSIC_OFFICER_ENCOUNTER writetext UnknownText_0x19ceea + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19cf06, 0 loadtrainer OFFICER, DIRK startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_OFFICER_DIRK - loadmovesprites + closetext end UnknownScript_0x19ca6d: writetext UnknownText_0x19cf0f + waitbutton closetext - loadmovesprites end UnknownScript_0x19ca73: writetext UnknownText_0x19cf56 + waitbutton closetext - loadmovesprites end MapRoute35Signpost1Script: jumptext UnknownText_0x19cf94 -ItemFragment_0x19ca7c: - db TM_ROLLOUT, 1 +Route35TMRollout: + itemball TM_ROLLOUT FruitTreeScript_0x19ca7e: fruittree FRUITTREE_ROUTE_35 @@ -479,4 +492,4 @@ Route35_MapEventHeader: person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 - person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT + person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT |