Skip to content

Fix fakematch in match_call.c #2323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AZero13 wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −31
Open

Fix fakematch in match_call.c #2323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 25 additions & 31 deletions src/match_call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1743,44 +1743,38 @@ static u8 GetWaterEncounterSlot(void)

static void PopulateSpeciesFromTrainerLocation(int matchCallId, u8 *destStr)
{
u16 species[2];
int numSpecies;
u8 slot;
int i = 0;
int i, slot;

if (gWildMonHeaders[i].mapGroup != MAP_GROUP(MAP_UNDEFINED)) // ??? This check is nonsense.
for (i = 0; gWildMonHeaders[i].mapGroup != MAP_GROUP(MAP_UNDEFINED); i++)
{
while (gWildMonHeaders[i].mapGroup != MAP_GROUP(MAP_UNDEFINED))
{
if (gWildMonHeaders[i].mapGroup == gRematchTable[matchCallId].mapGroup
&& gWildMonHeaders[i].mapNum == gRematchTable[matchCallId].mapNum)
break;
if (gWildMonHeaders[i].mapGroup == gRematchTable[matchCallId].mapGroup &&
gWildMonHeaders[i].mapNum == gRematchTable[matchCallId].mapNum)
break;
}

i++;
}
if (gWildMonHeaders[i].mapGroup != MAP_GROUP(MAP_UNDEFINED))
{
int numSpecies;
u16 species[2];

if (gWildMonHeaders[i].mapGroup != MAP_GROUP(MAP_UNDEFINED))
numSpecies = 0;
if (gWildMonHeaders[i].landMonsInfo)
{
numSpecies = 0;
if (gWildMonHeaders[i].landMonsInfo)
{
slot = GetLandEncounterSlot();
species[numSpecies] = gWildMonHeaders[i].landMonsInfo->wildPokemon[slot].species;
numSpecies++;
}
slot = GetLandEncounterSlot();
species[numSpecies++] = gWildMonHeaders[i].landMonsInfo->wildPokemon[slot].species;
}

if (gWildMonHeaders[i].waterMonsInfo)
{
slot = GetWaterEncounterSlot();
species[numSpecies] = gWildMonHeaders[i].waterMonsInfo->wildPokemon[slot].species;
numSpecies++;
}
if (gWildMonHeaders[i].waterMonsInfo)
{
slot = GetWaterEncounterSlot();
species[numSpecies++] = gWildMonHeaders[i].waterMonsInfo->wildPokemon[slot].species;
}

if (numSpecies)
{
StringCopy(destStr, gSpeciesNames[species[Random() % numSpecies]]);
return;
}
if (numSpecies)
{
slot = Random() % numSpecies;
StringCopy(destStr, gSpeciesNames[species[slot]]);
return;
}
}

Expand Down