aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/mansion1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/mansion1.asm')
-rwxr-xr-xdata/mapObjects/mansion1.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm
index 89d636b8..0bb168bb 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, STAY, LEFT, $1, OPP_SCIENTIST, $4
+ object SPRITE_BALL, $e, $3, STAY, NONE, $2, ESCAPE_ROPE
+ object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS
; warp-to
EVENT_DISP MANSION_1_WIDTH, $1b, $4