Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-05 21:16:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ORAS music!

Browse Source
This commit is contained in:
Guangcong Luo 2015-07-16 04:50:25 -04:00
parent 5a7acd09a9
commit 37998261ee
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/battle.js
View File

@ -5876,7 +5876,7 @@ var Battle = (function () {
}
};
Battle.prototype.preloadBgm = function () {
var bgmNum = Math.floor(Math.random() * 11);
var bgmNum = Math.floor(Math.random() * 13);
if (window.forceBgm || window.forceBgm === 0) bgmNum = window.forceBgm;
window.bgmNum = bgmNum;
@ -5925,10 +5925,18 @@ var Battle = (function () {
BattleSound.loadBgm('audio/xy-trainer.mp3', 7802, 82469);
this.bgm = 'audio/xy-trainer.mp3';
break;
default:
case 10:
BattleSound.loadBgm('audio/xy-rival.mp3', 7802, 58634);
this.bgm = 'audio/xy-rival.mp3';
break;
case 11:
BattleSound.loadBgm('audio/oras-trainer.mp3', 13579, 91548);
this.bgm = 'audio/oras-trainer.mp3';
break;
default:
BattleSound.loadBgm('audio/oras-rival.mp3', 14303, 69149);
this.bgm = 'audio/oras-rival.mp3';
break;
}
};
Battle.prototype.setMute = function (mute) {