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/silphco5.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/silphco5.asm')
| -rwxr-xr-x | data/mapObjects/silphco5.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index bb7bf68e..0c956cd3 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -14,10 +14,10 @@ SilphCo5Object: ; 0x1a08d (size=137) db $b ; objects object SPRITE_LAPRAS_GIVER, $d, $9, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $8, $10, STAY, RIGHT, $2, ROCKET + $C8, $1c - object SPRITE_OAK_AIDE, $8, $3, STAY, RIGHT, $3, SCIENTIST + $C8, $6 - object SPRITE_ROCKER, $12, $a, STAY, UP, $4, JUGGLER + $C8, $1 - object SPRITE_ROCKET, $1c, $4, STAY, UP, $5, ROCKET + $C8, $1d + object SPRITE_ROCKET, $8, $10, STAY, RIGHT, $2, OPP_ROCKET, $1c + object SPRITE_OAK_AIDE, $8, $3, STAY, RIGHT, $3, OPP_SCIENTIST, $6 + object SPRITE_ROCKER, $12, $a, STAY, UP, $4, OPP_JUGGLER, $1 + object SPRITE_ROCKET, $1c, $4, STAY, UP, $5, OPP_ROCKET, $1d object SPRITE_BALL, $2, $d, STAY, NONE, $6, TM_09 object SPRITE_BALL, $4, $6, STAY, NONE, $7, PROTEIN object SPRITE_BALL, $15, $10, STAY, NONE, $8, CARD_KEY |