From d9c2cbd93458c5abdb0c36905eeb6595a406351e Mon Sep 17 00:00:00 2001 From: giginet Date: Wed, 14 Dec 2022 00:37:28 +0900 Subject: [PATCH 1/5] Fix is_battle_only column --- data/v2/csv/pokemon_forms.csv | 43 ++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/data/v2/csv/pokemon_forms.csv b/data/v2/csv/pokemon_forms.csv index 2ad851973..9ea748867 100644 --- a/data/v2/csv/pokemon_forms.csv +++ b/data/v2/csv/pokemon_forms.csv @@ -1301,24 +1301,25 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau 10395,urshifu-single-strike-gmax,gmax,10226,20,1,1,0,1,1281 10396,urshifu-rapid-strike-gmax,gmax,10227,20,1,1,0,1,1282 10397,toxtricity-low-key-gmax,gmax,10228,20,1,1,0,1,1283 -10398,growlithe-hisui,hisui,10229,24,1,1,0,1,1284 -10399,arcanine-hisui,hisui,10230,24,1,1,0,1,1285 -10400,voltorb-hisui,hisui,10231,24,1,1,0,1,1286 -10401,electrode-hisui,hisui,10232,24,1,1,0,1,1287 -10402,typhlosion-hisui,hisui,10233,24,1,1,0,1,1288 -10403,qwilfish-hisui,hisui,10234,24,1,1,0,1,1289 -10404,sneasel-hisui,hisui,10235,24,1,1,0,1,1290 -10405,samurott-hisui,hisui,10236,24,1,1,0,1,1291 -10406,lilligant-hisui,hisui,10237,24,1,1,0,1,1292 -10407,zorua-hisui,hisui,10238,24,1,1,0,1,1293 -10408,zoroark-hisui,hisui,10239,24,1,1,0,1,1294 -10409,braviary-hisui,hisui,10240,24,1,1,0,1,1295 -10410,sliggoo-hisui,hisui,10241,24,1,1,0,1,1296 -10411,goodra-hisui,hisui,10242,24,1,1,0,1,1297 -10412,avalugg-hisui,hisui,10243,24,1,1,0,1,1298 -10413,decidueye-hisui,hisui,10244,24,1,1,0,1,1299 -10414,dialga-origin,origin,10245,24,1,1,0,1,1300 -10415,palkia-origin,origin,10246,24,1,1,0,1,1301 -10416,basculin-white-striped,white-striped,10247,24,1,1,0,1,1302 -10417,basculegion-female,female,10248,24,1,1,0,1,1303 -10418,enamorus-therian,therian,10249,24,1,1,0,1,1304 +10398,growlithe-hisui,hisui,10229,24,1,0,0,1,1284 +10399,arcanine-hisui,hisui,10230,24,1,0,0,1,1285 +10400,voltorb-hisui,hisui,10231,24,1,0,0,1,1286 +10401,electrode-hisui,hisui,10232,24,1,0,0,1,1287 +10402,typhlosion-hisui,hisui,10233,24,1,0,0,1,1288 +10403,qwilfish-hisui,hisui,10234,24,1,0,0,1,1289 +10404,sneasel-hisui,hisui,10235,24,1,0,0,1,1290 +10405,samurott-hisui,hisui,10236,24,1,0,0,1,1291 +10406,lilligant-hisui,hisui,10237,24,1,0,0,1,1292 +10407,zorua-hisui,hisui,10238,24,1,0,0,1,1293 +10408,zoroark-hisui,hisui,10239,24,1,0,0,1,1294 +10409,braviary-hisui,hisui,10240,24,1,0,0,1,1295 +10410,sliggoo-hisui,hisui,10241,24,1,0,0,1,1296 +10411,goodra-hisui,hisui,10242,24,1,0,0,1,1297 +10412,avalugg-hisui,hisui,10243,24,1,0,0,1,1298 +10413,decidueye-hisui,hisui,10244,24,1,0,0,1,1299 +10414,dialga-origin,origin,10245,24,1,0,0,1,1300 +10415,palkia-origin,origin,10246,24,1,0,0,1,1301 +10416,basculin-white-striped,white-striped,10247,24,1,0,0,1,1302 +10417,basculegion-female,female,10248,24,1,0,0,1,1303 +10418,enamorus-therian,therian,10249,24,1,0,0,1,1304 + From 45ad320973e8db6ec1d8bd2cdddc3c95cb37819f Mon Sep 17 00:00:00 2001 From: giginet Date: Wed, 14 Dec 2022 00:41:25 +0900 Subject: [PATCH 2/5] Add missing localize --- data/v2/csv/pokemon_form_names.csv | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/v2/csv/pokemon_form_names.csv b/data/v2/csv/pokemon_form_names.csv index 8c00ec854..cbb0ef0e2 100644 --- a/data/v2/csv/pokemon_form_names.csv +++ b/data/v2/csv/pokemon_form_names.csv @@ -2729,9 +2729,11 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 10309,5,,Rubombelle Dominant 10309,6,Totemform,Totem Bandelby 10309,9,,Totem Ribombee +10310,1,, 10310,5,,Rocabot Tempo Perso 10310,6,Tempomacherform,Wuffels (Tempomacher) 10310,9,,Own Tempo Rockruff +10310,11,, 10311,1,たそがれのすがた, 10311,3,황혼의 모습, 10311,4,黃昏的樣子, @@ -3034,10 +3036,14 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 10343,9,Low Key Form,Low Key Toxtricity 10343,11,ローなすがた, 10343,12,低调的样子, +10344,1,がんさくフォルム, 10344,6,Originalform,Fatalitee (Original) 10344,9,,Antique Sinistea +10344,11,がんさくフォルム, +10345,1,しんさくフォルム, 10345,6,Originalform,Mortipot (Original) 10345,9,,Antique Polteageist +10345,11,しんさくフォルム, 10346,1,ミルキィルビー, 10346,3,밀키루비, 10346,4,奶香紅鑽, From 699cb0988445146267b69271b5da183a4be2b1d2 Mon Sep 17 00:00:00 2001 From: giginet Date: Wed, 14 Dec 2022 00:47:53 +0900 Subject: [PATCH 3/5] Fix pokemon_name --- data/v2/csv/pokemon_form_names.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/v2/csv/pokemon_form_names.csv b/data/v2/csv/pokemon_form_names.csv index cbb0ef0e2..79917b014 100644 --- a/data/v2/csv/pokemon_form_names.csv +++ b/data/v2/csv/pokemon_form_names.csv @@ -2729,11 +2729,11 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 10309,5,,Rubombelle Dominant 10309,6,Totemform,Totem Bandelby 10309,9,,Totem Ribombee -10310,1,, +10310,1,,イワンコ（マイペース） 10310,5,,Rocabot Tempo Perso 10310,6,Tempomacherform,Wuffels (Tempomacher) 10310,9,,Own Tempo Rockruff -10310,11,, +10310,11,,イワンコ（マイペース） 10311,1,たそがれのすがた, 10311,3,황혼의 모습, 10311,4,黃昏的樣子, From 57197607ca40b1015b6011e776c16b1f4809ebd6 Mon Sep 17 00:00:00 2001 From: giginet Date: Wed, 14 Dec 2022 00:53:05 +0900 Subject: [PATCH 4/5] Fix Japanese localization of Sinistea --- data/v2/csv/pokemon_form_names.csv | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/v2/csv/pokemon_form_names.csv b/data/v2/csv/pokemon_form_names.csv index 79917b014..51d8cb380 100644 --- a/data/v2/csv/pokemon_form_names.csv +++ b/data/v2/csv/pokemon_form_names.csv @@ -396,10 +396,14 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 849,9,Amped Form,Amped Toxtricity 849,11,ハイなすがた, 849,12,高调的样子, +854,1,がんさくフォルム, 854,9,,Phony Sinistea 854,6,Fälschungsform,Fatalitee (Fälschung) +854,11,がんさくフォルム, +855,1,がんさくフォルム, 855,9,,Phony Polteageist 855,6,Fälschungsform,Mortipot (Fälschung) +855,11,がんさくフォルム, 869,1,ミルキィバニラ, 869,3,밀키바닐라, 869,4,奶香香草, @@ -3036,10 +3040,10 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 10343,9,Low Key Form,Low Key Toxtricity 10343,11,ローなすがた, 10343,12,低调的样子, -10344,1,がんさくフォルム, +10344,1,しんさくフォルム, 10344,6,Originalform,Fatalitee (Original) 10344,9,,Antique Sinistea -10344,11,がんさくフォルム, +10344,11,しんさくフォルム, 10345,1,しんさくフォルム, 10345,6,Originalform,Mortipot (Original) 10345,9,,Antique Polteageist From ff12a359db76203a703e2103180825fb3702b2d5 Mon Sep 17 00:00:00 2001 From: giginet Date: Wed, 14 Dec 2022 01:02:34 +0900 Subject: [PATCH 5/5] Add English form name --- data/v2/csv/pokemon_form_names.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/v2/csv/pokemon_form_names.csv b/data/v2/csv/pokemon_form_names.csv index 51d8cb380..8e5678e2a 100644 --- a/data/v2/csv/pokemon_form_names.csv +++ b/data/v2/csv/pokemon_form_names.csv @@ -397,11 +397,11 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 849,11,ハイなすがた, 849,12,高调的样子, 854,1,がんさくフォルム, -854,9,,Phony Sinistea +854,9,Phony Form,Phony Sinistea 854,6,Fälschungsform,Fatalitee (Fälschung) 854,11,がんさくフォルム, 855,1,がんさくフォルム, -855,9,,Phony Polteageist +855,9,Phony Form,Phony Polteageist 855,6,Fälschungsform,Mortipot (Fälschung) 855,11,がんさくフォルム, 869,1,ミルキィバニラ, @@ -3042,11 +3042,11 @@ pokemon_form_id,local_language_id,form_name,pokemon_name 10343,12,低调的样子, 10344,1,しんさくフォルム, 10344,6,Originalform,Fatalitee (Original) -10344,9,,Antique Sinistea +10344,9,Antique Form,Antique Sinistea 10344,11,しんさくフォルム, 10345,1,しんさくフォルム, 10345,6,Originalform,Mortipot (Original) -10345,9,,Antique Polteageist +10345,9,Antique Form,Antique Polteageist 10345,11,しんさくフォルム, 10346,1,ミルキィルビー, 10346,3,밀키루비,