summaryrefslogtreecommitdiff
path: root/maps/Route3.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/Route3.asm
parentf599e477fc3306dbca9cad4aeadfe7a66b84c7bc (diff)
Rename several script commands
Diffstat (limited to 'maps/Route3.asm')
-rw-r--r--maps/Route3.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route3.asm b/maps/Route3.asm
index e8333b9a4..8af618689 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -9,44 +9,44 @@ TrainerFirebreatherOtis:
trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, FirebreatherOtisScript
FirebreatherOtisScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1adff7
+ waitbutton
closetext
- loadmovesprites
end
TrainerYoungsterWarren:
trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, YoungsterWarrenScript
YoungsterWarrenScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ae051
+ waitbutton
closetext
- loadmovesprites
end
TrainerYoungsterJimmy:
trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, YoungsterJimmyScript
YoungsterJimmyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ae0a9
+ waitbutton
closetext
- loadmovesprites
end
TrainerFirebreatherBurt:
trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, FirebreatherBurtScript
FirebreatherBurtScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ae118
+ waitbutton
closetext
- loadmovesprites
end
MapRoute3Signpost0Script: