Marill (Pokémon): Difference between revisions

Marill (Pokémon) (view source)

Revision as of 16:19, 11 June 2013

474 bytes added , 11 June 2013

m

no edit summary

Spriteit

Leadership Board, Administrators

38,159

edits

@@ Line 1: / Line 1: @@
-{{PokémonPrevNextHead | species=Marill | type=water | prevnum=182 | nextnum=184 | prev=Bellossom | next=Azumarill}}
+{{PokémonPrevNextHead | species=Marill | type=water | type2=fairy | prevnum=182 | nextnum=184 | prev=Bellossom | next=Azumarill}}
 {{PokémonInfobox|
 name=Marill |
@@ Line 183: / Line 183: @@
 {{Dex
 |type=water
+|type2=fairy
 |gen=2
 |golddex=The tip of its tail, which contains oil that is lighter than water, lets it swim without drowning.
@@ Line 205: / Line 206: @@
 {{Availability|
 type=water |
+type2=fairy |
 gen=2 |
 gsrarity=Very Rare |
@@ Line 237: / Line 239: @@
 {{SidegameAvail
 |type=water
+|type2=fairy
 |channel=[[Cobalt Coast|Secret Cove]]
 |pinballrs=Lake (Sapphire Field)
@@ Line 248: / Line 251: @@
 ====In events====
-{{eventAvail/h|type=water}}
+{{eventAvail/h|type=water|type2=fairy}}
 {{eventAvail|{{gameabbrev3|GSC}}|Gotta Catch 'Em All Station! Hydro Pump Marill|English|United States|5|February 22 to March 14, 2002|link=List of Gotta Catch 'Em All event Pokémon#Hydro Pump Marill}}
 {{eventAvail|{{gameabbrev3|GSC}}|Gotta Catch 'Em All Station! Dizzy Punch Marill|English|United States|5|June 8 to 21, 2002|link=List of Gotta Catch 'Em All event Pokémon#Dizzy Punch Marill}}
@@ Line 258: / Line 261: @@
 {{BaseStats|
 type=water |
+type2=fairy |
 HP=    70 |
 Attack= 20 |
@@ Line 268: / Line 272: @@
 {{Pokéthlon
 |type=Water
+<!--Don't add Fairy this is Gen |V info-->
 |Speed=3
 |SpeedMax=4
@@ Line 283: / Line 288: @@
 {{Type effectiveness|
 type1=water|
+type2=fairy|
 Normal=  100 |
 Fighting=100 |
@@ Line 311: / Line 317: @@
 ===Learnset===
 ====By [[level|leveling up]]====
-{{learnlist/levelh|Marill|Water|Water|V|2}}
+{{learnlist/levelh|Marill|Water|Water<!--Don't change to Fairy this is Gen V info-->|V|2}}
 {{learnlist/levelV|Start|Start|Tackle|Normal|Physical|50|100|35}}
 {{learnlist/levelV|N/A|Start|Bubble|Water|Special|20|100|30||'''}}
@@ Line 330: / Line 336: @@
 ====By [[TM]]/[[HM]]====
-{{learnlist/tmh|Marill|Water|Water|5|2}}
+{{learnlist/tmh|Marill|Water|Water<!--Don't change to Fairy this is Gen V info-->|5|2}}
 {{learnlist/tm5|TM06|Toxic|Poison|Status|&mdash;|90|10}}
 {{learnlist/tm5|TM07|Hail|Ice|Status|&mdash;|&mdash;|10}}
@@ Line 362: / Line 368: @@
 ====By {{pkmn|breeding}}====
-{{learnlist/breedh|Marill|water|water|5|2}}
+{{learnlist/breedh|Marill|water|water<!--Don't change to Fairy this is Gen V info-->|5|2}}
 {{learnlist/breed5|{{MSP|054|Psyduck}}{{MSP|055|Golduck}}{{MSP|079|Slowpoke}}{{MSP|080|Slowbro}}{{MSP|199|Slowking}}{{MSP|194|Wooper}}<br>{{MSP|195|Quagsire}}{{MSP|368|Gorebyss}}{{MSP|399|Bidoof}}{{MSP|400|Bibarel}}|Amnesia|Psychic|Status|&mdash;|&mdash;|10|Cute|0}}
 {{learnlist/breed5|{{MSP|055|Golduck}}{{MSP|086|Seel}}{{MSP|087|Dewgong}}{{MSP|140|Kabuto}}{{MSP|141|Kabutops}}{{MSP|395|Empoleon}}<br>{{MSP|418|Buizel}}{{MSP|419|Floatzel}}{{MSP|564|Tirtouga}}{{MSP|565|Carracosta}}{{MSP|594|Alomomola}}|Aqua Jet|Water|Physical|40|100|20||||'''}}
@@ Line 383: / Line 389: @@
 ====By [[Move Tutor|tutoring]]====
-{{learnlist/tutorh|Marill|water|water|5|2}}
+{{learnlist/tutorh|Marill|water|water<!--Don't change to Fairy this is Gen V info-->|5|2}}
 {{learnlist/tutor5|Aqua Tail|Water|Physical|90|90|10||'''|no|yes}}
 {{learnlist/tutor5|Bounce|Flying|Physical|85|85|5|||no|yes}}
@@ Line 399: / Line 405: @@
 ====By a prior [[evolution]]====
-{{Learnlist/prevoh|Marill|Water|Water|5|2}}
+{{Learnlist/prevoh|Marill|Water|Water<!--Don't change to Fairy this is Gen V info-->|5|2}}
 {{Learnlist/prevo5|298|Azurill|||||Splash|Normal|Status|&mdash;|&mdash;|40}}
 {{Learnlist/prevo5|298|Azurill|||||Charm|Normal|Status|&mdash;|100|20}}
@@ Line 408: / Line 414: @@
 ===={{pkmn|Dream World}} moves====
-{{learnlist/eventh|Marill|water|water|5|2}}
+{{learnlist/eventh|Marill|water|water<!--Don't change to Fairy this is Gen V info-->|5|2}}
 {{learnlist/event5|{{dwa|Pleasant Forest}}|Aqua Jet|Water|Physical|40|100|20||'''}}
 {{learnlist/event5|{{dwa|Pleasant Forest}}|Ice Punch|Ice|Physical|75|100|15}}
@@ Line 427: / Line 433: @@
 {{Sidegame|
 type=water |
+type2=fairy |
 ndex=183 |
 pinballrs=Catch |
@@ Line 469: / Line 476: @@
 |name2=Marill
 |type1-2=Water
+|type2-2=Fairy
 |evotype2=Level
 |level2=18
@@ Line 478: / Line 486: @@
 {{Sprite|
 type=water|
+type2=fairy|
 gen=2|
 gender=none|
@@ Line 502: / Line 511: @@
 ==In other languages==
-{{Other languages|type=water|type2=water
+{{Other languages|type=water|type2=fairy
 |ja=マリル'' Maril''|jameaning=From 丸い ''marui'' (round or circular), 鞠 ''mari'' (ball) and 瑠璃 ''ruri'' (lapis lazuli).
 |fr=Marill|frmeaning=Same as English name
@@ Line 521: / Line 530: @@
 {{Smash Bros.}}
-{{PokémonPrevNextFoot | type=water | prevnum=182 | nextnum=184 | prev=Bellossom | next=Azumarill}}
+{{PokémonPrevNextFoot | type=water | type2=fairy | prevnum=182 | nextnum=184 | prev=Bellossom | next=Azumarill}}
 {{-}}
 {{Project Pokédex notice}}