From a02c3279102dca60deee70141c31af9fcfa1ff75 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Wed, 21 May 2014 15:49:59 -0400 Subject: Use more constants in object data --- data/mapObjects/mansion1.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/mapObjects/mansion1.asm') diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 426be00b..89d636b8 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -14,9 +14,9 @@ Mansion1Object: ; 0x443a4 (size=90) db $0 ; signs db $3 ; people - db SPRITE_OAK_AIDE, $11 + 4, $11 + 4, $ff, $d2, $41, SCIENTIST + $C8, $4 ; trainer - db SPRITE_BALL, $3 + 4, $e + 4, $ff, $ff, $82, ESCAPE_ROPE ; item - db SPRITE_BALL, $15 + 4, $12 + 4, $ff, $ff, $83, CARBOS ; item + 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 ; warp-to EVENT_DISP MANSION_1_WIDTH, $1b, $4 -- cgit v1.2.3