diff options
Diffstat (limited to 'data/mapObjects/ssanne1.asm')
-rwxr-xr-x | data/mapObjects/ssanne1.asm | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index 7f6a826c..9d5ddd1f 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -1,34 +1,34 @@ SSAnne1Object: db $c ; border block - db $b ; warps - db $0, $1a, $1, VERMILION_DOCK - db $0, $1b, $1, VERMILION_DOCK - db $8, $1f, $0, SS_ANNE_8 - db $8, $17, $1, SS_ANNE_8 - db $8, $13, $2, SS_ANNE_8 - db $8, $f, $3, SS_ANNE_8 - db $8, $b, $4, SS_ANNE_8 - db $8, $7, $5, SS_ANNE_8 - db $6, $2, $6, SS_ANNE_2 - db $f, $25, $5, SS_ANNE_4 - db $10, $3, $0, SS_ANNE_6 + db 11 ; warps + warp 26, 0, 1, VERMILION_DOCK + warp 27, 0, 1, VERMILION_DOCK + warp 31, 8, 0, SS_ANNE_8 + warp 23, 8, 1, SS_ANNE_8 + warp 19, 8, 2, SS_ANNE_8 + warp 15, 8, 3, SS_ANNE_8 + warp 11, 8, 4, SS_ANNE_8 + warp 7, 8, 5, SS_ANNE_8 + warp 2, 6, 6, SS_ANNE_2 + warp 37, 15, 5, SS_ANNE_4 + warp 3, 16, 0, SS_ANNE_6 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_WAITER, $c, $6, WALK, $2, $1 ; person - object SPRITE_SAILOR, $1b, $5, STAY, NONE, $2 ; person + db 2 ; objects + object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person + object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person ; warp-to - EVENT_DISP SS_ANNE_1_WIDTH, $0, $1a ; VERMILION_DOCK - EVENT_DISP SS_ANNE_1_WIDTH, $0, $1b ; VERMILION_DOCK - EVENT_DISP SS_ANNE_1_WIDTH, $8, $1f ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $17 ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $13 ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $f ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $b ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $7 ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $6, $2 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_1_WIDTH, $f, $25 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_1_WIDTH, $10, $3 ; SS_ANNE_6 + warp_to 26, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK + warp_to 27, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK + warp_to 31, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 23, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 19, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 15, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 11, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 7, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to 2, 6, SS_ANNE_1_WIDTH ; SS_ANNE_2 + warp_to 37, 15, SS_ANNE_1_WIDTH ; SS_ANNE_4 + warp_to 3, 16, SS_ANNE_1_WIDTH ; SS_ANNE_6 |