diff options
author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
tree | a1ce27018f39d98f49d89468df426d0291e18560 /data/mapObjects/mansion2.asm | |
parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/mansion2.asm')
-rwxr-xr-x | data/mapObjects/mansion2.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index b9a7b551..2cb45879 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -10,7 +10,7 @@ Mansion2Object: ; 0x520d1 (size=63) db $0 ; signs db $4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, BURGLAR + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, OPP_BURGLAR, $7 object SPRITE_BALL, $1c, $7, STAY, NONE, $2, CALCIUM object SPRITE_BOOK_MAP_DEX, $12, $2, STAY, NONE, $3 ; person object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person |