summaryrefslogtreecommitdiff
path: root/data/mapObjects/route7gate.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2018-02-05 10:57:14 -0600
committerGitHub <noreply@github.com>2018-02-05 10:57:14 -0600
commitb8aa9ec80e43257a9e3a487b46a33f99c999a940 (patch)
tree3813e75239070dbb3d549e8c03297cc28b2551e3 /data/mapObjects/route7gate.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
parent819b6789099947e83b7e3f0b0e2f6d39cf901807 (diff)
Merge pull request #174 from Rangi42/master
Add warp, sign, and warp_to macros for data/mapObjects definitions; use base 10 numbers
Diffstat (limited to 'data/mapObjects/route7gate.asm')
-rwxr-xr-xdata/mapObjects/route7gate.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm
index 3aea6a88..0b726fd3 100755
--- a/data/mapObjects/route7gate.asm
+++ b/data/mapObjects/route7gate.asm
@@ -1,19 +1,19 @@
Route7GateObject:
db $a ; border block
- db $4 ; warps
- db $3, $0, $3, $ff
- db $4, $0, $3, $ff
- db $3, $5, $0, $ff
- db $4, $5, $1, $ff
+ db 4 ; warps
+ warp 0, 3, 3, -1
+ warp 0, 4, 3, -1
+ warp 5, 3, 0, -1
+ warp 5, 4, 1, -1
- db $0 ; signs
+ db 0 ; signs
- db $1 ; objects
- object SPRITE_GUARD, $3, $1, STAY, DOWN, $1 ; person
+ db 1 ; objects
+ object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person
; warp-to
- EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0
- EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $0
- EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $5
- EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $5
+ warp_to 0, 3, ROUTE_7_GATE_WIDTH
+ warp_to 0, 4, ROUTE_7_GATE_WIDTH
+ warp_to 5, 3, ROUTE_7_GATE_WIDTH
+ warp_to 5, 4, ROUTE_7_GATE_WIDTH