aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/vermilionhouse1.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/vermilionhouse1.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/vermilionhouse1.asm')
-rwxr-xr-xdata/mapObjects/vermilionhouse1.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm
index 199489ba..bbb7491b 100755
--- a/data/mapObjects/vermilionhouse1.asm
+++ b/data/mapObjects/vermilionhouse1.asm
@@ -1,17 +1,17 @@
VermilionHouse1Object:
db $a ; border block
- db $2 ; warps
- db $7, $2, $4, $ff
- db $7, $3, $4, $ff
+ db 2 ; warps
+ warp 2, 7, 4, -1
+ warp 3, 7, 4, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_BUG_CATCHER, $5, $3, STAY, LEFT, $1 ; person
- object SPRITE_BIRD, $3, $5, WALK, $2, $2 ; person
- object SPRITE_PAPER_SHEET, $4, $3, STAY, NONE, $3 ; person
+ db 3 ; objects
+ object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person
+ object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person
+ object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person
; warp-to
- EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $2
- EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $3
+ warp_to 2, 7, VERMILION_HOUSE_1_WIDTH
+ warp_to 3, 7, VERMILION_HOUSE_1_WIDTH