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/unknowndungeon2.asm | |
| parent | 8cdf73265f95e9a55112f373804867244512878d (diff) | |
| parent | 2f0305d80a0f64c093eabceb434a2fd0c122caa2 (diff) | |
Merge pull request #11 from PikalaxALT/master
MILESTONE: Finish disassembly
Diffstat (limited to 'data/mapObjects/unknowndungeon2.asm')
| -rwxr-xr-x | data/mapObjects/unknowndungeon2.asm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index e5ebca56..88cc6ba0 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -11,10 +11,11 @@ UnknownDungeon2Object: ; 0x45e14 (size=73) db $0 ; signs - db $3 ; objects - object SPRITE_BALL, $1d, $9, STAY, NONE, $1, PP_UP - object SPRITE_BALL, $4, $f, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE + db $4 ; objects + object SPRITE_BALL, $0, $b, STAY, NONE, $1, RARE_CANDY + object SPRITE_BALL, $10, $7, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $13, $b, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $1b, $9, STAY, NONE, $4, FULL_RESTORE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 |