summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco8.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/silphco8.asm')
-rwxr-xr-xdata/mapObjects/silphco8.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm
index 188b27b6..513e84ea 100755
--- a/data/mapObjects/silphco8.asm
+++ b/data/mapObjects/silphco8.asm
@@ -1,28 +1,28 @@
SilphCo8Object:
db $2e ; border block
- db $7 ; warps
- db $0, $10, $1, SILPH_CO_9F
- db $0, $e, $0, SILPH_CO_7F
- db $0, $12, $0, SILPH_CO_ELEVATOR
- db $b, $3, $6, SILPH_CO_8F
- db $f, $3, $4, SILPH_CO_2F
- db $5, $b, $5, SILPH_CO_2F
- db $9, $b, $3, SILPH_CO_8F
+ db 7 ; warps
+ warp 16, 0, 1, SILPH_CO_9F
+ warp 14, 0, 0, SILPH_CO_7F
+ warp 18, 0, 0, SILPH_CO_ELEVATOR
+ warp 3, 11, 6, SILPH_CO_8F
+ warp 3, 15, 4, SILPH_CO_2F
+ warp 11, 5, 5, SILPH_CO_2F
+ warp 11, 9, 3, SILPH_CO_8F
- db $0 ; signs
+ db 0 ; signs
- db $4 ; objects
- object SPRITE_LAPRAS_GIVER, $4, $2, STAY, NONE, $1 ; person
- object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, OPP_ROCKET, $23
- object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, OPP_SCIENTIST, $9
- object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, OPP_ROCKET, $24
+ db 4 ; objects
+ object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person
+ object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35
+ object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9
+ object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36
; warp-to
- EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F
- EVENT_DISP SILPH_CO_8F_WIDTH, $0, $e ; SILPH_CO_7F
- EVENT_DISP SILPH_CO_8F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR
- EVENT_DISP SILPH_CO_8F_WIDTH, $b, $3 ; SILPH_CO_8F
- EVENT_DISP SILPH_CO_8F_WIDTH, $f, $3 ; SILPH_CO_2F
- EVENT_DISP SILPH_CO_8F_WIDTH, $5, $b ; SILPH_CO_2F
- EVENT_DISP SILPH_CO_8F_WIDTH, $9, $b ; SILPH_CO_8F_WIDTH
+ warp_to 16, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F
+ warp_to 14, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F
+ warp_to 18, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 3, 11, SILPH_CO_8F_WIDTH ; SILPH_CO_8F
+ warp_to 3, 15, SILPH_CO_8F_WIDTH ; SILPH_CO_2F
+ warp_to 11, 5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F
+ warp_to 11, 9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH