diff options
| author | dannye <33dannye@gmail.com> | 2025-09-06 16:54:17 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-09-06 16:54:17 -0500 |
| commit | 377749ca4efac05b6c57dfed049899891af6c35a (patch) | |
| tree | 4b429403935c4a7c2de710a6cbf7310246874539 /macros/asserts.asm | |
| parent | Fix .tilemap file extension, fix some typos (#138) (diff) | |
| parent | Document visual glitch with Pewter City Gym guy (#526) (diff) | |
| download | pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.gz pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.xz pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'macros/asserts.asm')
| -rw-r--r-- | macros/asserts.asm | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/macros/asserts.asm b/macros/asserts.asm index 7ca47892..7b41a654 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -27,15 +27,19 @@ 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 assert_max_table_length - DEF x = \1 - ASSERT x * CURRENT_TABLE_WIDTH >= @ - {CURRENT_TABLE_START}, \ - "{CURRENT_TABLE_START}: expected a maximum of {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 a maximum of {d:w} entries, each " ++ \ + "{d:CURRENT_TABLE_WIDTH} bytes, for maximum {d:x} total; but got {d:y} bytes" ENDM MACRO list_start @@ -134,12 +138,13 @@ MACRO def_grass_wildmons ENDM MACRO end_grass_wildmons + DEF x = @ - {CURRENT_GRASS_WILDMONS_LABEL} IF CURRENT_GRASS_WILDMONS_RATE == 0 - ASSERT 1 == @ - {CURRENT_GRASS_WILDMONS_LABEL}, \ - "def_grass_wildmons {d:CURRENT_GRASS_WILDMONS_RATE}: expected 1 byte" + ASSERT 1 == x, \ + "def_grass_wildmons {d:CURRENT_GRASS_WILDMONS_RATE}: expected 1 byte, got {d:x}" ELSE - ASSERT WILDDATA_LENGTH == @ - {CURRENT_GRASS_WILDMONS_LABEL}, \ - "def_grass_wildmons {d:CURRENT_GRASS_WILDMONS_RATE}: expected {d:WILDDATA_LENGTH} bytes" + ASSERT WILDDATA_LENGTH == x, \ + "def_grass_wildmons {d:CURRENT_GRASS_WILDMONS_RATE}: expected {d:WILDDATA_LENGTH} bytes, got {d:x}" ENDC ENDM @@ -152,11 +157,12 @@ MACRO def_water_wildmons ENDM MACRO end_water_wildmons + DEF x = @ - {CURRENT_WATER_WILDMONS_LABEL} IF CURRENT_WATER_WILDMONS_RATE == 0 - ASSERT 1 == @ - {CURRENT_WATER_WILDMONS_LABEL}, \ - "def_water_wildmons {d:CURRENT_WATER_WILDMONS_RATE}: expected 1 byte" + ASSERT 1 == x, \ + "def_water_wildmons {d:CURRENT_WATER_WILDMONS_RATE}: expected 1 byte, got {d:x}" ELSE - ASSERT WILDDATA_LENGTH == @ - {CURRENT_WATER_WILDMONS_LABEL}, \ - "def_water_wildmons {d:CURRENT_WATER_WILDMONS_RATE}: expected {d:WILDDATA_LENGTH} bytes" + ASSERT WILDDATA_LENGTH == x, \ + "def_water_wildmons {d:CURRENT_WATER_WILDMONS_RATE}: expected {d:WILDDATA_LENGTH} bytes, got {d:x}" ENDC ENDM |