summaryrefslogtreecommitdiff
path: root/maps/Route12.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route12.asm')
-rw-r--r--maps/Route12.asm24
1 files changed, 16 insertions, 8 deletions
diff --git a/maps/Route12.asm b/maps/Route12.asm
index 3f4d06fa4..9b1dba040 100644
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -1,3 +1,11 @@
+const_value set 2
+ const ROUTE12_FISHER1
+ const ROUTE12_FISHER2
+ const ROUTE12_FISHER3
+ const ROUTE12_FISHER4
+ const ROUTE12_POKE_BALL1
+ const ROUTE12_POKE_BALL2
+
Route12_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,44 +17,44 @@ TrainerFisherKyle:
trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, FisherKyleScript
FisherKyleScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a7238
+ waitbutton
closetext
- loadmovesprites
end
TrainerFisherMartin:
trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, FisherMartinScript
FisherMartinScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a704c
+ waitbutton
closetext
- loadmovesprites
end
TrainerFisherStephen:
trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, FisherStephenScript
FisherStephenScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a70d4
+ waitbutton
closetext
- loadmovesprites
end
TrainerFisherBarney:
trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, FisherBarneyScript
FisherBarneyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a716d
+ waitbutton
closetext
- loadmovesprites
end
MapRoute12Signpost0Script: