diff options
Diffstat (limited to 'maps/Route33.asm')
| -rw-r--r-- | maps/Route33.asm | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/maps/Route33.asm b/maps/Route33.asm index c56188c71..2d3f7044a 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE33_POKEFAN_M + const ROUTE33_LASS + const ROUTE33_FRUIT_TREE + Route33_MapScriptHeader: .MapTriggers: db 0 @@ -13,7 +18,7 @@ TrainerHikerAnthony: HikerAnthony2Script: writecode VAR_CALLERID, PHONE_HIKER_ANTHONY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_ANTHONY iftrue UnknownScript_0x1ac051 @@ -61,7 +66,7 @@ UnknownScript_0x1ac051: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight1 .LoadFight0 - loadtrainer HIKER, ANTHONY2 + scriptedtrainerdata HIKER, ANTHONY2 startbattle returnafterbattle loadvar wAnthonyFightCount, 1 @@ -69,7 +74,7 @@ UnknownScript_0x1ac051: end .LoadFight1 - loadtrainer HIKER, ANTHONY1 + scriptedtrainerdata HIKER, ANTHONY1 startbattle returnafterbattle loadvar wAnthonyFightCount, 2 @@ -77,7 +82,7 @@ UnknownScript_0x1ac051: end .LoadFight2 - loadtrainer HIKER, ANTHONY3 + scriptedtrainerdata HIKER, ANTHONY3 startbattle returnafterbattle loadvar wAnthonyFightCount, 3 @@ -85,7 +90,7 @@ UnknownScript_0x1ac051: end .LoadFight3 - loadtrainer HIKER, ANTHONY4 + scriptedtrainerdata HIKER, ANTHONY4 startbattle returnafterbattle loadvar wAnthonyFightCount, 4 @@ -93,7 +98,7 @@ UnknownScript_0x1ac051: end .LoadFight4 - loadtrainer HIKER, ANTHONY5 + scriptedtrainerdata HIKER, ANTHONY5 startbattle returnafterbattle clearflag ENGINE_ANTHONY @@ -101,8 +106,8 @@ UnknownScript_0x1ac051: UnknownScript_0x1ac0c5: writetext UnknownText_0x1ac180 + waitbutton closetext - loadmovesprites end UnknownScript_0x1ac0cb: |