diff options
| author | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
|---|---|---|
| committer | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
| commit | 864a69f9bf050eaaa062c8346cd6a5032e617139 (patch) | |
| tree | bd8b133710c813b11becf602067495526c849b6a /include/macros | |
| parent | 47bcba3e1b5140cef7f04edcda3759818408726a (diff) | |
merge conflicts are soooooooooo fun
Diffstat (limited to 'include/macros')
| -rw-r--r-- | include/macros/map.inc | 4 |
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 |