summaryrefslogtreecommitdiff
path: root/maps/Route12.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-25 10:16:29 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-25 10:16:29 -0500
commit01792e00d2d1b0fc1e5550f13a8851c21917aa60 (patch)
tree2a1241f269e70af4d6712731fef354429da17ed8 /maps/Route12.asm
parentf599e477fc3306dbca9cad4aeadfe7a66b84c7bc (diff)
Rename several script commands
Diffstat (limited to 'maps/Route12.asm')
-rw-r--r--maps/Route12.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 3f4d06fa4..dd77cc760 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -9,44 +9,44 @@ TrainerFisherKyle:
trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, FisherKyleScript
FisherKyleScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a7238
+ waitbutton
closetext
- loadmovesprites
end
TrainerFisherMartin:
trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, FisherMartinScript
FisherMartinScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a704c
+ waitbutton
closetext
- loadmovesprites
end
TrainerFisherStephen:
trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, FisherStephenScript
FisherStephenScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a70d4
+ waitbutton
closetext
- loadmovesprites
end
TrainerFisherBarney:
trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, FisherBarneyScript
FisherBarneyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a716d
+ waitbutton
closetext
- loadmovesprites
end
MapRoute12Signpost0Script: