aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/billshouse.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/billshouse.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/billshouse.asm')
-rwxr-xr-xdata/mapObjects/billshouse.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm
index ef52e1dd..317d7c01 100755
--- a/data/mapObjects/billshouse.asm
+++ b/data/mapObjects/billshouse.asm
@@ -1,17 +1,17 @@
BillsHouseObject:
db $d ; border block
- db $2 ; warps
- db $7, $2, $0, $ff
- db $7, $3, $0, $ff
+ db 2 ; warps
+ warp 2, 7, 0, -1
+ warp 3, 7, 0, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_SLOWBRO, $6, $5, STAY, NONE, $1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, $4, $4, STAY, NONE, $2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, $6, $5, STAY, NONE, $3 ; person
+ db 3 ; objects
+ object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person
; warp-to
- EVENT_DISP BILLS_HOUSE_WIDTH, $7, $2
- EVENT_DISP BILLS_HOUSE_WIDTH, $7, $3
+ warp_to 2, 7, BILLS_HOUSE_WIDTH
+ warp_to 3, 7, BILLS_HOUSE_WIDTH