mirror of
https://github.com/PokeAPI/pokeapi
synced 2024-11-10 06:04:18 +00:00
Merge branch 'master' into openapi-nix
This commit is contained in:
commit
d4712727b0
3 changed files with 48 additions and 14 deletions
|
@ -719,12 +719,12 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
|
|||
718,multi-attack,7,1,120,10,100,0,10,2,269,,,,
|
||||
719,10-000-000-volt-thunderbolt,7,13,195,1,,0,10,3,1,,,,
|
||||
720,mind-blown,7,10,150,5,100,0,9,3,420,,,,
|
||||
721,plasma-fists,7,13,100,15,100,0,10,2,1,,,,
|
||||
721,plasma-fists,7,13,100,15,100,0,10,2,417,,,,
|
||||
722,photon-geyser,7,14,100,5,100,0,10,3,1,,,,
|
||||
723,light-that-burns-the-sky,7,14,200,1,,0,10,3,416,,,,
|
||||
724,searing-sunraze-smash,7,9,200,1,,0,10,2,411,,,,
|
||||
725,menacing-moonraze-maelstrom,7,8,200,1,,0,10,3,411,,,,
|
||||
726,lets-snuggle-forever,7,18,190,1,,0,10,2,417,,,,
|
||||
726,lets-snuggle-forever,7,18,190,1,,0,10,2,1,,,,
|
||||
727,splintered-stormshards,7,6,190,1,,0,10,2,418,,,,
|
||||
728,clangorous-soulblaze,7,16,185,1,,0,11,3,419,100,,,
|
||||
729,zippy-zap,7,13,80,10,100,2,10,2,1,100,,,
|
||||
|
|
|
|
@ -183571,4 +183571,38 @@ gives rise to the budding of fresh life across Hisui."
|
|||
1007,40,9,"This seems to be the Winged King mentioned in an old expedition journal. It was said to have split the land with its bare fists."
|
||||
1007,41,9,"This Pokémon resembles Cyclizar, but it is far burlier and more ferocious. Nothing is known about its ecology or other features."
|
||||
1008,40,9,"Much remains unknown about this creature. It resembles Cyclizar, but it is far more ruthless and powerful."
|
||||
1008,41,9,"This seems to be the Iron Serpent mentioned in an old book. The Iron Serpent is said to have turned the land to ash with its lightning."
|
||||
1008,41,9,"This seems to be the Iron Serpent mentioned in an old book. The Iron Serpent is said to have turned the land to ash with its lightning."
|
||||
1009,40,9,"This ferocious creature is shrouded in mystery. It's named after an aquatic monster mentioned in an old expedition journal."
|
||||
1009,41,9,"It resembles an illustration published in a paranormal magazine, said to be a depiction of a super-ancient Suicune."
|
||||
1010,40,9,"Many of its physical characteristics match those of a Virizion from the future that was covered in a paranormal magazine."
|
||||
1010,41,9,"According to the few eyewitness accounts that exist, it used its shining blades to julienne large trees and boulders."
|
||||
1011,40,9,"Dipplin is two creatures in one Pokémon. Its evolution was triggered by a special apple grown only in one place."
|
||||
1011,41,9,"The head sticking out belongs to the fore-wyrm, while the tail belongs to the core-wyrm. The two share one apple and help each other out."
|
||||
1012,40,9,"Supposedly, the regrets of a tea ceremony master who died before perfecting his craft lingered in some matcha and became a Pokémon."
|
||||
1012,41,9,"Poltchageist looks like a regional form of Sinistea, but it was recently discovered that the two Pokémon are entirely unrelated."
|
||||
1013,40,9,"It pretends to be tea, trying to fool people into drinking it so it can drain their life-force. Its ruse is generally unsuccessful."
|
||||
1013,41,9,"It prefers cool, dark places, such as the back of a shelf or the space beneath a home's floorboards. It wanders in search of prey after sunset."
|
||||
1014,40,9,"After all its muscles were stimulated by the toxic chain around its neck, Okidogi transformed and gained a powerful physique."
|
||||
1014,41,9,"Okidogi is a ruffian with a short temper. It can pulverize anything by swinging around the chain on its neck."
|
||||
1015,40,9,"The chain is made from toxins that enhance capabilities. It stimulated Munkidori's brain and caused the Pokémon's psychic powers to bloom."
|
||||
1015,41,9,"Munkidori keeps itself somewhere safe while it toys with its foes, using psychokinesis to induce intense dizziness."
|
||||
1016,40,9,"Fezandipiti owes its beautiful looks and lovely voice to the toxic stimulants emanating from the chain wrapped around its body."
|
||||
1016,41,9,"Fezandipiti beats its glossy wings to scatter pheromones that captivate people and Pokémon."
|
||||
1017,40,9,"This Pokémon's type changes based on which mask it's wearing. It confounds its enemies with nimble movements and kicks."
|
||||
1017,41,9,"This mischief-loving Pokémon is full of curiosity. It battles by drawing out the type-based energy contained within its masks."
|
||||
1018,40,9,"It gathers static electricity from its surroundings. The beams it launches when down on all fours are tremendously powerful."
|
||||
1018,41,9,"It digs holes on mountains, searching for food. It’s so durable that being caught in a cave-in won’t faze it."
|
||||
1019,40,9,"Seven syrpents live inside an apple made of syrup. The syrpent in the center is the commander."
|
||||
1019,41,9,"These capricious syrpents have banded together. On the rare occasion that their moods align, their true power is unleashed."
|
||||
1020,40,9,"There are scant few reports of this creature being sighted. One short video shows it rampaging and spouting pillars of flame."
|
||||
1020,41,9,"It resembles an eerie Pokémon once shown in a paranormal magazine. That Pokémon was said to be an Entei regenerated from a fossil."
|
||||
1021,40,9,"It's said to incinerate everything around it with lightning launched from its fur. Very little is known about this creature."
|
||||
1021,41,9,"It bears resemblance to a Pokémon that became a hot topic for a short while after a paranormal magazine touted it as Raikou's ancestor."
|
||||
1022,40,9,"It resembles a Pokémon described in a dubious magazine as a Terrakion that had been modified by an evil organization."
|
||||
1022,41,9,"It was named after a mysterious object recorded in an old book. Its body seems to be metallic."
|
||||
1023,40,9,"It resembles a mysterious object introduced in a paranormal magazine as a cutting-edge weapon shaped like a Cobalion."
|
||||
1023,41,9,"There was supposedly an incident in which it launched shining blades to cut everything around it to pieces. Little else is known about it."
|
||||
1024,40,9,"Terapagos protects itself using its power to transform energy into hard crystals. This Pokémon is the source of the Terastal phenomenon."
|
||||
1024,41,9,"It’s thought that this Pokémon lived in ancient Paldea until it got caught in seismic shifts and went extinct."
|
||||
1025,40,9,"It feeds others toxic mochi that draw out desires and capabilities. Those who eat the mochi fall under Pecharunt’s control, chained to its will."
|
||||
1025,41,9,"Its peach-shaped shell serves as storage for a potent poison. It makes poisonous mochi and serves them to people and Pokémon."
|
||||
|
|
Can't render this file because it is too large.
|
|
@ -11116,7 +11116,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1011,6,Sirapfel,
|
||||
1011,7,Dipplin,
|
||||
1011,8,Dipplin,
|
||||
1011,9,Dipplin,
|
||||
1011,9,Dipplin,Candy Apple Pokémon
|
||||
1011,11,カミッチュ,
|
||||
1011,12,裹蜜虫,
|
||||
1012,1,チャデス,
|
||||
|
@ -11126,7 +11126,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1012,6,Mortcha,
|
||||
1012,7,Poltchageist,
|
||||
1012,8,Poltchageist,
|
||||
1012,9,Poltchageist,
|
||||
1012,9,Poltchageist,Matcha Pokémon
|
||||
1012,11,チャデス,
|
||||
1012,12,斯魔茶,
|
||||
1013,1,ヤバソチャ,
|
||||
|
@ -11136,7 +11136,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1013,6,Fatalitcha,
|
||||
1013,7,Sinistcha,
|
||||
1013,8,Sinistcha,
|
||||
1013,9,Sinistcha,
|
||||
1013,9,Sinistcha,Matcha Pokémon
|
||||
1013,11,ヤバソチャ,
|
||||
1013,12,来悲粗茶,
|
||||
1014,1,イイネイヌ,
|
||||
|
@ -11146,7 +11146,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1014,6,Boninu,
|
||||
1014,7,Okidogi,
|
||||
1014,8,Okidogi,
|
||||
1014,9,Okidogi,
|
||||
1014,9,Okidogi,Retainer Pokémon
|
||||
1014,11,イイネイヌ,
|
||||
1014,12,够赞狗,
|
||||
1015,1,マシマシラ,
|
||||
|
@ -11156,7 +11156,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1015,6,Benesaru,
|
||||
1015,7,Munkidori,
|
||||
1015,8,Munkidori,
|
||||
1015,9,Munkidori,
|
||||
1015,9,Munkidori,Retainer Pokémon
|
||||
1015,11,マシマシラ,
|
||||
1015,12,愿增猿,
|
||||
1016,1,キチキギス,
|
||||
|
@ -11166,7 +11166,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1016,6,Beatori,
|
||||
1016,7,Fezandipiti,
|
||||
1016,8,Fezandipiti,
|
||||
1016,9,Fezandipiti,
|
||||
1016,9,Fezandipiti,Retainer Pokémon
|
||||
1016,11,キチキギス,
|
||||
1016,12,吉雉鸡,
|
||||
1017,1,オーガポン,
|
||||
|
@ -11176,7 +11176,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1017,6,Ogerpon,
|
||||
1017,7,Ogerpon,
|
||||
1017,8,Ogerpon,
|
||||
1017,9,Ogerpon,
|
||||
1017,9,Ogerpon,Mask Pokémon
|
||||
1017,11,オーガポン,
|
||||
1017,12,厄诡椪,
|
||||
1018,1,ブリジュラス,ごうきんポケモン
|
||||
|
@ -11206,7 +11206,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1020,6,Keilflamme,
|
||||
1020,7,Flamariete,
|
||||
1020,8,Vampeaguzze,
|
||||
1020,9,Gouging Fire,Paladox Pokémon
|
||||
1020,9,Gouging Fire,Paradox Pokémon
|
||||
1020,11,ウガツホムラ,パラドックスポケモン
|
||||
1020,12,破空焰,
|
||||
1021,1,タケルライコ,パラドックスポケモン
|
||||
|
@ -11216,7 +11216,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1021,6,Furienblitz,
|
||||
1021,7,Electrofuria,
|
||||
1021,8,Furiatonante,
|
||||
1021,9,Raging Bolt,Paladox Pokémon
|
||||
1021,9,Raging Bolt,Paradox Pokémon
|
||||
1021,11,タケルライコ,パラドックスポケモン
|
||||
1021,12,猛雷鼓,
|
||||
1022,1,テツノイワオ,パラドックスポケモン
|
||||
|
@ -11226,7 +11226,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1022,6,Eisenfels,
|
||||
1022,7,Ferromole,
|
||||
1022,8,Massoferreo,
|
||||
1022,9,Iron Boulder,Paladox Pokémon
|
||||
1022,9,Iron Boulder,Paradox Pokémon
|
||||
1022,11,テツノイワオ,パラドックスポケモン
|
||||
1022,12,鐵磐岩,
|
||||
1023,1,テツノカシラ,パラドックスポケモン
|
||||
|
@ -11236,7 +11236,7 @@ pokemon_species_id,local_language_id,name,genus
|
|||
1023,6,Eisenhaupt,
|
||||
1023,7,Ferrotesta,
|
||||
1023,8,Capoferreo,
|
||||
1023,9,Iron Crown,Paladox Pokémon
|
||||
1023,9,Iron Crown,Paradox Pokémon
|
||||
1023,11,テツノカシラ,パラドックスポケモン
|
||||
1023,12,鐵頭殼,
|
||||
1024,1,テラパゴス,テラスタルポケモン
|
||||
|
|
|
Loading…
Reference in a new issue