diff options
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 69c5ea5f..e9b818c8 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 8058a7ac..3b1d8c5f 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 0e952c76..a394405d 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 |