Verify uneven list sizes with list_start, li, and assert_list_length macros

1 files changed, 68 insertions, 66 deletions

diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm
index ea68f2f4..3f385d7f 100644
--- a/data/trainers/class_names.asm
+++ b/data/trainers/class_names.asm
@@ -1,68 +1,70 @@
 TrainerClassNames::
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "RIVAL@"
-	db "#MON PROF.@"
-	db "ELITE FOUR@"
-	db "<PKMN> TRAINER@"
-	db "ELITE FOUR@"
-	db "ELITE FOUR@"
-	db "ELITE FOUR@"
-	db "CHAMPION@"
-	db "LEADER@"
-	db "LEADER@"
-	db "LEADER@"
-	db "SCIENTIST@"
-	db "LEADER@"
-	db "YOUNGSTER@"
-	db "SCHOOLBOY@"
-	db "BIRD KEEPER@"
-	db "LASS@"
-	db "LEADER@"
-	db "COOLTRAINER@"
-	db "COOLTRAINER@"
-	db "BEAUTY@"
-	db "#MANIAC@"
-	db "ROCKET@"
-	db "GENTLEMAN@"
-	db "SKIER@"
-	db "TEACHER@"
-	db "LEADER@"
-	db "BUG CATCHER@"
-	db "FISHER@"
-	db "SWIMMER♂@"
-	db "SWIMMER♀@"
-	db "SAILOR@"
-	db "SUPER NERD@"
-	db "RIVAL@"
-	db "GUITARIST@"
-	db "HIKER@"
-	db "BIKER@"
-	db "LEADER@"
-	db "BURGLAR@"
-	db "FIREBREATHER@"
-	db "JUGGLER@"
-	db "BLACKBELT@"
-	db "ROCKET@"
-	db "PSYCHIC@"
-	db "PICNICKER@"
-	db "CAMPER@"
-	db "ROCKET@"
-	db "SAGE@"
-	db "MEDIUM@"
-	db "BOARDER@"
-	db "#FAN@"
-	db "KIMONO GIRL@"
-	db "TWINS@"
-	db "#FAN@"
-	db "<PKMN> TRAINER@"
-	db "LEADER@"
-	db "OFFICER@"
-	db "ROCKET@"
+	list_start TrainerClassNames
+	li "LEADER"
+	li "LEADER"
+	li "LEADER"
+	li "LEADER"
+	li "LEADER"
+	li "LEADER"
+	li "LEADER"
+	li "LEADER"
+	li "RIVAL"
+	li "#MON PROF."
+	li "ELITE FOUR"
+	li "<PKMN> TRAINER"
+	li "ELITE FOUR"
+	li "ELITE FOUR"
+	li "ELITE FOUR"
+	li "CHAMPION"
+	li "LEADER"
+	li "LEADER"
+	li "LEADER"
+	li "SCIENTIST"
+	li "LEADER"
+	li "YOUNGSTER"
+	li "SCHOOLBOY"
+	li "BIRD KEEPER"
+	li "LASS"
+	li "LEADER"
+	li "COOLTRAINER"
+	li "COOLTRAINER"
+	li "BEAUTY"
+	li "#MANIAC"
+	li "ROCKET"
+	li "GENTLEMAN"
+	li "SKIER"
+	li "TEACHER"
+	li "LEADER"
+	li "BUG CATCHER"
+	li "FISHER"
+	li "SWIMMER♂"
+	li "SWIMMER♀"
+	li "SAILOR"
+	li "SUPER NERD"
+	li "RIVAL"
+	li "GUITARIST"
+	li "HIKER"
+	li "BIKER"
+	li "LEADER"
+	li "BURGLAR"
+	li "FIREBREATHER"
+	li "JUGGLER"
+	li "BLACKBELT"
+	li "ROCKET"
+	li "PSYCHIC"
+	li "PICNICKER"
+	li "CAMPER"
+	li "ROCKET"
+	li "SAGE"
+	li "MEDIUM"
+	li "BOARDER"
+	li "#FAN"
+	li "KIMONO GIRL"
+	li "TWINS"
+	li "#FAN"
+	li "<PKMN> TRAINER"
+	li "LEADER"
+	li "OFFICER"
+	li "ROCKET"
+	assert_list_length NUM_TRAINER_CLASSES