aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/redshouse1f.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/redshouse1f.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/redshouse1f.asm')
-rwxr-xr-xdata/mapObjects/redshouse1f.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm
index 4d32ea3d..c70ee1f6 100755
--- a/data/mapObjects/redshouse1f.asm
+++ b/data/mapObjects/redshouse1f.asm
@@ -1,18 +1,18 @@
RedsHouse1FObject:
db $0A ; border block
- db $3 ; warps
- db $7, $2, $0, $FF ; exit1
- db $7, $3, $0, $FF ; exit2
- db $1, $7, $0, REDS_HOUSE_2F ; staircase
+ db 3 ; warps
+ warp 2, 7, 0, -1 ; exit1
+ warp 3, 7, 0, -1 ; exit2
+ warp 7, 1, 0, REDS_HOUSE_2F ; staircase
- db $1 ; signs
- db $1, $3, $2 ; TV
+ db 1 ; signs
+ sign 3, 1, 2 ; TV
- db $1 ; objects
- object SPRITE_MOM, $5, $4, STAY, LEFT, $1 ; Mom
+ db 1 ; objects
+ object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom
; warp-to
- EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2
- EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $3
- EVENT_DISP REDS_HOUSE_1F_WIDTH, $1, $7
+ warp_to 2, 7, REDS_HOUSE_1F_WIDTH
+ warp_to 3, 7, REDS_HOUSE_1F_WIDTH
+ warp_to 7, 1, REDS_HOUSE_1F_WIDTH