summaryrefslogtreecommitdiff
path: root/data/mapObjects/ssanne8.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/ssanne8.asm')
-rwxr-xr-xdata/mapObjects/ssanne8.asm54
1 files changed, 27 insertions, 27 deletions
diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm
index b298f179..05645d78 100755
--- a/data/mapObjects/ssanne8.asm
+++ b/data/mapObjects/ssanne8.asm
@@ -1,33 +1,33 @@
SSAnne8Object:
- db $c ; border block
+ db 12 ; border block
- db $6 ; warps
- warp $0, $0, $2, SS_ANNE_1
- warp $a, $0, $3, SS_ANNE_1
- warp $14, $0, $4, SS_ANNE_1
- warp $0, $a, $5, SS_ANNE_1
- warp $a, $a, $6, SS_ANNE_1
- warp $14, $a, $7, SS_ANNE_1
+ db 6 ; warps
+ warp 0, 0, 2, SS_ANNE_1
+ warp 10, 0, 3, SS_ANNE_1
+ warp 20, 0, 4, SS_ANNE_1
+ warp 0, 10, 5, SS_ANNE_1
+ warp 10, 10, 6, SS_ANNE_1
+ warp 20, 10, 7, SS_ANNE_1
- db $0 ; signs
+ db 0 ; signs
- db $b ; objects
- object SPRITE_GENTLEMAN, $2, $3, STAY, LEFT, $1, OPP_GENTLEMAN, $1
- object SPRITE_GENTLEMAN, $b, $4, STAY, UP, $2, OPP_GENTLEMAN, $2
- object SPRITE_BUG_CATCHER, $b, $e, STAY, UP, $3, OPP_YOUNGSTER, $8
- object SPRITE_LASS, $d, $b, STAY, LEFT, $4, OPP_LASS, $b
- object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person
- object SPRITE_FAT_BALD_GUY, $0, $e, STAY, NONE, $6 ; person
- object SPRITE_LITTLE_GIRL, $2, $b, STAY, DOWN, $7 ; person
- object SPRITE_CLEFAIRY, $3, $b, STAY, DOWN, $8 ; person
- object SPRITE_GIRL, $a, $d, STAY, RIGHT, $9 ; person
- object SPRITE_BALL, $c, $f, STAY, NONE, $a, TM_08
- object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person
+ db 11 ; objects
+ object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1
+ object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2
+ object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8
+ object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11
+ object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person
+ object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person
+ object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person
+ object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person
+ object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person
+ object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_08
+ object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person
; warp-to
- warp_to $0, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1
- warp_to $a, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1
- warp_to $14, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1
- warp_to $0, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1
- warp_to $a, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1
- warp_to $14, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1
+ warp_to 0, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1
+ warp_to 10, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1
+ warp_to 20, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1
+ warp_to 0, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1
+ warp_to 10, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1
+ warp_to 20, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1