ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ORAS Champion theme for Mixed music (#3351)

This commit is contained in:
Madmadness65 2024-08-04 19:45:29 -05:00 committed by GitHub
parent a8bb6e7a0b
commit b6da93a092
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
public/audio/bgm/battle_hoenn_champion.mp3 → public/audio/bgm/battle_hoenn_champion_g5.mp3
View File

BIN
public/audio/bgm/battle_hoenn_champion_g6.mp3 Normal file
View File

Binary file not shown.

4
src/battle-scene.ts
View File

@ -1792,8 +1792,10 @@ export default class BattleScene extends SceneBase {
return 13.950; return 13.950;
case "battle_johto_champion": //B2W2 Johto Champion Battle case "battle_johto_champion": //B2W2 Johto Champion Battle
return 23.498; return 23.498;
case "battle_hoenn_champion": //B2W2 Hoenn Champion Battle case "battle_hoenn_champion_g5": //B2W2 Hoenn Champion Battle
return 11.328; return 11.328;
case "battle_hoenn_champion_g6": //ORAS Hoenn Champion Battle
return 11.762;
case "battle_sinnoh_champion": //B2W2 Sinnoh Champion Battle case "battle_sinnoh_champion": //B2W2 Sinnoh Champion Battle
return 12.235; return 12.235;
case "battle_champion_alder": //BW Unova Champion Battle case "battle_champion_alder": //BW Unova Champion Battle

4
src/data/trainer-config.ts
View File

@ -1404,7 +1404,7 @@ export const trainerConfigs: TrainerConfigs = {
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
p.generateName(); 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 => { .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.SKARMORY], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
})) }))
@ -1413,7 +1413,7 @@ export const trainerConfigs: TrainerConfigs = {
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();
p.generateName(); 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 => { .setPartyMemberFunc(0, getRandomPartyMemberFunc([Species.PELIPPER], TrainerSlot.TRAINER, true, p => {
p.abilityIndex = 1; // Drizzle p.abilityIndex = 1; // Drizzle
p.generateAndPopulateMoveset(); p.generateAndPopulateMoveset();

3
src/locales/de/bgm-name.ts
View File

@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = {
"missing_entries" : "{{name}}", "missing_entries" : "{{name}}",
"battle_kanto_champion": "S2W2 Vs. Kanto Champion", "battle_kanto_champion": "S2W2 Vs. Kanto Champion",
"battle_johto_champion": "S2W2 Vs. Johto 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_sinnoh_champion": "S2W2 Vs. Champion Cynthia",
"battle_champion_alder": "SW Vs. Champion Lauro", "battle_champion_alder": "SW Vs. Champion Lauro",
"battle_champion_iris": "S2W2 Vs. Champion Lilia", "battle_champion_iris": "S2W2 Vs. Champion Lilia",

3
src/locales/en/bgm-name.ts
View File

@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = {
"missing_entries" : "{{name}}", "missing_entries" : "{{name}}",
"battle_kanto_champion": "B2W2 Kanto Champion Battle", "battle_kanto_champion": "B2W2 Kanto Champion Battle",
"battle_johto_champion": "B2W2 Johto 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_sinnoh_champion": "B2W2 Sinnoh Champion Battle",
"battle_champion_alder": "BW Unova Champion Battle", "battle_champion_alder": "BW Unova Champion Battle",
"battle_champion_iris": "B2W2 Unova Champion Battle", "battle_champion_iris": "B2W2 Unova Champion Battle",

3
src/locales/es/bgm-name.ts
View File

@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = {
"missing_entries" : "{{name}}", "missing_entries" : "{{name}}",
"battle_kanto_champion": "B2W2 - ¡Vs Campeón de Kanto!", "battle_kanto_champion": "B2W2 - ¡Vs Campeón de Kanto!",
"battle_johto_champion": "B2W2 - ¡Vs Campeón de Johto!", "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_sinnoh_champion": "B2W2 - ¡Vs Campeón de Sinnoh!",
"battle_champion_alder": "BW - ¡Vs Campeón de Teselia!", "battle_champion_alder": "BW - ¡Vs Campeón de Teselia!",
"battle_champion_iris": "B2W2 - ¡Vs Campeón de Teselia!", "battle_champion_iris": "B2W2 - ¡Vs Campeón de Teselia!",

3
src/locales/fr/bgm-name.ts
View File

@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = {
"missing_entries" : "{{name}}", "missing_entries" : "{{name}}",
"battle_kanto_champion": "N2B2 - Vs. Maitre de Kanto", "battle_kanto_champion": "N2B2 - Vs. Maitre de Kanto",
"battle_johto_champion": "N2B2 - Vs. Maitre de Johto", "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_sinnoh_champion": "N2B2 - Vs. Maitresse de Sinnoh",
"battle_champion_alder": "NB - Vs. Maitre d’Unys", "battle_champion_alder": "NB - Vs. Maitre d’Unys",
"battle_champion_iris": "N2B2 - Vs. Maitresse d’Unys", "battle_champion_iris": "N2B2 - Vs. Maitresse d’Unys",

3
src/locales/it/bgm-name.ts
View File

@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = {
"missing_entries" : "{{name}}", "missing_entries" : "{{name}}",
"battle_kanto_champion": "B2W2 Kanto Champion Battle", "battle_kanto_champion": "B2W2 Kanto Champion Battle",
"battle_johto_champion": "B2W2 Johto 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_sinnoh_champion": "B2W2 Sinnoh Champion Battle",
"battle_champion_alder": "BW Unova Champion Battle", "battle_champion_alder": "BW Unova Champion Battle",
"battle_champion_iris": "B2W2 Unova Champion Battle", "battle_champion_iris": "B2W2 Unova Champion Battle",

3
src/locales/ko/bgm-name.ts
View File

@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = {
"missing_entries" : "{{name}}", "missing_entries" : "{{name}}",
"battle_kanto_champion": "BW2 관동 챔피언 배틀", "battle_kanto_champion": "BW2 관동 챔피언 배틀",
"battle_johto_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_sinnoh_champion": "BW2 신오 챔피언 배틀",
"battle_champion_alder": "BW 하나 챔피언 배틀", "battle_champion_alder": "BW 하나 챔피언 배틀",
"battle_champion_iris": "BW2 하나 챔피언 배틀", "battle_champion_iris": "BW2 하나 챔피언 배틀",

3
src/locales/pt_BR/bgm-name.ts
View File

@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = {
"missing_entries": "{{name}}", "missing_entries": "{{name}}",
"battle_kanto_champion": "B2W2 Batalha do Campeão de Kanto", "battle_kanto_champion": "B2W2 Batalha do Campeão de Kanto",
"battle_johto_champion": "B2W2 Batalha do Campeão de Johto", "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_sinnoh_champion": "B2W2 Batalha do Campeão de Sinnoh",
"battle_champion_alder": "BW Batalha do Campeão de Unova", "battle_champion_alder": "BW Batalha do Campeão de Unova",
"battle_champion_iris": "B2W2 Batalha do Campeão de Unova", "battle_champion_iris": "B2W2 Batalha do Campeão de Unova",

3
src/locales/zh_CN/bgm-name.ts
View File

@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = {
"missing_entries" : "{{name}}", "missing_entries" : "{{name}}",
"battle_kanto_champion": "黑2白2「决战！关都冠军」", "battle_kanto_champion": "黑2白2「决战！关都冠军」",
"battle_johto_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_sinnoh_champion": "黑2白2「决战！神奥冠军」",
"battle_champion_alder": "黑白「决战！合众冠军」", "battle_champion_alder": "黑白「决战！合众冠军」",
"battle_champion_iris": "黑2白2「决战！合众冠军」", "battle_champion_iris": "黑2白2「决战！合众冠军」",

3
src/locales/zh_TW/bgm-name.ts
View File

@ -5,7 +5,8 @@ export const bgmName: SimpleTranslationEntries = {
"missing_entries" : "{{name}}", "missing_entries" : "{{name}}",
"battle_kanto_champion": "B2W2 Kanto Champion Battle", "battle_kanto_champion": "B2W2 Kanto Champion Battle",
"battle_johto_champion": "B2W2 Johto 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_sinnoh_champion": "B2W2 Sinnoh Champion Battle",
"battle_champion_alder": "BW Unova Champion Battle", "battle_champion_alder": "BW Unova Champion Battle",
"battle_champion_iris": "B2W2 Unova Champion Battle", "battle_champion_iris": "B2W2 Unova Champion Battle",