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/rockethideout3.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/rockethideout3.asm')
| -rwxr-xr-x | data/mapObjects/rockethideout3.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 3001be76..d7933ddf 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -8,8 +8,8 @@ RocketHideout3Object: ; 0x4534d (size=50) db $0 ; signs db $4 ; objects - object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, ROCKET + $C8, $e - object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, ROCKET + $C8, $f + object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, OPP_ROCKET, $e + object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, OPP_ROCKET, $f object SPRITE_BALL, $1a, $11, STAY, NONE, $3, TM_10 object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY |