From cb5276773b2248a3ec2e71e34b31ed12fbd38000 Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Thu, 19 Jan 2012 01:40:35 -0500 Subject: [PATCH 1/6] Rerip B/W power, accuracy, and PP for all moves. --- pokedex/data/csv/moves.csv | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv index 582d526..dd9187b 100644 --- a/pokedex/data/csv/moves.csv +++ b/pokedex/data/csv/moves.csv @@ -126,7 +126,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 125,bone-club,1,5,65,20,85,0,10,2,32,10,5,10,5 126,fire-blast,1,10,120,5,85,0,10,3,5,10,2,1,17 127,waterfall,1,11,80,15,100,0,10,2,32,20,5,28,5 -128,clamp,1,11,35,10,85,0,10,2,43,100,5,24,5 +128,clamp,1,11,35,15,85,0,10,2,43,100,5,24,5 129,swift,1,1,60,20,,0,11,3,18,,1,27,17 130,skull-bash,1,1,100,15,100,0,10,2,146,100,5,4,6 131,spike-cannon,1,1,20,15,100,0,10,2,30,,1,10,7 @@ -137,7 +137,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 136,hi-jump-kick,1,2,130,10,90,0,10,2,46,,1,3,5 137,glare,1,1,0,30,90,0,10,1,68,,5,5,19 138,dream-eater,1,14,100,15,100,0,10,3,9,,4,8,20 -139,poison-gas,1,4,0,40,90,0,11,1,67,,4,33,5 +139,poison-gas,1,4,0,40,80,0,11,1,67,,4,33,5 140,barrage,1,1,15,20,85,0,10,2,30,,5,12,7 141,leech-life,1,7,20,15,100,0,10,2,4,,4,9,20 142,lovely-kiss,1,1,0,10,75,0,10,1,2,,2,5,19 @@ -196,9 +196,9 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 195,perish-song,2,1,0,5,,0,12,1,115,,2,14,10 196,icy-wind,2,15,55,15,95,0,11,3,71,100,2,5,2 197,detect,2,2,0,5,,4,7,1,112,,1,16,16 -198,bone-rush,2,5,25,10,80,0,10,2,30,,5,1,7 +198,bone-rush,2,5,25,10,90,0,10,2,30,,5,1,7 199,lock-on,2,1,0,5,,0,10,1,95,,4,24,20 -200,outrage,2,16,120,15,100,0,8,2,28,,1,6,7 +200,outrage,2,16,120,10,100,0,8,2,28,,1,6,7 201,sandstorm,2,6,0,10,,0,12,1,116,,5,21,13 202,giga-drain,2,12,75,10,100,0,10,3,4,,4,10,20 203,endure,2,1,0,10,,4,7,1,117,,5,16,13 @@ -362,7 +362,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 361,healing-wish,4,14,0,10,,0,7,1,221,,3,,8 362,brine,4,11,65,10,100,0,10,3,222,,4,,4 363,natural-gift,4,1,1,15,100,0,10,2,223,,1,,18 -364,feint,4,1,50,10,100,2,10,2,224,,2,,16 +364,feint,4,1,30,10,100,2,10,2,224,,2,,16 365,pluck,4,3,60,20,100,0,10,2,225,,3,,12 366,tailwind,4,3,0,30,,0,4,1,226,,4,,1 367,acupressure,4,1,0,30,,0,5,1,227,,1,,11 From 1309659ec3893a7f93c4b20277e9fd2d5976b0e2 Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Thu, 19 Jan 2012 03:00:36 -0500 Subject: [PATCH 2/6] Update the move changelog after that rerip. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I actually reripped all the D/P data, too, and compared them myself just to be sure, but those four were all there was. (The other move from the last commit was Poison Gas—we had its old accuracy right, remember.) --- pokedex/data/csv/move_changelog.csv | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pokedex/data/csv/move_changelog.csv b/pokedex/data/csv/move_changelog.csv index 45866c7..27716e1 100644 --- a/pokedex/data/csv/move_changelog.csv +++ b/pokedex/data/csv/move_changelog.csv @@ -37,7 +37,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,effect_id,effect_c 105,8,,,20,,, 120,3,,130,,,, 126,3,,,,,,30 -128,11,,,,75,, +128,11,,,10,75,, 136,8,,85,,,, 136,11,,100,20,,, 137,11,,,,75,, @@ -54,7 +54,9 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,effect_id,effect_c 178,11,,,,85,, 184,11,,,,90,, 192,8,,100,,,, +198,11,,,,80,, 200,8,,90,,,, +200,11,,,15,,, 202,8,,,5,,, 202,11,,60,,,, 210,11,,10,,,, @@ -73,6 +75,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,effect_id,effect_c 348,8,,70,,,, 350,11,,,,80,, 353,11,,120,,85,, +364,11,,50,,,, 382,11,,0,,,, 386,11,,60,,,, 387,11,,130,,,, From 871f9aa58bc3006cd41d0608027c8b2d98b3f78b Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Fri, 20 Jan 2012 15:19:02 -0500 Subject: [PATCH 3/6] =?UTF-8?q?Add=20French=20Pok=C3=A9mon=20form=20names.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pokedex/data/csv/pokemon_form_names.csv | 727 ++++++++++++++++++++++++ 1 file changed, 727 insertions(+) diff --git a/pokedex/data/csv/pokemon_form_names.csv b/pokedex/data/csv/pokemon_form_names.csv index 75ff562..dcf9d28 100644 --- a/pokedex/data/csv/pokemon_form_names.csv +++ b/pokedex/data/csv/pokemon_form_names.csv @@ -1,728 +1,1455 @@ pokemon_form_id,local_language_id,form_name,pokemon_name +1,5,, 1,9,, +2,5,, 2,9,, +3,5,, 3,9,, +4,5,, 4,9,, +5,5,, 5,9,, +6,5,, 6,9,, +7,5,, 7,9,, +8,5,, 8,9,, +9,5,, 9,9,, +10,5,, 10,9,, +11,5,, 11,9,, +12,5,, 12,9,, +13,5,, 13,9,, +14,5,, 14,9,, +15,5,, 15,9,, +16,5,, 16,9,, +17,5,, 17,9,, +18,5,, 18,9,, +19,5,, 19,9,, +20,5,, 20,9,, +21,5,, 21,9,, +22,5,, 22,9,, +23,5,, 23,9,, +24,5,, 24,9,, +25,5,, 25,9,, +26,5,, 26,9,, +27,5,, 27,9,, +28,5,, 28,9,, +29,5,, 29,9,, +30,5,, 30,9,, +31,5,, 31,9,, +32,5,, 32,9,, +33,5,, 33,9,, +34,5,, 34,9,, +35,5,, 35,9,, +36,5,, 36,9,, +37,5,, 37,9,, +38,5,, 38,9,, +39,5,, 39,9,, +40,5,, 40,9,, +41,5,, 41,9,, +42,5,, 42,9,, +43,5,, 43,9,, +44,5,, 44,9,, +45,5,, 45,9,, +46,5,, 46,9,, +47,5,, 47,9,, +48,5,, 48,9,, +49,5,, 49,9,, +50,5,, 50,9,, +51,5,, 51,9,, +52,5,, 52,9,, +53,5,, 53,9,, +54,5,, 54,9,, +55,5,, 55,9,, +56,5,, 56,9,, +57,5,, 57,9,, +58,5,, 58,9,, +59,5,, 59,9,, +60,5,, 60,9,, +61,5,, 61,9,, +62,5,, 62,9,, +63,5,, 63,9,, +64,5,, 64,9,, +65,5,, 65,9,, +66,5,, 66,9,, +67,5,, 67,9,, +68,5,, 68,9,, +69,5,, 69,9,, +70,5,, 70,9,, +71,5,, 71,9,, +72,5,, 72,9,, +73,5,, 73,9,, +74,5,, 74,9,, +75,5,, 75,9,, +76,5,, 76,9,, +77,5,, 77,9,, +78,5,, 78,9,, +79,5,, 79,9,, +80,5,, 80,9,, +81,5,, 81,9,, +82,5,, 82,9,, +83,5,, 83,9,, +84,5,, 84,9,, +85,5,, 85,9,, +86,5,, 86,9,, +87,5,, 87,9,, +88,5,, 88,9,, +89,5,, 89,9,, +90,5,, 90,9,, +91,5,, 91,9,, +92,5,, 92,9,, +93,5,, 93,9,, +94,5,, 94,9,, +95,5,, 95,9,, +96,5,, 96,9,, +97,5,, 97,9,, +98,5,, 98,9,, +99,5,, 99,9,, +100,5,, 100,9,, +101,5,, 101,9,, +102,5,, 102,9,, +103,5,, 103,9,, +104,5,, 104,9,, +105,5,, 105,9,, +106,5,, 106,9,, +107,5,, 107,9,, +108,5,, 108,9,, +109,5,, 109,9,, +110,5,, 110,9,, +111,5,, 111,9,, +112,5,, 112,9,, +113,5,, 113,9,, +114,5,, 114,9,, +115,5,, 115,9,, +116,5,, 116,9,, +117,5,, 117,9,, +118,5,, 118,9,, +119,5,, 119,9,, +120,5,, 120,9,, +121,5,, 121,9,, +122,5,, 122,9,, +123,5,, 123,9,, +124,5,, 124,9,, +125,5,, 125,9,, +126,5,, 126,9,, +127,5,, 127,9,, +128,5,, 128,9,, +129,5,, 129,9,, +130,5,, 130,9,, +131,5,, 131,9,, +132,5,, 132,9,, +133,5,, 133,9,, +134,5,, 134,9,, +135,5,, 135,9,, +136,5,, 136,9,, +137,5,, 137,9,, +138,5,, 138,9,, +139,5,, 139,9,, +140,5,, 140,9,, +141,5,, 141,9,, +142,5,, 142,9,, +143,5,, 143,9,, +144,5,, 144,9,, +145,5,, 145,9,, +146,5,, 146,9,, +147,5,, 147,9,, +148,5,, 148,9,, +149,5,, 149,9,, +150,5,, 150,9,, +151,5,, 151,9,, +152,5,, 152,9,, +153,5,, 153,9,, +154,5,, 154,9,, +155,5,, 155,9,, +156,5,, 156,9,, +157,5,, 157,9,, +158,5,, 158,9,, +159,5,, 159,9,, +160,5,, 160,9,, +161,5,, 161,9,, +162,5,, 162,9,, +163,5,, 163,9,, +164,5,, 164,9,, +165,5,, 165,9,, +166,5,, 166,9,, +167,5,, 167,9,, +168,5,, 168,9,, +169,5,, 169,9,, +170,5,, 170,9,, +171,5,, 171,9,, +172,5,, 172,9,, +173,5,, 173,9,, +174,5,, 174,9,, +175,5,, 175,9,, +176,5,, 176,9,, +177,5,, 177,9,, +178,5,, 178,9,, +179,5,, 179,9,, +180,5,, 180,9,, +181,5,, 181,9,, +182,5,, 182,9,, +183,5,, 183,9,, +184,5,, 184,9,, +185,5,, 185,9,, +186,5,, 186,9,, +187,5,, 187,9,, +188,5,, 188,9,, +189,5,, 189,9,, +190,5,, 190,9,, +191,5,, 191,9,, +192,5,, 192,9,, +193,5,, 193,9,, +194,5,, 194,9,, +195,5,, 195,9,, +196,5,, 196,9,, +197,5,, 197,9,, +198,5,, 198,9,, +199,5,, 199,9,, +200,5,, 200,9,, +201,5,Lettre A,Zarbi A 201,9,Letter A,Unown A +202,5,, 202,9,, +203,5,, 203,9,, +204,5,, 204,9,, +205,5,, 205,9,, +206,5,, 206,9,, +207,5,, 207,9,, +208,5,, 208,9,, +209,5,, 209,9,, +210,5,, 210,9,, +211,5,, 211,9,, +212,5,, 212,9,, +213,5,, 213,9,, +214,5,, 214,9,, +215,5,, 215,9,, +216,5,, 216,9,, +217,5,, 217,9,, +218,5,, 218,9,, +219,5,, 219,9,, +220,5,, 220,9,, +221,5,, 221,9,, +222,5,, 222,9,, +223,5,, 223,9,, +224,5,, 224,9,, +225,5,, 225,9,, +226,5,, 226,9,, +227,5,, 227,9,, +228,5,, 228,9,, +229,5,, 229,9,, +230,5,, 230,9,, +231,5,, 231,9,, +232,5,, 232,9,, +233,5,, 233,9,, +234,5,, 234,9,, +235,5,, 235,9,, +236,5,, 236,9,, +237,5,, 237,9,, +238,5,, 238,9,, +239,5,, 239,9,, +240,5,, 240,9,, +241,5,, 241,9,, +242,5,, 242,9,, +243,5,, 243,9,, +244,5,, 244,9,, +245,5,, 245,9,, +246,5,, 246,9,, +247,5,, 247,9,, +248,5,, 248,9,, +249,5,, 249,9,, +250,5,, 250,9,, +251,5,, 251,9,, +252,5,, 252,9,, +253,5,, 253,9,, +254,5,, 254,9,, +255,5,, 255,9,, +256,5,, 256,9,, +257,5,, 257,9,, +258,5,, 258,9,, +259,5,, 259,9,, +260,5,, 260,9,, +261,5,, 261,9,, +262,5,, 262,9,, +263,5,, 263,9,, +264,5,, 264,9,, +265,5,, 265,9,, +266,5,, 266,9,, +267,5,, 267,9,, +268,5,, 268,9,, +269,5,, 269,9,, +270,5,, 270,9,, +271,5,, 271,9,, +272,5,, 272,9,, +273,5,, 273,9,, +274,5,, 274,9,, +275,5,, 275,9,, +276,5,, 276,9,, +277,5,, 277,9,, +278,5,, 278,9,, +279,5,, 279,9,, +280,5,, 280,9,, +281,5,, 281,9,, +282,5,, 282,9,, +283,5,, 283,9,, +284,5,, 284,9,, +285,5,, 285,9,, +286,5,, 286,9,, +287,5,, 287,9,, +288,5,, 288,9,, +289,5,, 289,9,, +290,5,, 290,9,, +291,5,, 291,9,, +292,5,, 292,9,, +293,5,, 293,9,, +294,5,, 294,9,, +295,5,, 295,9,, +296,5,, 296,9,, +297,5,, 297,9,, +298,5,, 298,9,, +299,5,, 299,9,, +300,5,, 300,9,, +301,5,, 301,9,, +302,5,, 302,9,, +303,5,, 303,9,, +304,5,, 304,9,, +305,5,, 305,9,, +306,5,, 306,9,, +307,5,, 307,9,, +308,5,, 308,9,, +309,5,, 309,9,, +310,5,, 310,9,, +311,5,, 311,9,, +312,5,, 312,9,, +313,5,, 313,9,, +314,5,, 314,9,, +315,5,, 315,9,, +316,5,, 316,9,, +317,5,, 317,9,, +318,5,, 318,9,, +319,5,, 319,9,, +320,5,, 320,9,, +321,5,, 321,9,, +322,5,, 322,9,, +323,5,, 323,9,, +324,5,, 324,9,, +325,5,, 325,9,, +326,5,, 326,9,, +327,5,, 327,9,, +328,5,, 328,9,, +329,5,, 329,9,, +330,5,, 330,9,, +331,5,, 331,9,, +332,5,, 332,9,, +333,5,, 333,9,, +334,5,, 334,9,, +335,5,, 335,9,, +336,5,, 336,9,, +337,5,, 337,9,, +338,5,, 338,9,, +339,5,, 339,9,, +340,5,, 340,9,, +341,5,, 341,9,, +342,5,, 342,9,, +343,5,, 343,9,, +344,5,, 344,9,, +345,5,, 345,9,, +346,5,, 346,9,, +347,5,, 347,9,, +348,5,, 348,9,, +349,5,, 349,9,, +350,5,, 350,9,, +351,5,, 351,9,, +352,5,, 352,9,, +353,5,, 353,9,, +354,5,, 354,9,, +355,5,, 355,9,, +356,5,, 356,9,, +357,5,, 357,9,, +358,5,, 358,9,, +359,5,, 359,9,, +360,5,, 360,9,, +361,5,, 361,9,, +362,5,, 362,9,, +363,5,, 363,9,, +364,5,, 364,9,, +365,5,, 365,9,, +366,5,, 366,9,, +367,5,, 367,9,, +368,5,, 368,9,, +369,5,, 369,9,, +370,5,, 370,9,, +371,5,, 371,9,, +372,5,, 372,9,, +373,5,, 373,9,, +374,5,, 374,9,, +375,5,, 375,9,, +376,5,, 376,9,, +377,5,, 377,9,, +378,5,, 378,9,, +379,5,, 379,9,, +380,5,, 380,9,, +381,5,, 381,9,, +382,5,, 382,9,, +383,5,, 383,9,, +384,5,, 384,9,, +385,5,, 385,9,, +386,5,Forme Normale,Deoxys Normal 386,9,Normal Forme,Normal Deoxys +387,5,, 387,9,, +388,5,, 388,9,, +389,5,, 389,9,, +390,5,, 390,9,, +391,5,, 391,9,, +392,5,, 392,9,, +393,5,, 393,9,, +394,5,, 394,9,, +395,5,, 395,9,, +396,5,, 396,9,, +397,5,, 397,9,, +398,5,, 398,9,, +399,5,, 399,9,, +400,5,, 400,9,, +401,5,, 401,9,, +402,5,, 402,9,, +403,5,, 403,9,, +404,5,, 404,9,, +405,5,, 405,9,, +406,5,, 406,9,, +407,5,, 407,9,, +408,5,, 408,9,, +409,5,, 409,9,, +410,5,, 410,9,, +411,5,, 411,9,, +412,5,Cape Plante,Cheniti Plante 412,9,Plant Cloak,Plant Burmy +413,5,Cape Plante,Cheniselle Plante 413,9,Plant Cloak,Plant Wormadam +414,5,, 414,9,, +415,5,, 415,9,, +416,5,, 416,9,, +417,5,, 417,9,, +418,5,, 418,9,, +419,5,, 419,9,, +420,5,, 420,9,, +421,5,Temps Couvert,Ceriflor Couvert 421,9,Overcast Form,Overcast Cherrim +422,5,Mer Occident,Sancoki Occident 422,9,West Sea,West Shellos +423,5,Mer Occident,Tritosor Occident 423,9,West Sea,West Gastrodon +424,5,, 424,9,, +425,5,, 425,9,, +426,5,, 426,9,, +427,5,, 427,9,, +428,5,, 428,9,, +429,5,, 429,9,, +430,5,, 430,9,, +431,5,, 431,9,, +432,5,, 432,9,, +433,5,, 433,9,, +434,5,, 434,9,, +435,5,, 435,9,, +436,5,, 436,9,, +437,5,, 437,9,, +438,5,, 438,9,, +439,5,, 439,9,, +440,5,, 440,9,, +441,5,, 441,9,, +442,5,, 442,9,, +443,5,, 443,9,, +444,5,, 444,9,, +445,5,, 445,9,, +446,5,, 446,9,, +447,5,, 447,9,, +448,5,, 448,9,, +449,5,, 449,9,, +450,5,, 450,9,, +451,5,, 451,9,, +452,5,, 452,9,, +453,5,, 453,9,, +454,5,, 454,9,, +455,5,, 455,9,, +456,5,, 456,9,, +457,5,, 457,9,, +458,5,, 458,9,, +459,5,, 459,9,, +460,5,, 460,9,, +461,5,, 461,9,, +462,5,, 462,9,, +463,5,, 463,9,, +464,5,, 464,9,, +465,5,, 465,9,, +466,5,, 466,9,, +467,5,, 467,9,, +468,5,, 468,9,, +469,5,, 469,9,, +470,5,, 470,9,, +471,5,, 471,9,, +472,5,, 472,9,, +473,5,, 473,9,, +474,5,, 474,9,, +475,5,, 475,9,, +476,5,, 476,9,, +477,5,, 477,9,, +478,5,, 478,9,, +479,5,, 479,9,, +480,5,, 480,9,, +481,5,, 481,9,, +482,5,, 482,9,, +483,5,, 483,9,, +484,5,, 484,9,, +485,5,, 485,9,, +486,5,, 486,9,, +487,5,Forme Alternative,Giratina Alternative 487,9,Altered Forme,Altered Giratina +488,5,, 488,9,, +489,5,, 489,9,, +490,5,, 490,9,, +491,5,, 491,9,, +492,5,Forme Terrestre,Shaymin Terrestre 492,9,Land Forme,Land Shaymin +493,5,Type Normal,Arceus Normal 493,9,Normal Type,Normal Arceus +494,5,, 494,9,, +495,5,, 495,9,, +496,5,, 496,9,, +497,5,, 497,9,, +498,5,, 498,9,, +499,5,, 499,9,, +500,5,, 500,9,, +501,5,, 501,9,, +502,5,, 502,9,, +503,5,, 503,9,, +504,5,, 504,9,, +505,5,, 505,9,, +506,5,, 506,9,, +507,5,, 507,9,, +508,5,, 508,9,, +509,5,, 509,9,, +510,5,, 510,9,, +511,5,, 511,9,, +512,5,, 512,9,, +513,5,, 513,9,, +514,5,, 514,9,, +515,5,, 515,9,, +516,5,, 516,9,, +517,5,, 517,9,, +518,5,, 518,9,, +519,5,, 519,9,, +520,5,, 520,9,, +521,5,, 521,9,, +522,5,, 522,9,, +523,5,, 523,9,, +524,5,, 524,9,, +525,5,, 525,9,, +526,5,, 526,9,, +527,5,, 527,9,, +528,5,, 528,9,, +529,5,, 529,9,, +530,5,, 530,9,, +531,5,, 531,9,, +532,5,, 532,9,, +533,5,, 533,9,, +534,5,, 534,9,, +535,5,, 535,9,, +536,5,, 536,9,, +537,5,, 537,9,, +538,5,, 538,9,, +539,5,, 539,9,, +540,5,, 540,9,, +541,5,, 541,9,, +542,5,, 542,9,, +543,5,, 543,9,, +544,5,, 544,9,, +545,5,, 545,9,, +546,5,, 546,9,, +547,5,, 547,9,, +548,5,, 548,9,, +549,5,, 549,9,, +550,5,Motif Rouge,Bargantua Rouge 550,9,Red-Striped Form,Red-Striped Basculin +551,5,, 551,9,, +552,5,, 552,9,, +553,5,, 553,9,, +554,5,, 554,9,, +555,5,Mode Normal,Darumacho Normal 555,9,Standard Mode,Standard Darmanitan +556,5,, 556,9,, +557,5,, 557,9,, +558,5,, 558,9,, +559,5,, 559,9,, +560,5,, 560,9,, +561,5,, 561,9,, +562,5,, 562,9,, +563,5,, 563,9,, +564,5,, 564,9,, +565,5,, 565,9,, +566,5,, 566,9,, +567,5,, 567,9,, +568,5,, 568,9,, +569,5,, 569,9,, +570,5,, 570,9,, +571,5,, 571,9,, +572,5,, 572,9,, +573,5,, 573,9,, +574,5,, 574,9,, +575,5,, 575,9,, +576,5,, 576,9,, +577,5,, 577,9,, +578,5,, 578,9,, +579,5,, 579,9,, +580,5,, 580,9,, +581,5,, 581,9,, +582,5,, 582,9,, +583,5,, 583,9,, +584,5,, 584,9,, +585,5,Forme Printemps,Vivaldaim Printemps 585,9,Spring Form,Spring Deerling +586,5,Forme Printemps,Haydaim Printemps 586,9,Spring Form,Spring Sawsbuck +587,5,, 587,9,, +588,5,, 588,9,, +589,5,, 589,9,, +590,5,, 590,9,, +591,5,, 591,9,, +592,5,, 592,9,, +593,5,, 593,9,, +594,5,, 594,9,, +595,5,, 595,9,, +596,5,, 596,9,, +597,5,, 597,9,, +598,5,, 598,9,, +599,5,, 599,9,, +600,5,, 600,9,, +601,5,, 601,9,, +602,5,, 602,9,, +603,5,, 603,9,, +604,5,, 604,9,, +605,5,, 605,9,, +606,5,, 606,9,, +607,5,, 607,9,, +608,5,, 608,9,, +609,5,, 609,9,, +610,5,, 610,9,, +611,5,, 611,9,, +612,5,, 612,9,, +613,5,, 613,9,, +614,5,, 614,9,, +615,5,, 615,9,, +616,5,, 616,9,, +617,5,, 617,9,, +618,5,, 618,9,, +619,5,, 619,9,, +620,5,, 620,9,, +621,5,, 621,9,, +622,5,, 622,9,, +623,5,, 623,9,, +624,5,, 624,9,, +625,5,, 625,9,, +626,5,, 626,9,, +627,5,, 627,9,, +628,5,, 628,9,, +629,5,, 629,9,, +630,5,, 630,9,, +631,5,, 631,9,, +632,5,, 632,9,, +633,5,, 633,9,, +634,5,, 634,9,, +635,5,, 635,9,, +636,5,, 636,9,, +637,5,, 637,9,, +638,5,, 638,9,, +639,5,, 639,9,, +640,5,, 640,9,, +641,5,, 641,9,, +642,5,, 642,9,, +643,5,, 643,9,, +644,5,, 644,9,, +645,5,, 645,9,, +646,5,, 646,9,, +647,5,, 647,9,, +648,5,Forme Chant,Meloetta Chant 648,9,Aria Forme,Aria Meloetta +649,5,, 649,9,, +650,5,Lettre B,Zarbi B 650,9,Letter B,Unown B +651,5,Lettre C,Zarbi C 651,9,Letter C,Unown C +652,5,Lettre D,Zarbi D 652,9,Letter D,Unown D +653,5,Lettre E,Zarbi E 653,9,Letter E,Unown E +654,5,Lettre F,Zarbi F 654,9,Letter F,Unown F +655,5,Lettre G,Zarbi G 655,9,Letter G,Unown G +656,5,Lettre H,Zarbi H 656,9,Letter H,Unown H +657,5,Lettre I,Zarbi I 657,9,Letter I,Unown I +658,5,Lettre J,Zarbi J 658,9,Letter J,Unown J +659,5,Lettre K,Zarbi K 659,9,Letter K,Unown K +660,5,Lettre L,Zarbi L 660,9,Letter L,Unown L +661,5,Lettre M,Zarbi M 661,9,Letter M,Unown M +662,5,Lettre N,Zarbi N 662,9,Letter N,Unown N +663,5,Lettre O,Zarbi O 663,9,Letter O,Unown O +664,5,Lettre P,Zarbi P 664,9,Letter P,Unown P +665,5,Lettre Q,Zarbi Q 665,9,Letter Q,Unown Q +666,5,Lettre R,Zarbi R 666,9,Letter R,Unown R +667,5,Lettre S,Zarbi S 667,9,Letter S,Unown S +668,5,Lettre T,Zarbi T 668,9,Letter T,Unown T +669,5,Lettre U,Zarbi U 669,9,Letter U,Unown U +670,5,Lettre V,Zarbi V 670,9,Letter V,Unown V +671,5,Lettre W,Zarbi W 671,9,Letter W,Unown W +672,5,Lettre X,Zarbi X 672,9,Letter X,Unown X +673,5,Lettre Y,Zarbi Y 673,9,Letter Y,Unown Y +674,5,Lettre Z,Zarbi Z 674,9,Letter Z,Unown Z +675,5,Point d'Exclamation,Zarbi ! 675,9,Exclamation Mark,Unown ! +676,5,Point d'Interrogation,Zarbi ? 676,9,Question Mark,Unown ? +677,5,Forme Solaire,Morphéo Solaire 677,9,Sunny Form,Sunny Castform +678,5,Forme Eau de Pluie,Morphéo Eau de Pluie 678,9,Rainy Form,Rainy Castform +679,5,Forme Blizzard,Morphéo Blizzard 679,9,Snowy Form,Snowy Castform +680,5,Forme Attaque,Deoxys Attaque 680,9,Attack Form,Attack Deoxys +681,5,Forme Défense,Deoxys Défense 681,9,Defense Form,Defense Deoxys +682,5,Forme Vitesse,Deoxys Vitesse 682,9,Speed Form,Speed Deoxys +683,5,Cape Sable,Cheniti Sable 683,9,Sandy Cloak,Sandy Burmy +684,5,Cape Déchet,Cheniti Déchet 684,9,Trash Cloak,Trash Burmy +685,5,Cape Sable,Chenselle Sable 685,9,Sandy Cloak,Sandy Wormadam +686,5,Cape Déchet,Cheniselle Déchet 686,9,Trash Cloak,Trash Wormadam +687,5,Temps Ensoleillé,Ceriflor Ensoleillé 687,9,Sunshine Form,Sunshine Cherrim +688,5,Mer Orient,Sancoki Orient 688,9,East Sea,East Shellos +689,5,Mer Orient,Tritosor Orient 689,9,East Sea,East Gastrodon +690,5,Type Insecte,Arceus Insecte 690,9,Bug Type,Bug Arceus +691,5,Type Ténèbres,Arceus Ténèbres 691,9,Dark Type,Dark Arceus +692,5,Type Dragon,Arceus Dragon 692,9,Dragon Type,Dragon Arceus +693,5,Type Électrik,Arceus Électrik 693,9,Electric Type,Electric Arceus +694,5,Type Combat,Arceus Combat 694,9,Fighting Type,Fighting Arceus +695,5,Type Feu,Arceus Feu 695,9,Fire Type,Fire Arceus +696,5,Type Vol,Arceus Vol 696,9,Flying Type,Flying Arceus +697,5,Type Spectre,Arceus Spectre 697,9,Ghost Type,Ghost Arceus +698,5,Type Plante,Arceus Plante 698,9,Grass Type,Grass Arceus +699,5,Type Sol,Arceus Sol 699,9,Ground Type,Ground Arceus +700,5,Type Glace,Arceus Glace 700,9,Ice Type,Ice Arceus +701,5,Type Poison,Arceus Poison 701,9,Poison Type,Poison Arceus +702,5,Type Psy,Arceus Psy 702,9,Psychic Type,Psychic Arceus +703,5,Type Roche,Arceus Roche 703,9,Rock Type,Rock Arceus +704,5,Type Acier,Arceus Acier 704,9,Steel Type,Steel Arceus +705,5,Type Eau,Arceus Eau 705,9,Water Type,Water Arceus +706,5,Type ???,Arceus ??? 706,9,??? Type,??? Arceus +707,5,Forme Chaleur,Motisma Chaleur 707,9,Heat Form,Heat Rotom +708,5,Forme Lavage,Motisma Lavage 708,9,Wash Form,Wash Rotom +709,5,Forme Froid,Motisma Froid 709,9,Frost Form,Frost Rotom +710,5,Forme Hélice,Motisma Hélice 710,9,Fan Form,Fan Rotom +711,5,Forme Tonte,Motisma Tonte 711,9,Mow Form,Mow Rotom +712,5,Forme Originelle,Giratina Originel 712,9,Origin Forme,Origin Giratina +713,5,Forme Céleste,Shaymin Céleste 713,9,Sky Forme,Sky Shaymin +714,5,Troizépi,Pichu Troizépi 714,9,Spiky-eared,Spiky-eared Pichu +715,5,Motif Bleu,Bargantua Bleu 715,9,Blue-Striped Form,Blue-Striped Basculin +716,5,Mode Transe,Darumacho Transe 716,9,Zen Mode,Zen Darmanitan +717,5,Forme Été,Vivaldaim Été 717,9,Summer Form,Summer Deerling +718,5,Forme Automne,Vivaldaim Automne 718,9,Autumn Form,Autumn Deerling +719,5,Forme Hiver,Vivaldaim Hiver 719,9,Winter Form,Winter Deerling +720,5,Forme Été,Haydaim Été 720,9,Summer Form,Summer Sawsbuck +721,5,Forme Automne,Haydaim Automne 721,9,Autumn Form,Autumn Sawsbuck +722,5,Forme Hiver,Haydaim Hiver 722,9,Winter Form,Winter Sawsbuck +723,5,Forme Danse,Meloetta Danse 723,9,Pirouette Forme,Pirouette Meloetta +724,5,Module Aqua,Genesect Aqua 724,9,Douse Drive,Douse Genesect +725,5,Module Choc,Genesect Choc 725,9,Shock Drive,Shock Genesect +726,5,Module Pyro,Genesect Pyro 726,9,Burn Drive,Burn Genesect +727,5,Module Cryo,Genesect Cryo 727,9,Chill Drive,Chill Genesect From 111394315e44f620cb265193669501aa2c1af62c Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Fri, 20 Jan 2012 23:18:38 -0500 Subject: [PATCH 4/6] =?UTF-8?q?Fix=20the=20indiscriminate=20display=20of?= =?UTF-8?q?=20Pok=C3=A9mon=20with=20their=20form=20names.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pokedex/db/tables.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 5ed1482..d38fa5e 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -1082,7 +1082,13 @@ class Pokemon(TableBase): @property def name(self): - return self.default_form.pokemon_name or self.species.name + u"""Returns a name for this Pokémon, specifiying the form iff it + represents a specific PokemonForm. + """ + if any(not form.is_default for form in self.forms): + return self.species.name + else: + return self.default_form.pokemon_name or self.species.name def stat(self, stat_identifier): u"""Returns a PokemonStat record for the given stat name (or Stat row From eb7c26b621c26d97abd4bf7f6eb9785e8a11be6d Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Sun, 22 Jan 2012 23:11:17 -0500 Subject: [PATCH 5/6] Add Keldeo's Secret Sword tutor. --- pokedex/data/csv/pokemon_moves.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/pokedex/data/csv/pokemon_moves.csv b/pokedex/data/csv/pokemon_moves.csv index d66949e..3a1d3e6 100644 --- a/pokedex/data/csv/pokemon_moves.csv +++ b/pokedex/data/csv/pokemon_moves.csv @@ -205787,6 +205787,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order 647,11,526,1,61, 647,11,526,4,0, 647,11,533,1,43, +647,11,548,3,0, 648,11,47,1,16, 648,11,60,1,31, 648,11,63,4,0, From a6f9b47ae4a26c9b8ac245142c63dd69181ea3df Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Tue, 24 Jan 2012 00:24:23 -0500 Subject: [PATCH 6/6] Copy the red Basculin's egg moves to the blue one. #575 --- pokedex/data/csv/pokemon_moves.csv | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pokedex/data/csv/pokemon_moves.csv b/pokedex/data/csv/pokemon_moves.csv index 3a1d3e6..4934812 100644 --- a/pokedex/data/csv/pokemon_moves.csv +++ b/pokedex/data/csv/pokemon_moves.csv @@ -208616,9 +208616,13 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order 665,11,55,1,1,2 665,11,57,4,0, 665,11,58,4,0, +665,11,61,2,0, 665,11,92,4,0, +665,11,97,2,0, +665,11,99,2,0, 665,11,104,4,0, 665,11,127,4,0, +665,11,129,2,0, 665,11,156,4,0, 665,11,164,4,0, 665,11,175,1,46, @@ -208631,11 +208635,16 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order 665,11,237,4,0, 665,11,240,4,0, 665,11,242,1,24, +665,11,250,2,0, 665,11,253,1,4, 665,11,258,4,0, 665,11,263,4,0, 665,11,269,4,0, +665,11,279,2,0, 665,11,291,4,0, +665,11,330,2,0, +665,11,341,2,0, +665,11,362,2,0, 665,11,401,1,28, 665,11,453,1,13, 665,11,487,1,32,