aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route5gate.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-03-27 14:11:59 -0500
committerGitHub <noreply@github.com>2020-03-27 14:11:59 -0500
commite2e8bf6a8477af254ea7057028f72ac918b62005 (patch)
treeffed0137cf81880afa4b0ec2fa30300565996f4b /data/mapObjects/route5gate.asm
parentMerge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff)
parentRemoved EVENT_DISP (diff)
downloadpokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.gz
pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.xz
pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.zip
Merge pull request #47 from ValientOrc98/master
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/route5gate.asm')
-rwxr-xr-xdata/mapObjects/route5gate.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm
index 9588f511..8b230942 100755
--- a/data/mapObjects/route5gate.asm
+++ b/data/mapObjects/route5gate.asm
@@ -1,19 +1,19 @@
Route5GateObject:
db $a ; border block
- db $4 ; warps
- db $5, $3, $2, $ff
- db $5, $4, $2, $ff
- db $0, $3, $1, $ff
- db $0, $4, $0, $ff
+ db 4 ; warps
+ warp 3, 5, 2, -1
+ warp 4, 5, 2, -1
+ warp 3, 0, 1, -1
+ warp 4, 0, 0, -1
- db $0 ; signs
+ db 0 ; signs
- db $1 ; objects
- object SPRITE_GUARD, $1, $3, STAY, RIGHT, $1 ; person
+ db 1 ; objects
+ object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person
; warp-to
- EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $3
- EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $4
- EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $3
- EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $4
+ warp_to 3, 5, ROUTE_5_GATE_WIDTH
+ warp_to 4, 5, ROUTE_5_GATE_WIDTH
+ warp_to 3, 0, ROUTE_5_GATE_WIDTH
+ warp_to 4, 0, ROUTE_5_GATE_WIDTH