From 0a4b75615d829f85bc2dd835ab8cfcc9f2e73ddd Mon Sep 17 00:00:00 2001
From: Marty-D <math_man70@hotmail.com>
Date: Fri, 14 Jul 2017 08:45:43 -0400
Subject: [PATCH] Add new event Pokemon

---
 data/formats-data.js |  2 ++
 data/learnsets.js    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/data/formats-data.js b/data/formats-data.js
index 116a578160..f9ab4fd74e 100644
--- a/data/formats-data.js
+++ b/data/formats-data.js
@@ -1726,6 +1726,7 @@ exports.BattleFormatsData = {
 			{"generation": 4, "level": 5, "moves":["pound"], "pokeball": "cherishball"},
 			{"generation": 6, "level": 100, "moves":["pound"], "pokeball": "cherishball"},
 			{"generation": 7, "level": 5, "moves":["pound"], "pokeball": "cherishball"},
+			{"generation": 7, "level": 50, "moves":["psychic", "barrier", "metronome", "transform"], "pokeball": "cherishball"},
 		],
 		eventOnly: true,
 		tier: "OU",
@@ -2380,6 +2381,7 @@ exports.BattleFormatsData = {
 			{"generation": 5, "level": 5, "isHidden": true, "moves":["whirlwind", "weatherball"], "pokeball": "dreamball"},
 			{"generation": 6, "level": 50, "shiny": 1, "isHidden": false, "moves":["sunnyday", "fireblast", "sacredfire", "punishment"]},
 			{"generation": 6, "level": 50, "shiny": true, "isHidden": false, "moves":["sacredfire", "bravebird", "recover", "celebrate"], "pokeball": "cherishball"},
+			{"generation": 7, "level": 100, "isHidden": false, "moves":["sacredfire", "bravebird", "recover", "safeguard"], "pokeball": "cherishball"},
 		],
 		eventOnly: true,
 		tier: "Uber",
diff --git a/data/learnsets.js b/data/learnsets.js
index fce5e7ca9d..bee513bed7 100644
--- a/data/learnsets.js
+++ b/data/learnsets.js
@@ -18659,7 +18659,7 @@ exports.BattleLearnsets = {
 		aurasphere: ["7L100", "6L100", "5L100", "4L100", "4S14", "4S15", "4S16", "4S17", "4S18", "4S19"],
 		auroraveil: ["7M"],
 		avalanche: ["4M"],
-		barrier: ["7L40", "6L40", "5L40", "4L40", "4S15"],
+		barrier: ["7L40", "7S24", "6L40", "5L40", "4L40", "4S15"],
 		batonpass: ["7L80", "6L80", "5L80", "4L80"],
 		bide: ["7V"],
 		bind: ["6T", "5T"],
@@ -18767,7 +18767,7 @@ exports.BattleLearnsets = {
 		megadrain: ["7V"],
 		megakick: ["7V", "3T"],
 		megapunch: ["7L10", "7V", "6L10", "5L10", "4L10", "4S16", "3T", "3L20", "3S0"],
-		metronome: ["7L20", "7V", "6L20", "5L20", "4L20", "4S14", "4S15", "4S16", "4S17", "4S18", "4S19", "3T", "3L30", "3S0"],
+		metronome: ["7L20", "7V", "7S24", "6L20", "5L20", "4L20", "4S14", "4S15", "4S16", "4S17", "4S18", "4S19", "3T", "3L30", "3S0"],
 		mimic: ["7V", "3T"],
 		mudslap: ["4T", "3T"],
 		nastyplot: ["7L90", "6L90", "5L90", "4L90"],
@@ -18786,7 +18786,7 @@ exports.BattleLearnsets = {
 		pound: ["7L1", "7V", "7S23", "6L1", "6S22", "5L1", "4L1", "4S21", "3L1", "3S0", "3S1"],
 		poweruppunch: ["6M"],
 		protect: ["7M", "6M", "5M", "4M", "3M"],
-		psychic: ["7M", "7L30", "7V", "6M", "6L30", "5M", "5L30", "4M", "4L30", "4S19", "3M", "3L40"],
+		psychic: ["7M", "7L30", "7V", "7S24", "6M", "6L30", "5M", "5L30", "4M", "4L30", "4S19", "3M", "3L40"],
 		psychup: ["7M", "6M", "5M", "4M", "3T"],
 		psyshock: ["7M", "6M", "5M"],
 		psywave: ["7V"],
@@ -18866,7 +18866,7 @@ exports.BattleLearnsets = {
 		thunderwave: ["7M", "7V", "6M", "5M", "4M", "3T"],
 		torment: ["7M", "6M", "5M", "4M", "3M"],
 		toxic: ["7M", "7V", "6M", "5M", "4M", "3M"],
-		transform: ["7L1", "7V", "6L1", "5L1", "4L1", "4S18", "3L10", "3S0", "3S1"],
+		transform: ["7L1", "7V", "7S24", "6L1", "5L1", "4L1", "4S18", "3L10", "3S0", "3S1"],
 		triattack: ["7V"],
 		trick: ["6T", "5T", "4T"],
 		trickroom: ["7M", "6M", "5M", "4M"],
@@ -25654,7 +25654,7 @@ exports.BattleLearnsets = {
 		aerialace: ["7M", "6M", "5M", "4M", "3M"],
 		aircutter: ["4T"],
 		ancientpower: ["7L57", "6L57", "5L57", "4T", "4L57", "4S2", "3L88"],
-		bravebird: ["7L15", "6L15", "6S5", "5L15", "4L15"],
+		bravebird: ["7L15", "7S6", "6L15", "6S5", "5L15", "4L15"],
 		bulldoze: ["7M", "6M", "5M"],
 		calmmind: ["7M", "7L93", "6M", "6L93", "5M", "5L93", "4M", "4L93", "3M"],
 		celebrate: ["6S5"],
@@ -25699,7 +25699,7 @@ exports.BattleLearnsets = {
 		psychup: ["7M", "6M", "5M", "4M", "3T"],
 		punishment: ["7L50", "6L50", "6S4", "5L50", "4L50", "4S2"],
 		raindance: ["7M", "6M", "5M", "4M", "3M"],
-		recover: ["7L71", "6L71", "6S5", "5L71", "4L23", "3L33", "3S0"],
+		recover: ["7L71", "7S6", "6L71", "6S5", "5L71", "4L23", "3L33", "3S0"],
 		reflect: ["7M", "6M", "5M", "4M", "3M"],
 		rest: ["7M", "6M", "5M", "4M", "3M"],
 		return: ["7M", "6M", "5M", "4M", "3M"],
@@ -25707,8 +25707,8 @@ exports.BattleLearnsets = {
 		rocksmash: ["6M", "5M", "4M", "3M"],
 		roost: ["7M", "6M", "5T", "4M"],
 		round: ["7M", "6M", "5M"],
-		sacredfire: ["7L43", "6L43", "6S4", "6S5", "5L43", "4L43", "4S1", "4S2", "3L77"],
-		safeguard: ["7M", "7L65", "6M", "6L65", "5M", "5L65", "4M", "4L9", "4S2", "3M", "3L11"],
+		sacredfire: ["7L43", "7S6", "6L43", "6S4", "6S5", "5L43", "4L43", "4S1", "4S2", "3L77"],
+		safeguard: ["7M", "7L65", "7S6", "6M", "6L65", "5M", "5L65", "4M", "4L9", "4S2", "3M", "3L11"],
 		sandstorm: ["7M", "6M", "5M", "4M", "3M"],
 		secretpower: ["6M", "4M", "3M"],
 		shadowball: ["7M", "6M", "5M", "4M", "3M"],