mirror of
https://github.com/smogon/pokemon-showdown.git
synced 2026-06-13 12:12:26 -05:00
Merge pull request #2044 from ascriptmaster/move-fixes
Fix Hoopa, Diancie, and Volcanion's Pokedex colors
This commit is contained in:
commit
bb98c7e382
|
|
@ -828,11 +828,11 @@ noivern:{num:715,species:"Noivern",types:["Flying","Dragon"],baseStats:{hp:85,at
|
|||
xerneas:{num:716,species:"Xerneas",types:["Fairy"],gender:"N",baseStats:{hp:126,atk:131,def:95,spa:131,spd:98,spe:99},abilities:{0:"Fairy Aura"},heightm:3,weightkg:215,color:"Blue",eggGroups:["Undiscovered"]},
|
||||
yveltal:{num:717,species:"Yveltal",types:["Dark","Flying"],gender:"N",baseStats:{hp:126,atk:131,def:95,spa:131,spd:98,spe:99},abilities:{0:"Dark Aura"},heightm:5.8,weightkg:203,color:"Red",eggGroups:["Undiscovered"]},
|
||||
zygarde:{num:718,species:"Zygarde",types:["Dragon","Ground"],gender:"N",baseStats:{hp:108,atk:100,def:121,spa:81,spd:95,spe:95},abilities:{0:"Aura Break"},heightm:5,weightkg:305,color:"Green",eggGroups:["Undiscovered"]},
|
||||
diancie:{num:719,species:"Diancie",types:["Rock","Fairy"],gender:"N",baseStats:{hp:50,atk:100,def:150,spa:100,spd:150,spe:50},abilities:{0:"Clear Body"},heightm:0.7,weightkg:8.8,color:"Gray",eggGroups:["Undiscovered"],otherFormes:["dianciemega"]},
|
||||
dianciemega:{num:719,species:"Diancie-Mega",baseSpecies:"Diancie",forme:"Mega",formeLetter:"M",types:["Rock","Fairy"],gender:"N",baseStats:{hp:50,atk:160,def:110,spa:160,spd:110,spe:110},abilities:{0:"Magic Bounce"},heightm:1.1,weightkg:27.8,color:"Gray",eggGroups:["Undiscovered"]},
|
||||
hoopa:{num:720,species:"Hoopa",baseForme:"Confined",types:["Psychic","Ghost"],gender:"N",baseStats:{hp:80,atk:110,def:60,spa:150,spd:130,spe:70},abilities:{0:"Magician"},heightm:0.5,weightkg:9,color:"Pink",eggGroups:["Undiscovered"],otherFormes:["hoopaunbound"]},
|
||||
hoopaunbound:{num:720,species:"Hoopa-Unbound",baseSpecies:"Hoopa",forme:"Unbound",formeLetter:"U",types:["Psychic","Dark"],gender:"N",baseStats:{hp:80,atk:160,def:60,spa:170,spd:130,spe:80},abilities:{0:"Magician"},heightm:6.5,weightkg:490,color:"Pink",eggGroups:["Undiscovered"]},
|
||||
volcanion:{num:721,species:"Volcanion",types:["Fire","Water"],gender:"N",baseStats:{hp:80,atk:110,def:120,spa:130,spd:90,spe:70},abilities:{0:"Water Absorb"},heightm:1.7,weightkg:195,color:"Red",eggGroups:["Undiscovered"]},
|
||||
diancie:{num:719,species:"Diancie",types:["Rock","Fairy"],gender:"N",baseStats:{hp:50,atk:100,def:150,spa:100,spd:150,spe:50},abilities:{0:"Clear Body"},heightm:0.7,weightkg:8.8,color:"Pink",eggGroups:["Undiscovered"],otherFormes:["dianciemega"]},
|
||||
dianciemega:{num:719,species:"Diancie-Mega",baseSpecies:"Diancie",forme:"Mega",formeLetter:"M",types:["Rock","Fairy"],gender:"N",baseStats:{hp:50,atk:160,def:110,spa:160,spd:110,spe:110},abilities:{0:"Magic Bounce"},heightm:1.1,weightkg:27.8,color:"Pink",eggGroups:["Undiscovered"]},
|
||||
hoopa:{num:720,species:"Hoopa",baseForme:"Confined",types:["Psychic","Ghost"],gender:"N",baseStats:{hp:80,atk:110,def:60,spa:150,spd:130,spe:70},abilities:{0:"Magician"},heightm:0.5,weightkg:9,color:"Purple",eggGroups:["Undiscovered"],otherFormes:["hoopaunbound"]},
|
||||
hoopaunbound:{num:720,species:"Hoopa-Unbound",baseSpecies:"Hoopa",forme:"Unbound",formeLetter:"U",types:["Psychic","Dark"],gender:"N",baseStats:{hp:80,atk:160,def:60,spa:170,spd:130,spe:80},abilities:{0:"Magician"},heightm:6.5,weightkg:490,color:"Purple",eggGroups:["Undiscovered"]},
|
||||
volcanion:{num:721,species:"Volcanion",types:["Fire","Water"],gender:"N",baseStats:{hp:80,atk:110,def:120,spa:130,spd:90,spe:70},abilities:{0:"Water Absorb"},heightm:1.7,weightkg:195,color:"Brown",eggGroups:["Undiscovered"]},
|
||||
missingno:{num:0,species:"Missingno.",types:["Bird","Normal"],baseStats:{hp:33,atk:136,def:0,spa:6,spd:6,spe:29},abilities:{0:"",H:""},heightm:3,weightkg:1590.8,color:"Gray",eggGroups:["Undiscovered"]},
|
||||
tomohawk:{num:-1,species:"Tomohawk",types:["Flying","Fighting"],baseStats:{hp:105,atk:60,def:90,spa:115,spd:80,spe:85},abilities:{0:"Intimidate",1:"Prankster",H:"Justified"},heightm:1.27,weightkg:37.2,color:"Red",eggGroups:["Field","Flying"]},
|
||||
necturna:{num:-2,species:"Necturna",types:["Grass","Ghost"],gender:"F",baseStats:{hp:64,atk:120,def:100,spa:85,spd:120,spe:81},abilities:{0:"Forewarn",H:"Telepathy"},heightm:1.65,weightkg:49.6,color:"Black",eggGroups:["Grass","Field"]},
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user