Merge branch 'master' of git.veekun.com:pokedex

[zzz-pokedex.git] / pokedex / data / csv / pokemon.csv

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 9d708c3..eb3bca7 100644 (file)
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -568,8 +568,8 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 567,aakeosu,5,289,14,320,さいこどり,10,,,1,45,177,70,0,30,0,0
 568,yabukuron,5,290,6,310,ゴミぶくろ,5,,,4,190,66,70,0,20,0,0
 569,dasutodasu,5,290,19,1073,ゴミすてば,5,,,4,60,166,70,0,20,0,0
-570,zoroa,5,291,7,125,わるぎつね,4,,,1,75,66,70,0,25,0,0
-571,zoroaaku,5,291,16,811,ばけぎつね,4,,,1,45,179,70,0,20,0,0
+570,Zorua,5,291,7,125,Tricky Fox,4,,,1,75,66,70,0,25,0,0
+571,Zoroark,5,291,16,811,Illusion Fox,4,,,1,45,179,70,0,20,0,0
 572,chiraamy,5,292,4,58,チンチラ,4,,,6,255,60,70,0,15,0,0
 573,chirachiino,5,292,5,75,スカーフ,4,,,6,60,165,70,0,15,0,0
 574,gochimu,5,293,4,58,ぎょうし,7,,,6,200,58,70,0,20,0,0