From 5943b96cf6d5eda52df2ad689af0ac251e4e0841 Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Wed, 12 Nov 2025 15:44:07 -0500
Subject: Use features of RGBDS 1.0.0 (#537)

---
 macros/data.asm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'macros/data.asm')

diff --git a/macros/data.asm b/macros/data.asm
index c945a21d..feb8f1b8 100644
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -2,19 +2,19 @@
 
 DEF percent EQUS "* $ff / 100"
 
-MACRO bcd2
+MACRO? bcd2
 	dn ((\1) / 1000) % 10, ((\1) / 100) % 10
 	dn ((\1) / 10) % 10, (\1) % 10
 ENDM
 
-MACRO bcd3
+MACRO? bcd3
 	dn ((\1) / 100000) % 10, ((\1) / 10000) % 10
 	dn ((\1) / 1000) % 10, ((\1) / 100) % 10
 	dn ((\1) / 10) % 10, (\1) % 10
 ENDM
 
 ; used in data/pokemon/base_stats/*.asm
-MACRO tmhm
+MACRO? tmhm
 	; initialize bytes to 0
 	FOR n, (NUM_TM_HM + 7) / 8
 		DEF _tm{d:n} = 0
@@ -40,49 +40,49 @@ ENDM
 
 ; Constant data (db, dw, dl) macros
 
-MACRO dbw
+MACRO? dbw
 	db \1
 	dw \2
 ENDM
 
-MACRO dwb
+MACRO? dwb
 	dw \1
 	db \2
 ENDM
 
-MACRO dn ; nybbles
+MACRO? dn ; nybbles
 	REPT _NARG / 2
 		db ((\1) << 4) | (\2)
 		SHIFT 2
 	ENDR
 ENDM
 
-MACRO dc ; "crumbs"
+MACRO? dc ; "crumbs"
 	REPT _NARG / 4
 		db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4)
 		SHIFT 4
 	ENDR
 ENDM
 
-MACRO bigdw ; big-endian word
+MACRO? bigdw ; big-endian word
 	db HIGH(\1), LOW(\1)
 ENDM
 
-MACRO dba ; dbw bank, address
+MACRO? dba ; dbw bank, address
 	REPT _NARG
 		dbw BANK(\1), \1
 		SHIFT
 	ENDR
 ENDM
 
-MACRO dab ; dwb address, bank
+MACRO? dab ; dwb address, bank
 	REPT _NARG
 		dwb \1, BANK(\1)
 		SHIFT
 	ENDR
 ENDM
 
-MACRO dname
+MACRO? dname
 	IF _NARG == 2
 		DEF n = \2
 	ELSE
@@ -91,5 +91,5 @@ MACRO dname
 	ASSERT STRFIND(\1, "@") == -1, "String terminator \"@\" in name: \1"
 	ASSERT CHARLEN(\1) <= n, "Name longer than {d:n} characters: \1"
 	db \1
-	ds n - CHARLEN(\1), "@"
+	ds n - CHARLEN(\1), '@'
 ENDM
-- 
cgit v1.3.1-sl0p