Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-29 13:26:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Adds Ability Shield activation message (#7224)

Browse Source
This commit is contained in:
PhallenTree
2025-06-26 13:42:32 +01:00
committed by GitHub
parent 6f7dac6d11
commit a82aa618fb
9 changed files with 111 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_scripts.h
View File

@@ -243,6 +243,8 @@ extern const u8 BattleScript_ConsumableStatRaiseRet[];
extern const u8 BattleScript_BerryFocusEnergyRet[];
extern const u8 BattleScript_BerryFocusEnergyEnd2[];
extern const u8 BattleScript_ActionSelectionItemsCantBeUsed[];
extern const u8 BattleScript_AbilityAvoidsDamage[];
extern const u8 BattleScript_AbilityShieldProtects[];
extern const u8 BattleScript_ArenaTurnBeginning[];
extern const u8 BattleScript_PalacePrintFlavorText[];
extern const u8 BattleScript_ArenaDoJudgment[];

3
include/battle_util.h
View File

@@ -257,7 +257,8 @@ bool32 TryPrimalReversion(u32 battler);
bool32 IsNeutralizingGasOnField(void);
bool32 IsMoldBreakerTypeAbility(u32 battler, u32 ability);
u32 GetBattlerAbilityIgnoreMoldBreaker(u32 battler);
u32 GetBattlerAbilityInternal(u32 battler, u32 ignoreMoldBreaker);
u32 GetBattlerAbilityNoAbilityShield(u32 battler);
u32 GetBattlerAbilityInternal(u32 battler, u32 ignoreMoldBreaker, u32 noAbilityShield);
u32 GetBattlerAbility(u32 battler);
u32 IsAbilityOnSide(u32 battler, u32 ability);
u32 IsAbilityOnOpposingSide(u32 battler, u32 ability);

1
include/constants/battle_string_ids.h
View File

@@ -738,6 +738,7 @@ enum StringID
STRINGID_TOXICSPIKESBADLYPOISONED,
STRINGID_POWERCONSTRUCTPRESENCEOFMANY,
STRINGID_POWERCONSTRUCTTRANSFORM,
STRINGID_ABILITYSHIELDPROTECTS,
STRINGID_COUNT
};