diff options
| author | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
|---|---|---|
| committer | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
| commit | 3d8e949d373a828fee370b08d005f131abb67333 (patch) | |
| tree | e200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/safarizoneresthouse2.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| download | pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.gz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.xz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.zip | |
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/safarizoneresthouse2.asm')
| -rwxr-xr-x | data/mapObjects/safarizoneresthouse2.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index 82f04f9d..7e589731 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -1,17 +1,17 @@ SafariZoneRestHouse2Object: db $a ; border block - db $2 ; warps - db $7, $2, $7, SAFARI_ZONE_WEST - db $7, $3, $7, SAFARI_ZONE_WEST + db 2 ; warps + warp 2, 7, 7, SAFARI_ZONE_WEST + warp 3, 7, 7, SAFARI_ZONE_WEST - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_OAK_AIDE, $4, $4, WALK, $0, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $0, $2, STAY, RIGHT, $2 ; person - object SPRITE_ERIKA, $6, $2, STAY, DOWN, $3 ; person + db 3 ; objects + object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person + object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $2 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $3 ; SAFARI_ZONE_WEST + warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST + warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST |