aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ceruleanhouse1.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/ceruleanhouse1.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/ceruleanhouse1.asm')
-rwxr-xr-xdata/mapObjects/ceruleanhouse1.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm
index 97e5b52d..efbbebd6 100755
--- a/data/mapObjects/ceruleanhouse1.asm
+++ b/data/mapObjects/ceruleanhouse1.asm
@@ -1,18 +1,18 @@
CeruleanHouse1Object:
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 $4 ; objects
- object SPRITE_GIRL, $3, $1, STAY, DOWN, $1 ; person
- object SPRITE_BULBASAUR, $4, $1, STAY, DOWN, $2 ; person
- object SPRITE_ODDISH, $1, $4, STAY, NONE, $3 ; person
- object SPRITE_SANDSHREW, $5, $3, STAY, LEFT, $4 ; person
+ db 4 ; objects
+ object SPRITE_GIRL, 3, 1, STAY, DOWN, 1 ; person
+ object SPRITE_BULBASAUR, 4, 1, STAY, DOWN, 2 ; person
+ object SPRITE_ODDISH, 1, 4, STAY, NONE, 3 ; person
+ object SPRITE_SANDSHREW, 5, 3, STAY, LEFT, 4 ; person
; warp-to
- EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2
- EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $3
+ warp_to 2, 7, CERULEAN_HOUSE_1_WIDTH
+ warp_to 3, 7, CERULEAN_HOUSE_1_WIDTH