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/mansion1.asm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm
index 89d636b8..0e890098 100755
--- a/data/mapObjects/mansion1.asm
+++ b/data/mapObjects/mansion1.asm
@@ -13,10 +13,10 @@ Mansion1Object: ; 0x443a4 (size=90)
 
 	db $0 ; signs
 
-	db $3 ; people
-	db SPRITE_OAK_AIDE, $11 + 4, $11 + 4, $ff, $d2, TRAINER | $1, SCIENTIST + $C8, $4
-	db SPRITE_BALL, $3 + 4, $e + 4, $ff, $ff, ITEM | $2, ESCAPE_ROPE
-	db SPRITE_BALL, $15 + 4, $12 + 4, $ff, $ff, ITEM | $3, CARBOS
+	db $3 ; objects
+	object SPRITE_OAK_AIDE, $11, $11, FACE, RIGHT, $1, SCIENTIST + $C8, $4
+	object SPRITE_BALL, $e, $3, FACE, STAY, $2, ESCAPE_ROPE
+	object SPRITE_BALL, $12, $15, FACE, STAY, $3, CARBOS
 
 	; warp-to
 	EVENT_DISP MANSION_1_WIDTH, $1b, $4
-- 
cgit v1.3.1-sl0p