summaryrefslogtreecommitdiff
path: root/data/mapObjects/undergroundpathwe.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/undergroundpathwe.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/undergroundpathwe.asm')
-rwxr-xr-xdata/mapObjects/undergroundpathwe.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm
index 42bbb9bf..0af2ccc3 100755
--- a/data/mapObjects/undergroundpathwe.asm
+++ b/data/mapObjects/undergroundpathwe.asm
@@ -1,14 +1,14 @@
UndergroundPathWEObject:
db $1 ; border block
- db $2 ; warps
- db $5, $2, $2, PATH_ENTRANCE_ROUTE_7
- db $2, $2f, $2, PATH_ENTRANCE_ROUTE_8
+ db 2 ; warps
+ warp 2, 5, 2, PATH_ENTRANCE_ROUTE_7
+ warp 47, 2, 2, PATH_ENTRANCE_ROUTE_8
- db $0 ; signs
+ db 0 ; signs
- db $0 ; objects
+ db 0 ; objects
; warp-to
- EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $5, $2 ; PATH_ENTRANCE_ROUTE_7
- EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $2, $2f ; PATH_ENTRANCE_ROUTE_8
+ warp_to 2, 5, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_7
+ warp_to 47, 2, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_8