Merge branch 'master' into dev

This commit is contained in:
Maruno17
2020-11-25 22:07:17 +00:00
14 changed files with 28 additions and 25 deletions

View File

@@ -169,13 +169,13 @@ class PokeBattle_Trainer
def pokedexSeen(region=-1) # Number of Pokémon seen
ret=0
if region==-1
for i in 0..PBSpecies.maxValue
for i in 1..PBSpecies.maxValue
ret+=1 if @seen[i]
end
else
regionlist=pbAllRegionalSpecies(region)
for i in regionlist
ret+=1 if @seen[i]
ret+=1 if i > 0 && @seen[i]
end
end
return ret