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

Updated variable name in MOVEEND_SKY_DROP_CONFUSE

Browse source
This commit is contained in:
W1serV1ser 2021-12-27 12:10:38 -08:00
parent 8923ffb3af
commit e0f7e7a2d9
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_script_commands.c
View file

@ -5179,22 +5179,23 @@ static void Cmd_moveend(void)
{
if (gBattleStruct->skyDropTargets[i] == 0xFE)
{
u8 targetId;
// Find the battler id of the Pokemon that was held by Sky Drop
for (arg1 = 0; arg1 < gBattlersCount; arg1++)
for (targetId = 0; targetId < gBattlersCount; targetId++)
{
if (gBattleStruct->skyDropTargets[arg1] == i)
if (gBattleStruct->skyDropTargets[targetId] == i)
break;
}
// Set gBattlerAttacker to the battler id of the target
gBattlerAttacker = arg1;
gBattlerAttacker = targetId;
// Jump to "confused due to fatigue" script
gBattlescriptCurrInstr = BattleScript_ThrashConfuses;
// Clear skyDropTargets data
gBattleStruct->skyDropTargets[i] = 0xFF;
gBattleStruct->skyDropTargets[arg1] = 0xFF;
gBattleStruct->skyDropTargets[targetId] = 0xFF;
return;
}
}