summaryrefslogtreecommitdiff
path: root/maps/MountMortarB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MountMortarB1F.asm')
-rw-r--r--maps/MountMortarB1F.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm
index 6aae2afd0..d8d42a630 100644
--- a/maps/MountMortarB1F.asm
+++ b/maps/MountMortarB1F.asm
@@ -141,14 +141,14 @@ MountMortarB1F_MapEventHeader:
; signposts
db 1
- signpost 6, 4, $7, MapMountMortarB1FSignpostItem0
+ signpost 6, 4, SIGNPOST_ITEMIFSET, MapMountMortarB1FSignpostItem0
; people-events
db 7
- person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, EVENT_686
- person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, EVENT_687
- person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, -1
- person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, -1
- person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, EVENT_7CA
- person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, EVENT_7CB
- person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, EVENT_7CC
+ person_event SPRITE_POKE_BALL, 16, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e240, EVENT_686
+ person_event SPRITE_POKE_BALL, 20, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e242, EVENT_687
+ person_event SPRITE_BOULDER, 14, 13, LEFT << 2 | $11, $0, -1, -1, $0, 0, MountMortarB1FBoulder, -1
+ person_event SPRITE_BLACK_BELT, 8, 20, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlackBeltScript_0x7e1f6, -1
+ person_event SPRITE_POKE_BALL, 28, 38, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e244, EVENT_7CA
+ person_event SPRITE_POKE_BALL, 7, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e246, EVENT_7CB
+ person_event SPRITE_POKE_BALL, 30, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e248, EVENT_7CC