summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/silphco2.asm')
-rwxr-xr-xdata/mapObjects/silphco2.asm44
1 files changed, 22 insertions, 22 deletions
diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm
index ae3aca74..4b7f34f6 100755
--- a/data/mapObjects/silphco2.asm
+++ b/data/mapObjects/silphco2.asm
@@ -1,29 +1,29 @@
SilphCo2Object:
db $2e ; border block
- db $7 ; warps
- db $0, $18, $2, SILPH_CO_1F
- db $0, $1a, $0, SILPH_CO_3F
- db $0, $14, $0, SILPH_CO_ELEVATOR
- db $3, $3, $6, SILPH_CO_3F
- db $3, $d, $4, SILPH_CO_8F
- db $f, $1b, $5, SILPH_CO_8F
- db $f, $9, $4, SILPH_CO_6F
+ db 7 ; warps
+ warp 24, 0, 2, SILPH_CO_1F
+ warp 26, 0, 0, SILPH_CO_3F
+ warp 20, 0, 0, SILPH_CO_ELEVATOR
+ warp 3, 3, 6, SILPH_CO_3F
+ warp 13, 3, 4, SILPH_CO_8F
+ warp 27, 15, 5, SILPH_CO_8F
+ warp 9, 15, 4, SILPH_CO_6F
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_ERIKA, $a, $1, STAY, UP, $1 ; person
- object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, OPP_SCIENTIST, $2
- object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, OPP_SCIENTIST, $3
- object SPRITE_ROCKET, $10, $b, STAY, UP, $4, OPP_ROCKET, $17
- object SPRITE_ROCKET, $18, $7, STAY, UP, $5, OPP_ROCKET, $18
+ db 5 ; objects
+ object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person
+ object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2
+ object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3
+ object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23
+ object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24
; warp-to
- EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F
- EVENT_DISP SILPH_CO_2F_WIDTH, $0, $1a ; SILPH_CO_3F
- EVENT_DISP SILPH_CO_2F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
- EVENT_DISP SILPH_CO_2F_WIDTH, $3, $3 ; SILPH_CO_3F
- EVENT_DISP SILPH_CO_2F_WIDTH, $3, $d ; SILPH_CO_8F
- EVENT_DISP SILPH_CO_2F_WIDTH, $f, $1b ; SILPH_CO_8F
- EVENT_DISP SILPH_CO_2F_WIDTH, $f, $9 ; SILPH_CO_6F
+ warp_to 24, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F
+ warp_to 26, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F
+ warp_to 20, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 3, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F
+ warp_to 13, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F
+ warp_to 27, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_8F
+ warp_to 9, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_6F