From 28c414cc5cab4c4504569546d76c50440636c9a1 Mon Sep 17 00:00:00 2001 From: Eevee Date: Tue, 23 Nov 2010 15:54:44 -0800 Subject: [PATCH 1/1] Gen V English names for the starters and Reshiram/Zekrom. #450 --- pokedex/data/csv/abilities.csv | 4 ++-- pokedex/data/csv/pokemon.csv | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pokedex/data/csv/abilities.csv b/pokedex/data/csv/abilities.csv index d781793..f394da4 100644 --- a/pokedex/data/csv/abilities.csv +++ b/pokedex/data/csv/abilities.csv @@ -526,5 +526,5 @@ This ability stacks if two allied Pokémon have it.",Damages [sleeping]{mechanic 160,iron thorns,5,"Whenever a move makes contact with this Pokémon, the move's user takes 1/8 of its maximum [HP]{mechanic} in damage.",Damages attacking Pokémon for 1/8 their max [HP]{mechanic} on contact. 161,daruma mode,5,Changes to Daruma form in a pinch.,Changes to Daruma form in a pinch. 162,victory star,5,"Raises every friendly Pokémon's Accuracy, including this Pokémon's.","Raises every friendly Pokémon's Accuracy, including this Pokémon's." -163,turbo blaze,5,"When this Pokémon acts, if the target has an ability that would hinder or prevent this Pokémon's selected move, that ability is ignored.",Moves ignore abilities that would hinder or prevent them. -164,teravoltage,5,"When this Pokémon acts, if the target has an ability that would hinder or prevent this Pokémon's selected move, that ability is ignored.",Moves ignore abilities that would hinder or prevent them. +163,Turboblaze,5,"When this Pokémon acts, if the target has an ability that would hinder or prevent this Pokémon's selected move, that ability is ignored.",Moves ignore abilities that would hinder or prevent them. +164,Teravolt,5,"When this Pokémon acts, if the target has an ability that would hinder or prevent this Pokémon's selected move, that ability is ignored.",Moves ignore abilities that would hinder or prevent them. diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv index 9a46052..0873594 100644 --- a/pokedex/data/csv/pokemon.csv +++ b/pokedex/data/csv/pokemon.csv @@ -493,13 +493,13 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,height 492,Shaymin,land,,4,253,2,21,Gratitude,5,8,,-1,45,64,100,0,120,0,0 493,Arceus,,,4,254,32,3200,Alpha,4,8,,-1,3,255,0,0,120,0,0 494,bikutini,,,5,255,4,40,しょうり,10,,,-1,3,270,100,0,120,0,0 -495,tsutaaja,,,5,256,6,81,くさへび,5,,,1,45,28,70,0,20,0,0 +495,Snivy,,,5,256,6,81,Grass Snake,5,,,1,45,28,70,0,20,0,0 496,janobii,,,5,256,8,160,くさへび,5,,,1,45,145,70,0,20,0,0 497,jarooda,,,5,256,33,630,ロイヤル,5,,,1,45,238,70,0,20,0,0 -498,pokabu,,,5,257,5,99,ひぶた,8,,,1,45,28,70,0,20,0,0 +498,Tepig,,,5,257,5,99,Fire Pig,8,,,1,45,28,70,0,20,0,0 499,chaobuu,,,5,257,10,555,ひぶた,8,,,1,45,146,70,0,20,0,0 500,enbuoo,,,5,257,16,1500,おおひぶた,8,,,1,45,238,70,0,20,0,0 -501,mijumaru,,,5,258,5,59,ラッコ,2,,,1,45,28,70,0,20,0,0 +501,Oshawott,,,5,258,5,59,Sea Otter,2,,,1,45,28,70,0,20,0,0 502,futachimaru,,,5,258,8,245,しゅぎょう,2,,,1,45,145,70,0,20,0,0 503,daikenki,,,5,258,15,946,かんろく,2,,,1,45,238,70,0,20,0,0 504,minezumi,,,5,259,5,116,みはり,3,,,4,255,51,70,0,15,0,0 @@ -641,8 +641,8 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,height 640,birijion,,,5,327,20,2000,そうげん,5,,,-1,3,261,35,0,80,0,0 641,torunerosu,,,5,328,15,630,せんぷう,5,,,0,3,261,90,0,120,0,0 642,borutorosu,,,5,329,15,610,らいげき,2,,,0,3,261,90,0,120,0,0 -643,reshiramu,,,5,330,32,3300,はくよう,9,,,-1,45,306,0,0,120,0,0 -644,zekuromu,,,5,331,29,3450,こくいん,1,,,-1,45,306,0,0,120,0,0 +643,Reshiram,,,5,330,32,3300,Vast White,9,,,-1,45,306,0,0,120,0,0 +644,Zekrom,,,5,331,29,3450,Deep Black,1,,,-1,45,306,0,0,120,0,0 645,randorosu,,,5,332,15,680,ほうじょう,3,,,0,3,270,90,0,120,0,0 646,kyuremu,,,5,333,30,3250,きょうかい,4,,,-1,3,297,0,0,120,0,0 647,kerudio,,,5,334,14,485,わかごま,10,,,-1,3,261,35,0,80,0,0 -- 2.7.4