From 9ac2583b204998a0dc91af53a001a6a21da44ded Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 6 Jun 2018 18:49:16 -0400 Subject: [PATCH] Use dn --- data/trainers/dvs.asm | 141 ++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 73 deletions(-) diff --git a/data/trainers/dvs.asm b/data/trainers/dvs.asm index e5571cdff..20188096c 100644 --- a/data/trainers/dvs.asm +++ b/data/trainers/dvs.asm @@ -1,76 +1,71 @@ -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) - dvs 9, 10, 7, 7 ; FALKNER - dvs 8, 8, 8, 8 ; BUGSY - dvs 9, 8, 8, 8 ; WHITNEY - dvs 9, 8, 8, 8 ; MORTY - dvs 9, 8, 8, 8 ; PRYCE - dvs 9, 8, 8, 8 ; JASMINE - dvs 9, 8, 8, 8 ; CHUCK - dvs 7, 12, 13, 13 ; CLAIR - dvs 13, 13, 13, 13 ; RIVAL1 - dvs 9, 8, 8, 8 ; POKEMON_PROF - dvs 13, 12, 13, 13 ; WILL - dvs 13, 12, 13, 13 ; CAL - dvs 13, 12, 13, 13 ; BRUNO - dvs 7, 15, 13, 15 ; KAREN - dvs 13, 12, 13, 13 ; KOGA - dvs 13, 12, 13, 13 ; CHAMPION - dvs 9, 8, 8, 8 ; BROCK - dvs 7, 8, 8, 8 ; MISTY - dvs 9, 8, 8, 8 ; LT_SURGE - dvs 9, 8, 8, 8 ; SCIENTIST - dvs 7, 8, 8, 8 ; ERIKA - dvs 9, 8, 8, 8 ; YOUNGSTER - dvs 9, 8, 8, 8 ; SCHOOLBOY - dvs 9, 8, 8, 8 ; BIRD_KEEPER - dvs 5, 8, 8, 8 ; LASS - dvs 9, 8, 8, 8 ; JANINE - dvs 13, 8, 12, 8 ; COOLTRAINERM - dvs 7, 12, 12, 8 ; COOLTRAINERF - dvs 6, 9, 12, 8 ; BEAUTY - dvs 9, 8, 8, 8 ; POKEMANIAC - dvs 13, 8, 10, 8 ; GRUNTM - dvs 9, 8, 8, 8 ; GENTLEMAN - dvs 9, 8, 8, 8 ; SKIER - dvs 6, 8, 8, 8 ; TEACHER - dvs 7, 13, 8, 7 ; SABRINA - dvs 9, 8, 8, 8 ; BUG_CATCHER - dvs 9, 8, 8, 8 ; FISHER - dvs 9, 8, 8, 8 ; SWIMMERM - dvs 7, 8, 8, 8 ; SWIMMERF - dvs 9, 8, 8, 8 ; SAILOR - dvs 9, 8, 8, 8 ; SUPER_NERD - dvs 9, 8, 8, 8 ; RIVAL2 - dvs 9, 8, 8, 8 ; GUITARIST - dvs 10, 8, 8, 8 ; HIKER - dvs 9, 8, 8, 8 ; BIKER - dvs 9, 8, 8, 8 ; BLAINE - dvs 9, 8, 8, 8 ; BURGLAR - dvs 9, 8, 8, 8 ; FIREBREATHER - dvs 9, 8, 8, 8 ; JUGGLER - dvs 9, 8, 8, 8 ; BLACKBELT_T - dvs 13, 8, 10, 8 ; EXECUTIVEM - dvs 9, 8, 8, 8 ; PSYCHIC_T - dvs 6, 10, 10, 8 ; PICNICKER - dvs 9, 8, 8, 8 ; CAMPER - dvs 7, 14, 10, 8 ; EXECUTIVEF - dvs 9, 8, 8, 8 ; SAGE - dvs 7, 8, 8, 8 ; MEDIUM - dvs 9, 8, 8, 8 ; BOARDER - dvs 9, 8, 8, 8 ; POKEFANM - dvs 6, 8, 8, 10 ; KIMONO_GIRL - dvs 6, 8, 10, 8 ; TWINS - dvs 6, 13, 8, 8 ; POKEFANF - dvs 15, 13, 13, 14 ; RED - dvs 9, 13, 13, 13 ; BLUE - dvs 9, 8, 8, 8 ; OFFICER - dvs 7, 14, 10, 8 ; GRUNTF - dvs 9, 8, 8, 8 ; MYSTICALMAN + ; atk,def,spd,spc + dn 9, 10, 7, 7 ; FALKNER + dn 8, 8, 8, 8 ; BUGSY + dn 9, 8, 8, 8 ; WHITNEY + dn 9, 8, 8, 8 ; MORTY + dn 9, 8, 8, 8 ; PRYCE + dn 9, 8, 8, 8 ; JASMINE + dn 9, 8, 8, 8 ; CHUCK + dn 7, 12, 13, 13 ; CLAIR + dn 13, 13, 13, 13 ; RIVAL1 + dn 9, 8, 8, 8 ; POKEMON_PROF + dn 13, 12, 13, 13 ; WILL + dn 13, 12, 13, 13 ; CAL + dn 13, 12, 13, 13 ; BRUNO + dn 7, 15, 13, 15 ; KAREN + dn 13, 12, 13, 13 ; KOGA + dn 13, 12, 13, 13 ; CHAMPION + dn 9, 8, 8, 8 ; BROCK + dn 7, 8, 8, 8 ; MISTY + dn 9, 8, 8, 8 ; LT_SURGE + dn 9, 8, 8, 8 ; SCIENTIST + dn 7, 8, 8, 8 ; ERIKA + dn 9, 8, 8, 8 ; YOUNGSTER + dn 9, 8, 8, 8 ; SCHOOLBOY + dn 9, 8, 8, 8 ; BIRD_KEEPER + dn 5, 8, 8, 8 ; LASS + dn 9, 8, 8, 8 ; JANINE + dn 13, 8, 12, 8 ; COOLTRAINERM + dn 7, 12, 12, 8 ; COOLTRAINERF + dn 6, 9, 12, 8 ; BEAUTY + dn 9, 8, 8, 8 ; POKEMANIAC + dn 13, 8, 10, 8 ; GRUNTM + dn 9, 8, 8, 8 ; GENTLEMAN + dn 9, 8, 8, 8 ; SKIER + dn 6, 8, 8, 8 ; TEACHER + dn 7, 13, 8, 7 ; SABRINA + dn 9, 8, 8, 8 ; BUG_CATCHER + dn 9, 8, 8, 8 ; FISHER + dn 9, 8, 8, 8 ; SWIMMERM + dn 7, 8, 8, 8 ; SWIMMERF + dn 9, 8, 8, 8 ; SAILOR + dn 9, 8, 8, 8 ; SUPER_NERD + dn 9, 8, 8, 8 ; RIVAL2 + dn 9, 8, 8, 8 ; GUITARIST + dn 10, 8, 8, 8 ; HIKER + dn 9, 8, 8, 8 ; BIKER + dn 9, 8, 8, 8 ; BLAINE + dn 9, 8, 8, 8 ; BURGLAR + dn 9, 8, 8, 8 ; FIREBREATHER + dn 9, 8, 8, 8 ; JUGGLER + dn 9, 8, 8, 8 ; BLACKBELT_T + dn 13, 8, 10, 8 ; EXECUTIVEM + dn 9, 8, 8, 8 ; PSYCHIC_T + dn 6, 10, 10, 8 ; PICNICKER + dn 9, 8, 8, 8 ; CAMPER + dn 7, 14, 10, 8 ; EXECUTIVEF + dn 9, 8, 8, 8 ; SAGE + dn 7, 8, 8, 8 ; MEDIUM + dn 9, 8, 8, 8 ; BOARDER + dn 9, 8, 8, 8 ; POKEFANM + dn 6, 8, 8, 10 ; KIMONO_GIRL + dn 6, 8, 10, 8 ; TWINS + dn 6, 13, 8, 8 ; POKEFANF + dn 15, 13, 13, 14 ; RED + dn 9, 13, 13, 13 ; BLUE + dn 9, 8, 8, 8 ; OFFICER + dn 7, 14, 10, 8 ; GRUNTF + dn 9, 8, 8, 8 ; MYSTICALMAN ; 2715c