summaryrefslogtreecommitdiff
path: root/maps/Route6.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route6.asm')
-rw-r--r--maps/Route6.asm17
1 files changed, 11 insertions, 6 deletions
diff --git a/maps/Route6.asm b/maps/Route6.asm
index d70ed689d..dea3a1e4e 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -1,3 +1,8 @@
+const_value set 2
+ const ROUTE6_POKEFAN_M1
+ const ROUTE6_POKEFAN_M2
+ const ROUTE6_POKEFAN_M3
+
Route6_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,22 +14,22 @@ TrainerPokefanmRex:
trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript
PokefanmRexScript:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x1ad9ff
+ waitbutton
closetext
- loadmovesprites
end
TrainerPokefanmAllan:
trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript
PokefanmAllanScript:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x1ada88
+ waitbutton
closetext
- loadmovesprites
end
PokefanMScript_0x1ad951: