diff --git a/data/learnsets-g6.js b/data/learnsets-g6.js
index a8e69726a..7154df7dd 100644
--- a/data/learnsets-g6.js
+++ b/data/learnsets-g6.js
@@ -742,7 +742,7 @@ exports.BattleLearnsets = {
 	gourgeist:{learnset:{explosion:["6L001a","6L075","6M"],phantomforce:["6L001b","6L057"],trick:["6L001c"],astonish:["6L001d"],confuseray:["6L001e"],scaryface:["6L004"],trickortreat:["6L006","6L023","6L040","6L063"],worryseed:["6L011"],razorleaf:["6L016"],leechseed:["6L020"],bulletseed:["6L026"],shadowsneak:["6L030"],shadowball:["6L036","6L070","6M"],painsplit:["6L042"],seedbomb:["6L048"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],hyperbeam:["6M"],lightscreen:["6M"],protect:["6M"],safeguard:["6M"],frustration:["6M"],solarbeam:["6M"],"return":["6M"],psychic:["6M"],doubleteam:["6M"],flamethrower:["6M"],sludgebomb:["6M"],fireblast:["6M"],facade:["6M"],flamecharge:["6M"],rest:["6M"],attract:["6M"],thief:["6M"],round:["6M"],focusblast:["6M"],energyball:["6M"],chargebeam:["6M"],incinerate:["6M"],willowisp:["6M"],gigaimpact:["6M"],flash:["6M"],gyroball:["6M"],rockslide:["6M"],dreameater:["6M"],grassknot:["6M"],swagger:["6M"],sleeptalk:["6M"],substitute:["6M"],trickroom:["6M"],rocksmash:["6M"],naturepower:["6M"],darkpulse:["6M"],confide:["6M"]}},
 	bergmite:{learnset:{tackle:["6L001a"],bite:["6L001b"],harden:["6L001c"],powdersnow:["6L005"],icywind:["6L010"],takedown:["6L015"],sharpen:["6L020"],curse:["6L022"],icefang:["6L026"],iceball:["6L030"],rapidspin:["6L035"],avalanche:["6L039"],blizzard:["6L043","6M"],recover:["6L047","6E"],doubleedge:["6L049"],toxic:["6M"],hail:["6M"],hiddenpower:["6M"],icebeam:["6M"],protect:["6M"],raindance:["6M"],safeguard:["6M"],frustration:["6M"],"return":["6M"],doubleteam:["6M"],rocktomb:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],round:["6M"],rockpolish:["6M"],flash:["6M"],stoneedge:["6M"],gyroball:["6M"],frostbreath:["6M"],rockslide:["6M"],swagger:["6M"],sleeptalk:["6M"],substitute:["6M"],flashcannon:["6M"],rocksmash:["6M"],confide:["6M"],surf:["6M"],strength:["6M"],mist:["6E"],mirrorcoat:["6E"],barrier:["6E"]}},
 	avalugg:{learnset:{irondefense:["6L001a"],crunch:["6L001b","6L065"],skullbash:["6L001c","6L060"],tackle:["6L001d"],bite:["6L001e"],harden:["6L001f"],powdersnow:["6L005"],icywind:["6L010"],takedown:["6L015"],sharpen:["6L020"],curse:["6L022"],icefang:["6L026"],iceball:["6L030"],rapidspin:["6L035"],avalanche:["6L042"],blizzard:["6L046","6M"],recover:["6L051"],doubleedge:["6L056"],roar:["6M"],toxic:["6M"],hail:["6M"],hiddenpower:["6M"],icebeam:["6M"],hyperbeam:["6M"],protect:["6M"],raindance:["6M"],safeguard:["6M"],frustration:["6M"],earthquake:["6M"],"return":["6M"],doubleteam:["6M"],rocktomb:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],round:["6M"],gigaimpact:["6M"],rockpolish:["6M"],flash:["6M"],stoneedge:["6M"],gyroball:["6M"],bulldoze:["6M"],frostbreath:["6M"],rockslide:["6M"],swagger:["6M"],sleeptalk:["6M"],substitute:["6M"],flashcannon:["6M"],rocksmash:["6M"],confide:["6M"],surf:["6M"],strength:["6M"]}},
-	noibat:{learnset:{screech:["6L001a"],supersonic:["6L001b"],tackle:["6L001c"],leechlife:["6L005"],gust:["6L011"],bite:["6L013"],wingattack:["6L016"],agility:["6L018"],aircutter:["6L023"],roost:["6L027","6M"],razorwind:["6L031"],tailwind:["6L035","6E"],whirlwind:["6L040"],superfang:["6L043"],airslash:["6L048"],hurricane:["6L058"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],taunt:["6M"],protect:["6M"],frustration:["6M"],solarbeam:["6M"],"return":["6M"],psychic:["6M"],shadowball:["6M"],brickbreak:["6M"],doubleteam:["6M"],aerialace:["6M"],torment:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],thief:["6M"],round:["6M"],echoedvoice:["6M"],steelwing:["6M"],acrobatics:["6M"],shadowclaw:["6M"],xscissor:["6M"],dreameater:["6M"],swagger:["6M"],sleeptalk:["6M"],uturn:["6M"],substitute:["6M"],wildcharge:["6M"],darkpulse:["6M"],confide:["6M"],cut:["6M"],fly:["6M"],dracometeor:["6T"],switcheroo:["6E"]}},
+	noibat:{learnset:{screech:["6L001a"],supersonic:["6L001b"],tackle:["6L001c"],leechlife:["6L005"],gust:["6L011"],bite:["6L013"],wingattack:["6L016"],agility:["6L018"],aircutter:["6L023"],roost:["6L027","6M"],razorwind:["6L031"],tailwind:["6L035","6E"],whirlwind:["6L040"],superfang:["6L043"],airslash:["6L048"],hurricane:["6L058"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],taunt:["6M"],protect:["6M"],frustration:["6M"],solarbeam:["6M"],"return":["6M"],psychic:["6M"],shadowball:["6M"],brickbreak:["6M"],doubleteam:["6M"],aerialace:["6M"],torment:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],thief:["6M"],round:["6M"],echoedvoice:["6M"],steelwing:["6M"],acrobatics:["6M"],shadowclaw:["6M"],xscissor:["6M"],dreameater:["6M"],swagger:["6M"],sleeptalk:["6M"],uturn:["6M"],substitute:["6M"],wildcharge:["6M"],darkpulse:["6M"],confide:["6M"],cut:["6M"],fly:["6M"],dracometeor:["6T"],switcheroo:["6E"],snatch:["6E"],outrage:["6E"]}},
 	noivern:{learnset:{moonlight:["6L001a"],boomburst:["6L001b","6L075"],dragonpulse:["6L001c","6L070"],hurricane:["6L001d","6L062"],screech:["6L001e"],supersonic:["6L001f"],tackle:["6L001g"],leechlife:["6L005"],gust:["6L011"],bite:["6L013"],wingattack:["6L016"],agility:["6L018"],aircutter:["6L023"],roost:["6L027","6M"],razorwind:["6L031"],tailwind:["6L035"],whirlwind:["6L040"],superfang:["6L043"],airslash:["6L053"],honeclaws:["6M"],dragonclaw:["6M"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],taunt:["6M"],hyperbeam:["6M"],protect:["6M"],frustration:["6M"],solarbeam:["6M"],"return":["6M"],psychic:["6M"],shadowball:["6M"],brickbreak:["6M"],doubleteam:["6M"],flamethrower:["6M"],aerialace:["6M"],torment:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],thief:["6M"],round:["6M"],echoedvoice:["6M"],steelwing:["6M"],focusblast:["6M"],acrobatics:["6M"],shadowclaw:["6M"],gigaimpact:["6M"],xscissor:["6M"],dreameater:["6M"],swagger:["6M"],sleeptalk:["6M"],uturn:["6M"],substitute:["6M"],wildcharge:["6M"],darkpulse:["6M"],confide:["6M"],cut:["6M"],fly:["6M"],dracometeor:["6T"]}},
 	xerneas:{learnset:{healpulse:["6L001a"],aromatherapy:["6L001b"],ingrain:["6L001c"],takedown:["6L001d"],lightscreen:["6L001e","6M"],aurorabeam:["6L001f"],gravity:["6L001g"],geomancy:["6L001h"],moonblast:["6L001i"],megahorn:["6L001j"],nightslash:["6L051"],hornleech:["6L055"],psychup:["6L059","6M"],mistyterrain:["6L063"],naturepower:["6L072","6M"],closecombat:["6L080"],gigaimpact:["6L088","6M"],outrage:["6L093"],psyshock:["6M"],calmmind:["6M"],roar:["6M"],toxic:["6M"],hail:["6M"],hiddenpower:["6M"],sunnyday:["6M"],hyperbeam:["6M"],protect:["6M"],raindance:["6M"],frustration:["6M"],thunderbolt:["6M"],thunder:["6M"],"return":["6M"],psychic:["6M"],doubleteam:["6M"],reflect:["6M"],facade:["6M"],rest:["6M"],round:["6M"],echoedvoice:["6M"],focusblast:["6M"],flash:["6M"],thunderwave:["6M"],rockslide:["6M"],grassknot:["6M"],swagger:["6M"],sleeptalk:["6M"],substitute:["6M"],flashcannon:["6M"],dazzlinggleam:["6M"],confide:["6M"],cut:["6M"]}},
 	yveltal:{learnset:{hurricane:["6L001a"],razorwind:["6L001b"],taunt:["6L001c","6M"],roost:["6L001d","6M"],doubleteam:["6L001e","6M"],airslash:["6L001f"],snarl:["6L001g","6M"],oblivionwing:["6L001h"],disable:["6L001i"],darkpulse:["6L001j","6M"],foulplay:["6L051"],phantomforce:["6L055"],psychic:["6L059","6M"],dragonrush:["6L063"],focusblast:["6L072","6M"],suckerpunch:["6L080"],hyperbeam:["6L088","6M"],skyattack:["6L093"],honeclaws:["6M"],dragonclaw:["6M"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],protect:["6M"],raindance:["6M"],frustration:["6M"],"return":["6M"],shadowball:["6M"],aerialace:["6M"],torment:["6M"],facade:["6M"],rest:["6M"],thief:["6M"],round:["6M"],steelwing:["6M"],skydrop:["6M"],acrobatics:["6M"],embargo:["6M"],shadowclaw:["6M"],gigaimpact:["6M"],rockslide:["6M"],dreameater:["6M"],swagger:["6M"],sleeptalk:["6M"],uturn:["6M"],substitute:["6M"],confide:["6M"],cut:["6M"],fly:["6M"]}},
diff --git a/data/learnsets.js b/data/learnsets.js
index c9ac7f9bc..c190ae547 100644
--- a/data/learnsets.js
+++ b/data/learnsets.js
@@ -742,7 +742,7 @@ exports.BattleLearnsets = {
 	gourgeist:{learnset:{explosion:["6L1","6L75","6M"],phantomforce:["6L1","6L57"],trick:["6L1"],astonish:["6L1"],confuseray:["6L1"],scaryface:["6L4"],trickortreat:["6L6","6L23","6L40","6L63"],worryseed:["6L11"],razorleaf:["6L16"],leechseed:["6L20"],bulletseed:["6L26"],shadowsneak:["6L30"],shadowball:["6L36","6L70","6M"],painsplit:["6L42"],seedbomb:["6L48"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],hyperbeam:["6M"],lightscreen:["6M"],protect:["6M"],safeguard:["6M"],frustration:["6M"],solarbeam:["6M"],"return":["6M"],psychic:["6M"],doubleteam:["6M"],flamethrower:["6M"],sludgebomb:["6M"],fireblast:["6M"],facade:["6M"],flamecharge:["6M"],rest:["6M"],attract:["6M"],thief:["6M"],round:["6M"],focusblast:["6M"],energyball:["6M"],chargebeam:["6M"],incinerate:["6M"],willowisp:["6M"],gigaimpact:["6M"],flash:["6M"],gyroball:["6M"],rockslide:["6M"],dreameater:["6M"],grassknot:["6M"],swagger:["6M"],sleeptalk:["6M"],substitute:["6M"],trickroom:["6M"],rocksmash:["6M"],naturepower:["6M"],darkpulse:["6M"],confide:["6M"]}},
 	bergmite:{learnset:{tackle:["6L1"],bite:["6L1"],harden:["6L1"],powdersnow:["6L5"],icywind:["6L10"],takedown:["6L15"],sharpen:["6L20"],curse:["6L22"],icefang:["6L26"],iceball:["6L30"],rapidspin:["6L35"],avalanche:["6L39"],blizzard:["6L43","6M"],recover:["6L47","6E"],doubleedge:["6L49"],toxic:["6M"],hail:["6M"],hiddenpower:["6M"],icebeam:["6M"],protect:["6M"],raindance:["6M"],safeguard:["6M"],frustration:["6M"],"return":["6M"],doubleteam:["6M"],rocktomb:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],round:["6M"],rockpolish:["6M"],flash:["6M"],stoneedge:["6M"],gyroball:["6M"],frostbreath:["6M"],rockslide:["6M"],swagger:["6M"],sleeptalk:["6M"],substitute:["6M"],flashcannon:["6M"],rocksmash:["6M"],confide:["6M"],surf:["6M"],strength:["6M"],mist:["6E"],mirrorcoat:["6E"],barrier:["6E"]}},
 	avalugg:{learnset:{irondefense:["6L1"],crunch:["6L1","6L65"],skullbash:["6L1","6L60"],tackle:["6L1"],bite:["6L1"],harden:["6L1"],powdersnow:["6L5"],icywind:["6L10"],takedown:["6L15"],sharpen:["6L20"],curse:["6L22"],icefang:["6L26"],iceball:["6L30"],rapidspin:["6L35"],avalanche:["6L42"],blizzard:["6L46","6M"],recover:["6L51"],doubleedge:["6L56"],roar:["6M"],toxic:["6M"],hail:["6M"],hiddenpower:["6M"],icebeam:["6M"],hyperbeam:["6M"],protect:["6M"],raindance:["6M"],safeguard:["6M"],frustration:["6M"],earthquake:["6M"],"return":["6M"],doubleteam:["6M"],rocktomb:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],round:["6M"],gigaimpact:["6M"],rockpolish:["6M"],flash:["6M"],stoneedge:["6M"],gyroball:["6M"],bulldoze:["6M"],frostbreath:["6M"],rockslide:["6M"],swagger:["6M"],sleeptalk:["6M"],substitute:["6M"],flashcannon:["6M"],rocksmash:["6M"],confide:["6M"],surf:["6M"],strength:["6M"]}},
-	noibat:{learnset:{screech:["6L1"],supersonic:["6L1"],tackle:["6L1"],leechlife:["6L5"],gust:["6L11"],bite:["6L13"],wingattack:["6L16"],agility:["6L18"],aircutter:["6L23"],roost:["6L27","6M"],razorwind:["6L31"],tailwind:["6L35","6E"],whirlwind:["6L40"],superfang:["6L43"],airslash:["6L48"],hurricane:["6L58"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],taunt:["6M"],protect:["6M"],frustration:["6M"],solarbeam:["6M"],"return":["6M"],psychic:["6M"],shadowball:["6M"],brickbreak:["6M"],doubleteam:["6M"],aerialace:["6M"],torment:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],thief:["6M"],round:["6M"],echoedvoice:["6M"],steelwing:["6M"],acrobatics:["6M"],shadowclaw:["6M"],xscissor:["6M"],dreameater:["6M"],swagger:["6M"],sleeptalk:["6M"],uturn:["6M"],substitute:["6M"],wildcharge:["6M"],darkpulse:["6M"],confide:["6M"],cut:["6M"],fly:["6M"],dracometeor:["6T"],switcheroo:["6E"]}},
+	noibat:{learnset:{screech:["6L1"],supersonic:["6L1"],tackle:["6L1"],leechlife:["6L5"],gust:["6L11"],bite:["6L13"],wingattack:["6L16"],agility:["6L18"],aircutter:["6L23"],roost:["6L27","6M"],razorwind:["6L31"],tailwind:["6L35","6E"],whirlwind:["6L40"],superfang:["6L43"],airslash:["6L48"],hurricane:["6L58"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],taunt:["6M"],protect:["6M"],frustration:["6M"],solarbeam:["6M"],"return":["6M"],psychic:["6M"],shadowball:["6M"],brickbreak:["6M"],doubleteam:["6M"],aerialace:["6M"],torment:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],thief:["6M"],round:["6M"],echoedvoice:["6M"],steelwing:["6M"],acrobatics:["6M"],shadowclaw:["6M"],xscissor:["6M"],dreameater:["6M"],swagger:["6M"],sleeptalk:["6M"],uturn:["6M"],substitute:["6M"],wildcharge:["6M"],darkpulse:["6M"],confide:["6M"],cut:["6M"],fly:["6M"],dracometeor:["6T"],switcheroo:["6E"],snatch:["6E"],outrage:["6E"]}},
 	noivern:{learnset:{moonlight:["6L1"],boomburst:["6L1","6L75"],dragonpulse:["6L1","6L70"],hurricane:["6L1","6L62"],screech:["6L1"],supersonic:["6L1"],tackle:["6L1"],leechlife:["6L5"],gust:["6L11"],bite:["6L13"],wingattack:["6L16"],agility:["6L18"],aircutter:["6L23"],roost:["6L27","6M"],razorwind:["6L31"],tailwind:["6L35"],whirlwind:["6L40"],superfang:["6L43"],airslash:["6L53"],honeclaws:["6M"],dragonclaw:["6M"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],taunt:["6M"],hyperbeam:["6M"],protect:["6M"],frustration:["6M"],solarbeam:["6M"],"return":["6M"],psychic:["6M"],shadowball:["6M"],brickbreak:["6M"],doubleteam:["6M"],flamethrower:["6M"],aerialace:["6M"],torment:["6M"],facade:["6M"],rest:["6M"],attract:["6M"],thief:["6M"],round:["6M"],echoedvoice:["6M"],steelwing:["6M"],focusblast:["6M"],acrobatics:["6M"],shadowclaw:["6M"],gigaimpact:["6M"],xscissor:["6M"],dreameater:["6M"],swagger:["6M"],sleeptalk:["6M"],uturn:["6M"],substitute:["6M"],wildcharge:["6M"],darkpulse:["6M"],confide:["6M"],cut:["6M"],fly:["6M"],dracometeor:["6T"]}},
 	xerneas:{learnset:{healpulse:["6L1"],aromatherapy:["6L1"],ingrain:["6L1"],takedown:["6L1"],lightscreen:["6L1","6M"],aurorabeam:["6L1"],gravity:["6L1"],geomancy:["6L1"],moonblast:["6L1"],megahorn:["6L1"],nightslash:["6L51"],hornleech:["6L55"],psychup:["6L59","6M"],mistyterrain:["6L63"],naturepower:["6L72","6M"],closecombat:["6L80"],gigaimpact:["6L88","6M"],outrage:["6L93"],psyshock:["6M"],calmmind:["6M"],roar:["6M"],toxic:["6M"],hail:["6M"],hiddenpower:["6M"],sunnyday:["6M"],hyperbeam:["6M"],protect:["6M"],raindance:["6M"],frustration:["6M"],thunderbolt:["6M"],thunder:["6M"],"return":["6M"],psychic:["6M"],doubleteam:["6M"],reflect:["6M"],facade:["6M"],rest:["6M"],round:["6M"],echoedvoice:["6M"],focusblast:["6M"],flash:["6M"],thunderwave:["6M"],rockslide:["6M"],grassknot:["6M"],swagger:["6M"],sleeptalk:["6M"],substitute:["6M"],flashcannon:["6M"],dazzlinggleam:["6M"],confide:["6M"],cut:["6M"]}},
 	yveltal:{learnset:{hurricane:["6L1"],razorwind:["6L1"],taunt:["6L1","6M"],roost:["6L1","6M"],doubleteam:["6L1","6M"],airslash:["6L1"],snarl:["6L1","6M"],oblivionwing:["6L1"],disable:["6L1"],darkpulse:["6L1","6M"],foulplay:["6L51"],phantomforce:["6L55"],psychic:["6L59","6M"],dragonrush:["6L63"],focusblast:["6L72","6M"],suckerpunch:["6L80"],hyperbeam:["6L88","6M"],skyattack:["6L93"],honeclaws:["6M"],dragonclaw:["6M"],toxic:["6M"],hiddenpower:["6M"],sunnyday:["6M"],protect:["6M"],raindance:["6M"],frustration:["6M"],"return":["6M"],shadowball:["6M"],aerialace:["6M"],torment:["6M"],facade:["6M"],rest:["6M"],thief:["6M"],round:["6M"],steelwing:["6M"],skydrop:["6M"],acrobatics:["6M"],embargo:["6M"],shadowclaw:["6M"],gigaimpact:["6M"],rockslide:["6M"],dreameater:["6M"],swagger:["6M"],sleeptalk:["6M"],uturn:["6M"],substitute:["6M"],confide:["6M"],cut:["6M"],fly:["6M"]}},
diff --git a/data/moves.js b/data/moves.js
index 5f8f12aaa..8717bccb1 100644
--- a/data/moves.js
+++ b/data/moves.js
@@ -240,7 +240,7 @@ exports.BattleMovedex = {
 		id: "airslash",
 		isViable: true,
 		name: "Air Slash",
-		pp: 20,
+		pp: 15,
 		priority: 0,
 		secondary: {
 			chance: 30,
@@ -436,7 +436,7 @@ exports.BattleMovedex = {
 		accuracy: true,
 		basePower: 0,
 		category: "Status",
-		desc: "A random move among those known by the user's party members is selected for use. Does not select Assist, Bestow, Chatter, Circle Throw, Copycat, Counter, Covet, Destiny Bond, Detect, Dragon Tail, Endure, Feint, Focus Punch, Follow Me, Helping Hand, Me First, Metronome, Mimic, Mirror Coat, Mirror Move, Nature Power, Protect, Rage Powder, Sketch, Sleep Talk, Snatch, Struggle, Switcheroo, Thief, Transform, or Trick.",
+		desc: "A random move among those known by the user's party members is selected for use. Does not select Assist, Belch, Bestow, Chatter, Circle Throw, Copycat, Counter, Covet, Destiny Bond, Detect, Dragon Tail, Endure, Feint, Focus Punch, Follow Me, Helping Hand, Me First, Metronome, Mimic, Mirror Coat, Mirror Move, Nature Power, Protect, Rage Powder, Sketch, Sleep Talk, Snatch, Struggle, Switcheroo, Thief, Transform, or Trick.",
 		shortDesc: "Uses a random move known by a team member.",
 		id: "assist",
 		name: "Assist",
@@ -450,7 +450,7 @@ exports.BattleMovedex = {
 				for (var i=0; i<pokemon.moves.length; i++) {
 					var move = pokemon.moves[i];
 					var noAssist = {
-						assist:1, bestow:1, bounce:1, chatter:1, circlethrow:1, copycat:1, counter:1, covet:1, destinybond:1, detect:1, dig:1, dive:1, dragontail:1, endure:1, feint:1, fly:1, focuspunch:1, followme:1, helpinghand:1, mefirst:1, metronome:1, mimic:1, mirrorcoat:1, mirrormove:1, naturepower:1, phantomforce:1, protect:1, ragepowder:1, roar:1, shadowforce:1, sketch:1, sleeptalk:1, snatch:1, struggle:1, switcheroo:1, thief:1, transform:1, trick:1, whirlwind:1
+						assist:1, belch:1, bestow:1, bounce:1, chatter:1, circlethrow:1, copycat:1, counter:1, covet:1, destinybond:1, detect:1, dig:1, dive:1, dragontail:1, endure:1, feint:1, fly:1, focuspunch:1, followme:1, helpinghand:1, mefirst:1, metronome:1, mimic:1, mirrorcoat:1, mirrormove:1, naturepower:1, phantomforce:1, protect:1, ragepowder:1, roar:1, shadowforce:1, sketch:1, sleeptalk:1, snatch:1, struggle:1, switcheroo:1, thief:1, transform:1, trick:1, whirlwind:1
 					};
 					if (move && !noAssist[move]) {
 						moves.push(move);
@@ -1539,6 +1539,25 @@ exports.BattleMovedex = {
 		target: "allAdjacentFoes",
 		type: "Normal"
 	},
+	"celebrate": {
+		num: 150,
+		accuracy: true,
+		basePower: 0,
+		category: "Status",
+		desc: "No in-game effect. (Doubles prizes out-of-battle.)",
+		shortDesc: "Does nothing.",
+		id: "Celebrate",
+		name: "celebrate",
+		pp: 40,
+		priority: 0,
+		onTryHit: function(target, source) {
+			this.add('-activate', target, "move: Celebrate");
+			return null;
+		},
+		secondary: false,
+		target: "self",
+		type: "Normal"
+	},
 	"charge": {
 		num: 268,
 		accuracy: true,
@@ -2764,7 +2783,7 @@ exports.BattleMovedex = {
 		desc: "Deals damage to one adjacent target and hits two to five times. Has a 1/3 chance to hit two or three times, and a 1/6 chance to hit four or five times. If one of the hits breaks the target's Substitute, it will take damage for the remaining hits. If the user has the Ability Skill Link, this move will always hit five times. Makes contact.",
 		shortDesc: "Hits 2-5 times in one turn.",
 		id: "doubleslap",
-		name: "DoubleSlap",
+		name: "Double Slap",
 		pp: 10,
 		priority: 0,
 		isContact: true,
@@ -2950,7 +2969,7 @@ exports.BattleMovedex = {
 		id: "drainingkiss",
 		isViable: true,
 		name: "Draining Kiss",
-		pp: 20,
+		pp: 10,
 		priority: 0,
 		isContact: true,
 		drain: [3,4],
@@ -3741,7 +3760,7 @@ exports.BattleMovedex = {
 		desc: "Lowers one adjacent target's Attack by 2 stages. Pokemon protected by Magic Coat or the Ability Magic Bounce are unaffected and instead use this move themselves.",
 		shortDesc: "Lowers the target's Attack by 2.",
 		id: "featherdance",
-		name: "FeatherDance",
+		name: "Feather Dance",
 		pp: 15,
 		priority: 0,
 		boosts: {
@@ -4271,7 +4290,7 @@ exports.BattleMovedex = {
 		shortDesc: "Raises Defense by 1 of Grass types in battle.",
 		id: "flowershield",
 		name: "Flower Shield",
-		pp: 25,
+		pp: 10,
 		priority: 0,
 		onHitField: function(target, source) {
 			var targets = [];
@@ -4563,8 +4582,8 @@ exports.BattleMovedex = {
 		desc: "Deals damage to one adjacent target with a 10% chance to freeze it. Super-effective against Water-type Pokemon",
 		shortDesc: "Super-effective against Water. 10% freeze chance.",
 		id: "freezedry",
-		name: "Freeze Dry",
-		pp: 15,
+		name: "Freeze-Dry",
+		pp: 20,
 		priority: 0,
 		onModifyEffectiveness: function(effectiveness, target) {
 			if (target.hasType('Water')) return effectiveness + 2;
@@ -5245,7 +5264,7 @@ exports.BattleMovedex = {
 		id: "growth",
 		isViable: true,
 		name: "Growth",
-		pp: 40,
+		pp: 20,
 		priority: 0,
 		isSnatchable: true,
 		onModifyMove: function(move) {
@@ -7750,7 +7769,7 @@ exports.BattleMovedex = {
 		id: "matblock",
 		isViable: true,
 		name: "Mat Block",
-		pp: 15,
+		pp: 10,
 		priority: 0,
 		stallingMove: true, // Note: stallingMove is not used anywhere.
 		volatileStatus: 'matblock',
@@ -9575,7 +9594,7 @@ exports.BattleMovedex = {
 		shortDesc: "Hitting a target raises Attack by 1",
 		id: "poweruppunch",
 		name: "Power-Up Punch",
-		pp: 30,
+		pp: 20,
 		priority: 0,
 		isContact: true,
 		secondary: {
@@ -9840,7 +9859,7 @@ exports.BattleMovedex = {
 	},
 	"psywave": {
 		num: 149,
-		accuracy: 80,
+		accuracy: 100,
 		basePower: 0,
 		damageCallback: function(pokemon) {
 			return (this.random(50,151) * pokemon.level) / 100;
@@ -10930,7 +10949,7 @@ exports.BattleMovedex = {
 		id: "sacredsword",
 		isViable: true,
 		name: "Sacred Sword",
-		pp: 20,
+		pp: 15,
 		priority: 0,
 		isContact: true,
 		ignoreEvasion: true,
@@ -12150,7 +12169,7 @@ exports.BattleMovedex = {
 		id: "spikyshield",
 		isViable: true,
 		name: "Spiky Shield",
-		pp: 20,
+		pp: 10,
 		priority: 4,
 		stallingMove: true, // Note: stallingMove is not used anywhere.
 		volatileStatus: 'spikyshield',
@@ -13285,7 +13304,7 @@ exports.BattleMovedex = {
 		id: "tailwind",
 		isViable: true,
 		name: "Tailwind",
-		pp: 30,
+		pp: 15,
 		priority: 0,
 		isSnatchable: true,
 		sideCondition: 'tailwind',
@@ -13663,8 +13682,8 @@ exports.BattleMovedex = {
 		desc: "Inverts target's stat stages.",
 		shortDesc: "Inverts target's stat stages.",
 		id: "topsyturvy",
-		name: "Topsy-turvy",
-		pp: 10,
+		name: "Topsy-Turvy",
+		pp: 20,
 		priority: 0,
 		isBounceable: true,
 		onHit: function(target) {