summaryrefslogtreecommitdiff
path: root/maps/UnionCave1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/UnionCave1F.asm')
-rw-r--r--maps/UnionCave1F.asm31
1 files changed, 21 insertions, 10 deletions
diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm
index cf9b6ed88..fdc84a956 100644
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -1,3 +1,14 @@
+const_value set 2
+ const UNIONCAVE1F_POKEFAN_M1
+ const UNIONCAVE1F_SUPER_NERD
+ const UNIONCAVE1F_POKEFAN_M2
+ const UNIONCAVE1F_FISHER1
+ const UNIONCAVE1F_FISHER2
+ const UNIONCAVE1F_POKE_BALL1
+ const UNIONCAVE1F_POKE_BALL2
+ const UNIONCAVE1F_POKE_BALL3
+ const UNIONCAVE1F_POKE_BALL4
+
UnionCave1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,55 +20,55 @@ TrainerPokemaniacLarry:
trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, PokemaniacLarryScript
PokemaniacLarryScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x59d31
+ waitbutton
closetext
- loadmovesprites
end
TrainerHikerRussell:
trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, HikerRussellScript
HikerRussellScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x59c6c
+ waitbutton
closetext
- loadmovesprites
end
TrainerHikerDaniel:
trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, HikerDanielScript
HikerDanielScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x59dc9
+ waitbutton
closetext
- loadmovesprites
end
TrainerFirebreatherBill:
trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, FirebreatherBillScript
FirebreatherBillScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x59e6f
+ waitbutton
closetext
- loadmovesprites
end
TrainerFirebreatherRay:
trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, FirebreatherRayScript
FirebreatherRayScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x59efc
+ waitbutton
closetext
- loadmovesprites
end
ItemFragment_0x59c00: