diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-27 22:40:34 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-27 22:40:34 -0600 |
| commit | cbf615ca73cb70e1b5e8649a245685394526212b (patch) | |
| tree | f5a51bcaa68227d18eb658b337c764e10f0bf224 /asm/macros | |
| parent | 2fea5bf7d82e85f4b33857e6eb5b4ddc6e7542d2 (diff) | |
fix comment alignment and get rid of warp_map macro
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/map.inc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 5bce7a456..9c68e8414 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -1,11 +1,6 @@ .macro map map_id - .byte \map_id >> 8 @ map group - .byte \map_id & 0xFF @ map num - .endm - - .macro warp_map map_id - .byte \map_id & 0xFF @ map num - .byte \map_id >> 8 @ map group + .byte \map_id >> 8 @ map group + .byte \map_id & 0xFF @ map num .endm .macro map_script type, address @@ -32,7 +27,8 @@ .macro warp_def x, y, byte, warp, map_id .2byte \x, \y .byte \byte, \warp - warp_map \map_id + .byte \map_id & 0xFF @ map num + .byte \map_id >> 8 @ map group inc _num_warps .endm |