summaryrefslogtreecommitdiff
path: root/maps/MountMortarB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MountMortarB1F.asm')
-rw-r--r--maps/MountMortarB1F.asm21
1 files changed, 15 insertions, 6 deletions
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index b10adf856..ade5f377e 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -1,3 +1,12 @@
+const_value set 2
+ const MOUNTMORTARB1F_POKE_BALL1
+ const MOUNTMORTARB1F_POKE_BALL2
+ const MOUNTMORTARB1F_BOULDER
+ const MOUNTMORTARB1F_BLACK_BELT
+ const MOUNTMORTARB1F_POKE_BALL3
+ const MOUNTMORTARB1F_POKE_BALL4
+ const MOUNTMORTARB1F_POKE_BALL5
+
MountMortarB1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -13,10 +22,10 @@ BlackBeltScript_0x7e1f6:
checkevent EVENT_BEAT_BLACKBELT_KIYO
iftrue UnknownScript_0x7e217
writetext UnknownText_0x7e24d
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x7e2a9, 0
- loadtrainer BLACKBELT_T, KIYO
+ scriptedtrainerdata BLACKBELT_T, KIYO
startbattle
returnafterbattle
setevent EVENT_BEAT_BLACKBELT_KIYO
@@ -24,24 +33,24 @@ BlackBeltScript_0x7e1f6:
UnknownScript_0x7e217:
writetext UnknownText_0x7e2c0
keeptextopen
- waitbutton
+ waitsfx
checkcode VAR_PARTYCOUNT
if_equal $6, UnknownScript_0x7e237
writetext UnknownText_0x7e355
playsound SFX_CAUGHT_MON
- waitbutton
+ waitsfx
givepoke TYROGUE, 10
setevent EVENT_GOT_TYROGUE_FROM_KIYO
UnknownScript_0x7e231:
writetext UnknownText_0x7e36a
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x7e237:
writetext UnknownText_0x7e3df
+ waitbutton
closetext
- loadmovesprites
end
MountMortarB1FBoulder: