diff --git a/include/constants/flags.h b/include/constants/flags.h
index 8d98e3aa0..53d548930 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -42,7 +42,7 @@
#define TEMP_FLAGS_END FLAG_TEMP_1F
#define NUM_TEMP_FLAGS (TEMP_FLAGS_END - TEMP_FLAGS_START + 1)
[color=red]-#define FLAG_UNUSED_0x020 0x20 // Unused Flag[/color]
[color=seagreen]+#define FLAG_FORCE_DOUBLE_TRAINER_BATTLES 0x20 // Originally Unused Flag[/color]
#define FLAG_UNUSED_0x021 0x21 // Unused Flag
#define FLAG_UNUSED_0x022 0x22 // Unused Flag
#define FLAG_UNUSED_0x023 0x23 // Unused Flag
diff --git a/src/battle_main.c b/src/battle_main.c
index c19089deb..5bc17dadf 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1962,6 +1962,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
u8 fixedIV;
s32 i, j;
u8 monsCount;
[color=seagreen]+ bool8 isDoubleBattle = gTrainers[trainerNum].doubleBattle;[/color]
if (trainerNum == TRAINER_SECRET_BASE)
return 0;
@@ -1985,10 +1986,13 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
monsCount = gTrainers[trainerNum].partySize;
}
[color=seagreen]+ if (FlagGet(FLAG_FORCE_DOUBLE_TRAINER_BATTLES) && monsCount >= 2)
+ isDoubleBattle = TRUE;
+[/color]
for (i = 0; i < monsCount; i++)
{
[color=red]- if (gTrainers[trainerNum].doubleBattle == TRUE)[/color]
[color=seagreen]+ if (isDoubleBattle == TRUE)[/color]
personalityValue = 0x80;
else if (gTrainers[trainerNum].encounterMusic_gender & F_TRAINER_FEMALE)
personalityValue = 0x78; // Use personality more likely to result in a female Pokémon
@@ -2067,7 +2071,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir
}
}
[color=red]- gBattleTypeFlags |= gTrainers[trainerNum].doubleBattle;[/color]
[color=seagreen]+ gBattleTypeFlags |= isDoubleBattle;[/color]
}
return gTrainers[trainerNum].partySize;