diff options
Diffstat (limited to 'macros/asserts.asm')
| -rw-r--r-- | macros/asserts.asm | 48 |
1 files changed, 15 insertions, 33 deletions
diff --git a/macros/asserts.asm b/macros/asserts.asm index 04c039ecc..f1c5cfdc1 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,38 +40,26 @@ ENDM def_grass_wildmons: MACRO ;\1: map id -if DEF(CURRENT_GRASS_WILDMONS_MAP) -PURGE CURRENT_GRASS_WILDMONS_MAP -endc -if DEF(CURRENT_GRASS_WILDMONS_LABEL) -PURGE CURRENT_GRASS_WILDMONS_LABEL -endc -CURRENT_GRASS_WILDMONS_MAP EQUS "\1" -CURRENT_GRASS_WILDMONS_LABEL EQUS "._def_grass_wildmons_\1" -CURRENT_GRASS_WILDMONS_LABEL: +REDEF CURRENT_GRASS_WILDMONS_MAP EQUS "\1" +REDEF CURRENT_GRASS_WILDMONS_LABEL EQUS "._def_grass_wildmons_\1" +{CURRENT_GRASS_WILDMONS_LABEL}: map_id \1 ENDM end_grass_wildmons: MACRO - assert GRASS_WILDDATA_LENGTH == @ - CURRENT_GRASS_WILDMONS_LABEL, \ + assert GRASS_WILDDATA_LENGTH == @ - {CURRENT_GRASS_WILDMONS_LABEL}, \ "def_grass_wildmons {CURRENT_GRASS_WILDMONS_MAP}: expected {d:GRASS_WILDDATA_LENGTH} bytes" ENDM def_water_wildmons: MACRO ;\1: map id -if DEF(CURRENT_WATER_WILDMONS_MAP) -PURGE CURRENT_WATER_WILDMONS_MAP -endc -if DEF(CURRENT_WATER_WILDMONS_LABEL) -PURGE CURRENT_WATER_WILDMONS_LABEL -endc -CURRENT_WATER_WILDMONS_MAP EQUS "\1" -CURRENT_WATER_WILDMONS_LABEL EQUS "._def_water_wildmons_\1" -CURRENT_WATER_WILDMONS_LABEL: +REDEF CURRENT_WATER_WILDMONS_MAP EQUS "\1" +REDEF CURRENT_WATER_WILDMONS_LABEL EQUS "._def_water_wildmons_\1" +{CURRENT_WATER_WILDMONS_LABEL}: map_id \1 ENDM end_water_wildmons: MACRO - assert WATER_WILDDATA_LENGTH == @ - CURRENT_WATER_WILDMONS_LABEL, \ + assert WATER_WILDDATA_LENGTH == @ - {CURRENT_WATER_WILDMONS_LABEL}, \ "def_water_wildmons {CURRENT_WATER_WILDMONS_MAP}: expected {d:WATER_WILDDATA_LENGTH} bytes" ENDM |