diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-30 20:28:46 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-30 20:28:46 -0400 |
commit | c7e71bc47d322fc7da3a07910ba36fe236b51e13 (patch) | |
tree | b24d817d82621d758804fc995189fffc7413f72e /src/field/tv.c | |
parent | 044e8cc93b46fccb2e4e5ed5accf4c55917a3f7f (diff) | |
parent | 5fb9b9052276243d54ecfc27d0514e9c35825e8c (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into refactor_src
Diffstat (limited to 'src/field/tv.c')
-rw-r--r-- | src/field/tv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/tv.c b/src/field/tv.c index 734cbad6f..e9b5e850d 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -1555,7 +1555,7 @@ u16 sub_80BF674(u16 species) rspecies = (Random() % (NUM_SPECIES - 1)) + 1; cspecies = rspecies; - while (GetNationalPokedexFlag(SpeciesToNationalPokedexNum(cspecies), 0) != 1 || cspecies == species) + while (GetSetPokedexFlag(SpeciesToNationalPokedexNum(cspecies), 0) != 1 || cspecies == species) { if (cspecies == SPECIES_BULBASAUR) cspecies = NUM_SPECIES - 1; @@ -2319,7 +2319,7 @@ void sub_80C03A8(u8 showidx) void sub_80C03C8(u16 species, u8 showidx) { - if (GetNationalPokedexFlag(SpeciesToNationalPokedexNum(species), 0) == 0) + if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), 0) == 0) gSaveBlock1.tvShows[showidx].common.var01 = 0; } |