summaryrefslogtreecommitdiff
path: root/data/mapObjects
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-03 21:16:31 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-03 21:16:31 -0400
commit35cc755f663be0810576c9348d39b6d5e811e623 (patch)
tree4ba9be9e083ab54ac5595e4d4238f3e465d82844 /data/mapObjects
parent11e4037756a6eb9978a4fe8917552f08c4ee1b7a (diff)
Remaining maps in Bank 11
Diffstat (limited to 'data/mapObjects')
-rwxr-xr-xdata/mapObjects/unknowndungeon2.asm9
-rwxr-xr-xdata/mapObjects/unknowndungeon3.asm8
2 files changed, 10 insertions, 7 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
diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm
index 8b733e6b..cb2d8f83 100755
--- a/data/mapObjects/unknowndungeon3.asm
+++ b/data/mapObjects/unknowndungeon3.asm
@@ -6,10 +6,12 @@ UnknownDungeon3Object: ; 0x45f36 (size=34)
db $0 ; signs
- db $3 ; objects
+ db $5 ; objects
object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 70
- object SPRITE_BALL, $10, $9, STAY, NONE, $2, ULTRA_BALL
- object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE
+ object SPRITE_BALL, $1a, $1, STAY, NONE, $2, ULTRA_BALL
+ object SPRITE_BALL, $2, $d, STAY, NONE, $3, ULTRA_BALL
+ object SPRITE_BALL, $3, $d, STAY, NONE, $4, MAX_REVIVE
+ object SPRITE_BALL, $f, $3, STAY, NONE, $5, MAX_ELIXER
; warp-to
EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1