diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-27 22:48:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 22:48:14 -0600 |
| commit | 940ab939959945f9990b50893434648c9547e880 (patch) | |
| tree | f5a51bcaa68227d18eb658b337c764e10f0bf224 /asm/macros | |
| parent | 61e0c62d2d2dbeba13aaeb49b89c9773b25f84b7 (diff) | |
| parent | cbf615ca73cb70e1b5e8649a245685394526212b (diff) | |
Merge pull request #481 from camthesaxman/map_constants
convert data files to use constants/map.h
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/map.inc | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index fd417fe9d..9c68e8414 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -1,30 +1,6 @@ - .macro new_map_group - inc cur_map_group - .set cur_map_num, 0 - .endm - - .macro map_group map_name - .set GROUP_\map_name, cur_map_group - .set MAP_\map_name, cur_map_num - inc cur_map_num - .endm - - .macro map map_name - .byte GROUP_\map_name - .byte MAP_\map_name - .endm - - .macro warp_map map_name - .byte MAP_\map_name - .byte GROUP_\map_name - .endm - - .macro heal_location map_name, x, y - .byte GROUP_\map_name - .byte MAP_\map_name - .2byte \x - .2byte \y - .space 2 + .macro map map_id + .byte \map_id >> 8 @ map group + .byte \map_id & 0xFF @ map num .endm .macro map_script type, address @@ -48,10 +24,11 @@ inc _num_npcs .endm - .macro warp_def x, y, byte, warp, map + .macro warp_def x, y, byte, warp, map_id .2byte \x, \y .byte \byte, \warp - warp_map \map + .byte \map_id & 0xFF @ map num + .byte \map_id >> 8 @ map group inc _num_warps .endm |