summaryrefslogtreecommitdiff
path: root/maps/Route20.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/Route20.asm
parentf599e477fc3306dbca9cad4aeadfe7a66b84c7bc (diff)
Rename several script commands
Diffstat (limited to 'maps/Route20.asm')
-rw-r--r--maps/Route20.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 86a0ad424..556e7dc9d 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -17,33 +17,33 @@ TrainerSwimmerfNicole:
trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, SwimmerfNicoleScript
SwimmerfNicoleScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1acd93
+ waitbutton
closetext
- loadmovesprites
end
TrainerSwimmerfLori:
trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, SwimmerfLoriScript
SwimmerfLoriScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ace15
+ waitbutton
closetext
- loadmovesprites
end
TrainerSwimmermCameron:
trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, SwimmermCameronScript
SwimmermCameronScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ace8b
+ waitbutton
closetext
- loadmovesprites
end
MapRoute20Signpost0Script: