summaryrefslogtreecommitdiff
path: root/maps/OlivineLighthouse3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/OlivineLighthouse3F.asm')
-rw-r--r--maps/OlivineLighthouse3F.asm18
1 files changed, 12 insertions, 6 deletions
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm
index 21eb3d72c..82a145f0a 100644
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -1,3 +1,9 @@
+const_value set 2
+ const OLIVINELIGHTHOUSE3F_SAILOR
+ const OLIVINELIGHTHOUSE3F_GENTLEMAN
+ const OLIVINELIGHTHOUSE3F_YOUNGSTER
+ const OLIVINELIGHTHOUSE3F_POKE_BALL
+
OlivineLighthouse3F_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,33 +15,33 @@ TrainerBird_keeperTheo:
trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript
Bird_keeperTheoScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x5b2df
+ waitbutton
closetext
- loadmovesprites
end
TrainerGentlemanPreston:
trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, GentlemanPrestonScript
GentlemanPrestonScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x5b457
+ waitbutton
closetext
- loadmovesprites
end
TrainerSailorTerrell:
trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, SailorTerrellScript
SailorTerrellScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x5b384
+ waitbutton
closetext
- loadmovesprites
end
ItemFragment_0x5b279: