aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/mtmoon3.asm
diff options
context:
space:
mode:
authorShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
committerShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
commit3d8e949d373a828fee370b08d005f131abb67333 (patch)
treee200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/mtmoon3.asm
parentMerge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff)
downloadpokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.gz
pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.xz
pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.zip
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/mtmoon3.asm')
-rwxr-xr-xdata/mapObjects/mtmoon3.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm
index 43891ec3..f76a3e26 100755
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/mtmoon3.asm
@@ -1,28 +1,28 @@
MtMoon3Object:
db $3 ; border block
- db $4 ; warps
- db $9, $19, $1, MT_MOON_2
- db $11, $15, $4, MT_MOON_2
- db $1b, $f, $5, MT_MOON_2
- db $7, $5, $6, MT_MOON_2
+ db 4 ; warps
+ warp 25, 9, 1, MT_MOON_2
+ warp 21, 17, 4, MT_MOON_2
+ warp 15, 27, 5, MT_MOON_2
+ warp 5, 7, 6, MT_MOON_2
- db $0 ; signs
+ db 0 ; signs
- db $a ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2
- 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, $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
+ db 10 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
+ object SPRITE_JESSIE, 9, 3, STAY, LEFT, 2
+ object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2
+ object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3
+ object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 1
+ object SPRITE_JAMES, 9, 4, STAY, LEFT, 6
+ object SPRITE_OMANYTE, 12, 6, STAY, NONE, 7 ; person
+ object SPRITE_OMANYTE, 13, 6, STAY, NONE, 8 ; person
+ object SPRITE_BALL, 25, 21, STAY, NONE, 9, HP_UP
+ object SPRITE_BALL, 29, 5, STAY, NONE, 10, TM_01
; warp-to
- EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2
- EVENT_DISP MT_MOON_3_WIDTH, $11, $15 ; MT_MOON_2
- EVENT_DISP MT_MOON_3_WIDTH, $1b, $f ; MT_MOON_2
- EVENT_DISP MT_MOON_3_WIDTH, $7, $5 ; MT_MOON_2
+ warp_to 25, 9, MT_MOON_3_WIDTH ; MT_MOON_2
+ warp_to 21, 17, MT_MOON_3_WIDTH ; MT_MOON_2
+ warp_to 15, 27, MT_MOON_3_WIDTH ; MT_MOON_2
+ warp_to 5, 7, MT_MOON_3_WIDTH ; MT_MOON_2