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

Clean up some battle scr cmd data

Browse Source
This commit is contained in:
GriffinR
2020-07-16 20:12:12 -04:00
parent 0c4f3b269e
commit aba42513d3
25 changed files with 584 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/wild_encounter.c
View File

@@ -303,29 +303,27 @@ static u8 PickWildMonNature(void)
u8 i;
u8 j;
struct Pokeblock *safariPokeblock;
u8 natures[25];
u8 natures[NUM_NATURES];
if (GetSafariZoneFlag() == TRUE && Random() % 100 < 80)
{
safariPokeblock = SafariZoneGetActivePokeblock();
if (safariPokeblock != NULL)
{
for (i = 0; i < 25; i++)
for (i = 0; i < NUM_NATURES; i++)
natures[i] = i;
for (i = 0; i < 24; i++)
for (i = 0; i < NUM_NATURES - 1; i++)
{
for (j = i + 1; j < 25; j++)
for (j = i + 1; j < NUM_NATURES; j++)
{
if (Random() & 1)
{
u8 temp = natures[i];
natures[i] = natures[j];
natures[j] = temp;
u8 temp;
SWAP(natures[i], natures[j], temp);
}
}
}
for (i = 0; i < 25; i++)
for (i = 0; i < NUM_NATURES; i++)
{
if (PokeblockGetGain(natures[i], safariPokeblock) > 0)
return natures[i];
@@ -337,11 +335,11 @@ static u8 PickWildMonNature(void)
&& GetMonAbility(&gPlayerParty[0]) == ABILITY_SYNCHRONIZE
&& Random() % 2 == 0)
{
return GetMonData(&gPlayerParty[0], MON_DATA_PERSONALITY) % 25;
return GetMonData(&gPlayerParty[0], MON_DATA_PERSONALITY) % NUM_NATURES;
}
// random nature
return Random() % 25;
return Random() % NUM_NATURES;
}
static void CreateWildMon(u16 species, u8 level)