diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h
index 65f85af957..f68646bb81 100644
--- a/include/constants/battle_config.h
+++ b/include/constants/battle_config.h
@@ -227,8 +227,8 @@
 #define B_LAST_USED_BALL_BUTTON     R_BUTTON // If last used ball is implemented, this button (or button combo) will trigger throwing the last used ball.
 
 // Other settings
-#define B_DOUBLE_WILD_CHANCE                0    // % chance of encountering two Pokémon in a Wild Encounter.
-#define B_NEW_MULTI_BATTLE_DEFEAT_CONDITION TRUE // In Gen5+, multi battles end when the Player and also their Partner don't have any more Pokémon to fight.
+#define B_DOUBLE_WILD_CHANCE        0 // % chance of encountering two Pokémon in a Wild Encounter.
+#define B_MULTI_BATTLE_WHITEOUT GEN_8 // In Gen4+, multi battles end when the Player and also their Partner don't have any more Pokémon to fight.
 
 // Animation Settings
 #define B_NEW_SWORD_PARTICLE            FALSE    // If set to TRUE, it updates Swords Dance's particle.
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 6b1f5a6ff2..d41084ca7a 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -4113,7 +4113,7 @@ static void Cmd_getexp(void)
     }
 }
 
-#ifdef B_NEW_MULTI_BATTLE_DEFEAT_CONDITION == TRUE
+#ifdef B_MULTI_BATTLE_WHITEOUT >= GEN_4
 static bool32 NoAliveMonsForPlayerAndPartner(void)
 {
     u32 i;
@@ -4190,7 +4190,7 @@ static void Cmd_unknown_24(void)
     if (gBattleControllerExecFlags)
         return;
 
-    #ifdef B_NEW_MULTI_BATTLE_DEFEAT_CONDITION == TRUE
+    #ifdef B_MULTI_BATTLE_WHITEOUT >= GEN_4
     if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER) && NoAliveMonsForPlayerAndPartner())
         gBattleOutcome |= B_OUTCOME_LOST;
     #endif