summaryrefslogtreecommitdiff
path: root/maps/MountMortarB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MountMortarB1F.asm')
-rw-r--r--maps/MountMortarB1F.asm89
1 files changed, 36 insertions, 53 deletions
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index c3be8ebbf..e64b8566a 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -1,17 +1,16 @@
-MountMortarB1F_MapScriptHeader: ; 0x7e1f4
- ; trigger count
+MountMortarB1F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x7e1f6
-BlackBeltScript_0x7e1f6: ; 0x7e1f6
+BlackBeltScript_0x7e1f6:
faceplayer
loadfont
checkevent EVENT_GOT_TYROGUE_FROM_KIYO
iftrue UnknownScript_0x7e231
- checkevent $04a9
+ checkevent EVENT_BEAT_BLACKBELT_KIYO
iftrue UnknownScript_0x7e217
writetext UnknownText_0x7e24d
closetext
@@ -20,63 +19,54 @@ BlackBeltScript_0x7e1f6: ; 0x7e1f6
loadtrainer BLACKBELT_T, KIYO
startbattle
returnafterbattle
- setevent $04a9
+ setevent EVENT_BEAT_BLACKBELT_KIYO
loadfont
-UnknownScript_0x7e217: ; 0x7e217
+UnknownScript_0x7e217:
writetext UnknownText_0x7e2c0
keeptextopen
waitbutton
- checkcode $1
+ checkcode VAR_PARTYCOUNT
if_equal $6, UnknownScript_0x7e237
writetext UnknownText_0x7e355
playsound SFX_CAUGHT_MON
waitbutton
givepoke TYROGUE, 10, 0, 0
setevent EVENT_GOT_TYROGUE_FROM_KIYO
-UnknownScript_0x7e231: ; 0x7e231
+UnknownScript_0x7e231:
writetext UnknownText_0x7e36a
closetext
loadmovesprites
end
-; 0x7e237
-UnknownScript_0x7e237: ; 0x7e237
+UnknownScript_0x7e237:
writetext UnknownText_0x7e3df
closetext
loadmovesprites
end
-; 0x7e23d
MountMortarB1FBoulder:
jumpstd strengthboulder
-ItemFragment_0x7e240: ; 0x7e240
+ItemFragment_0x7e240:
db HYPER_POTION, 1
-; 0x7e242
-ItemFragment_0x7e242: ; 0x7e242
+ItemFragment_0x7e242:
db CARBOS, 1
-; 0x7e244
-ItemFragment_0x7e244: ; 0x7e244
+ItemFragment_0x7e244:
db FULL_RESTORE, 1
-; 0x7e246
-ItemFragment_0x7e246: ; 0x7e246
+ItemFragment_0x7e246:
db MAX_ETHER, 1
-; 0x7e248
-ItemFragment_0x7e248: ; 0x7e248
+ItemFragment_0x7e248:
db PP_UP, 1
-; 0x7e24a
-MapMountMortarB1FSignpostItem0: ; 0x7e24a
- dw $0093
- db MAX_REVIVE
+MapMountMortarB1FSignpostItem0:
+ dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE
-; 0x7e24d
-UnknownText_0x7e24d: ; 0x7e24d
+UnknownText_0x7e24d:
text "Hey!"
para "I am the KARATE"
@@ -90,15 +80,13 @@ UnknownText_0x7e24d: ; 0x7e24d
para "Hwaaarggh!"
done
-; 0x7e2a9
-UnknownText_0x7e2a9: ; 0x7e2a9
+UnknownText_0x7e2a9:
text "Waaaarggh!"
line "I'm beaten!"
done
-; 0x7e2c0
-UnknownText_0x7e2c0: ; 0x7e2c0
+UnknownText_0x7e2c0:
text "I… I'm crushed…"
para "My training is"
@@ -113,15 +101,13 @@ UnknownText_0x7e2c0: ; 0x7e2c0
para "give you a rare"
line "fighting #MON."
done
-; 0x7e355
-UnknownText_0x7e355: ; 0x7e355
+UnknownText_0x7e355:
text "<PLAYER> received"
line "TYROGUE."
done
-; 0x7e36a
-UnknownText_0x7e36a: ; 0x7e36a
+UnknownText_0x7e36a:
text "TYROGUE is a"
line "fighting-type."
@@ -134,37 +120,34 @@ UnknownText_0x7e36a: ; 0x7e36a
para "Farewell!"
done
-; 0x7e3df
-UnknownText_0x7e3df: ; 0x7e3df
+UnknownText_0x7e3df:
text "You have no room"
line "in your party!"
done
-; 0x7e400
-MountMortarB1F_MapEventHeader: ; 0x7e400
+MountMortarB1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $3, $3, 5, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE
warp_def $1d, $13, 7, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 1
- signpost 6, 4, $7, MapMountMortarB1FSignpostItem0
+ signpost 6, 4, SIGNPOST_ITEM, MapMountMortarB1FSignpostItem0
- ; people-events
+.PersonEvents:
db 7
- person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, $0686
- person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, $0687
- person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, $ffff
- person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, $ffff
- person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, $07ca
- person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, $07cb
- person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, $07cc
-; 0x7e470
+ person_event SPRITE_POKE_BALL, 16, 33, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
+ person_event SPRITE_POKE_BALL, 20, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS
+ person_event SPRITE_BOULDER, 14, 13, OW_LEFT | $11, $0, -1, -1, $0, 0, MountMortarB1FBoulder, -1
+ person_event SPRITE_BLACK_BELT, 8, 20, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlackBeltScript_0x7e1f6, -1
+ person_event SPRITE_POKE_BALL, 28, 38, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
+ person_event SPRITE_POKE_BALL, 7, 36, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
+ person_event SPRITE_POKE_BALL, 30, 25, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP