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

Bring back fading out music with switching maps

Browse Source
This commit is contained in:
JappaWakka 2023-08-29 19:20:54 +02:00
parent 5429ad9e15
commit 0eddb70011
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1365,7 +1365,7 @@ nextIndex:
If hasLevelUp = False Then If hasLevelUp = False Then
MusicManager.Stop() MusicManager.Stop()
MusicManager.Play(SavedOverworld.Level.MusicLoop) MusicManager.Play(SavedOverworld.Level.MusicLoop, True, 0.01F)
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)
@ -1383,7 +1383,7 @@ nextIndex:
If EvolvePokeList.Count = 0 Then If EvolvePokeList.Count = 0 Then
MusicManager.Stop() MusicManager.Stop()
MusicManager.Play(SavedOverworld.Level.MusicLoop) MusicManager.Play(SavedOverworld.Level.MusicLoop, True, 0.01F)
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))

2
P3D/Overworld/OverworldCamera.vb
View File

@ -888,7 +888,7 @@ Public Class OverworldCamera
Screen.Level.OverworldPokemon.Visible = False Screen.Level.OverworldPokemon.Visible = False
If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then
MusicManager.Play(Screen.Level.MusicLoop) MusicManager.Play(Screen.Level.MusicLoop, True, 0.01F)
End If End If
End If End If
End If End If

2
P3D/Overworld/OverworldScreen.vb
View File

@ -137,7 +137,7 @@ Public Class OverworldScreen
If Level.Riding = True Then If Level.Riding = True Then
MusicManager.Play("ride", True) 'Play "ride" when player is riding. MusicManager.Play("ride", True) 'Play "ride" when player is riding.
Else Else
MusicManager.Play(Level.MusicLoop, True) 'Play default MusicLoop. MusicManager.Play(Level.MusicLoop, True, 0.01F) 'Play default MusicLoop.
End If End If
End If End If

2
P3D/Overworld/SecretBase/SecretBaseScreen.vb
View File

@ -23,7 +23,7 @@
Level.Load("|") Level.Load("|")
Me.SecretBase.LoadSecretBaseFromStore(Screen.Level) Me.SecretBase.LoadSecretBaseFromStore(Screen.Level)
MusicManager.Play(Level.MusicLoop, True) MusicManager.Play(Level.MusicLoop, True, 0.01F)
End Sub End Sub
Public Overrides Sub Update() Public Overrides Sub Update()

2
P3D/Screens/Pokemon/EvolutionScreen.vb
View File

@ -328,7 +328,7 @@
s = s.PreScreen s = s.PreScreen
End While End While
Core.SetScreen(New TransitionScreen(s, s.PreScreen, Color.Black, False)) Core.SetScreen(New TransitionScreen(s, s.PreScreen, Color.Black, False))
MusicManager.Play(SavedMusic) MusicManager.Play(SavedMusic, True, 0.01F)
Else Else
Dim s As Screen = Core.CurrentScreen Dim s As Screen = Core.CurrentScreen
While s.Identification <> Identifications.BattleScreen While s.Identification <> Identifications.BattleScreen

2
P3D/Screens/Pokemon/PartyScreen.vb
View File

@ -1025,7 +1025,7 @@ Public Class PartyScreen
End If End If
If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then
MusicManager.Play(Level.MusicLoop) MusicManager.Play(Level.MusicLoop, True, 0.01F)
End If End If
Else Else
If Screen.Level.Surfing = False And Screen.Camera.IsMoving() = False And Screen.Camera.Turning = False And Level.CanRide() = True Then If Screen.Level.Surfing = False And Screen.Camera.IsMoving() = False And Screen.Camera.Turning = False And Level.CanRide() = True Then

2
P3D/World/Level.vb
View File

@ -1072,7 +1072,7 @@ Public Class Level
MusicManager.Play("ride", True) MusicManager.Play("ride", True)
Else Else
If MusicManager.GetSong(MusicLoop) IsNot Nothing Then If MusicManager.GetSong(MusicLoop) IsNot Nothing Then
MusicManager.Play(MusicLoop, True) MusicManager.Play(MusicLoop, True, 0.01F)
Else Else
MusicManager.Play("silence") MusicManager.Play("silence")
End If End If