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-04 00:15:03 -0500
commit40902ffe244544d638567642e4e01b9c5801db23 (patch)
tree4abf9ac20786fdf66bb298b3ec7935cef2c71d07 /constants/trainer_constants.asm
parent9c17fb14c8068d6662b9ca1cb048ed206b6770ee (diff)
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
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 80231fb67..d71df38e1 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -25,6 +25,7 @@ CHRIS EQU __trainer_class__
const PHONECONTACT_BILL
const PHONECONTACT_ELM
const PHONECONTACT_BUENA
+NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
KRIS EQU __trainer_class__
trainerclass FALKNER ; 1
@@ -702,4 +703,4 @@ KRIS EQU __trainer_class__
trainerclass MYSTICALMAN ; 43
const EUSINE
-NUM_TRAINER_CLASSES EQU __trainer_class__
+NUM_TRAINER_CLASSES EQU __trainer_class__ - 1