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/silphco7.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/silphco7.asm')
| -rwxr-xr-x | data/mapObjects/silphco7.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index 42a84faa..ef665ac0 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -16,10 +16,10 @@ SilphCo7Object: ; 0x51ed7 (size=128) object SPRITE_LAPRAS_GIVER, $d, $d, STAY, UP, $2 ; person object SPRITE_LAPRAS_GIVER, $7, $a, STAY, NONE, $3 ; person object SPRITE_ERIKA, $a, $8, STAY, NONE, $4 ; person - object SPRITE_ROCKET, $d, $1, STAY, DOWN, $5, ROCKET + $C8, $20 - object SPRITE_OAK_AIDE, $2, $d, STAY, DOWN, $6, SCIENTIST + $C8, $8 - object SPRITE_ROCKET, $14, $2, STAY, LEFT, $7, ROCKET + $C8, $21 - object SPRITE_ROCKET, $13, $e, STAY, RIGHT, $8, ROCKET + $C8, $22 + object SPRITE_ROCKET, $d, $1, STAY, DOWN, $5, OPP_ROCKET, $20 + object SPRITE_OAK_AIDE, $2, $d, STAY, DOWN, $6, OPP_SCIENTIST, $8 + object SPRITE_ROCKET, $14, $2, STAY, LEFT, $7, OPP_ROCKET, $21 + object SPRITE_ROCKET, $13, $e, STAY, RIGHT, $8, OPP_ROCKET, $22 object SPRITE_BLUE, $3, $7, STAY, UP, $9 ; person object SPRITE_BALL, $1, $9, STAY, NONE, $a, CALCIUM object SPRITE_BALL, $18, $b, STAY, NONE, $b, TM_03 |