summaryrefslogtreecommitdiff
path: root/data/mapObjects/ssanne9.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/ssanne9.asm')
-rwxr-xr-xdata/mapObjects/ssanne9.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm
index a621ad9f..6b5e4b7d 100755
--- a/data/mapObjects/ssanne9.asm
+++ b/data/mapObjects/ssanne9.asm
@@ -1,4 +1,4 @@
-SSAnne9Object: ; 0x61c8d (size=188)
+SSAnne9Object:
db $c ; border block
db $c ; warps
@@ -17,20 +17,20 @@ SSAnne9Object: ; 0x61c8d (size=188)
db $0 ; signs
- db $d ; people
- db SPRITE_GENTLEMAN, $2 + 4, $a + 4, $ff, $d3, TRAINER | $1, GENTLEMAN + $C8, $3
- db SPRITE_FISHER2, $4 + 4, $d + 4, $ff, $d2, TRAINER | $2, FISHER + $C8, $1
- db SPRITE_GENTLEMAN, $e + 4, $0 + 4, $ff, $d3, TRAINER | $3, GENTLEMAN + $C8, $5
- db SPRITE_LASS, $b + 4, $2 + 4, $ff, $d0, TRAINER | $4, LASS + $C8, $c
- db SPRITE_GENTLEMAN, $2 + 4, $1 + 4, $ff, $d0, $5 ; person
- db SPRITE_BALL, $1 + 4, $c + 4, $ff, $ff, ITEM | $6, MAX_ETHER
- db SPRITE_GENTLEMAN, $2 + 4, $15 + 4, $ff, $d0, $7 ; person
- db SPRITE_OLD_PERSON, $1 + 4, $16 + 4, $ff, $d0, $8 ; person
- db SPRITE_BALL, $c + 4, $0 + 4, $ff, $ff, ITEM | $9, RARE_CANDY
- db SPRITE_GENTLEMAN, $c + 4, $c + 4, $ff, $d0, $a ; person
- db SPRITE_YOUNG_BOY, $e + 4, $b + 4, $ff, $ff, $b ; person
- db SPRITE_BRUNETTE_GIRL, $c + 4, $16 + 4, $ff, $d2, $c ; person
- db SPRITE_FOULARD_WOMAN, $c + 4, $14 + 4, $ff, $d3, $d ; person
+ db $d ; objects
+ object SPRITE_GENTLEMAN, $a, $2, STAY, RIGHT, $1, OPP_GENTLEMAN, $3
+ object SPRITE_FISHER2, $d, $4, STAY, LEFT, $2, OPP_FISHER, $1
+ object SPRITE_GENTLEMAN, $0, $e, STAY, RIGHT, $3, OPP_GENTLEMAN, $5
+ object SPRITE_LASS, $2, $b, STAY, DOWN, $4, OPP_LASS, $c
+ object SPRITE_GENTLEMAN, $1, $2, STAY, DOWN, $5 ; person
+ object SPRITE_BALL, $c, $1, STAY, NONE, $6, MAX_ETHER
+ object SPRITE_GENTLEMAN, $15, $2, STAY, DOWN, $7 ; person
+ object SPRITE_OLD_PERSON, $16, $1, STAY, DOWN, $8 ; person
+ object SPRITE_BALL, $0, $c, STAY, NONE, $9, RARE_CANDY
+ object SPRITE_GENTLEMAN, $c, $c, STAY, DOWN, $a ; person
+ object SPRITE_YOUNG_BOY, $b, $e, STAY, NONE, $b ; person
+ object SPRITE_BRUNETTE_GIRL, $16, $c, STAY, LEFT, $c ; person
+ object SPRITE_FOULARD_WOMAN, $14, $c, STAY, RIGHT, $d ; person
; warp-to
EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2