Merge branch 'master' into dev

This commit is contained in:
Maruno17
2021-06-20 23:12:30 +01:00
2 changed files with 10 additions and 4 deletions

View File

@@ -279,7 +279,7 @@ class PokemonEncounters
if favored_type
new_enc_list = []
enc_list.each do |enc|
species_data = GameData::Species.get(enc[0])
species_data = GameData::Species.get(enc[1])
t1 = species_data.type1
t2 = species_data.type2
new_enc_list.push(enc) if t1 == favored_type || t2 == favored_type