aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/blueshouse.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/blueshouse.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/blueshouse.asm')
-rwxr-xr-xdata/mapObjects/blueshouse.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm
index 08b11853..65523b26 100755
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/blueshouse.asm
@@ -1,17 +1,17 @@
BluesHouseObject:
- db $0A ; border block
+ db $a ; border block
- db $2 ; warps
- db $7, $2, $1, $FF
- db $7, $3, $1, $FF
+ db 2 ; warps
+ warp 2, 7, 1, -1
+ warp 3, 7, 1, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_DAISY, $2, $3, STAY, RIGHT, $81, $0 ; Daisy, sitting by map
- object SPRITE_DAISY, $6, $4, WALK, $1, $82, $0 ; Daisy, walking around
- object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $83, $0 ; map on table
+ db 3 ; objects
+ object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1, 0 ; Daisy, sitting by map
+ object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around
+ object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table
; warp-to
- EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2
- EVENT_DISP BLUES_HOUSE_WIDTH, $7, $3
+ warp_to 2, 7, BLUES_HOUSE_WIDTH
+ warp_to 3, 7, BLUES_HOUSE_WIDTH