diff options
Diffstat (limited to 'macros')
| -rwxr-xr-x | macros/coords.asm | 3 | ||||
| -rwxr-xr-x | macros/data.asm | 8 | ||||
| -rwxr-xr-x | macros/gfx.asm | 4 | ||||
| -rw-r--r-- | macros/legacy.asm | 2 | ||||
| -rwxr-xr-x | macros/rst.asm | 4 |
5 files changed, 5 insertions, 16 deletions
diff --git a/macros/coords.asm b/macros/coords.asm index 0fbf96cc..3ea6e415 100755 --- 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 c0ada7f7..b9b4b0a9 100755 --- 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 2753373e..24c79e1f 100755 --- 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/legacy.asm b/macros/legacy.asm index 6234b834..ff6bf7c9 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -1,4 +1,4 @@ -; Legacy support for old pokecrystal. +; Legacy support for old pokecrystal/pokegold. ; Allows porting scripts with as few edits as possible. ; Legacy support not in this file can be found by looking for the keyword: "LEGACY" diff --git a/macros/rst.asm b/macros/rst.asm index 773a5c60..c8b80aab 100755 --- 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 |