atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MAGIC_GAURD_CHECK -> MAGIC_GUARD_CHECK

Browse source
This commit is contained in:
LOuroboros 2021-05-01 07:37:23 -03:00
parent e11fd352fa
commit 5489ab97e4
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/battle_util.c
View file

@ -2138,7 +2138,7 @@ s32 GetDrainedBigRootHp(u32 battler, s32 hp)
return hp * -1;
}
#define MAGIC_GAURD_CHECK \
#define MAGIC_GUARD_CHECK \
if (ability == ABILITY_MAGIC_GUARD) \
{\
RecordAbilityBattle(gActiveBattler, ability);\
@ -2213,7 +2213,7 @@ u8 DoBattlerEndTurnEffects(void)
&& gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER].hp != 0
&& gBattleMons[gActiveBattler].hp != 0)
{
MAGIC_GAURD_CHECK;
MAGIC_GUARD_CHECK;
gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER; // Notice gBattlerTarget is actually the HP receiver.
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8;
@ -2230,7 +2230,7 @@ u8 DoBattlerEndTurnEffects(void)
if ((gBattleMons[gActiveBattler].status1 & STATUS1_POISON)
&& gBattleMons[gActiveBattler].hp != 0)
{
MAGIC_GAURD_CHECK;
MAGIC_GUARD_CHECK;
if (ability == ABILITY_POISON_HEAL)
{
@ -2259,7 +2259,7 @@ u8 DoBattlerEndTurnEffects(void)
if ((gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_POISON)
&& gBattleMons[gActiveBattler].hp != 0)
{
MAGIC_GAURD_CHECK;
MAGIC_GUARD_CHECK;
if (ability == ABILITY_POISON_HEAL)
{
@ -2291,7 +2291,7 @@ u8 DoBattlerEndTurnEffects(void)
if ((gBattleMons[gActiveBattler].status1 & STATUS1_BURN)
&& gBattleMons[gActiveBattler].hp != 0)
{
MAGIC_GAURD_CHECK;
MAGIC_GUARD_CHECK;
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (B_BURN_DAMAGE >= GEN_7 ? 16 : 8);
if (ability == ABILITY_HEATPROOF)
@ -2311,7 +2311,7 @@ u8 DoBattlerEndTurnEffects(void)
if ((gBattleMons[gActiveBattler].status2 & STATUS2_NIGHTMARE)
&& gBattleMons[gActiveBattler].hp != 0)
{
MAGIC_GAURD_CHECK;
MAGIC_GUARD_CHECK;
// R/S does not perform this sleep check, which causes the nightmare effect to
// persist even after the affected Pokemon has been awakened by Shed Skin.
if (gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)
@ -2333,7 +2333,7 @@ u8 DoBattlerEndTurnEffects(void)
if ((gBattleMons[gActiveBattler].status2 & STATUS2_CURSED)
&& gBattleMons[gActiveBattler].hp != 0)
{
MAGIC_GAURD_CHECK;
MAGIC_GUARD_CHECK;
gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4;
if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1;
@ -2347,7 +2347,7 @@ u8 DoBattlerEndTurnEffects(void)
{
if (--gDisableStructs[gActiveBattler].wrapTurns != 0) // damaged by wrap
{
MAGIC_GAURD_CHECK;
MAGIC_GUARD_CHECK;
gBattleScripting.animArg1 = gBattleStruct->wrappedMove[gActiveBattler];
gBattleScripting.animArg2 = gBattleStruct->wrappedMove[gActiveBattler] >> 8;