From 0d37b7946d38ae81c3e0c47020ad2ab0b18d90ac Mon Sep 17 00:00:00 2001
From: Marty-D <Marty-D@users.noreply.github.com>
Date: Sun, 22 Nov 2015 21:46:14 -0500
Subject: [PATCH] Seasonal: Fix custom movesets

Merge conflicts were being resolved in the wrong direction, giving all Pokemon their normal Random Battle movepools.
---
 data/scripts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/scripts.js b/data/scripts.js
index 77c270bb5c..9c0f8c9de2 100644
--- a/data/scripts.js
+++ b/data/scripts.js
@@ -3234,7 +3234,7 @@ exports.BattleScripts = {
 			let template = {};
 			if (heroTemplate.moves) template.randomBattleMoves = heroTemplate.moves;
 			if (heroTemplate.required) template.requiredMove = heroTemplate.required;
-			Object.merge(template, this.getTemplate(heroTemplate.species), false);
+			Object.merge(template, this.getTemplate(heroTemplate.species), false, false);
 
 			let pokemon = this.randomSet(template, i, teamDetails);