Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-01 15:22:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

More background music

Browse Source
This commit is contained in:
Guangcong Luo
2014-01-12 01:26:44 -06:00
parent 180588a8d9
commit abd86709ea
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/battle.js
View File

@@ -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) {