diff options
Diffstat (limited to 'maps/Route42.asm')
| -rw-r--r-- | maps/Route42.asm | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/maps/Route42.asm b/maps/Route42.asm index 327c7b88d..b330d88f8 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,3 +1,14 @@ +const_value set 2 + const ROUTE42_FISHER + const ROUTE42_POKEFAN_M + const ROUTE42_SUPER_NERD + const ROUTE42_FRUIT_TREE1 + const ROUTE42_FRUIT_TREE2 + const ROUTE42_FRUIT_TREE3 + const ROUTE42_POKE_BALL1 + const ROUTE42_POKE_BALL2 + const ROUTE42_SUICUNE + Route42_MapScriptHeader: .MapTriggers: db 2 @@ -19,8 +30,8 @@ UnknownScript_0x1a9218: showemote EMOTE_SHOCK, PLAYER, 15 pause 15 playsound SFX_WARP_FROM - applymovement $a, MovementData_0x1a9356 - disappear $a + applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 + disappear ROUTE42_SUICUNE pause 10 dotrigger $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 @@ -32,7 +43,7 @@ TrainerFisherTully1: FisherTully1Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_TULLY iftrue UnknownScript_0x1a927f @@ -76,7 +87,7 @@ UnknownScript_0x1a927f: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .LoadFight1 .LoadFight0 - loadtrainer FISHER, TULLY1 + scriptedtrainerdata FISHER, TULLY1 startbattle returnafterbattle loadvar wTullyFightCount, 1 @@ -84,7 +95,7 @@ UnknownScript_0x1a927f: end .LoadFight1 - loadtrainer FISHER, TULLY2 + scriptedtrainerdata FISHER, TULLY2 startbattle returnafterbattle loadvar wTullyFightCount, 2 @@ -92,7 +103,7 @@ UnknownScript_0x1a927f: end .LoadFight2 - loadtrainer FISHER, TULLY3 + scriptedtrainerdata FISHER, TULLY3 startbattle returnafterbattle loadvar wTullyFightCount, 3 @@ -100,7 +111,7 @@ UnknownScript_0x1a927f: end .LoadFight3 - loadtrainer FISHER, TULLY4 + scriptedtrainerdata FISHER, TULLY4 startbattle returnafterbattle clearflag ENGINE_TULLY @@ -157,22 +168,22 @@ TrainerPokemaniacShane: trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, PokemaniacShaneScript PokemaniacShaneScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a94d6 + waitbutton closetext - loadmovesprites end TrainerHikerBenjamin: trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, HikerBenjaminScript HikerBenjaminScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a943f + waitbutton closetext - loadmovesprites end MapRoute42Signpost0Script: |