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/silphco6.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/silphco6.asm')
| -rwxr-xr-x | data/mapObjects/silphco6.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index c1cdebd0..66372f57 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -16,9 +16,9 @@ SilphCo6Object: ; 0x1a2fb (size=112) object SPRITE_ERIKA, $15, $6, STAY, DOWN, $3 ; person object SPRITE_ERIKA, $b, $a, STAY, RIGHT, $4 ; person object SPRITE_LAPRAS_GIVER, $12, $d, STAY, UP, $5 ; person - object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, ROCKET + $C8, $1e - object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, SCIENTIST + $C8, $7 - object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, ROCKET + $C8, $1f + object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, OPP_ROCKET, $1e + object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, OPP_SCIENTIST, $7 + object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, OPP_ROCKET, $1f object SPRITE_BALL, $3, $c, STAY, NONE, $9, HP_UP object SPRITE_BALL, $2, $f, STAY, NONE, $a, X_ACCURACY |