summaryrefslogtreecommitdiff
path: root/maps/Route2.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/Route2.asm
parentf599e477fc3306dbca9cad4aeadfe7a66b84c7bc (diff)
Rename several script commands
Diffstat (limited to 'maps/Route2.asm')
-rw-r--r--maps/Route2.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm
index b97a27845..a3b659116 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -9,33 +9,33 @@ TrainerBug_catcherRob:
trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, Bug_catcherRobScript
Bug_catcherRobScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ac34d
+ waitbutton
closetext
- loadmovesprites
end
TrainerBug_catcherEd:
trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, Bug_catcherEdScript
Bug_catcherEdScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ac3cf
+ waitbutton
closetext
- loadmovesprites
end
TrainerBug_catcherDoug:
trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, Bug_catcherDougScript
Bug_catcherDougScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ac423
+ waitbutton
closetext
- loadmovesprites
end
MapRoute2Signpost0Script: