Removed uses of F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED

include/constants/trainers.h

@@ -371,11 +371,6 @@
 
 #define F_TRAINER_FEMALE (1 << 7)
 
-// All trainer parties specify the IV, level, and species for each Pokémon in the
-// party. Some trainer parties also specify held items and custom moves for each
-// Pokémon.
-#define F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED (1 << 3)
-
 // Trainer party defines
 #define TRAINER_MON_MALE    1
 #define TRAINER_MON_FEMALE  2

include/data.h

@@ -52,7 +52,7 @@ struct TrainerMonCustomized
     bool8 isShiny : 1;
 };
 
-#define EVERYTHING_CUSTOMIZED(party) { .EverythingCustomized = party}, .partySize = ARRAY_COUNT(party), .partyFlags = F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED
+#define EVERYTHING_CUSTOMIZED(party) { .EverythingCustomized = party}, .partySize = ARRAY_COUNT(party)
 
 union TrainerMonPtr
 {
@@ -69,7 +69,7 @@ struct Trainer
     /*0x12*/ u8 trainerPic;
     /*0x13*/ u8 trainerName[TRAINER_NAME_LENGTH + 1];
     /*0x1E*/ bool8 doubleBattle:1;
-             u8 partyFlags:7;
+             u8 padding:7;
     /*0x1F*/ u8 partySize;
 };
 

src/battle_main.c

@@ -1883,13 +1883,8 @@ static u32 Crc32B (const u8 *data, u32 size)
 
 static u32 GeneratePartyHash(const struct Trainer *trainer, u32 i)
 {
-    const u8 *buffer;
+    const u8 *buffer = (const u8 *) &trainer->party.EverythingCustomized[i];
-    u32 n;
+    u32 n = sizeof(*trainer->party.EverythingCustomized);
-    if (trainer->partyFlags == F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED)
-    {
-        buffer = (const u8 *) &trainer->party.EverythingCustomized[i];
-        n = sizeof(*trainer->party.EverythingCustomized);
-    }
     return Crc32B(buffer, n);
 }
 
@@ -1967,6 +1962,10 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer
         for (i = 0; i < monsCount; i++)
         {
             u32 personalityHash = GeneratePartyHash(trainer, i);
+            const struct TrainerMonCustomized *partyData = trainer->party.EverythingCustomized;
+            u32 otIdType = OT_ID_RANDOM_NO_SHINY;
+            u32 fixedOtId = 0;
+
             if (trainer->doubleBattle == TRUE)
                 personalityValue = 0x80;
             else if (trainer->encounterMusic_gender & F_TRAINER_FEMALE)
@@ -1975,13 +1974,6 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer
                 personalityValue = 0x88; // Use personality more likely to result in a male Pokémon
 
             personalityValue += personalityHash << 8;
-            switch (trainer->partyFlags)
-            {
-            case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
-            {
-                const struct TrainerMonCustomized *partyData = trainer->party.EverythingCustomized;
-                u32 otIdType = OT_ID_RANDOM_NO_SHINY;
-                u32 fixedOtId = 0;
             if (partyData[i].gender == TRAINER_MON_MALE)
                 personalityValue = (personalityValue & 0xFFFFFF00) | GeneratePersonalityForGender(MON_MALE, partyData[i].species);
             else if (partyData[i].gender == TRAINER_MON_FEMALE)
@@ -2030,8 +2022,6 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer
                 SetMonData(&party[i], MON_DATA_NICKNAME, partyData[i].nickname);
             }
             CalculateMonStats(&party[i]);
-            }
-            }
 
         #if B_TRAINER_CLASS_POKE_BALLS >= GEN_7
             if (ball == -1)

src/battle_script_commands.c

@@ -7336,16 +7336,9 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
         moneyReward = 20 * gBattleResources->secretBase->party.levels[0] * gBattleStruct->moneyMultiplier;
     }
     else
-    {
-        switch (gTrainers[trainerId].partyFlags)
-        {
-        case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
     {
         const struct TrainerMonCustomized *party = gTrainers[trainerId].party.EverythingCustomized;
         lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl;
-            }
-            break;
-        }
 
         for (; gTrainerMoneyTable[i].classId != 0xFF; i++)
         {

src/battle_setup.c

@@ -758,23 +758,16 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
     u8 i;
     u8 sum;
     u32 count = numMons;
+    const struct TrainerMonCustomized *party;
 
     if (gTrainers[opponentId].partySize < count)
         count = gTrainers[opponentId].partySize;
 
     sum = 0;
 
-    switch (gTrainers[opponentId].partyFlags)
-    {
-    case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
-        {
-            const struct TrainerMonCustomized *party;
     party = gTrainers[opponentId].party.EverythingCustomized;
     for (i = 0; i < count; i++)
         sum += party[i].lvl;
-        }
-        break;
-    }
 
     return sum;
 }

src/battle_tower.c

@@ -3049,18 +3049,13 @@ static void FillPartnerParty(u16 trainerId)
 
         for (i = 0; i < 3 && i < gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].partySize; i++)
         {
+            const struct TrainerMonCustomized *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.EverythingCustomized;
+            u32 otIdType = OT_ID_RANDOM_NO_SHINY;
             do
             {
                 j = Random32();
             } while (IsShinyOtIdPersonality(otID, j));
 
-            switch (gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].partyFlags)
-            {
-            case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
-            {
-                const struct TrainerMonCustomized *partyData = gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].party.EverythingCustomized;
-                u32 otIdType = OT_ID_RANDOM_NO_SHINY;
-
             if (partyData[i].gender == TRAINER_MON_MALE)
                 j = (j & 0xFFFFFF00) | GeneratePersonalityForGender(MON_MALE, partyData[i].species);
             else if (partyData[i].gender == TRAINER_MON_FEMALE)
@@ -3115,8 +3110,6 @@ static void FillPartnerParty(u16 trainerId)
                 SetMonData(&gPlayerParty[i+3], MON_DATA_NICKNAME, partyData[i].nickname);
             }
             CalculateMonStats(&gPlayerParty[i+3]);
-            }
-            }
 
             StringCopy(trainerName, gTrainers[trainerId - TRAINER_CUSTOM_PARTNER].trainerName);
             SetMonData(&gPlayerParty[i + 3], MON_DATA_OT_NAME, trainerName);

src/data/trainers.h

@@ -1,7 +1,6 @@
 const struct Trainer gTrainers[] = {
     [TRAINER_NONE] =
     {
-        .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PKMN_TRAINER_1,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_HIKER,

src/match_call.c

@@ -1796,14 +1796,7 @@ static void PopulateSpeciesFromTrainerParty(int matchCallId, u8 *destStr)
     trainerId = GetLastBeatenRematchTrainerId(sMatchCallTrainers[matchCallId].trainerId);
     party = gTrainers[trainerId].party;
     monId = Random() % gTrainers[trainerId].partySize;
-
-    switch (gTrainers[trainerId].partyFlags)
-    {
-    default:
-    case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED:
     speciesName = gSpeciesNames[party.EverythingCustomized[monId].species];
-        break;
-    }
 
     StringCopy(destStr, speciesName);
 }