aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/saffronhouse2.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/saffronhouse2.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/saffronhouse2.asm')
-rwxr-xr-xdata/mapObjects/saffronhouse2.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm
index e57bdbb7..ac1827b9 100755
--- a/data/mapObjects/saffronhouse2.asm
+++ b/data/mapObjects/saffronhouse2.asm
@@ -1,15 +1,15 @@
SaffronHouse2Object:
db $a ; border block
- db $2 ; warps
- db $7, $2, $7, $ff
- db $7, $3, $7, $ff
+ db 2 ; warps
+ warp 2, 7, 7, -1
+ warp 3, 7, 7, -1
- db $0 ; signs
+ db 0 ; signs
- db $1 ; objects
- object SPRITE_FISHER, $5, $3, STAY, LEFT, $1 ; person
+ db 1 ; objects
+ object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person
; warp-to
- EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $2
- EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $3
+ warp_to 2, 7, SAFFRON_HOUSE_2_WIDTH
+ warp_to 3, 7, SAFFRON_HOUSE_2_WIDTH