summaryrefslogtreecommitdiff
path: root/maps/Route6.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/Route6.asm
parentf599e477fc3306dbca9cad4aeadfe7a66b84c7bc (diff)
Rename several script commands
Diffstat (limited to 'maps/Route6.asm')
-rw-r--r--maps/Route6.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route6.asm b/maps/Route6.asm
index d70ed689d..bb555247e 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -9,22 +9,22 @@ TrainerPokefanmRex:
trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript
PokefanmRexScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ad9ff
+ waitbutton
closetext
- loadmovesprites
end
TrainerPokefanmAllan:
trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript
PokefanmAllanScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ada88
+ waitbutton
closetext
- loadmovesprites
end
PokefanMScript_0x1ad951: