diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-03 22:22:41 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-05 16:10:25 -0500 |
| commit | 5454e1e0deefc6b4fc8c4de0e63314052fceebc0 (patch) | |
| tree | 565805b252fa596aab3f80b3128ebc91b1fae540 /engine/pokedex | |
| parent | b423e94be700cc6434465cf1dcccf0b677489192 (diff) | |
Verify data table sizes with table_width and assert_table_length macros
It also uncovered some off-by-one issues with defining some constants.
A few structs now use rsreset/_RS to define their offset constants.
Diffstat (limited to 'engine/pokedex')
| -rw-r--r-- | engine/pokedex/pokedex.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index d4933646..a895f357 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -1805,7 +1805,7 @@ Pokedex_PrevSearchMonType: jr .done .wrap_around - ld [hl], NUM_TYPES - 1 + ld [hl], NUM_TYPES .done scf @@ -1818,7 +1818,7 @@ Pokedex_NextSearchMonType: ld hl, wDexSearchMonType1 ld a, [hl] - cp NUM_TYPES - 1 + cp NUM_TYPES jr nc, .type1_wrap_around inc [hl] jr .done @@ -1829,7 +1829,7 @@ Pokedex_NextSearchMonType: .type2 ld hl, wDexSearchMonType2 ld a, [hl] - cp NUM_TYPES - 1 + cp NUM_TYPES jr nc, .type2_wrap_around inc [hl] jr .done @@ -1862,7 +1862,7 @@ Pokedex_PlaceTypeString: ld e, a ld d, 0 ld hl, PokedexTypeSearchStrings -rept 9 +rept POKEDEX_TYPE_STRING_LENGTH add hl, de endr ld e, l |