Merge branch 'master' into master

pokesets/1 XM_Standard/XM_Seaking.yaml

@@ -0,0 +1,22 @@
+species: Seaking
+displayname: Grayson
+ingamename: Grayson
+setname: Christmas
+tags: [christmas]
+item: [Heat Rock] # It has a heater
+ability: [Truant]
+moves:
+    - [Bubble] # It's a fish
+    - [Follow Me] # It moves, the character follows
+    - [Endeavor] # It sure tries
+    - [Rest, Memento] # "The fish is just sleeping"
+gender: [m]
+happiness: 255
+biddable: True
+rarity: 1.0
+ball: [Dive]
+shiny: True
+nature: Bold
+ivs: 31
+evs: {hp: 252, atk: 0, def: 252, spA: 4, spD: 252, spe: 0}
+hidden: false

pokesets/PWT/FishPlaysPokemon/1.yaml

@@ -0,0 +1,20 @@
+species: Charmander
+ingamename: AAAABBK
+displayname: AAAABBK
+setname: Fish Plays Pokémon
+tags: [in-game, PWT-Fish Plays Pokemon, trainer+fishplayspokemon]
+item: [null]
+ability: [null]
+moves:
+    - [Growl]
+    - [Scratch]
+gender: [f]
+happiness: 70
+biddable: True
+rarity: 1.0
+ball: [Poké]
+shiny: False
+nature: Adamant
+ivs: {hp: 6, atk: 0, def: 14, spA: 18, spD: 20, spe: 18}
+evs: {hp: 0, atk: 0, def: 1, spA: 0, spD: 0, spe: 2}
+---

pokesets/Runmon/11_AnniversaryRed.yaml

@@ -298,7 +298,7 @@ ball: [Poké]
 shiny: False
 nature: Serious
 ivs: {hp: 20, atk: 10, def: 4, spA: 24, spD: 24, spe: 14}
-evs: {hp: 248, atk: 252, def: 252, spA: 92, spD: 252, spe: 252}
+evs: {hp: 248, atk: 252, def: 252, spA: 252, spD: 252, spe: 252}
 ---
 species: Venomoth
 ingamename: RRRRIIIIH

pokesets/Runmon/12_Moemon.yaml

@@ -117,10 +117,10 @@ item: [Awakening]
 ability: [Water Absorb]
 nature: Quiet
 moves:
-    - Surf
-    - Water Pulse
-    - Blizzard
-    - Aurora Beam
+    - [Surf]
+    - [Water Pulse]
+    - [Blizzard]
+    - [Aurora Beam]
 gender: [f]
 happiness: 255
 shiny: False

pokesets/Runmon/17_Brown.yaml

@@ -8,7 +8,7 @@ ability: [null]
 moves:
     - [Fly]
     - [Wing Attack]
-    - [Hyper Beam]
+    - [Giga Impact]
     - [Swift]
 gender: [m]
 happiness: 255
@@ -116,7 +116,7 @@ moves:
     - [Cut]
     - [Swords Dance]
     - [Double-Edge]
-    - [Hyper Beam]
+    - [Giga Impact]
 gender: [m]
 happiness: 255
 biddable: True

pokesets/Runmon/29_StormSilver.yaml

@@ -17,77 +17,8 @@ rarity: 1.0
 ball: [Heal]
 shiny: False
 nature: Lax
-ivs: {hp: 14, atk: 14, def: 6, spA: 21, spD: 31, spe: 25}
-evs: {hp: 32, atk: 252, def: 0, spA: 0, spD: 0, spe: 224}
----
-species: Cloyster
-ingamename: "0"
-displayname: "0"
-setname: TPP Storm Silver
-tags: [runmon, in-game]
-item: [Pearl]
-ability: [Shell Armor]
-moves:
-    - [Aurora Beam]
-    - [Protect]
-    - [Spikes]
-    - [Spike Cannon]
-gender: [f]
-happiness: 255
-biddable: True
-rarity: 1.0
-ball: [Great]
-shiny: True
-hidden: false
-nature: Rash
-ivs: 31
-evs: 0
----
-species: Dusclops
-ingamename: d
-displayname: d
-setname: TPP Storm Silver
-tags: [runmon, in-game]
-item: [null]
-ability: [Pressure]
-moves:
-    - [Curse]
-    - [Will-O-Wisp]
-    - [Shadow Punch]
-    - [Mean Look]
-gender: [f]
-happiness: 255
-biddable: True
-rarity: 1.0
-ball: [Poke]
-shiny: True
-hidden: false
-nature: Lax
-ivs: 31
-evs: 0
----
-species: Exeggutor
-ingamename: WWWC
-displayname: WWWC
-setname: TPP Storm Silver
-tags: [runmon, in-game]
-item: [null]
-ability: [Chlorophyll]
-moves:
-    - [Bullet Seed]
-    - [Reflect]
-    - [Leech Seed]
-    - [Confusion]
-gender: [m]
-happiness: 255
-biddable: True
-rarity: 1.0
-ball: [Poke]
-shiny: True
-hidden: false
-nature: Hardy
-ivs: 31
-evs: {hp: 252, atk: 252, def: 252, spA: 252, spD: 252, spe: 0}
+ivs: {hp: 11, atk: 2, def: 4, spA: 23, spD: 14, spe: 15}
+evs: {hp: 15, atk: 52, def: 20, spA: 23, spD: 14, spe: 48}
 ---
 species: Farfetch'd
 ingamename: QUAC
@@ -108,12 +39,12 @@ rarity: 1.0
 ball: [Heal]
 shiny: False
 nature: Jolly
-evs: {hp: 40, atk: 252, def: 28, spA: 32, spD: 36, spe: 252}
-ivs: {hp: 26, atk: 31, def: 23, spA: 31, spD: 5, spe: 31}
+ivs: {hp: 26, atk: 23, def: 23, spA: 21, spD: 5, spe: 5}
+evs: {hp: 40, atk: 168, def: 28, spA: 32, spD: 36, spe: 113}
 ---
 species: Froslass
-ingamename: 00  UU
-displayname: 00  UU
+ingamename: 00  UU
+displayname: 00  UU
 setname: TPP Storm Silver
 tags: [runmon, in-game]
 item: [Spooky Plate]
@@ -131,7 +62,7 @@ ball: [Poke]
 shiny: False
 nature: Bold
 ivs: {hp: 2, atk: 3, def: 1, spA: 29, spD: 14, spe: 3}
-evs: {hp: 36, atk: 160, def: 100, spA: 216, spD: 52, spe: 76}
+evs: {hp: 41, atk: 167, def: 103, spA: 58, spD: 55, spe: 86}
 ---
 species: Gastrodon
 ingamename: AAAAAAAAA
@@ -155,27 +86,6 @@ nature: Bold
 evs: {hp: 56, atk: 136, def: 108, spA: 72, spD: 24, spe: 112}
 ivs: {hp: 28, atk: 26, def: 17, spA: 7, spD: 12, spe: 11}
 ---
-species: Ho-oh
-ingamename: B:dd(OBBbb
-displayname: B:dd(OBBbb
-setname: TPP Storm Silver
-tags: [runmon, in-game]
-item: [Sacred Ash]
-ability: [Pressure]
-moves:
-    - [Flash]
-    - [Punishment]
-    - [Ancient Power]
-    - [Safeguard]
-happiness: 255
-biddable: True
-rarity: 1.0
-ball: [Dusk]
-shiny: False
-nature: Rash
-ivs: {hp: 23, atk: 10, def: 29, spA: 3, spD: 27, spe: 14}
-evs: 0
----
 species: Lugia
 ingamename: r
 displayname: r
@@ -197,29 +107,6 @@ nature: Rash
 ivs: {hp: 31, atk: 11, def: 8, spA: 0, spD: 30, spe: 18}
 evs: {hp: 44, atk: 140, def: 72, spA: 80, spD: 60, spe: 112}
 ---
-species: Salamence
-ingamename: CAAACCAA!
-displayname: CAAACCAA!
-setname: TPP Storm Silver
-tags: [runmon, in-game]
-item: [null]
-ability: [Intimidate]
-moves:
-    - [Zen Headbutt]
-    - [Scary Face]
-    - [Fly]
-    - [Crunch]
-gender: [m]
-happiness: 255
-biddable: True
-rarity: 1.0
-ball: [Ultra]
-shiny: True
-hidden: false
-nature: Bold
-ivs: 31
-evs: 0
----
 species: Skuntank
 ingamename: F2P
 displayname: F2P
@@ -242,29 +129,6 @@ nature: Lax
 ivs: {hp: 2, atk: 22, def: 3, spA: 8, spD: 10, spe: 19}
 evs: {hp: 32, atk: 96, def: 124, spA: 108, spD: 36, spe: 112}
 ---
-species: Tangela
-ingamename: Tangela
-displayname: Tangela
-setname: TPP Storm Silver
-tags: [runmon, in-game]
-item: [null]
-ability: [Chlorophyll]
-moves:
-    - [Slam]
-    - [Tickle]
-    - [Wring Out]
-    - [Power Whip]
-gender: [f]
-happiness: 255
-biddable: True
-rarity: 1.0
-ball: [Quick]
-shiny: True
-hidden: false
-nature: Naughty
-ivs: 31
-evs: 252
----
 species: Typhlosion
 ingamename: "222"
 displayname: "222"

pokesets/Runmon/38_TriHardEmerald.yaml

@@ -30,7 +30,7 @@ ability: [Static]
 moves:
     - [Hidden Power]
     - [Thunderbolt]
-    - [Bite]
+    - [Dark Pulse]
     - [Thunder]
 gender: [f]
 happiness: 255
@@ -152,67 +152,6 @@ nature: Naive
 ivs: {hp: 25, atk: 2, def: 17, spA: 26, spD: 31, spe: 6}
 evs: {hp: 35, atk: 37, def: 9, spA: 21, spD: 26, spe: 38}
 ---
-species: Lotad
-ingamename: "F --"
-displayname: "F --"
-setname: TPP TriHard Emerald
-tags: [runmon, in-game]
-item: [Null]
-ability: [Swift Swim]
-moves:
-    - [Growl]
-    - [Astonish]
-gender: [m]
-happiness: 255
-biddable: True
-rarity: 0.1
-ball: [Poke]
-shiny: False
-nature: Naive
-ivs: {hp: 6, atk: 0, def: 12, spA: 20, spD: 31, spe: 5}
-evs: {hp: 0, atk: 1, def: 0, spA: 0, spD: 0, spe: 0}
----
-species: Wurmple
-ingamename: "Kkek"
-displayname: "Kkek"
-setname: TPP TriHard Emerald
-tags: [runmon, in-game]
-item: [Null]
-ability: [Shield Dust]
-moves:
-    - [String Shot]
-    - [Poison Sting]
-    - [Tackle]
-gender: [f]
-happiness: 255
-biddable: True
-rarity: 0.1
-ball: [Poke]
-shiny: False
-nature: Naive
-ivs: {hp: 0, atk: 1, def: 12, spA: 2, spD: 2, spe: 3}
-evs: {hp: 0, atk: 1, def: 1, spA: 0, spD: 1, spe: 3}
----
-species: Shroomish
-ingamename: "Xxwww ,yyy"
-displayname: "Xxwww ,yyy"
-setname: TPP TriHard Emerald
-tags: [runmon, in-game]
-item: [Null]
-ability: [Effect Spore]
-moves:
-    - [Absorb]
-    - [Tackle]
-gender: [f]
-happiness: 255
-biddable: True
-rarity: 0.1
-ball: [Poke]
-shiny: False
-nature: Serious
-ivs: {hp: 14, atk: 31, def: 6, spA: 25, spD: 24, spe: 16}
-evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
----
 species: Regice
 ingamename: "Vnnnmmmhht"
 displayname: "Vnnnmmmhht"
@@ -256,7 +195,7 @@ nature: Careful
 ivs: {hp: 27, atk: 7, def: 9, spA: 27, spD: 18, spe: 12}
 evs: {hp: 182, atk: 8, def: 112, spA: 26, spD: 17, spe: 165}
 ---
-species: Tentacool
+species: Tentacool #comedy incarnate
 ingamename: "tttttt"
 displayname: "tttttt"
 setname: TPP TriHard Emerald