tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-29 00:34:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix battle music crashes

Browse Source
This commit is contained in:
JappaWakka 2024-02-25 18:52:28 +01:00
parent 50dd29d601
commit bb78bb3543
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
P3D/Battle/BattleSystemV2/BattleScreen.vb
View File

@ -1380,7 +1380,6 @@ nextIndex:
Next Next
If hasLevelUp = False Then If hasLevelUp = False Then
MusicManager.Play(SavedOverworld.Level.MusicLoop, True, 0.02F)
Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, New Color(255, 255, 255), False, AddressOf ChangeSavedScreen)) Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, New Color(255, 255, 255), False, AddressOf ChangeSavedScreen))
Else Else
Dim EvolvePokeList As New List(Of Integer) Dim EvolvePokeList As New List(Of Integer)
@ -1397,7 +1396,6 @@ nextIndex:
Next Next
If EvolvePokeList.Count = 0 Then If EvolvePokeList.Count = 0 Then
MusicManager.Play(SavedOverworld.Level.MusicLoop, True, 0.02F)
Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, New Color(255, 255, 255), False, AddressOf ChangeSavedScreen)) Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, New Color(255, 255, 255), False, AddressOf ChangeSavedScreen))
Else Else
Core.SetScreen(New TransitionScreen(Me, New EvolutionScreen(Core.CurrentScreen, EvolvePokeList, "", EvolutionCondition.EvolutionTrigger.LevelUp, True), Color.Black, False)) Core.SetScreen(New TransitionScreen(Me, New EvolutionScreen(Core.CurrentScreen, EvolvePokeList, "", EvolutionCondition.EvolutionTrigger.LevelUp, True), Color.Black, False))

8
P3D/Resources/Sound/MusicManager.vb
View File

@ -227,7 +227,13 @@ Public Class MusicManager
_currentSong = Nothing _currentSong = Nothing
_currentSongName = "Silence" _currentSongName = "Silence"
_isIntroStarted = False _isIntroStarted = False
PlayNoMusic() If Muted = True Then
Volume = 0.0F
Else
Volume = 1.0F
End If
_isFadingOut = False
Play("Silence", True, 0.0F)
End Sub End Sub
Public Shared Sub PlayNoMusic() Public Shared Sub PlayNoMusic()

1
P3D/Screens/BattleIntroScreen.vb
View File

@ -546,6 +546,7 @@
Player.Temp.BeforeBattleFacing = Screen.Camera.GetPlayerFacingDirection() Player.Temp.BeforeBattleFacing = Screen.Camera.GetPlayerFacingDirection()
Dim b As BattleSystem.BattleScreen = CType(Me.NewScreen, BattleSystem.BattleScreen) Dim b As BattleSystem.BattleScreen = CType(Me.NewScreen, BattleSystem.BattleScreen)
MusicManager.ClearCurrentlyPlaying()
If BattleSystem.BattleScreen.CustomBattleMusic = "" OrElse MusicManager.SongExists(BattleSystem.BattleScreen.CustomBattleMusic) = False Then If BattleSystem.BattleScreen.CustomBattleMusic = "" OrElse MusicManager.SongExists(BattleSystem.BattleScreen.CustomBattleMusic) = False Then
If b.IsPVPBattle = True Then If b.IsPVPBattle = True Then
MusicManager.Play(MusicLoop, False, 0.0F, True, "pvp") MusicManager.Play(MusicLoop, False, 0.0F, True, "pvp")

9
P3D/Screens/TransitionScreen.vb
View File

@ -71,11 +71,6 @@
Public Overrides Sub Update() Public Overrides Sub Update()
If reduce = False Then If reduce = False Then
Dim screens() As Screen.Identifications = {Screen.Identifications.PokegearScreen, Screen.Identifications.OverworldScreen}
If screens.Contains(NewScreen.Identification) Then
MusicManager.Play(Screen.Level.MusicLoop, True, 0.01F)
End If
alpha += Speed alpha += Speed
If OldScreen.UpdateFadeOut = True Then If OldScreen.UpdateFadeOut = True Then
OldScreen.Update() OldScreen.Update()
@ -86,6 +81,10 @@
If noStuff = False Then If noStuff = False Then
doSub() doSub()
End If End If
Dim screens() As Screen.Identifications = {Screen.Identifications.PokegearScreen, Screen.Identifications.OverworldScreen}
If screens.Contains(NewScreen.Identification) Then
MusicManager.Play(Screen.Level.MusicLoop, True, 0.02F)
End If
End If End If
Else Else
alpha -= Speed alpha -= Speed