Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Missing shouldAbilityTrigger (#9447)

Browse Source
This commit is contained in:
Alex 2026-03-07 15:30:19 +01:00 committed by GitHub
parent 4d9580ffbb
commit 4e0fc26fc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_util.c
View File

@ -3466,7 +3466,7 @@ u32 AbilityBattleEffects(enum AbilityEffect caseID, enum BattlerId battler, enum
}
break;
case ABILITY_TERAFORM_ZERO:
if (gBattleMons[battler].species == SPECIES_TERAPAGOS_STELLAR)
if (shouldAbilityTrigger && gBattleMons[battler].species == SPECIES_TERAPAGOS_STELLAR)
{
BattleScriptCall(BattleScript_ActivateTeraformZero);
effect++;
@ -3623,7 +3623,7 @@ u32 AbilityBattleEffects(enum AbilityEffect caseID, enum BattlerId battler, enum
}
break;
case ABILITYEFFECT_SWITCH_IN_FORM_CHANGE:
if (TryBattleFormChange(battler, FORM_CHANGE_BATTLE_HP_PERCENT_SEND_OUT, ability))
if (shouldAbilityTrigger && TryBattleFormChange(battler, FORM_CHANGE_BATTLE_HP_PERCENT_SEND_OUT, ability))
{
gBattleScripting.battler = battler;
// To prevent the new form's ability from pop up