dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1750 from LOuroboros/patch-2

Browse Source 
Fixed switch syntax in Task_TryFieldPoisonWhiteOut
This commit is contained in:
GriffinR
2022-08-24 17:07:17 -04:00
committed by GitHub
parent 8a8ba92f21 90f72a745a
commit eecf968390
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_poison.c
+31 -31
View File
@@ -67,40 +67,40 @@ static void Task_TryFieldPoisonWhiteOut(u8 taskId)
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
switch (tState) switch (tState)
{ {
case 0: case 0:
for (; tPartyIdx < PARTY_SIZE; tPartyIdx++) for (; tPartyIdx < PARTY_SIZE; tPartyIdx++)
{
if (MonFaintedFromPoison(tPartyIdx))
{ {
if (MonFaintedFromPoison(tPartyIdx)) FaintFromFieldPoison(tPartyIdx);
{ ShowFieldMessage(gText_PkmnFainted_FldPsn);
FaintFromFieldPoison(tPartyIdx); tState++;
ShowFieldMessage(gText_PkmnFainted_FldPsn); return;
tState++;
return;
}
}
tState = 2; // Finished checking party
break;
case 1:
// Wait for "{mon} fainted" message, then return to party loop
if (IsFieldMessageBoxHidden())
tState--;
break;
case 2:
if (AllMonsFainted())
{
// Battle facilities have their own white out script to handle the challenge loss
if (InBattlePyramid() | InBattlePike() || InTrainerHillChallenge())
gSpecialVar_Result = FLDPSN_FRONTIER_WHITEOUT;
else
gSpecialVar_Result = FLDPSN_WHITEOUT;
} }
}
tState = 2; // Finished checking party
break;
case 1:
// Wait for "{mon} fainted" message, then return to party loop
if (IsFieldMessageBoxHidden())
tState--;
break;
case 2:
if (AllMonsFainted())
{
// Battle facilities have their own white out script to handle the challenge loss
if (InBattlePyramid() | InBattlePike() || InTrainerHillChallenge())
gSpecialVar_Result = FLDPSN_FRONTIER_WHITEOUT;
else else
{ gSpecialVar_Result = FLDPSN_WHITEOUT;
gSpecialVar_Result = FLDPSN_NO_WHITEOUT; }
} else
ScriptContext_Enable(); {
DestroyTask(taskId); gSpecialVar_Result = FLDPSN_NO_WHITEOUT;
break; }
ScriptContext_Enable();
DestroyTask(taskId);
break;
} }
} }