diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-05 20:11:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 20:11:10 -0700 |
| commit | 9238533346fd97c67e48fee33a204d1e8e2dd0a7 (patch) | |
| tree | e9a140e919d72891ea825b64fc72a9cfa175ce88 /include/macros/map.inc | |
| parent | 99c98097753008b1f824a676b36f34ac2857effe (diff) | |
| parent | f309f3272ae04be643ee3d1dd9f3fc3e5fc6c699 (diff) | |
Merge pull request #648 from yenatch/master
fix WarpEvent and label some of pokemon_summary_screen
Diffstat (limited to 'include/macros/map.inc')
| -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 |