diff --git a/public/audio/bgm/battle_legendary_k.mp3 b/public/audio/bgm/battle_legendary_kyurem.mp3 similarity index 100% rename from public/audio/bgm/battle_legendary_k.mp3 rename to public/audio/bgm/battle_legendary_kyurem.mp3 diff --git a/public/audio/bgm/battle_legendary_regis.mp3 b/public/audio/bgm/battle_legendary_regis.mp3 new file mode 100644 index 000000000..227d544d9 Binary files /dev/null and b/public/audio/bgm/battle_legendary_regis.mp3 differ diff --git a/public/audio/bgm/battle_legendary_rz.mp3 b/public/audio/bgm/battle_legendary_res_zek.mp3 similarity index 100% rename from public/audio/bgm/battle_legendary_rz.mp3 rename to public/audio/bgm/battle_legendary_res_zek.mp3 diff --git a/public/audio/bgm/battle_legendary.mp3 b/public/audio/bgm/battle_legendary_unova.mp3 similarity index 100% rename from public/audio/bgm/battle_legendary.mp3 rename to public/audio/bgm/battle_legendary_unova.mp3 diff --git a/src/battle-scene.ts b/src/battle-scene.ts index cbf363f68..0a5c4bbf4 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1671,11 +1671,13 @@ export default class BattleScene extends SceneBase { return 13.122; case 'battle_unova_gym': return 19.145; - case 'battle_legendary': + case 'battle_legendary_regis': //B2W2 Legendary Titan Battle + return 49.500; + case 'battle_legendary_unova': //BW Unova Legendary Battle return 13.855; - case 'battle_legendary_k': + case 'battle_legendary_kyurem': //BW Kyurem Battle return 18.314; - case 'battle_legendary_rz': + case 'battle_legendary_res_zek': //BW Reshiram & Zekrom Battle return 18.329; case 'battle_rival': return 13.689; diff --git a/src/battle.ts b/src/battle.ts index 97dec4716..0f910159f 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -195,11 +195,17 @@ export default class Battle { return 'battle_final_encounter'; } if (pokemon.species.legendary || pokemon.species.pseudoLegendary || pokemon.species.mythical) { + if (pokemon.species.speciesId === Species.REGIROCK || pokemon.species.speciesId === Species.REGICE || pokemon.species.speciesId === Species.REGISTEEL || pokemon.species.speciesId === Species.REGIGIGAS || pokemon.species.speciesId === Species.REGIELEKI || pokemon.species.speciesId === Species.REGIDRAGO) + return 'battle_legendary_regis'; + if (pokemon.species.speciesId === Species.COBALION || pokemon.species.speciesId === Species.TERRAKION || pokemon.species.speciesId === Species.VIRIZION || pokemon.species.speciesId === Species.TORNADUS || pokemon.species.speciesId === Species.THUNDURUS || pokemon.species.speciesId === Species.LANDORUS || pokemon.species.speciesId === Species.KELDEO || pokemon.species.speciesId === Species.MELOETTA || pokemon.species.speciesId === Species.GENESECT) + return 'battle_legendary_unova'; + if (pokemon.species.speciesId === Species.RESHIRAM || pokemon.species.speciesId === Species.ZEKROM) + return 'battle_legendary_res_zek'; if (pokemon.species.speciesId === Species.KYUREM) - return 'battle_legendary_k'; + return 'battle_legendary_kyurem'; if (pokemon.species.legendary) - return 'battle_legendary_rz'; - return 'battle_legendary'; + return 'battle_legendary_res_zek'; + return 'battle_legendary_unova'; } }