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/silphco9.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'data/mapObjects/silphco9.asm')
| -rwxr-xr-x | data/mapObjects/silphco9.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 5fb1db79..204f0d1d 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -12,9 +12,9 @@ SilphCo9Object: ; 0x5d93f (size=74) db $4 ; objects object SPRITE_NURSE, $3, $e, STAY, DOWN, $1 ; person - object SPRITE_ROCKET, $2, $4, STAY, UP, $2, ROCKET + $C8, $25 - object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, SCIENTIST + $C8, $a - object SPRITE_ROCKET, $d, $10, STAY, UP, $4, ROCKET + $C8, $26 + object SPRITE_ROCKET, $2, $4, STAY, UP, $2, OPP_ROCKET, $25 + object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, OPP_SCIENTIST, $a + object SPRITE_ROCKET, $d, $10, STAY, UP, $4, OPP_ROCKET, $26 ; warp-to EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F |