summaryrefslogtreecommitdiff
path: root/maps/MountMortarB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MountMortarB1F.asm')
-rw-r--r--maps/MountMortarB1F.asm61
1 files changed, 35 insertions, 26 deletions
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index b10adf856..e523f5fcd 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
@@ -7,62 +16,62 @@ MountMortarB1F_MapScriptHeader:
BlackBeltScript_0x7e1f6:
faceplayer
- loadfont
+ opentext
checkevent EVENT_GOT_TYROGUE_FROM_KIYO
iftrue UnknownScript_0x7e231
checkevent EVENT_BEAT_BLACKBELT_KIYO
iftrue UnknownScript_0x7e217
writetext UnknownText_0x7e24d
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x7e2a9, 0
loadtrainer BLACKBELT_T, KIYO
startbattle
- returnafterbattle
+ reloadmapafterbattle
setevent EVENT_BEAT_BLACKBELT_KIYO
- loadfont
+ opentext
UnknownScript_0x7e217:
writetext UnknownText_0x7e2c0
- keeptextopen
- waitbutton
+ buttonsound
+ 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:
jumpstd strengthboulder
-ItemFragment_0x7e240:
- db HYPER_POTION, 1
+MountMortarB1FHyperPotion:
+ itemball HYPER_POTION
-ItemFragment_0x7e242:
- db CARBOS, 1
+MountMortarB1FCarbos:
+ itemball CARBOS
-ItemFragment_0x7e244:
- db FULL_RESTORE, 1
+MountMortarB1FFullRestore:
+ itemball FULL_RESTORE
-ItemFragment_0x7e246:
- db MAX_ETHER, 1
+MountMortarB1FMaxEther:
+ itemball MAX_ETHER
-ItemFragment_0x7e248:
- db PP_UP, 1
+MountMortarB1FPPUp:
+ itemball PP_UP
-MapMountMortarB1FSignpostItem0:
+MountMortarB1FHiddenMaxRevive:
dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
@@ -140,14 +149,14 @@ MountMortarB1F_MapEventHeader:
.Signposts:
db 1
- signpost 6, 4, SIGNPOST_ITEM, MapMountMortarB1FSignpostItem0
+ signpost 6, 4, SIGNPOST_ITEM, MountMortarB1FHiddenMaxRevive
.PersonEvents:
db 7
- person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
- person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS
+ person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
+ person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS
person_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1
person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1
- person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
- person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
- person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP
+ person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
+ person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
+ person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP