summaryrefslogtreecommitdiff
path: root/maps/Route40.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route40.asm')
-rw-r--r--maps/Route40.asm42
1 files changed, 28 insertions, 14 deletions
diff --git a/maps/Route40.asm b/maps/Route40.asm
index d753be910..e9c7f61c0 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -1,3 +1,17 @@
+const_value set 2
+ const ROUTE40_OLIVINE_RIVAL1
+ const ROUTE40_OLIVINE_RIVAL2
+ const ROUTE40_SWIMMER_GIRL1
+ const ROUTE40_SWIMMER_GIRL2
+ const ROUTE40_ROCK1
+ const ROUTE40_ROCK2
+ const ROUTE40_ROCK3
+ const ROUTE40_LASS1
+ const ROUTE40_BUENA
+ const ROUTE40_POKEFAN_M
+ const ROUTE40_LASS2
+ const ROUTE40_STANDING_YOUNGSTER
+
Route40_MapScriptHeader:
.MapTriggers:
db 0
@@ -13,55 +27,55 @@ MonicaCallback:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
checkcode VAR_WEEKDAY
if_equal MONDAY, .MonicaAppears
- disappear $a
+ disappear ROUTE40_BUENA
return
.MonicaAppears
- appear $a
+ appear ROUTE40_BUENA
return
TrainerSwimmerfElaine:
trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, SwimmerfElaineScript
SwimmerfElaineScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a637b
+ waitbutton
closetext
- loadmovesprites
end
TrainerSwimmerfPaula:
trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, SwimmerfPaulaScript
SwimmerfPaulaScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a63f5
+ waitbutton
closetext
- loadmovesprites
end
TrainerSwimmermSimon:
trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, SwimmermSimonScript
SwimmermSimonScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a6282
+ waitbutton
closetext
- loadmovesprites
end
TrainerSwimmermRandall:
trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, SwimmermRandallScript
SwimmermRandallScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x1a62fa
+ waitbutton
closetext
- loadmovesprites
end
LassScript_0x1a61c4:
@@ -100,21 +114,21 @@ MonicaScript:
iffalse MonicaDoneScript
setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
writetext MonicaGaveGiftText
+ waitbutton
closetext
- loadmovesprites
end
MonicaMondayScript:
writetext MonicaMondayText
- closetext
+ waitbutton
MonicaDoneScript:
- loadmovesprites
+ closetext
end
MonicaNotMondayScript:
writetext MonicaNotMondayText
+ waitbutton
closetext
- loadmovesprites
end
MapRoute40Signpost0Script: