Use constants for max IVs & the random IV generation flag

1 files changed, 345 insertions, 345 deletions

diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h
index 1b41024d0..d8bd57576 100644
--- a/src/data/battle_frontier/trainer_hill.h
+++ b/src/data/battle_frontier/trainer_hill.h
@@ -1244,12 +1244,12 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
                         .attackEV = 252,
                         .speedEV = 252,
                         .otId = TRAINER_HILL_OTID,
-                        .hpIV = 31,
-                        .attackIV = 31,
-                        .defenseIV = 31,
-                        .speedIV = 31,
-                        .spAttackIV = 31,
-                        .spDefenseIV = 31,
+                        .hpIV = MAX_PER_STAT_IVS,
+                        .attackIV = MAX_PER_STAT_IVS,
+                        .defenseIV = MAX_PER_STAT_IVS,
+                        .speedIV = MAX_PER_STAT_IVS,
+                        .spAttackIV = MAX_PER_STAT_IVS,
+                        .spDefenseIV = MAX_PER_STAT_IVS,
                         .abilityNum = 0,
                         .personality = 0xCB,
                         .nickname = _("SKITTY"),
@@ -2717,11 +2717,11 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
                                             .hpIV = 30,
-                                            .attackIV = 31,
+                                            .attackIV = MAX_PER_STAT_IVS,
                                             .defenseIV = 30,
-                                            .speedIV = 31,
+                                            .speedIV = MAX_PER_STAT_IVS,
                                             .spAttackIV = 30,
-                                            .spDefenseIV = 31,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x202,
                                             .nickname = _("UNOWN"),
@@ -2738,11 +2738,11 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
                                             .hpIV = 30,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
                                             .speedIV = 30,
                                             .spAttackIV = 30,
-                                            .spDefenseIV = 31,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x10001,
                                             .nickname = _("UNOWN"),
@@ -2921,11 +2921,11 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
                                             .hpIV = 30,
-                                            .attackIV = 31,
+                                            .attackIV = MAX_PER_STAT_IVS,
                                             .defenseIV = 30,
                                             .speedIV = 30,
                                             .spAttackIV = 30,
-                                            .spDefenseIV = 31,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x302,
                                             .nickname = _("UNOWN"),
@@ -2941,10 +2941,10 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                                             .hpEV = 255,
                                             .attackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
                                             .attackIV = 30,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
                                             .spAttackIV = 30,
                                             .spDefenseIV = 30,
                                             .abilityNum = 0,
@@ -2962,12 +2962,12 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                                             .hpEV = 255,
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
                                             .defenseIV = 30,
                                             .speedIV = 30,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x301,
                                             .nickname = _("UNOWN"),
@@ -3820,12 +3820,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x32,
                                             .nickname = _("SMOOCHUM"),
@@ -3842,12 +3842,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0xC8,
                                             .nickname = _("AZURILL"),
@@ -3864,12 +3864,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x0,
                                             .nickname = _("ELEKID"),
@@ -3886,12 +3886,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                                             .attackEV = 252,
                                             .speedEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x0,
                                             .nickname = _("CLEFFA"),
@@ -3908,12 +3908,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                                             .defenseEV = 130,
                                             .spDefenseEV = 130,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x84,
                                             .nickname = _("WYNAUT"),
@@ -3930,12 +3930,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0xF,
                                             .nickname = _("MAGBY"),
@@ -4319,12 +4319,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .defenseEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x35,
                                             .nickname = _("SNORLAX"),
@@ -4341,12 +4341,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .speedEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x3,
                                             .nickname = _("MILTANK"),
@@ -4363,12 +4363,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .spAttackEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x7F,
                                             .nickname = _("URSARING"),
@@ -4385,12 +4385,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .spDefenseEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x80,
                                             .nickname = _("SLAKING"),
@@ -4407,12 +4407,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .speedEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x3,
                                             .nickname = _("KANGASKHAN"),
@@ -4429,12 +4429,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .speedEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x80,
                                             .nickname = _("ZANGOOSE"),
@@ -4464,12 +4464,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 110,
                                             .spAttackEV = 200,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 1,
                                             .personality = 0xF,
                                             .nickname = _("SLOWKING"),
@@ -4486,12 +4486,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x28,
                                             .nickname = _("ESPEON"),
@@ -4508,12 +4508,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 1,
                                             .personality = 0xF,
                                             .nickname = _("STARMIE"),
@@ -4530,12 +4530,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0xF,
                                             .nickname = _("GENGAR"),
@@ -4552,12 +4552,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0xF,
                                             .nickname = _("GARDEVOIR"),
@@ -4574,12 +4574,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0xF,
                                             .nickname = _("ALAKAZAM"),
@@ -4641,12 +4641,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .spDefenseEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x3,
                                             .nickname = _("SWELLOW"),
@@ -4663,12 +4663,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .spDefenseEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x3,
                                             .nickname = _("MACHAMP"),
@@ -4685,12 +4685,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .spDefenseEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x3,
                                             .nickname = _("URSARING"),
@@ -4707,12 +4707,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .spDefenseEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x80,
                                             .nickname = _("KINGLER"),
@@ -4729,12 +4729,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .defenseEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x80,
                                             .nickname = _("TYRANITAR"),
@@ -4751,12 +4751,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .spDefenseEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x80,
                                             .nickname = _("DRAGONITE"),
@@ -4786,12 +4786,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0xA,
                                             .nickname = _("JOLTEON"),
@@ -4808,12 +4808,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0xA,
                                             .nickname = _("ALAKAZAM"),
@@ -4830,12 +4830,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 1,
                                             .personality = 0xA,
                                             .nickname = _("STARMIE"),
@@ -4852,12 +4852,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 252,
                                             .spDefenseEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x82,
                                             .nickname = _("DUSCLOPS"),
@@ -4874,12 +4874,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0xD2,
                                             .nickname = _("NINETALES"),
@@ -4896,12 +4896,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 252,
                                             .spDefenseEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x85,
                                             .nickname = _("BANETTE"),
@@ -4963,12 +4963,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 130,
                                             .spDefenseEV = 130,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x94,
                                             .nickname = _("WOBBUFFET"),
@@ -4985,12 +4985,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 130,
                                             .spDefenseEV = 130,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x85,
                                             .nickname = _("EXPLOUD"),
@@ -5007,12 +5007,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 130,
                                             .spDefenseEV = 130,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x0,
                                             .nickname = _("CROBAT"),
@@ -5029,12 +5029,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 252,
                                             .speedEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 1,
                                             .personality = 0xD,
                                             .nickname = _("DUGTRIO"),
@@ -5051,12 +5051,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 252,
                                             .spAttackEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x5,
                                             .nickname = _("ELECTRODE"),
@@ -5073,12 +5073,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spDefenseEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x14,
                                             .nickname = _("GENGAR"),
@@ -5108,12 +5108,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 130,
                                             .spDefenseEV = 130,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x82,
                                             .nickname = _("LAPRAS"),
@@ -5130,12 +5130,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 6,
                                             .speedEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x8A,
                                             .nickname = _("ABSOL"),
@@ -5152,12 +5152,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .spAttackEV = 6,
                                             .spDefenseEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x0,
                                             .nickname = _("ALTARIA"),
@@ -5174,12 +5174,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 252,
                                             .spAttackEV = 6,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x14,
                                             .nickname = _("DEWGONG"),
@@ -5196,12 +5196,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .spAttackEV = 6,
                                             .spDefenseEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 1,
                                             .personality = 0x14,
                                             .nickname = _("POLITOED"),
@@ -5218,12 +5218,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 6,
                                             .spDefenseEV = 252,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 1,
                                             .personality = 0x17,
                                             .nickname = _("MAROWAK"),
@@ -5285,12 +5285,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 200,
                                             .spDefenseEV = 200,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x3,
                                             .nickname = _("FORRETRESS"),
@@ -5306,12 +5306,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 255,
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 1,
                                             .personality = 0xC,
                                             .nickname = _("ELECTRODE"),
@@ -5327,12 +5327,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 255,
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x7F,
                                             .nickname = _("EXEGGUTOR"),
@@ -5349,12 +5349,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 200,
                                             .spDefenseEV = 200,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x93,
                                             .nickname = _("DUSCLOPS"),
@@ -5370,12 +5370,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 255,
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0xF,
                                             .nickname = _("NINETALES"),
@@ -5391,12 +5391,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .hpEV = 255,
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x96,
                                             .nickname = _("BANETTE"),
@@ -5425,12 +5425,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 255,
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x95,
                                             .nickname = _("SALAMENCE"),
@@ -5446,12 +5446,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .speedEV = 255,
                                             .spAttackEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x8C,
                                             .nickname = _("GENGAR"),
@@ -5467,12 +5467,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 255,
                                             .speedEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x3,
                                             .nickname = _("GYARADOS"),
@@ -5488,12 +5488,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .attackEV = 255,
                                             .speedEV = 255,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x3,
                                             .nickname = _("GENGAR"),
@@ -5510,12 +5510,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 200,
                                             .spDefenseEV = 200,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x14,
                                             .nickname = _("DUSCLOPS"),
@@ -5532,12 +5532,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                                             .defenseEV = 180,
                                             .spDefenseEV = 150,
                                             .otId = TRAINER_HILL_OTID,
-                                            .hpIV = 31,
-                                            .attackIV = 31,
-                                            .defenseIV = 31,
-                                            .speedIV = 31,
-                                            .spAttackIV = 31,
-                                            .spDefenseIV = 31,
+                                            .hpIV = MAX_PER_STAT_IVS,
+                                            .attackIV = MAX_PER_STAT_IVS,
+                                            .defenseIV = MAX_PER_STAT_IVS,
+                                            .speedIV = MAX_PER_STAT_IVS,
+                                            .spAttackIV = MAX_PER_STAT_IVS,
+                                            .spDefenseIV = MAX_PER_STAT_IVS,
                                             .abilityNum = 0,
                                             .personality = 0x85,
                                             .nickname = _("MISDREAVUS"),