diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-05 16:39:42 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2016-06-05 16:39:42 -0400 |
| commit | 08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239 (patch) | |
| tree | 7b5d7d54ed3ce4cebd9b3e2809c5ce54e8eaddfd /data/mapObjects/silphco11.asm | |
| parent | Merge pull request #10 from PikalaxALT/master (diff) | |
| parent | This looks like Gen 2's object animation engine (diff) | |
| download | pokeyellow-08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239.tar.gz pokeyellow-08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239.tar.xz pokeyellow-08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239.zip | |
Merge pull request #11 from PikalaxALT/master
MILESTONE: Finish disassembly
Diffstat (limited to 'data/mapObjects/silphco11.asm')
| -rwxr-xr-x | data/mapObjects/silphco11.asm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index 8cba618e..bae7eda5 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -9,12 +9,13 @@ SilphCo11Object: ; 0x62380 (size=72) db $0 ; signs - db $5 ; objects + db $6 ; objects object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2 - object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29 + object SPRITE_JAMES, $2, $8, STAY, UP, $4 object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28 + object SPRITE_JESSIE, $3, $8, STAY, UP, $6 ; warp-to EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F |