diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/coords.asm | 3 | ||||
| -rw-r--r-- | macros/data.asm | 8 | ||||
| -rw-r--r-- | macros/gfx.asm | 4 | ||||
| -rw-r--r-- | macros/rst.asm | 4 |
4 files changed, 4 insertions, 15 deletions
diff --git a/macros/coords.asm b/macros/coords.asm index 0fbf96ccd..3ea6e4154 100644 --- a/macros/coords.asm +++ b/macros/coords.asm @@ -28,8 +28,7 @@ dwcoord: MACRO ; x, y rept _NARG / 2 dw (\2) * SCREEN_WIDTH + (\1) + wTilemap - shift - shift + shift 2 endr ENDM diff --git a/macros/data.asm b/macros/data.asm index 76a5d31de..009683213 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -32,18 +32,14 @@ ENDM dn: MACRO ; nybbles rept _NARG / 2 db ((\1) << 4) | (\2) - shift - shift + shift 2 endr ENDM dc: MACRO ; "crumbs" rept _NARG / 4 db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4) - shift - shift - shift - shift + shift 4 endr ENDM diff --git a/macros/gfx.asm b/macros/gfx.asm index 2753373e0..24c79e1f1 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -1,9 +1,7 @@ RGB: MACRO rept _NARG / 3 dw palred (\1) + palgreen (\2) + palblue (\3) - shift - shift - shift + shift 3 endr ENDM diff --git a/macros/rst.asm b/macros/rst.asm index 773a5c60d..c8b80aab2 100644 --- a/macros/rst.asm +++ b/macros/rst.asm @@ -1,7 +1,3 @@ -FarCall EQU $08 -Bankswitch EQU $10 -JumpTable EQU $28 - farcall: MACRO ; bank, address ld a, BANK(\1) ld hl, \1 |