summaryrefslogtreecommitdiff
path: root/data/mapObjects/ssanne1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/ssanne1.asm')
-rwxr-xr-xdata/mapObjects/ssanne1.asm56
1 files changed, 28 insertions, 28 deletions
diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm
index c3f96ef4..0e44fa82 100755
--- a/data/mapObjects/ssanne1.asm
+++ b/data/mapObjects/ssanne1.asm
@@ -1,34 +1,34 @@
SSAnne1Object:
- db $c ; border block
+ db 12 ; border block
- db $b ; warps
- warp $1a, $0, $1, VERMILION_DOCK
- warp $1b, $0, $1, VERMILION_DOCK
- warp $1f, $8, $0, SS_ANNE_8
- warp $17, $8, $1, SS_ANNE_8
- warp $13, $8, $2, SS_ANNE_8
- warp $f, $8, $3, SS_ANNE_8
- warp $b, $8, $4, SS_ANNE_8
- warp $7, $8, $5, SS_ANNE_8
- warp $2, $6, $6, SS_ANNE_2
- warp $25, $f, $5, SS_ANNE_4
- warp $3, $10, $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
- warp_to $1a, $0, SS_ANNE_1_WIDTH ; VERMILION_DOCK
- warp_to $1b, $0, SS_ANNE_1_WIDTH ; VERMILION_DOCK
- warp_to $1f, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8
- warp_to $17, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8
- warp_to $13, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8
- warp_to $f, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8
- warp_to $b, $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 $25, $f, SS_ANNE_1_WIDTH ; SS_ANNE_4
- warp_to $3, $10, SS_ANNE_1_WIDTH ; 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