diff options
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/battle_frontier/trainer_hill.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h index fe98477b9..f38cfcc38 100644 --- a/src/data/battle_frontier/trainer_hill.h +++ b/src/data/battle_frontier/trainer_hill.h @@ -1,14 +1,14 @@ #define TRAINER_HILL_OTID 0x10000000 -static const struct TrHillTag sDataTagEReader = { - .trainerType = HILL_TRAINER_TYPE_EREADER, +static const struct TrHillTag sDataTagJPDefault = { + .numTrainers = NUM_TRAINER_HILL_TRAINERS_JP, .unused1 = 1, - .numFloors = 2, + .numFloors = NUM_TRAINER_HILL_FLOORS_JP, .checksum = 0x0 }; -// In the JP Version of Trainer Hill, if there was an odd number of E-Reader trainers then one would be paired with an NPC -static const struct TrHillFloor sDataTagEReader_Floors[] = { + +static const struct TrHillFloor sDataTagJPDefault_Floors[] = { [0] = { .trainerNum1 = 0, .trainerNum2 = 0, @@ -383,9 +383,9 @@ static const struct TrHillFloor sDataTagEReader_Floors[] = { static const struct TrHillTag sDataTagNormal = { - .trainerType = HILL_TRAINER_TYPE_NPC, + .numTrainers = NUM_TRAINER_HILL_TRAINERS, .unused1 = 2, - .numFloors = 4, + .numFloors = NUM_TRAINER_HILL_FLOORS, .checksum = 0x00051E05 }; @@ -1603,9 +1603,9 @@ static const struct TrHillFloor sDataTagNormal_Floors[] = static const struct TrHillTag sDataTagVariety = { - .trainerType = HILL_TRAINER_TYPE_NPC, + .numTrainers = NUM_TRAINER_HILL_TRAINERS, .unused1 = 1, - .numFloors = 4, + .numFloors = NUM_TRAINER_HILL_FLOORS, .checksum = 0x00054C15 }; @@ -2829,9 +2829,9 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = { static const struct TrHillTag sDataTagUnique = { - .trainerType = HILL_TRAINER_TYPE_NPC, + .numTrainers = NUM_TRAINER_HILL_TRAINERS, .unused1 = 3, - .numFloors = 4, + .numFloors = NUM_TRAINER_HILL_FLOORS, .checksum = 0x000652F3 }; @@ -4040,9 +4040,9 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = { static const struct TrHillTag sDataTagExpert = { - .trainerType = HILL_TRAINER_TYPE_NPC, + .numTrainers = NUM_TRAINER_HILL_TRAINERS, .unused1 = 1, - .numFloors = 4, + .numFloors = NUM_TRAINER_HILL_FLOORS, .checksum = 0x00061F3F }; |