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

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

diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm
index 5d253d98..a5e1f633 100755
--- a/data/mapObjects/silphco10.asm
+++ b/data/mapObjects/silphco10.asm
@@ -11,13 +11,13 @@ SilphCo10Object: ; 0x5a1fb (size=95)
 
 	db $0 ; signs
 
-	db $6 ; people
-	db SPRITE_ROCKET, $9 + 4, $1 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $27
-	db SPRITE_OAK_AIDE, $2 + 4, $a + 4, $ff, $d2, TRAINER | $2, SCIENTIST + $C8, $b
-	db SPRITE_ERIKA, $f + 4, $9 + 4, $fe, $0, $3 ; person
-	db SPRITE_BALL, $c + 4, $2 + 4, $ff, $ff, ITEM | $4, TM_26
-	db SPRITE_BALL, $e + 4, $4 + 4, $ff, $ff, ITEM | $5, RARE_CANDY
-	db SPRITE_BALL, $b + 4, $5 + 4, $ff, $ff, ITEM | $6, CARBOS
+	db $6 ; objects
+	object SPRITE_ROCKET, $1, $9, FACE, LEFT, $1, ROCKET + $C8, $27
+	object SPRITE_OAK_AIDE, $a, $2, FACE, RIGHT, $2, SCIENTIST + $C8, $b
+	object SPRITE_ERIKA, $9, $f, WALK, $0, $3 ; person
+	object SPRITE_BALL, $2, $c, FACE, STAY, $4, TM_26
+	object SPRITE_BALL, $4, $e, FACE, STAY, $5, RARE_CANDY
+	object SPRITE_BALL, $5, $b, FACE, STAY, $6, CARBOS
 
 	; warp-to
 	EVENT_DISP SILPH_CO_10F_WIDTH, $0, $8 ; SILPH_CO_9F
-- 
cgit v1.3.1-sl0p