ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1701 from LOuroboros/safariZone

Browse Source 
Fixed Safari Zone
This commit is contained in:
Eduardo Quezada D'Ottone 2021-10-01 09:07:16 -03:00 committed by GitHub
commit 9980108f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_main.c
View File

@ -3465,11 +3465,14 @@ static void TryDoEventsBeforeFirstTurn(void)
return; return;
// Set invalid mons as absent(for example when starting a double battle with only one pokemon). // Set invalid mons as absent(for example when starting a double battle with only one pokemon).
if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
{
for (i = 0; i < gBattlersCount; i++) for (i = 0; i < gBattlersCount; i++)
{ {
if (gBattleMons[i].hp == 0 || gBattleMons[i].species == SPECIES_NONE) if (gBattleMons[i].hp == 0 || gBattleMons[i].species == SPECIES_NONE)
gAbsentBattlerFlags |= gBitTable[i]; gAbsentBattlerFlags |= gBitTable[i];
} }
}
if (gBattleStruct->switchInAbilitiesCounter == 0) if (gBattleStruct->switchInAbilitiesCounter == 0)
{ {