From 0e48333fb864b0c8b6914fe1b5e57929d5258080 Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Sat, 18 Jul 2015 22:22:51 -0500
Subject: Map object macro closes
 https://github.com/iimarckus/pokered/issues/89

---
 data/mapObjects/ssanne5.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'data/mapObjects/ssanne5.asm')

diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm
index 88b2b5b7..3787467d 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, FACE, UP, $1 ; person
+	object SPRITE_SAILOR, $4, $9, FACE, STAY, $2 ; person
+	object SPRITE_BLACK_HAIR_BOY_1, $7, $b, FACE, STAY, $3 ; person
+	object SPRITE_SAILOR, $4, $4, FACE, DOWN, $4, SAILOR + $C8, $1
+	object SPRITE_SAILOR, $a, $8, FACE, UP, $5, SAILOR + $C8, $2
 
 	; warp-to
 	EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3
-- 
cgit v1.3.1-sl0p