diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-30 15:51:49 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-30 15:51:49 -0400 |
| commit | ed0a0f71591dd802d6491d57a52040a360cfb406 (patch) | |
| tree | 451a66459fbf02d396ace8e7d88169b3dc59b491 /macros | |
| parent | b1dbadbdd397cb8c9e85fa48d9184949c921a8f3 (diff) | |
Move the dbbw, dbww, and dbwww macros to legacy
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/data.asm | 15 | ||||
| -rw-r--r-- | macros/legacy.asm | 17 | ||||
| -rw-r--r-- | macros/scripts/maps.asm | 3 |
3 files changed, 19 insertions, 16 deletions
diff --git a/macros/data.asm b/macros/data.asm index 1970c8c3c..d57bfdd8f 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -41,21 +41,6 @@ dbw: MACRO dw \2 ENDM -dbbw: MACRO - db \1, \2 - dw \3 -ENDM - -dbww: MACRO - db \1 - dw \2, \3 -ENDM - -dbwww: MACRO - db \1 - dw \2, \3, \4 -ENDM - dn: MACRO ; nybbles rept _NARG / 2 db ((\1) << 4) | (\2) diff --git a/macros/legacy.asm b/macros/legacy.asm index 68566c75e..2abe3f8d8 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -11,6 +11,23 @@ dsprite: MACRO dbsprite \2, \4, \1, \3, \5, \6 ENDM +; macros/data.asm + +dbbw: MACRO + db \1, \2 + dw \3 +ENDM + +dbww: MACRO + db \1 + dw \2, \3 +ENDM + +dbwww: MACRO + db \1 + dw \2, \3, \4 +ENDM + ; macros/scripts/audio.asm __ EQU 0 CC EQU 13 diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index 0e952c764..a394405d4 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -172,5 +172,6 @@ stonetable: MACRO ;\1: warp id ;\2: object_event id ;\3: script pointer - dbbw \1, \2, \3 + db \1, \2 + dw \3 ENDM |