diff --git a/include/battle.h b/include/battle.h index 30e7a13158..3e4907050b 100644 --- a/include/battle.h +++ b/include/battle.h @@ -834,7 +834,6 @@ struct BattleStruct u8 usedMicleBerry; struct MessageStatus slideMessageStatus; u8 trainerSlideSpriteIds[MAX_BATTLERS_COUNT]; - u8 embodyAspectBoost[NUM_BATTLE_SIDES]; u16 savedMove; // backup current move for mid-turn switching, e.g. Red Card u16 opponentMonCanTera:6; u16 opponentMonCanDynamax:6; diff --git a/src/battle_util.c b/src/battle_util.c index b012b177e3..b9b43ab663 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -4764,8 +4764,8 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 break; case ABILITY_IMPOSTER: { - u32 diagonalBattler = BATTLE_OPPOSITE(battler); - if (IsDoubleBattle()) + u32 diagonalBattler = BATTLE_OPPOSITE(battler); + if (IsDoubleBattle()) diagonalBattler = BATTLE_PARTNER(diagonalBattler); if (IsBattlerAlive(diagonalBattler) && !(gBattleMons[diagonalBattler].status2 & (STATUS2_TRANSFORMED | STATUS2_SUBSTITUTE)) @@ -5303,8 +5303,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 case ABILITY_EMBODY_ASPECT_HEARTHFLAME_MASK: case ABILITY_EMBODY_ASPECT_WELLSPRING_MASK: case ABILITY_EMBODY_ASPECT_CORNERSTONE_MASK: - if (!gSpecialStatuses[battler].switchInAbilityDone - && !(gBattleStruct->embodyAspectBoost[GetBattlerSide(battler)] & (1u << gBattlerPartyIndexes[battler]))) + if (!gSpecialStatuses[battler].switchInAbilityDone) { u32 stat; @@ -5323,7 +5322,6 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 gBattleScripting.savedBattler = gBattlerAttacker; gBattlerAttacker = battler; gSpecialStatuses[battler].switchInAbilityDone = TRUE; - gBattleStruct->embodyAspectBoost[GetBattlerSide(battler)] |= 1u << gBattlerPartyIndexes[battler]; SET_STATCHANGER(stat, 1, FALSE); BattleScriptPushCursorAndCallback(BattleScript_BattlerAbilityStatRaiseOnSwitchIn); effect++; diff --git a/test/battle/ability/embody_aspect.c b/test/battle/ability/embody_aspect.c index 22b28dea22..fffc8cf423 100644 --- a/test/battle/ability/embody_aspect.c +++ b/test/battle/ability/embody_aspect.c @@ -57,26 +57,3 @@ SINGLE_BATTLE_TEST("Embody Aspect activates when it's no longer effected by Neut MESSAGE("The opposing Ogerpon's Embody Aspect raised its Speed!"); } } - -SINGLE_BATTLE_TEST("Embody Aspect raises Speed only once per battle") -{ - GIVEN { - PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_OGERPON_TEAL_TERA) { Ability(ABILITY_EMBODY_ASPECT_TEAL_MASK); } - OPPONENT(SPECIES_WYNAUT); - } WHEN { - TURN { SWITCH(opponent, 1); } - TURN { SWITCH(opponent, 0); } - } SCENE { - ABILITY_POPUP(opponent, ABILITY_EMBODY_ASPECT_TEAL_MASK); - ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); - MESSAGE("The opposing Ogerpon's Embody Aspect raised its Speed!"); - NONE_OF { - ABILITY_POPUP(opponent, ABILITY_EMBODY_ASPECT_TEAL_MASK); - ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); - MESSAGE("The opposing Ogerpon's Embody Aspect raised its Speed!"); - } - } THEN { - EXPECT_EQ(opponent->statStages[STAT_SPEED], DEFAULT_STAT_STAGE); - } -}