summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco11.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/silphco11.asm')
-rwxr-xr-xdata/mapObjects/silphco11.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm
index 95712629..a130f4f1 100755
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/silphco11.asm
@@ -1,23 +1,23 @@
SilphCo11Object:
db $d ; border block
- db $4 ; warps
- db $0, $9, $1, SILPH_CO_10F
- db $0, $d, $0, SILPH_CO_ELEVATOR
- db $5, $5, $9, $ff
- db $2, $3, $3, SILPH_CO_7F
+ db 4 ; warps
+ warp 9, 0, 1, SILPH_CO_10F
+ warp 13, 0, 0, SILPH_CO_ELEVATOR
+ warp 5, 5, 9, -1
+ warp 3, 2, 3, SILPH_CO_7F
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person
- object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person
- object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2
- object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29
- object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28
+ db 5 ; objects
+ object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person
+ object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person
+ object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2
+ object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41
+ object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40
; warp-to
- EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F
- EVENT_DISP SILPH_CO_11F_WIDTH, $0, $d ; SILPH_CO_ELEVATOR
- EVENT_DISP SILPH_CO_11F_WIDTH, $5, $5
- EVENT_DISP SILPH_CO_11F_WIDTH, $2, $3 ; SILPH_CO_7F
+ warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F
+ warp_to 13, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 5, 5, SILPH_CO_11F_WIDTH
+ warp_to 3, 2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F