From abd86709ea0023c007b98f55e30ed2e5cfc5f70d Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Sun, 12 Jan 2014 01:26:44 -0600
Subject: [PATCH] More background music

---
 js/battle.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/js/battle.js b/js/battle.js
index 109a3dcd8..ab40a0ad5 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -5272,7 +5272,7 @@ function Battle(frame, logFrame, noPreload) {
 		}
 	};
 	this.preloadBgm = function() {
-		var bgmNum = Math.floor(Math.random() * 7);
+		var bgmNum = Math.floor(Math.random() * 11);
 
 		if (window.forceBgm || window.forceBgm === 0) bgmNum = window.forceBgm;
 		window.bgmNum = bgmNum;
@@ -5306,10 +5306,26 @@ function Battle(frame, logFrame, noPreload) {
 			self.bgm = 'audio/hgss-johto-trainer.mp3';
 			break;
 		case 6:
-		default:
 			BattleSound.loadBgm('audio/dpp-rival.mp3', 13888, 66352);
 			self.bgm = 'audio/dpp-rival.mp3';
 			break;
+		case 7:
+			BattleSound.loadBgm('audio/bw2-kanto-gym-leader.mp3', 14626, 58986);
+			self.bgm = 'audio/bw2-kanto-gym-leader.mp3';
+			break;
+		case 8:
+			BattleSound.loadBgm('audio/bw2-rival.mp3', 7152, 68708);
+			self.bgm = 'audio/bw2-rival.mp3';
+			break;
+		case 9:
+			BattleSound.loadBgm('audio/xy-trainer.mp3', 7802, 82469);
+			self.bgm = 'audio/xy-trainer.mp3';
+			break;
+		case 10:
+		default:
+			BattleSound.loadBgm('audio/xy-rival.mp3', 7802, 58634);
+			self.bgm = 'audio/xy-rival.mp3';
+			break;
 		}
 	};
 	this.setMute = function (mute) {