You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Verify data table sizes with table_width and assert_table_length macros
This was discussed in #706 It also uncovered some off-by-one issues with defining some constants. A few structs now use rsreset/_RS to define their offset constants, as discussed in #739
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
TypeNames:
|
||||
; entries correspond to types (see constants/type_constants.asm)
|
||||
table_width 2, TypeNames
|
||||
dw Normal
|
||||
dw Fighting
|
||||
dw Flying
|
||||
@@ -10,6 +11,7 @@ TypeNames:
|
||||
dw Bug
|
||||
dw Ghost
|
||||
dw Steel
|
||||
assert_table_length UNUSED_TYPES
|
||||
dw Normal
|
||||
dw Normal
|
||||
dw Normal
|
||||
@@ -20,6 +22,7 @@ TypeNames:
|
||||
dw Normal
|
||||
dw Normal
|
||||
dw CurseType
|
||||
assert_table_length UNUSED_TYPES_END
|
||||
dw Fire
|
||||
dw Water
|
||||
dw Grass
|
||||
@@ -28,6 +31,7 @@ TypeNames:
|
||||
dw Ice
|
||||
dw Dragon
|
||||
dw Dark
|
||||
assert_table_length TYPES_END
|
||||
|
||||
Normal: db "NORMAL@"
|
||||
Fighting: db "FIGHTING@"
|
||||
|
@@ -1,5 +1,6 @@
|
||||
PokedexTypeSearchStrings:
|
||||
; entries correspond with PokedexTypeSearchConversionTable (see data/types/search_types.asm)
|
||||
table_width POKEDEX_TYPE_STRING_LENGTH, PokedexTypeSearchStrings
|
||||
db " ---- @"
|
||||
db " NORMAL @"
|
||||
db " FIRE @"
|
||||
@@ -18,3 +19,4 @@ PokedexTypeSearchStrings:
|
||||
db " DRAGON @"
|
||||
db " DARK @"
|
||||
db " STEEL @"
|
||||
assert_table_length NUM_TYPES + 1
|
||||
|
@@ -1,5 +1,6 @@
|
||||
PokedexTypeSearchConversionTable:
|
||||
; entries correspond with PokedexTypeSearchStrings (see data/types/search_strings.asm)
|
||||
table_width 1, PokedexTypeSearchConversionTable
|
||||
db NORMAL
|
||||
db FIRE
|
||||
db WATER
|
||||
@@ -17,3 +18,4 @@ PokedexTypeSearchConversionTable:
|
||||
db DRAGON
|
||||
db DARK
|
||||
db STEEL
|
||||
assert_table_length NUM_TYPES
|
||||
|
Reference in New Issue
Block a user