summaryrefslogtreecommitdiff
path: root/maps/UnionCaveB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/UnionCaveB1F.asm')
-rw-r--r--maps/UnionCaveB1F.asm25
1 files changed, 17 insertions, 8 deletions
diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm
index d8cbad843..278e414d1 100644
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -1,3 +1,12 @@
+const_value set 2
+ const UNIONCAVEB1F_POKEFAN_M1
+ const UNIONCAVEB1F_POKEFAN_M2
+ const UNIONCAVEB1F_SUPER_NERD1
+ const UNIONCAVEB1F_SUPER_NERD2
+ const UNIONCAVEB1F_POKE_BALL1
+ const UNIONCAVEB1F_BOULDER
+ const UNIONCAVEB1F_POKE_BALL2
+
UnionCaveB1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,44 +18,44 @@ TrainerPokemaniacAndrew:
trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, PokemaniacAndrewScript
PokemaniacAndrewScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x5a181
+ waitbutton
closetext
- loadmovesprites
end
TrainerPokemaniacCalvin:
trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, PokemaniacCalvinScript
PokemaniacCalvinScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x5a230
+ waitbutton
closetext
- loadmovesprites
end
TrainerHikerPhillip:
trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, HikerPhillipScript
HikerPhillipScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x5a073
+ waitbutton
closetext
- loadmovesprites
end
TrainerHikerLeonard:
trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, HikerLeonardScript
HikerLeonardScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x5a0fb
+ waitbutton
closetext
- loadmovesprites
end
ItemFragment_0x5a016: