summaryrefslogtreecommitdiff
path: root/maps/Route14.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route14.asm')
-rw-r--r--maps/Route14.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route14.asm b/maps/Route14.asm
index 0c62003d7..c75e154d7 100644
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -9,41 +9,41 @@ TeacherScript_0x1ad47f:
faceplayer
loadfont
trade $5
+ waitbutton
closetext
- loadmovesprites
end
TrainerPokefanmCarter:
trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, PokefanmCarterScript
PokefanmCarterScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ad508
+ waitbutton
closetext
- loadmovesprites
end
TrainerBird_keeperRoy:
trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, Bird_keeperRoyScript
Bird_keeperRoyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ad5a4
+ waitbutton
closetext
- loadmovesprites
end
TrainerPokefanmTrevor:
trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, PokefanmTrevorScript
PokefanmTrevorScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ad660
+ waitbutton
closetext
- loadmovesprites
end
PokefanmCarterSeenText: