Specify DVs individually

data/trainers/dvs.asm

@@ -1,72 +1,76 @@
+dvs: MACRO
+; atk, def, spd, spc
+	dn \1, \2
+	dn \3, \4
+ENDM
+
 TrainerClassDVs: ; 270d6
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
-	;  Atk  Spd
+	dvs  9, 10,  7,  7 ; FALKNER
-	;  Def  Spc
+	dvs  8,  8,  8,  8 ; BUGSY
-	db $9A, $77 ; falkner
+	dvs  9,  8,  8,  8 ; WHITNEY
-	db $88, $88 ; bugsy
+	dvs  9,  8,  8,  8 ; MORTY
-	db $98, $88 ; whitney
+	dvs  9,  8,  8,  8 ; PRYCE
-	db $98, $88 ; morty
+	dvs  9,  8,  8,  8 ; JASMINE
-	db $98, $88 ; pryce
+	dvs  9,  8,  8,  8 ; CHUCK
-	db $98, $88 ; jasmine
+	dvs  7, 12, 13, 13 ; CLAIR
-	db $98, $88 ; chuck
+	dvs 13, 13, 13, 13 ; RIVAL1
-	db $7C, $DD ; clair
+	dvs  9,  8,  8,  8 ; POKEMON_PROF
-	db $DD, $DD ; rival1
+	dvs 13, 12, 13, 13 ; WILL
-	db $98, $88 ; pokemon prof
+	dvs 13, 12, 13, 13 ; CAL
-	db $DC, $DD ; will
+	dvs 13, 12, 13, 13 ; BRUNO
-	db $DC, $DD ; cal
+	dvs  7, 15, 13, 15 ; KAREN
-	db $DC, $DD ; bruno
+	dvs 13, 12, 13, 13 ; KOGA
-	db $7F, $DF ; karen
+	dvs 13, 12, 13, 13 ; CHAMPION
-	db $DC, $DD ; koga
+	dvs  9,  8,  8,  8 ; BROCK
-	db $DC, $DD ; champion
+	dvs  7,  8,  8,  8 ; MISTY
-	db $98, $88 ; brock
+	dvs  9,  8,  8,  8 ; LT_SURGE
-	db $78, $88 ; misty
+	dvs  9,  8,  8,  8 ; SCIENTIST
-	db $98, $88 ; lt surge
+	dvs  7,  8,  8,  8 ; ERIKA
-	db $98, $88 ; scientist
+	dvs  9,  8,  8,  8 ; YOUNGSTER
-	db $78, $88 ; erika
+	dvs  9,  8,  8,  8 ; SCHOOLBOY
-	db $98, $88 ; youngster
+	dvs  9,  8,  8,  8 ; BIRD_KEEPER
-	db $98, $88 ; schoolboy
+	dvs  5,  8,  8,  8 ; LASS
-	db $98, $88 ; bird keeper
+	dvs  9,  8,  8,  8 ; JANINE
-	db $58, $88 ; lass
+	dvs 13,  8, 12,  8 ; COOLTRAINERM
-	db $98, $88 ; janine
+	dvs  7, 12, 12,  8 ; COOLTRAINERF
-	db $D8, $C8 ; cooltrainerm
+	dvs  6,  9, 12,  8 ; BEAUTY
-	db $7C, $C8 ; cooltrainerf
+	dvs  9,  8,  8,  8 ; POKEMANIAC
-	db $69, $C8 ; beauty
+	dvs 13,  8, 10,  8 ; GRUNTM
-	db $98, $88 ; pokemaniac
+	dvs  9,  8,  8,  8 ; GENTLEMAN
-	db $D8, $A8 ; gruntm
+	dvs  9,  8,  8,  8 ; SKIER
-	db $98, $88 ; gentleman
+	dvs  6,  8,  8,  8 ; TEACHER
-	db $98, $88 ; skier
+	dvs  7, 13,  8,  7 ; SABRINA
-	db $68, $88 ; teacher
+	dvs  9,  8,  8,  8 ; BUG_CATCHER
-	db $7D, $87 ; sabrina
+	dvs  9,  8,  8,  8 ; FISHER
-	db $98, $88 ; bug catcher
+	dvs  9,  8,  8,  8 ; SWIMMERM
-	db $98, $88 ; fisher
+	dvs  7,  8,  8,  8 ; SWIMMERF
-	db $98, $88 ; swimmerm
+	dvs  9,  8,  8,  8 ; SAILOR
-	db $78, $88 ; swimmerf
+	dvs  9,  8,  8,  8 ; SUPER_NERD
-	db $98, $88 ; sailor
+	dvs  9,  8,  8,  8 ; RIVAL2
-	db $98, $88 ; super nerd
+	dvs  9,  8,  8,  8 ; GUITARIST
-	db $98, $88 ; rival2
+	dvs 10,  8,  8,  8 ; HIKER
-	db $98, $88 ; guitarist
+	dvs  9,  8,  8,  8 ; BIKER
-	db $A8, $88 ; hiker
+	dvs  9,  8,  8,  8 ; BLAINE
-	db $98, $88 ; biker
+	dvs  9,  8,  8,  8 ; BURGLAR
-	db $98, $88 ; blaine
+	dvs  9,  8,  8,  8 ; FIREBREATHER
-	db $98, $88 ; burglar
+	dvs  9,  8,  8,  8 ; JUGGLER
-	db $98, $88 ; firebreather
+	dvs  9,  8,  8,  8 ; BLACKBELT_T
-	db $98, $88 ; juggler
+	dvs 13,  8, 10,  8 ; EXECUTIVEM
-	db $98, $88 ; blackbelt
+	dvs  9,  8,  8,  8 ; PSYCHIC_T
-	db $D8, $A8 ; executivem
+	dvs  6, 10, 10,  8 ; PICNICKER
-	db $98, $88 ; psychic
+	dvs  9,  8,  8,  8 ; CAMPER
-	db $6A, $A8 ; picnicker
+	dvs  7, 14, 10,  8 ; EXECUTIVEF
-	db $98, $88 ; camper
+	dvs  9,  8,  8,  8 ; SAGE
-	db $7E, $A8 ; executivef
+	dvs  7,  8,  8,  8 ; MEDIUM
-	db $98, $88 ; sage
+	dvs  9,  8,  8,  8 ; BOARDER
-	db $78, $88 ; medium
+	dvs  9,  8,  8,  8 ; POKEFANM
-	db $98, $88 ; boarder
+	dvs  6,  8,  8, 10 ; KIMONO_GIRL
-	db $98, $88 ; pokefanm
+	dvs  6,  8, 10,  8 ; TWINS
-	db $68, $8A ; kimono girl
+	dvs  6, 13,  8,  8 ; POKEFANF
-	db $68, $A8 ; twins
+	dvs 15, 13, 13, 14 ; RED
-	db $6D, $88 ; pokefanf
+	dvs  9, 13, 13, 13 ; BLUE
-	db $FD, $DE ; red
+	dvs  9,  8,  8,  8 ; OFFICER
-	db $9D, $DD ; blue
+	dvs  7, 14, 10,  8 ; GRUNTF
-	db $98, $88 ; officer
+	dvs  9,  8,  8,  8 ; MYSTICALMAN
-	db $7E, $A8 ; gruntf
-	db $98, $88 ; mysticalman
 ; 2715c