ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-19 01:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from Bassoonian/formbattlechangefix

Browse Source 
Integrate ghoul's review
This commit is contained in:
Eduardo Quezada D'Ottone 2023-04-29 15:54:13 -04:00 committed by GitHub
commit 9796984637
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle_script_commands.c
View File

@ -15148,15 +15148,7 @@ static void Cmd_tryweatherformdatachange(void)
{
CMD_ARGS();
u8 form;
// gBattlescriptCurrInstr = cmd->nextInstr;
// form = TryWeatherFormChange(gBattleScripting.battler);
// if (form)
// {
// BattleScriptPushCursorAndCallback(BattleScript_WeatherFormChange);
// *(&gBattleStruct->formToChangeInto) = form - 1;
// }
// removed in favor of new form system
}
// Water and Mud Sport

4
src/battle_util.c
View File

@ -2487,7 +2487,7 @@ u8 DoFieldEndTurnEffects(void)
gBattleStruct->turnCountersTracker++;
break;
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))
{
@ -10154,7 +10154,7 @@ bool32 TryBattleFormChange(u8 battlerId, u16 method)
{
u8 monId = gBattlerPartyIndexes[battlerId];
u8 side = GET_BATTLER_SIDE(battlerId);
struct Pokemon *party = (side == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty;
struct Pokemon *party = GetBattlerParty(battlerId);
u16 targetSpecies;
if (!CanBattlerFormChange(battlerId, method))