diff options
Diffstat (limited to 'data/trainers')
| -rw-r--r-- | data/trainers/attributes.asm | 3 | ||||
| -rw-r--r-- | data/trainers/dvs.asm | 2 | ||||
| -rw-r--r-- | data/trainers/encounter_music.asm | 8 | ||||
| -rw-r--r-- | data/trainers/genders.asm | 2 | ||||
| -rw-r--r-- | data/trainers/palettes.asm | 4 | ||||
| -rw-r--r-- | data/trainers/party_pointers.asm | 2 | ||||
| -rw-r--r-- | data/trainers/pic_pointers.asm | 2 | ||||
| -rw-r--r-- | data/trainers/sprites.asm | 2 |
8 files changed, 22 insertions, 3 deletions
diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm index 67d852d83..70544977d 100644 --- a/data/trainers/attributes.asm +++ b/data/trainers/attributes.asm @@ -1,5 +1,6 @@ TrainerClassAttributes: ; entries correspond to trainer classes (see constants/trainer_constants.asm) + table_width NUM_TRAINER_ATTRIBUTES, TrainerClassAttributes ; Falkner db NO_ITEM, NO_ITEM ; items @@ -402,3 +403,5 @@ TrainerClassAttributes: db 25 ; base reward dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY dw CONTEXT_USE | SWITCH_SOMETIMES + + assert_table_length NUM_TRAINER_CLASSES diff --git a/data/trainers/dvs.asm b/data/trainers/dvs.asm index 91918b4d9..12bba0da6 100644 --- a/data/trainers/dvs.asm +++ b/data/trainers/dvs.asm @@ -1,5 +1,6 @@ TrainerClassDVs: ; entries correspond to trainer classes (see constants/trainer_constants.asm) + table_width 2, TrainerClassDVs ; atk,def,spd,spc dn 9, 10, 7, 7 ; FALKNER dn 8, 8, 8, 8 ; WHITNEY @@ -68,3 +69,4 @@ TrainerClassDVs: dn 9, 8, 8, 8 ; OFFICER dn 7, 14, 10, 8 ; GRUNTF dn 9, 8, 8, 8 ; MYSTICALMAN + assert_table_length NUM_TRAINER_CLASSES diff --git a/data/trainers/encounter_music.asm b/data/trainers/encounter_music.asm index a64d160fe..026646952 100644 --- a/data/trainers/encounter_music.asm +++ b/data/trainers/encounter_music.asm @@ -2,6 +2,7 @@ TrainerEncounterMusic:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) + table_width 1, TrainerEncounterMusic db MUSIC_HIKER_ENCOUNTER ; none db MUSIC_YOUNGSTER_ENCOUNTER ; falkner db MUSIC_LASS_ENCOUNTER ; whitney @@ -70,6 +71,7 @@ TrainerEncounterMusic:: db MUSIC_HIKER_ENCOUNTER ; officer db MUSIC_ROCKET_ENCOUNTER ; gruntf db MUSIC_HIKER_ENCOUNTER ; mysticalman - db MUSIC_HIKER_ENCOUNTER - db MUSIC_HIKER_ENCOUNTER - db MUSIC_HIKER_ENCOUNTER + assert_table_length NUM_TRAINER_CLASSES + 1 + db MUSIC_HIKER_ENCOUNTER ; unused + db MUSIC_HIKER_ENCOUNTER ; unused + db MUSIC_HIKER_ENCOUNTER ; unused diff --git a/data/trainers/genders.asm b/data/trainers/genders.asm index 1bfc925d2..230b29205 100644 --- a/data/trainers/genders.asm +++ b/data/trainers/genders.asm @@ -2,6 +2,7 @@ BTTrainerClassGenders: ; entries correspond to trainer classes + table_width 1, BTTrainerClassGenders db MALE ; FALKNER db FEMALE ; WHITNEY db FEMALE ; BUGSY @@ -68,3 +69,4 @@ BTTrainerClassGenders: db MALE ; BLUE db MALE ; OFFICER db FEMALE ; GRUNTF + assert_table_length NUM_TRAINER_CLASSES - 1 ; exclude MYSTICALMAN diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index abbe519ca..342999647 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -4,6 +4,8 @@ TrainerPalettes: ; Each .gbcpal is generated from the corresponding .png, and ; only the middle two colors are included, not black or white. + table_width PAL_COLOR_SIZE * 2, TrainerPalettes + PlayerPalette: ; Chris uses the same colors as Cal INCBIN "gfx/trainers/cal.gbcpal", middle_colors KrisPalette: ; Kris shares Falkner's palette @@ -74,3 +76,5 @@ INCBIN "gfx/trainers/blue.gbcpal", middle_colors INCBIN "gfx/trainers/officer.gbcpal", middle_colors INCBIN "gfx/trainers/grunt_f.gbcpal", middle_colors INCBIN "gfx/trainers/mysticalman.gbcpal", middle_colors + + assert_table_length NUM_TRAINER_CLASSES + 1 diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm index 45ba65b85..985e81ca4 100644 --- a/data/trainers/party_pointers.asm +++ b/data/trainers/party_pointers.asm @@ -2,6 +2,7 @@ TrainerGroups: ; entries correspond to trainer classes (see constants/trainer_constants.asm) + table_width 2, TrainerGroups dw FalknerGroup dw WhitneyGroup dw BugsyGroup @@ -69,3 +70,4 @@ TrainerGroups: dw OfficerGroup dw GruntFGroup dw MysticalmanGroup + assert_table_length NUM_TRAINER_CLASSES diff --git a/data/trainers/pic_pointers.asm b/data/trainers/pic_pointers.asm index 6fc444eb6..31740ea3d 100644 --- a/data/trainers/pic_pointers.asm +++ b/data/trainers/pic_pointers.asm @@ -2,6 +2,7 @@ TrainerPicPointers:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) + table_width 3, TrainerPicPointers dba_pic FalknerPic dba_pic WhitneyPic dba_pic BugsyPic @@ -69,3 +70,4 @@ TrainerPicPointers:: dba_pic OfficerPic dba_pic GruntfPic dba_pic MysticalmanPic + assert_table_length NUM_TRAINER_CLASSES diff --git a/data/trainers/sprites.asm b/data/trainers/sprites.asm index b92a9032c..cf2f59961 100644 --- a/data/trainers/sprites.asm +++ b/data/trainers/sprites.asm @@ -1,5 +1,6 @@ BTTrainerClassSprites: ; entries correspond to trainer classes + table_width 1, BTTrainerClassSprites db SPRITE_FALKNER db SPRITE_WHITNEY db SPRITE_BUGSY @@ -66,3 +67,4 @@ BTTrainerClassSprites: db SPRITE_BLUE db SPRITE_OFFICER db SPRITE_ROCKET_GIRL + assert_table_length NUM_TRAINER_CLASSES - 1 ; exclude MYSTICALMAN |