mirror of
https://github.com/PokeAPI/pokeapi
synced 2024-11-10 06:04:18 +00:00
Merge branch 'master' into add-pokemon-cries
This commit is contained in:
commit
6f0b800d27
1 changed files with 2 additions and 2 deletions
|
@ -874,7 +874,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
|
|||
873,frosmoth,8,872,455,9,13,,4,75,50,0,20,0,2,0,0,0,873,
|
||||
874,stonjourner,8,,456,4,7,,4,60,50,0,25,0,1,0,0,0,874,
|
||||
875,eiscue,8,,457,2,6,,4,60,50,0,25,0,1,0,0,0,875,
|
||||
876,indeedee,8,,458,7,6,,4,30,140,0,40,0,3,0,0,0,876,
|
||||
876,indeedee,8,,458,7,6,,4,30,140,0,40,1,3,0,0,0,876,
|
||||
877,morpeko,8,,459,10,12,,4,180,50,0,10,0,2,0,0,0,877,
|
||||
878,cufant,8,,460,10,8,,4,190,50,0,25,0,2,0,0,0,878,
|
||||
879,copperajah,8,878,460,5,8,,4,90,50,0,25,0,2,0,0,0,879,
|
||||
|
@ -914,7 +914,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
|
|||
913,quaxwell,9,912,480,2,,,1,45,50,0,20,0,4,0,0,0,913,
|
||||
914,quaquaval,9,913,480,2,,,1,45,50,0,20,0,4,0,0,0,914,
|
||||
915,lechonk,9,,481,4,,,4,255,50,0,15,0,2,0,0,0,915,
|
||||
916,oinkologne,9,915,481,4,,,0,100,50,0,15,0,2,0,0,0,916,
|
||||
916,oinkologne,9,915,481,4,,,0,100,50,0,15,1,2,0,0,0,916,
|
||||
917,tarountula,9,,482,9,,,4,255,50,0,15,0,5,0,0,0,918,
|
||||
918,spidops,9,917,482,5,,,4,120,50,0,15,0,5,0,0,0,919,
|
||||
919,nymble,9,,483,4,,,4,190,20,0,20,0,2,0,0,0,920,
|
||||
|
|
|
Loading…
Reference in a new issue