summaryrefslogtreecommitdiff
path: root/constants/trainer_constants.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-03-03 22:22:41 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-03-05 16:10:25 -0500
commit5454e1e0deefc6b4fc8c4de0e63314052fceebc0 (patch)
tree565805b252fa596aab3f80b3128ebc91b1fae540 /constants/trainer_constants.asm
parentb423e94be700cc6434465cf1dcccf0b677489192 (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 'constants/trainer_constants.asm')
-rw-r--r--constants/trainer_constants.asm3
1 files changed, 2 insertions, 1 deletions
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index f849f0d3..f9f56461 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -22,6 +22,7 @@ CHRIS EQU __trainer_class__
const PHONECONTACT_BIKESHOP
const PHONECONTACT_BILL
const PHONECONTACT_ELM
+NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
trainerclass FALKNER ; 1
const FALKNER1
@@ -656,4 +657,4 @@ CHRIS EQU __trainer_class__
const GRUNTF_4
const GRUNTF_5
-NUM_TRAINER_CLASSES EQU __trainer_class__
+NUM_TRAINER_CLASSES EQU __trainer_class__ - 1