Merge pull request #1211 from jtmedley/master

remove incorrect frillish and jellicent entries, fixes #1210
PokeAPI · Mar 6, 2025 · 11e0a1f · 11e0a1f
2 parents 2c9fbf8 + 2306971
commit 11e0a1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/data/v2/csv/encounters.csv b/data/v2/csv/encounters.csv
@@ -61228,7 +61228,7 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 66707,21,706,572,591,56,56
 66708,22,706,572,591,56,56
 66709,21,619,572,593,40,40
-66710,22,619,572,10279,40,40
+66710,22,619,572,593,40,40
 66711,21,702,572,612,60,60
 66712,22,702,572,612,60,60
 66713,22,627,572,628,25,25
@@ -61510,8 +61510,8 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 66989,30,1196,1133,646,60,60
 66990,29,1197,1133,716,60,60
 66991,30,1195,1133,717,60,60
-66992,29,1059,1133,10278,34,34
-66993,30,1059,1133,10278,34,34
+66992,29,1059,1133,592,34,34
+66993,30,1059,1133,592,34,34
 66994,29,1123,1133,718,60,60
 66995,30,1123,1133,718,60,60
 66996,29,1084,1133,760,28,28

diff --git a/data/v2/csv/pokemon.csv b/data/v2/csv/pokemon.csv
@@ -1301,5 +1301,3 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 10275,ogerpon-cornerstone-mask,1017,12,398,275,,0
 10276,terapagos-terastal,1024,3,160,90,,0
 10277,terapagos-stellar,1024,17,770,90,,0
-10278,frillish-female,592,12,330,67,,0
-10279,jellicent-female,593,22,1350,168,,0