1,948
edits
No edit summary |
(updating Sun & Moon parties) |
||
Line 922: | Line 922: | ||
==Gen VII== | ==Gen VII== | ||
===Sun=== | ===Sun=== | ||
[[File:Bag Normalium Z Sprite.png]][[File:Bag Fightinium Z Sprite.png]][[File:Bag Waterium Z Sprite.png]] | [[File:Bag Normalium Z Sprite.png]][[File:Bag Fightinium Z Sprite.png]][[File:Bag Waterium Z Sprite.png]][[File:Bag Firium Z Sprite.png]]<!--[[File:Bag Grassium Z Sprite.png]][[File:Bag Rockium Z Sprite.png]][[File:Bag Electrium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]]--> | ||
{{Party | {{Party | ||
Line 938: | Line 938: | ||
|pokemon1={{Pokémon/7|game=Sun|ndex=728|pokemon=Popplio|nickname=Siren | |pokemon1={{Pokémon/7|game=Sun|ndex=728|pokemon=Popplio|nickname=Siren | ||
|level= | |level=34|gender=female|type1=Water|ability=Torrent|held=Waterium Z | ||
|move1=Sing|move1type=Normal|move1cat=Status | |move1=Sing|move1type=Normal|move1cat=Status | ||
|move2=Water Pledge|move2type=Water|move2cat=Special | |move2=Water Pledge|move2type=Water|move2cat=Special | ||
|move3= | |move3=Hyper Voice|move3type=Normal|move3cat=Special | ||
|move4=Disarming Voice|move4type=Fairy|move4cat=Special}} | |move4=Disarming Voice|move4type=Fairy|move4cat=Special}} | ||
|pokemon2={{Pokémon/7|game=Sun|ndex=737|pokemon=Charjabug|nickname=Vic Viper | |pokemon2={{Pokémon/7|game=Sun|ndex=737|pokemon=Charjabug|nickname=Vic Viper | ||
|level= | |level=31|gender=male|type1=Bug|type2=Electric|ability=Battery<!--|held=???--> | ||
|move1=Dig|move1type=Ground|move1cat=Physical | |move1=Dig|move1type=Ground|move1cat=Physical | ||
|move2=X-Scissor|move2type=Bug|move2cat=Physical | |move2=X-Scissor|move2type=Bug|move2cat=Physical | ||
Line 952: | Line 952: | ||
|pokemon3={{Pokémon/7|game=Sun|ndex=741|pokemon=Oricorio|nickname=Flamenco | |pokemon3={{Pokémon/7|game=Sun|ndex=741|pokemon=Oricorio|nickname=Flamenco | ||
|level= | |level=29|gender=female|type1=Fire|type2=Flying|form=-Baile|ability=Dancer<!--|held=???--> | ||
|move1= | |move1=Teeter Dance|move1type=Normal|move1cat=Status | ||
|move2=Feather Dance|move2type=Flying|move2cat=Status | |move2=Feather Dance|move2type=Flying|move2cat=Status | ||
|move3=Air Cutter|move3type=Flying|move3cat=Special | |move3=Air Cutter|move3type=Flying|move3cat=Special | ||
Line 981: | Line 981: | ||
{{-}} | {{-}} | ||
===Moon=== | ===Moon=== | ||
[[File:Bag Normalium Z Sprite.png]][[File:Bag Fightinium Z Sprite.png]][[File:Bag Waterium Z Sprite.png]] | [[File:Bag Normalium Z Sprite.png]][[File:Bag Fightinium Z Sprite.png]][[File:Bag Waterium Z Sprite.png]][[File:Bag Firium Z Sprite.png]]<!--[[File:Bag Grassium Z Sprite.png]][[File:Bag Rockium Z Sprite.png]][[File:Bag Electrium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]]--> | ||
{{Party | {{Party | ||
Line 994: | Line 994: | ||
|location=Hau'oli Outskirts | |location=Hau'oli Outskirts | ||
|locationname=Hau'oli Outskirts | |locationname=Hau'oli Outskirts | ||
|pokemon= | |pokemon=4 | ||
|pokemon1={{Pokémon/7|game=Moon|ndex=722|pokemon=Rowlet|nickname=Blathers | |pokemon1={{Pokémon/7|game=Moon|ndex=722|pokemon=Rowlet|nickname=Blathers | ||
|level= | |level=33|gender=male|type1=Grass|type2=Flying|ability=Overgrow<!--|held=???--> | ||
|move1=Synthesis|move1type=Grass|move1cat=Status | |move1=Synthesis|move1type=Grass|move1cat=Status | ||
|move2=Razor Leaf|move2type=Grass|move2cat=Physical | |move2=Razor Leaf|move2type=Grass|move2cat=Physical | ||
|move3= | |move3=Sucker Punch|move3type=Dark|move3cat=Physical | ||
|move4=Pluck|move4type=Flying|move4cat=Physical}} | |move4=Pluck|move4type=Flying|move4cat=Physical}} | ||
|pokemon2={{Pokémon/7|game=Moon|ndex=025|pokemon=Pikachu|nickname=Puka | |pokemon2={{Pokémon/7|game=Moon|ndex=025|pokemon=Pikachu|nickname=Puka | ||
|level= | |level=29|gender=male|type1=Electric|ability=Static<!--|held=???--> | ||
|move1=Thunder Shock|move1type=Electric|move1cat=Special | |move1=Thunder Shock|move1type=Electric|move1cat=Special | ||
|move2= | |move2=Nuzzle|move2type=Electric|move2cat=Physical | ||
|move3=Nasty Plot|move3type=Dark|move3cat=Status | |move3=Nasty Plot|move3type=Dark|move3cat=Status | ||
|move4=Sweet Kiss|move4type=Fairy|move4cat=Status}} | |move4=Sweet Kiss|move4type=Fairy|move4cat=Status}} | ||
|pokemon3={{Pokémon/7|game=Moon|ndex=731|pokemon=Pikipek|nickname=Toucan Sam | |pokemon3={{Pokémon/7|game=Moon|ndex=731|pokemon=Pikipek|nickname=Toucan Sam | ||
|level= | |level=30|gender=male|type1=Normal|type2=Flying|ability=Skill Link<!--|held=???--> | ||
|move1=Drill Peck|move1type=Flying|move1cat=Physical | |move1=Drill Peck|move1type=Flying|move1cat=Physical | ||
|move2=Fury Attack|move2type=Normal|move2cat=Physical | |move2=Fury Attack|move2type=Normal|move2cat=Physical | ||
Line 1,017: | Line 1,017: | ||
|move4=Brick Break|move4type=Fighting|move4cat=Physical}} | |move4=Brick Break|move4type=Fighting|move4cat=Physical}} | ||
| | |pokemon5={{Pokémon/7|game=Moon|ndex=767|pokemon=Wimpod|nickname=??? | ||
|level=???|gender=male|type1=Bug|type2=Water|ability=Wimp Out|held=Eject Button | |level=???|gender=male|type1=Bug|type2=Water|ability=Wimp Out|held=Eject Button | ||
|move1=???|move1type=???|move1cat=??? | |move1=???|move1type=???|move1cat=??? | ||
Line 1,024: | Line 1,024: | ||
|move4=???|move4type=???|move4cat=???}} | |move4=???|move4type=???|move4cat=???}} | ||
| | |pokemon6={{Pokémon/7|game=Moon|ndex=782|pokemon=Jangmo-o|nickname=??? | ||
|level=???|gender=female|type1=Dragon|ability=Soundproof|held=??? | |level=???|gender=female|type1=Dragon|ability=Soundproof|held=??? | ||
|move1=???|move1type=???|move1cat=??? | |move1=???|move1type=???|move1cat=??? | ||
Line 1,031: | Line 1,031: | ||
|move4=???|move4type=???|move4cat=???}} | |move4=???|move4type=???|move4cat=???}} | ||
| | |pokemon4={{Pokémon/7|game=Moon|ndex=757|pokemon=Salandit|nickname=Bayonetta | ||
|level= | |level=22|gender=female|type1=Poison|type2=Fire|ability=Corrosion<!--|held=???--> | ||
|move1= | |move1=Ember|move1type=Fire|move1cat=Special | ||
|move2= | |move2=Sweet Scent|move2type=Normal|move2cat=Status | ||
|move3= | |move3=Dragon Rage|move3type=Dragon|move3cat=Special | ||
|move4= | |move4=Smog|move4type=Poison|move4cat=Special}} | ||
}} | }} | ||
{{-}} | {{-}} | ||
Line 1,229: | Line 1,229: | ||
! Sun | ! Sun | ||
|- | |- | ||
|[[File:Bag Normalium Z Sprite.png]][[File:Bag Fightinium Z Sprite.png]][[File:Bag Waterium Z Sprite.png]] | |[[File:Bag Normalium Z Sprite.png]][[File:Bag Fightinium Z Sprite.png]][[File:Bag Waterium Z Sprite.png]][[File:Bag Firium Z Sprite.png]]<!--[[File:Bag Grassium Z Sprite.png]][[File:Bag Rockium Z Sprite.png]][[File:Bag Electrium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]]--> | ||
|- | |- | ||
|{{ActivePoké|x|Popplio|Lana Popplio.png|water|size=190px|link=no}} ♀ | |{{ActivePoké|x|Popplio|Lana Popplio.png|water|size=190px|link=no}} ♀ | ||
Line 1,243: | Line 1,243: | ||
! Moon | ! Moon | ||
|- | |- | ||
|[[File:Bag Normalium Z Sprite.png]][[File:Bag Fightinium Z Sprite.png]][[File:Bag Waterium Z Sprite.png]] | |[[File:Bag Normalium Z Sprite.png]][[File:Bag Fightinium Z Sprite.png]][[File:Bag Waterium Z Sprite.png]][[File:Bag Firium Z Sprite.png]]<!--[[File:Bag Grassium Z Sprite.png]][[File:Bag Rockium Z Sprite.png]][[File:Bag Electrium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]][[File:Bag ???ium Z Sprite.png]]--> | ||
|- | |- | ||
|{{ActivePoké|x|Rowlet|Ash Rowlet.png|grass|flying|size=190px|link=no}} ♂ | |{{ActivePoké|x|Rowlet|Ash Rowlet.png|grass|flying|size=190px|link=no}} ♂ | ||
|{{ActivePoké|x|Pikachu|Ash Pikachu.png|electric|fir=Pichu|size=190px|link=no}} ♂ | |{{ActivePoké|x|Pikachu|Ash Pikachu.png|electric|fir=Pichu|size=190px|link=no}} ♂ | ||
|{{ActivePoké|x|Pikipek|Pikipek anime.png|normal|flying|size=190px|link=no}} ♂ | |{{ActivePoké|x|Pikipek|Pikipek anime.png|normal|flying|size=190px|link=no}} ♂ | ||
<!-- | |- | ||
|{{ActivePoké|x|Wimpod|767Wimpod.png|bug|water|size=190px|link=no}} ♂ | <!--|{{ActivePoké|x|Wimpod|767Wimpod.png|bug|water|size=190px|link=no}} ♂ | ||
|{{ActivePoké|x|Jangmo-o|782Jangmo-o.png|dragon|size=190px|link=no}} ♀ | |{{ActivePoké|x|Jangmo-o|782Jangmo-o.png|dragon|size=190px|link=no}} ♀--> | ||
|{{ActivePoké|x|Salandit|Team Skull Salandit.png|poison|fire|size=190px|link=no}} ♀ | |{{ActivePoké|x|Salandit|Team Skull Salandit.png|poison|fire|size=190px|link=no}} ♀ | ||
|} | |} | ||
{{left clear}} | {{left clear}} |
edits