diff --git a/public/audio/bgm/battle_hoenn_champion.mp3 b/public/audio/bgm/battle_hoenn_champion_g5.mp3 similarity index 100% rename from public/audio/bgm/battle_hoenn_champion.mp3 rename to public/audio/bgm/battle_hoenn_champion_g5.mp3 diff --git a/public/audio/bgm/battle_hoenn_champion_g6.mp3 b/public/audio/bgm/battle_hoenn_champion_g6.mp3 new file mode 100644 index 00000000000..16ef20a5bea Binary files /dev/null and b/public/audio/bgm/battle_hoenn_champion_g6.mp3 differ diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 93b05a39ecb..f54ff92e324 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1792,8 +1792,10 @@ export default class BattleScene extends SceneBase { return 13.950; case "battle_johto_champion": //B2W2 Johto Champion Battle return 23.498; - case "battle_hoenn_champion": //B2W2 Hoenn Champion Battle + case "battle_hoenn_champion_g5": //B2W2 Hoenn Champion Battle return 11.328; + case "battle_hoenn_champion_g6": //ORAS Hoenn Champion Battle + return 11.762; case "battle_sinnoh_champion": //B2W2 Sinnoh Champion Battle return 12.235; case "battle_champion_alder": //BW Unova Champion Battle diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts index 2cc228a93cf..8d61463f316 100644 --- a/src/data/trainer-config.ts +++ b/src/data/trainer-config.ts @@ -1404,7 +1404,7 @@ export const trainerConfigs: TrainerConfigs = { p.generateAndPopulateMoveset(); p.generateName(); })), - [TrainerType.STEVEN]: new TrainerConfig(++t).initForChampion(signatureSpecies["STEVEN"],true).setBattleBgm("battle_hoenn_champion").setMixedBattleBgm("battle_hoenn_champion").setHasDouble("steven_wallace_double").setDoubleTrainerType(TrainerType.WALLACE).setDoubleTitle("champion_double") + [TrainerType.STEVEN]: new TrainerConfig(++t).initForChampion(signatureSpecies["STEVEN"],true).setBattleBgm("battle_hoenn_champion_g5").setMixedBattleBgm("battle_hoenn_champion_g6").setHasDouble("steven_wallace_double").setDoubleTrainerType(TrainerType.WALLACE).setDoubleTitle("champion_double") .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SKARMORY], TrainerSlot.TRAINER, true, p => { p.generateAndPopulateMoveset(); })) @@ -1413,7 +1413,7 @@ export const trainerConfigs: TrainerConfigs = { p.generateAndPopulateMoveset(); p.generateName(); })), - [TrainerType.WALLACE]: new TrainerConfig(++t).initForChampion(signatureSpecies["WALLACE"],true).setBattleBgm("battle_hoenn_champion").setMixedBattleBgm("battle_hoenn_champion").setHasDouble("wallace_steven_double").setDoubleTrainerType(TrainerType.STEVEN).setDoubleTitle("champion_double") + [TrainerType.WALLACE]: new TrainerConfig(++t).initForChampion(signatureSpecies["WALLACE"],true).setBattleBgm("battle_hoenn_champion_g5").setMixedBattleBgm("battle_hoenn_champion_g6").setHasDouble("wallace_steven_double").setDoubleTrainerType(TrainerType.STEVEN).setDoubleTitle("champion_double") .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => { p.abilityIndex = 1; // Drizzle p.generateAndPopulateMoveset(); diff --git a/src/locales/de/bgm-name.ts b/src/locales/de/bgm-name.ts index 2a247e51a44..3877aeea9bd 100644 --- a/src/locales/de/bgm-name.ts +++ b/src/locales/de/bgm-name.ts @@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = { "missing_entries" : "{{name}}", "battle_kanto_champion": "S2W2 Vs. Kanto Champion", "battle_johto_champion": "S2W2 Vs. Johto Champion", - "battle_hoenn_champion": "S2W2 Vs. Hoenn Champion", + "battle_hoenn_champion_g5": "S2W2 Vs. Hoenn Champion", + "battle_hoenn_champion_g6": "ORAS Vs. Hoenn Champion", "battle_sinnoh_champion": "S2W2 Vs. Champion Cynthia", "battle_champion_alder": "SW Vs. Champion Lauro", "battle_champion_iris": "S2W2 Vs. Champion Lilia", diff --git a/src/locales/en/bgm-name.ts b/src/locales/en/bgm-name.ts index 01fb86b281d..be9a8f621c7 100644 --- a/src/locales/en/bgm-name.ts +++ b/src/locales/en/bgm-name.ts @@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = { "missing_entries" : "{{name}}", "battle_kanto_champion": "B2W2 Kanto Champion Battle", "battle_johto_champion": "B2W2 Johto Champion Battle", - "battle_hoenn_champion": "B2W2 Hoenn Champion Battle", + "battle_hoenn_champion_g5": "B2W2 Hoenn Champion Battle", + "battle_hoenn_champion_g6": "ORAS Hoenn Champion Battle", "battle_sinnoh_champion": "B2W2 Sinnoh Champion Battle", "battle_champion_alder": "BW Unova Champion Battle", "battle_champion_iris": "B2W2 Unova Champion Battle", diff --git a/src/locales/es/bgm-name.ts b/src/locales/es/bgm-name.ts index ab6de0b81b5..f7316ca1166 100644 --- a/src/locales/es/bgm-name.ts +++ b/src/locales/es/bgm-name.ts @@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = { "missing_entries" : "{{name}}", "battle_kanto_champion": "B2W2 - ¡Vs Campeón de Kanto!", "battle_johto_champion": "B2W2 - ¡Vs Campeón de Johto!", - "battle_hoenn_champion": "B2W2 - ¡Vs Campeón de Hoenn!", + "battle_hoenn_champion_g5": "B2W2 - ¡Vs Campeón de Hoenn!", + "battle_hoenn_champion_g6": "ORAS - ¡Vs Campeón de Hoenn!", "battle_sinnoh_champion": "B2W2 - ¡Vs Campeón de Sinnoh!", "battle_champion_alder": "BW - ¡Vs Campeón de Teselia!", "battle_champion_iris": "B2W2 - ¡Vs Campeón de Teselia!", diff --git a/src/locales/fr/bgm-name.ts b/src/locales/fr/bgm-name.ts index da344fe001e..e66c8102e46 100644 --- a/src/locales/fr/bgm-name.ts +++ b/src/locales/fr/bgm-name.ts @@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = { "missing_entries" : "{{name}}", "battle_kanto_champion": "N2B2 - Vs. Maitre de Kanto", "battle_johto_champion": "N2B2 - Vs. Maitre de Johto", - "battle_hoenn_champion": "N2B2 - Vs. Maitre de Hoenn", + "battle_hoenn_champion_g5": "N2B2 - Vs. Maitre de Hoenn", + "battle_hoenn_champion_g6": "ROSA - Vs. Maitre de Hoenn", "battle_sinnoh_champion": "N2B2 - Vs. Maitresse de Sinnoh", "battle_champion_alder": "NB - Vs. Maitre d’Unys", "battle_champion_iris": "N2B2 - Vs. Maitresse d’Unys", diff --git a/src/locales/it/bgm-name.ts b/src/locales/it/bgm-name.ts index 01fb86b281d..be9a8f621c7 100644 --- a/src/locales/it/bgm-name.ts +++ b/src/locales/it/bgm-name.ts @@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = { "missing_entries" : "{{name}}", "battle_kanto_champion": "B2W2 Kanto Champion Battle", "battle_johto_champion": "B2W2 Johto Champion Battle", - "battle_hoenn_champion": "B2W2 Hoenn Champion Battle", + "battle_hoenn_champion_g5": "B2W2 Hoenn Champion Battle", + "battle_hoenn_champion_g6": "ORAS Hoenn Champion Battle", "battle_sinnoh_champion": "B2W2 Sinnoh Champion Battle", "battle_champion_alder": "BW Unova Champion Battle", "battle_champion_iris": "B2W2 Unova Champion Battle", diff --git a/src/locales/ko/bgm-name.ts b/src/locales/ko/bgm-name.ts index 69697b07774..81052560fc4 100644 --- a/src/locales/ko/bgm-name.ts +++ b/src/locales/ko/bgm-name.ts @@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = { "missing_entries" : "{{name}}", "battle_kanto_champion": "BW2 관동 챔피언 배틀", "battle_johto_champion": "BW2 성도 챔피언 배틀", - "battle_hoenn_champion": "BW2 호연 챔피언 배틀", + "battle_hoenn_champion_g5": "BW2 호연 챔피언 배틀", + "battle_hoenn_champion_g6": "ORAS 호연 챔피언 배틀", "battle_sinnoh_champion": "BW2 신오 챔피언 배틀", "battle_champion_alder": "BW 하나 챔피언 배틀", "battle_champion_iris": "BW2 하나 챔피언 배틀", diff --git a/src/locales/pt_BR/bgm-name.ts b/src/locales/pt_BR/bgm-name.ts index ae2756e74be..01baf93c2a5 100644 --- a/src/locales/pt_BR/bgm-name.ts +++ b/src/locales/pt_BR/bgm-name.ts @@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = { "missing_entries": "{{name}}", "battle_kanto_champion": "B2W2 Batalha do Campeão de Kanto", "battle_johto_champion": "B2W2 Batalha do Campeão de Johto", - "battle_hoenn_champion": "B2W2 Batalha do Campeão de Hoenn", + "battle_hoenn_champion_g5": "B2W2 Batalha do Campeão de Hoenn", + "battle_hoenn_champion_g6": "ORAS Batalha do Campeão de Hoenn", "battle_sinnoh_champion": "B2W2 Batalha do Campeão de Sinnoh", "battle_champion_alder": "BW Batalha do Campeão de Unova", "battle_champion_iris": "B2W2 Batalha do Campeão de Unova", diff --git a/src/locales/zh_CN/bgm-name.ts b/src/locales/zh_CN/bgm-name.ts index 71db565eb05..6039a259fd3 100644 --- a/src/locales/zh_CN/bgm-name.ts +++ b/src/locales/zh_CN/bgm-name.ts @@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = { "missing_entries" : "{{name}}", "battle_kanto_champion": "黑2白2「决战!关都冠军」", "battle_johto_champion": "黑2白2「决战!城都冠军」", - "battle_hoenn_champion": "黑2白2「决战!丰缘冠军」", + "battle_hoenn_champion_g5": "黑2白2「决战!丰缘冠军」", + "battle_hoenn_champion_g6": "Ω红宝石α蓝宝石「决战!丰缘冠军」", "battle_sinnoh_champion": "黑2白2「决战!神奥冠军」", "battle_champion_alder": "黑白「决战!合众冠军」", "battle_champion_iris": "黑2白2「决战!合众冠军」", diff --git a/src/locales/zh_TW/bgm-name.ts b/src/locales/zh_TW/bgm-name.ts index 01fb86b281d..be9a8f621c7 100644 --- a/src/locales/zh_TW/bgm-name.ts +++ b/src/locales/zh_TW/bgm-name.ts @@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = { "missing_entries" : "{{name}}", "battle_kanto_champion": "B2W2 Kanto Champion Battle", "battle_johto_champion": "B2W2 Johto Champion Battle", - "battle_hoenn_champion": "B2W2 Hoenn Champion Battle", + "battle_hoenn_champion_g5": "B2W2 Hoenn Champion Battle", + "battle_hoenn_champion_g6": "ORAS Hoenn Champion Battle", "battle_sinnoh_champion": "B2W2 Sinnoh Champion Battle", "battle_champion_alder": "BW Unova Champion Battle", "battle_champion_iris": "B2W2 Unova Champion Battle",