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

some test fixes

Browse Source
This commit is contained in:
AlexOn1ine 2024-12-28 22:58:16 +01:00
parent 74f1d7cb80
commit d9db60218c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_script_commands.c
View File

@ -11589,9 +11589,9 @@ static void Cmd_setfieldweather(void)
{
CMD_ARGS(u8 weather);
u8 weather = cmd->weather;
u8 battleWeatherId = cmd->weather;
if (!TryChangeBattleWeather(gBattlerAttacker, weather, FALSE))
if (!TryChangeBattleWeather(gBattlerAttacker, battleWeatherId, FALSE))
{
gBattleStruct->moveResultFlags[gBattlerTarget] |= MOVE_RESULT_MISSED;
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED;
@ -11599,7 +11599,7 @@ static void Cmd_setfieldweather(void)
return;
}
switch (weather)
switch (battleWeatherId)
{
case BATTLE_WEATHER_RAIN:
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_RAIN;

1
src/battle_util.c
View File

@ -1684,6 +1684,7 @@ static bool32 TryEndTurnWeather(void)
if (gWishFutureKnock.weatherDuration > 0 && --gWishFutureKnock.weatherDuration == 0)
{
gBattleWeather = B_WEATHER_NONE;
gBattleCommunication[MULTISTRING_CHOOSER] = sBattleWeatherInfo[currBattleWeather].endMessage;
BattleScriptExecute(BattleScript_WeatherFaded);
effect++;