summaryrefslogtreecommitdiff
path: root/data/mapObjects/ssanne5.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/ssanne5.asm')
-rwxr-xr-xdata/mapObjects/ssanne5.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm
index 6031327e..106557be 100755
--- a/data/mapObjects/ssanne5.asm
+++ b/data/mapObjects/ssanne5.asm
@@ -1,19 +1,19 @@
SSAnne5Object:
db $23 ; border block
- db $2 ; warps
- db $6, $d, $0, SS_ANNE_3
- db $7, $d, $0, SS_ANNE_3
+ db 2 ; warps
+ warp 13, 6, 0, SS_ANNE_3
+ warp 13, 7, 0, SS_ANNE_3
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $5, $2, STAY, UP, $1 ; person
- object SPRITE_SAILOR, $4, $9, STAY, NONE, $2 ; person
- object SPRITE_BLACK_HAIR_BOY_1, $7, $b, STAY, NONE, $3 ; person
- object SPRITE_SAILOR, $4, $4, STAY, DOWN, $4, OPP_SAILOR, $1
- object SPRITE_SAILOR, $a, $8, STAY, UP, $5, OPP_SAILOR, $2
+ db 5 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person
+ object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person
+ object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1
+ object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2
; warp-to
- EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3
- EVENT_DISP SS_ANNE_5_WIDTH, $7, $d ; SS_ANNE_3
+ warp_to 13, 6, SS_ANNE_5_WIDTH ; SS_ANNE_3
+ warp_to 13, 7, SS_ANNE_5_WIDTH ; SS_ANNE_3