From 11c47dfaad2eddb916daa0bf94658aa4740249ed Mon Sep 17 00:00:00 2001 From: cawtds Date: Mon, 10 Jun 2024 23:08:47 +0200 Subject: [PATCH] add expansion updates --- src/battle_script_commands.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c086bb156..529e4e9d8 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7090,7 +7090,6 @@ static void Cmd_switchineffects(void) s32 i; u32 battler = GetBattlerForBattleScript(cmd->battler); - UpdateSentPokesToOpponentValue(battler); gHitMarker &= ~HITMARKER_FAINTED(battler); @@ -7133,7 +7132,7 @@ static void Cmd_switchineffects(void) && IsBattlerGrounded(battler)) { u8 spikesDmg = (5 - gSideTimers[GetBattlerSide(battler)].spikesAmount) * 2; - gBattleMoveDamage = gBattleMons[battler].maxHP / (spikesDmg); + gBattleMoveDamage = GetNonDynamaxMaxHP(battler) / (spikesDmg); if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; @@ -7230,22 +7229,10 @@ static void Cmd_switchineffects(void) gDisableStructs[battler].truantSwitchInHack = 0; - // Don't activate switch-in abilities if the opposing field is empty. - // This could happen when a mon uses explosion and causes everyone to faint. - if ((battlerAbility == ABILITY_INTIMIDATE || battlerAbility == ABILITY_SUPERSWEET_SYRUP || battlerAbility == ABILITY_DOWNLOAD) - && !IsBattlerAlive(BATTLE_OPPOSITE(battler)) - && !IsBattlerAlive(BATTLE_PARTNER(BATTLE_OPPOSITE(battler)))) - { - if (ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, battler, FALSE)) - return; - } - else - { - if (DoSwitchInAbilities(battler) || ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, battler, FALSE)) - return; - else if (AbilityBattleEffects(ABILITYEFFECT_OPPORTUNIST, battler, 0, 0, 0)) - return; - } + if (DoSwitchInAbilities(battler) || ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, battler, FALSE)) + return; + else if (AbilityBattleEffects(ABILITYEFFECT_OPPORTUNIST, battler, 0, 0, 0)) + return; gDisableStructs[battler].stickyWebDone = FALSE; gDisableStructs[battler].spikesDone = FALSE;