Say how many bytes the assertion macros expected vs got

Author: Rangi42

macros/asserts.asm

@@ -27,9 +27,11 @@ MACRO table_width
 ENDM
 
 MACRO assert_table_length
-	DEF x = \1
-	assert x * CURRENT_TABLE_WIDTH == @ - {CURRENT_TABLE_START}, \
-		"{CURRENT_TABLE_START}: expected {d:x} entries, each {d:CURRENT_TABLE_WIDTH} bytes"
+	DEF w = \1
+	DEF x = w * CURRENT_TABLE_WIDTH
+	DEF y = @ - {CURRENT_TABLE_START}
+	assert x == y, "{CURRENT_TABLE_START}: expected {d:w} entries, each {d:CURRENT_TABLE_WIDTH} " ++ \
+		"bytes, for {d:x} total; but got {d:y} bytes"
 ENDM
 
 MACRO list_start
@@ -58,8 +60,9 @@ MACRO def_grass_wildmons
 ENDM
 
 MACRO end_grass_wildmons
-	assert GRASS_WILDDATA_LENGTH == @ - {CURRENT_GRASS_WILDMONS_LABEL}, \
-		"def_grass_wildmons {CURRENT_GRASS_WILDMONS_MAP}: expected {d:GRASS_WILDDATA_LENGTH} bytes"
+	DEF x = @ - {CURRENT_GRASS_WILDMONS_LABEL}
+	assert GRASS_WILDDATA_LENGTH == x, \
+		"def_grass_wildmons {CURRENT_GRASS_WILDMONS_MAP}: expected {d:GRASS_WILDDATA_LENGTH} bytes, got {d:x}"
 ENDM
 
 MACRO def_water_wildmons
@@ -71,6 +74,7 @@ MACRO def_water_wildmons
 ENDM
 
 MACRO end_water_wildmons
-	assert WATER_WILDDATA_LENGTH == @ - {CURRENT_WATER_WILDMONS_LABEL}, \
-		"def_water_wildmons {CURRENT_WATER_WILDMONS_MAP}: expected {d:WATER_WILDDATA_LENGTH} bytes"
+	DEF x = @ - {CURRENT_WATER_WILDMONS_LABEL}
+	assert WATER_WILDDATA_LENGTH == x, \
+		"def_water_wildmons {CURRENT_WATER_WILDMONS_MAP}: expected {d:WATER_WILDDATA_LENGTH} bytes, got {d:x}"
 ENDM