From 808001ceecc321685b4aa825e0af3faa0d0ddb47 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Fri, 30 May 2025 10:48:17 +0200 Subject: [PATCH] You can now have regional wild defeat music --- P3D/Battle/BattleSystemV2/Battle.vb | 7 ++++++- P3D/Screens/Battle/BattleCatchScreen.vb | 6 +++++- P3D/Screens/Pokemon/HatchEggScreen.vb | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb index fe4f4c6af..22f68a385 100644 --- a/P3D/Battle/BattleSystemV2/Battle.vb +++ b/P3D/Battle/BattleSystemV2/Battle.vb @@ -8390,7 +8390,12 @@ Won = True Core.Player.AddPoints(1, "Won against wild Pokémon.") - BattleScreen.BattleQuery.Add(New PlayMusicQueryObject("wild_defeat")) + Dim musicLoop As String = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_defeat" + If MusicManager.SongExists(musicLoop) = False Then + musicLoop = "wild_defeat" + End If + + BattleScreen.BattleQuery.Add(New PlayMusicQueryObject(musicLoop)) ChangeCameraAngle(1, True, BattleScreen) GainEXP(BattleScreen) diff --git a/P3D/Screens/Battle/BattleCatchScreen.vb b/P3D/Screens/Battle/BattleCatchScreen.vb index c8d93a9a1..05158fee9 100644 --- a/P3D/Screens/Battle/BattleCatchScreen.vb +++ b/P3D/Screens/Battle/BattleCatchScreen.vb @@ -335,7 +335,11 @@ nextIndex: p.SetCatchInfos(Me.Ball, Localization.GetString("CatchMethod_Caught", "Caught at")) MusicManager.Pause() - MusicManager.Play("wild_defeat", False, 0.0F) + Dim musicLoop As String = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_defeat" + If MusicManager.SongExists(musicLoop) = False Then + musicLoop = "wild_defeat" + End If + MusicManager.Play(musicLoop, False, 0.0F) SoundManager.PlaySound("success_catch", True) TextBox.Show(s, {}, False, False) diff --git a/P3D/Screens/Pokemon/HatchEggScreen.vb b/P3D/Screens/Pokemon/HatchEggScreen.vb index bd704c371..04f047e61 100644 --- a/P3D/Screens/Pokemon/HatchEggScreen.vb +++ b/P3D/Screens/Pokemon/HatchEggScreen.vb @@ -97,7 +97,11 @@ If size < 4.0F Then size += 0.08F Else - MusicManager.Play("wild_defeat") + Dim musicLoop As String = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_defeat" + If MusicManager.SongExists(musicLoop) = False Then + musicLoop = "wild_defeat" + End If + MusicManager.Play(musicLoop) cPokemon.PlayCry() SoundManager.PlaySound("success", True) Stage = 7