summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/silphco1.asm')
-rwxr-xr-xdata/mapObjects/silphco1.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm
index fe779393..0f98247b 100755
--- a/data/mapObjects/silphco1.asm
+++ b/data/mapObjects/silphco1.asm
@@ -1,21 +1,21 @@
SilphCo1Object:
db $2e ; border block
- db $5 ; warps
- db $11, $a, $5, $ff
- db $11, $b, $5, $ff
- db $0, $1a, $0, SILPH_CO_2F
- db $0, $14, $0, SILPH_CO_ELEVATOR
- db $a, $10, $6, SILPH_CO_3F
+ db 5 ; warps
+ warp 10, 17, 5, -1
+ warp 11, 17, 5, -1
+ warp 26, 0, 0, SILPH_CO_2F
+ warp 20, 0, 0, SILPH_CO_ELEVATOR
+ warp 16, 10, 6, SILPH_CO_3F
- db $0 ; signs
+ db 0 ; signs
- db $1 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, $4, $2, STAY, DOWN, $1 ; person
+ db 1 ; objects
+ object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person
; warp-to
- EVENT_DISP SILPH_CO_1F_WIDTH, $11, $a
- EVENT_DISP SILPH_CO_1F_WIDTH, $11, $b
- EVENT_DISP SILPH_CO_1F_WIDTH, $0, $1a ; SILPH_CO_2F
- EVENT_DISP SILPH_CO_1F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
- EVENT_DISP SILPH_CO_1F_WIDTH, $a, $10 ; SILPH_CO_3F
+ warp_to 10, 17, SILPH_CO_1F_WIDTH
+ warp_to 11, 17, SILPH_CO_1F_WIDTH
+ warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F
+ warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR
+ warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F