PKMNAdventurer

User:PKMNAdventurer (view source)

Revision as of 05:38, 19 January 2018

977 bytes added , 19 January 2018

some changes

PKMNAdventurer

1,948

edits

@@ Line 934: / Line 934: @@
 |move1=Stone Edge|move1type=Rock|move1cat=Physical
 |move2=Night Slash|move2type=Dark|move2cat=Physical
-|move3=Psycho Cut|move3type=Psychic|move3cat= Physical
+|move3=Psycho Cut|move3type=Psychic|move3cat=Physical
 |move4=Megahorn|move4type=Bug|move4cat=Physical}}
 }}
@@ Line 976: / Line 976: @@
 |move2=Roost|move2type=Flying|move2cat=Status
 |move3=Hurricane|move3type=Flying|move3cat=Special
-|move4=Hidden Power|move4type=Psychic|move4cat=Special}}
+|move4=Hidden Power<!--Icy Wind-->|move4type=Psychic<!--Ice-->|move4cat=Special}}
 |pokemon4={{Pokémon/7|game=Sun|ndex=770|pokemon=Palossand|nickname=Castle
@@ Line 987: / Line 987: @@
 |pokemon5={{Pokémon/7|game=Sun|ndex=760|pokemon=Bewear|nickname=Teddy
 |level=83|gender=male|type1=Normal|type2=Fighting|ability=Fluffy|held=Choice Band
-|move1=Hammer Arm|move1type=Fighting|move1cat=Physical
+|move1=Hammer Arm<!--Drain Punch-->|move1type=Fighting|move1cat=Physical
 |move2=Thrash|move2type=Normal|move2cat=Physical
 |move3=Rock Slide|move3type=Rock|move3cat=Physical
@@ Line 996: / Line 996: @@
 |move1=High Jump Kick|move1type=Fighting|move1cat=Physical
 |move2=Rapid Spin|move2type=Normal|move2cat=Physical
-|move3=Trop Kick|move3type=Grass|move3cat=Physical
+|move3=Trop Kick<!--Power Whip-->|move3type=Grass|move3cat=Physical
 |move4=U-turn|move4type=Bug|move4cat=Physical}}
 }}
@@ Line 1,049: / Line 1,049: @@
 |level=81|gender=female|type1=Dragon|type2=Fighting|ability=Soundproof|held=Weakness Policy
 |move1=Dragon Dance|move1type=Dragon|move1cat=Status
-|move2=Sky Uppercut|move2type=Fighting|move2cat=Physical
+|move2=Sky Uppercut<!--Close Combat-->|move2type=Fighting|move2cat=Physical
 |move3=Rock Slide|move3type=Rock|move3cat=Physical
 |move4=Outrage|move4type=Dragon|move4cat=Physical}}
@@ Line 1,081: / Line 1,081: @@
 |pokemon1={{Pokémon/7|game=Ultra Sun|ndex=728|pokemon=Popplio|nickname=Siren
 |level=13|gender=female|type1=Water|ability=Torrent|held=<!--Primarium Z-->
-|move1=Pound|move1type=Normal|move1cat=Physical
+|move1=Pound<!--Energy Ball-->|move1type=Normal<!--Grass-->|move1cat=Physical<!--Special-->
-|move2=Water Gun|move2type=Water|move2cat=Special
+|move2=Water Gun<!--Sparkling Aria-->|move2type=Water|move2cat=Special
-|move3=Baby-Doll Eyes|move3type=Fairy|move3cat=Status
+|move3=Baby-Doll Eyes<!--Ice Beam-->|move3type=Fairy<!--Ice-->|move3cat=Status<!--Special-->
-|move4=Disarming Voice|move4type=Fairy|move4cat=Special}}
+|move4=Disarming Voice<!--Moonblast-->|move4type=Fairy|move4cat=Special}}
 |pokemon5={{Pokémon/7|game=Ultra Sun|ndex=179|pokemon=Mareep|nickname=Fluffy
 |level=1|gender=female|type1=Electric|ability=Static|held=Ampharosite
-|move1=Thunder|move1type=???|move1cat=???
+|move1=Thunder|move1type=Electric|move1cat=Special
-|move2=Power Gem|move2type=???|move2cat=???
+|move2=Power Gem|move2type=Rock|move2cat=Special
-|move3=???|move3type=???|move3cat=???
+|move3=???<!--Dragon Pulse-->|move3type=???<!--Dragon-->|move3cat=???<!--Special-->
-|move4=???|move4type=???|move4cat=???}}
+|move4=???<!--Focus Blast-->|move4type=???<!--Fighting-->|move4cat=???<!--Special-->}}
 |pokemon3={{Pokémon/7|game=Ultra Sun|ndex=198|pokemon=Murkrow|nickname=Crow
 |level=1|gender=male|type1=Dark|type2=Flying|ability=Prankster|held=Life Orb
 |move1=Brave Bird|move1type=Flying|move1cat=Physical
-|move2=Thief|move2type=Dark|move2cat=Physical
+|move2=Thief<!--Night Slash-->|move2type=Dark|move2cat=Physical
 |move3=Steel Wing|move3type=Steel|move3cat=Physical
 |move4=Roost|move4type=Flying|move4cat=Status}}
@@ Line 1,102: / Line 1,102: @@
 |pokemon4={{Pokémon/7|game=Ultra Sun|ndex=104|pokemon=Cubone|nickname=Marrow
 |level=1|gender=male|type1=Ground|ability=Battle Armor|held=Thick Club
-|move1=Rock Slide|move1type=Rock|move1cat=Physical
+|move1=Rock Slide<!--Flare Blitz-->|move1type=Rock<!--Fire-->|move1cat=Physical
-|move2=Swords Dance|move2type=Normal|move2cat=Status
+|move2=Swords Dance<!--Shadow Bone-->|move2type=Normal<!--Ghost-->|move2cat=Status<!--Physical-->
 |move3=Earthquake|move3type=Ground|move3cat=Physical
 |move4=Double-Edge|move4type=Normal|move4cat=Physical}}
@@ Line 1,109: / Line 1,109: @@
 |pokemon2={{Pokémon/7|game=Ultra Sun|ndex=744|pokemon=Rockruff|nickname=Lycan
 |level=12|gender=male|type1=Rock|ability=Own Tempo|held=Focus Band<!--Weakness Policy-->
-|move1=Tackle|move1type=Normal|move1cat=Physical
+|move1=Tackle<!--Accelerock-->|move1type=Normal<!--Rock-->|move1cat=Physical
-|move2=Bite|move2type=Dark|move2cat=Physical
+|move2=Bite<!--Brick Break-->|move2type=Dark<!--Fighting-->|move2cat=Physical
 |move3=Fire Fang|move3type=Fire|move3cat=Physical
-|move4=Happy Hour|move4type=Normal|move4cat=Status}}
+|move4=Happy Hour<!--Swords Dance-->|move4type=Normal|move4cat=Status}}
 |pokemon6={{Pokémon/7|game=Ultra Sun|ndex=572|pokemon=Minccino|nickname=Chinchilla
 |level=1|gender=female|type1=Normal|ability=Skill Link|held=Leftovers
-|move1=Aqua Tail|move1type=Water|move1cat=Physical
+|move1=Aqua Tail<!--Tail Slap-->|move1type=Water<!--Normal-->|move1cat=Physical
-|move2=Iron Tail|move2type=Steel|move2cat=Physical
+|move2=Iron Tail<!--Bullet Seed-->|move2type=Steel<!--Grass-->|move2cat=Physical
-|move3=Knock Off|move3type=Dark|move3cat=Physical
+|move3=Knock Off<!--Rock Blast-->|move3type=Dark<!--Rock-->|move3cat=Physical
 |move4=Wake-Up Slap|move4type=Fighting|move4cat=Physical}}
 }}
@@ Line 1,141: / Line 1,141: @@
 |pokemon1={{Pokémon/7|game=Ultra Moon|ndex=725|pokemon=Litten|nickname=El Tigre
-|level=12|gender=male|type1=Fire|ability=Blaze|held=<!--Incinium Z-->
+|level=13|gender=male|type1=Fire|ability=Blaze|held=<!--Incinium Z-->
-|move1=Scratch|move1type=Normal|move1cat=Physical
+|move1=Scratch<!--Darkest Lariat-->|move1type=Normal<!--Dark-->|move1cat=Physical
-|move2=Ember|move2type=Fire|move2cat=Special
+|move2=Ember<!--Flare Blitz-->|move2type=Fire|move2cat=Special<!--Physical-->
-|move3=Leer|move3type=Normal|move3cat=Status
+|move3=Leer<!--Cross Chop--><!--Drain Punch-->|move3type=Normal<!--Fighting-->|move3cat=Status<!--Physical-->
-|move4=Lick|move4type=Ghost|move4cat=Physical}}
+|move4=Lick<!--Earthquake--><!--Thunder Punch-->|move4type=Ghost<!--Ground--><!--Electric-->|move4cat=Physical}}
 |pokemon2={{Pokémon/7|game=Ultra Moon|ndex=074|pokemon=Geodude|nickname=Rocky
@@ Line 1,157: / Line 1,157: @@
 |level=1|gender=male|type1=Poison|type2=Flying|ability=Infiltrator|held=Life Orb
 |move1=Brave Bird|move1type=Flying|move1cat=Physical
-|move2=Poison Fang|move2type=Poison|move2cat=Physical
+|move2=Poison Fang<!--Cross Poison-->|move2type=Poison|move2cat=Physical
 |move3=Leech Life|move3type=Bug|move3cat=Physical
 |move4=Roost|move4type=Flying|move4cat=Status}}
@@ Line 1,163: / Line 1,163: @@
 |pokemon4={{Pokémon/7|game=Ultra Moon|ndex=374|pokemon=Beldum|nickname=Metal
 |level=1|type1=Steel|type2=Psychic|ability=Clear Body|held=Metagrossite
-|move1=Take Down|move1type=Normal|move1cat=Physical
+|move1=Take Down<!--Meteor Mash-->|move1type=Normal<!--Steel-->|move1cat=Physical
-|move2=???|move2type=???|move2cat=???
+|move2=???<!--Zen Headbutt-->|move2type=???<!--Psychic-->|move2cat=???<!--Physical-->
-|move3=???|move3type=???|move3cat=???
+|move3=???<!--Earthquake-->|move3type=???<!--Ground-->|move3cat=???<!--Physical-->
-|move4=???|move4type=???|move4cat=???}}
+|move4=???<!--Ice Punch-->|move4type=???<!--Ice-->|move4cat=???<!--Physical-->}}
 |pokemon5={{Pokémon/7|game=Ultra Moon|ndex=751|pokemon=Dewpider|nickname=Arachnid
@@ Line 1,180: / Line 1,180: @@
 |move2=Moonblast|move2type=Fairy|move2cat=Special
 |move3=Aurora Veil|move3type=Ice|move3cat=Status
-|move4=Hypnosis|move4type=Psychic|move4cat=Status}}
+|move4=Hypnosis<!--Extrasensory-->|move4type=Psychic|move4cat=Status<!--Special-->}}
 }}
 {{-}}
@@ Line 1,205: / Line 1,205: @@
 |{{ActivePoké|x|Torterra|Ash Torterra.png|grass|ground|fir=Turtwig|mid=Grotle|size=190px|link=no}} ♂
 |{{ActivePoké|x|Electivire|Gary Electivire debut.png|electric|fir=Elekid|mid=Electabuzz|size=190px|link=no}} ♂
-|{{ActivePoké|x|Staraptor|Barry Staraptor.png|normal|flying|fir=Starly|mid=Staravia|size=190px|link=no}} ♂
+|{{ActivePoké|x|Staraptor|Orson Staraptor.png|normal|flying|fir=Starly|mid=Staravia|size=190px|link=no}} ♂
 |-
 |{{ActivePoké|x|Spiritomb|Spiritomb anime.png|ghost|dark|size=190px|link=no}} ♂
@@ Line 1,292: / Line 1,292: @@
 |-
 |{{ActivePoké|x|Samurott|Cameron Samurott Megahorn.png|water|fir=Oshawott|mid=Dewott|size=190px|link=no}} ♂
-|{{ActivePoké|x|Electivire|Gary Electivire.png|electric|fir=Elekid|mid= Electabuzz|size=190px|link=no}} ♂
+|{{ActivePoké|x|Electivire|Gary Electivire.png|electric|fir=Elekid|mid=Electabuzz|size=190px|link=no}} ♂
 |{{ActivePoké|x|Sigilyph|Damon Sigilyph.png|psychic|flying|fir=Egg|size=190px|link=no}} ♂
 |-
@@ Line 1,398: / Line 1,398: @@
 |-
 |{{ActivePoké|x|Golisopod|768Golisopod.png|bug|water|fir=Wimpod|size=190px|link=no}} ♂
-|{{ActivePoké|x|Kommo-o|784Kommo-o.png|dragon|fighting|fir=Jangmo-o|mid=Hakamo-o|size=190px|link=no}} ♀
+|{{ActivePoké|x|Kommo-o|Totem Kommo-o.png|dragon|fighting|fir=Jangmo-o|mid=Hakamo-o|size=190px|link=no}} ♀
 |{{ActivePoké|x|Salazzle|Lusamine Salazzle.png|poison|fire|fir=Salandit|size=190px|link=no}} ♀
 |}