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

You can now have regional wild defeat music

Browse Source
This commit is contained in:
JappaWakka 2025-05-30 10:48:17 +02:00
parent ff1d21f115
commit 808001ceec
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
P3D/Battle/BattleSystemV2/Battle.vb
View File

@ -8390,7 +8390,12 @@
Won = True Won = True
Core.Player.AddPoints(1, "Won against wild Pokémon.") 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) ChangeCameraAngle(1, True, BattleScreen)
GainEXP(BattleScreen) GainEXP(BattleScreen)

6
P3D/Screens/Battle/BattleCatchScreen.vb
View File

@ -335,7 +335,11 @@ nextIndex:
p.SetCatchInfos(Me.Ball, Localization.GetString("CatchMethod_Caught", "Caught at")) p.SetCatchInfos(Me.Ball, Localization.GetString("CatchMethod_Caught", "Caught at"))
MusicManager.Pause() 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) SoundManager.PlaySound("success_catch", True)
TextBox.Show(s, {}, False, False) TextBox.Show(s, {}, False, False)

6
P3D/Screens/Pokemon/HatchEggScreen.vb
View File

@ -97,7 +97,11 @@
If size < 4.0F Then If size < 4.0F Then
size += 0.08F size += 0.08F
Else 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() cPokemon.PlayCry()
SoundManager.PlaySound("success", True) SoundManager.PlaySound("success", True)
Stage = 7 Stage = 7