Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pokemon_form info #799

Merged
merged 8 commits into from
Jan 13, 2023
Merged

Fix pokemon_form info #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9c2cbd
Fix is_battle_only column
giginet Dec 13, 2022
45ad320
Add missing localize
giginet Dec 13, 2022
699cb09
Fix pokemon_name
giginet Dec 13, 2022
5719760
Fix Japanese localization of Sinistea
giginet Dec 13, 2022
ff12a35
Add English form name
giginet Dec 13, 2022
5b384a5
Merge remote-tracking branch 'origin/master' into missing-form-info
giginet Jan 9, 2023
962601c
Merge branch 'master' into missing-form-info
Naramsim Jan 13, 2023
4c289d5
Merge branch 'master' into missing-form-info
Naramsim Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions data/v2/csv/pokemon_form_names.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,9,,Phony Sinistea
854,1,がんさくフォルム,
854,9,Phony Form,Phony Sinistea
854,6,Fälschungsform,Fatalitee (Fälschung)
855,9,,Phony Polteageist
854,11,がんさくフォルム,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add Japanese localization for Phony/Antique forms of Sinistea/Polteageist

855,1,がんさくフォルム,
855,9,Phony Form,Phony Polteageist
855,6,Fälschungsform,Mortipot (Fälschung)
855,11,がんさくフォルム,
869,1,ミルキィバニラ,
869,3,밀키바닐라,
869,4,奶香香草,
Expand Down Expand Up @@ -2756,9 +2760,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,,イワンコ（マイペース）
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add Japanese localization for Rockruff(Own Tempo).

10310,5,,Rocabot Tempo Perso
10310,6,Tempomacherform,Wuffels (Tempomacher)
10310,9,,Own Tempo Rockruff
10310,11,,イワンコ（マイペース）
10311,1,たそがれのすがた,
10311,3,황혼의 모습,
10311,4,黃昏的樣子,
Expand Down Expand Up @@ -3061,10 +3067,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,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,밀키루비,
10346,4,奶香紅鑽,
Expand Down
42 changes: 21 additions & 21 deletions data/v2/csv/pokemon_forms.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,27 +1404,27 @@ 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
Comment on lines +1407 to +1427
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is_battle_only columns of Hisuian forms should be 0.

10419,tauros-paldea-combat-breed,paldea-combat-breed,10250,25,0,0,0,2,1305
10420,tauros-paldea-blaze-breed,paldea-blaze-breed,10251,25,0,0,0,3,1306
10421,tauros-paldea-aqua-breed,paldea-aqua-breed,10252,25,0,0,0,4,1307
Expand Down