aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/safarizoneentrance.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/safarizoneentrance.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/safarizoneentrance.asm')
-rwxr-xr-xdata/mapObjects/safarizoneentrance.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm
index 9d26aa17..5a3379c7 100755
--- a/data/mapObjects/safarizoneentrance.asm
+++ b/data/mapObjects/safarizoneentrance.asm
@@ -1,20 +1,20 @@
SafariZoneEntranceObject:
db $a ; border block
- db $4 ; warps
- db $5, $3, $4, $ff
- db $5, $4, $4, $ff
- db $0, $3, $0, SAFARI_ZONE_CENTER
- db $0, $4, $1, SAFARI_ZONE_CENTER
+ db 4 ; warps
+ warp 3, 5, 4, -1
+ warp 4, 5, 4, -1
+ warp 3, 0, 0, SAFARI_ZONE_CENTER
+ warp 4, 0, 1, SAFARI_ZONE_CENTER
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_WHITE_PLAYER, $6, $2, STAY, LEFT, $1 ; person
- object SPRITE_WHITE_PLAYER, $1, $4, STAY, RIGHT, $2 ; person
+ db 2 ; objects
+ object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person
+ object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person
; warp-to
- EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $3
- EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $4
- EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $3 ; SAFARI_ZONE_CENTER
- EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $4 ; SAFARI_ZONE_CENTER
+ warp_to 3, 5, SAFARI_ZONE_ENTRANCE_WIDTH
+ warp_to 4, 5, SAFARI_ZONE_ENTRANCE_WIDTH
+ warp_to 3, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 4, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER