ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-10 15:23:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1987 from rh-hideout/DizzyEggg-patch-1

Browse Source 
Fix Intimidate affecting fainted mons
This commit is contained in:
Eduardo Quezada D'Ottone 2021-12-18 15:01:19 -03:00 committed by GitHub
commit 66e6b140ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_util.c
View File

@ -5535,10 +5535,11 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
case ABILITYEFFECT_INTIMIDATE2: case ABILITYEFFECT_INTIMIDATE2:
for (i = 0; i < gBattlersCount; i++) for (i = 0; i < gBattlersCount; i++)
{ {
if (GetBattlerAbility(i) == ABILITY_INTIMIDATE && gBattleResources->flags->flags[i] & RESOURCE_FLAG_INTIMIDATED) if (GetBattlerAbility(i) == ABILITY_INTIMIDATE && gBattleResources->flags->flags[i] & RESOURCE_FLAG_INTIMIDATED
&& (IsBattlerAlive(BATTLE_OPPOSITE(i)) || IsBattlerAlive(BATTLE_PARTNER(BATTLE_OPPOSITE(i))))) // At least one opposing mon has to be alive.
{ {
gLastUsedAbility = ABILITY_INTIMIDATE;
gBattleResources->flags->flags[i] &= ~RESOURCE_FLAG_INTIMIDATED; gBattleResources->flags->flags[i] &= ~RESOURCE_FLAG_INTIMIDATED;
gLastUsedAbility = ABILITY_INTIMIDATE;
if (caseID == ABILITYEFFECT_INTIMIDATE1) if (caseID == ABILITYEFFECT_INTIMIDATE1)
{ {
BattleScriptPushCursorAndCallback(BattleScript_IntimidateActivatesEnd3); BattleScriptPushCursorAndCallback(BattleScript_IntimidateActivatesEnd3);