summaryrefslogtreecommitdiff
path: root/maps/Route17.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route17.asm')
-rw-r--r--maps/Route17.asm22
1 files changed, 14 insertions, 8 deletions
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 994f91628..b5464f20a 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -1,3 +1,9 @@
+const_value set 2
+ const ROUTE17_BIKER1
+ const ROUTE17_BIKER2
+ const ROUTE17_BIKER3
+ const ROUTE17_BIKER4
+
Route17_MapScriptHeader:
.MapTriggers:
db 0
@@ -18,44 +24,44 @@ TrainerBikerCharles:
trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, BikerCharlesScript
BikerCharlesScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ad293
+ waitbutton
closetext
- loadmovesprites
end
TrainerBikerRiley:
trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, BikerRileyScript
BikerRileyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ad13b
+ waitbutton
closetext
- loadmovesprites
end
TrainerBikerJoel:
trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, BikerJoelScript
BikerJoelScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ad196
+ waitbutton
closetext
- loadmovesprites
end
TrainerBikerGlenn:
trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, BikerGlennScript
BikerGlennScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ad225
+ waitbutton
closetext
- loadmovesprites
end
MapRoute17SignpostItem0: