Merge branch 'master' of https://github.com/Torq-A/pbr-movesets

TwitchPlaysPokemon · Feb 27, 2024 · 4904271 · 4904271
2 parents d4b2bec + cbe29c5
commit 4904271
Show file tree

Hide file tree

Showing 31 changed files with 1,373 additions and 63 deletions.
diff --git a/pokesets/1 HW_Standard/HW_Beedrill.yaml b/pokesets/1 HW_Standard/HW_Beedrill.yaml
@@ -17,26 +17,3 @@ nature: Serious
 ivs: {hp: 26, atk: 1, def: 31, spA: 31, spD: 1, spe: 11}
 evs: {hp: 0, atk: 0, def: 200, spA: 160, spD: 0, spe: 0}
 hidden: false
----
-species: Beedrill #Gazuma
-ingamename: sxc
-displayname: sxc
-setname: Halloween-Temtem
-tags: [halloween]
-item: Magnet #Lightning Rod
-ability: Motor Drive #Fast Charge
-moves:
-    - [Zap Cannon] #DC Beam
-    - [Air Cutter] #Tornado
-    - [Sludge Bomb] #Noxious Bomb
-    - [Discharge] #Electric Storm
-gender: [m]
-happiness: 255
-biddable: False
-rarity: 1.0
-ball: [Heal]
-shiny: Poke
-nature: Serious
-ivs: {hp: 14, atk: 20, def: 8, spA: 2, spD: 17, spe: 31}
-evs: {hp: 178, atk: 143, def: 93, spA: 182, spD: 93, spe: 216}
-hidden: false
diff --git a/pokesets/1 HW_Standard/HW_Entei.yaml b/pokesets/1 HW_Standard/HW_Entei.yaml
@@ -62,4 +62,4 @@ shiny: True
 nature: Serious
 ivs: {hp: 10, atk: 11, def: 31, spA: 15, spD: 31, spe: 12}
 evs: {hp: 206, atk: 174, def: 144, spA: 141, spD: 53, spe: 179}
-hidden: false
+hidden: false
diff --git a/pokesets/1 HW_Standard/HW_Golduck.yaml b/pokesets/1 HW_Standard/HW_Golduck.yaml
@@ -25,7 +25,7 @@ species: Golduck #Platimous
 ingamename: stanley pa
 displayname: stanley pa
 setname: Halloween-Temtem
-tags: [halloween]
+tags: [halloween, runmon, in-game]
 item: Wave Incense #Bait
 ability: Marvel Scale #Zen
 moves:

diff --git a/pokesets/1 HW_Standard/HW_Quilava.yaml b/pokesets/1 HW_Standard/HW_Quilava.yaml
@@ -20,26 +20,3 @@ nature: Serious
 ivs: {hp: 31, atk: 31, def: 31, spA: 31, spD: 31, spe: 31}
 evs: {hp: 140, atk: 252, def: 0, spA: 32, spD: 0, spe: 44}
 hidden: false
----
-species: Quilava #Anahir
-ingamename: Entei
-displayname: Entei
-setname: Halloween-Temtem
-tags: [halloween]
-item: Flame Plate #Fire Chip
-ability: Natural Cure #Self-Care
-moves:
-    - [Fire Spin] #Chains Hit
-    - [Eruption] #Meteor Swarm
-    - [Leaf Blade] #Grass Blade
-    - [Crunch] #Crystal Bite
-gender: [f]
-happiness: 255
-biddable: True
-rarity: 1.0
-ball: [Poke]
-shiny: True
-nature: Serious
-ivs: {hp: 10, atk: 11, def: 31, spA: 15, spD: 31, spe: 12}
-evs: {hp: 206, atk: 174, def: 144, spA: 141, spD: 53, spe: 179}
-hidden: false
diff --git a/pokesets/1 HW_Standard/HW_Seaking.yaml b/pokesets/1 HW_Standard/HW_Seaking.yaml
@@ -2,7 +2,7 @@ species: Seaking #Koish
 ingamename: pokemon
 displayname: pokemon
 setname: Halloween-Temtem
-tags: [halloween]
+tags: [halloween, runmon, in-game]
 item: Occa Berry
 ability: Adaptability #Synergy Adept
 moves:

diff --git a/pokesets/1 HW_Standard/HW_Shaymin.yaml b/pokesets/1 HW_Standard/HW_Shaymin.yaml
@@ -19,3 +19,25 @@ nature: Mild
 ivs: {hp: 0, atk: 31, def: 0, spA: 0, spD: 0, spe: 0}
 evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
 hidden: false
+---
+species: Shaymin
+ingamename: Flwrblight
+displayname: Flowerblight
+setname: Halloween-1
+tags: [halloween]
+item: Pomeg Berry
+ability: Flower Gift
+moves:
+    - [Petal Dance]
+    - [Rage]
+    - [Guillotine]
+    - [Growth]
+happiness: 255
+biddable: True
+rarity: 1.0
+ball: [Dusk]
+shiny: True
+nature: Serious
+ivs: {hp: 31, atk: 31, def: 0, spA: 31, spD: 0, spe: 31}
+evs: {hp: 0, atk: 252, def: 0, spA: 0, spD: 0, spe: 0}
+hidden: false
diff --git a/pokesets/1 HW_Standard/HW_Slowking.yaml b/pokesets/1 HW_Standard/HW_Slowking.yaml
@@ -25,7 +25,7 @@ species: Slowking #Nagaise
 ingamename: Xenoblade
 displayname: Xenoblade
 setname: Halloween-Temtem
-tags: [Halloween]
+tags: [Halloween, runmon, in-game]
 item: Wacan Berry #Rock Shield
 ability: [Storm Drain] #Water Custodian
 moves:

diff --git a/pokesets/1 HW_Standard/HW_Zapdos.yaml b/pokesets/1 HW_Standard/HW_Zapdos.yaml
@@ -0,0 +1,21 @@
+species: Zapdos #Gazuma
+ingamename: sxc
+displayname: sxc
+setname: Halloween-Temtem
+tags: [halloween, runmon, in-game]
+item: Magnet #Lightning Rod
+ability: Motor Drive #Fast Charge
+moves:
+    - [Zap Cannon] #DC Beam
+    - [Air Cutter] #Tornado
+    - [Sludge Bomb] #Noxious Bomb
+    - [Discharge] #Electric Storm
+happiness: 255
+biddable: true
+rarity: 1.0
+ball: [Heal]
+shiny: True
+hidden: False 
+nature: Serious
+ivs: {hp: 14, atk: 20, def: 8, spA: 2, spD: 17, spe: 31}
+evs: {hp: 178, atk: 143, def: 93, spA: 182, spD: 93, spe: 216}
diff --git a/pokesets/1 XM_Standard/XM_Cubone.yaml b/pokesets/1 XM_Standard/XM_Cubone.yaml
@@ -2,7 +2,7 @@ species: Cubone
 ingamename: sans
 displayname: sans
 setname: Christmas-Miitopia
-tags: [Christmas]
+tags: [Christmas, runmon, in-game]
 item: [Nanab Berry]
 ability: [Trace]
 moves:

diff --git a/pokesets/1 XM_Standard/XM_Ditto.yaml b/pokesets/1 XM_Standard/XM_Ditto.yaml
@@ -1,6 +1,6 @@
 species: Ditto
 setname: Christmas-Miitopia
-tags: [Christmas]
+tags: [Christmas, runmon, in-game]
 item: [Sticky Barb]
 ability: [Download]
 moves:

diff --git a/pokesets/1 XM_Standard/XM_Dugtrio.yaml b/pokesets/1 XM_Standard/XM_Dugtrio.yaml
@@ -25,14 +25,14 @@ species: Dugtrio
 ingamename: Dig
 displayname: Dig
 setname: Christmas-Miitopia
-tags: [christmas]
+tags: [christmas, runmon, in-game]
 item: [Metal Coat]
 ability: [Cute Charm]
 moves:
     - [Fury Swipes]
     - [Shadow Claw]
     - [Thief]
-    - [Growl]
+    - [Swords Dance]
 gender: [f]
 happiness: 255
 biddable: True

diff --git a/pokesets/1 XM_Standard/XM_Loudred.yaml b/pokesets/1 XM_Standard/XM_Loudred.yaml
@@ -2,7 +2,7 @@ species: Loudred
 ingamename: "La Resitas"
 displayname: "La Resitas"
 setname: Christmas-Miitopia
-tags: [Christmas]
+tags: [Christmas, runmon, in-game]
 item: [Iron Plate]
 ability: [Shell Armor]
 moves:

diff --git a/pokesets/1 XM_Standard/XM_Porygon-Z.yaml b/pokesets/1 XM_Standard/XM_Porygon-Z.yaml
@@ -24,7 +24,7 @@ species: Porygon-Z
 ingamename: tppsim
 displayname: tppsimulator
 setname: Christmas2
-tags: [christmas]
+tags: [christmas, runmon, in-game]
 item: Dubious Disc
 ability: Synchronize
 moves:
@@ -46,7 +46,7 @@ species: Porygon-Z
 ingamename: Sim
 displayname: Sim
 setname: Christmas-Miitopia
-tags: [Christmas]
+tags: [Christmas, runmon, in-game]
 item: [Heart Scale]
 ability: [Soundproof]
 moves:

diff --git a/pokesets/1 XM_Standard/XM_Rapidash.yaml b/pokesets/1 XM_Standard/XM_Rapidash.yaml
@@ -25,7 +25,7 @@ species: Rapidash
 ingamename: "qzsds gg "
 displayname: "qzsds gg "
 setname: Christmas-Miitopia
-tags: [Christmas]
+tags: [Christmas, runmon, in-game]
 item: [Destiny Knot]
 ability: [Run Away]
 moves:

diff --git a/pokesets/1 XM_Standard/XM_Wobbuffet.yaml b/pokesets/1 XM_Standard/XM_Wobbuffet.yaml
@@ -25,7 +25,7 @@ species: Wobbuffet
 ingamename: AMOGUS
 displayname: AMOGUS
 setname: Christmas-Miitopia
-tags: [Christmas]
+tags: [Christmas, runmon, in-game]
 item: [Thick Club]
 ability: [Magic Guard]
 moves:

diff --git a/pokesets/1 XM_Standard/XM_Wooper.yaml b/pokesets/1 XM_Standard/XM_Wooper.yaml
@@ -2,7 +2,7 @@ species: Wooper
 ingamename: This.
 displayname: This.
 setname: Christmas-Miitopia
-tags: [christmas]
+tags: [christmas, runmon, in-game]
 item: [Stick]
 ability: [Guts]
 moves:

diff --git a/pokesets/1 XM_Standard/XM_Zigzagoon.yaml b/pokesets/1 XM_Standard/XM_Zigzagoon.yaml
@@ -2,7 +2,7 @@ species: Zigzagoon
 ingamename: Ziggy
 displayname: Ziggy
 setname: Christmas-Miitopia
-tags: [Christmas]
+tags: [Christmas, runmon, in-game]
 item: [Wise Glasses]
 ability: [Download]
 moves:

diff --git a/pokesets/HW_Apokelypse/326_Grumpig.yaml b/pokesets/HW_Apokelypse/326_Grumpig.yaml
@@ -0,0 +1,23 @@
+species: Grumpig
+ingamename: DrkBeastGn
+displayname: "Dark Beast Ganon"
+setname: Pokelypse
+tags: ubers
+tags: [pokelypse]
+item: Enigma Berry
+ability: Wonder Guard
+moves:
+    - [Dark Pulse]
+    - [Hyper Beam]
+    - [Dark Void]
+    - [Calm Mind]
+gender: [m]
+happiness: 255
+biddable: True
+rarity: 1.0
+ball: [Master]
+shiny: True
+nature: Modest
+ivs: {hp: 31, atk: 0, def: 31, spA: 31, spD: 31, spe: 31}
+evs: {hp: 252, atk: 0, def: 252, spA: 252, spD: 252, spe: 0}
+hidden: false
diff --git a/pokesets/HW_Apokelypse/386_Deoxys-Attack.yaml b/pokesets/HW_Apokelypse/386_Deoxys-Attack.yaml
@@ -20,3 +20,26 @@ nature: Adamant
 ivs: {hp: 0, atk: 31, def: 31, spA: 31, spD: 31, spe: 31}
 evs: {hp: 0, atk: 252, def: 0, spA: 0, spD: 4, spe: 252}
 hidden: false
+---
+species: Deoxys
+ingamename: Thndrblght
+displayname: Thunderblight
+setname: Pokelypse-2
+tags: [pokelypse]
+item: [Focus Sash]
+ability: Speed Boost
+moves:
+    - [Psycho Cut]
+    - [Thunderbolt]
+    - [Magnet Bomb]
+    - [Double Team]
+form: Attack
+happiness: 255
+biddable: True
+rarity: 1.0
+ball: [Dusk]
+shiny: True
+nature: Adamant
+ivs: {hp: 31, atk: 31, def: 31, spA: 31, spD: 31, spe: 0}
+evs: {hp: 251, atk: 0, def: 252, spA: 0, spD: 252, spe: 0}
+hidden: false
diff --git a/pokesets/HW_Apokelypse/386_Deoxys-Speed.yaml b/pokesets/HW_Apokelypse/386_Deoxys-Speed.yaml
@@ -0,0 +1,22 @@
+species: Deoxys
+ingamename: Windblight
+displayname: Windblight
+setname: Pokelypse-1
+tags: [pokelypse]
+item: [Power Herb]
+ability: Serene Grace
+moves:
+    - [Air Slash]
+    - [Sky Attack]
+    - [U-Turn]
+    - [Tailwind]
+form: Speed
+happiness: 255
+biddable: True
+rarity: 1.0
+ball: [Dusk]
+shiny: True
+nature: Serious
+ivs: {hp: 31, atk: 31, def: 31, spA: 31, spD: 31, spe: 31}
+evs: {hp: 252, atk: 0, def: 252, spA: 252, spD: 252, spe: 0}
+hidden: false