Skip to content

Commit 34e0513

Browse files
authored
Merge pull request #921 from WyattC16/addTealMask
2 parents 17abf64 + 1b05701 commit 34e0513

14 files changed

+999
-3
lines changed

data/v2/csv/abilities.csv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,10 @@ id,identifier,generation_id,is_main_series
297297
296,armor-tail,9,1
298298
297,earth-eater,9,1
299299
298,mycelium-might,9,1
300+
299,minds-eye,9,1
301+
300,supersweet-syrup,9,1
302+
301,hospitality,9,1
303+
302,toxic-chain,9,1
300304
10001,mountaineer,5,0
301305
10002,wave-rider,5,0
302306
10003,skater,5,0

data/v2/csv/ability_flavor_text.csv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27866,3 +27866,7 @@ Unnerve Ability and Spectrier’s Grim Neigh Ability."
2786627866
二つの 特性を あわせ持つ。"
2786727867
267,20,12,"兼备蕾冠王的紧张感和
2786827868
灵幽马的漆黑嘶鸣这两种特性。"
27869+
299,26,9,The Pokémon ignores changes to opponents' evasiveness, its accuracy can't be lowered, and it can hit Ghost types with Normal-type and Fighting-type moves
27870+
300,26,9,Lowers the evasion of opposing Pok�mon by 1 stage when first sent into battle
27871+
301,26,9,"When the Pok�mon enters a battle, it showers its ally with hospitality, restoring a small amount of the ally's HP"
27872+
302,26,9,The power of the Pok�mon's toxic chain may badly poison any target the Pok�mon hits with a move

data/v2/csv/evolution_chains.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,3 +529,8 @@ id,baby_trigger_item_id
529529
536,
530530
537,
531531
538,
532+
539,
533+
540,
534+
541,
535+
542,
536+
543,

data/v2/csv/move_names.csv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8623,6 +8623,10 @@ move_id,local_language_id,name
86238623
900,8,Turboincanto
86248624
900,9,Magical Torque
86258625
900,11,マジカルアクセル
8626+
901,9,Blood Moon
8627+
902,9,Matcha Gotcha
8628+
903,9,Syrup Bomb
8629+
904,9,Ivy Cudgel
86268630
10001,1,ダークラッシュ
86278631
10001,5,Charge Noire
86288632
10001,6,Cryptoschlag

data/v2/csv/moves.csv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,10 @@ 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,blood-moon,9,1,140,5,100,0,10,3,,,,,
903+
902,matcha-gotcha,9,12,80,15,90,0,10,3,,,,,
904+
903,syrup-bomb,9,12,60,10,85,0,10,3,,,,,
905+
904,ivy-cudgel,9,12,100,10,1100,0,10,2,,,,,
902906
10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
903907
10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
904908
10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

data/v2/csv/pokedexes.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ id,region_id,identifier,is_main_series
2929
29,8,crown-tundra,1
3030
30,9,hisui,1
3131
31,10,paldea,1
32-
32,10,teal-mask,1
32+
32,10,kitakami,1
3333
33,10,indigo-disk,1

data/v2/csv/pokemon.csv

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,13 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
10091009
1008,miraidon,1008,35,2400,,999,1
10101010
1009,walking-wake,1009,35,2800,,1093,1
10111011
1010,iron-leaves,1010,15,1250,,1094,1
1012+
1011,dipplin,1011,4,97,,1095,1
1013+
1012,poltchageist,1012,1,11,,1096,1
1014+
1013,sinistcha,1013,2,22,,1097,1
1015+
1014,okidogi,1014,18,922,,1098,1
1016+
1015,munkidori,1015,10,122,,1099,1
1017+
1016,fezandipiti,1016,14,301,,1100,1
1018+
1017,ogerpon,1017,12,398,,1101,1
10121019
10001,deoxys-attack,386,17,608,270,515,0
10131020
10002,deoxys-defense,386,17,608,270,516,0
10141021
10003,deoxys-speed,386,17,608,270,517,0
@@ -1280,3 +1287,7 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
12801287
10269,miraidon-drive-mode,1008,28,2400,,,0
12811288
10270,miraidon-aquatic-mode,1008,28,2400,,,0
12821289
10271,miraidon-glide-mode,1008,28,2400,,,0
1290+
10272,ursaluna-bloodmoon,901,24,2900,,,0
1291+
10273,ogerpon-wellspring-mask,1017,12,398,,,0
1292+
10274,ogerpon-hearthflame-mask,1017,12,398,,,0
1293+
10275,ogerpon-cornerstone-mask,1017,12,398,,,0

data/v2/csv/pokemon_abilities.csv

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ pokemon_id,ability_id,is_hidden,slot
709709
274,48,0,2
710710
274,124,1,3
711711
275,34,0,1
712-
275,48,0,2
712+
275,274,0,2
713713
275,124,1,3
714714
276,62,0,1
715715
276,113,1,3
@@ -981,7 +981,7 @@ pokemon_id,ability_id,is_hidden,slot
981981
394,67,0,1
982982
394,128,1,3
983983
395,67,0,1
984-
395,128,1,3
984+
395,172,1,3
985985
396,51,0,1
986986
396,120,1,3
987987
397,22,0,1
@@ -2412,6 +2412,20 @@ pokemon_id,ability_id,is_hidden,slot
24122412
1009,281,1,3
24132413
1010,282,0,1
24142414
1010,282,1,3
2415+
1011,300,0,1
2416+
1011,82,0,2
2417+
1011,60,1,3
2418+
1012,301,0,1
2419+
1012,85,1,3
2420+
1013,301,0,1
2421+
1013,85,1,3
2422+
1014,302,0,1
2423+
1014,278,1,3
2424+
1015,302,0,1
2425+
1015,119,1,3
2426+
1016,302,0,1
2427+
1016,101,1,3
2428+
1017,128,0,1
24152429
10001,46,0,1
24162430
10002,46,0,1
24172431
10003,46,0,1
@@ -2908,3 +2922,7 @@ pokemon_id,ability_id,is_hidden,slot
29082922
10270,289,1,3
29092923
10271,289,0,1
29102924
10271,289,1,3
2925+
10272,299,0,1
2926+
10273,11,0,1
2927+
10274,104,0,1
2928+
10275,5,0,1

0 commit comments

Comments
 (0)