diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-25 10:16:29 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-25 10:16:29 -0500 |
| commit | 01792e00d2d1b0fc1e5550f13a8851c21917aa60 (patch) | |
| tree | 2a1241f269e70af4d6712731fef354429da17ed8 /maps/Route46.asm | |
| parent | f599e477fc3306dbca9cad4aeadfe7a66b84c7bc (diff) | |
Rename several script commands
Diffstat (limited to 'maps/Route46.asm')
| -rw-r--r-- | maps/Route46.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/Route46.asm b/maps/Route46.asm index 493bd5303..64dc4b733 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -9,11 +9,11 @@ TrainerCamperTed: trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, CamperTedScript CamperTedScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a9851 + waitbutton closetext - loadmovesprites end TrainerPicnickerErin1: @@ -21,7 +21,7 @@ TrainerPicnickerErin1: PicnickerErin1Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_ERIN iftrue UnknownScript_0x1a96da @@ -59,7 +59,7 @@ UnknownScript_0x1a96da: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 .LoadFight0 - loadtrainer PICNICKER, ERIN1 + scriptedtrainerdata PICNICKER, ERIN1 startbattle returnafterbattle loadvar wErinFightCount, 1 @@ -67,7 +67,7 @@ UnknownScript_0x1a96da: end .LoadFight1 - loadtrainer PICNICKER, ERIN2 + scriptedtrainerdata PICNICKER, ERIN2 startbattle returnafterbattle loadvar wErinFightCount, 2 @@ -75,7 +75,7 @@ UnknownScript_0x1a96da: end .LoadFight2 - loadtrainer PICNICKER, ERIN3 + scriptedtrainerdata PICNICKER, ERIN3 startbattle returnafterbattle clearflag ENGINE_ERIN @@ -95,7 +95,7 @@ UnknownScript_0x1a973a: UnknownScript_0x1a973b: loadfont writetext UnknownText_0x1a9927 - closetext + waitbutton verbosegiveitem CALCIUM iffalse UnknownScript_0x1a976b clearevent EVENT_ERIN_CALCIUM @@ -143,11 +143,11 @@ TrainerHikerBailey: trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, HikerBaileyScript HikerBaileyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a97e8 + waitbutton closetext - loadmovesprites end MapRoute46Signpost0Script: |