atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT

Browse source
This commit is contained in:
LOuroboros 2021-12-19 20:53:57 -03:00
parent ffe35fbb06
commit cb44de13b3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/constants/battle_config.h
View file

@ -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.

4
src/battle_script_commands.c
View file

@ -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