Skip to content

Commit a11d4dd

Browse files
authored
Merge branch 'master' into add-italian-translations
2 parents 23951d3 + 255ad9e commit a11d4dd

File tree

6 files changed

+258
-60
lines changed

6 files changed

+258
-60
lines changed

data/v2/csv/move_names.csv

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8451,14 +8451,8 @@ move_id,local_language_id,name
84518451
874,4,淘金潮
84528452
874,9,Make It Rain
84538453
874,11,ゴールドラッシュ
8454-
875,1,はたく
8455-
875,4,拍击
8456-
875,9,Pound
8457-
875,11,はたく
8458-
876,1,はたく
8459-
876,4,拍击
8460-
876,9,Pound
8461-
876,11,はたく
8454+
875,9,Psyblade
8455+
876,9,Hydro Steam
84628456
877,1,カタストロフィ
84638457
877,4,大灾难
84648458
877,9,Ruination

data/v2/csv/moves.csv

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,8 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
873873
872,aqua-step,9,11,80,10,100,0,10,2,,,,,
874874
873,raging-bull,9,1,90,10,100,0,10,2,,,,,
875875
874,make-it-rain,9,9,120,5,100,0,11,3,,,,,
876-
875,pound,9,1,40,35,100,0,10,2,,,,,
877-
876,pound,9,1,40,35,100,0,10,2,,,,,
876+
875,psyblade,9,14,80,15,100,0,10,2,,,,,
877+
876,hydro-steam,9,11,80,15,100,0,10,3,,,,,
878878
877,ruination,9,17,1,10,90,0,10,3,,,,,
879879
878,collision-course,9,2,100,5,100,0,10,2,,,,,
880880
879,electro-drift,9,13,100,5,100,0,10,3,,,,,
@@ -899,8 +899,6 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
899899
898,noxious-torque,9,4,100,10,100,0,10,2,,,,,
900900
899,combat-torque,9,2,100,10,100,0,10,2,,,,,
901901
900,magical-torque,9,18,100,10,100,0,10,2,,,,,
902-
901,hydro-steam,9,11,80,15,100,0,10,3,,,,,
903-
902,psyblade,9,14,80,15,100,0,10,2,,,,,
904902
10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
905903
10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
906904
10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

data/v2/csv/pokemon_abilities.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2830,7 +2830,7 @@ pokemon_id,ability_id,is_hidden,slot
28302830
10239,149,0,1
28312831
10240,51,0,1
28322832
10240,125,0,2
2833-
10240,128,1,3
2833+
10240,110,1,3
28342834
10241,157,0,1
28352835
10241,142,0,2
28362836
10241,183,1,3

0 commit comments

Comments
 (0)