aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pokemontower2.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/pokemontower2.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/pokemontower2.asm')
-rwxr-xr-xdata/mapObjects/pokemontower2.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm
index 33bc048d..96223a26 100755
--- a/data/mapObjects/pokemontower2.asm
+++ b/data/mapObjects/pokemontower2.asm
@@ -1,16 +1,16 @@
PokemonTower2Object:
db $1 ; border block
- db $2 ; warps
- db $9, $3, $0, POKEMONTOWER_3
- db $9, $12, $2, POKEMONTOWER_1
+ db 2 ; warps
+ warp 3, 9, 0, POKEMONTOWER_3
+ warp 18, 9, 2, POKEMONTOWER_1
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_BLUE, $e, $5, STAY, NONE, $1 ; person
- object SPRITE_MEDIUM, $3, $7, STAY, RIGHT, $2 ; person
+ db 2 ; objects
+ object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
+ object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person
; warp-to
- EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3
- EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $12 ; POKEMONTOWER_1
+ warp_to 3, 9, POKEMONTOWER_2_WIDTH ; POKEMON_TOWER_3F
+ warp_to 18, 9, POKEMONTOWER_2_WIDTH ; POKEMON_TOWER_1F