aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pokemontower7.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/pokemontower7.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/pokemontower7.asm')
-rwxr-xr-xdata/mapObjects/pokemontower7.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm
index 76435c04..67adcd69 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -1,15 +1,15 @@
PokemonTower7Object:
db $1 ; border block
- db $1 ; warps
- db $10, $9, $1, POKEMONTOWER_6
+ db 1 ; warps
+ warp 9, 16, 1, POKEMONTOWER_6
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_JESSIE, $a, $8, STAY, DOWN, $1
- object SPRITE_JAMES, $b, $8, STAY, DOWN, $2
- object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $3
+ db 3 ; objects
+ object SPRITE_JESSIE, 10, 8, STAY, DOWN, 1
+ object SPRITE_JAMES, 11, 8, STAY, DOWN, 2
+ object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 3
; warp-to
- EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6
+ warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6