summaryrefslogtreecommitdiff
path: root/data/mapObjects/ssanne1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/ssanne1.asm')
-rwxr-xr-xdata/mapObjects/ssanne1.asm44
1 files changed, 22 insertions, 22 deletions
diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm
index 7f6a826c..c3f96ef4 100755
--- a/data/mapObjects/ssanne1.asm
+++ b/data/mapObjects/ssanne1.asm
@@ -2,17 +2,17 @@ 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
+ 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 $0 ; signs
@@ -21,14 +21,14 @@ SSAnne1Object:
object SPRITE_SAILOR, $1b, $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 $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