149
edits
(I know those excessive edits were in the last 24h, but that was late past midnight for me. I promise to continue to engage with the wiki, and do more mainspace edits than the handful I tackled today. I know it was mostly talk pages.) |
(I forgot how time consuming this is, actually... Gonna do one type table at a time for the remaining types, and edit mainspace in the meantime.) |
||
Line 1,584: | Line 1,584: | ||
===Electric=== | ===Electric=== | ||
{| class="roundy" align="center" width=500px style="text-align: center; margin:auto ; background: #{{electric color light}}; border: 5px solid #{{electric color}};" | |||
! [[Electric (type)]] | |||
|- | |||
| | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
|-style="background: #{{electric color}};" | |||
! Pure Electric | |||
|- | |||
| {{MSP|025|Pikachu}}{{MSP|025Gi|Pikachu}}|{{MSP|026|Raichu}}|{{MSP|100|Voltorb}}|{{MSP|101|Electrode}}|{{MSP|125|Electabuzz}}|{{MSP|135|Jolteon}}|{{MSP|172|Pichu}}|{{MSP|179|Mareep}}|{{MSP|180|Flaaffy}}|{{MSP|181|Ampharos}}|{{MSP|239|Elekid}}|{{MSP|243|Raikou}}|{{MSP|309|Electrike}}|{{MSP|310|Manectric}}{{MSP|310M|Manectric}}|{{MSP|311|Plusle}}|{{MSP|312|Minun}}|{{MSP|403|Shinx}}|{{MSP|404|Luxio}}|{{MSP|405|Luxray}}|{{MSP|417|Pachirisu}}|{{MSP|466|Electivire}}|{{MSP|522|Blitzle}}|{{MSP|523|Zebstrika}}|{{MSP|602|Tynamo}}|{{MSP|603|Eelektrik}}|{{MSP|604|Eelektross}}|{{MSP|796|Xurkitree}}|{{MSP|807|Zeraora}}|{{MSP|835|Yamper}}|{{MSP|836|Boltund}}|{{MSP|871|Pincurchin}} | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{normal color light}};"| Electric / Normal | |||
!style="background: #{{normal color}};"| Normal / Electric | |||
|- | |||
!width="50%"| {{MSP|694|Helioptile}}|{{MSP|695|Heliolisk}} | |||
!width="50%"| None | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{fighting color light}};"| Electric / Fighting | |||
!style="background: #{{fighting color}};"| Fighting / Electric | |||
|- | |||
!width="50%"| None | |||
!width="50%"| None | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{flying color light}};"| Electric / Flying | |||
!style="background: #{{flying color}};"| Flying / Electric | |||
|- | |||
!width="50%"| {{MSP|145|Zapdos}}|{{MSP|479F|Rotom}}|{{MSP|587|Emolga}}|{{MSP|642|Thundurus}}{{MSP|642T|Thundurus}}|{{MSP|741Po|Oricorio}} | |||
!width="50%"| {{MSP|000|UFO}} | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{poison color light}};"| Electric / Poison | |||
!style="background: #{{poison color}};"| Poison / Electric | |||
|- | |||
!width="50%"| {{MSP|848|Toxel}}|{{MSP|849|Toxtricity}}{{MSP|849L|Toxtricity}}{{MSP|849Gi|Toxtricity}} | |||
!width="50%"| None | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{ground color light}};"| Electric / Ground | |||
!style="background: #{{ground color}};"| Ground / Electric | |||
|- | |||
!width="50%"| None | |||
!width="50%"| {{MSP|618|Stunfisk}} | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{rock color light}};"| Electric / Rock | |||
!style="background: #{{rock color}};"| Rock / Electric | |||
|- | |||
!width="50%"| None | |||
!width="50%"| {{MSP|074A|Geodude}}|{{MSP|075A|Graveler}}|{{MSP|076A|Golem}} | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{bug color light}};"| Electric / Bug | |||
!style="background: #{{bug color}};"| Bug / Electric | |||
|- | |||
!width="50%"| None | |||
!width="50%"| {{MSP|595|Joltik}}|{{MSP|596|Galvantula}}|{{MSP|737|Charjabug}}|{{MSP|738|Vikavolt}} | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{ghost color light}};"| Electric / Ghost | |||
!style="background: #{{ghost color}};"| Ghost / Electric | |||
|- | |||
!width="50%"| {{MSP|479|Rotom}} | |||
!width="50%"| None | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{steel color light}};"| Electric / Steel | |||
!style="background: #{{steel color}};"| Steel / Electric | |||
|- | |||
!width="50%"| {{MSP|081|Magnemite}}|{{MSP|082|Magneton}}|{{MSP|462|Magnezone}}|{{MSP|777|Togedemaru}} | |||
!width="50%"| {{MSP|000|MT2}} | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{fire color light}};"| Electric / Fire | |||
!style="background: #{{fire color}};"| Fire / Electric | |||
|- | |||
!width="50%"| {{MSP|479O|Rotom}} | |||
!width="50%"| None | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{water color light}};"| Electric / Water | |||
!style="background: #{{water color}};"| Water / Electric | |||
|- | |||
!width="50%"| {{MSP|479W|Rotom}} | |||
!width="50%"| {{MSP|170|Chinchou}}|{{MSP|171|Lanturn}} | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{grass color light}};"| Electric / Grass | |||
!style="background: #{{grass color}};"| Grass / Electric | |||
|- | |||
!width="50%"| {{MSP|479L|Rotom}} | |||
!width="50%"| None | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{psychic color light}};"| Electric / Psychic | |||
!style="background: #{{psychic color}};"| Psychic / Electric | |||
|- | |||
!width="50%"| {{MSP|026A|Raichu}} | |||
!width="50%"| {{MSP|000|UFO 2}} | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{ice color light}};"| Electric / Ice | |||
!style="background: #{{ice color}};"| Ice / Electric | |||
|- | |||
!width="50%"| {{MSP|479R|Rotom}}|{{MSP|881|Arctozolt}} | |||
!width="50%"| None | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{dragon color light}};"| Electric / Dragon | |||
!style="background: #{{dragon color}};"| Dragon / Electric | |||
|- | |||
!width="50%"| {{MSP|181M|Ampharos}}|{{MSP|880|Dracozolt}} | |||
!width="50%"| {{MSP|644|Zekrom}} | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{dark color light}};"| Electric / Dark | |||
!style="background: #{{dark color}};"| Dark / Electric | |||
|- | |||
!width="50%"| {{MSP|877|Morpeko}}{{MSP|877H|Morpeko}} | |||
!width="50%"| None | |||
|} | |||
{| border=1 width="100%" class="table" style="margin:auto; background: #FFFFFF; border:1px solid #{{electric color light}}; border-collapse:collapse;" | |||
!style="background: #{{fairy color light}};"| Electric / Fairy | |||
!style="background: #{{fairy color}};"| Fairy / Electric | |||
|- | |||
!width="50%"| {{MSP|702|Dedenne}}|{{MSP|785|Tapu Koko}} | |||
!width="50%"| None | |||
|} | |||
|} | |||
===Psychic=== | ===Psychic=== |
edits