diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-22 16:12:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 16:12:27 -0600 |
| commit | ebbe826133661d3faabc17f9167fa565b405514a (patch) | |
| tree | 52687e79258567b4d88c184b6692e035d0ff3e14 /src/field_specials.c | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
| parent | c805bab48324f946845e1f81002035e4bdb07e62 (diff) | |
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 3f945fcfb..64ff46ce2 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1266,7 +1266,7 @@ void IsGrassTypeInParty(void) for (i = 0; i < PARTY_SIZE; i++) { pokemon = &gPlayerParty[i]; - if (GetMonData(pokemon, MON_DATA_SANITY_BIT2) && !GetMonData(pokemon, MON_DATA_IS_EGG)) + if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && !GetMonData(pokemon, MON_DATA_IS_EGG)) { species = GetMonData(pokemon, MON_DATA_SPECIES); if (gBaseStats[species].type1 == TYPE_GRASS || gBaseStats[species].type2 == TYPE_GRASS) @@ -1658,7 +1658,7 @@ bool8 sub_813990C(void) for (i = 0; i < partyCount; i++) { - if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_BIT1) == 1) + if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_IS_BAD_EGG) == 1) return TRUE; } |