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/mansion4.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/mansion4.asm')
| -rwxr-xr-x | data/mapObjects/mansion4.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 6d5cac47..eddbda8e 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -7,8 +7,8 @@ Mansion4Object: ; 0x52498 (size=69) db $0 ; signs db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, BURGLAR + $C8, $9 - object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, SCIENTIST + $C8, $d + object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, OPP_BURGLAR, $9 + object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, OPP_SCIENTIST, $d object SPRITE_BALL, $a, $2, STAY, NONE, $3, RARE_CANDY object SPRITE_BALL, $1, $16, STAY, NONE, $4, FULL_RESTORE object SPRITE_BALL, $13, $19, STAY, NONE, $5, TM_14 |