aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2026-04-15 12:05:52 -0500
committerdannye <33dannye@gmail.com>2026-04-15 12:05:52 -0500
commitbfa7170107eea23b89febb60bfb2ce39173bf2e1 (patch)
tree9796ec9b20b065c8935f54ef4f7cbf1d5a821ecc /macros
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
parentRelabel SFX_SILPH_SCOPE to SFX_TRAINER_APPEARED (#580) (diff)
downloadpokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.tar.gz
pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.tar.xz
pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'macros')
-rw-r--r--macros/asserts.asm16
1 files changed, 3 insertions, 13 deletions
diff --git a/macros/asserts.asm b/macros/asserts.asm
index 11e0ee99..132006f9 100644
--- a/macros/asserts.asm
+++ b/macros/asserts.asm
@@ -11,7 +11,7 @@ MACRO? _redef_current_label
DEF \1 EQUS #{__SCOPE__}
ENDC
ENDC
- if !DEF(\1)
+ IF !DEF(\1)
DEF \1 EQUS \2
{\1}:
ENDC
@@ -68,12 +68,7 @@ ENDM
MACRO? nybble_array
DEF CURRENT_NYBBLE_ARRAY_VALUE = 0
DEF CURRENT_NYBBLE_ARRAY_LENGTH = 0
- IF _NARG == 1
- REDEF CURRENT_NYBBLE_ARRAY_START EQUS "\1"
- ELSE
- REDEF CURRENT_NYBBLE_ARRAY_START EQUS "._nybble_array\@"
- {CURRENT_NYBBLE_ARRAY_START}:
- ENDC
+ _redef_current_label CURRENT_NYBBLE_ARRAY_START, "._nybble_array\@", \#
ENDM
MACRO? nybble
@@ -103,12 +98,7 @@ ENDM
MACRO? bit_array
DEF CURRENT_BIT_ARRAY_VALUE = 0
DEF CURRENT_BIT_ARRAY_LENGTH = 0
- IF _NARG == 1
- REDEF CURRENT_BIT_ARRAY_START EQUS "\1"
- ELSE
- REDEF CURRENT_BIT_ARRAY_START EQUS "._bit_array\@"
- {CURRENT_BIT_ARRAY_START}:
- ENDC
+ _redef_current_label CURRENT_BIT_ARRAY_START, "._bit_array\@", \#
ENDM
MACRO? dbit