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

Add missing clear check for Defog

Browse Source 
We usually want to check first before we remove any statuses.
This commit is contained in:
Alex 2025-12-02 22:59:23 +01:00 committed by GitHub
parent 7e0b1de2ae
commit 65a4d852fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/battle_script_commands.c
View File

@ -9392,14 +9392,21 @@ static bool32 TryDefogClear(u32 battlerAtk, bool32 clear)
} }
if (gBattleWeather & B_WEATHER_FOG) if (gBattleWeather & B_WEATHER_FOG)
{ {
gBattleWeather &= ~B_WEATHER_FOG;
BattleScriptCall(BattleScript_FogEnded_Ret); if (clear)
{
gBattleWeather &= ~B_WEATHER_FOG;
BattleScriptCall(BattleScript_FogEnded_Ret);
}
return TRUE; return TRUE;
} }
if (GetConfig(CONFIG_DEFOG_EFFECT_CLEARING) >= GEN_8 && (gFieldStatuses & STATUS_FIELD_TERRAIN_ANY)) if (GetConfig(CONFIG_DEFOG_EFFECT_CLEARING) >= GEN_8 && (gFieldStatuses & STATUS_FIELD_TERRAIN_ANY))
{ {
RemoveAllTerrains(); if (clear)
BattleScriptCall(BattleScript_TerrainEnds_Ret); {
RemoveAllTerrains();
BattleScriptCall(BattleScript_TerrainEnds_Ret);
}
return TRUE; return TRUE;
} }
} }