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/museum2f.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm
index 88ee827c..80b2ce56 100755
--- a/data/mapObjects/museum2f.asm
+++ b/data/mapObjects/museum2f.asm
@@ -8,12 +8,12 @@ Museum2FObject: ; 0x5c34b (size=48)
 	db $2, $b, $6 ; Museum2FText6
 	db $5, $2, $7 ; Museum2FText7
 
-	db $5 ; people
-	db SPRITE_BUG_CATCHER, $7 + 4, $1 + 4, $fe, $2, $1 ; person
-	db SPRITE_OLD_PERSON, $5 + 4, $0 + 4, $ff, $d0, $2 ; person
-	db SPRITE_OAK_AIDE, $5 + 4, $7 + 4, $ff, $d0, $3 ; person
-	db SPRITE_BRUNETTE_GIRL, $5 + 4, $b + 4, $ff, $ff, $4 ; person
-	db SPRITE_HIKER, $5 + 4, $c + 4, $ff, $d0, $5 ; person
+	db $5 ; objects
+	object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person
+	object SPRITE_OLD_PERSON, $0, $5, FACE, DOWN, $2 ; person
+	object SPRITE_OAK_AIDE, $7, $5, FACE, DOWN, $3 ; person
+	object SPRITE_BRUNETTE_GIRL, $b, $5, FACE, STAY, $4 ; person
+	object SPRITE_HIKER, $c, $5, FACE, DOWN, $5 ; person
 
 	; warp-to
 	EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F
-- 
cgit v1.3.1-sl0p