summaryrefslogtreecommitdiff
path: root/maps/Route10South.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route10South.asm')
-rw-r--r--maps/Route10South.asm12
1 files changed, 8 insertions, 4 deletions
diff --git a/maps/Route10South.asm b/maps/Route10South.asm
index 2e4c36ff4..fc94bbc2f 100644
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -1,3 +1,7 @@
+const_value set 2
+ const ROUTE10SOUTH_POKEFAN_M1
+ const ROUTE10SOUTH_POKEFAN_M2
+
Route10South_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,22 +13,22 @@ TrainerHikerJim:
trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, HikerJimScript
HikerJimScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ae43b
+ waitbutton
closetext
- loadmovesprites
end
TrainerPokefanmRobert:
trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, PokefanmRobertScript
PokefanmRobertScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1ae4a9
+ waitbutton
closetext
- loadmovesprites
end
MapRoute10SouthSignpost0Script: