Move the dbbw, dbww, and dbwww macros to legacy

2021-05-30 15:51:49 -04:00
parent b1dbadbdd3
commit ed0a0f7159
10 changed files with 321 additions and 286 deletions
--- 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)
--- 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
--- 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