summaryrefslogtreecommitdiff
path: root/data/mapObjects/ssanne6.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/ssanne6.asm')
-rwxr-xr-xdata/mapObjects/ssanne6.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm
index 8c2444f8..a25fe9b3 100755
--- a/data/mapObjects/ssanne6.asm
+++ b/data/mapObjects/ssanne6.asm
@@ -1,19 +1,19 @@
SSAnne6Object:
db $c ; border block
- db $1 ; warps
- db $0, $6, $a, SS_ANNE_1
+ db 1 ; warps
+ warp 6, 0, 10, SS_ANNE_1
- db $0 ; signs
+ db 0 ; signs
- db $7 ; objects
- object SPRITE_COOK, $1, $8, WALK, $1, $1 ; person
- object SPRITE_COOK, $5, $8, WALK, $1, $2 ; person
- object SPRITE_COOK, $9, $7, WALK, $1, $3 ; person
- object SPRITE_COOK, $d, $6, STAY, NONE, $4 ; person
- object SPRITE_COOK, $d, $8, STAY, NONE, $5 ; person
- object SPRITE_COOK, $d, $a, STAY, NONE, $6 ; person
- object SPRITE_COOK, $b, $d, STAY, UP, $7 ; person
+ db 7 ; objects
+ object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person
+ object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person
+ object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person
+ object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person
+ object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person
+ object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person
+ object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person
; warp-to
- EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1
+ warp_to 6, 0, SS_ANNE_6_WIDTH ; SS_ANNE_1