Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use one iterator

Browse Source
This commit is contained in:
AlexOn1ine 2025-01-04 12:16:35 +01:00
parent 80df54adc6
commit 9eee076e64
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/battle_util.c
View File

@ -1669,14 +1669,15 @@ static bool32 EndTurnTerrain(u32 terrainFlag, u32 stringTableId)
static bool32 TryEndTurnWeather(void)
{
u32 i = 0;
u32 effect = 0;
u32 currBattleWeather = 0xFF;
for (u32 weather = 0; weather < ARRAY_COUNT(sBattleWeatherInfo); weather++)
for (i = 0; i < ARRAY_COUNT(sBattleWeatherInfo); i++)
{
if (gBattleWeather & sBattleWeatherInfo[weather].flag)
if (gBattleWeather & sBattleWeatherInfo[i].flag)
{
currBattleWeather = weather;
currBattleWeather = i;
break;
}
}
@ -1687,7 +1688,7 @@ static bool32 TryEndTurnWeather(void)
if (gWishFutureKnock.weatherDuration > 0 && --gWishFutureKnock.weatherDuration == 0)
{
gBattleWeather = B_WEATHER_NONE;
for (u32 i = 0; i < gBattlersCount; i++)
for (i = 0; i < gBattlersCount; i++)
gDisableStructs[i].weatherAbilityDone = FALSE;
gBattleCommunication[MULTISTRING_CHOOSER] = sBattleWeatherInfo[currBattleWeather].endMessage;
BattleScriptExecute(BattleScript_WeatherFaded);