From e7feb63f6ce38c994ffedb2b4d6770ec3da291db Mon Sep 17 00:00:00 2001
From: Kevin Lau <ascriptmaster@gmail.com>
Date: Mon, 2 Jan 2017 16:56:01 -0800
Subject: [PATCH] Random Battle: Fix Various Issues with Ubers (#3069)

---
 data/scripts.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/scripts.js b/data/scripts.js
index 56a8ac7460..c8f1049ac0 100644
--- a/data/scripts.js
+++ b/data/scripts.js
@@ -2226,6 +2226,9 @@ exports.BattleScripts = {
 			Unown: 100,
 		};
 		let tier = template.tier;
+		if (tier.includes('Unreleased') && template.battleOnly) {
+			tier = baseTemplate.tier;
+		}
 		if (tier.charAt(0) === '(') {
 			tier = tier.slice(1, -1);
 		}
@@ -2334,7 +2337,7 @@ exports.BattleScripts = {
 
 			let tier = template.tier;
 			switch (tier) {
-			case 'Uber':
+			case 'Uber': case 'Bank-Uber':
 				// Ubers are limited to 2 but have a 20% chance of being added anyway.
 				if (uberCount > 1 && this.random(5) >= 1) continue;
 				break;