summaryrefslogtreecommitdiff
path: root/data/mapObjects
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-29 20:52:05 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-29 20:52:05 -0400
commitb8cced19fce2a212f5cb205039382a63821a3762 (patch)
tree6a01fb5bbe4e6558a25db77c76cf357e846e7590 /data/mapObjects
parentf17f3f1a06ce8c28f044cdb04c1d6355efc01a8f (diff)
Mt Moon B2F
Diffstat (limited to 'data/mapObjects')
-rwxr-xr-xdata/mapObjects/mtmoon3.asm15
1 files changed, 8 insertions, 7 deletions
diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm
index 4f8f911c..4a9b1946 100755
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/mtmoon3.asm
@@ -9,16 +9,17 @@ MtMoon3Object: ; 0x49fdb (size=102)
db $0 ; signs
- db $9 ; objects
+ db $a ; objects
object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2
- object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, OPP_ROCKET, $1
+ object SPRITE_JESSIE, $9, $3, STAY, LEFT, $2
object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, OPP_ROCKET, $2
object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, OPP_ROCKET, $3
- object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $4
- object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person
- object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person
- object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP
- object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01
+ object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $1
+ object SPRITE_JAMES, $9, $4, STAY, LEFT, $6
+ object SPRITE_OMANYTE, $c, $6, STAY, NONE, $7 ; person
+ object SPRITE_OMANYTE, $d, $6, STAY, NONE, $8 ; person
+ object SPRITE_BALL, $19, $15, STAY, NONE, $9, HP_UP
+ object SPRITE_BALL, $1d, $5, STAY, NONE, $a, TM_01
; warp-to
EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2