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

Integrate ghoul's review

Browse source 
Co-Authored-By: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
This commit is contained in:
Bassoonian 2023-04-29 18:29:50 +02:00
parent f87c5e793a
commit c82c2c185e
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/battle_script_commands.c
View file

@ -15147,16 +15147,6 @@ static void Cmd_doweatherformchangeanimation(void)
static void Cmd_tryweatherformdatachange(void) static void Cmd_tryweatherformdatachange(void)
{ {
CMD_ARGS(); CMD_ARGS();
u8 form;
// gBattlescriptCurrInstr = cmd->nextInstr;
// form = TryWeatherFormChange(gBattleScripting.battler);
// if (form)
// {
// BattleScriptPushCursorAndCallback(BattleScript_WeatherFormChange);
// *(&gBattleStruct->formToChangeInto) = form - 1;
// }
} }
// Water and Mud Sport // Water and Mud Sport

4
src/battle_util.c
View file

@ -2487,7 +2487,7 @@ u8 DoFieldEndTurnEffects(void)
gBattleStruct->turnCountersTracker++; gBattleStruct->turnCountersTracker++;
break; break;
case ENDTURN_WEATHER_FORM: case ENDTURN_WEATHER_FORM:
for (i = 0; i < gBattlersCount; ++i) for (i = 0; i < gBattlersCount; i++)
{ {
if (AbilityBattleEffects(ABILITYEFFECT_ON_WEATHER, i, 0, 0, 0)) if (AbilityBattleEffects(ABILITYEFFECT_ON_WEATHER, i, 0, 0, 0))
{ {
@ -10154,7 +10154,7 @@ bool32 TryBattleFormChange(u8 battlerId, u16 method)
{ {
u8 monId = gBattlerPartyIndexes[battlerId]; u8 monId = gBattlerPartyIndexes[battlerId];
u8 side = GET_BATTLER_SIDE(battlerId); u8 side = GET_BATTLER_SIDE(battlerId);
struct Pokemon *party = (side == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty; struct Pokemon *party = GetBattlerParty(battlerId);
u16 targetSpecies; u16 targetSpecies;
if (!CanBattlerFormChange(battlerId, method)) if (!CanBattlerFormChange(battlerId, method))