summaryrefslogtreecommitdiff
path: root/maps/MountMortar1FInside.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MountMortar1FInside.asm')
-rw-r--r--maps/MountMortar1FInside.asm20
1 files changed, 16 insertions, 4 deletions
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm
index 345305172..3ead2c21e 100644
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -1,3 +1,15 @@
+const_value set 2
+ const MOUNTMORTAR1FINSIDE_BOULDER
+ const MOUNTMORTAR1FINSIDE_POKE_BALL1
+ const MOUNTMORTAR1FINSIDE_POKE_BALL2
+ const MOUNTMORTAR1FINSIDE_POKE_BALL3
+ const MOUNTMORTAR1FINSIDE_POKE_BALL4
+ const MOUNTMORTAR1FINSIDE_POKE_BALL5
+ const MOUNTMORTAR1FINSIDE_SUPER_NERD1
+ const MOUNTMORTAR1FINSIDE_SUPER_NERD2
+ const MOUNTMORTAR1FINSIDE_POKE_BALL6
+ const MOUNTMORTAR1FINSIDE_POKE_BALL7
+
MountMortar1FInside_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,22 +21,22 @@ TrainerPokemaniacMiller:
trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, PokemaniacMillerScript
PokemaniacMillerScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x7debd
+ waitbutton
closetext
- loadmovesprites
end
TrainerSupernerdMarkus:
trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, SupernerdMarkusScript
SupernerdMarkusScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x7df97
+ waitbutton
closetext
- loadmovesprites
end
MountMortar1FBoulder: