Merge branch 'master' of https://github.com/pret/pokered

data/trainers/names.asm

@@ -1,52 +1,54 @@
 TrainerNames::
-	db "YOUNGSTER@"
-	db "BUG CATCHER@"
-	db "LASS@"
-	db "SAILOR@"
-	db "JR.TRAINER♂@"
-	db "JR.TRAINER♀@"
-	db "POKéMANIAC@"
-	db "SUPER NERD@"
-	db "HIKER@"
-	db "BIKER@"
-	db "BURGLAR@"
-	db "ENGINEER@"
-	db "FISHERMAN@"
-	db "SWIMMER@"
-	db "CUE BALL@"
-	db "GAMBLER@"
-	db "BEAUTY@"
-	db "PSYCHIC@"
-	db "ROCKER@"
-	db "JUGGLER@"
-	db "TAMER@"
-	db "BIRD KEEPER@"
-	db "BLACKBELT@"
-	db "RIVAL1@"
-	db "PROF.OAK@"
-	db "CHIEF@"
-	db "SCIENTIST@"
-	db "GIOVANNI@"
-	db "ROCKET@"
-	db "COOLTRAINER♂@"
-	db "COOLTRAINER♀@"
-	db "BRUNO@"
-	db "BROCK@"
-	db "MISTY@"
-	db "LT.SURGE@"
-	db "ERIKA@"
-	db "KOGA@"
-	db "BLAINE@"
-	db "SABRINA@"
-	db "GENTLEMAN@"
-	db "RIVAL2@"
-	db "RIVAL3@"
-	db "LORELEI@"
-	db "CHANNELER@"
-	db "AGATHA@"
-	db "LANCE@"
-	db "YUJIROU@"
-	db "STUDENT@"
-	db "FIREFIGHTER@"
-	db "JUNIOR@"
-	db "JACK@"
+	list_start TrainerNames
+	li "YOUNGSTER"
+	li "BUG CATCHER"
+	li "LASS"
+	li "SAILOR"
+	li "JR.TRAINER♂"
+	li "JR.TRAINER♀"
+	li "POKéMANIAC"
+	li "SUPER NERD"
+	li "HIKER"
+	li "BIKER"
+	li "BURGLAR"
+	li "ENGINEER"
+	li "FISHERMAN"
+	li "SWIMMER"
+	li "CUE BALL"
+	li "GAMBLER"
+	li "BEAUTY"
+	li "PSYCHIC"
+	li "ROCKER"
+	li "JUGGLER"
+	li "TAMER"
+	li "BIRD KEEPER"
+	li "BLACKBELT"
+	li "RIVAL1"
+	li "PROF.OAK"
+	li "CHIEF"
+	li "SCIENTIST"
+	li "GIOVANNI"
+	li "ROCKET"
+	li "COOLTRAINER♂"
+	li "COOLTRAINER♀"
+	li "BRUNO"
+	li "BROCK"
+	li "MISTY"
+	li "LT.SURGE"
+	li "ERIKA"
+	li "KOGA"
+	li "BLAINE"
+	li "SABRINA"
+	li "GENTLEMAN"
+	li "RIVAL2"
+	li "RIVAL3"
+	li "LORELEI"
+	li "CHANNELER"
+	li "AGATHA"
+	li "LANCE"
+	li "YUJIROU"
+	li "STUDENT"
+	li "FIREFIGHTER"
+	li "JUNIOR"
+	li "JACK"
+	assert_list_length NUM_TRAINERS

data/trainers/parties.asm

@@ -1,4 +1,5 @@
 TrainerDataPointers:
+	table_width 2, TrainerDataPointers
 	dw YoungsterData
 	dw BugCatcherData
 	dw LassData
@@ -50,6 +51,7 @@ TrainerDataPointers:
 	dw FirefighterData
 	dw JuniorData
 	dw JackData
+	assert_table_length NUM_TRAINERS
 
 ; if first byte != $FF, then
 	; first byte is level (of all pokemon on this team)