summaryrefslogtreecommitdiff
path: root/include/macros/map.inc
diff options
context:
space:
mode:
authorGarak <thomastaps194@comcast.net>2018-07-07 20:50:41 -0400
committerGitHub <noreply@github.com>2018-07-07 20:50:41 -0400
commit6c5d1c4a3de2f1a2d1855a542a6a5d53e4daf936 (patch)
treee9a140e919d72891ea825b64fc72a9cfa175ce88 /include/macros/map.inc
parentc4cc1522c86ec240c53c75455b650b1c69b2d5a4 (diff)
parent9238533346fd97c67e48fee33a204d1e8e2dd0a7 (diff)
Merge pull request #9 from pret/master
sync with source repo
Diffstat (limited to 'include/macros/map.inc')
-rw-r--r--include/macros/map.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/macros/map.inc b/include/macros/map.inc
index 80257fd23..bc54271d4 100644
--- a/include/macros/map.inc
+++ b/include/macros/map.inc
@@ -26,9 +26,9 @@
inc _num_npcs
.endm
- .macro warp_def x, y, byte, warp, map_id
+ .macro warp_def x, y, elevation, warp, map_id
.2byte \x, \y
- .byte \byte, \warp
+ .byte \elevation, \warp
.byte \map_id & 0xFF @ map num
.byte \map_id >> 8 @ map group
inc _num_warps