summaryrefslogtreecommitdiff
path: root/data/mapObjects/unknowndungeon1.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-06-05 16:39:42 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-06-05 16:39:42 -0400
commit08fb4c22ef11f7ea99abe9c6ff0e73bbcd8fb239 (patch)
tree7b5d7d54ed3ce4cebd9b3e2809c5ce54e8eaddfd /data/mapObjects/unknowndungeon1.asm
parent8cdf73265f95e9a55112f373804867244512878d (diff)
parent2f0305d80a0f64c093eabceb434a2fd0c122caa2 (diff)
Merge pull request #11 from PikalaxALT/master
MILESTONE: Finish disassembly
Diffstat (limited to 'data/mapObjects/unknowndungeon1.asm')
-rwxr-xr-xdata/mapObjects/unknowndungeon1.asm9
1 files changed, 5 insertions, 4 deletions
diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm
index c55711b4..0635e9a7 100755
--- a/data/mapObjects/unknowndungeon1.asm
+++ b/data/mapObjects/unknowndungeon1.asm
@@ -14,10 +14,11 @@ UnknownDungeon1Object: ; 0x74d15 (size=97)
db $0 ; signs
- db $3 ; objects
- object SPRITE_BALL, $7, $d, STAY, NONE, $1, FULL_RESTORE
- object SPRITE_BALL, $13, $3, STAY, NONE, $2, MAX_ELIXER
- object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET
+ db $4 ; objects
+ object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY
+ object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER
+ object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE
+ object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL
; warp-to
EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18