aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ssanne5.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/ssanne5.asm')
-rwxr-xr-xdata/mapObjects/ssanne5.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm
index 88b2b5b7..e18f1074 100755
--- a/data/mapObjects/ssanne5.asm
+++ b/data/mapObjects/ssanne5.asm
@@ -7,12 +7,12 @@ SSAnne5Object: ; 0x6172b (size=54)
db $0 ; signs
- db $5 ; people
- db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $5 + 4, $ff, $d1, $1 ; person
- db SPRITE_SAILOR, $9 + 4, $4 + 4, $ff, $ff, $2 ; person
- db SPRITE_BLACK_HAIR_BOY_1, $b + 4, $7 + 4, $ff, $ff, $3 ; person
- db SPRITE_SAILOR, $4 + 4, $4 + 4, $ff, $d0, TRAINER | $4, SAILOR + $C8, $1
- db SPRITE_SAILOR, $8 + 4, $a + 4, $ff, $d1, TRAINER | $5, SAILOR + $C8, $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, $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
; warp-to
EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3