Merge branch 'beta' into settinglabels

This commit is contained in:
damocleas 2025-01-29 20:23:33 -05:00 committed by GitHub
commit 0f39fbf5f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 0 deletions

Binary file not shown.

View File

@ -2084,8 +2084,11 @@ export default class BattleScene extends SceneBase {
return sound;
}
/** The loop point of any given battle, mystery encounter, or title track, read as seconds and milliseconds. */
getBgmLoopPoint(bgmName: string): number {
switch (bgmName) {
case "title": //Firel PokéRogue Title
return 46.500;
case "battle_kanto_champion": //B2W2 Kanto Champion Battle
return 13.950;
case "battle_johto_champion": //B2W2 Johto Champion Battle

View File

@ -695,6 +695,7 @@ export class Arena {
globalScene.loadBgm(this.bgm);
}
/** The loop point of any given biome track, read as seconds and milliseconds. */
getBgmLoopPoint(): number {
switch (this.biomeType) {
case Biome.TOWN: