summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-04-04 14:42:31 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-04-04 15:15:02 -0400
commit0ee9d7a48baed7e9388e7e377b5eab5b4f795688 (patch)
tree749cbc7e9407feb2253573f5264f7006c03e7d52 /macros
parenta325db0f14ca3c48bd9057627f7306b207544700 (diff)
Upgrade to rgbds 0.4.0
- fail for rgbds < 0.4.0 - `rst <Label>` - `ds <count>, <byte>` - `shift <N>` - ASCII "\r" - Sorted .sym file
Diffstat (limited to 'macros')
-rw-r--r--macros/coords.asm3
-rw-r--r--macros/data.asm8
-rw-r--r--macros/gfx.asm4
-rw-r--r--macros/rst.asm4
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