ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Aurora Veil now only works in Hail

Browse Source
This commit is contained in:
DizzyEggg 2019-12-23 17:50:13 +01:00
parent 63621da46c
commit ea9109943d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/battle_script_commands.c
View File

@ -2195,7 +2195,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
break;
if (gBattleMons[gEffectBattler].status1)
break;
if (GetBattlerAbility(gEffectBattler) == ABILITY_IMMUNITY
if (GetBattlerAbility(gEffectBattler) == ABILITY_IMMUNITY
|| IsFlowerVeilProtected(gEffectBattler)
|| IsLeafGuardProtected(gEffectBattler))
break;
@ -2234,7 +2234,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
}
if (IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_FIRE))
break;
if (GetBattlerAbility(gEffectBattler) == ABILITY_WATER_VEIL
if (GetBattlerAbility(gEffectBattler) == ABILITY_WATER_VEIL
|| IsFlowerVeilProtected(gEffectBattler)
|| IsLeafGuardProtected(gEffectBattler))
break;
@ -2252,7 +2252,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
break;
if (noSunCanFreeze == 0)
break;
if (GetBattlerAbility(gEffectBattler) == ABILITY_MAGMA_ARMOR
if (GetBattlerAbility(gEffectBattler) == ABILITY_MAGMA_ARMOR
|| IsFlowerVeilProtected(gEffectBattler)
|| IsLeafGuardProtected(gEffectBattler))
break;
@ -2297,7 +2297,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
}
if (IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_ELECTRIC))
break;
if (GetBattlerAbility(gEffectBattler) == ABILITY_LIMBER
if (GetBattlerAbility(gEffectBattler) == ABILITY_LIMBER
|| IsFlowerVeilProtected(gEffectBattler)
|| IsLeafGuardProtected(gEffectBattler))
break;
@ -2340,7 +2340,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
break;
if (!IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_POISON) && !IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_STEEL))
{
if (GetBattlerAbility(gEffectBattler) == ABILITY_IMMUNITY
if (GetBattlerAbility(gEffectBattler) == ABILITY_IMMUNITY
|| IsFlowerVeilProtected(gEffectBattler)
|| IsLeafGuardProtected(gEffectBattler))
break;
@ -7640,7 +7640,8 @@ static void Cmd_various(void)
}
break;
case VARIOUS_SET_AURORA_VEIL:
if (gSideStatuses[GET_BATTLER_SIDE(gActiveBattler)] & SIDE_STATUS_AURORA_VEIL)
if (gSideStatuses[GET_BATTLER_SIDE(gActiveBattler)] & SIDE_STATUS_AURORA_VEIL
|| !(WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_HAIL_ANY))
{
gMoveResultFlags |= MOVE_RESULT_MISSED;
gBattleCommunication[MULTISTRING_CHOOSER] = 0;