diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-17 19:06:56 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-17 19:06:56 -0400 |
| commit | dd690920c9f8502b649f1022fadbb99fab67a44a (patch) | |
| tree | 6241fa9659e8ba2a82ea6fa45194dbd6e5dc39ef /macros/asserts.asm | |
| parent | 4b64b146e4d723980d26470d171fb18e63f4a215 (diff) | |
Use rgbds 0.5.0 features:
- FOR loops
- {interpolation}
- REDEF EQUS
- \# for all macro args
Diffstat (limited to 'macros/asserts.asm')
| -rw-r--r-- | macros/asserts.asm | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/macros/asserts.asm b/macros/asserts.asm index d04c7942..a07bc553 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -2,33 +2,27 @@ table_width: MACRO CURRENT_TABLE_WIDTH = \1 -IF DEF(CURRENT_TABLE_START) -PURGE CURRENT_TABLE_START -ENDC IF _NARG == 2 -CURRENT_TABLE_START EQUS "\2" +REDEF CURRENT_TABLE_START EQUS "\2" ELSE -CURRENT_TABLE_START EQUS "._table_width\@" -CURRENT_TABLE_START: +REDEF CURRENT_TABLE_START EQUS "._table_width\@" +{CURRENT_TABLE_START}: ENDC ENDM assert_table_length: MACRO x = \1 - ASSERT x * CURRENT_TABLE_WIDTH == @ - CURRENT_TABLE_START, \ + ASSERT x * CURRENT_TABLE_WIDTH == @ - {CURRENT_TABLE_START}, \ "{CURRENT_TABLE_START}: expected {d:x} entries, each {d:CURRENT_TABLE_WIDTH} bytes" ENDM list_start: MACRO list_index = 0 -IF DEF(CURRENT_LIST_START) -PURGE CURRENT_LIST_START -ENDC IF _NARG == 1 -CURRENT_LIST_START EQUS "\1" +REDEF CURRENT_LIST_START EQUS "\1" ELSE -CURRENT_LIST_START EQUS "._list_start\@" -CURRENT_LIST_START: +REDEF CURRENT_LIST_START EQUS "._list_start\@" +{CURRENT_LIST_START}: ENDC ENDM @@ -46,42 +40,36 @@ ENDM def_grass_wildmons: MACRO ;\1: encounter rate -if DEF(CURRENT_GRASS_WILDMONS_LABEL) -PURGE CURRENT_GRASS_WILDMONS_LABEL -endc CURRENT_GRASS_WILDMONS_RATE = \1 -CURRENT_GRASS_WILDMONS_LABEL EQUS "._def_grass_wildmons_\1" -CURRENT_GRASS_WILDMONS_LABEL: +REDEF CURRENT_GRASS_WILDMONS_LABEL EQUS "._def_grass_wildmons_\1" +{CURRENT_GRASS_WILDMONS_LABEL}: db \1 ENDM end_grass_wildmons: MACRO IF CURRENT_GRASS_WILDMONS_RATE == 0 - assert 1 == @ - CURRENT_GRASS_WILDMONS_LABEL, \ + assert 1 == @ - {CURRENT_GRASS_WILDMONS_LABEL}, \ "def_grass_wildmons {d:CURRENT_GRASS_WILDMONS_RATE}: expected 1 byte" ELSE - assert WILDDATA_LENGTH == @ - CURRENT_GRASS_WILDMONS_LABEL, \ + assert WILDDATA_LENGTH == @ - {CURRENT_GRASS_WILDMONS_LABEL}, \ "def_grass_wildmons {d:CURRENT_GRASS_WILDMONS_RATE}: expected {d:WILDDATA_LENGTH} bytes" ENDC ENDM def_water_wildmons: MACRO ;\1: encounter rate -if DEF(CURRENT_WATER_WILDMONS_LABEL) -PURGE CURRENT_WATER_WILDMONS_LABEL -endc CURRENT_WATER_WILDMONS_RATE = \1 -CURRENT_WATER_WILDMONS_LABEL EQUS "._def_water_wildmons_\1" -CURRENT_WATER_WILDMONS_LABEL: +REDEF CURRENT_WATER_WILDMONS_LABEL EQUS "._def_water_wildmons_\1" +{CURRENT_WATER_WILDMONS_LABEL}: db \1 ENDM end_water_wildmons: MACRO IF CURRENT_WATER_WILDMONS_RATE == 0 - assert 1 == @ - CURRENT_WATER_WILDMONS_LABEL, \ + assert 1 == @ - {CURRENT_WATER_WILDMONS_LABEL}, \ "def_water_wildmons {d:CURRENT_WATER_WILDMONS_RATE}: expected 1 byte" ELSE - assert WILDDATA_LENGTH == @ - CURRENT_WATER_WILDMONS_LABEL, \ + assert WILDDATA_LENGTH == @ - {CURRENT_WATER_WILDMONS_LABEL}, \ "def_water_wildmons {d:CURRENT_WATER_WILDMONS_RATE}: expected {d:WILDDATA_LENGTH} bytes" ENDC ENDM |