Skip to content

Commit

Permalink
Merge pull request #921 from WyattC16/addTealMask
Browse files Browse the repository at this point in the history
  • Loading branch information
Naramsim authored Sep 21, 2023
2 parents 17abf64 + 1b05701 commit 34e0513
Show file tree
Hide file tree
Showing 14 changed files with 999 additions and 3 deletions.
4 changes: 4 additions & 0 deletions data/v2/csv/abilities.csv
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@ id,identifier,generation_id,is_main_series
296,armor-tail,9,1
297,earth-eater,9,1
298,mycelium-might,9,1
299,minds-eye,9,1
300,supersweet-syrup,9,1
301,hospitality,9,1
302,toxic-chain,9,1
10001,mountaineer,5,0
10002,wave-rider,5,0
10003,skater,5,0
Expand Down
4 changes: 4 additions & 0 deletions data/v2/csv/ability_flavor_text.csv
Original file line number Diff line number Diff line change
Expand Up @@ -27866,3 +27866,7 @@ Unnerve Ability and Spectrier’s Grim Neigh Ability."
二つの 特性を あわせ持つ。"
267,20,12,"兼备蕾冠王的紧张感和
灵幽马的漆黑嘶鸣这两种特性。"
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
300,26,9,Lowers the evasion of opposing Pok�mon by 1 stage when first sent into battle
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"
302,26,9,The power of the Pok�mon's toxic chain may badly poison any target the Pok�mon hits with a move
5 changes: 5 additions & 0 deletions data/v2/csv/evolution_chains.csv
Original file line number Diff line number Diff line change
Expand Up @@ -529,3 +529,8 @@ id,baby_trigger_item_id
536,
537,
538,
539,
540,
541,
542,
543,
4 changes: 4 additions & 0 deletions data/v2/csv/move_names.csv
Original file line number Diff line number Diff line change
Expand Up @@ -8623,6 +8623,10 @@ move_id,local_language_id,name
900,8,Turboincanto
900,9,Magical Torque
900,11,マジカルアクセル
901,9,Blood Moon
902,9,Matcha Gotcha
903,9,Syrup Bomb
904,9,Ivy Cudgel
10001,1,ダークラッシュ
10001,5,Charge Noire
10001,6,Cryptoschlag
Expand Down
4 changes: 4 additions & 0 deletions data/v2/csv/moves.csv
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,10 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
898,noxious-torque,9,4,100,10,100,0,10,2,,,,,
899,combat-torque,9,2,100,10,100,0,10,2,,,,,
900,magical-torque,9,18,100,10,100,0,10,2,,,,,
901,blood-moon,9,1,140,5,100,0,10,3,,,,,
902,matcha-gotcha,9,12,80,15,90,0,10,3,,,,,
903,syrup-bomb,9,12,60,10,85,0,10,3,,,,,
904,ivy-cudgel,9,12,100,10,1100,0,10,2,,,,,
10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,
Expand Down
2 changes: 1 addition & 1 deletion data/v2/csv/pokedexes.csv
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ id,region_id,identifier,is_main_series
29,8,crown-tundra,1
30,9,hisui,1
31,10,paldea,1
32,10,teal-mask,1
32,10,kitakami,1
33,10,indigo-disk,1
11 changes: 11 additions & 0 deletions data/v2/csv/pokemon.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,13 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
1008,miraidon,1008,35,2400,,999,1
1009,walking-wake,1009,35,2800,,1093,1
1010,iron-leaves,1010,15,1250,,1094,1
1011,dipplin,1011,4,97,,1095,1
1012,poltchageist,1012,1,11,,1096,1
1013,sinistcha,1013,2,22,,1097,1
1014,okidogi,1014,18,922,,1098,1
1015,munkidori,1015,10,122,,1099,1
1016,fezandipiti,1016,14,301,,1100,1
1017,ogerpon,1017,12,398,,1101,1
10001,deoxys-attack,386,17,608,270,515,0
10002,deoxys-defense,386,17,608,270,516,0
10003,deoxys-speed,386,17,608,270,517,0
Expand Down Expand Up @@ -1280,3 +1287,7 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
10269,miraidon-drive-mode,1008,28,2400,,,0
10270,miraidon-aquatic-mode,1008,28,2400,,,0
10271,miraidon-glide-mode,1008,28,2400,,,0
10272,ursaluna-bloodmoon,901,24,2900,,,0
10273,ogerpon-wellspring-mask,1017,12,398,,,0
10274,ogerpon-hearthflame-mask,1017,12,398,,,0
10275,ogerpon-cornerstone-mask,1017,12,398,,,0
22 changes: 20 additions & 2 deletions data/v2/csv/pokemon_abilities.csv
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ pokemon_id,ability_id,is_hidden,slot
274,48,0,2
274,124,1,3
275,34,0,1
275,48,0,2
275,274,0,2
275,124,1,3
276,62,0,1
276,113,1,3
Expand Down Expand Up @@ -981,7 +981,7 @@ pokemon_id,ability_id,is_hidden,slot
394,67,0,1
394,128,1,3
395,67,0,1
395,128,1,3
395,172,1,3
396,51,0,1
396,120,1,3
397,22,0,1
Expand Down Expand Up @@ -2412,6 +2412,20 @@ pokemon_id,ability_id,is_hidden,slot
1009,281,1,3
1010,282,0,1
1010,282,1,3
1011,300,0,1
1011,82,0,2
1011,60,1,3
1012,301,0,1
1012,85,1,3
1013,301,0,1
1013,85,1,3
1014,302,0,1
1014,278,1,3
1015,302,0,1
1015,119,1,3
1016,302,0,1
1016,101,1,3
1017,128,0,1
10001,46,0,1
10002,46,0,1
10003,46,0,1
Expand Down Expand Up @@ -2908,3 +2922,7 @@ pokemon_id,ability_id,is_hidden,slot
10270,289,1,3
10271,289,0,1
10271,289,1,3
10272,299,0,1
10273,11,0,1
10274,104,0,1
10275,5,0,1
Loading

0 comments on commit 34e0513

Please sign in to comment.