diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb index 0226b52af..67af33e61 100644 --- a/P3D/Battle/BattleSystemV2/Battle.vb +++ b/P3D/Battle/BattleSystemV2/Battle.vb @@ -946,33 +946,46 @@ 'Potion,Super Point,Hyper Potion,Full Heal,Full Restore,Burn Heal,Antidote,Paralyze heal,Awakening,Ice Heal,Revive,Max Revive,Max Potion Select Case ItemID Case 18 'Potion + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.GainHP(20, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Potion on " & p.GetDisplayName() & "!", "item:potion") Case 17 'Super Potion + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.GainHP(50, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Super Potion on " & p.GetDisplayName() & "!", "item:superpotion") Case 16 'Hyper Potion + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.GainHP(100, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Hyper Potion on " & p.GetDisplayName() & "!", "item:hyperpotion") Case 15 'Max Potion + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.GainHP(p.MaxHP, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Max Potion on " & p.GetDisplayName() & "!", "item:maxpotion") Case 14 'Full Restore + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.GainHP(p.MaxHP, False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Full Restore on " & p.GetDisplayName() & "!", "item:fullrestore") Me.CureStatusProblem(False, False, BattleScreen, "", "item:fullrestore") Case 38 'Full Heal + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Full Heal on " & p.GetDisplayName() & "!", "item:fullheal") Case 9 'Antidote + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used an Antidote on " & p.GetDisplayName() & "!", "item:antidote") Case 10 'Burn Heal + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Burn Heal on " & p.GetDisplayName() & "!", "item:burnheal") Case 11 'Ice Heal + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used an Ice Heal on " & p.GetDisplayName() & "!", "item:iceheal") Case 12 'Awakening + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used an Awakening on " & p.GetDisplayName() & "!", "item:awakening") Case 13 'Paralyze Heal + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) Me.CureStatusProblem(False, False, BattleScreen, BattleScreen.Trainer.Name & " used a Paralyze Heal on " & p.GetDisplayName() & "!", "item:paralyzeheal") Case 39 'Revive + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & " used a Revive on " & p.GetDisplayName() & "!")) p.Status = Pokemon.StatusProblems.None p.HP = CInt(Math.Ceiling(p.MaxHP / 2)) Case 40 'Max Revive + BattleScreen.BattleQuery.Add(New PlaySoundQueryObject("single_heal", False)) BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & " used a Revive on " & p.GetDisplayName() & "!")) p.Status = Pokemon.StatusProblems.None p.HP = p.MaxHP @@ -3987,7 +4000,7 @@ If Not p.Item Is Nothing Then If BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then Select Case p.Item.Name.ToLower() - Case "figy" + Case "figy" If RemoveHeldItem(own, own, BattleScreen, "", "berry:figy") = True Then UseBerry(own, from, Item.GetItemByID(ItemID), BattleScreen, message, cause) End If diff --git a/P3D/Battle/BattleSystemV2/BattleCalculation.vb b/P3D/Battle/BattleSystemV2/BattleCalculation.vb index 2fcb0cffa..f5666b9ad 100644 --- a/P3D/Battle/BattleSystemV2/BattleCalculation.vb +++ b/P3D/Battle/BattleSystemV2/BattleCalculation.vb @@ -1535,11 +1535,11 @@ If Attack.Type.Type = Element.Types.Normal Then UA = 1.2F End If - Case "normalize" + Case "normalize" If Attack.Type.Type = Element.Types.Normal Then UA = 1.2F End If - Case "galvanize" + Case "galvanize" If Attack.Type.Type = Element.Types.Normal Then UA = 1.2F End If diff --git a/P3D/Battle/BattleSystemV2/BattleMenu.vb b/P3D/Battle/BattleSystemV2/BattleMenu.vb index ced62ba8a..870ecb4e9 100644 --- a/P3D/Battle/BattleSystemV2/BattleMenu.vb +++ b/P3D/Battle/BattleSystemV2/BattleMenu.vb @@ -418,11 +418,13 @@ Public Sub Activate(ByVal BattleScreen As BattleScreen, ByVal AllExtended As Integer, ByVal isSelected As Boolean) If BattleScreen.BattleMenu._isExtracting = False And BattleScreen.BattleMenu._isRetracting = False Then If Controls.Accept(False, True, True) = True And isSelected = True Then + SoundManager.PlaySound("select") Me.ClickAction(BattleScreen) End If If Controls.Accept(True, False, False) = True Then If MouseHandler.IsInRectangle(New Rectangle(Core.ScreenSize.Width - 255, 116 + Index * 96, 255, 80)) = True Then If isSelected = True Then + SoundManager.PlaySound("select") Me.ClickAction(BattleScreen) Else BattleScreen.BattleMenu._mainMenuNextIndex = Me.Index @@ -497,11 +499,13 @@ If BattleScreen.BattleMenu._isExtracting = False And BattleScreen.BattleMenu._isRetracting = False Then If Me.Move.CurrentPP > 0 Or isSelected = False Then If Controls.Accept(False, True, True) = True And isSelected = True Then + SoundManager.PlaySound("select") Me.ClickAction(BattleScreen) End If If Controls.Accept(True, False, False) = True Then If MouseHandler.IsInRectangle(New Rectangle(Core.ScreenSize.Width - 255, 116 + Index * 96, 255, 80)) = True Then If isSelected = True Then + SoundManager.PlaySound("select") Me.ClickAction(BattleScreen) Else BattleScreen.BattleMenu._moveMenuNextIndex = Me.Index @@ -886,6 +890,7 @@ UpdateMenuOptions(_moveMenuIndex, _moveMenuNextIndex, _moveMenuItemList.Count) If Controls.Dismiss(True, True, True) = True And _retractMenu = False And _isExtracting = False And _isRetracting = False Then + SoundManager.PlaySound("select") _retractMenu = True _nextMenuState = MenuStates.Main diff --git a/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb b/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb index 6f312cc4c..2bc07434b 100644 --- a/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb +++ b/P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb @@ -111,9 +111,10 @@ If _chooseIndex = 0 Then Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5), AddressOf ChoosePokemon, "Choose Pokémon to battle!", False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True} AddHandler selScreen.SelectedObject, AddressOf ChoosePokemonHandler - + SoundManager.PlaySound("select") Core.SetScreen(selScreen) Else + SoundManager.PlaySound("select") _ready = True End If End If diff --git a/P3D/Battle/BattleSystemV2/QueryObjects/TextQueryObject.vb b/P3D/Battle/BattleSystemV2/QueryObjects/TextQueryObject.vb index b59e8355a..74013718b 100644 --- a/P3D/Battle/BattleSystemV2/QueryObjects/TextQueryObject.vb +++ b/P3D/Battle/BattleSystemV2/QueryObjects/TextQueryObject.vb @@ -59,6 +59,7 @@ End If Else If Controls.Accept(True, True) = True Then + SoundManager.PlaySound("select") Me._ready = True End If End If diff --git a/P3D/Content/Data/Scripts/ceruleancave/mewtwo.dat b/P3D/Content/Data/Scripts/ceruleancave/mewtwo.dat index 2660f6588..109072e8a 100644 Binary files a/P3D/Content/Data/Scripts/ceruleancave/mewtwo.dat and b/P3D/Content/Data/Scripts/ceruleancave/mewtwo.dat differ diff --git a/P3D/Content/Data/Scripts/ceruleancave/protonencounter.dat b/P3D/Content/Data/Scripts/ceruleancave/protonencounter.dat index 982fd1f21..5015d75f0 100644 Binary files a/P3D/Content/Data/Scripts/ceruleancave/protonencounter.dat and b/P3D/Content/Data/Scripts/ceruleancave/protonencounter.dat differ diff --git a/P3D/Content/Data/Scripts/goldenrod/trainsaffron.dat b/P3D/Content/Data/Scripts/goldenrod/trainsaffron.dat index c6b9382e1..5e3dd1896 100644 Binary files a/P3D/Content/Data/Scripts/goldenrod/trainsaffron.dat and b/P3D/Content/Data/Scripts/goldenrod/trainsaffron.dat differ diff --git a/P3D/Content/Data/Scripts/saffron/traingoldenrod.dat b/P3D/Content/Data/Scripts/saffron/traingoldenrod.dat index 9988b649b..bc4a138df 100644 Binary files a/P3D/Content/Data/Scripts/saffron/traingoldenrod.dat and b/P3D/Content/Data/Scripts/saffron/traingoldenrod.dat differ diff --git a/P3D/Content/Data/Scripts/speedboatscene.dat b/P3D/Content/Data/Scripts/speedboatscene.dat index 113be0084..984ba08cf 100644 Binary files a/P3D/Content/Data/Scripts/speedboatscene.dat and b/P3D/Content/Data/Scripts/speedboatscene.dat differ diff --git a/P3D/Content/Data/Scripts/trainer/league/lance.dat b/P3D/Content/Data/Scripts/trainer/league/lance.dat index 87ab87f4a..0ba5756fb 100644 Binary files a/P3D/Content/Data/Scripts/trainer/league/lance.dat and b/P3D/Content/Data/Scripts/trainer/league/lance.dat differ diff --git a/P3D/Content/Data/maps/restplaces.dat b/P3D/Content/Data/maps/restplaces.dat index 7779864e5..7fa585885 100644 Binary files a/P3D/Content/Data/maps/restplaces.dat and b/P3D/Content/Data/maps/restplaces.dat differ diff --git a/P3D/Content/Localization/Tokens_de.dat b/P3D/Content/Localization/Tokens_de.dat index c6638458c..7227845a6 100644 Binary files a/P3D/Content/Localization/Tokens_de.dat and b/P3D/Content/Localization/Tokens_de.dat differ diff --git a/P3D/Content/Localization/Tokens_en.dat b/P3D/Content/Localization/Tokens_en.dat index 98dfd7a84..49f80222f 100644 --- a/P3D/Content/Localization/Tokens_en.dat +++ b/P3D/Content/Localization/Tokens_en.dat @@ -550,8 +550,8 @@ game_message_third_person_on,Third person mode on. game_message_third_person_off,Third person mode off. game_message_free_camera_on,Free camera mode on game_message_free_camera_off,Free camera mode off -game_message_music_on,Music on -game_message_music_off,Music off +game_message_audio_on,Audio on +game_message_audio_off,Audio off game_message_continue_autosave,Continued save state: --- Online: diff --git a/P3D/Content/Localization/Tokens_fr.dat b/P3D/Content/Localization/Tokens_fr.dat index 3ef0afea5..4bfa9c4da 100644 --- a/P3D/Content/Localization/Tokens_fr.dat +++ b/P3D/Content/Localization/Tokens_fr.dat @@ -351,8 +351,8 @@ game_message_third_person_on,Mode troisième personne. game_message_third_person_off,Mode première personne. game_message_free_camera_on,Mouvements libres de la caméra activé. game_message_free_camera_off,Mouvement libress de la caméra désactivé. -game_message_music_on,Musique activé. -game_message_music_off,Musique désactivé. +game_message_audio_on,L'audio activé. +game_message_audio_off,L'audio désactivé. --- Online: game_message_close_connection,Tu as fermé la partie en CO-OP. diff --git a/P3D/Content/Localization/Tokens_id.dat b/P3D/Content/Localization/Tokens_id.dat index 1bfd5163d..5020e200b 100644 Binary files a/P3D/Content/Localization/Tokens_id.dat and b/P3D/Content/Localization/Tokens_id.dat differ diff --git a/P3D/Content/Localization/Tokens_it.dat b/P3D/Content/Localization/Tokens_it.dat index 08d0ffccd..8b81284a2 100644 Binary files a/P3D/Content/Localization/Tokens_it.dat and b/P3D/Content/Localization/Tokens_it.dat differ diff --git a/P3D/Content/Localization/Tokens_lt.dat b/P3D/Content/Localization/Tokens_lt.dat index b394d88d4..9fc85ba1c 100644 --- a/P3D/Content/Localization/Tokens_lt.dat +++ b/P3D/Content/Localization/Tokens_lt.dat @@ -675,8 +675,8 @@ game_message_third_person_on,Trečiojo asmens rėžimas įjungtas. game_message_third_person_off,Trečiojo asmens rėžimas išjungtas. game_message_free_camera_on,Laisvos kameros rėžimas įjungtas. game_message_free_camera_off,Laisvos kameros rėžimas išjungtas. -game_message_music_on,Muzika įjungta -game_message_music_off,Muzika išjungta +game_message_audio_on,Garso įjungta +game_message_audio_off,Garso išjungta game_message_continue_autosave,Continued save state: --- Online: diff --git a/P3D/Content/Localization/Tokens_no.dat b/P3D/Content/Localization/Tokens_no.dat index b277ee173..d7c5b50ed 100644 --- a/P3D/Content/Localization/Tokens_no.dat +++ b/P3D/Content/Localization/Tokens_no.dat @@ -547,8 +547,8 @@ game_message_third_person_on,Tredje personmodus på. game_message_third_person_off,Tredje personmodus av. game_message_free_camera_on,Fri bevegelses kameramodus på game_message_free_camera_off,Fri bevegelses kameramodus på -game_message_music_on,Musikk på -game_message_music_off,Musikk av +game_message_audio_on,Lyd på +game_message_audio_off,Lyd av game_message_continue_autosave,Fortsatt lagret tilstand: --- Online: diff --git a/P3D/Content/Localization/Tokens_sv.dat b/P3D/Content/Localization/Tokens_sv.dat index a97c50d34..c6f6cf524 100644 --- a/P3D/Content/Localization/Tokens_sv.dat +++ b/P3D/Content/Localization/Tokens_sv.dat @@ -542,8 +542,8 @@ game_message_third_person_on,Tredje person på. game_message_third_person_off,Tredje person av. game_message_free_camera_on,Fri kamera på game_message_free_camera_off,Fri kamera av -game_message_music_on,Musik på -game_message_music_off,Musik av +game_message_audio_on,Audio på +game_message_audio_off,Audio av game_message_continue_autosave,Fortsatt sparat spel: --- Online: diff --git a/P3D/Content/Localization/Tokens_tr.dat b/P3D/Content/Localization/Tokens_tr.dat index 3ee44d21a..ec3b082b1 100644 Binary files a/P3D/Content/Localization/Tokens_tr.dat and b/P3D/Content/Localization/Tokens_tr.dat differ diff --git a/P3D/Content/Songs/Goldenrod.ogg b/P3D/Content/Songs/Goldenrod.ogg new file mode 100644 index 000000000..407156f63 Binary files /dev/null and b/P3D/Content/Songs/Goldenrod.ogg differ diff --git a/P3D/Content/Songs/HallofFame.ogg b/P3D/Content/Songs/HallofFame.ogg new file mode 100644 index 000000000..fd014ffcc Binary files /dev/null and b/P3D/Content/Songs/HallofFame.ogg differ diff --git a/P3D/Content/Songs/IlexForest.ogg b/P3D/Content/Songs/IlexForest.ogg new file mode 100644 index 000000000..9bea0bf4b Binary files /dev/null and b/P3D/Content/Songs/IlexForest.ogg differ diff --git a/P3D/Content/Songs/Johto_champion_intro.ogg b/P3D/Content/Songs/Johto_champion_intro.ogg new file mode 100644 index 000000000..b95c6d957 Binary files /dev/null and b/P3D/Content/Songs/Johto_champion_intro.ogg differ diff --git a/P3D/Content/Songs/Looker_encounter.ogg b/P3D/Content/Songs/Looker_encounter.ogg new file mode 100644 index 000000000..fe78325ad Binary files /dev/null and b/P3D/Content/Songs/Looker_encounter.ogg differ diff --git a/P3D/Content/Songs/RouteMusic0.ogg b/P3D/Content/Songs/RouteMusic0.ogg new file mode 100644 index 000000000..116c906f8 Binary files /dev/null and b/P3D/Content/Songs/RouteMusic0.ogg differ diff --git a/P3D/Content/Songs/RouteMusic1.ogg b/P3D/Content/Songs/RouteMusic1.ogg new file mode 100644 index 000000000..9e1461d26 Binary files /dev/null and b/P3D/Content/Songs/RouteMusic1.ogg differ diff --git a/P3D/Content/Songs/RouteMusic10.ogg b/P3D/Content/Songs/RouteMusic10.ogg new file mode 100644 index 000000000..3a324fe8e Binary files /dev/null and b/P3D/Content/Songs/RouteMusic10.ogg differ diff --git a/P3D/Content/Songs/RouteMusic11.ogg b/P3D/Content/Songs/RouteMusic11.ogg new file mode 100644 index 000000000..46d11b673 Binary files /dev/null and b/P3D/Content/Songs/RouteMusic11.ogg differ diff --git a/P3D/Content/Songs/RouteMusic2.ogg b/P3D/Content/Songs/RouteMusic2.ogg new file mode 100644 index 000000000..3f843799f Binary files /dev/null and b/P3D/Content/Songs/RouteMusic2.ogg differ diff --git a/P3D/Content/Songs/RouteMusic3.ogg b/P3D/Content/Songs/RouteMusic3.ogg new file mode 100644 index 000000000..168c29829 Binary files /dev/null and b/P3D/Content/Songs/RouteMusic3.ogg differ diff --git a/P3D/Content/Songs/RouteMusic4.ogg b/P3D/Content/Songs/RouteMusic4.ogg new file mode 100644 index 000000000..2f3f6c905 Binary files /dev/null and b/P3D/Content/Songs/RouteMusic4.ogg differ diff --git a/P3D/Content/Songs/RouteMusic5.ogg b/P3D/Content/Songs/RouteMusic5.ogg new file mode 100644 index 000000000..d6f2cf14e Binary files /dev/null and b/P3D/Content/Songs/RouteMusic5.ogg differ diff --git a/P3D/Content/Songs/RouteMusic6.ogg b/P3D/Content/Songs/RouteMusic6.ogg new file mode 100644 index 000000000..7a9f6ed3d Binary files /dev/null and b/P3D/Content/Songs/RouteMusic6.ogg differ diff --git a/P3D/Content/Songs/RouteMusic7.ogg b/P3D/Content/Songs/RouteMusic7.ogg new file mode 100644 index 000000000..04ee22a90 Binary files /dev/null and b/P3D/Content/Songs/RouteMusic7.ogg differ diff --git a/P3D/Content/Songs/RouteMusic8.ogg b/P3D/Content/Songs/RouteMusic8.ogg new file mode 100644 index 000000000..8b3d6f935 Binary files /dev/null and b/P3D/Content/Songs/RouteMusic8.ogg differ diff --git a/P3D/Content/Songs/RouteMusic9.ogg b/P3D/Content/Songs/RouteMusic9.ogg new file mode 100644 index 000000000..6334a4504 Binary files /dev/null and b/P3D/Content/Songs/RouteMusic9.ogg differ diff --git a/P3D/Content/Songs/alph.ogg b/P3D/Content/Songs/alph.ogg new file mode 100644 index 000000000..79744416d Binary files /dev/null and b/P3D/Content/Songs/alph.ogg differ diff --git a/P3D/Content/Songs/ancient_ruins.ogg b/P3D/Content/Songs/ancient_ruins.ogg new file mode 100644 index 000000000..2a7109f0d Binary files /dev/null and b/P3D/Content/Songs/ancient_ruins.ogg differ diff --git a/P3D/Content/Songs/azalea.ogg b/P3D/Content/Songs/azalea.ogg new file mode 100644 index 000000000..9137d78da Binary files /dev/null and b/P3D/Content/Songs/azalea.ogg differ diff --git a/P3D/Content/Songs/barktown.ogg b/P3D/Content/Songs/barktown.ogg new file mode 100644 index 000000000..620bac318 Binary files /dev/null and b/P3D/Content/Songs/barktown.ogg differ diff --git a/P3D/Content/Songs/battlefactory.ogg b/P3D/Content/Songs/battlefactory.ogg new file mode 100644 index 000000000..920356880 Binary files /dev/null and b/P3D/Content/Songs/battlefactory.ogg differ diff --git a/P3D/Content/Songs/battletower.ogg b/P3D/Content/Songs/battletower.ogg new file mode 100644 index 000000000..8b1807611 Binary files /dev/null and b/P3D/Content/Songs/battletower.ogg differ diff --git a/P3D/Content/Songs/brain_battle.ogg b/P3D/Content/Songs/brain_battle.ogg new file mode 100644 index 000000000..dc31be159 Binary files /dev/null and b/P3D/Content/Songs/brain_battle.ogg differ diff --git a/P3D/Content/Songs/brain_battle_intro.ogg b/P3D/Content/Songs/brain_battle_intro.ogg new file mode 100644 index 000000000..9182b6fe6 Binary files /dev/null and b/P3D/Content/Songs/brain_battle_intro.ogg differ diff --git a/P3D/Content/Songs/bugcontest.ogg b/P3D/Content/Songs/bugcontest.ogg new file mode 100644 index 000000000..7d2d1b38d Binary files /dev/null and b/P3D/Content/Songs/bugcontest.ogg differ diff --git a/P3D/Content/Songs/burnedtower.ogg b/P3D/Content/Songs/burnedtower.ogg new file mode 100644 index 000000000..4b78c6317 Binary files /dev/null and b/P3D/Content/Songs/burnedtower.ogg differ diff --git a/P3D/Content/Songs/celadon.ogg b/P3D/Content/Songs/celadon.ogg new file mode 100644 index 000000000..089d66f81 Binary files /dev/null and b/P3D/Content/Songs/celadon.ogg differ diff --git a/P3D/Content/Songs/center.ogg b/P3D/Content/Songs/center.ogg new file mode 100644 index 000000000..a5b797d83 Binary files /dev/null and b/P3D/Content/Songs/center.ogg differ diff --git a/P3D/Content/Songs/cerulean.ogg b/P3D/Content/Songs/cerulean.ogg new file mode 100644 index 000000000..7cb293774 Binary files /dev/null and b/P3D/Content/Songs/cerulean.ogg differ diff --git a/P3D/Content/Songs/cerulean_cave.ogg b/P3D/Content/Songs/cerulean_cave.ogg new file mode 100644 index 000000000..62bd502e5 Binary files /dev/null and b/P3D/Content/Songs/cerulean_cave.ogg differ diff --git a/P3D/Content/Songs/champion_defeat.ogg b/P3D/Content/Songs/champion_defeat.ogg new file mode 100644 index 000000000..0f5add3cc Binary files /dev/null and b/P3D/Content/Songs/champion_defeat.ogg differ diff --git a/P3D/Content/Songs/cherrygrove.ogg b/P3D/Content/Songs/cherrygrove.ogg new file mode 100644 index 000000000..65053f442 Binary files /dev/null and b/P3D/Content/Songs/cherrygrove.ogg differ diff --git a/P3D/Content/Songs/cinnabar.ogg b/P3D/Content/Songs/cinnabar.ogg new file mode 100644 index 000000000..3315a5628 Binary files /dev/null and b/P3D/Content/Songs/cinnabar.ogg differ diff --git a/P3D/Content/Songs/credits.ogg b/P3D/Content/Songs/credits.ogg new file mode 100644 index 000000000..f6a760f38 Binary files /dev/null and b/P3D/Content/Songs/credits.ogg differ diff --git a/P3D/Content/Songs/dark_cave.ogg b/P3D/Content/Songs/dark_cave.ogg new file mode 100644 index 000000000..d06173797 Binary files /dev/null and b/P3D/Content/Songs/dark_cave.ogg differ diff --git a/P3D/Content/Songs/diglettscave.ogg b/P3D/Content/Songs/diglettscave.ogg new file mode 100644 index 000000000..8fc3b7079 Binary files /dev/null and b/P3D/Content/Songs/diglettscave.ogg differ diff --git a/P3D/Content/Songs/dragonsden.ogg b/P3D/Content/Songs/dragonsden.ogg new file mode 100644 index 000000000..372d5c034 Binary files /dev/null and b/P3D/Content/Songs/dragonsden.ogg differ diff --git a/P3D/Content/Songs/ecruteak.ogg b/P3D/Content/Songs/ecruteak.ogg new file mode 100644 index 000000000..0cbaac316 Binary files /dev/null and b/P3D/Content/Songs/ecruteak.ogg differ diff --git a/P3D/Content/Songs/elite_defeat.ogg b/P3D/Content/Songs/elite_defeat.ogg new file mode 100644 index 000000000..96f1b26c2 Binary files /dev/null and b/P3D/Content/Songs/elite_defeat.ogg differ diff --git a/P3D/Content/Songs/elmslab.ogg b/P3D/Content/Songs/elmslab.ogg new file mode 100644 index 000000000..e77642482 Binary files /dev/null and b/P3D/Content/Songs/elmslab.ogg differ diff --git a/P3D/Content/Songs/entei_battle.ogg b/P3D/Content/Songs/entei_battle.ogg new file mode 100644 index 000000000..f1b63acb4 Binary files /dev/null and b/P3D/Content/Songs/entei_battle.ogg differ diff --git a/P3D/Content/Songs/entei_battle_intro.ogg b/P3D/Content/Songs/entei_battle_intro.ogg new file mode 100644 index 000000000..b9b00ea4c Binary files /dev/null and b/P3D/Content/Songs/entei_battle_intro.ogg differ diff --git a/P3D/Content/Songs/eusine_encounter.ogg b/P3D/Content/Songs/eusine_encounter.ogg new file mode 100644 index 000000000..fa56ac5d6 Binary files /dev/null and b/P3D/Content/Songs/eusine_encounter.ogg differ diff --git a/P3D/Content/Songs/evolution.ogg b/P3D/Content/Songs/evolution.ogg new file mode 100644 index 000000000..61df111f9 Binary files /dev/null and b/P3D/Content/Songs/evolution.ogg differ diff --git a/P3D/Content/Songs/frontier.ogg b/P3D/Content/Songs/frontier.ogg new file mode 100644 index 000000000..f685cd6e2 Binary files /dev/null and b/P3D/Content/Songs/frontier.ogg differ diff --git a/P3D/Content/Songs/gamecorner.ogg b/P3D/Content/Songs/gamecorner.ogg new file mode 100644 index 000000000..e16edd892 Binary files /dev/null and b/P3D/Content/Songs/gamecorner.ogg differ diff --git a/P3D/Content/Songs/gameintro.ogg b/P3D/Content/Songs/gameintro.ogg new file mode 100644 index 000000000..54a93c1dc Binary files /dev/null and b/P3D/Content/Songs/gameintro.ogg differ diff --git a/P3D/Content/Songs/gts.ogg b/P3D/Content/Songs/gts.ogg new file mode 100644 index 000000000..a7ba7fe07 Binary files /dev/null and b/P3D/Content/Songs/gts.ogg differ diff --git a/P3D/Content/Songs/gym.ogg b/P3D/Content/Songs/gym.ogg new file mode 100644 index 000000000..29c8bdb9c Binary files /dev/null and b/P3D/Content/Songs/gym.ogg differ diff --git a/P3D/Content/Songs/ho-oh_battle.ogg b/P3D/Content/Songs/ho-oh_battle.ogg new file mode 100644 index 000000000..5cf395be1 Binary files /dev/null and b/P3D/Content/Songs/ho-oh_battle.ogg differ diff --git a/P3D/Content/Songs/ho-oh_battle_intro.ogg b/P3D/Content/Songs/ho-oh_battle_intro.ogg new file mode 100644 index 000000000..21cfadb73 Binary files /dev/null and b/P3D/Content/Songs/ho-oh_battle_intro.ogg differ diff --git a/P3D/Content/Songs/indigo.ogg b/P3D/Content/Songs/indigo.ogg new file mode 100644 index 000000000..5c80a64a7 Binary files /dev/null and b/P3D/Content/Songs/indigo.ogg differ diff --git a/P3D/Content/Songs/intro/Goldenrod.ogg b/P3D/Content/Songs/intro/Goldenrod.ogg new file mode 100644 index 000000000..0b566106f Binary files /dev/null and b/P3D/Content/Songs/intro/Goldenrod.ogg differ diff --git a/P3D/Content/Songs/intro/IlexForest.ogg b/P3D/Content/Songs/intro/IlexForest.ogg new file mode 100644 index 000000000..fd54e0c96 Binary files /dev/null and b/P3D/Content/Songs/intro/IlexForest.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic1.ogg b/P3D/Content/Songs/intro/RouteMusic1.ogg new file mode 100644 index 000000000..d00b4f6ea Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic1.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic10.ogg b/P3D/Content/Songs/intro/RouteMusic10.ogg new file mode 100644 index 000000000..d44ae29b0 Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic10.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic11.ogg b/P3D/Content/Songs/intro/RouteMusic11.ogg new file mode 100644 index 000000000..65af3d0aa Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic11.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic2.ogg b/P3D/Content/Songs/intro/RouteMusic2.ogg new file mode 100644 index 000000000..ac8ed8ee9 Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic2.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic3.ogg b/P3D/Content/Songs/intro/RouteMusic3.ogg new file mode 100644 index 000000000..20c7acb59 Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic3.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic4.ogg b/P3D/Content/Songs/intro/RouteMusic4.ogg new file mode 100644 index 000000000..ab9ee470d Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic4.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic5.ogg b/P3D/Content/Songs/intro/RouteMusic5.ogg new file mode 100644 index 000000000..581d344c2 Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic5.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic6.ogg b/P3D/Content/Songs/intro/RouteMusic6.ogg new file mode 100644 index 000000000..85fffa4bb Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic6.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic7.ogg b/P3D/Content/Songs/intro/RouteMusic7.ogg new file mode 100644 index 000000000..cd9da776f Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic7.ogg differ diff --git a/P3D/Content/Songs/intro/RouteMusic8.ogg b/P3D/Content/Songs/intro/RouteMusic8.ogg new file mode 100644 index 000000000..76b85d053 Binary files /dev/null and b/P3D/Content/Songs/intro/RouteMusic8.ogg differ diff --git a/P3D/Content/Songs/intro/azalea.ogg b/P3D/Content/Songs/intro/azalea.ogg new file mode 100644 index 000000000..7220437c0 Binary files /dev/null and b/P3D/Content/Songs/intro/azalea.ogg differ diff --git a/P3D/Content/Songs/intro/barktown.ogg b/P3D/Content/Songs/intro/barktown.ogg new file mode 100644 index 000000000..af8b6e22a Binary files /dev/null and b/P3D/Content/Songs/intro/barktown.ogg differ diff --git a/P3D/Content/Songs/intro/battlefactory.ogg b/P3D/Content/Songs/intro/battlefactory.ogg new file mode 100644 index 000000000..da3a8ef08 Binary files /dev/null and b/P3D/Content/Songs/intro/battlefactory.ogg differ diff --git a/P3D/Content/Songs/intro/bugcontest.ogg b/P3D/Content/Songs/intro/bugcontest.ogg new file mode 100644 index 000000000..2aa5eee26 Binary files /dev/null and b/P3D/Content/Songs/intro/bugcontest.ogg differ diff --git a/P3D/Content/Songs/intro/burnedtower.ogg b/P3D/Content/Songs/intro/burnedtower.ogg new file mode 100644 index 000000000..b3cc0f2ee Binary files /dev/null and b/P3D/Content/Songs/intro/burnedtower.ogg differ diff --git a/P3D/Content/Songs/intro/celadon.ogg b/P3D/Content/Songs/intro/celadon.ogg new file mode 100644 index 000000000..3a64f4e2a Binary files /dev/null and b/P3D/Content/Songs/intro/celadon.ogg differ diff --git a/P3D/Content/Songs/intro/cerulean.ogg b/P3D/Content/Songs/intro/cerulean.ogg new file mode 100644 index 000000000..218fd9f7c Binary files /dev/null and b/P3D/Content/Songs/intro/cerulean.ogg differ diff --git a/P3D/Content/Songs/intro/cerulean_cave.ogg b/P3D/Content/Songs/intro/cerulean_cave.ogg new file mode 100644 index 000000000..40efea1ac Binary files /dev/null and b/P3D/Content/Songs/intro/cerulean_cave.ogg differ diff --git a/P3D/Content/Songs/intro/champion_defeat.ogg b/P3D/Content/Songs/intro/champion_defeat.ogg new file mode 100644 index 000000000..3d79eb82a Binary files /dev/null and b/P3D/Content/Songs/intro/champion_defeat.ogg differ diff --git a/P3D/Content/Songs/intro/cherrygrove.ogg b/P3D/Content/Songs/intro/cherrygrove.ogg new file mode 100644 index 000000000..f78fce739 Binary files /dev/null and b/P3D/Content/Songs/intro/cherrygrove.ogg differ diff --git a/P3D/Content/Songs/intro/diglettscave.ogg b/P3D/Content/Songs/intro/diglettscave.ogg new file mode 100644 index 000000000..f11d2ad27 Binary files /dev/null and b/P3D/Content/Songs/intro/diglettscave.ogg differ diff --git a/P3D/Content/Songs/intro/elite_defeat.ogg b/P3D/Content/Songs/intro/elite_defeat.ogg new file mode 100644 index 000000000..b33af3d8b Binary files /dev/null and b/P3D/Content/Songs/intro/elite_defeat.ogg differ diff --git a/P3D/Content/Songs/intro/elmslab.ogg b/P3D/Content/Songs/intro/elmslab.ogg new file mode 100644 index 000000000..8a7a7c6cd Binary files /dev/null and b/P3D/Content/Songs/intro/elmslab.ogg differ diff --git a/P3D/Content/Songs/intro/entei_battle.ogg b/P3D/Content/Songs/intro/entei_battle.ogg new file mode 100644 index 000000000..e61e1ebda Binary files /dev/null and b/P3D/Content/Songs/intro/entei_battle.ogg differ diff --git a/P3D/Content/Songs/intro/evolution.ogg b/P3D/Content/Songs/intro/evolution.ogg new file mode 100644 index 000000000..365965a5b Binary files /dev/null and b/P3D/Content/Songs/intro/evolution.ogg differ diff --git a/P3D/Content/Songs/intro/frontier.ogg b/P3D/Content/Songs/intro/frontier.ogg new file mode 100644 index 000000000..7434d90c3 Binary files /dev/null and b/P3D/Content/Songs/intro/frontier.ogg differ diff --git a/P3D/Content/Songs/intro/gamecorner.ogg b/P3D/Content/Songs/intro/gamecorner.ogg new file mode 100644 index 000000000..246413580 Binary files /dev/null and b/P3D/Content/Songs/intro/gamecorner.ogg differ diff --git a/P3D/Content/Songs/intro/gts.ogg b/P3D/Content/Songs/intro/gts.ogg new file mode 100644 index 000000000..58eee9f13 Binary files /dev/null and b/P3D/Content/Songs/intro/gts.ogg differ diff --git a/P3D/Content/Songs/intro/ho-oh_battle.ogg b/P3D/Content/Songs/intro/ho-oh_battle.ogg new file mode 100644 index 000000000..47db55af5 Binary files /dev/null and b/P3D/Content/Songs/intro/ho-oh_battle.ogg differ diff --git a/P3D/Content/Songs/intro/johto_elite.ogg b/P3D/Content/Songs/intro/johto_elite.ogg new file mode 100644 index 000000000..391e74ed2 Binary files /dev/null and b/P3D/Content/Songs/intro/johto_elite.ogg differ diff --git a/P3D/Content/Songs/intro/johto_leader.ogg b/P3D/Content/Songs/intro/johto_leader.ogg new file mode 100644 index 000000000..0456a9334 Binary files /dev/null and b/P3D/Content/Songs/intro/johto_leader.ogg differ diff --git a/P3D/Content/Songs/intro/johto_rival_encounter.ogg b/P3D/Content/Songs/intro/johto_rival_encounter.ogg new file mode 100644 index 000000000..e721840a0 Binary files /dev/null and b/P3D/Content/Songs/intro/johto_rival_encounter.ogg differ diff --git a/P3D/Content/Songs/intro/johto_rocket.ogg b/P3D/Content/Songs/intro/johto_rocket.ogg new file mode 100644 index 000000000..281b02cc6 Binary files /dev/null and b/P3D/Content/Songs/intro/johto_rocket.ogg differ diff --git a/P3D/Content/Songs/intro/johto_trainer.ogg b/P3D/Content/Songs/intro/johto_trainer.ogg new file mode 100644 index 000000000..5138d3c44 Binary files /dev/null and b/P3D/Content/Songs/intro/johto_trainer.ogg differ diff --git a/P3D/Content/Songs/intro/johto_wild.ogg b/P3D/Content/Songs/intro/johto_wild.ogg new file mode 100644 index 000000000..dfcc94ff1 Binary files /dev/null and b/P3D/Content/Songs/intro/johto_wild.ogg differ diff --git a/P3D/Content/Songs/intro/kanto_leader.ogg b/P3D/Content/Songs/intro/kanto_leader.ogg new file mode 100644 index 000000000..ea86a9fe6 Binary files /dev/null and b/P3D/Content/Songs/intro/kanto_leader.ogg differ diff --git a/P3D/Content/Songs/intro/kanto_trainer.ogg b/P3D/Content/Songs/intro/kanto_trainer.ogg new file mode 100644 index 000000000..85b5cb00c Binary files /dev/null and b/P3D/Content/Songs/intro/kanto_trainer.ogg differ diff --git a/P3D/Content/Songs/intro/lavender.ogg b/P3D/Content/Songs/intro/lavender.ogg new file mode 100644 index 000000000..20a6aca5c Binary files /dev/null and b/P3D/Content/Songs/intro/lavender.ogg differ diff --git a/P3D/Content/Songs/intro/leader_defeat.ogg b/P3D/Content/Songs/intro/leader_defeat.ogg new file mode 100644 index 000000000..ddada9b10 Binary files /dev/null and b/P3D/Content/Songs/intro/leader_defeat.ogg differ diff --git a/P3D/Content/Songs/intro/lobby.ogg b/P3D/Content/Songs/intro/lobby.ogg new file mode 100644 index 000000000..721ee0323 Binary files /dev/null and b/P3D/Content/Songs/intro/lobby.ogg differ diff --git a/P3D/Content/Songs/intro/lugia_battle.ogg b/P3D/Content/Songs/intro/lugia_battle.ogg new file mode 100644 index 000000000..041935d55 Binary files /dev/null and b/P3D/Content/Songs/intro/lugia_battle.ogg differ diff --git a/P3D/Content/Songs/intro/mart.ogg b/P3D/Content/Songs/intro/mart.ogg new file mode 100644 index 000000000..a1c3c6dfa Binary files /dev/null and b/P3D/Content/Songs/intro/mart.ogg differ diff --git a/P3D/Content/Songs/intro/mary_encounter.ogg b/P3D/Content/Songs/intro/mary_encounter.ogg new file mode 100644 index 000000000..17788d0ae Binary files /dev/null and b/P3D/Content/Songs/intro/mary_encounter.ogg differ diff --git a/P3D/Content/Songs/intro/oak_encounter.ogg b/P3D/Content/Songs/intro/oak_encounter.ogg new file mode 100644 index 000000000..150581eaa Binary files /dev/null and b/P3D/Content/Songs/intro/oak_encounter.ogg differ diff --git a/P3D/Content/Songs/intro/oakslab.ogg b/P3D/Content/Songs/intro/oakslab.ogg new file mode 100644 index 000000000..aec979d92 Binary files /dev/null and b/P3D/Content/Songs/intro/oakslab.ogg differ diff --git a/P3D/Content/Songs/intro/pokeflute.ogg b/P3D/Content/Songs/intro/pokeflute.ogg new file mode 100644 index 000000000..7a42fb95c Binary files /dev/null and b/P3D/Content/Songs/intro/pokeflute.ogg differ diff --git a/P3D/Content/Songs/intro/pokemon_lullaby.ogg b/P3D/Content/Songs/intro/pokemon_lullaby.ogg new file mode 100644 index 000000000..ca76af6c5 Binary files /dev/null and b/P3D/Content/Songs/intro/pokemon_lullaby.ogg differ diff --git a/P3D/Content/Songs/intro/pokemon_march.ogg b/P3D/Content/Songs/intro/pokemon_march.ogg new file mode 100644 index 000000000..c815054e8 Binary files /dev/null and b/P3D/Content/Songs/intro/pokemon_march.ogg differ diff --git a/P3D/Content/Songs/intro/pvp.ogg b/P3D/Content/Songs/intro/pvp.ogg new file mode 100644 index 000000000..7e355655b Binary files /dev/null and b/P3D/Content/Songs/intro/pvp.ogg differ diff --git a/P3D/Content/Songs/intro/raikou_battle.ogg b/P3D/Content/Songs/intro/raikou_battle.ogg new file mode 100644 index 000000000..468780d48 Binary files /dev/null and b/P3D/Content/Songs/intro/raikou_battle.ogg differ diff --git a/P3D/Content/Songs/intro/ride.ogg b/P3D/Content/Songs/intro/ride.ogg new file mode 100644 index 000000000..b07310a17 Binary files /dev/null and b/P3D/Content/Songs/intro/ride.ogg differ diff --git a/P3D/Content/Songs/intro/safari.ogg b/P3D/Content/Songs/intro/safari.ogg new file mode 100644 index 000000000..40b4ff1d3 Binary files /dev/null and b/P3D/Content/Songs/intro/safari.ogg differ diff --git a/P3D/Content/Songs/intro/show_me_around.ogg b/P3D/Content/Songs/intro/show_me_around.ogg new file mode 100644 index 000000000..ec09508ff Binary files /dev/null and b/P3D/Content/Songs/intro/show_me_around.ogg differ diff --git a/P3D/Content/Songs/intro/space_legend_battle.ogg b/P3D/Content/Songs/intro/space_legend_battle.ogg new file mode 100644 index 000000000..f86d41cac Binary files /dev/null and b/P3D/Content/Songs/intro/space_legend_battle.ogg differ diff --git a/P3D/Content/Songs/intro/sprout_tower.ogg b/P3D/Content/Songs/intro/sprout_tower.ogg new file mode 100644 index 000000000..f3cef8c1a Binary files /dev/null and b/P3D/Content/Songs/intro/sprout_tower.ogg differ diff --git a/P3D/Content/Songs/intro/ssaqua.ogg b/P3D/Content/Songs/intro/ssaqua.ogg new file mode 100644 index 000000000..8b27d1876 Binary files /dev/null and b/P3D/Content/Songs/intro/ssaqua.ogg differ diff --git a/P3D/Content/Songs/intro/startower.ogg b/P3D/Content/Songs/intro/startower.ogg new file mode 100644 index 000000000..90e30010f Binary files /dev/null and b/P3D/Content/Songs/intro/startower.ogg differ diff --git a/P3D/Content/Songs/intro/suicune_battle.ogg b/P3D/Content/Songs/intro/suicune_battle.ogg new file mode 100644 index 000000000..80775d172 Binary files /dev/null and b/P3D/Content/Songs/intro/suicune_battle.ogg differ diff --git a/P3D/Content/Songs/intro/tao_legend_battle.ogg b/P3D/Content/Songs/intro/tao_legend_battle.ogg new file mode 100644 index 000000000..8d14084e8 Binary files /dev/null and b/P3D/Content/Songs/intro/tao_legend_battle.ogg differ diff --git a/P3D/Content/Songs/intro/trainer_encounter.ogg b/P3D/Content/Songs/intro/trainer_encounter.ogg new file mode 100644 index 000000000..57b53b5db Binary files /dev/null and b/P3D/Content/Songs/intro/trainer_encounter.ogg differ diff --git a/P3D/Content/Songs/intro/trainerschool.ogg b/P3D/Content/Songs/intro/trainerschool.ogg new file mode 100644 index 000000000..513cf61c7 Binary files /dev/null and b/P3D/Content/Songs/intro/trainerschool.ogg differ diff --git a/P3D/Content/Songs/intro/vermilion.ogg b/P3D/Content/Songs/intro/vermilion.ogg new file mode 100644 index 000000000..4a3d6aa31 Binary files /dev/null and b/P3D/Content/Songs/intro/vermilion.ogg differ diff --git a/P3D/Content/Songs/intro/violet.ogg b/P3D/Content/Songs/intro/violet.ogg new file mode 100644 index 000000000..718108f3b Binary files /dev/null and b/P3D/Content/Songs/intro/violet.ogg differ diff --git a/P3D/Content/Songs/johto_champion.ogg b/P3D/Content/Songs/johto_champion.ogg new file mode 100644 index 000000000..a1a27cb0f Binary files /dev/null and b/P3D/Content/Songs/johto_champion.ogg differ diff --git a/P3D/Content/Songs/johto_elite.ogg b/P3D/Content/Songs/johto_elite.ogg new file mode 100644 index 000000000..35892df7f Binary files /dev/null and b/P3D/Content/Songs/johto_elite.ogg differ diff --git a/P3D/Content/Songs/johto_elite_intro.ogg b/P3D/Content/Songs/johto_elite_intro.ogg new file mode 100644 index 000000000..ef1b7475f Binary files /dev/null and b/P3D/Content/Songs/johto_elite_intro.ogg differ diff --git a/P3D/Content/Songs/johto_leader.ogg b/P3D/Content/Songs/johto_leader.ogg new file mode 100644 index 000000000..ac2f413d2 Binary files /dev/null and b/P3D/Content/Songs/johto_leader.ogg differ diff --git a/P3D/Content/Songs/johto_leader_intro.ogg b/P3D/Content/Songs/johto_leader_intro.ogg new file mode 100644 index 000000000..157d00e41 Binary files /dev/null and b/P3D/Content/Songs/johto_leader_intro.ogg differ diff --git a/P3D/Content/Songs/johto_rival.ogg b/P3D/Content/Songs/johto_rival.ogg new file mode 100644 index 000000000..2610ff78b Binary files /dev/null and b/P3D/Content/Songs/johto_rival.ogg differ diff --git a/P3D/Content/Songs/johto_rival_encounter.ogg b/P3D/Content/Songs/johto_rival_encounter.ogg new file mode 100644 index 000000000..f3879f96f Binary files /dev/null and b/P3D/Content/Songs/johto_rival_encounter.ogg differ diff --git a/P3D/Content/Songs/johto_rivalintro.ogg b/P3D/Content/Songs/johto_rivalintro.ogg new file mode 100644 index 000000000..a68cb8d57 Binary files /dev/null and b/P3D/Content/Songs/johto_rivalintro.ogg differ diff --git a/P3D/Content/Songs/johto_rocket.ogg b/P3D/Content/Songs/johto_rocket.ogg new file mode 100644 index 000000000..d8beeabcf Binary files /dev/null and b/P3D/Content/Songs/johto_rocket.ogg differ diff --git a/P3D/Content/Songs/johto_rocket_encounter.ogg b/P3D/Content/Songs/johto_rocket_encounter.ogg new file mode 100644 index 000000000..3e1a9e63b Binary files /dev/null and b/P3D/Content/Songs/johto_rocket_encounter.ogg differ diff --git a/P3D/Content/Songs/johto_rocket_intro.ogg b/P3D/Content/Songs/johto_rocket_intro.ogg new file mode 100644 index 000000000..95018e678 Binary files /dev/null and b/P3D/Content/Songs/johto_rocket_intro.ogg differ diff --git a/P3D/Content/Songs/johto_trainer.ogg b/P3D/Content/Songs/johto_trainer.ogg new file mode 100644 index 000000000..49732933c Binary files /dev/null and b/P3D/Content/Songs/johto_trainer.ogg differ diff --git a/P3D/Content/Songs/johto_trainer_intro.ogg b/P3D/Content/Songs/johto_trainer_intro.ogg new file mode 100644 index 000000000..40260bd4b Binary files /dev/null and b/P3D/Content/Songs/johto_trainer_intro.ogg differ diff --git a/P3D/Content/Songs/johto_wild.ogg b/P3D/Content/Songs/johto_wild.ogg new file mode 100644 index 000000000..4ee3aee2e Binary files /dev/null and b/P3D/Content/Songs/johto_wild.ogg differ diff --git a/P3D/Content/Songs/johto_wild_intro.ogg b/P3D/Content/Songs/johto_wild_intro.ogg new file mode 100644 index 000000000..cdac4f048 Binary files /dev/null and b/P3D/Content/Songs/johto_wild_intro.ogg differ diff --git a/P3D/Content/Songs/kanto_leader.ogg b/P3D/Content/Songs/kanto_leader.ogg new file mode 100644 index 000000000..1237ba52e Binary files /dev/null and b/P3D/Content/Songs/kanto_leader.ogg differ diff --git a/P3D/Content/Songs/kanto_leader_intro.ogg b/P3D/Content/Songs/kanto_leader_intro.ogg new file mode 100644 index 000000000..f38504060 Binary files /dev/null and b/P3D/Content/Songs/kanto_leader_intro.ogg differ diff --git a/P3D/Content/Songs/kanto_trainer.ogg b/P3D/Content/Songs/kanto_trainer.ogg new file mode 100644 index 000000000..9bec7b8d6 Binary files /dev/null and b/P3D/Content/Songs/kanto_trainer.ogg differ diff --git a/P3D/Content/Songs/kanto_trainer_intro.ogg b/P3D/Content/Songs/kanto_trainer_intro.ogg new file mode 100644 index 000000000..6e0719f18 Binary files /dev/null and b/P3D/Content/Songs/kanto_trainer_intro.ogg differ diff --git a/P3D/Content/Songs/kanto_wild.ogg b/P3D/Content/Songs/kanto_wild.ogg new file mode 100644 index 000000000..8c3b255e5 Binary files /dev/null and b/P3D/Content/Songs/kanto_wild.ogg differ diff --git a/P3D/Content/Songs/kanto_wild_intro.ogg b/P3D/Content/Songs/kanto_wild_intro.ogg new file mode 100644 index 000000000..8a6c46237 Binary files /dev/null and b/P3D/Content/Songs/kanto_wild_intro.ogg differ diff --git a/P3D/Content/Songs/kimono.ogg b/P3D/Content/Songs/kimono.ogg new file mode 100644 index 000000000..394dbe5c5 Binary files /dev/null and b/P3D/Content/Songs/kimono.ogg differ diff --git a/P3D/Content/Songs/kvictoryroad.ogg b/P3D/Content/Songs/kvictoryroad.ogg new file mode 100644 index 000000000..3d1fd18bd Binary files /dev/null and b/P3D/Content/Songs/kvictoryroad.ogg differ diff --git a/P3D/Content/Songs/lavender.ogg b/P3D/Content/Songs/lavender.ogg new file mode 100644 index 000000000..24992d395 Binary files /dev/null and b/P3D/Content/Songs/lavender.ogg differ diff --git a/P3D/Content/Songs/leader_defeat.ogg b/P3D/Content/Songs/leader_defeat.ogg new file mode 100644 index 000000000..da68e09ce Binary files /dev/null and b/P3D/Content/Songs/leader_defeat.ogg differ diff --git a/P3D/Content/Songs/lighthouse.ogg b/P3D/Content/Songs/lighthouse.ogg new file mode 100644 index 000000000..7cca2c4c0 Binary files /dev/null and b/P3D/Content/Songs/lighthouse.ogg differ diff --git a/P3D/Content/Songs/lobby.ogg b/P3D/Content/Songs/lobby.ogg new file mode 100644 index 000000000..2328d81b2 Binary files /dev/null and b/P3D/Content/Songs/lobby.ogg differ diff --git a/P3D/Content/Songs/lugia_battle.ogg b/P3D/Content/Songs/lugia_battle.ogg new file mode 100644 index 000000000..5c945159e Binary files /dev/null and b/P3D/Content/Songs/lugia_battle.ogg differ diff --git a/P3D/Content/Songs/lugia_battle_intro.ogg b/P3D/Content/Songs/lugia_battle_intro.ogg new file mode 100644 index 000000000..511a8a302 Binary files /dev/null and b/P3D/Content/Songs/lugia_battle_intro.ogg differ diff --git a/P3D/Content/Songs/mart.ogg b/P3D/Content/Songs/mart.ogg new file mode 100644 index 000000000..22d3c76ca Binary files /dev/null and b/P3D/Content/Songs/mart.ogg differ diff --git a/P3D/Content/Songs/mary_encounter.ogg b/P3D/Content/Songs/mary_encounter.ogg new file mode 100644 index 000000000..18c71d2f0 Binary files /dev/null and b/P3D/Content/Songs/mary_encounter.ogg differ diff --git a/P3D/Content/Songs/mtmoonsq.ogg b/P3D/Content/Songs/mtmoonsq.ogg new file mode 100644 index 000000000..935413691 Binary files /dev/null and b/P3D/Content/Songs/mtmoonsq.ogg differ diff --git a/P3D/Content/Songs/nationalpark.ogg b/P3D/Content/Songs/nationalpark.ogg new file mode 100644 index 000000000..7b20fd7fd Binary files /dev/null and b/P3D/Content/Songs/nationalpark.ogg differ diff --git a/P3D/Content/Songs/oak_encounter.ogg b/P3D/Content/Songs/oak_encounter.ogg new file mode 100644 index 000000000..9ece95ff8 Binary files /dev/null and b/P3D/Content/Songs/oak_encounter.ogg differ diff --git a/P3D/Content/Songs/oakslab.ogg b/P3D/Content/Songs/oakslab.ogg new file mode 100644 index 000000000..f093f5286 Binary files /dev/null and b/P3D/Content/Songs/oakslab.ogg differ diff --git a/P3D/Content/Songs/pallet.ogg b/P3D/Content/Songs/pallet.ogg new file mode 100644 index 000000000..b4cace4cb Binary files /dev/null and b/P3D/Content/Songs/pallet.ogg differ diff --git a/P3D/Content/Songs/pokeflute.ogg b/P3D/Content/Songs/pokeflute.ogg new file mode 100644 index 000000000..b247e4b48 Binary files /dev/null and b/P3D/Content/Songs/pokeflute.ogg differ diff --git a/P3D/Content/Songs/pokemon_lullaby.ogg b/P3D/Content/Songs/pokemon_lullaby.ogg new file mode 100644 index 000000000..b49278071 Binary files /dev/null and b/P3D/Content/Songs/pokemon_lullaby.ogg differ diff --git a/P3D/Content/Songs/pokemon_march.ogg b/P3D/Content/Songs/pokemon_march.ogg new file mode 100644 index 000000000..8640fa234 Binary files /dev/null and b/P3D/Content/Songs/pokemon_march.ogg differ diff --git a/P3D/Content/Songs/pvp.ogg b/P3D/Content/Songs/pvp.ogg new file mode 100644 index 000000000..c38e4fdff Binary files /dev/null and b/P3D/Content/Songs/pvp.ogg differ diff --git a/P3D/Content/Songs/rHideout.ogg b/P3D/Content/Songs/rHideout.ogg new file mode 100644 index 000000000..8dd32d756 Binary files /dev/null and b/P3D/Content/Songs/rHideout.ogg differ diff --git a/P3D/Content/Songs/raikou_battle.ogg b/P3D/Content/Songs/raikou_battle.ogg new file mode 100644 index 000000000..ecd737540 Binary files /dev/null and b/P3D/Content/Songs/raikou_battle.ogg differ diff --git a/P3D/Content/Songs/raikou_battle_intro.ogg b/P3D/Content/Songs/raikou_battle_intro.ogg new file mode 100644 index 000000000..062ead39f Binary files /dev/null and b/P3D/Content/Songs/raikou_battle_intro.ogg differ diff --git a/P3D/Content/Songs/ride.ogg b/P3D/Content/Songs/ride.ogg new file mode 100644 index 000000000..18e7391a2 Binary files /dev/null and b/P3D/Content/Songs/ride.ogg differ diff --git a/P3D/Content/Songs/rocket_broadcast.ogg b/P3D/Content/Songs/rocket_broadcast.ogg new file mode 100644 index 000000000..b976905be Binary files /dev/null and b/P3D/Content/Songs/rocket_broadcast.ogg differ diff --git a/P3D/Content/Songs/safari.ogg b/P3D/Content/Songs/safari.ogg new file mode 100644 index 000000000..2dc84d718 Binary files /dev/null and b/P3D/Content/Songs/safari.ogg differ diff --git a/P3D/Content/Songs/safarigate.ogg b/P3D/Content/Songs/safarigate.ogg new file mode 100644 index 000000000..176830365 Binary files /dev/null and b/P3D/Content/Songs/safarigate.ogg differ diff --git a/P3D/Content/Songs/show_me_around.ogg b/P3D/Content/Songs/show_me_around.ogg new file mode 100644 index 000000000..ea3612143 Binary files /dev/null and b/P3D/Content/Songs/show_me_around.ogg differ diff --git a/P3D/Content/Songs/sovietmarch.ogg b/P3D/Content/Songs/sovietmarch.ogg new file mode 100644 index 000000000..b2ff1c8b6 Binary files /dev/null and b/P3D/Content/Songs/sovietmarch.ogg differ diff --git a/P3D/Content/Songs/space_legend_battle.ogg b/P3D/Content/Songs/space_legend_battle.ogg new file mode 100644 index 000000000..3c0de6f18 Binary files /dev/null and b/P3D/Content/Songs/space_legend_battle.ogg differ diff --git a/P3D/Content/Songs/space_legend_battle_intro.ogg b/P3D/Content/Songs/space_legend_battle_intro.ogg new file mode 100644 index 000000000..fae4f3399 Binary files /dev/null and b/P3D/Content/Songs/space_legend_battle_intro.ogg differ diff --git a/P3D/Content/Songs/sprout_tower.ogg b/P3D/Content/Songs/sprout_tower.ogg new file mode 100644 index 000000000..f5772b6f9 Binary files /dev/null and b/P3D/Content/Songs/sprout_tower.ogg differ diff --git a/P3D/Content/Songs/ssaqua.ogg b/P3D/Content/Songs/ssaqua.ogg new file mode 100644 index 000000000..cac040cbb Binary files /dev/null and b/P3D/Content/Songs/ssaqua.ogg differ diff --git a/P3D/Content/Songs/startower.ogg b/P3D/Content/Songs/startower.ogg new file mode 100644 index 000000000..9d635e573 Binary files /dev/null and b/P3D/Content/Songs/startower.ogg differ diff --git a/P3D/Content/Songs/suicune_battle.ogg b/P3D/Content/Songs/suicune_battle.ogg new file mode 100644 index 000000000..499e61281 Binary files /dev/null and b/P3D/Content/Songs/suicune_battle.ogg differ diff --git a/P3D/Content/Songs/suicune_battle_intro.ogg b/P3D/Content/Songs/suicune_battle_intro.ogg new file mode 100644 index 000000000..23ce126a0 Binary files /dev/null and b/P3D/Content/Songs/suicune_battle_intro.ogg differ diff --git a/P3D/Content/Songs/surf.ogg b/P3D/Content/Songs/surf.ogg new file mode 100644 index 000000000..6493a7ffd Binary files /dev/null and b/P3D/Content/Songs/surf.ogg differ diff --git a/P3D/Content/Songs/tao_legend_battle.ogg b/P3D/Content/Songs/tao_legend_battle.ogg new file mode 100644 index 000000000..476e9b0bf Binary files /dev/null and b/P3D/Content/Songs/tao_legend_battle.ogg differ diff --git a/P3D/Content/Songs/tao_legend_battle_intro.ogg b/P3D/Content/Songs/tao_legend_battle_intro.ogg new file mode 100644 index 000000000..7d0b72a86 Binary files /dev/null and b/P3D/Content/Songs/tao_legend_battle_intro.ogg differ diff --git a/P3D/Content/Songs/tintower.ogg b/P3D/Content/Songs/tintower.ogg new file mode 100644 index 000000000..f421e137a Binary files /dev/null and b/P3D/Content/Songs/tintower.ogg differ diff --git a/P3D/Content/Songs/title.ogg b/P3D/Content/Songs/title.ogg new file mode 100644 index 000000000..2198ea262 Binary files /dev/null and b/P3D/Content/Songs/title.ogg differ diff --git a/P3D/Content/Songs/trainer_defeat.ogg b/P3D/Content/Songs/trainer_defeat.ogg new file mode 100644 index 000000000..99aad0a30 Binary files /dev/null and b/P3D/Content/Songs/trainer_defeat.ogg differ diff --git a/P3D/Content/Songs/trainer_encounter.ogg b/P3D/Content/Songs/trainer_encounter.ogg new file mode 100644 index 000000000..c0978f626 Binary files /dev/null and b/P3D/Content/Songs/trainer_encounter.ogg differ diff --git a/P3D/Content/Songs/trainerschool.ogg b/P3D/Content/Songs/trainerschool.ogg new file mode 100644 index 000000000..f431b67ee Binary files /dev/null and b/P3D/Content/Songs/trainerschool.ogg differ diff --git a/P3D/Content/Songs/unown_broadcast.ogg b/P3D/Content/Songs/unown_broadcast.ogg new file mode 100644 index 000000000..99a0ef076 Binary files /dev/null and b/P3D/Content/Songs/unown_broadcast.ogg differ diff --git a/P3D/Content/Songs/vermilion.ogg b/P3D/Content/Songs/vermilion.ogg new file mode 100644 index 000000000..e1b6d5ac6 Binary files /dev/null and b/P3D/Content/Songs/vermilion.ogg differ diff --git a/P3D/Content/Songs/violet.ogg b/P3D/Content/Songs/violet.ogg new file mode 100644 index 000000000..e95318307 Binary files /dev/null and b/P3D/Content/Songs/violet.ogg differ diff --git a/P3D/Content/Songs/viridian_forest.ogg b/P3D/Content/Songs/viridian_forest.ogg new file mode 100644 index 000000000..a4c28a585 Binary files /dev/null and b/P3D/Content/Songs/viridian_forest.ogg differ diff --git a/P3D/Content/Songs/wild_defeat.ogg b/P3D/Content/Songs/wild_defeat.ogg new file mode 100644 index 000000000..e0cd5e5eb Binary files /dev/null and b/P3D/Content/Songs/wild_defeat.ogg differ diff --git a/P3D/Content/Songs/wind.ogg b/P3D/Content/Songs/wind.ogg new file mode 100644 index 000000000..fb023af1c Binary files /dev/null and b/P3D/Content/Songs/wind.ogg differ diff --git a/P3D/Content/Sounds/Battle/Damage/normaldamage.wav b/P3D/Content/Sounds/Battle/Damage/normaldamage.wav index edf18b8a6..e33cbcfc7 100644 Binary files a/P3D/Content/Sounds/Battle/Damage/normaldamage.wav and b/P3D/Content/Sounds/Battle/Damage/normaldamage.wav differ diff --git a/P3D/Content/Sounds/Battle/Damage/not_effective.wav b/P3D/Content/Sounds/Battle/Damage/not_effective.wav index e82742f6f..af23072f0 100644 Binary files a/P3D/Content/Sounds/Battle/Damage/not_effective.wav and b/P3D/Content/Sounds/Battle/Damage/not_effective.wav differ diff --git a/P3D/Content/Sounds/Battle/Damage/super_effective.wav b/P3D/Content/Sounds/Battle/Damage/super_effective.wav index 8ea4045eb..82af96eeb 100644 Binary files a/P3D/Content/Sounds/Battle/Damage/super_effective.wav and b/P3D/Content/Sounds/Battle/Damage/super_effective.wav differ diff --git a/P3D/Content/Sounds/Battle/Effects/effect_ember.wav b/P3D/Content/Sounds/Battle/Effects/effect_ember.wav index 9da65c878..397e9de77 100644 Binary files a/P3D/Content/Sounds/Battle/Effects/effect_ember.wav and b/P3D/Content/Sounds/Battle/Effects/effect_ember.wav differ diff --git a/P3D/Content/Sounds/Battle/Effects/effect_fly.wav b/P3D/Content/Sounds/Battle/Effects/effect_fly.wav index 0f18eaad6..ee11fd3b3 100644 Binary files a/P3D/Content/Sounds/Battle/Effects/effect_fly.wav and b/P3D/Content/Sounds/Battle/Effects/effect_fly.wav differ diff --git a/P3D/Content/Sounds/Battle/Effects/effect_ice1.wav b/P3D/Content/Sounds/Battle/Effects/effect_ice1.wav index bfe8e9e7f..9abb6ce12 100644 Binary files a/P3D/Content/Sounds/Battle/Effects/effect_ice1.wav and b/P3D/Content/Sounds/Battle/Effects/effect_ice1.wav differ diff --git a/P3D/Content/Sounds/Battle/Effects/effect_poison.wav b/P3D/Content/Sounds/Battle/Effects/effect_poison.wav index 7d968b433..a5ada0a14 100644 Binary files a/P3D/Content/Sounds/Battle/Effects/effect_poison.wav and b/P3D/Content/Sounds/Battle/Effects/effect_poison.wav differ diff --git a/P3D/Content/Sounds/Battle/Effects/effect_pound.wav b/P3D/Content/Sounds/Battle/Effects/effect_pound.wav index ce297df61..89708c203 100644 Binary files a/P3D/Content/Sounds/Battle/Effects/effect_pound.wav and b/P3D/Content/Sounds/Battle/Effects/effect_pound.wav differ diff --git a/P3D/Content/Sounds/Battle/Effects/effect_thunderbolt.wav b/P3D/Content/Sounds/Battle/Effects/effect_thunderbolt.wav index dd7c7ce99..8fa4ec174 100644 Binary files a/P3D/Content/Sounds/Battle/Effects/effect_thunderbolt.wav and b/P3D/Content/Sounds/Battle/Effects/effect_thunderbolt.wav differ diff --git a/P3D/Content/Sounds/Battle/Effects/effect_thundershock2.wav b/P3D/Content/Sounds/Battle/Effects/effect_thundershock2.wav index d9a827577..f0e9d9c28 100644 Binary files a/P3D/Content/Sounds/Battle/Effects/effect_thundershock2.wav and b/P3D/Content/Sounds/Battle/Effects/effect_thundershock2.wav differ diff --git a/P3D/Content/Sounds/Battle/ballshake.wav b/P3D/Content/Sounds/Battle/ballshake.wav index 72eb1c5b2..13bf4359d 100644 Binary files a/P3D/Content/Sounds/Battle/ballshake.wav and b/P3D/Content/Sounds/Battle/ballshake.wav differ diff --git a/P3D/Content/Sounds/Battle/exp_max.wav b/P3D/Content/Sounds/Battle/exp_max.wav index cc55d4bc2..f02abdab6 100644 Binary files a/P3D/Content/Sounds/Battle/exp_max.wav and b/P3D/Content/Sounds/Battle/exp_max.wav differ diff --git a/P3D/Content/Sounds/Battle/pokeball_land.wav b/P3D/Content/Sounds/Battle/pokeball_land.wav index b804e9284..6fcf42896 100644 Binary files a/P3D/Content/Sounds/Battle/pokeball_land.wav and b/P3D/Content/Sounds/Battle/pokeball_land.wav differ diff --git a/P3D/Content/Sounds/Battle/running.wav b/P3D/Content/Sounds/Battle/running.wav index 0821d6f59..9489b4389 100644 Binary files a/P3D/Content/Sounds/Battle/running.wav and b/P3D/Content/Sounds/Battle/running.wav differ diff --git a/P3D/Content/Sounds/Battle/shiny.wav b/P3D/Content/Sounds/Battle/shiny.wav index 3a6fe5139..7f7ef61e8 100644 Binary files a/P3D/Content/Sounds/Battle/shiny.wav and b/P3D/Content/Sounds/Battle/shiny.wav differ diff --git a/P3D/Content/Sounds/Battle/throw.wav b/P3D/Content/Sounds/Battle/throw.wav index 2261b95ea..97bef34af 100644 Binary files a/P3D/Content/Sounds/Battle/throw.wav and b/P3D/Content/Sounds/Battle/throw.wav differ diff --git a/P3D/Content/Sounds/Contest/rankplace.wav b/P3D/Content/Sounds/Contest/rankplace.wav index 8b01990b9..202b7cae5 100644 Binary files a/P3D/Content/Sounds/Contest/rankplace.wav and b/P3D/Content/Sounds/Contest/rankplace.wav differ diff --git a/P3D/Content/Sounds/PC/pc_logon.wav b/P3D/Content/Sounds/PC/pc_logon.wav index 81f5b99d0..9c194ea03 100644 Binary files a/P3D/Content/Sounds/PC/pc_logon.wav and b/P3D/Content/Sounds/PC/pc_logon.wav differ diff --git a/P3D/Content/Sounds/PC/pc_off.wav b/P3D/Content/Sounds/PC/pc_off.wav index 2b3468781..1e946097d 100644 Binary files a/P3D/Content/Sounds/PC/pc_off.wav and b/P3D/Content/Sounds/PC/pc_off.wav differ diff --git a/P3D/Content/Sounds/PC/pc_turnon.wav b/P3D/Content/Sounds/PC/pc_turnon.wav index 5b4f77923..419ae58b7 100644 Binary files a/P3D/Content/Sounds/PC/pc_turnon.wav and b/P3D/Content/Sounds/PC/pc_turnon.wav differ diff --git a/P3D/Content/Sounds/PokeballOpen.wav b/P3D/Content/Sounds/PokeballOpen.wav index d9fdd87f2..b38cd0325 100644 Binary files a/P3D/Content/Sounds/PokeballOpen.wav and b/P3D/Content/Sounds/PokeballOpen.wav differ diff --git a/P3D/Content/Sounds/Pokegear/pokegear_off.wav b/P3D/Content/Sounds/Pokegear/pokegear_off.wav index b3566d761..1e946097d 100644 Binary files a/P3D/Content/Sounds/Pokegear/pokegear_off.wav and b/P3D/Content/Sounds/Pokegear/pokegear_off.wav differ diff --git a/P3D/Content/Sounds/Pokegear/pokegear_on.wav b/P3D/Content/Sounds/Pokegear/pokegear_on.wav index 556632b88..9c194ea03 100644 Binary files a/P3D/Content/Sounds/Pokegear/pokegear_on.wav and b/P3D/Content/Sounds/Pokegear/pokegear_on.wav differ diff --git a/P3D/Content/Sounds/Save.wav b/P3D/Content/Sounds/Save.wav index 012047199..bca7792b1 100644 Binary files a/P3D/Content/Sounds/Save.wav and b/P3D/Content/Sounds/Save.wav differ diff --git a/P3D/Content/Sounds/TossPokeball.wav b/P3D/Content/Sounds/TossPokeball.wav index cc704e588..baf55ad97 100644 Binary files a/P3D/Content/Sounds/TossPokeball.wav and b/P3D/Content/Sounds/TossPokeball.wav differ diff --git a/P3D/Content/Sounds/badge_acquired.wav b/P3D/Content/Sounds/badge_acquired.wav index a0cefb23b..7bb2affb5 100644 Binary files a/P3D/Content/Sounds/badge_acquired.wav and b/P3D/Content/Sounds/badge_acquired.wav differ diff --git a/P3D/Content/Sounds/bump.wav b/P3D/Content/Sounds/bump.wav index 2e5fc76fa..de44d8646 100644 Binary files a/P3D/Content/Sounds/bump.wav and b/P3D/Content/Sounds/bump.wav differ diff --git a/P3D/Content/Sounds/buy2.wav b/P3D/Content/Sounds/buy2.wav index 290072c97..48534e497 100644 Binary files a/P3D/Content/Sounds/buy2.wav and b/P3D/Content/Sounds/buy2.wav differ diff --git a/P3D/Content/Sounds/destroy.wav b/P3D/Content/Sounds/destroy.wav index 540bd1e43..b7535554b 100644 Binary files a/P3D/Content/Sounds/destroy.wav and b/P3D/Content/Sounds/destroy.wav differ diff --git a/P3D/Content/Sounds/egg_hatch.wav b/P3D/Content/Sounds/egg_hatch.wav index 64e1c9404..c91154ca4 100644 Binary files a/P3D/Content/Sounds/egg_hatch.wav and b/P3D/Content/Sounds/egg_hatch.wav differ diff --git a/P3D/Content/Sounds/enter.wav b/P3D/Content/Sounds/enter.wav index 91e8e1374..fa61b888a 100644 Binary files a/P3D/Content/Sounds/enter.wav and b/P3D/Content/Sounds/enter.wav differ diff --git a/P3D/Content/Sounds/ice_break.wav b/P3D/Content/Sounds/ice_break.wav index bb731db85..158e07e8a 100644 Binary files a/P3D/Content/Sounds/ice_break.wav and b/P3D/Content/Sounds/ice_break.wav differ diff --git a/P3D/Content/Sounds/ice_crack.wav b/P3D/Content/Sounds/ice_crack.wav index 1c4932cb3..697dc6a35 100644 Binary files a/P3D/Content/Sounds/ice_crack.wav and b/P3D/Content/Sounds/ice_crack.wav differ diff --git a/P3D/Content/Sounds/item_found.wav b/P3D/Content/Sounds/item_found.wav index f1efed22a..84551ca73 100644 Binary files a/P3D/Content/Sounds/item_found.wav and b/P3D/Content/Sounds/item_found.wav differ diff --git a/P3D/Content/Sounds/itemfinder.wav b/P3D/Content/Sounds/itemfinder.wav index f41e0ba17..24133d481 100644 Binary files a/P3D/Content/Sounds/itemfinder.wav and b/P3D/Content/Sounds/itemfinder.wav differ diff --git a/P3D/Content/Sounds/jump_ledge.wav b/P3D/Content/Sounds/jump_ledge.wav index 6dcf289c0..bf717fa2a 100644 Binary files a/P3D/Content/Sounds/jump_ledge.wav and b/P3D/Content/Sounds/jump_ledge.wav differ diff --git a/P3D/Content/Sounds/magnettrain.wav b/P3D/Content/Sounds/magnettrain.wav index 7d026702e..c2670e651 100644 Binary files a/P3D/Content/Sounds/magnettrain.wav and b/P3D/Content/Sounds/magnettrain.wav differ diff --git a/P3D/Content/Sounds/menu_open.wav b/P3D/Content/Sounds/menu_open.wav index 975b341e1..92a9c8b6f 100644 Binary files a/P3D/Content/Sounds/menu_open.wav and b/P3D/Content/Sounds/menu_open.wav differ diff --git a/P3D/Content/Sounds/pickup.wav b/P3D/Content/Sounds/pickup.wav index 9e8cd9fb8..ac743f2a2 100644 Binary files a/P3D/Content/Sounds/pickup.wav and b/P3D/Content/Sounds/pickup.wav differ diff --git a/P3D/Content/Sounds/pokeball_set.wav b/P3D/Content/Sounds/pokeball_set.wav index 29c967d17..c7f291b34 100644 Binary files a/P3D/Content/Sounds/pokeball_set.wav and b/P3D/Content/Sounds/pokeball_set.wav differ diff --git a/P3D/Content/Sounds/pokemon_heal.wav b/P3D/Content/Sounds/pokemon_heal.wav index 533de9e0f..1906c4c26 100644 Binary files a/P3D/Content/Sounds/pokemon_heal.wav and b/P3D/Content/Sounds/pokemon_heal.wav differ diff --git a/P3D/Content/Sounds/repel_use.wav b/P3D/Content/Sounds/repel_use.wav index 990704967..538200e43 100644 Binary files a/P3D/Content/Sounds/repel_use.wav and b/P3D/Content/Sounds/repel_use.wav differ diff --git a/P3D/Content/Sounds/select.wav b/P3D/Content/Sounds/select.wav index 68a6b8d57..638c51115 100644 Binary files a/P3D/Content/Sounds/select.wav and b/P3D/Content/Sounds/select.wav differ diff --git a/P3D/Content/Sounds/shutter.wav b/P3D/Content/Sounds/shutter.wav index 849290138..6f77ccd6b 100644 Binary files a/P3D/Content/Sounds/shutter.wav and b/P3D/Content/Sounds/shutter.wav differ diff --git a/P3D/Content/Sounds/single_heal.wav b/P3D/Content/Sounds/single_heal.wav index 824ec049e..d6820f1e1 100644 Binary files a/P3D/Content/Sounds/single_heal.wav and b/P3D/Content/Sounds/single_heal.wav differ diff --git a/P3D/Content/Sounds/success.wav b/P3D/Content/Sounds/success.wav index 87450c961..8fbc0858d 100644 Binary files a/P3D/Content/Sounds/success.wav and b/P3D/Content/Sounds/success.wav differ diff --git a/P3D/Content/Sounds/success_small.wav b/P3D/Content/Sounds/success_small.wav index cc69b46d9..466c18f5a 100644 Binary files a/P3D/Content/Sounds/success_small.wav and b/P3D/Content/Sounds/success_small.wav differ diff --git a/P3D/Content/Sounds/teleport.wav b/P3D/Content/Sounds/teleport.wav index 271b3f982..042c33afd 100644 Binary files a/P3D/Content/Sounds/teleport.wav and b/P3D/Content/Sounds/teleport.wav differ diff --git a/P3D/Content/Sounds/trhq_alarm.wav b/P3D/Content/Sounds/trhq_alarm.wav index 79cee7ded..df65b138f 100644 Binary files a/P3D/Content/Sounds/trhq_alarm.wav and b/P3D/Content/Sounds/trhq_alarm.wav differ diff --git a/P3D/Core/CommandLineArgHandler.vb b/P3D/Core/CommandLineArgHandler.vb index 4d9e194a1..471904bcd 100644 --- a/P3D/Core/CommandLineArgHandler.vb +++ b/P3D/Core/CommandLineArgHandler.vb @@ -6,13 +6,13 @@ Public Sub Initialize(ByVal args() As String) If args.Length > 0 Then If args.Any(Function(arg As String) - Return arg = "-forcegraphics" - End Function) Then + Return arg = "-forcegraphics" + End Function) Then _forceGraphics = True End If If args.Any(Function(arg As String) - Return arg = "-nosplash" - End Function) Then + Return arg = "-nosplash" + End Function) Then _nosplash = True End If End If diff --git a/P3D/Core/GameOptions.vb b/P3D/Core/GameOptions.vb index 7ad14ad4d..05b31e57b 100644 --- a/P3D/Core/GameOptions.vb +++ b/P3D/Core/GameOptions.vb @@ -45,7 +45,7 @@ SoundManager.Volume = CSng(CDbl(value) / 100) Case "muted" SoundManager.Muted = CBool(value) - MediaPlayer.IsMuted = CBool(value) + MusicManager.Muted = CBool(value) Case "renderdistance" Me.RenderDistance = CInt(value) Case "showdebug" @@ -120,7 +120,7 @@ Public Sub SaveOptions() If MapPreviewScreen.MapViewMode = False Then - Dim mutedString As String = MediaPlayer.IsMuted.ToNumberString() + Dim mutedString As String = MusicManager.Muted.ToNumberString() Dim showDebugString As String = Me.ShowDebug.ToString() Dim ContentPackString As String = "" If Me.ContentPackNames.Count > 0 Then diff --git a/P3D/Core/MainGameFunctions.vb b/P3D/Core/MainGameFunctions.vb index 116ed0d2c..05c3916bc 100644 --- a/P3D/Core/MainGameFunctions.vb +++ b/P3D/Core/MainGameFunctions.vb @@ -23,14 +23,20 @@ End If ElseIf KeyBoardHandler.KeyPressed(KeyBindings.FullScreenKey) AndAlso Core.CurrentScreen.CanGoFullscreen Then ToggleFullScreen() - ElseIf KeyBoardHandler.KeyPressed(KeyBindings.MuteMusicKey) AndAlso Core.CurrentScreen.CanMuteMusic Then - MusicManager.Muted = Not MediaPlayer.IsMuted - SoundManager.Muted = MediaPlayer.IsMuted - Core.GameOptions.SaveOptions() - Core.CurrentScreen.ToggledMute() - End If + ElseIf KeyBoardHandler.KeyPressed(KeyBindings.MuteAudioKey) AndAlso Core.CurrentScreen.CanMuteMusic Then + If MusicManager.Muted Then + MusicManager.Muted = False + SoundManager.Muted = False + Else + MusicManager.Muted = True + SoundManager.Muted = True + End If - If KeyBoardHandler.KeyDown(KeyBindings.DebugKey) = True Then + Core.GameOptions.SaveOptions() + Core.CurrentScreen.ToggledMute() + End If + + If KeyBoardHandler.KeyDown(KeyBindings.DebugKey) = True Then If KeyBoardHandler.KeyPressed(Keys.F) Then TextureManager.TextureList.Clear() Core.GameMessage.ShowMessage(Localization.GetString("game_message_debug_texture_list_clear", "Texture list have cleared"), 12, FontManager.MainFont, Color.White) diff --git a/P3D/Debug/DebugDisplay.vb b/P3D/Debug/DebugDisplay.vb index 0fe3787fd..6e375d2ff 100644 --- a/P3D/Debug/DebugDisplay.vb +++ b/P3D/Debug/DebugDisplay.vb @@ -1,4 +1,6 @@ -Public Class DebugDisplay +Imports NAudio.Wave + +Public Class DebugDisplay ''' ''' Renders the debug information. @@ -86,7 +88,7 @@ End Property ''' - ''' MediaPLayer state tracking method. + ''' MediaPlayer state tracking method. ''' Private Shared Sub DrawMediaInfo() Dim songName = "" @@ -100,13 +102,19 @@ Dim field = GetType(MediaPlayer).GetField("_sessionState", Reflection.BindingFlags.NonPublic Or Reflection.BindingFlags.Static) Dim sessionState = field.GetValue(Nothing).ToString() + Dim _outputDevice As WaveOutEvent + If Not MusicManager.outputDevice Is Nothing Then + _outputdevice = MusicManager.outputDevice + Else + _outputDevice = New WaveOutEvent() + End If Dim str = "Song: " + songName + Environment.NewLine + - "Play position: " + MediaPlayer.PlayPosition.ToString() + Environment.NewLine + + "Play position: " + _outputDevice.GetPosition.ToString() + Environment.NewLine + "Session state: " + sessionState + Environment.NewLine + - "State: " + MediaPlayer.State.ToString() + Environment.NewLine + - "Volume: " + MediaPlayer.Volume.ToString() + Environment.NewLine + - "Is Muted: " + MediaPlayer.IsMuted.ToString() + Environment.NewLine + - "Is Repeating: " + MediaPlayer.IsRepeating.ToString() + "State: " + _outputDevice.PlaybackState.ToString() + Environment.NewLine + + "Volume: " + MusicManager.MasterVolume.ToString() + Environment.NewLine + + "Is Muted: " + MusicManager.Muted.ToString() + Environment.NewLine + + "Is Repeating: " + MusicManager._isLooping.ToString() Core.SpriteBatch.DrawInterfaceString(FontManager.MainFont, str, New Vector2(7, 7), Color.Black) Core.SpriteBatch.DrawInterfaceString(FontManager.MainFont, str, New Vector2(5, 5), Color.White) diff --git a/P3D/Dialogues/PokemonImageView.vb b/P3D/Dialogues/PokemonImageView.vb index d1484434c..2ab460e09 100644 --- a/P3D/Dialogues/PokemonImageView.vb +++ b/P3D/Dialogues/PokemonImageView.vb @@ -45,6 +45,7 @@ ElseIf Delay = 0.0F Then If Controls.Accept() = True Or Controls.Dismiss() = True Then Me.Showing = False + SoundManager.PlaySound("select") End If End If End Sub diff --git a/P3D/Entites/Enviroment/WarpBlock.vb b/P3D/Entites/Enviroment/WarpBlock.vb index 783637500..939582d4f 100644 --- a/P3D/Entites/Enviroment/WarpBlock.vb +++ b/P3D/Entites/Enviroment/WarpBlock.vb @@ -43,8 +43,8 @@ Screen.Level.WarpData.IsWarpBlock = True Logger.Debug("Lock Camera") CType(Screen.Camera, OverworldCamera).YawLocked = True - Else - Screen.Level = New Level() + Else + Screen.Level = New Level() Screen.Level.Load(Me.AdditionalValue.GetSplit(0)) Screen.Level.World.Initialize(Screen.Level.EnvironmentType, Screen.Level.WeatherType) diff --git a/P3D/Input/KeyBindings.vb b/P3D/Input/KeyBindings.vb index 1f12a0bcf..413b2d2f9 100644 --- a/P3D/Input/KeyBindings.vb +++ b/P3D/Input/KeyBindings.vb @@ -15,7 +15,7 @@ Public Class KeyBindings Public Shared LeftKey As Keys = Keys.Left Public Shared CameraLockKey As Keys = Keys.C - Public Shared MuteMusicKey As Keys = Keys.M + Public Shared MuteAudioKey As Keys = Keys.M Public Shared OnlineStatusKey As Keys = Keys.Tab Public Shared GUIControlKey As Keys = Keys.F1 @@ -60,8 +60,8 @@ Public Class KeyBindings ChatKey = binding Case "special", "pokegear" SpecialKey = binding - Case "mutemusic" - MuteMusicKey = binding + Case "muteaudio", "mutemusic" + MuteAudioKey = binding Case "cameraleft" LeftKey = binding Case "cameraright" @@ -238,7 +238,7 @@ Public Class KeyBindings "[Inventory]=" & GetKeyName(Keys.E) & Environment.NewLine & "[Chat]=" & GetKeyName(Keys.T) & Environment.NewLine & "[Special]=" & GetKeyName(Keys.Q) & Environment.NewLine & - "[MuteMusic]=" & GetKeyName(Keys.M) & Environment.NewLine & + "[MuteAudio]=" & GetKeyName(Keys.M) & Environment.NewLine & "[Up]=" & GetKeyName(Keys.Up) & Environment.NewLine & "[Down]=" & GetKeyName(Keys.Down) & Environment.NewLine & "[Left]=" & GetKeyName(Keys.Left) & Environment.NewLine & @@ -273,7 +273,7 @@ Public Class KeyBindings "[Inventory]=" & GetKeyName(OpenInventoryKey) & Environment.NewLine & "[Chat]=" & GetKeyName(ChatKey) & Environment.NewLine & "[Special]=" & GetKeyName(SpecialKey) & Environment.NewLine & - "[MuteMusic]=" & GetKeyName(MuteMusicKey) & Environment.NewLine & + "[MuteAudio]=" & GetKeyName(MuteAudioKey) & Environment.NewLine & "[Up]=" & GetKeyName(UpKey) & Environment.NewLine & "[Down]=" & GetKeyName(DownKey) & Environment.NewLine & "[Left]=" & GetKeyName(LeftKey) & Environment.NewLine & diff --git a/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb b/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb index 60264ea06..d38c874cd 100644 --- a/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSInboxScreen.vb @@ -70,6 +70,7 @@ Selected = -1 Else Selected = i + ScrollIndex + SoundManager.PlaySound("select") Emblem = New Emblem(InboxList(Selected).FromUserID, 0) End If End If @@ -100,6 +101,7 @@ If New Rectangle(600, 440, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then If Controls.Accept(True, False) = True Then If Core.Player.Pokemons.Count < 6 Then + SoundManager.PlaySound("select") WithdrawCurrent() End If End If @@ -114,6 +116,7 @@ Else Core.SetScreen(Me.PreScreen) End If + SoundManager.PlaySound("select") End If End Sub diff --git a/P3D/Network/GameJolt/GTS/GTSMainScreen.vb b/P3D/Network/GameJolt/GTS/GTSMainScreen.vb index 6d7be1cb8..d32a9e813 100644 --- a/P3D/Network/GameJolt/GTS/GTSMainScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSMainScreen.vb @@ -250,12 +250,16 @@ If Controls.Accept(False, True) = True Then Select Case Me.menuIndex Case 0 + SoundManager.PlaySound("select") InboxButton() Case 1 + SoundManager.PlaySound("select") SearchButton() Case 2 + SoundManager.PlaySound("select") SetupButton() Case 3 + SoundManager.PlaySound("select") ExitButton() End Select End If diff --git a/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb b/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb index 44d73f482..d6622aba9 100644 --- a/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSSearchScreen.vb @@ -279,6 +279,7 @@ Selected = -1 Else Selected = i + ScrollIndex + SoundManager.PlaySound("select") TempPokemon = Pokemon.GetPokemonByID(CInt(SearchResults(Selected).RequestID)) Emblem = New Emblem(SearchResults(Selected).FromUserID, 0) End If @@ -290,15 +291,19 @@ If Controls.Accept(True, False) = True Then If New Rectangle(280, 48, 5 * 32, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New SelectPokemonScreen(Me, "Offer")) End If If New Rectangle(472, 48, 4 * 32, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New SelectLevelScreen(Me)) End If If New Rectangle(632, 48, 4 * 32, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New SelectGenderScreen(Me)) End If If New Rectangle(792, 48, 5 * 32, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New SelectPokemonScreen(Me, "Request")) End If If New Rectangle(1000, 64, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then @@ -328,9 +333,11 @@ Selected = -1 ScrollIndex = 0 'End If + SoundManager.PlaySound("select") End If If New Rectangle(600, 610, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then If Selected > -1 Then + SoundManager.PlaySound("select") Core.SetScreen(New GTSTradeScreen(Me, SearchResults(Selected))) End If End If @@ -339,7 +346,9 @@ If Controls.Dismiss(True, True) = True Then If Selected > -1 Then Selected = -1 + SoundManager.PlaySound("select") Else + SoundManager.PlaySound("select") Core.SetScreen(Me.PreScreen) End If End If @@ -539,17 +548,20 @@ Case 9 newSetting = "90 - 100" End Select + SoundManager.PlaySound("select") Me.GTSSearchScreen.LevelFilter = newSetting Core.SetScreen(Me.GTSSearchScreen) End If Next If New Rectangle(900, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSSearchScreen) End If End If If Controls.Dismiss(True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSSearchScreen) End If End Sub @@ -706,7 +718,7 @@ ElseIf Mode = "Offer" Then Me.GTSSearchScreen.OfferFilter = newSetting End If - + SoundManager.PlaySound("select") Close() End If End If @@ -716,6 +728,7 @@ If Me.Page > 0 Then Me.Page -= 1 GetPokemon() + SoundManager.PlaySound("select") If Me.Mode = "Request" Then TempRequestPage = Me.Page ElseIf Me.Mode = "Offer" Then @@ -727,6 +740,7 @@ If CurrentPokemon.Count = 20 Then Me.Page += 1 GetPokemon() + SoundManager.PlaySound("select") If Me.Mode = "Request" Then TempRequestPage = Me.Page ElseIf Me.Mode = "Offer" Then @@ -740,15 +754,17 @@ ElseIf Mode = "Offer" Then Me.GTSSearchScreen.OfferFilter = "" End If - + SoundManager.PlaySound("select") Close() End If If New Rectangle(900, 500, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Close() End If End If If Controls.Dismiss(True, True) = True Then + SoundManager.PlaySound("select") Close() End If End Sub @@ -849,9 +865,11 @@ If New Rectangle(900, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Core.SetScreen(Me.GTSSearchScreen) End If + SoundManager.PlaySound("select") End If If Controls.Dismiss(True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSSearchScreen) End If End Sub @@ -931,9 +949,11 @@ If New Rectangle(900, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Core.SetScreen(Me.GTSSearchScreen.PreScreen) End If + SoundManager.PlaySound("select") End If If Controls.Dismiss(True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSSearchScreen.PreScreen) End If End Sub diff --git a/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb b/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb index c6832187c..084a4eee2 100644 --- a/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSSetupScreen.vb @@ -246,6 +246,7 @@ Selected = -1 Else Selected = i + ScrollIndex + SoundManager.PlaySound("select") TempPokemon = Pokemon.GetPokemonByID(CInt(SetupList(Selected).RequestID)) If SetupList(Selected).SecurityArea = GTSDataItem.SecurityCode.Private Then Emblem = New Emblem(SetupList(Selected).ToUserID, 0) @@ -278,12 +279,14 @@ If Selected > -1 Then If New Rectangle(600, 610, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then If Controls.Accept(True, False) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New GTSEditTradeScreen(Me, SetupList(Selected))) End If End If If New Rectangle(800, 610, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then If Controls.Accept(True, False) = True Then If Core.Player.Pokemons.Count < 6 Then + SoundManager.PlaySound("select") Working = True FetchBack = Me.SetupList(Selected) Dim APICall As New APICall(AddressOf FetchTradeBack) @@ -297,6 +300,7 @@ If CanSetup() = True Then If New Rectangle(180, 200 + (SetupList.Count - ScrollIndex) * 64, 32 * 4 + 64, 32).Contains(MouseHandler.MousePosition) = True Then If Controls.Accept(True, False) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New GTSEditTradeScreen(Me, Nothing)) End If End If @@ -304,8 +308,10 @@ If Controls.Dismiss(True, True) = True Then If Selected > -1 Then + SoundManager.PlaySound("select") Selected = -1 Else + SoundManager.PlaySound("select") Core.SetScreen(Me.PreScreen) End If End If @@ -734,6 +740,7 @@ Dim APICall As New APICall(AddressOf GotTradeID) APICall.GetStorageData("GTSTRADEID", False) End If + SoundManager.PlaySound("select") End If If Controls.Dismiss(True, True) = True Then @@ -985,7 +992,7 @@ ElseIf Mode = "Offer" Then Me.GTSEditTradeScreen.D.RequestID = CurrentPokemon.Keys(i).ToString() End If - + SoundManager.PlaySound("select") Close() End If End If @@ -1143,16 +1150,19 @@ newSetting = "90 - 100" End Select Me.GTSEditTradeScreen.D.RequestLevel = newSetting + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If Next If New Rectangle(900, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If End If If Controls.Dismiss(True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If End Sub @@ -1223,30 +1233,36 @@ If Controls.Accept(True, False) = True Then If New Rectangle(100, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Me.GTSEditTradeScreen.D.RequestGender = "Male" + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If If New Rectangle(260, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Me.GTSEditTradeScreen.D.RequestGender = "Female" + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If If New Rectangle(420, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Me.GTSEditTradeScreen.D.RequestGender = "Genderless" + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If If New Rectangle(580, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Me.GTSEditTradeScreen.D.RequestGender = "" + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If If New Rectangle(900, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If End If If Controls.Dismiss(True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If End Sub @@ -1315,20 +1331,24 @@ If Controls.Accept(True, False) = True Then If New Rectangle(100, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Me.GTSEditTradeScreen.D.SecurityArea = GTSDataItem.SecurityCode.Global + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If If New Rectangle(260, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Me.GTSEditTradeScreen.D.SecurityArea = GTSDataItem.SecurityCode.Private + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If If New Rectangle(900, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If End If If Controls.Dismiss(True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If End Sub @@ -1447,6 +1467,7 @@ If New Rectangle(100 + x * 160, 200 + y * 100, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Me.GTSEditTradeScreen.D.ToUserID = Users.Keys(i + Page * 20).ToString() + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If End If @@ -1454,19 +1475,23 @@ If New Rectangle(900, 200, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then If Page > 0 Then Page -= 1 + SoundManager.PlaySound("select") End If End If If New Rectangle(900, 300, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then If Users.Count - Page * 20 > 20 Then Page += 1 + SoundManager.PlaySound("select") End If End If If New Rectangle(900, 400, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then Me.GTSEditTradeScreen.D.ToUserID = "" Me.GTSEditTradeScreen.ToEmblem = Nothing + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If If New Rectangle(900, 500, 32 * 4, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If End If @@ -1474,6 +1499,7 @@ Users = (From entry In Users Order By entry.Value Ascending).ToDictionary(Function(pair) pair.Key, Function(pair) pair.Value) If Controls.Dismiss(True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.GTSEditTradeScreen) End If End Sub diff --git a/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb b/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb index 4bd20dc41..6fc8c734f 100644 --- a/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb +++ b/P3D/Network/GameJolt/GTS/GTSTradeScreen.vb @@ -47,24 +47,28 @@ Dim selScreen = New PartyScreen(Me, Item.GetItemByID(5), AddressOf ChosePokemon, "Choose Pokémon to trade", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True} AddHandler selScreen.SelectedObject, AddressOf ChosePokemonHandler - + SoundManager.PlaySound("select") Core.SetScreen(selScreen) End If If New Rectangle(180, 510, 32 * 5 + 64, 32).Contains(MouseHandler.MousePosition) = True Then PokeIndex = -1 + SoundManager.PlaySound("select") End If If New Rectangle(780, 560, 32 * 5 + 64, 32).Contains(MouseHandler.MousePosition) = True Then Core.SetScreen(New SummaryScreen(Me, {D.Pokemon}, 0)) + SoundManager.PlaySound("select") ''Core.SetScreen(New PokemonStatusScreen(Me, 0, {D.Pokemon}, D.Pokemon, False)) End If If New Rectangle(520, 560, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then If MeetsCondition() = True Then + SoundManager.PlaySound("select") Core.SetScreen(New TradingScreen(Me, Me.D, Me.PokeIndex)) End If End If End If If Controls.Dismiss(True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.PreScreen) End If End Sub diff --git a/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb b/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb index 873e9e980..56c921698 100644 --- a/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb +++ b/P3D/Network/GameJolt/GTS/WonderTradeScreen.vb @@ -186,6 +186,7 @@ For i = 0 To Me.MenuItems.Count - 1 If New Rectangle(CInt(Core.windowSize.Width / 2 - (64 * 4) / 2), 400 + i * 96, 64 * 4, 64).Contains(MouseHandler.MousePosition) = True Then If i = Cursor Then + SoundManager.PlaySound("select") Me.SelectMenuEntry() Else Cursor = i @@ -195,6 +196,7 @@ End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.SelectMenuEntry() End If Case ScreenStates.Idle @@ -221,6 +223,7 @@ End If Case ScreenStates.Stopped If KeyBoardHandler.GetPressedKeys().Count > 0 Or ControllerHandler.HasControlerInput() = True Or Controls.Accept() = True Or Controls.Dismiss() = True Then + SoundManager.PlaySound("select") CloseScreen() End If Case ScreenStates.Trading diff --git a/P3D/Network/GameJolt/LogInScreen.vb b/P3D/Network/GameJolt/LogInScreen.vb index e7c979121..41be834de 100644 --- a/P3D/Network/GameJolt/LogInScreen.vb +++ b/P3D/Network/GameJolt/LogInScreen.vb @@ -157,6 +157,7 @@ Namespace GameJolt Select Case True Case Core.ScaleScreenRec(OkButton.GetRectangle()).Contains(MouseHandler.MousePosition) If OkButton.IsActive = True Then + SoundManager.PlaySound("select") OkButton.DoPress() Else Deactivate() @@ -195,6 +196,7 @@ Namespace GameJolt Token.IsActive = True Case Core.ScaleScreenRec(LogInButton.GetRectangle()).Contains(MouseHandler.MousePosition) If LogInButton.IsActive = True Then + SoundManager.PlaySound("select") LogInButton.DoPress() Else Deactivate() @@ -202,6 +204,7 @@ Namespace GameJolt End If Case Core.ScaleScreenRec(CloseButton.GetRectangle()).Contains(MouseHandler.MousePosition) If CloseButton.IsActive = True Then + SoundManager.PlaySound("select") CloseButton.DoPress() Else Deactivate() @@ -209,6 +212,7 @@ Namespace GameJolt End If Case Core.ScaleScreenRec(CreateAccountButton.GetRectangle()).Contains(MouseHandler.MousePosition) If CreateAccountButton.IsActive = True Then + SoundManager.PlaySound("select") CreateAccountButton.DoPress() Else Deactivate() @@ -219,14 +223,19 @@ Namespace GameJolt If Controls.Accept(False, False, True) = True Or KeyBoardHandler.KeyPressed(KeyBindings.EnterKey1) = True Then Select Case True Case UserName.IsActive + SoundManager.PlaySound("select") UserName.DoPress() Case Token.IsActive + SoundManager.PlaySound("select") Token.DoPress() Case LogInButton.IsActive + SoundManager.PlaySound("select") LogInButton.DoPress() Case CloseButton.IsActive + SoundManager.PlaySound("select") CloseButton.DoPress() Case CreateAccountButton.IsActive + SoundManager.PlaySound("select") CreateAccountButton.DoPress() End Select End If diff --git a/P3D/Network/GameJolt/RegisterBattleScreen.vb b/P3D/Network/GameJolt/RegisterBattleScreen.vb index 4c236e9c6..fd037dc55 100644 --- a/P3D/Network/GameJolt/RegisterBattleScreen.vb +++ b/P3D/Network/GameJolt/RegisterBattleScreen.vb @@ -181,6 +181,7 @@ For i = 0 To Me.MainMenuItems.Count - 1 If New Rectangle(CInt(Core.windowSize.Width / 2 - (64 * 4) / 2), 400 + i * 96, 64 * 4, 64).Contains(MouseHandler.MousePosition) = True Then If i = MainCursor Then + SoundManager.PlaySound("select") Me.SelectMainMenuEntry() Else MainCursor = i @@ -190,9 +191,11 @@ End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.SelectMainMenuEntry() End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New TransitionScreen(Me, Me.PreScreen, Color.White, False)) End If End Sub @@ -274,6 +277,7 @@ For i = 0 To Me.TeamRegisterMenuItems.Count - 1 If New Rectangle(CInt(Core.windowSize.Width / 2 - (64 * 4) / 2), 400 + i * 96, 64 * 4, 64).Contains(MouseHandler.MousePosition) = True Then If i = TeamRegisterCursor Then + SoundManager.PlaySound("select") Me.SelectTeamRegisterMenuEntry() Else TeamRegisterCursor = i @@ -283,9 +287,11 @@ End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.SelectTeamRegisterMenuEntry() End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") Me.ScreenState = ScreenStates.MainMenu End If End Sub @@ -444,17 +450,21 @@ If New Rectangle(CInt(Core.windowSize.Width / 2) + 120, 230, 290, 360).Contains(MouseHandler.MousePosition) = True Then If ChooseTeamCursor = 0 Then ChooseTeamCursor = 1 + SoundManager.PlaySound("select") Else UseBattleBox = False + SoundManager.PlaySound("select") Me.PrepareBattle() End If End If If New Rectangle(CInt(Core.windowSize.Width / 2) - 410, 230, 290, 360).Contains(MouseHandler.MousePosition) = True Then If ChooseTeamCursor = 1 Then + SoundManager.PlaySound("select") ChooseTeamCursor = 0 Else If hasBattleBoxPokemon = True Then UseBattleBox = True + SoundManager.PlaySound("select") Me.PrepareBattle() End If End If @@ -468,11 +478,13 @@ Else UseBattleBox = False End If + SoundManager.PlaySound("select") Me.PrepareBattle() End If End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") Me.ScreenState = ScreenStates.MainMenu End If End Sub diff --git a/P3D/Network/MysteryEventScreen.vb b/P3D/Network/MysteryEventScreen.vb index edc361703..2c89f22ff 100644 --- a/P3D/Network/MysteryEventScreen.vb +++ b/P3D/Network/MysteryEventScreen.vb @@ -189,7 +189,9 @@ Exit For End If Next + SoundManager.PlaySound("select") Else + SoundManager.PlaySound("select") ActivatedMysteryEvents.Add(cEvent) End If End If diff --git a/P3D/Network/Servers/DirectTradeScreen.vb b/P3D/Network/Servers/DirectTradeScreen.vb index 960b5a690..f7bf9cb50 100644 --- a/P3D/Network/Servers/DirectTradeScreen.vb +++ b/P3D/Network/Servers/DirectTradeScreen.vb @@ -230,6 +230,7 @@ Me.UpdateIdle() Case ScreenStates.Stopped If KeyBoardHandler.GetPressedKeys().Count > 0 Or ControllerHandler.HasControlerInput() = True Or Controls.Accept() = True Or Controls.Dismiss() = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.PreScreen) End If Case ScreenStates.Trading @@ -264,6 +265,7 @@ For i = 0 To Me.menuItems.Count - 1 If New Rectangle(CInt(Core.windowSize.Width / 2 - (64 * 4) / 2), 200 + i * 96, 64 * 4, 64).Contains(MouseHandler.MousePosition) = True Then If i = Cursor Then + SoundManager.PlaySound("select") Me.SelectMenuEntry() Else Cursor = i @@ -273,11 +275,13 @@ End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.SelectMenuEntry() End If End If Else If Controls.Dismiss() = True Then + SoundManager.PlaySound("select") QuitTrade() End If End If diff --git a/P3D/Network/Servers/PVPLobbyScreen.vb b/P3D/Network/Servers/PVPLobbyScreen.vb index 0ce04355a..8b432bf7f 100644 --- a/P3D/Network/Servers/PVPLobbyScreen.vb +++ b/P3D/Network/Servers/PVPLobbyScreen.vb @@ -134,6 +134,7 @@ Me.UpdateIdle() Case ScreenStates.Stopped If KeyBoardHandler.GetPressedKeys().Count > 0 Or ControllerHandler.HasControlerInput() = True Or Controls.Accept() = True Or Controls.Dismiss() = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.PreScreen) End If Case ScreenStates.ChooseTeam @@ -268,6 +269,7 @@ For i = 0 To Me.menuItems.Count - 1 If New Rectangle(CInt(Core.windowSize.Width / 2 - (64 * 4) / 2), 200 + i * 96, 64 * 4, 64).Contains(MouseHandler.MousePosition) = True Then If i = Cursor Then + SoundManager.PlaySound("select") Me.SelectMenuEntry() Else Cursor = i @@ -277,11 +279,13 @@ End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.SelectMenuEntry() End If End If Else If Controls.Dismiss() = True Then + SoundManager.PlaySound("select") QuitBattle() End If End If @@ -417,15 +421,19 @@ If New Rectangle(CInt(Core.windowSize.Width / 2) + 120, 230, 290, 360).Contains(MouseHandler.MousePosition) = True Then If ChooseTeamCursor = 0 Then ChooseTeamCursor = 1 + SoundManager.PlaySound("select") Else + SoundManager.PlaySound("select") SelectTeam() End If End If If New Rectangle(CInt(Core.windowSize.Width / 2) - 410, 230, 290, 360).Contains(MouseHandler.MousePosition) = True Then If ChooseTeamCursor = 1 Then ChooseTeamCursor = 0 + SoundManager.PlaySound("select") Else If hasBattleBoxPokemon = True Then + SoundManager.PlaySound("select") SelectTeam() End If End If @@ -434,11 +442,13 @@ If hasBattleBoxPokemon = True Or ChooseTeamCursor = 1 Then If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") SelectTeam() End If End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") ScreenState = ScreenStates.Idle End If End Sub @@ -821,6 +831,7 @@ Private Sub UpdateBattleResults() If Controls.Accept() = True Then + SoundManager.PlaySound("select") ScreenState = ScreenStates.Stopped End If End Sub diff --git a/P3D/Overworld/OverworldCamera.vb b/P3D/Overworld/OverworldCamera.vb index 280da4613..1dcae6e26 100644 --- a/P3D/Overworld/OverworldCamera.vb +++ b/P3D/Overworld/OverworldCamera.vb @@ -762,9 +762,6 @@ Public Class OverworldCamera Screen.Level.OwnPlayer.DoAnimation = (walkSteps <= 1) Move(walkSteps) - If _thirdPerson = False Then - _bumpSoundDelay = 35 - End If Else 'Walked against something, set player transparent If Screen.Level.Surfing = False Then @@ -772,12 +769,12 @@ Public Class OverworldCamera If _didWalkAgainst = True Then Screen.Level.OwnPlayer.Opacity = 0.5F End If - If _bumpSoundDelay = 0 Then - If _didWalkAgainst = True Then - SoundManager.PlaySound("bump") - End If - _bumpSoundDelay = 35 + End If + If _bumpSoundDelay = 0 Then + If _didWalkAgainst = True Then + SoundManager.PlaySound("bump") End If + _bumpSoundDelay = 35 End If End If End If diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 4f0ebc46a..006fc1275 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -100,8 +100,14 @@ ..\packages\MonoGame.Framework.DX.3.7.1.189\lib\net45\MonoGame.Framework.dll - - ..\packages\NAudio.1.8.4\lib\net35\NAudio.dll + + ..\packages\NAudio.1.10.0\lib\net35\NAudio.dll + + + ..\packages\NAudio.Vorbis.1.2.0\lib\net45\NAudio.Vorbis.dll + + + ..\packages\NVorbis.0.10.1\lib\net45\NVorbis.dll ..\packages\SharpDX.4.0.1\lib\net45\SharpDX.dll @@ -131,10 +137,24 @@ ..\packages\SharpDX.XInput.4.0.1\lib\net45\SharpDX.XInput.dll + + ..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll + + + ..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll + + + @@ -13958,6 +13978,573 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -24806,9 +25393,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -27657,6 +28241,7 @@ PreserveNewest + Always @@ -27664,6 +28249,7 @@ + @@ -29196,6 +29782,7 @@ + @@ -29236,6 +29823,7 @@ + diff --git a/P3D/Player/Player.vb b/P3D/Player/Player.vb index c907b227c..28df664f1 100644 --- a/P3D/Player/Player.vb +++ b/P3D/Player/Player.vb @@ -1897,7 +1897,7 @@ End Sub Private Sub PlayWildPokemonNoise(ByVal number As Integer) - SoundManager.PlayPokemonCry(number, Random.Next(0, 6) / 10.0F, Random.Next(0, 20) / 10.0F - 1, SoundManager.Volume * 0.35F) + SoundManager.PlayPokemonCry(number, Random.Next(0, 6) / 10.0F, Random.Next(0, 20) / 10.0F - 1, SoundManager.Volume * 0.5F) End Sub #End Region diff --git a/P3D/Pokemon/Attacks/Dark/NightDaze.vb b/P3D/Pokemon/Attacks/Dark/NightDaze.vb index ed4378b5c..e2c5ae21c 100644 --- a/P3D/Pokemon/Attacks/Dark/NightDaze.vb +++ b/P3D/Pokemon/Attacks/Dark/NightDaze.vb @@ -64,6 +64,6 @@ End If End Sub - End Class + End Class End Namespace diff --git a/P3D/Pokemon/Attacks/Fire/Eruption.vb b/P3D/Pokemon/Attacks/Fire/Eruption.vb index bba8e31a5..c8699b0c2 100644 --- a/P3D/Pokemon/Attacks/Fire/Eruption.vb +++ b/P3D/Pokemon/Attacks/Fire/Eruption.vb @@ -61,6 +61,6 @@ Namespace BattleSystem.Moves.Fire Return CInt(150 * (p.HP / p.MaxHP)) End Function - End Class + End Class End Namespace \ No newline at end of file diff --git a/P3D/Pokemon/Attacks/Ground/MudBomb.vb b/P3D/Pokemon/Attacks/Ground/MudBomb.vb index 007bb2241..8389f36b4 100644 --- a/P3D/Pokemon/Attacks/Ground/MudBomb.vb +++ b/P3D/Pokemon/Attacks/Ground/MudBomb.vb @@ -51,7 +51,7 @@ Me.IsWonderGuardAffected = True Me.IsBulletMove = True '#End - + Me.EffectChances.Add(30) Me.AIField1 = AIField.Damage diff --git a/P3D/Pokemon/Attacks/Water/WaterSpout.vb b/P3D/Pokemon/Attacks/Water/WaterSpout.vb index c20ab2a65..cce19ffa5 100644 --- a/P3D/Pokemon/Attacks/Water/WaterSpout.vb +++ b/P3D/Pokemon/Attacks/Water/WaterSpout.vb @@ -61,6 +61,6 @@ Namespace BattleSystem.Moves.Water Return CInt(150 * (p.HP / p.MaxHP)) End Function - End Class + End Class End Namespace \ No newline at end of file diff --git a/P3D/Pokemon/Items/Standard/EscapeRope.vb b/P3D/Pokemon/Items/Standard/EscapeRope.vb index 3d2ba2ce7..3ee61672e 100644 --- a/P3D/Pokemon/Items/Standard/EscapeRope.vb +++ b/P3D/Pokemon/Items/Standard/EscapeRope.vb @@ -33,12 +33,12 @@ Namespace Items.Standard @camera.reset @camera.fix @player.turnto(0) +@sound.play(teleport) :while:<" & yFinish & " @player.turn(1) @player.warp(~,~+0.1,~) @level.wait(1) :endwhile -@sound.play(destroy) @screen.fadeout @camera.defix @player.warp(" & Core.Player.LastRestPlace & "," & Core.Player.LastRestPlacePosition & ",0) diff --git a/P3D/Resources/GameModeManager.vb b/P3D/Resources/GameModeManager.vb index c88556d35..97d0e273d 100644 --- a/P3D/Resources/GameModeManager.vb +++ b/P3D/Resources/GameModeManager.vb @@ -378,11 +378,12 @@ Public Class GameMode ''' The start location name for the new GameMode. ''' The Pokémon that appear on the new game screen for the new GameMode. ''' The intro music that plays on the new game screen for the new GameMode. + ''' The type of intro used when starting a new game for the GameMode (0 = New Intro (3D), 1 = Old Intro (2D)). ''' The skin colors for the new GameMode. Must be the same amount as SkinFiles and SkinNames. ''' The skin files for the new GameMode. Must be the same amount as SkinColors and SkinNames. ''' The skin names for the new GameMode. Must be the same amount as SkinFiles and SkinColors. Public Sub New(ByVal Name As String, ByVal Description As String, ByVal Version As String, ByVal Author As String, ByVal MapPath As String, ByVal ScriptPath As String, ByVal PokeFilePath As String, ByVal PokemonDataPath As String, ByVal ContentPath As String, ByVal LocalizationsPath As String, ByVal GameRules As List(Of GameRule), - ByVal StartMap As String, ByVal StartPosition As Vector3, ByVal StartRotation As Single, ByVal StartLocationName As String, ByVal StartDialogue As String, ByVal StartColor As Color, ByVal PokemonAppear As String, ByVal IntroMusic As String, ByVal SkinColors As List(Of Color), ByVal SkinFiles As List(Of String), ByVal SkinNames As List(Of String)) + ByVal StartMap As String, ByVal StartPosition As Vector3, ByVal StartRotation As Single, ByVal StartLocationName As String, ByVal StartDialogue As String, ByVal StartColor As Color, ByVal PokemonAppear As String, ByVal IntroMusic As String, ByVal IntroType As String, ByVal SkinColors As List(Of Color), ByVal SkinFiles As List(Of String), ByVal SkinNames As List(Of String)) Me._name = Name Me._description = Description Me._version = Version @@ -403,6 +404,7 @@ Public Class GameMode Me._startColor = StartColor Me._pokemonAppear = PokemonAppear Me._introMusic = IntroMusic + Me._introType = IntroType Me._skinColors = SkinColors Me._skinFiles = SkinFiles Me._skinNames = SkinNames @@ -495,6 +497,8 @@ Public Class GameMode End If Case "intromusic" Me._introMusic = Value + Case "introtype" + Me._introType = Value Case "skincolors" Dim l As New List(Of Color) For Each color As String In Value.Split(CChar(",")) @@ -554,7 +558,7 @@ Public Class GameMode Dim SkinNames As List(Of String) = {"Ethan", "Lyra", "Nate", "Rosa", "Hilbert", "Hilda"}.ToList() Dim gameMode As New GameMode("Pokemon 3D", "The normal game mode.", GameController.GAMEVERSION, "Kolben Games", "\Content\Data\maps\", "\Content\Data\Scripts\", "\Content\Data\maps\poke\", "\Content\Pokemon\Data\", "\Content\", "\Content\Localization\", New List(Of GameRule), - "newgame\intro0.dat", New Vector3(1.0F, 0.1F, 3.0F), MathHelper.PiOver2, "Your Room", "", New Color(59, 123, 165), "0", "welcome", SkinColors, SkinFiles, SkinNames) + "newgame\intro0.dat", New Vector3(1.0F, 0.1F, 3.0F), MathHelper.PiOver2, "Your Room", "", New Color(59, 123, 165), "0", "welcome", "0", SkinColors, SkinFiles, SkinNames) Dim gameRules As New List(Of GameRule) gameRules.Add(New GameRule("MaxLevel", "100")) @@ -830,6 +834,7 @@ Public Class GameMode Private _startColor As Color = New Color(59, 123, 165) Private _pokemonAppear As String = "" Private _introMusic As String = "" + Private _introType As String = "" Private _skinColors As New List(Of Color) Private _skinFiles As New List(Of String) Private _skinNames As New List(Of String) @@ -953,6 +958,18 @@ Public Class GameMode End Set End Property + ''' + ''' The type of intro used when starting a new game for the GameMode (0 = New Intro (3D), 1 = Old Intro (2D)). + ''' + Public Property IntroType() As String + Get + Return Me._introType + End Get + Set(value As String) + Me._introType = value + End Set + End Property + ''' ''' The skin colors for this GameMode. Must be the same amount as SkinFiles and SkinNames. ''' diff --git a/P3D/Resources/Sound/MusicManager.vb b/P3D/Resources/Sound/MusicManager.vb index 096d1c21e..0a2bce504 100644 --- a/P3D/Resources/Sound/MusicManager.vb +++ b/P3D/Resources/Sound/MusicManager.vb @@ -1,13 +1,71 @@ Imports Microsoft.VisualBasic +Imports NAudio.Wave +Imports NAudio.Wave.SampleProviders +Public Class LoopStream + Inherits WaveStream + Private _sourceStream As WaveStream + + Public Sub New(ByVal sourceStream As WaveStream, Optional ByVal Looping As Boolean = True) + Me._sourceStream = sourceStream + Me._enableLooping = Looping + End Sub + + Public Property _enableLooping As Boolean + + Public Overrides ReadOnly Property WaveFormat As WaveFormat + Get + Return _sourceStream.WaveFormat + End Get + End Property + + Public Overrides ReadOnly Property Length As Long + Get + Return _sourceStream.Length + End Get + End Property + + Public Overrides Property Position As Long + Get + Return _sourceStream.Position + End Get + Set(ByVal value As Long) + _sourceStream.Position = value + End Set + End Property + + Public Overrides Function Read(buffer() As Byte, offset As Integer, count As Integer) As Integer + Dim totalBytesRead As Integer = 0 + + While totalBytesRead < count + Dim bytesRead As Integer = _sourceStream.Read(buffer, offset + totalBytesRead, count - totalBytesRead) + + If bytesRead = 0 Then + + If _enableLooping Then + _sourceStream.Position = 0 + Else + If Not _sourceStream.Position = 0 Then + Exit While + End If + End If + End If + totalBytesRead += bytesRead + End While + + Return totalBytesRead + End Function +End Class Public Class MusicManager Private Const NO_MUSIC As String = "*nomusic*" ' contains * as character, which cannot be in a filename Private Const DEFAULT_FADE_SPEED As Single = 0.02F Private Shared _songs As Dictionary(Of String, SongContainer) = New Dictionary(Of String, SongContainer)() - Private Shared _volume As Single = 1.0F + Public Shared Property Volume As Single = 1.0F Private Shared _lastVolume As Single = 1.0F Private Shared _muted As Boolean = False + Private Shared _paused As Boolean = False + Public Shared _isLooping As Boolean = False ' currently playing song Private Shared _currentSongName As String = NO_MUSIC @@ -20,7 +78,8 @@ Public Class MusicManager Private Shared _isPausedForSound As Boolean = False ' time until the intro of a song plays - Private Shared _introEndTime As Date + Private Shared _introMuteTime As Date + Public Shared _introEndTime As Date Private Shared _isIntroStarted As Boolean = False ' song that gets played after the intro finished Private Shared _introContinueSong As String @@ -33,6 +92,10 @@ Public Class MusicManager Private Shared _fadeIntoIntro As Boolean = False Private Shared _isFadingOut As Boolean = False Private Shared _isFadingIn As Boolean = False + ' NAudio properties + Public Shared outputDevice As WaveOutEvent + Public Shared audioFile As VorbisWaveReader + Public Shared _loop As WaveStream Public Shared Property MasterVolume As Single = 1.0F Public Shared ReadOnly Property CurrentSong As SongContainer @@ -48,33 +111,63 @@ Public Class MusicManager Set(value As Boolean) If _muted <> value Then _muted = value - MediaPlayer.IsMuted = value If _muted = True Then - MediaPlayer.Pause() - Core.GameMessage.ShowMessage(Localization.GetString("game_message_music_off"), 12, FontManager.MainFont, Color.White) + If outputDevice IsNot Nothing Then + Volume = 0.0F + Core.GameMessage.ShowMessage(Localization.GetString("game_message_audio_off"), 12, FontManager.MainFont, Color.White) + End If + Else - ResumePlayback() - Core.GameMessage.ShowMessage(Localization.GetString("game_message_music_on"), 12, FontManager.MainFont, Color.White) + If outputDevice IsNot Nothing Then + If _isPausedForSound = True Then + _muted = True + Volume = 0.0F + Else + Volume = 1.0F + Core.GameMessage.ShowMessage(Localization.GetString("game_message_audio_on"), 12, FontManager.MainFont, Color.White) + End If + End If End If End If End Set End Property + Public Shared Property Paused As Boolean + Get + Return _paused + End Get + Set(value As Boolean) + If _paused <> value Then + _paused = value + If _paused = True Then + If outputDevice IsNot Nothing Then + outputDevice.Pause() + _introMuteTime = Date.Now + End If + Else + ResumePlayback() + End If + End If + End Set + End Property Public Shared Sub Setup() MasterVolume = 1.0F - MediaPlayer.Volume = MasterVolume - _volume = 1.0F + If Muted = True Then + Volume = 0.0F + Else + Volume = 1.0F + End If _nextSong = "" _fadeSpeed = DEFAULT_FADE_SPEED _isFadingOut = False _isFadingIn = False - _muted = MediaPlayer.IsMuted - MediaPlayer.IsRepeating = True + _isLooping = True End Sub Public Shared Sub Clear() _songs.Clear() + LoadMusic(False) End Sub Public Shared Sub ClearCurrentlyPlaying() @@ -93,18 +186,20 @@ Public Class MusicManager Public Shared Sub Update() If _isPausedForSound Then If Date.Now >= _pausedUntil Then - _isPausedForSound = False - ResumePlayback() + If MusicManager.Paused = True Then + _isPausedForSound = False + ResumePlayback() + End If End If - Else + Else ' fading If _isFadingOut Then - _volume -= _fadeSpeed + Volume -= _fadeSpeed - If _volume <= 0F Then + If Volume <= 0F Then - _volume = 0F + Volume = 0F _isFadingOut = False _isFadingIn = True @@ -117,11 +212,10 @@ Public Class MusicManager If _fadeIntoIntro Then _fadeIntoIntro = False - _introEndTime = Date.Now.AddSeconds(0.1) + song.Song.Duration + _introEndTime = Date.Now + song.Duration _isIntroStarted = True - 'MediaPlayer.IsRepeating = False Else - MediaPlayer.IsRepeating = True + _isLooping = True End If Else @@ -130,10 +224,14 @@ Public Class MusicManager _fadeIntoIntro = False ClearCurrentlyPlaying() _isFadingIn = False - _volume = 1.0F + If Muted = True Then + Volume = 0.0F + Else + Volume = 1.0F + End If If _nextSong = NO_MUSIC Then - MusicManager.Stop() _nextSong = "" + MusicManager.Stop() End If End If @@ -141,94 +239,123 @@ Public Class MusicManager End If ElseIf _isFadingIn Then - - _volume += _fadeSpeed - - If _volume >= 1.0F Then - _volume = 1.0F + If Muted = True Then + Volume = 0.0F _isFadingIn = False + Else + Volume += _fadeSpeed + If Volume >= 1.0F Then + Volume = 1.0F + _isFadingIn = False + End If End If - End If ' intro If _isIntroStarted Then - - If Date.Now >= _introEndTime Then - MediaPlayer.Pause() - Dim song = GetSong(_introContinueSong) - MediaPlayer.IsRepeating = True - _isIntroStarted = False - Play(song) - + If Muted = False Then + If Date.Now >= _introEndTime Then + Dim song = GetSong(_introContinueSong) + _isLooping = True + _isIntroStarted = False + Play(song) + End If End If - End If - End If - If Core.GameInstance.IsActive AndAlso _lastVolume <> (_volume * MasterVolume) Then + If Core.GameInstance.IsActive AndAlso _lastVolume <> (Volume * MasterVolume) Then UpdateVolume() End If End Sub Public Shared Sub UpdateVolume() - MediaPlayer.Volume = _volume * MasterVolume - _lastVolume = _volume * MasterVolume + _lastVolume = Volume * MasterVolume + If Not outputDevice Is Nothing Then + outputDevice.Volume = Volume * MasterVolume + End If End Sub Public Shared Sub PauseForSound(ByVal sound As SoundEffect) _isPausedForSound = True _pausedUntil = Date.Now + sound.Duration - MediaPlayer.Pause() + MusicManager.Pause() End Sub Public Shared Sub Pause() - MediaPlayer.Pause() + MusicManager.Paused = True End Sub Public Shared Sub [Stop]() - MediaPlayer.Stop() + If Not outputDevice Is Nothing Then + outputDevice.Stop() + outputDevice.Dispose() + End If _isIntroStarted = False End Sub Public Shared Sub ResumePlayback() If Not _currentSong Is Nothing Then - ' if an intro was playing while the media player was paused, calc its end time - If MediaPlayer.State = MediaState.Paused AndAlso _isIntroStarted Then - - _introEndTime = Date.Now + (_currentSong.Song.Duration - MediaPlayer.PlayPosition) + If outputDevice IsNot Nothing Then + ' if an intro was playing while the music player was paused, calculate its end time + If outputDevice.PlaybackState = PlaybackState.Paused AndAlso _isIntroStarted Then + Dim pauseTime As TimeSpan = Date.Now.Subtract(_introMuteTime) + _introEndTime = _introEndTime + pauseTime + End If + outputDevice.Play() End If - - MediaPlayer.Resume() - End If + End Sub Private Shared Sub Play(song As SongContainer) - MediaPlayer.Stop() - - If Not song Is Nothing Then - Logger.Debug($"Play song [{song.Name}]") - - ' We wait here for a short amount of time before playing the song - ' to mitigate an issue with the mediaplayer: without a timespan arg it sometimes does not play the song - ' and when started from 0, it plays the last few frames of the song and then starts at the beginning - MediaPlayer.Play(song.Song, New TimeSpan(0, 0, 0, 0, 25)) ' 25ms - - If MediaPlayer.IsMuted Then - MediaPlayer.Pause() + If _isLooping = True Then + If Not song Is Nothing Then + Logger.Debug($"Play song [{song.Name}]") + If Not outputDevice Is Nothing Then + outputDevice.Dispose() + End If + outputDevice = New WaveOutEvent() + audioFile = New VorbisWaveReader(song.Song) + _loop = New LoopStream(audioFile) + outputDevice.Init(_loop) + If Paused = False Then + outputDevice.Play() + End If + outputDevice.Volume = Volume * MasterVolume + _currentSongExists = True + _currentSongName = song.Name + _currentSong = song + Else + _currentSongExists = False + _currentSongName = NO_MUSIC + _currentSong = Nothing End If - - _currentSongExists = True - _currentSongName = song.Name - _currentSong = song Else - _currentSongExists = False - _currentSongName = NO_MUSIC - _currentSong = Nothing + If Not song Is Nothing Then + Logger.Debug($"Play song [{song.Name}]") + If Not outputDevice Is Nothing Then + outputDevice.Dispose() + End If + + outputDevice = New WaveOutEvent() + audioFile = New VorbisWaveReader(song.Song) + _loop = New LoopStream(audioFile, False) + outputDevice.Init(_loop) + If Paused = False Then + outputDevice.Play() + End If + outputDevice.Volume = Volume * MasterVolume + _currentSongExists = True + _currentSongName = song.Name + _currentSong = song + Else + _currentSongExists = False + _currentSongName = NO_MUSIC + _currentSong = Nothing + End If End If End Sub @@ -247,11 +374,11 @@ Public Class MusicManager Return Play(song, False, DEFAULT_FADE_SPEED) End Function - Public Shared Function Play(song As String, playIntro As Boolean) As SongContainer + Public Shared Function Play(song As String, playIntro As Boolean, Optional loopSong As Boolean = True) As SongContainer Return Play(song, playIntro, DEFAULT_FADE_SPEED) End Function - Public Shared Function Play(song As String, playIntro As Boolean, fadeSpeed As Single) As SongContainer + Public Shared Function Play(song As String, playIntro As Boolean, fadeSpeed As Single, Optional loopSong As Boolean = True) As SongContainer Dim playedSong As SongContainer = Nothing @@ -261,31 +388,33 @@ Public Class MusicManager If currentSong = NO_MUSIC OrElse currentSong <> songName Then - If playIntro Then - + If playIntro = True Then + _isLooping = False Dim introSong = GetSong("intro\" + songName) If Not introSong Is Nothing Then + If introSong.Origin = GetSong(songName).Origin Then - ' play the intro - ' setup the continue song - _introContinueSong = songName - ' do not repeat media player, do not want intro to loop - 'MediaPlayer.IsRepeating = False + ' play the intro + ' setup the continue song + _introContinueSong = songName + ' do not repeat media player, do not want intro to loop + '_isLooping = False - If fadeSpeed > 0F Then - _isIntroStarted = False - _fadeIntoIntro = True - FadeInto(introSong, fadeSpeed) - Else - _isIntroStarted = True - _introEndTime = Date.Now.AddSeconds(0) + introSong.Song.Duration - Play(introSong) + If fadeSpeed > 0F Then + _isIntroStarted = False + _fadeIntoIntro = True + FadeInto(introSong, fadeSpeed) + Else + _isIntroStarted = True + _introEndTime = Date.Now + introSong.Duration + Play(introSong) + End If + + playedSong = introSong + + ' load the next song so the end of the intro doesn't lag + GetSong(song) End If - - playedSong = introSong - - ' load the next song so the end of the intro doesn't lag - GetSong(song) Else _isIntroStarted = False _fadeIntoIntro = False @@ -297,19 +426,23 @@ Public Class MusicManager ' intro was not requested or does not exist If Not _isIntroStarted AndAlso Not _fadeIntoIntro Then - + If loopSong = True Then + _isLooping = True + Else + _isLooping = False + End If Dim nextSong = GetSong(song) If fadeSpeed > 0F Then FadeInto(nextSong, fadeSpeed) Else Play(nextSong) End If - MediaPlayer.IsRepeating = True + playedSong = nextSong - End If + End If - End If + End If Return playedSong @@ -343,54 +476,27 @@ Public Class MusicManager Private Shared Function GetSong(songName As String) As SongContainer Dim key = GetSongName(songName) - Dim iSong As SongContainer = Nothing - If Not _songs.TryGetValue(key, iSong) Then - - Dim songFilePath = Path.Combine(GameController.GamePath, "Content", "Songs", key + ".wma") - Dim songPath = Path.Combine("Songs", key) - + If _songs.ContainsKey(key) = True Then + Return _songs(key) + Else + Dim defaultSongFilePath = GameController.GamePath & "\Content\" & "Songs\" & key & ".ogg" + Dim songFilePath = GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "Songs\" & key & ".ogg" If File.Exists(songFilePath) Then - Dim _song As Song = Content.Load(Of Song)(songPath) - Dim duration = _song.Duration - 'Dim duration = GetSongDuration(songFilePath) - iSong = New SongContainer(_song, key, duration) - _songs.Add(key, iSong) + If AddSong(key, False) = True Then + Return _songs(key) + End If + ElseIf File.Exists(defaultSongFilePath) Then + If AddSong(key, False) = True Then + Return _songs(key) + End If + Else + Logger.Log(Logger.LogTypes.Warning, "MusicManager.vb: Cannot find music file """ & songName & """. Return nothing.") End If - + Return Nothing End If - Return iSong - End Function - Private Shared Function GetSongDuration(fileName As String) As TimeSpan - - Dim duration As Double = 0 - Dim sampleFrequency = 0 - - Using stream = New FileStream(fileName, FileMode.Open) - Dim frame = NAudio.Wave.Mp3Frame.LoadFromStream(stream) - If Not frame Is Nothing Then - - sampleFrequency = frame.SampleRate - - End If - - While Not frame Is Nothing - - duration += frame.SampleCount / sampleFrequency - frame = NAudio.Wave.Mp3Frame.LoadFromStream(stream) - - End While - - End Using - - Dim seconds = CType(duration, Integer) - Dim milliseconds = CType((duration - seconds) * 1000, Integer) - - Return New TimeSpan(0, 0, 0, seconds, milliseconds) - - End Function Private Shared Function GetSongName(song As String) As String Dim key = song.ToLowerInvariant() @@ -401,6 +507,95 @@ Public Class MusicManager Return key End Function + Private Shared Function AddSong(ByVal Name As String, ByVal forceReplace As Boolean) As Boolean + Try + Dim cContent As ContentManager = ContentPackManager.GetContentManager("Songs\" & Name, ".ogg") + + Dim loadSong As Boolean = False + Dim removeSong As Boolean = False + + If _songs.ContainsKey(GetSongName(Name)) = False Then + loadSong = True + ElseIf forceReplace = True And _songs(GetSongName(Name)).IsStandardSong = True Then + removeSong = True + loadSong = True + End If + + If loadSong = True Then + Dim songFilePath As String = Nothing + + If System.IO.File.Exists(GameController.GamePath & "\" & cContent.RootDirectory & "\Songs\" & Name & ".ogg") = True Then + songFilePath = GameController.GamePath & "\" & cContent.RootDirectory & "\Songs\" & Name & ".ogg" + Else + Logger.Log(Logger.LogTypes.Warning, "MusicManager.vb: Song at """ & GameController.GamePath & "\" & cContent.RootDirectory & "\Songs\" & Name & """ was not found!") + Return False + End If + + If Not songFilePath Is Nothing Then + If removeSong = True Then + _songs.Remove(GetSongName(Name)) + End If + Dim Duration = GetSongDuration(songFilePath) + _songs.Add(GetSongName(Name), New SongContainer(songFilePath, Name, Duration, cContent.RootDirectory)) + End If + End If + Catch ex As Exception + Logger.Log(Logger.LogTypes.Warning, "MusicManager.vb: File at ""Songs\" & Name & """ is not a valid song file!") + Return False + End Try + Return True + End Function + + Public Shared Sub LoadMusic(ByVal forceReplace As Boolean) + For Each musicFile As String In System.IO.Directory.GetFiles(GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "Songs\", "*.*", IO.SearchOption.AllDirectories) + If musicFile.EndsWith(".ogg") = True Then + Dim isIntro As Boolean = False + If musicFile.Contains("\Songs\intro\") = True Then + isIntro = True + End If + + If isIntro = False Then + musicFile = System.IO.Path.GetFileNameWithoutExtension(musicFile) + Else + musicFile = "intro\" & System.IO.Path.GetFileNameWithoutExtension(musicFile) + End If + + AddSong(musicFile, forceReplace) + End If + Next + If Core.GameOptions.ContentPackNames.Count > 0 Then + For Each c As String In Core.GameOptions.ContentPackNames + Dim path As String = GameController.GamePath & "\ContentPacks\" & c & "\Songs\" + If System.IO.Directory.Exists(path) = True Then + For Each musicFile As String In System.IO.Directory.GetFiles(path, "*.*", IO.SearchOption.AllDirectories) + If musicFile.EndsWith(".ogg") = True Then + Dim isIntro As Boolean = False + If musicFile.Contains("\Songs\intro\") = True Then + isIntro = True + End If + + If isIntro = False Then + musicFile = System.IO.Path.GetFileNameWithoutExtension(musicFile) + Else + musicFile = "intro\" & System.IO.Path.GetFileNameWithoutExtension(musicFile) + End If + AddSong(musicFile, forceReplace) + End If + Next + End If + Next + End If + End Sub + + Private Shared Function GetSongDuration(songFilePath As String) As TimeSpan + + Dim DurationFile As VorbisWaveReader = New VorbisWaveReader(songFilePath) + Dim SongDuration = DurationFile.TotalTime + DurationFile.Dispose() + Return SongDuration + + End Function + Private Shared ReadOnly Property SongAliasMap As Dictionary(Of String, String) Get Return New Dictionary(Of String, String)() From diff --git a/P3D/Resources/Sound/SongContainer.vb b/P3D/Resources/Sound/SongContainer.vb index 3e2f4842a..07bd63704 100644 --- a/P3D/Resources/Sound/SongContainer.vb +++ b/P3D/Resources/Sound/SongContainer.vb @@ -2,15 +2,23 @@ ' also because when loading songs from uris, it doesn't calculate its duration Public Class SongContainer - Public Song As Song + Public Song As String Public Name As String + Public Origin As String + Public Duration As TimeSpan - Public Sub New(song As Song, name As String, duration As TimeSpan) + Public Sub New(song As String, name As String, duration As TimeSpan, origin As String) Me.Song = song Me.Name = name - - Dim durationField = song.GetType().GetField("_duration", Reflection.BindingFlags.Instance Or Reflection.BindingFlags.NonPublic) - durationField.SetValue(song, duration) + Me.Origin = origin + Me.Duration = duration End Sub + + Public ReadOnly Property IsStandardSong() As Boolean + Get + Return (Me.Origin = "Content") + End Get + End Property + End Class diff --git a/P3D/Resources/Sound/SoundContainer.vb b/P3D/Resources/Sound/SoundContainer.vb new file mode 100644 index 000000000..933b62fc5 --- /dev/null +++ b/P3D/Resources/Sound/SoundContainer.vb @@ -0,0 +1,36 @@ +'Created to support ContentPack SFX +Public Class SoundContainer + + Public _sound As SoundEffect + Public _origin As String + + Public Sub New(sound As SoundEffect, origin As String) + Me._sound = sound + Me._origin = origin + End Sub + + Public Property Sound() As SoundEffect + Get + Return Me._sound + End Get + Set(value As SoundEffect) + Me._sound = value + End Set + End Property + + Public Property Origin() As String + Get + Return Me._origin + End Get + Set(value As String) + Me._origin = value + End Set + End Property + + Public ReadOnly Property IsStandardSound() As Boolean + Get + Return (Me.Origin = "Content") + End Get + End Property + +End Class diff --git a/P3D/Resources/Sound/SoundManager.vb b/P3D/Resources/Sound/SoundManager.vb index ee32df409..f5a529b7b 100644 --- a/P3D/Resources/Sound/SoundManager.vb +++ b/P3D/Resources/Sound/SoundManager.vb @@ -1,8 +1,8 @@ Public Class SoundManager - Const POKEMON_CRY_VOLUME_MULTIPLIER As Single = 0.6F + Const POKEMON_CRY_VOLUME_MULTIPLIER As Single = 1.0F - Shared _sounds As Dictionary(Of String, SoundEffect) = New Dictionary(Of String, SoundEffect) + Shared _sounds As Dictionary(Of String, SoundContainer) = New Dictionary(Of String, SoundContainer) Public Shared Volume As Single = 1.0F Public Shared Muted As Boolean = False @@ -12,8 +12,53 @@ Return GetAudioOutputDevices() > 0 End Function + Private Shared Function AddSound(ByVal Name As String, ByVal forceReplace As Boolean) As Boolean + Try + Dim cContent As ContentManager = ContentPackManager.GetContentManager("Sounds\" & Name, ".xnb,.wav") + + Dim loadSound As Boolean = False + Dim removeSound As Boolean = False + + If _sounds.ContainsKey(Name.ToLower()) = False Then + loadSound = True + ElseIf forceReplace = True And _sounds(Name.ToLower()).IsStandardSound = True Then + removeSound = True + loadSound = True + End If + + If loadSound = True Then + Dim sound As SoundEffect = Nothing + + If System.IO.File.Exists(GameController.GamePath & "\" & cContent.RootDirectory & "\Sounds\" & Name & ".xnb") = False Then + If System.IO.File.Exists(GameController.GamePath & "\" & cContent.RootDirectory & "\Sounds\" & Name & ".wav") = True Then + Using stream As System.IO.Stream = System.IO.File.Open(GameController.GamePath & "\" & cContent.RootDirectory & "\Sounds\" & Name & ".wav", IO.FileMode.OpenOrCreate) + sound = SoundEffect.FromStream(stream) + End Using + Else + Logger.Log(Logger.LogTypes.Warning, "SoundManager.vb: Sound at """ & GameController.GamePath & "\" & cContent.RootDirectory & "\Songs\" & Name & """ was not found!") + Return False + End If + Else + sound = cContent.Load(Of SoundEffect)("Sounds\" & Name) + End If + + If Not sound Is Nothing Then + If removeSound = True Then + _sounds.Remove(Name.ToLower()) + End If + _sounds.Add(Name.ToLower(), New SoundContainer(sound, cContent.RootDirectory)) + End If + End If + Catch ex As Exception + Logger.Log(Logger.LogTypes.Warning, "SoundManager.vb: File at ""Sounds\" & Name & """ is not a valid sound file. They have to be a PCM wave file, mono or stereo, 8 or 16 bit and have to have a sample rate between 8k and 48k Hz.") + Return False + End Try + Return True + End Function + Public Shared Sub Clear() _sounds.Clear() + LoadSounds(False) End Sub Public Shared Sub PlaySound(soundFile As String) @@ -29,23 +74,8 @@ If Not Muted Then Dim key = soundFile.ToLowerInvariant() - Dim sound As SoundEffect = Nothing - If Not _sounds.TryGetValue(key, sound) Then - - ' load sound - Dim filePath = Path.Combine(GameController.GamePath, "Content\Sounds", soundFile & ".wav") - If File.Exists(filePath) Then - Using stream As New FileStream(filePath, FileMode.OpenOrCreate) - Try - sound = SoundEffect.FromStream(stream) - _sounds.Add(key, sound) - Catch ex As Exception - Logger.Log(Logger.LogTypes.ErrorMessage, "Failed to load sound at """ & soundFile & """: " & ex.Message) - End Try - End Using - End If - - End If + Dim sound As SoundContainer = Nothing + sound = GetSoundEffect(key) If sound IsNot Nothing Then @@ -53,10 +83,10 @@ Logger.Debug("SoundEffect [" & soundFile & "]") - sound.Play(volume, pitch, pan) + sound.Sound.Play(volume, pitch, pan) If stopMusic = True Then - MusicManager.PauseForSound(sound) + MusicManager.PauseForSound(sound.Sound) End If Else @@ -83,4 +113,54 @@ PlaySound("Cries\" + pokemonId.ToString(), pitch, pan, volume * POKEMON_CRY_VOLUME_MULTIPLIER, False) End Sub + Public Shared Sub LoadSounds(ByVal forceReplace As Boolean) + For Each soundfile As String In System.IO.Directory.GetFiles(GameController.GamePath & "\Content\Sounds\") + If soundfile.EndsWith(".wav") = True Then + soundfile = System.IO.Path.GetFileNameWithoutExtension(soundfile) + AddSound(soundfile, forceReplace) + End If + Next + If Core.GameOptions.ContentPackNames.Count > 0 Then + For Each c As String In Core.GameOptions.ContentPackNames + Dim path As String = GameController.GamePath & "\ContentPacks\" & c & "\Sounds\" + + If System.IO.Directory.Exists(path) = True Then + For Each soundfile As String In System.IO.Directory.GetFiles(path, "*.*", IO.SearchOption.AllDirectories) + If soundfile.EndsWith(".wav") = True Then + soundfile = System.IO.Path.GetFileNameWithoutExtension(soundfile) + AddSound(soundfile, forceReplace) + End If + Next + End If + Next + End If + End Sub + + Private Shared Function GetSoundEffect(ByVal Name As String) As SoundContainer + + If _sounds.ContainsKey(Name.ToLower()) = True Then + Return _sounds(Name.ToLower()) + Else + If TryAddGameModeSound(Name) = True Then + Return _sounds(Name.ToLower()) + Else + Logger.Log(Logger.LogTypes.Warning, "SoundManager.vb: Cannot find sound file """ & Name & """. Return nothing.") + Return Nothing + End If + End If + End Function + + Private Shared Function TryAddGameModeSound(ByVal Name As String) As Boolean + Dim defaultSoundFilePath As String = GameController.GamePath & "\Content\" & "Sounds\" & Name & ".wav" + Dim soundFilePath As String = GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "Sounds\" & Name & ".wav" + If System.IO.File.Exists(soundFilePath) = True Then + Return AddSound(Name, False) + Else + If System.IO.File.Exists(defaultSoundFilePath) = True Then + Return AddSound(Name, False) + End If + End If + Return False + End Function + End Class \ No newline at end of file diff --git a/P3D/Screens/Battle/BattleCatchScreen.vb b/P3D/Screens/Battle/BattleCatchScreen.vb index f798c5905..41fa29134 100644 --- a/P3D/Screens/Battle/BattleCatchScreen.vb +++ b/P3D/Screens/Battle/BattleCatchScreen.vb @@ -322,7 +322,7 @@ If BattleSystem.BattleScreen.DiveBattle = True Then BallRate = 3.5F End If - Case "lure ball" + Case "lure ball" If BattleSystem.BattleScreen.DiveBattle = True Then BallRate = 5.0F End If diff --git a/P3D/Screens/Battle/BattleGrowStatsScreen.vb b/P3D/Screens/Battle/BattleGrowStatsScreen.vb index 3f438a0af..7532b2c81 100644 --- a/P3D/Screens/Battle/BattleGrowStatsScreen.vb +++ b/P3D/Screens/Battle/BattleGrowStatsScreen.vb @@ -90,6 +90,7 @@ If Controls.Accept() = True Then If Delay >= 13.0F Then + SoundManager.PlaySound("select") Core.SetScreen(Me.PreScreen) End If End If diff --git a/P3D/Screens/Battle/BlackOutScreen.vb b/P3D/Screens/Battle/BlackOutScreen.vb index 0aad1a842..89dcba0fc 100644 --- a/P3D/Screens/Battle/BlackOutScreen.vb +++ b/P3D/Screens/Battle/BlackOutScreen.vb @@ -34,6 +34,7 @@ Public Overrides Sub Update() If Me.IsGameOver = True Then If Controls.Accept(True, False) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New PressStartScreen()) Core.Player.loadedSave = False End If diff --git a/P3D/Screens/BattleIntroScreen.vb b/P3D/Screens/BattleIntroScreen.vb index 781ab0f25..5a44c3edc 100644 --- a/P3D/Screens/BattleIntroScreen.vb +++ b/P3D/Screens/BattleIntroScreen.vb @@ -294,7 +294,6 @@ If Me.minDelay = 0.0F And SongOver() Then Core.SetScreen(Me.NewScreen) If Me.NewScreen.GetType() Is GetType(BattleSystem.BattleScreen) Then - MediaPlayer.IsRepeating = True Dim b As BattleSystem.BattleScreen = CType(Me.NewScreen, BattleSystem.BattleScreen) @@ -342,12 +341,12 @@ End Sub Private Sub UpdateFaceshotIntro() - Me.barOffset += 14 - Me.blackPosition = (Me.blackPosition + 6).Clamp(0, CInt(Core.windowSize.Height / 2 - 128)) + Me.barOffset += 18 + Me.blackPosition = (Me.blackPosition + 10).Clamp(0, CInt(Core.windowSize.Height / 2 - 128)) If blackPosition >= CInt(Core.windowSize.Height / 2 - 128) Then - trainerPosition = (trainerPosition + 16).Clamp(0, 420) + trainerPosition = (trainerPosition + 20).Clamp(0, 420) If trainerPosition >= 420 Then - textPosition += CInt(Math.Ceiling(Core.windowSize.Width / 75)) + textPosition += CInt(Math.Ceiling(Core.windowSize.Width / 50)) If textPosition >= CInt(Core.windowSize.Width / 2 - CInt(FontManager.InGameFont.MeasureString(Trainer.Name).X) / 2) + 1200 Then Me.ready = True End If @@ -505,20 +504,18 @@ Player.Temp.BeforeBattlePosition = Screen.Camera.Position Player.Temp.BeforeBattleLevelFile = Screen.Level.LevelFile Player.Temp.BeforeBattleFacing = Screen.Camera.GetPlayerFacingDirection() - MusicManager.Play(MusicLoop, False, 0F) - MediaPlayer.IsRepeating = False + MusicManager.Play(MusicLoop, False, 0F, False) If Not MusicManager.CurrentSong Is Nothing Then - Me.duration = MusicManager.CurrentSong.Song.Duration + Me.duration = MusicManager.CurrentSong.Duration Else Me.duration = New TimeSpan(0) End If - Me.startTime = Date.Now End Sub Private Function SongOver() As Boolean - Return startTime + duration < Date.Now.AddSeconds(1) + Return startTime + duration < Date.Now.AddSeconds(0.1) End Function 'Protected Overrides Sub Finalize() diff --git a/P3D/Screens/Credits/CreditsScreen.vb b/P3D/Screens/Credits/CreditsScreen.vb index c22e940a6..fd580f944 100644 --- a/P3D/Screens/Credits/CreditsScreen.vb +++ b/P3D/Screens/Credits/CreditsScreen.vb @@ -44,8 +44,7 @@ Public Class CreditsScreen ExecuteCameraLevel() - MusicManager.Play("credits", True) - MediaPlayer.IsRepeating = False + MusicManager.Play("credits", True, False) End Sub ' The text that shows during the credits: @@ -135,6 +134,7 @@ Public Class CreditsScreen If TheEnd = True Then If Controls.Accept(True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, Color.Black, False, AddressOf ChangeSavedScreen)) End If End If @@ -284,11 +284,11 @@ Public Class CreditsScreen End Class Public Overrides Sub ChangeFrom() - MediaPlayer.IsRepeating = True + MusicManager._isLooping = True End Sub Public Overrides Sub ChangeTo() - MediaPlayer.IsRepeating = False + MusicManager._isLooping = False End Sub End Class \ No newline at end of file diff --git a/P3D/Screens/GUI/InputScreen.vb b/P3D/Screens/GUI/InputScreen.vb index 3852f5a63..a435f9113 100644 --- a/P3D/Screens/GUI/InputScreen.vb +++ b/P3D/Screens/GUI/InputScreen.vb @@ -375,6 +375,7 @@ If Controls.Accept(True, False, False) = True And New Rectangle(CInt(p.X), CInt(p.Y), Size, RasterSize).Contains(MouseHandler.MousePosition) = True Then If Selector = Me.RelPosition Then enterKey = True + SoundManager.PlaySound("select") Else Selector = Me.RelPosition End If @@ -382,11 +383,13 @@ If Controls.Accept(False, False, True) = True Then If Selector = Me.RelPosition Then enterKey = True + SoundManager.PlaySound("select") End If End If If KeyBoardHandler.KeyPressed(Keys.Enter) = True Then If Selector = Me.RelPosition Then enterKey = True + SoundManager.PlaySound("select") End If End If diff --git a/P3D/Screens/Inventory/ApricornScreen.vb b/P3D/Screens/Inventory/ApricornScreen.vb index d1e721a6c..100d9809b 100644 --- a/P3D/Screens/Inventory/ApricornScreen.vb +++ b/P3D/Screens/Inventory/ApricornScreen.vb @@ -107,6 +107,7 @@ If Me.Buttons.Count > 0 Then If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.Buttons(Me.CursorIndex).Click() End If End If diff --git a/P3D/Screens/Inventory/NewInventoryScreen.vb b/P3D/Screens/Inventory/NewInventoryScreen.vb index a6915a435..9933b96b0 100644 --- a/P3D/Screens/Inventory/NewInventoryScreen.vb +++ b/P3D/Screens/Inventory/NewInventoryScreen.vb @@ -694,10 +694,12 @@ Public Class NewInventoryScreen If Not TextBox.Showing Then If Controls.Accept Then + SoundManager.PlaySound("select") Core.Player.Inventory.RemoveItem(cItem.ID, _tossValue) LoadItems() _tossingItems = False ElseIf Controls.Dismiss Then + SoundManager.PlaySound("select") _tossingItems = False End If _tossValue = 1 @@ -752,9 +754,11 @@ Public Class NewInventoryScreen End If If _tabInControl Then If Controls.Dismiss() And CanExit Then + SoundManager.PlaySound("select") _closing = True End If If Controls.Accept() And _items.Length > 0 Then + SoundManager.PlaySound("select") _tabInControl = False End If End If @@ -813,11 +817,13 @@ Public Class NewInventoryScreen If Controls.Accept() AndAlso _items.Length > 0 Then _infoItemOptionSelection = 0 _isInfoShowing = True + SoundManager.PlaySound("select") SetInfoSettings() SetItemOptions() End If If Controls.Dismiss() Then + SoundManager.PlaySound("select") _tabInControl = True End If End Sub @@ -855,10 +861,12 @@ Public Class NewInventoryScreen End If If Controls.Accept() Then + SoundManager.PlaySound("select") SelectedItemOption() End If If Controls.Dismiss() Then + SoundManager.PlaySound("select") CloseInfoScreen() End If End Sub diff --git a/P3D/Screens/Inventory/PokegearScreen.vb b/P3D/Screens/Inventory/PokegearScreen.vb index b393cdb1a..40e3fc00d 100644 --- a/P3D/Screens/Inventory/PokegearScreen.vb +++ b/P3D/Screens/Inventory/PokegearScreen.vb @@ -312,6 +312,7 @@ If pressedIndex > -1 Then If FunctionList.Count - 1 >= pressedIndex Then If Cursors(0) = pressedIndex Then + SoundManager.PlaySound("select") PressedMainMenuButton() Else Cursors(0) = pressedIndex @@ -321,6 +322,7 @@ End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") PressedMainMenuButton() End If @@ -524,6 +526,7 @@ Dim r As New Rectangle(CInt(startPos.X + 45), CInt(startPos.Y + 80 + i * 35), 510, 32) If r.Contains(MouseHandler.MousePosition) Then If RankListSelect = i + RankListScroll Then + SoundManager.PlaySound("select") PSSRanklistDisplayUser() Else RankListSelect = i + RankListScroll @@ -544,6 +547,7 @@ RankListSelect = RankListSelect.Clamp(0, RankingList.Count - 1) If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") PSSRanklistDisplayUser() End If End If @@ -718,6 +722,7 @@ Dim r As New Rectangle(CInt(startPos.X + 45), CInt(startPos.Y + 80 + i * 35), 510, 32) If r.Contains(MouseHandler.MousePosition) Then If FriendListSelect = i + FriendListScroll Then + SoundManager.PlaySound("select") PSSFriendlistDisplayUser() Else FriendListSelect = i + FriendListScroll @@ -738,6 +743,7 @@ FriendListSelect = FriendListSelect.Clamp(0, FriendList.Count - 1) If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") PSSFriendlistDisplayUser() End If End If @@ -932,6 +938,7 @@ Dim r As New Rectangle(CInt(startPos.X + 45), CInt(startPos.Y + 80 + i * 35), 510, 32) If r.Contains(MouseHandler.MousePosition) Then If LocalSelect = i + LocalScroll Then + SoundManager.PlaySound("select") PSSLocallistDisplayUser() Else LocalSelect = i + LocalScroll @@ -952,6 +959,7 @@ LocalSelect = LocalSelect.Clamp(0, LocalList.Count - 1) If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") PSSLocallistDisplayUser() End If End If @@ -1110,10 +1118,12 @@ Select Case Cursors(1) Case 0 If sameServer = True Then + SoundManager.PlaySound("select") Core.SetScreen(New PVPLobbyScreen(Core.CurrentScreen, UserNetworkID, True)) End If Case 1 If sameServer = True And sameConnection = True Then + SoundManager.PlaySound("select") Core.SetScreen(New DirectTradeScreen(Core.CurrentScreen, UserNetworkID, True)) End If Case 2 @@ -1128,6 +1138,7 @@ End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") menuIndex = UserViewPreMenu End If End Sub @@ -1218,6 +1229,7 @@ Dim r As New Rectangle(CInt(startPos.X + 45), CInt(startPos.Y + 80 + i * 35), 510, 32) If r.Contains(MouseHandler.MousePosition) Then If PhoneSelect = i + PhoneScroll Then + SoundManager.PlaySound("select") SelectPhoneContact() Else PhoneSelect = i + PhoneScroll @@ -1238,11 +1250,13 @@ PhoneSelect = PhoneSelect.Clamp(0, PhoneContacts.Count - 1) If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") SelectPhoneContact() End If End If End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") menuIndex = MenuScreens.Main End If End Sub @@ -1845,6 +1859,7 @@ End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") Me.menuIndex = MenuScreens.Main End If End Sub @@ -2009,9 +2024,11 @@ If i = Me.TradeRequestCursor Then Select Case i Case 0 + SoundManager.PlaySound("select") CloseTradeRequest() Core.SetScreen(New DirectTradeScreen(Core.CurrentScreen, TradeRequestNetworkID, False)) Case 1 + SoundManager.PlaySound("select") CloseTradeRequest() End Select Else @@ -2024,13 +2041,16 @@ If Controls.Accept(False, True, True) = True Then Select Case Me.TradeRequestCursor Case 0 + SoundManager.PlaySound("select") CloseTradeRequest() Core.SetScreen(New DirectTradeScreen(Core.CurrentScreen, TradeRequestNetworkID, False)) Case 1 + SoundManager.PlaySound("select") CloseTradeRequest() End Select End If If Controls.Dismiss() = True Then + SoundManager.PlaySound("select") CloseTradeRequest() End If End If @@ -2140,9 +2160,11 @@ If i = Me.BattleRequestCursor Then Select Case i Case 0 + SoundManager.PlaySound("select") CloseBattleRequest() Core.SetScreen(New PVPLobbyScreen(Core.CurrentScreen, BattleRequestNetworkID, False)) Case 1 + SoundManager.PlaySound("select") CloseBattleRequest() End Select Else @@ -2155,13 +2177,16 @@ If Controls.Accept(False, True, True) = True Then Select Case Me.BattleRequestCursor Case 0 + SoundManager.PlaySound("select") CloseBattleRequest() Core.SetScreen(New PVPLobbyScreen(Core.CurrentScreen, BattleRequestNetworkID, False)) Case 1 + SoundManager.PlaySound("select") CloseBattleRequest() End Select End If If Controls.Dismiss() = True Then + SoundManager.PlaySound("select") CloseBattleRequest() End If End If diff --git a/P3D/Screens/MainMenu/AddServerScreen.vb b/P3D/Screens/MainMenu/AddServerScreen.vb index 7ed1dda47..32a5b024f 100644 --- a/P3D/Screens/MainMenu/AddServerScreen.vb +++ b/P3D/Screens/MainMenu/AddServerScreen.vb @@ -165,8 +165,10 @@ If ButtonIndex = i Then If Controls.Accept(True, False, False) = True Then If i = 0 Then + SoundManager.PlaySound("select") ButtonDone() Else + SoundManager.PlaySound("select") ButtonCancel() End If End If @@ -199,15 +201,18 @@ Select Case ButtonIndex Case 0 If Controls.Accept(False, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Enter) = True Then + SoundManager.PlaySound("select") ButtonDone() End If Case 1 If Controls.Accept(False, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Enter) = True Then + SoundManager.PlaySound("select") ButtonCancel() End If End Select If Controls.Dismiss(True, False, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(Me.PreScreen) End If End Sub diff --git a/P3D/Screens/MainMenu/JoinServerScreen.vb b/P3D/Screens/MainMenu/JoinServerScreen.vb index 82e2bc284..981f754b6 100644 --- a/P3D/Screens/MainMenu/JoinServerScreen.vb +++ b/P3D/Screens/MainMenu/JoinServerScreen.vb @@ -196,16 +196,22 @@ Public Class JoinServerScreen If MouseHandler.ButtonPressed(MouseHandler.MouseButtons.LeftButton) = True AndAlso MouseHandler.ButtonPressed(MouseHandler.MouseButtons.RightButton) = False Then Select Case Me.buttonIndex Case 0 + SoundManager.PlaySound("select") JoinButton() Case 1 + SoundManager.PlaySound("select") RefreshButton() Case 2 + SoundManager.PlaySound("select") AddServerButton() Case 3 + SoundManager.PlaySound("select") EditServerButton() Case 4 + SoundManager.PlaySound("select") RemoveServerButton() Case 5 + SoundManager.PlaySound("select") CancelButton() End Select End If @@ -233,16 +239,22 @@ Public Class JoinServerScreen If Controls.Accept(False, True) = True Then Select Case Me.buttonIndex Case 0 + SoundManager.PlaySound("select") JoinButton() Case 1 + SoundManager.PlaySound("select") RefreshButton() Case 2 + SoundManager.PlaySound("select") AddServerButton() Case 3 + SoundManager.PlaySound("select") EditServerButton() Case 4 + SoundManager.PlaySound("select") RemoveServerButton() Case 5 + SoundManager.PlaySound("select") CancelButton() End Select End If @@ -251,6 +263,7 @@ Public Class JoinServerScreen ''CType(Me.PreScreen, NewMainMenuScreen)._menuIndex = 0 Core.Player.Unload() Core.SetScreen(Me.PreScreen) + SoundManager.PlaySound("select") End If BarAnimationState += 1 diff --git a/P3D/Screens/MainMenu/NewNewGameScreen.vb b/P3D/Screens/MainMenu/NewNewGameScreen.vb index aeea60904..77f3ec36c 100644 --- a/P3D/Screens/MainMenu/NewNewGameScreen.vb +++ b/P3D/Screens/MainMenu/NewNewGameScreen.vb @@ -267,6 +267,7 @@ End If If Controls.Accept(False, True, True) Then + SoundManager.PlaySound("select") _selectedSkin = _skins(_index) SetScreen(PreScreen) End If @@ -274,6 +275,7 @@ For i = 0 To _skins.Count - 1 If New Rectangle(CInt(windowSize.Width / 2 - 128 + i * 280 - _index * 280 + _offset), CInt(windowSize.Height / 2 - 128), 256, 256).Contains(MouseHandler.MousePosition) Then If i = _index Then + SoundManager.PlaySound("select") _selectedSkin = _skins(_index) SetScreen(PreScreen) Else diff --git a/P3D/Screens/MainMenu/PauseScreen.vb b/P3D/Screens/MainMenu/PauseScreen.vb index c3fed6768..4a79838b3 100644 --- a/P3D/Screens/MainMenu/PauseScreen.vb +++ b/P3D/Screens/MainMenu/PauseScreen.vb @@ -123,8 +123,10 @@ If Controls.Accept(True, False) = True Then Select Case Me.mainIndex Case 0 + SoundManager.PlaySound("select") ClickContinue() Case 1 + SoundManager.PlaySound("select") ClickQuit() End Select End If @@ -137,13 +139,16 @@ If Controls.Accept(False, True) = True Then Select Case Me.mainIndex Case 0 + SoundManager.PlaySound("select") ClickContinue() Case 1 + SoundManager.PlaySound("select") ClickQuit() End Select End If If Controls.Dismiss() = True Or KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True And leftEscapeKey = True Or ControllerHandler.ButtonPressed(Buttons.Start) = True Then + SoundManager.PlaySound("select") ClickContinue() End If @@ -217,8 +222,10 @@ If Controls.Accept(True, False) = True Then Select Case Me.quitIndex Case 0 + SoundManager.PlaySound("select") ClickBack() Case 1 + SoundManager.PlaySound("select") ClickConfirmationQuit() End Select End If @@ -231,13 +238,16 @@ If Controls.Accept(False, True) = True Then Select Case Me.quitIndex Case 0 + SoundManager.PlaySound("select") ClickBack() Case 1 + SoundManager.PlaySound("select") ClickConfirmationQuit() End Select End If If Controls.Dismiss(False, True) = True Then + SoundManager.PlaySound("select") ClickBack() End If End Sub diff --git a/P3D/Screens/MainMenu/PressStartScreen.vb b/P3D/Screens/MainMenu/PressStartScreen.vb index 465aca578..c30e0f192 100644 --- a/P3D/Screens/MainMenu/PressStartScreen.vb +++ b/P3D/Screens/MainMenu/PressStartScreen.vb @@ -310,6 +310,7 @@ Public Class NewMainMenuScreen If New Rectangle(CInt(xOffset), CInt(_screenOffset.Y), 160, 160).Contains(MouseHandler.MousePosition) Then If _selectedProfile = x Then ClickedProfile() + SoundManager.PlaySound("select") Else Dim diff As Integer = x - _selectedProfile _screenOffsetTarget.X -= diff * 180 @@ -339,6 +340,7 @@ Public Class NewMainMenuScreen If New Rectangle(CInt(xOffset), CInt(_screenOffset.Y), 160, 160).Contains(MouseHandler.MousePosition) Then If _selectedProfile = x Then + SoundManager.PlaySound("select") DismissProfile() End If Exit For @@ -372,16 +374,21 @@ Public Class NewMainMenuScreen If Controls.Accept(False, True, True) Then Select Case _yIndex Case 0 + SoundManager.PlaySound("select") ClickedProfile() Case 1 + SoundManager.PlaySound("select") ButtonChangeMale() Case 2 + SoundManager.PlaySound("select") ButtonChangeFemale() Case 3 + SoundManager.PlaySound("select") ButtonResetSave() End Select End If If Controls.Dismiss(False, True, True) Then + SoundManager.PlaySound("select") DismissProfile() _yIndex = 0 End If @@ -1113,14 +1120,20 @@ Public Class GameModeSelectionScreen _index += 1 End If If Controls.Dismiss(True, True, True) Then + SoundManager.PlaySound("select") SetScreen(PreScreen) End If If Controls.Accept(True, True, True) Then GameModeManager.SetGameModePointer(_gameModes(_index).DirectoryName) - SetScreen(New Screens.MainMenu.NewNewGameScreen(PreScreen)) + SoundManager.PlaySound("select") + If GameModeManager.ActiveGameMode.IntroType = "0" Then + SetScreen(New Screens.MainMenu.NewNewGameScreen(PreScreen)) + Else + SetScreen(New TransitionScreen(Me.PreScreen, New NewGameScreen(), Color.Black, False)) + End If End If - Dim targetOffset = GetTargetOffset() + Dim targetOffset = GetTargetOffset() If _offset <> targetOffset Then _offset = MathHelper.Lerp(_offset, targetOffset, 0.25F) diff --git a/P3D/Screens/MapScreen.vb b/P3D/Screens/MapScreen.vb index 9d3eea91c..b7eb798e6 100644 --- a/P3D/Screens/MapScreen.vb +++ b/P3D/Screens/MapScreen.vb @@ -266,6 +266,7 @@ End If If Controls.Dismiss() = True Then + SoundManager.PlaySound("select") Player.Temp.MapSwitch = Me.drawObjects Core.SetScreen(New TransitionScreen(Me, Me.PreScreen, Color.Black, False)) End If @@ -566,6 +567,7 @@ "@player.wearskin([POKEMON|" & isShiny & "]" & p.Number & PokemonForms.GetOverworldAddition(p) & ")" & Environment.NewLine & "@player.turnto(2)" & Environment.NewLine & "@player.move(2)" & Environment.NewLine & + "@sound.play(Battle\Effects\effect_fly)" & Environment.NewLine & "@camera.fix" & Environment.NewLine & "@player.setmovement(0,2,3)" & Environment.NewLine & "@player.move(3)" & Environment.NewLine & @@ -576,7 +578,6 @@ "@player.warp(" & FlyToFile & "," & FlyToPosition.X.ToString().ReplaceDecSeparator() & "," & (FlyToPosition.Y - 4 + 0.1F).ToString().ReplaceDecSeparator() & "," & (FlyToPosition.Z + 6).ToString().ReplaceDecSeparator() & ",0)" & Environment.NewLine & "@camera.setyaw(0)" & Environment.NewLine & "@camera.setposition(0,-3.7,-4.5)" & Environment.NewLine & - "@sound.play(Battle\Effects\effect_fly)" & Environment.NewLine & "@level.update" & Environment.NewLine & "@player.setmovement(0,-2,-3)" & Environment.NewLine & "@screen.fadein(10)" & Environment.NewLine & diff --git a/P3D/Screens/NewGameScreen.vb b/P3D/Screens/NewGameScreen.vb index 44c789a02..7602dace4 100644 --- a/P3D/Screens/NewGameScreen.vb +++ b/P3D/Screens/NewGameScreen.vb @@ -52,8 +52,8 @@ Localization.ReloadGameModeTokens() If GameModeManager.ActiveGameMode.IsDefaultGamemode = False Then - MusicManager.LoadMusic(True) - SoundManager.LoadSounds(True) + 'MusicManager.LoadMusic(True) + 'SoundManager.LoadSounds(True) End If SmashRock.Load() Badge.Load() @@ -80,7 +80,7 @@ TextBox.reDelay = 0 skinTexture = TextureManager.GetTexture(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)), New Rectangle(0, 64, 32, 32)) - MusicManager.PlayMusic("nomusic") + MusicManager.Play("nomusic") End Sub Private Sub LoadIntroValues() @@ -121,7 +121,7 @@ If ProfAlpha < 255 And Index = 0 Then ProfAlpha += 2 If ProfAlpha >= 255 Then - MusicManager.PlayMusic(Me.introMusic, True, 0.0F, 0.0F) + MusicManager.Play(Me.introMusic, True, 0.0F) End If ElseIf ProfAlpha >= 255 Or Index > 0 Then TextBox.Update() @@ -237,7 +237,7 @@ Case 4 Canvas.DrawRectangle(New Rectangle(CInt(TextboxPosition.X - 5), CInt(TextboxPosition.Y - 24), 138, 42), New Color(0, 0, 0, 80)) - Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("new_game_choose_skin") & ":" & vbNewLine & skinNames(SkinIndex), New Vector2(TextboxPosition.X, TextboxPosition.Y - 24), Color.White) + Core.SpriteBatch.DrawString(FontManager.MiniFont, Localization.GetString("new_game_choose_skin") & ":" & Environment.NewLine & skinNames(SkinIndex), New Vector2(TextboxPosition.X, TextboxPosition.Y - 24), Color.White) Canvas.DrawScrollBar(New Vector2(TextboxPosition.X, TextboxPosition.Y + 48), startSkins.Count, 1, SkinIndex, New Size(128, 4), True, TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(112, 12, 1, 1)), TextureManager.GetTexture(TextureManager.GetTexture("GUI\Menus\Menu"), New Rectangle(113, 12, 1, 1))) End Select @@ -361,7 +361,7 @@ CanMuteMusic = False If ControllerHandler.ButtonPressed(Buttons.X) = True Then - Core.SetScreen(New InputScreen(Core.CurrentScreen, "Player", InputScreen.InputModes.Name, Me.CurrentText, 14, {TextureManager.GetTexture(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)),New Rectangle(0, 64, 32, 32))}.ToList(), AddressOf Me.ConfirmInput)) + Core.SetScreen(New InputScreen(Core.CurrentScreen, "Player", InputScreen.InputModes.Name, Me.CurrentText, 14, {TextureManager.GetTexture(TextureManager.GetTexture("Textures\NPC\" & startSkins(SkinIndex)), New Rectangle(0, 64, 32, 32))}.ToList(), AddressOf Me.ConfirmInput)) Else KeyBindings.GetNameInput(Me.CurrentText, 14) @@ -438,7 +438,7 @@ System.IO.File.WriteAllText(savePath & folderPath & "\RoamingPokemon.dat", "") System.IO.File.WriteAllText(savePath & folderPath & "\Statistics.dat", "") - Core.Player.IsGamejoltSave = False + Core.Player.IsGameJoltSave = False Core.Player.LoadGame(folderPath) Core.SetScreen(New TransitionScreen(Me, New OverworldScreen(), Color.Black, False, 5)) End Sub @@ -449,82 +449,82 @@ ot = "0" & ot End While - Dim s As String = "Name|" & Name & vbNewLine & _ - "Position|" & Me.startPosition.X.ToString().Replace(GameController.DecSeparator, ".") & "," & Me.startPosition.Y.ToString().Replace(GameController.DecSeparator, ".") & "," & Me.startPosition.Z.ToString().Replace(GameController.DecSeparator, ".") & vbNewLine & _ - "MapFile|" & Me.startMap & vbNewLine & _ - "Rotation|" & Me.startYaw.ToString() & vbNewLine & _ - "RivalName|???" & vbNewLine & _ - "Money|3000" & vbNewLine & _ - "Badges|0" & vbNewLine & _ - "Gender|Male" & vbNewLine & _ - "PlayTime|0,0,0" & vbNewLine & _ - "OT|" & ot & vbNewLine & _ - "Points|0" & vbNewLine & _ - "hasPokedex|0" & vbNewLine & _ - "hasPokegear|0" & vbNewLine & _ - "freeCamera|1" & vbNewLine & _ - "thirdPerson|0" & vbNewLine & _ - "skin|" & startSkins(SkinIndex) & vbNewLine & _ - "location|" & Me.startLocation & vbNewLine & _ - "battleAnimations|2" & vbNewLine & _ - "BoxAmount|5" & vbNewLine & _ - "LastRestPlace|yourroom.dat" & vbNewLine & _ - "LastRestPlacePosition|1,0.1,3" & vbNewLine & _ - "DiagonalMovement|0" & vbNewLine & _ - "RepelSteps|0" & vbNewLine & _ - "LastSavePlace|yourroom.dat" & vbNewLine & _ - "LastSavePlacePosition|1,0.1,3" & vbNewLine & _ - "Difficulty|" & GameModeManager.GetGameRuleValue("Difficulty", "0") & vbNewLine & _ - "BattleStyle|0" & vbNewLine & _ - "saveCreated|" & GameController.GAMEDEVELOPMENTSTAGE & " " & GameController.GAMEVERSION & vbNewLine & _ - "LastPokemonPosition|999,999,999" & vbNewLine & _ - "DaycareSteps|0" & vbNewLine & _ - "GameMode|" & GameModeManager.ActiveGameMode.DirectoryName & vbNewLine & - "PokeFiles|" & vbNewLine & - "VisitedMaps|yourroom.dat" & vbNewLine & - "TempSurfSkin|Hilbert" & vbNewLine & - "Surfing|0" & vbNewLine & - "ShowModels|1" & vbNewLine & - "GTSStars|4" & vbNewLine & + Dim s As String = "Name|" & Name & Environment.NewLine & + "Position|" & Me.startPosition.X.ToString().Replace(GameController.DecSeparator, ".") & "," & Me.startPosition.Y.ToString().Replace(GameController.DecSeparator, ".") & "," & Me.startPosition.Z.ToString().Replace(GameController.DecSeparator, ".") & Environment.NewLine & + "MapFile|" & Me.startMap & Environment.NewLine & + "Rotation|" & Me.startYaw.ToString() & Environment.NewLine & + "RivalName|???" & Environment.NewLine & + "Money|3000" & Environment.NewLine & + "Badges|0" & Environment.NewLine & + "Gender|Male" & Environment.NewLine & + "PlayTime|0,0,0,0" & Environment.NewLine & + "OT|" & ot & Environment.NewLine & + "Points|0" & Environment.NewLine & + "hasPokedex|0" & Environment.NewLine & + "hasPokegear|0" & Environment.NewLine & + "freeCamera|1" & Environment.NewLine & + "thirdPerson|0" & Environment.NewLine & + "skin|" & startSkins(SkinIndex) & Environment.NewLine & + "location|" & Me.startLocation & Environment.NewLine & + "battleAnimations|2" & Environment.NewLine & + "BoxAmount|5" & Environment.NewLine & + "LastRestPlace|yourroom.dat" & Environment.NewLine & + "LastRestPlacePosition|1,0.1,3" & Environment.NewLine & + "DiagonalMovement|0" & Environment.NewLine & + "RepelSteps|0" & Environment.NewLine & + "LastSavePlace|yourroom.dat" & Environment.NewLine & + "LastSavePlacePosition|1,0.1,3" & Environment.NewLine & + "Difficulty|" & GameModeManager.GetGameRuleValue("Difficulty", "0") & Environment.NewLine & + "BattleStyle|0" & Environment.NewLine & + "saveCreated|" & GameController.GAMEDEVELOPMENTSTAGE & " " & GameController.GAMEVERSION & Environment.NewLine & + "LastPokemonPosition|999,999,999" & Environment.NewLine & + "DaycareSteps|0" & Environment.NewLine & + "GameMode|" & GameModeManager.ActiveGameMode.DirectoryName & Environment.NewLine & + "PokeFiles|" & Environment.NewLine & + "VisitedMaps|yourroom.dat" & Environment.NewLine & + "TempSurfSkin|Hilbert" & Environment.NewLine & + "Surfing|0" & Environment.NewLine & + "ShowModels|1" & Environment.NewLine & + "GTSStars|4" & Environment.NewLine & "SandBoxMode|0" Return s End Function Public Shared Function GetOptionsData() As String - Dim s As String = "FOV|50" & vbNewLine & _ - "TextSpeed|2" & vbNewLine & _ + Dim s As String = "FOV|50" & Environment.NewLine & + "TextSpeed|2" & Environment.NewLine & "MouseSpeed|12" Return s End Function Public Shared Function GetBerryData() As String - Dim s As String = "{route29.dat|13,0,5|6|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route29.dat|14,0,5|6|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route29.dat|15,0,5|6|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{azalea.dat|9,0,3|0|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{azalea.dat|9,0,4|1|1|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{azalea.dat|9,0,5|0|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route30.dat|7,0,41|10|1|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route30.dat|14,0,5|2|1|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route30.dat|15,0,5|6|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route30.dat|16,0,5|2|1|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{routes\route35.dat|0,0,4|7|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{routes\route35.dat|1,0,4|8|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route36.dat|37,0,7|0|1|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route36.dat|38,0,7|4|1|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route36.dat|39,0,7|3|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route39.dat|8,0,2|9|1|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route39.dat|8,0,3|6|1|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route38.dat|13,0,12|16|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route38.dat|14,0,12|23|1|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{route38.dat|15,0,12|16|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{routes\route43.dat|13,0,45|23|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{routes\route43.dat|13,0,46|24|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{routes\route43.dat|13,0,47|25|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{safarizone\main.dat|3,0,11|5|2|0|2012,9,21,4,0,0|1}" & vbNewLine & - "{safarizone\main.dat|4,0,11|0|2|0|2012,9,21,4,0,0|1}" & vbNewLine & + Dim s As String = "{route29.dat|13,0,5|6|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route29.dat|14,0,5|6|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route29.dat|15,0,5|6|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{azalea.dat|9,0,3|0|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{azalea.dat|9,0,4|1|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{azalea.dat|9,0,5|0|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route30.dat|7,0,41|10|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route30.dat|14,0,5|2|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route30.dat|15,0,5|6|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route30.dat|16,0,5|2|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{routes\route35.dat|0,0,4|7|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{routes\route35.dat|1,0,4|8|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route36.dat|37,0,7|0|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route36.dat|38,0,7|4|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route36.dat|39,0,7|3|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route39.dat|8,0,2|9|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route39.dat|8,0,3|6|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route38.dat|13,0,12|16|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route38.dat|14,0,12|23|1|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{route38.dat|15,0,12|16|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{routes\route43.dat|13,0,45|23|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{routes\route43.dat|13,0,46|24|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{routes\route43.dat|13,0,47|25|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{safarizone\main.dat|3,0,11|5|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & + "{safarizone\main.dat|4,0,11|0|2|0|2012,9,21,4,0,0|1}" & Environment.NewLine & "{safarizone\main.dat|5,0,11|6|3|0|2012,9,21,4,0,0|1}" Return s diff --git a/P3D/Screens/NewMenuScreen.vb b/P3D/Screens/NewMenuScreen.vb index 81a1da4db..781c50273 100644 --- a/P3D/Screens/NewMenuScreen.vb +++ b/P3D/Screens/NewMenuScreen.vb @@ -213,7 +213,7 @@ If New Rectangle(CInt(pos.X), CInt(pos.Y), 64 * 6, 64).Contains(MouseHandler.MousePosition) Then If _menuIndex = i Then _cursorPosition.X = _cursorDestPosition.X - + SoundManager.PlaySound("select") PressButton() Else _menuIndex = i @@ -226,7 +226,7 @@ End If If Controls.Accept(False, True, True) = True Then _cursorPosition.X = _cursorDestPosition.X - + SoundManager.PlaySound("select") PressButton() End If End If diff --git a/P3D/Screens/NewOptionScreen.vb b/P3D/Screens/NewOptionScreen.vb index 7e402904f..e6dacdeb7 100644 --- a/P3D/Screens/NewOptionScreen.vb +++ b/P3D/Screens/NewOptionScreen.vb @@ -85,7 +85,7 @@ Me.Difficulty = Core.Player.DifficultyMode Me.BattleStyle = Core.Player.BattleStyle Me.ShowModels = CInt(Core.Player.ShowModelsInBattle) - Me.Muted = CInt(MediaPlayer.IsMuted.ToNumberString()) + Me.Muted = CInt(MusicManager.Muted.ToNumberString()) If Core.GameOptions.LoadOffsetMaps = 0 Then Me.LoadOffsetMaps = 0 Else @@ -259,6 +259,7 @@ If Controls.Dismiss() Then + SoundManager.PlaySound("select") If Me.ScreenIndex = 0 Then _closing = True Else @@ -489,7 +490,7 @@ Public Overrides Sub ToggledMute() If Me.ScreenIndex = 5 Then - Me.Muted = CInt(MediaPlayer.IsMuted) + Me.Muted = CInt(MusicManager.Muted) InitializeControls() End If End Sub @@ -787,7 +788,7 @@ If P3D.Controls.Accept(True, False, False) = True Then Me._toggled = Not Me._toggled OnToggleTrigger(Me) - ' SoundManager.PlaySound("select") + SoundManager.PlaySound("select") End If End If @@ -795,7 +796,7 @@ If Position = s._cursorDestPosition Then Me._toggled = Not Me._toggled OnToggleTrigger(Me) - 'SoundManager.PlaySound("select") + SoundManager.PlaySound("select") End If End If End Sub @@ -884,14 +885,15 @@ If r.Contains(MouseHandler.MousePosition) = True Then If P3D.Controls.Accept(True, False, False) = True Then + SoundManager.PlaySound("select") OnClickTrigger(Me) End If End If If Controls.Accept(False, True, True) Then If Position = s._cursorDestPosition Then - OnClickTrigger(Me) SoundManager.PlaySound("select") + OnClickTrigger(Me) End If End If End Sub diff --git a/P3D/Screens/NewTrainerScreen.vb b/P3D/Screens/NewTrainerScreen.vb index d6650eba5..5e4fce92d 100644 --- a/P3D/Screens/NewTrainerScreen.vb +++ b/P3D/Screens/NewTrainerScreen.vb @@ -252,6 +252,7 @@ End If Else If Controls.Dismiss() Then + SoundManager.PlaySound("select") SetScreen(PreScreen) End If End If diff --git a/P3D/Screens/PC/MailSystemScreen.vb b/P3D/Screens/PC/MailSystemScreen.vb index 873fc7275..621886de7 100644 --- a/P3D/Screens/PC/MailSystemScreen.vb +++ b/P3D/Screens/PC/MailSystemScreen.vb @@ -238,6 +238,7 @@ End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") If Me.index <> -1 Then Me.index = -1 Else @@ -292,6 +293,7 @@ If Controls.Dismiss(True, False, True) = True Then Me.index = -1 + SoundManager.PlaySound("select") End If End If End Sub diff --git a/P3D/Screens/PC/StorageSystemScreen.vb b/P3D/Screens/PC/StorageSystemScreen.vb index e3bebecc3..c7fd9ff71 100644 --- a/P3D/Screens/PC/StorageSystemScreen.vb +++ b/P3D/Screens/PC/StorageSystemScreen.vb @@ -230,16 +230,19 @@ Public Class StorageSystemScreen PressNumberButtons() If GetRelativeMousePosition() <> New Vector2(-1) AndAlso GetRelativeMousePosition() = CursorPosition AndAlso Controls.Accept(True, False, False) = True Then + SoundManager.PlaySound("select") ChooseObject() End If ControlCursor() If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") ChooseObject() End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") CloseScreen() End If End If @@ -1862,6 +1865,7 @@ Public Class StorageSystemFilterScreen If Not ClickHandler Is Nothing Then ClickHandler(Me) + SoundManager.PlaySound("select") End If Me.Visible = False End If @@ -1869,6 +1873,7 @@ Public Class StorageSystemFilterScreen Me.Index = Me.BackIndex If Not ClickHandler Is Nothing Then ClickHandler(Me) + SoundManager.PlaySound("select") End If Me.Visible = False End If @@ -2064,6 +2069,7 @@ Public Class StorageSystemFilterScreen If New Rectangle(100, 100 + (i - Scroll) * 96, 640, 64).Contains(MouseHandler.MousePosition) = True Then If i = Cursor + Scroll Then SelectFilter() + SoundManager.PlaySound("select") Else Cursor = i - Scroll End If @@ -2074,12 +2080,14 @@ Public Class StorageSystemFilterScreen If Controls.Accept(False, True, True) = True Then SelectFilter() + SoundManager.PlaySound("select") End If End If If Controls.Dismiss(True, True, True) = True Then ApplyFilters() Core.SetScreen(Me._storageSystemScreen) + SoundManager.PlaySound("select") End If End If diff --git a/P3D/Screens/Pokedex/PokedexScreen.vb b/P3D/Screens/Pokedex/PokedexScreen.vb index e12299e32..10217478d 100644 --- a/P3D/Screens/Pokedex/PokedexScreen.vb +++ b/P3D/Screens/Pokedex/PokedexScreen.vb @@ -123,8 +123,10 @@ If New Rectangle(100, 100 + i * 96, 64 * 7, 64).Contains(MouseHandler.MousePosition) = True Then If i = Cursor Then If Me.Cursor = Me.Profiles.Count Then + SoundManager.PlaySound("select") Core.SetScreen(New PokedexHabitatScreen(Me)) Else + SoundManager.PlaySound("select") Core.SetScreen(New PokedexScreen(Me, Me.Profiles(Me.Cursor), Nothing)) End If Else @@ -137,12 +139,15 @@ If Controls.Accept(False, True, True) = True Then If Me.Cursor = Me.Profiles.Count Then Core.SetScreen(New PokedexHabitatScreen(Me)) + SoundManager.PlaySound("select") Else Core.SetScreen(New PokedexScreen(Me, Me.Profiles(Me.Cursor), Nothing)) + SoundManager.PlaySound("select") End If End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New TransitionScreen(Core.CurrentScreen, Me.PreScreen, Color.White, False)) End If @@ -277,6 +282,7 @@ Public Class PokedexHabitatScreen If i <= Me.HabitatList.Count - 1 Then If New Rectangle(100, 100 + (i - Scroll) * 96, 640, 64).Contains(MouseHandler.MousePosition) = True Then If i = Cursor + Scroll Then + SoundManager.PlaySound("select") Core.SetScreen(New PokedexScreen(Me, Nothing, Me.HabitatList(Cursor + Scroll))) Else Cursor = i - Scroll @@ -287,12 +293,14 @@ Public Class PokedexHabitatScreen End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New PokedexScreen(Me, Nothing, Me.HabitatList(Cursor + Scroll))) End If End If If Controls.Dismiss(True, True, True) = True Then Core.SetScreen(Me.PreScreen) + SoundManager.PlaySound("select") End If PokedexScreen.TileOffset += 1 @@ -749,6 +757,7 @@ Public Class PokedexScreen If New Rectangle(50 + x * 100, 140 + y * 100, 64, 92).Contains(MouseHandler.MousePosition) = True Then If Cursor.X + Cursor.Y * 6 = i Then If TempPokemonDexType(CInt((Cursor.Y + Scroll) * 6 + Cursor.X + 1)) > 0 Then + SoundManager.PlaySound("select") Core.SetScreen(New PokedexViewScreen(Me, TempPokemonStorage(CInt((Cursor.Y + Scroll) * 6 + Cursor.X + 1)), False)) End If Else @@ -763,6 +772,7 @@ Public Class PokedexScreen If Controls.Accept(False, True, True) = True Then If TempPokemonDexType(CInt((Cursor.Y + Scroll) * 6 + Cursor.X + 1)) > 0 Then + SoundManager.PlaySound("select") Core.SetScreen(New PokedexViewScreen(Me, TempPokemonStorage(CInt((Cursor.Y + Scroll) * 6 + Cursor.X + 1)), False)) End If End If @@ -773,11 +783,13 @@ Public Class PokedexScreen If Controls.Dismiss(True, True, True) = True Then If Me.Filters.Count > 0 Or Me.Order <> OrderType.Numeric Or Me.ReverseOrder = True Then + SoundManager.PlaySound("select") Me.Filters.Clear() Me.ReverseOrder = False Me.Order = OrderType.Numeric Me.SetList() Else + SoundManager.PlaySound("select") Core.SetScreen(Me.PreScreen) End If End If @@ -973,6 +985,7 @@ Public Class PokedexScreen If Not ClickHandler Is Nothing Then ClickHandler(Me) + SoundManager.PlaySound("select") End If Me.Visible = False End If @@ -980,6 +993,7 @@ Public Class PokedexScreen Me.Index = Me.BackIndex If Not ClickHandler Is Nothing Then ClickHandler(Me) + SoundManager.PlaySound("select") End If Me.Visible = False End If @@ -1650,8 +1664,10 @@ Public Class PokedexViewScreen Public Overrides Sub Update() If Controls.Dismiss(True, True, True) = True Then If Me._transitionOut = True Then + SoundManager.PlaySound("select") Core.SetScreen(New TransitionScreen(Me, Me.PreScreen, Color.White, False)) Else + SoundManager.PlaySound("select") Core.SetScreen(Me.PreScreen) End If End If @@ -1669,10 +1685,12 @@ Public Class PokedexViewScreen If Controls.Accept(True, False, False) = True Then If Me.Page = 0 Or Me.Page = 1 Then If New Rectangle(Core.windowSize.Width - 70, CInt(Core.windowSize.Height / 2 - 32), 64, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Me.Page += 1 End If End If If Me.Page = 1 Or Me.Page = 2 Then + SoundManager.PlaySound("select") If New Rectangle(6, CInt(Core.windowSize.Height / 2 - 32), 64, 64).Contains(MouseHandler.MousePosition) = True Then Me.Page -= 1 End If @@ -1726,6 +1744,7 @@ Public Class PokedexViewScreen Private Sub UpdatePage1() If Controls.Accept(True, True, True) = True Then + SoundManager.PlaySound("select") Me.FrontView = Not Me.FrontView Me.GetYOffset() End If @@ -1766,6 +1785,7 @@ Public Class PokedexViewScreen If i <= Me.HabitatList.Count - 1 Then If New Rectangle(100, 160 + (i - Scroll) * 96, 640, 64).Contains(MouseHandler.MousePosition) = True Then If i = Cursor + Scroll Then + SoundManager.PlaySound("select") Core.SetScreen(New PokedexScreen(Me, Nothing, Me.HabitatList(Cursor + Scroll))) Else Cursor = i - Scroll @@ -1776,6 +1796,7 @@ Public Class PokedexViewScreen End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Core.SetScreen(New PokedexScreen(Me, Nothing, Me.HabitatList(Cursor + Scroll))) End If End If diff --git a/P3D/Screens/Pokedex/ViewModelScreen.vb b/P3D/Screens/Pokedex/ViewModelScreen.vb index 16eed605e..323f63656 100644 --- a/P3D/Screens/Pokedex/ViewModelScreen.vb +++ b/P3D/Screens/Pokedex/ViewModelScreen.vb @@ -72,8 +72,10 @@ If Controls.Accept(True, True, True) = True And CanViewShiny = True Then Me.normalModel = Not Me.normalModel If Me.normalModel = False Then + SoundManager.PlaySound("select") Me.Model.LoadModel("Models\" & Me.PokemonAnimationName & "\Shiny") Else + SoundManager.PlaySound("select") Me.Model.LoadModel("Models\" & Me.PokemonAnimationName & "\Normal") End If End If @@ -87,6 +89,7 @@ If Controls.Dismiss(True, True, True) = True Then Screen.Camera = c Core.SetScreen(Me.PreScreen) + SoundManager.PlaySound("select") End If End Sub diff --git a/P3D/Screens/Pokemon/ChooseAttackScreen.vb b/P3D/Screens/Pokemon/ChooseAttackScreen.vb index d23744d71..e6f6fe373 100644 --- a/P3D/Screens/Pokemon/ChooseAttackScreen.vb +++ b/P3D/Screens/Pokemon/ChooseAttackScreen.vb @@ -54,10 +54,12 @@ Me.AttackIndex = CInt(MathHelper.Clamp(Me.AttackIndex, 0, Pokemon.Attacks.Count - 1)) If Controls.Accept() = True Then + SoundManager.PlaySound("select") ClickYes() End If If Controls.Dismiss() = True Then If canExit = True Then + SoundManager.PlaySound("select") ClickNo() End If End If diff --git a/P3D/Screens/Pokemon/NameObjectScreen.vb b/P3D/Screens/Pokemon/NameObjectScreen.vb index d550b9041..273065593 100644 --- a/P3D/Screens/Pokemon/NameObjectScreen.vb +++ b/P3D/Screens/Pokemon/NameObjectScreen.vb @@ -185,9 +185,11 @@ Public Class NameObjectScreen If Controls.Accept(True, False, True) = True Or KeyBoardHandler.KeyPressed(KeyBindings.EnterKey1) = True Then Select Case _index Case 0 + SoundManager.PlaySound("select") ClickYes() Case 1 If _canChooseNo = True Then + SoundManager.PlaySound("select") ClickNo() End If End Select @@ -213,6 +215,7 @@ Public Class NameObjectScreen Me._currentText = Me.ReplaceInvalidChars(Me._currentText) If Controls.Dismiss(True, False, True) = True And _canChooseNo = True Then + SoundManager.PlaySound("select") ClickNo() End If End If diff --git a/P3D/Screens/Pokemon/PartyScreen.vb b/P3D/Screens/Pokemon/PartyScreen.vb index f86c327e6..9e85e4094 100644 --- a/P3D/Screens/Pokemon/PartyScreen.vb +++ b/P3D/Screens/Pokemon/PartyScreen.vb @@ -509,7 +509,7 @@ Public Class PartyScreen If _switchIndex <> _index Then Dim p1 As Pokemon = PokemonList(_switchIndex) Dim p2 As Pokemon = PokemonList(_index) - + SoundManager.PlaySound("select") PokemonList(_switchIndex) = p2 PokemonList(_index) = p1 End If @@ -528,6 +528,7 @@ Public Class PartyScreen used = True ExitedSub(_index) End If + SoundManager.PlaySound("select") _closing = True End If End If diff --git a/P3D/Screens/Pokemon/SummaryScreen.vb b/P3D/Screens/Pokemon/SummaryScreen.vb index a70a0033a..524583c7e 100644 --- a/P3D/Screens/Pokemon/SummaryScreen.vb +++ b/P3D/Screens/Pokemon/SummaryScreen.vb @@ -675,12 +675,15 @@ If Controls.Accept() = True Then If _pageIndex = 0 Then _isFront = Not _isFront + SoundManager.PlaySound("select") ElseIf _pageIndex = 1 Then + SoundManager.PlaySound("select") _moveSelected = True End If End If End If If Controls.Dismiss() = True Then + SoundManager.PlaySound("select") _closing = True End If Else @@ -705,7 +708,7 @@ Dim switchingMove As BattleSystem.Attack = GetPokemon().Attacks(_switchMoveIndex) GetPokemon().Attacks.RemoveAt(_switchMoveIndex) GetPokemon().Attacks.Insert(_moveIndex, switchingMove) - + SoundManager.PlaySound("select") _switchingMoves = False _switchMoveIndex = -1 Else @@ -719,8 +722,10 @@ If _switchingMoves = True Then _switchingMoves = False _switchMoveIndex = -1 + SoundManager.PlaySound("select") Else _moveSelected = False + SoundManager.PlaySound("select") End If End If End If diff --git a/P3D/Screens/Pokemon/TeachMovesScreen.vb b/P3D/Screens/Pokemon/TeachMovesScreen.vb index 652109636..d9e33d1c2 100644 --- a/P3D/Screens/Pokemon/TeachMovesScreen.vb +++ b/P3D/Screens/Pokemon/TeachMovesScreen.vb @@ -195,13 +195,16 @@ If Controls.Accept(True, True, True) = True Then If Me.MovesList.Count = 0 Then Core.SetScreen(Me.PreScreen) + SoundManager.PlaySound("select") Else LearnMove(MovesList(index)) + SoundManager.PlaySound("select") End If End If If Controls.Dismiss(True, True, True) = True Then Core.SetScreen(Me.PreScreen) + SoundManager.PlaySound("select") End If End Sub diff --git a/P3D/Screens/SaveScreen.vb b/P3D/Screens/SaveScreen.vb index 3a647f78e..63263e3b2 100644 --- a/P3D/Screens/SaveScreen.vb +++ b/P3D/Screens/SaveScreen.vb @@ -205,12 +205,14 @@ End If If Controls.Dismiss() And ready = False Then + SoundManager.PlaySound("select") ChooseBox.Showing = False _closing = True 'Core.SetScreen(Me.PreScreen) End If Else If Controls.Dismiss() = True Then + SoundManager.PlaySound("select") ChooseBox.Showing = False _closing = True 'Core.SetScreen(Me.PreScreen) diff --git a/P3D/Screens/StatisticsScreen.vb b/P3D/Screens/StatisticsScreen.vb index 52c27a8ec..8ed1cf95c 100644 --- a/P3D/Screens/StatisticsScreen.vb +++ b/P3D/Screens/StatisticsScreen.vb @@ -161,6 +161,7 @@ End If If Controls.Dismiss() = True Then + SoundManager.PlaySound("select") Core.SetScreen(New TransitionScreen(Me, Me.PreScreen, Color.White, False)) End If diff --git a/P3D/Screens/TradeScreen.vb b/P3D/Screens/TradeScreen.vb index ed6613952..e4e436022 100644 --- a/P3D/Screens/TradeScreen.vb +++ b/P3D/Screens/TradeScreen.vb @@ -268,6 +268,7 @@ Public Class TradeScreen For i = 0 To mainMenuButtons.Count - 1 If New Rectangle(100, 100 + i * 96, 64 * 7, 64).Contains(MouseHandler.MousePosition) = True Then If i = Me.Cursor Then + SoundManager.PlaySound("select") Me.ClickMainButton() Else Cursor = i @@ -277,10 +278,12 @@ Public Class TradeScreen End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.ClickMainButton() End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") Me.ButtonMainExit() End If End Sub @@ -406,6 +409,7 @@ Public Class TradeScreen If i <= Me.loadedBuyCategories.Count - 1 Then If New Rectangle(100, 100 + (i - Me.Scroll) * 96, 64 * 7, 64).Contains(MouseHandler.MousePosition) = True Then If i = Scroll + Cursor Then + SoundManager.PlaySound("select") Me.ButtonBuyCategoriesAccept() Else Cursor = i - Scroll @@ -416,11 +420,13 @@ Public Class TradeScreen End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.ButtonBuyCategoriesAccept() End If End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") Me.MenuState = MenuStates.MainPage End If End Sub @@ -584,8 +590,10 @@ Public Class TradeScreen If Controls.Dismiss(True, True, True) = True Then If Me.BuyItemsShowDescription = True Then + SoundManager.PlaySound("select") Me.BuyItemsShowDescription = False Else + SoundManager.PlaySound("select") Me.MenuState = MenuStates.BuyItemsCategory End If End If @@ -820,6 +828,7 @@ Public Class TradeScreen If i <= Me.loadedSellCategories.Count - 1 Then If New Rectangle(100, 100 + (i - Me.Scroll) * 96, 64 * 7, 64).Contains(MouseHandler.MousePosition) = True Then If i = Scroll + Cursor Then + SoundManager.PlaySound("select") Me.ButtonSellCategoriesAccept() Else Cursor = i - Scroll @@ -830,11 +839,13 @@ Public Class TradeScreen End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.ButtonSellCategoriesAccept() End If End If If Controls.Dismiss(True, True, True) = True Then + SoundManager.PlaySound("select") Me.MenuState = MenuStates.MainPage End If End Sub @@ -939,6 +950,7 @@ Public Class TradeScreen ' Buy button: If New Rectangle(664 + 64, 484 + 64 + 22, 64 * 3, 64).Contains(MouseHandler.MousePosition) = True Then + SoundManager.PlaySound("select") Me.ButtonSellItemsSell() End If End If @@ -952,14 +964,17 @@ Public Class TradeScreen End If If Controls.Accept(False, True, True) = True Then + SoundManager.PlaySound("select") Me.ButtonSellItemsSell() End If If Controls.Dismiss(True, True, True) = True Then If Me.SellItemsShowDescription = True Then Me.SellItemsShowDescription = False + SoundManager.PlaySound("select") Else Me.MenuState = MenuStates.SellItemsCategory + SoundManager.PlaySound("select") End If End If diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb index 594875512..6e3a1180b 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoMusic.vb @@ -26,10 +26,14 @@ End If Case "stop" MusicManager.Stop() + Case "mute" + MusicManager.Muted() = True + Case "unmute" + MusicManager.Muted() = False Case "pause" - MusicManager.Pause() + MusicManager.Paused() = True Case "resume" - MusicManager.ResumePlayback() + MusicManager.Paused() = False End Select IsReady = True diff --git a/P3D/World/ActionScript/V2/ScriptLibrary.vb b/P3D/World/ActionScript/V2/ScriptLibrary.vb index 85a0f6767..17aa89654 100644 --- a/P3D/World/ActionScript/V2/ScriptLibrary.vb +++ b/P3D/World/ActionScript/V2/ScriptLibrary.vb @@ -170,6 +170,8 @@ Namespace ScriptVersion2 r(New ScriptCommand("music", "play", {New ScriptArgument("musicFile", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Changes the currently playing music to a new one.")) r(New ScriptCommand("music", "setmusicloop", {New ScriptArgument("musicFile", ScriptArgument.ArgumentTypes.Str)}.ToList(), "Sets the map musicloop to a new musicfile.")) r(New ScriptCommand("music", "stop", "Stops the music playback.")) + r(New ScriptCommand("music", "mute", "Silences the music playback.")) + r(New ScriptCommand("music", "unmute", "Reverts the volume of the music playback.")) r(New ScriptCommand("music", "pause", "Pauses the music playback.")) r(New ScriptCommand("music", "resume", "Resumes the music playback.")) End Sub diff --git a/P3D/World/Level.vb b/P3D/World/Level.vb index debf1c0d0..b5c55cd2b 100644 --- a/P3D/World/Level.vb +++ b/P3D/World/Level.vb @@ -1025,6 +1025,10 @@ Public Class Level ' Check if the enter sound should be played by checking if CanDig or CanFly properties are different from the last map: If tempProperties <> Me.CanDig.ToString() & "," & Me.CanFly.ToString() Then SoundManager.PlaySound("enter", False) + ElseIf tempProperties = "True,False" And Me.CanDig = True And Me.CanFly = False Then + SoundManager.PlaySound("enter", False) + ElseIf tempProperties = "False,False" And Me.CanDig = False And Me.CanFly = False Then + SoundManager.PlaySound("enter", False) End If ' Unlock the yaw on the camera: @@ -1042,6 +1046,7 @@ Public Class Level ' Update network players: Core.ServersManager.PlayerManager.NeedsUpdate = True End If + End If End Sub diff --git a/P3D/packages.config b/P3D/packages.config index 850a2284f..af520c846 100644 --- a/P3D/packages.config +++ b/P3D/packages.config @@ -1,7 +1,9 @@  - + + + @@ -11,4 +13,8 @@ + + + + \ No newline at end of file diff --git a/lib/P3D.ContentPipeline/Content/Content.mgcb b/lib/P3D.ContentPipeline/Content/Content.mgcb index aa67d1075..4d73bb0a0 100644 --- a/lib/P3D.ContentPipeline/Content/Content.mgcb +++ b/lib/P3D.ContentPipeline/Content/Content.mgcb @@ -19,6 +19,12 @@ /processorParam:DebugMode=Auto /build:Effects/BackdropShader.fx +#begin Effects/GaussianBlur.fx +/importer:EffectImporter +/processor:EffectProcessor +/processorParam:DebugMode=Auto +/build:Effects/GaussianBlur.fx + #begin Fonts/BMP/Braille.png /importer:TextureImporter /processor:FontTextureProcessor @@ -35,6 +41,9 @@ /processorParam:TextureFormat=Color /build:Fonts/BMP/chatFont.png +#begin Fonts/BMP/GameJolt.xnb +/copy:Fonts/BMP/GameJolt.xnb + #begin Fonts/BMP/InGame.png /importer:TextureImporter /processor:FontTextureProcessor @@ -74,82 +83,6 @@ /processorParam:TextureFormat=Color /build:Fonts/BMP/Unown.png -#begin Models/boat2/Boat.fbx -/importer:FbxImporter -/processor:ModelProcessor -/processorParam:ColorKeyColor=0,0,0,0 -/processorParam:ColorKeyEnabled=True -/processorParam:DefaultEffect=BasicEffect -/processorParam:GenerateMipmaps=True -/processorParam:GenerateTangentFrames=False -/processorParam:PremultiplyTextureAlpha=True -/processorParam:PremultiplyVertexColors=True -/processorParam:ResizeTexturesToPowerOfTwo=False -/processorParam:RotationX=0 -/processorParam:RotationY=0 -/processorParam:RotationZ=0 -/processorParam:Scale=1 -/processorParam:SwapWindingOrder=False -/processorParam:TextureFormat=Color -/build:Models/boat2/Boat.fbx - -#begin SkyDomeResource/SkyDome.x -/importer:XImporter -/processor:ModelProcessor -/processorParam:ColorKeyColor=0,0,0,0 -/processorParam:ColorKeyEnabled=True -/processorParam:DefaultEffect=BasicEffect -/processorParam:GenerateMipmaps=True -/processorParam:GenerateTangentFrames=False -/processorParam:PremultiplyTextureAlpha=True -/processorParam:PremultiplyVertexColors=True -/processorParam:ResizeTexturesToPowerOfTwo=False -/processorParam:RotationX=0 -/processorParam:RotationY=0 -/processorParam:RotationZ=0 -/processorParam:Scale=1 -/processorParam:SwapWindingOrder=False -/processorParam:TextureFormat=Color -/build:SkyDomeResource/SkyDome.x - -#begin Models/Snorlax/Normal.obj -/importer:OpenAssetImporter -/processor:ModelProcessor -/processorParam:ColorKeyColor=0,0,0,0 -/processorParam:ColorKeyEnabled=True -/processorParam:DefaultEffect=BasicEffect -/processorParam:GenerateMipmaps=True -/processorParam:GenerateTangentFrames=False -/processorParam:PremultiplyTextureAlpha=True -/processorParam:PremultiplyVertexColors=True -/processorParam:ResizeTexturesToPowerOfTwo=False -/processorParam:RotationX=0 -/processorParam:RotationY=0 -/processorParam:RotationZ=0 -/processorParam:Scale=1 -/processorParam:SwapWindingOrder=False -/processorParam:TextureFormat=Compressed -/build:Models/Snorlax/Normal.obj - -#begin Models/Snorlax/Shiny.obj -/importer:OpenAssetImporter -/processor:ModelProcessor -/processorParam:ColorKeyColor=0,0,0,0 -/processorParam:ColorKeyEnabled=True -/processorParam:DefaultEffect=BasicEffect -/processorParam:GenerateMipmaps=True -/processorParam:GenerateTangentFrames=False -/processorParam:PremultiplyTextureAlpha=True -/processorParam:PremultiplyVertexColors=True -/processorParam:ResizeTexturesToPowerOfTwo=False -/processorParam:RotationX=0 -/processorParam:RotationY=0 -/processorParam:RotationZ=0 -/processorParam:Scale=1 -/processorParam:SwapWindingOrder=False -/processorParam:TextureFormat=Compressed -/build:Models/Snorlax/Shiny.obj - #begin Models/boat/ferry.obj /importer:OpenAssetImporter /processor:ModelProcessor @@ -188,6 +121,25 @@ /processorParam:TextureFormat=Compressed /build:Models/boat/Ship.obj +#begin Models/boat2/Boat.fbx +/importer:FbxImporter +/processor:ModelProcessor +/processorParam:ColorKeyColor=0,0,0,0 +/processorParam:ColorKeyEnabled=True +/processorParam:DefaultEffect=BasicEffect +/processorParam:GenerateMipmaps=True +/processorParam:GenerateTangentFrames=False +/processorParam:PremultiplyTextureAlpha=True +/processorParam:PremultiplyVertexColors=True +/processorParam:ResizeTexturesToPowerOfTwo=False +/processorParam:RotationX=0 +/processorParam:RotationY=0 +/processorParam:RotationZ=0 +/processorParam:Scale=1 +/processorParam:SwapWindingOrder=False +/processorParam:TextureFormat=Color +/build:Models/boat2/Boat.fbx + #begin Models/building/P3DBuilding.obj /importer:OpenAssetImporter /processor:ModelProcessor @@ -226,6 +178,25 @@ /processorParam:TextureFormat=Compressed /build:Models/Environment/arena_colleseum.obj +#begin Models/Environment/MtSilver/Mountain.obj +/importer:OpenAssetImporter +/processor:ModelProcessor +/processorParam:ColorKeyColor=0,0,0,0 +/processorParam:ColorKeyEnabled=True +/processorParam:DefaultEffect=BasicEffect +/processorParam:GenerateMipmaps=True +/processorParam:GenerateTangentFrames=False +/processorParam:PremultiplyTextureAlpha=True +/processorParam:PremultiplyVertexColors=True +/processorParam:ResizeTexturesToPowerOfTwo=False +/processorParam:RotationX=0 +/processorParam:RotationY=0 +/processorParam:RotationZ=0 +/processorParam:Scale=1 +/processorParam:SwapWindingOrder=False +/processorParam:TextureFormat=Compressed +/build:Models/Environment/MtSilver/Mountain.obj + #begin Models/Environment/Test_floor/Test_floor.obj /importer:OpenAssetImporter /processor:ModelProcessor @@ -245,7 +216,7 @@ /processorParam:TextureFormat=Compressed /build:Models/Environment/Test_floor/Test_floor.obj -#begin Models/Environment/MtSilver/Mountain.obj +#begin Models/Snorlax/Normal.obj /importer:OpenAssetImporter /processor:ModelProcessor /processorParam:ColorKeyColor=0,0,0,0 @@ -262,7 +233,26 @@ /processorParam:Scale=1 /processorParam:SwapWindingOrder=False /processorParam:TextureFormat=Compressed -/build:Models/Environment/MtSilver/Mountain.obj +/build:Models/Snorlax/Normal.obj + +#begin Models/Snorlax/Shiny.obj +/importer:OpenAssetImporter +/processor:ModelProcessor +/processorParam:ColorKeyColor=0,0,0,0 +/processorParam:ColorKeyEnabled=True +/processorParam:DefaultEffect=BasicEffect +/processorParam:GenerateMipmaps=True +/processorParam:GenerateTangentFrames=False +/processorParam:PremultiplyTextureAlpha=True +/processorParam:PremultiplyVertexColors=True +/processorParam:ResizeTexturesToPowerOfTwo=False +/processorParam:RotationX=0 +/processorParam:RotationY=0 +/processorParam:RotationZ=0 +/processorParam:Scale=1 +/processorParam:SwapWindingOrder=False +/processorParam:TextureFormat=Compressed +/build:Models/Snorlax/Shiny.obj #begin Models/truck2/Truck.obj /importer:OpenAssetImporter @@ -283,1140 +273,22 @@ /processorParam:TextureFormat=Compressed /build:Models/truck2/Truck.obj -#begin Effects/GaussianBlur.fx -/importer:EffectImporter -/processor:EffectProcessor -/processorParam:DebugMode=Auto -/build:Effects/GaussianBlur.fx - -#begin Fonts/BMP/GameJolt.xnb -/copy:Fonts/BMP/GameJolt.xnb - -#begin Songs/intro/azalea.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/azalea.ogg - -#begin Songs/intro/barktown.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/barktown.ogg - -#begin Songs/intro/battlefactory.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/battlefactory.ogg - -#begin Songs/intro/bugcontest.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/bugcontest.ogg - -#begin Songs/intro/burnedtower.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/burnedtower.ogg - -#begin Songs/intro/celadon.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/celadon.ogg - -#begin Songs/intro/cerulean.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/cerulean.ogg - -#begin Songs/intro/cerulean_cave.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/cerulean_cave.ogg - -#begin Songs/intro/champion_defeat.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/champion_defeat.ogg - -#begin Songs/intro/cherrygrove.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/cherrygrove.ogg - -#begin Songs/intro/diglettscave.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/diglettscave.ogg - -#begin Songs/intro/elite_defeat.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/elite_defeat.ogg - -#begin Songs/intro/elmslab.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/elmslab.ogg - -#begin Songs/intro/entei_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/entei_battle.ogg - -#begin Songs/intro/evolution.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/evolution.ogg - -#begin Songs/intro/frontier.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/frontier.ogg - -#begin Songs/intro/gamecorner.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/gamecorner.ogg - -#begin Songs/intro/Goldenrod.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/Goldenrod.ogg - -#begin Songs/intro/gts.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/gts.ogg - -#begin Songs/intro/ho-oh_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/ho-oh_battle.ogg - -#begin Songs/intro/IlexForest.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/IlexForest.ogg - -#begin Songs/intro/johto_elite.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/johto_elite.ogg - -#begin Songs/intro/johto_leader.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/johto_leader.ogg - -#begin Songs/intro/johto_rival_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/johto_rival_encounter.ogg - -#begin Songs/intro/johto_rocket.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/johto_rocket.ogg - -#begin Songs/intro/johto_trainer.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/johto_trainer.ogg - -#begin Songs/intro/johto_wild.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/johto_wild.ogg - -#begin Songs/intro/kanto_leader.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/kanto_leader.ogg - -#begin Songs/intro/kanto_trainer.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/kanto_trainer.ogg - -#begin Songs/intro/lavender.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/lavender.ogg - -#begin Songs/intro/leader_defeat.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/leader_defeat.ogg - -#begin Songs/intro/lobby.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/lobby.ogg - -#begin Songs/intro/lugia_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/lugia_battle.ogg - -#begin Songs/intro/mart.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/mart.ogg - -#begin Songs/intro/mary_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/mary_encounter.ogg - -#begin Songs/intro/oakslab.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/oakslab.ogg - -#begin Songs/intro/oak_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/oak_encounter.ogg - -#begin Songs/intro/pokeflute.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/pokeflute.ogg - -#begin Songs/intro/pokemon_lullaby.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/pokemon_lullaby.ogg - -#begin Songs/intro/pokemon_march.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/pokemon_march.ogg - -#begin Songs/intro/pvp.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/pvp.ogg - -#begin Songs/intro/raikou_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/raikou_battle.ogg - -#begin Songs/intro/ride.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/ride.ogg - -#begin Songs/intro/RouteMusic1.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic1.ogg - -#begin Songs/intro/RouteMusic10.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic10.ogg - -#begin Songs/intro/RouteMusic11.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic11.ogg - -#begin Songs/intro/RouteMusic2.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic2.ogg - -#begin Songs/intro/RouteMusic3.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic3.ogg - -#begin Songs/intro/RouteMusic4.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic4.ogg - -#begin Songs/intro/RouteMusic5.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic5.ogg - -#begin Songs/intro/RouteMusic6.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic6.ogg - -#begin Songs/intro/RouteMusic7.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic7.ogg - -#begin Songs/intro/RouteMusic8.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/RouteMusic8.ogg - -#begin Songs/intro/safari.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/safari.ogg - -#begin Songs/intro/show_me_around.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/show_me_around.ogg - -#begin Songs/intro/space_legend_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/space_legend_battle.ogg - -#begin Songs/intro/sprout_tower.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/sprout_tower.ogg - -#begin Songs/intro/ssaqua.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/ssaqua.ogg - -#begin Songs/intro/startower.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/startower.ogg - -#begin Songs/intro/suicune_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/suicune_battle.ogg - -#begin Songs/intro/tao_legend_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/tao_legend_battle.ogg - -#begin Songs/intro/trainer_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/trainer_encounter.ogg - -#begin Songs/intro/vermilion.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/vermilion.ogg - -#begin Songs/intro/violet.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/violet.ogg - -#begin Songs/alph.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/alph.ogg - -#begin Songs/ancient_ruins.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/ancient_ruins.ogg - -#begin Songs/azalea.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/azalea.ogg - -#begin Songs/barktown.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/barktown.ogg - -#begin Songs/battlefactory.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/battlefactory.ogg - -#begin Songs/battletower.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/battletower.ogg - -#begin Songs/brain_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/brain_battle.ogg - -#begin Songs/brain_battle_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/brain_battle_intro.ogg - -#begin Songs/bugcontest.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/bugcontest.ogg - -#begin Songs/burnedtower.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/burnedtower.ogg - -#begin Songs/celadon.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/celadon.ogg - -#begin Songs/center.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/center.ogg - -#begin Songs/cerulean.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/cerulean.ogg - -#begin Songs/cerulean_cave.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/cerulean_cave.ogg - -#begin Songs/champion_defeat.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/champion_defeat.ogg - -#begin Songs/cherrygrove.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/cherrygrove.ogg - -#begin Songs/cinnabar.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/cinnabar.ogg - -#begin Songs/credits.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/credits.ogg - -#begin Songs/dark_cave.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/dark_cave.ogg - -#begin Songs/diglettscave.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/diglettscave.ogg - -#begin Songs/dragonsden.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/dragonsden.ogg - -#begin Songs/ecruteak.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/ecruteak.ogg - -#begin Songs/elite_defeat.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/elite_defeat.ogg - -#begin Songs/elmslab.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/elmslab.ogg - -#begin Songs/entei_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/entei_battle.ogg - -#begin Songs/entei_battle_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/entei_battle_intro.ogg - -#begin Songs/eusine_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/eusine_encounter.ogg - -#begin Songs/evolution.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/evolution.ogg - -#begin Songs/frontier.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/frontier.ogg - -#begin Songs/gamecorner.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/gamecorner.ogg - -#begin Songs/Goldenrod.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/Goldenrod.ogg - -#begin Songs/gts.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/gts.ogg - -#begin Songs/gym.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/gym.ogg - -#begin Songs/HallofFame.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/HallofFame.ogg - -#begin Songs/ho-oh_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/ho-oh_battle.ogg - -#begin Songs/ho-oh_battle_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/ho-oh_battle_intro.ogg - -#begin Songs/IlexForest.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/IlexForest.ogg - -#begin Songs/indigo.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/indigo.ogg - -#begin Songs/johto_champion.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_champion.ogg - -#begin Songs/Johto_champion_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/Johto_champion_intro.ogg - -#begin Songs/johto_elite.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_elite.ogg - -#begin Songs/johto_elite_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_elite_intro.ogg - -#begin Songs/johto_leader.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_leader.ogg - -#begin Songs/johto_leader_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_leader_intro.ogg - -#begin Songs/johto_rival.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_rival.ogg - -#begin Songs/johto_rivalintro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_rivalintro.ogg - -#begin Songs/johto_rival_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_rival_encounter.ogg - -#begin Songs/johto_rocket.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_rocket.ogg - -#begin Songs/johto_rocket_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_rocket_encounter.ogg - -#begin Songs/johto_rocket_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_rocket_intro.ogg - -#begin Songs/johto_trainer.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_trainer.ogg - -#begin Songs/johto_trainer_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_trainer_intro.ogg - -#begin Songs/johto_wild.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_wild.ogg - -#begin Songs/johto_wild_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/johto_wild_intro.ogg - -#begin Songs/kanto_leader.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/kanto_leader.ogg - -#begin Songs/kanto_leader_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/kanto_leader_intro.ogg - -#begin Songs/kanto_trainer.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/kanto_trainer.ogg - -#begin Songs/kanto_trainer_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/kanto_trainer_intro.ogg - -#begin Songs/kanto_wild.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/kanto_wild.ogg - -#begin Songs/kanto_wild_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/kanto_wild_intro.ogg - -#begin Songs/kimono.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/kimono.ogg - -#begin Songs/kvictoryroad.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/kvictoryroad.ogg - -#begin Songs/lavender.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/lavender.ogg - -#begin Songs/leader_defeat.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/leader_defeat.ogg - -#begin Songs/lighthouse.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/lighthouse.ogg - -#begin Songs/lobby.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/lobby.ogg - -#begin Songs/Looker_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/Looker_encounter.ogg - -#begin Songs/lugia_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/lugia_battle.ogg - -#begin Songs/lugia_battle_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/lugia_battle_intro.ogg - -#begin Songs/mart.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/mart.ogg - -#begin Songs/mary_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/mary_encounter.ogg - -#begin Songs/mtmoonsq.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/mtmoonsq.ogg - -#begin Songs/nationalpark.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/nationalpark.ogg - -#begin Songs/oakslab.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/oakslab.ogg - -#begin Songs/oak_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/oak_encounter.ogg - -#begin Songs/pallet.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/pallet.ogg - -#begin Songs/pokeflute.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/pokeflute.ogg - -#begin Songs/pokemon_lullaby.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/pokemon_lullaby.ogg - -#begin Songs/pokemon_march.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/pokemon_march.ogg - -#begin Songs/pvp.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/pvp.ogg - -#begin Songs/raikou_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/raikou_battle.ogg - -#begin Songs/raikou_battle_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/raikou_battle_intro.ogg - -#begin Songs/rHideout.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/rHideout.ogg - -#begin Songs/ride.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/ride.ogg - -#begin Songs/rocket_broadcast.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/rocket_broadcast.ogg - -#begin Songs/RouteMusic0.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic0.ogg - -#begin Songs/RouteMusic1.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic1.ogg - -#begin Songs/RouteMusic10.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic10.ogg - -#begin Songs/RouteMusic11.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic11.ogg - -#begin Songs/RouteMusic2.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic2.ogg - -#begin Songs/RouteMusic3.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic3.ogg - -#begin Songs/RouteMusic4.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic4.ogg - -#begin Songs/RouteMusic5.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic5.ogg - -#begin Songs/RouteMusic6.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic6.ogg - -#begin Songs/RouteMusic7.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic7.ogg - -#begin Songs/RouteMusic8.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic8.ogg - -#begin Songs/RouteMusic9.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/RouteMusic9.ogg - -#begin Songs/safari.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/safari.ogg - -#begin Songs/safarigate.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/safarigate.ogg - -#begin Songs/show_me_around.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/show_me_around.ogg - -#begin Songs/space_legend_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/space_legend_battle.ogg - -#begin Songs/space_legend_battle_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/space_legend_battle_intro.ogg - -#begin Songs/sprout_tower.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/sprout_tower.ogg - -#begin Songs/ssaqua.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/ssaqua.ogg - -#begin Songs/startower.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/startower.ogg - -#begin Songs/suicune_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/suicune_battle.ogg - -#begin Songs/suicune_battle_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/suicune_battle_intro.ogg - -#begin Songs/surf.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/surf.ogg - -#begin Songs/tao_legend_battle.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/tao_legend_battle.ogg - -#begin Songs/tao_legend_battle_intro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/tao_legend_battle_intro.ogg - -#begin Songs/tintower.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/tintower.ogg - -#begin Songs/title.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/title.ogg - -#begin Songs/trainer_defeat.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/trainer_defeat.ogg - -#begin Songs/trainer_encounter.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/trainer_encounter.ogg - -#begin Songs/unown_broadcast.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/unown_broadcast.ogg - -#begin Songs/vermilion.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/vermilion.ogg - -#begin Songs/violet.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/violet.ogg - -#begin Songs/viridian_forest.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/viridian_forest.ogg - -#begin Songs/wild_defeat.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/wild_defeat.ogg - -#begin Songs/wind.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/wind.ogg - -#begin Songs/trainerschool.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/trainerschool.ogg - -#begin Songs/intro/trainerschool.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/intro/trainerschool.ogg - -#begin Songs/sovietmarch.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/sovietmarch.ogg - -#begin Songs/gameintro.ogg -/importer:OggImporter -/processor:SongProcessor -/processorParam:Quality=Best -/build:Songs/gameintro.ogg +#begin SkyDomeResource/SkyDome.x +/importer:XImporter +/processor:ModelProcessor +/processorParam:ColorKeyColor=0,0,0,0 +/processorParam:ColorKeyEnabled=True +/processorParam:DefaultEffect=BasicEffect +/processorParam:GenerateMipmaps=True +/processorParam:GenerateTangentFrames=False +/processorParam:PremultiplyTextureAlpha=True +/processorParam:PremultiplyVertexColors=True +/processorParam:ResizeTexturesToPowerOfTwo=False +/processorParam:RotationX=0 +/processorParam:RotationY=0 +/processorParam:RotationZ=0 +/processorParam:Scale=1 +/processorParam:SwapWindingOrder=False +/processorParam:TextureFormat=Color +/build:SkyDomeResource/SkyDome.x diff --git a/lib/build/Content/Fonts/BMP/Braille.xnb b/lib/build/Content/Fonts/BMP/Braille.xnb index 25661dd46..63fe10e54 100644 Binary files a/lib/build/Content/Fonts/BMP/Braille.xnb and b/lib/build/Content/Fonts/BMP/Braille.xnb differ diff --git a/lib/build/Content/Fonts/BMP/miniFont.xnb b/lib/build/Content/Fonts/BMP/miniFont.xnb index fb0765581..cf7f7c3a0 100644 Binary files a/lib/build/Content/Fonts/BMP/miniFont.xnb and b/lib/build/Content/Fonts/BMP/miniFont.xnb differ diff --git a/lib/build/Content/Models/Environment/MtSilver/Mountain.xnb b/lib/build/Content/Models/Environment/MtSilver/Mountain.xnb index 5e04cd367..4e7234671 100644 Binary files a/lib/build/Content/Models/Environment/MtSilver/Mountain.xnb and b/lib/build/Content/Models/Environment/MtSilver/Mountain.xnb differ diff --git a/lib/build/Content/Models/Environment/Test_floor/Test_floor.xnb b/lib/build/Content/Models/Environment/Test_floor/Test_floor.xnb index 518fbc3e6..20681ac84 100644 Binary files a/lib/build/Content/Models/Environment/Test_floor/Test_floor.xnb and b/lib/build/Content/Models/Environment/Test_floor/Test_floor.xnb differ diff --git a/lib/build/Content/Models/Environment/arena_colleseum.xnb b/lib/build/Content/Models/Environment/arena_colleseum.xnb index bd4f6184c..95b231494 100644 Binary files a/lib/build/Content/Models/Environment/arena_colleseum.xnb and b/lib/build/Content/Models/Environment/arena_colleseum.xnb differ diff --git a/lib/build/Content/Models/Snorlax/Normal.xnb b/lib/build/Content/Models/Snorlax/Normal.xnb index 3a0595ede..7d1758ed0 100644 Binary files a/lib/build/Content/Models/Snorlax/Normal.xnb and b/lib/build/Content/Models/Snorlax/Normal.xnb differ diff --git a/lib/build/Content/Models/Snorlax/Shiny.xnb b/lib/build/Content/Models/Snorlax/Shiny.xnb index 2066f89ed..a991c6ed7 100644 Binary files a/lib/build/Content/Models/Snorlax/Shiny.xnb and b/lib/build/Content/Models/Snorlax/Shiny.xnb differ diff --git a/lib/build/Content/Models/boat/Ship.xnb b/lib/build/Content/Models/boat/Ship.xnb index 1a9f65af7..319b03a1a 100644 Binary files a/lib/build/Content/Models/boat/Ship.xnb and b/lib/build/Content/Models/boat/Ship.xnb differ diff --git a/lib/build/Content/Models/boat/ferry.xnb b/lib/build/Content/Models/boat/ferry.xnb index 802925216..6372f7a8f 100644 Binary files a/lib/build/Content/Models/boat/ferry.xnb and b/lib/build/Content/Models/boat/ferry.xnb differ diff --git a/lib/build/Content/Models/building/P3DBuilding.xnb b/lib/build/Content/Models/building/P3DBuilding.xnb index ddab8c261..b91d4b2e1 100644 Binary files a/lib/build/Content/Models/building/P3DBuilding.xnb and b/lib/build/Content/Models/building/P3DBuilding.xnb differ diff --git a/lib/build/Content/Models/truck2/Truck.xnb b/lib/build/Content/Models/truck2/Truck.xnb index ffd735cd1..9dfa035a5 100644 Binary files a/lib/build/Content/Models/truck2/Truck.xnb and b/lib/build/Content/Models/truck2/Truck.xnb differ diff --git a/lib/build/Content/Songs/Goldenrod.xnb b/lib/build/Content/Songs/Goldenrod.xnb deleted file mode 100644 index c254f3da5..000000000 Binary files a/lib/build/Content/Songs/Goldenrod.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/HallofFame.xnb b/lib/build/Content/Songs/HallofFame.xnb deleted file mode 100644 index b5b3a2568..000000000 Binary files a/lib/build/Content/Songs/HallofFame.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/IlexForest.xnb b/lib/build/Content/Songs/IlexForest.xnb deleted file mode 100644 index f09e20b4b..000000000 Binary files a/lib/build/Content/Songs/IlexForest.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/Johto_champion_intro.xnb b/lib/build/Content/Songs/Johto_champion_intro.xnb deleted file mode 100644 index 8ee285824..000000000 Binary files a/lib/build/Content/Songs/Johto_champion_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/Looker_encounter.xnb b/lib/build/Content/Songs/Looker_encounter.xnb deleted file mode 100644 index 5ddc03e93..000000000 Binary files a/lib/build/Content/Songs/Looker_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic0.xnb b/lib/build/Content/Songs/RouteMusic0.xnb deleted file mode 100644 index b32330a7b..000000000 Binary files a/lib/build/Content/Songs/RouteMusic0.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic1.xnb b/lib/build/Content/Songs/RouteMusic1.xnb deleted file mode 100644 index 25b17ab4d..000000000 Binary files a/lib/build/Content/Songs/RouteMusic1.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic10.xnb b/lib/build/Content/Songs/RouteMusic10.xnb deleted file mode 100644 index ecaab87e9..000000000 Binary files a/lib/build/Content/Songs/RouteMusic10.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic11.xnb b/lib/build/Content/Songs/RouteMusic11.xnb deleted file mode 100644 index d256a4df0..000000000 Binary files a/lib/build/Content/Songs/RouteMusic11.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic2.xnb b/lib/build/Content/Songs/RouteMusic2.xnb deleted file mode 100644 index 03c925c46..000000000 Binary files a/lib/build/Content/Songs/RouteMusic2.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic3.xnb b/lib/build/Content/Songs/RouteMusic3.xnb deleted file mode 100644 index 067185f45..000000000 Binary files a/lib/build/Content/Songs/RouteMusic3.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic4.xnb b/lib/build/Content/Songs/RouteMusic4.xnb deleted file mode 100644 index 64c88e20c..000000000 Binary files a/lib/build/Content/Songs/RouteMusic4.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic5.xnb b/lib/build/Content/Songs/RouteMusic5.xnb deleted file mode 100644 index efe161535..000000000 Binary files a/lib/build/Content/Songs/RouteMusic5.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic6.xnb b/lib/build/Content/Songs/RouteMusic6.xnb deleted file mode 100644 index 024f623ea..000000000 Binary files a/lib/build/Content/Songs/RouteMusic6.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic7.xnb b/lib/build/Content/Songs/RouteMusic7.xnb deleted file mode 100644 index e6db24c8d..000000000 Binary files a/lib/build/Content/Songs/RouteMusic7.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic8.xnb b/lib/build/Content/Songs/RouteMusic8.xnb deleted file mode 100644 index ab8b341ed..000000000 Binary files a/lib/build/Content/Songs/RouteMusic8.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/RouteMusic9.xnb b/lib/build/Content/Songs/RouteMusic9.xnb deleted file mode 100644 index 4278ff690..000000000 Binary files a/lib/build/Content/Songs/RouteMusic9.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/alph.xnb b/lib/build/Content/Songs/alph.xnb deleted file mode 100644 index 5ca026086..000000000 Binary files a/lib/build/Content/Songs/alph.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/ancient_ruins.xnb b/lib/build/Content/Songs/ancient_ruins.xnb deleted file mode 100644 index 7903677e6..000000000 Binary files a/lib/build/Content/Songs/ancient_ruins.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/azalea.xnb b/lib/build/Content/Songs/azalea.xnb deleted file mode 100644 index f2f9dcb84..000000000 Binary files a/lib/build/Content/Songs/azalea.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/barktown.xnb b/lib/build/Content/Songs/barktown.xnb deleted file mode 100644 index 17b05b23c..000000000 Binary files a/lib/build/Content/Songs/barktown.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/battlefactory.xnb b/lib/build/Content/Songs/battlefactory.xnb deleted file mode 100644 index 7b7cb2332..000000000 Binary files a/lib/build/Content/Songs/battlefactory.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/battletower.xnb b/lib/build/Content/Songs/battletower.xnb deleted file mode 100644 index f56b3fe75..000000000 Binary files a/lib/build/Content/Songs/battletower.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/brain_battle.xnb b/lib/build/Content/Songs/brain_battle.xnb deleted file mode 100644 index a451c4e8d..000000000 Binary files a/lib/build/Content/Songs/brain_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/brain_battle_intro.xnb b/lib/build/Content/Songs/brain_battle_intro.xnb deleted file mode 100644 index e2936f73d..000000000 Binary files a/lib/build/Content/Songs/brain_battle_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/bugcontest.xnb b/lib/build/Content/Songs/bugcontest.xnb deleted file mode 100644 index ae29c3743..000000000 Binary files a/lib/build/Content/Songs/bugcontest.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/burnedtower.xnb b/lib/build/Content/Songs/burnedtower.xnb deleted file mode 100644 index 19642cd6b..000000000 Binary files a/lib/build/Content/Songs/burnedtower.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/celadon.xnb b/lib/build/Content/Songs/celadon.xnb deleted file mode 100644 index a108d61e7..000000000 Binary files a/lib/build/Content/Songs/celadon.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/center.xnb b/lib/build/Content/Songs/center.xnb deleted file mode 100644 index b5d7130ee..000000000 Binary files a/lib/build/Content/Songs/center.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/cerulean.xnb b/lib/build/Content/Songs/cerulean.xnb deleted file mode 100644 index 632f9b794..000000000 Binary files a/lib/build/Content/Songs/cerulean.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/cerulean_cave.xnb b/lib/build/Content/Songs/cerulean_cave.xnb deleted file mode 100644 index e88f0fa58..000000000 Binary files a/lib/build/Content/Songs/cerulean_cave.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/champion_defeat.xnb b/lib/build/Content/Songs/champion_defeat.xnb deleted file mode 100644 index 79dbbbc39..000000000 Binary files a/lib/build/Content/Songs/champion_defeat.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/cherrygrove.xnb b/lib/build/Content/Songs/cherrygrove.xnb deleted file mode 100644 index 1f55247b4..000000000 Binary files a/lib/build/Content/Songs/cherrygrove.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/cinnabar.xnb b/lib/build/Content/Songs/cinnabar.xnb deleted file mode 100644 index 4416726c3..000000000 Binary files a/lib/build/Content/Songs/cinnabar.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/credits.xnb b/lib/build/Content/Songs/credits.xnb deleted file mode 100644 index 576fe329c..000000000 Binary files a/lib/build/Content/Songs/credits.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/dark_cave.xnb b/lib/build/Content/Songs/dark_cave.xnb deleted file mode 100644 index 36f2d6e09..000000000 Binary files a/lib/build/Content/Songs/dark_cave.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/diglettscave.xnb b/lib/build/Content/Songs/diglettscave.xnb deleted file mode 100644 index 786e7c9a4..000000000 Binary files a/lib/build/Content/Songs/diglettscave.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/dragonsden.xnb b/lib/build/Content/Songs/dragonsden.xnb deleted file mode 100644 index dba212e06..000000000 Binary files a/lib/build/Content/Songs/dragonsden.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/ecruteak.xnb b/lib/build/Content/Songs/ecruteak.xnb deleted file mode 100644 index 3d16a2b36..000000000 Binary files a/lib/build/Content/Songs/ecruteak.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/elite_defeat.xnb b/lib/build/Content/Songs/elite_defeat.xnb deleted file mode 100644 index ff00e9056..000000000 Binary files a/lib/build/Content/Songs/elite_defeat.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/elmslab.xnb b/lib/build/Content/Songs/elmslab.xnb deleted file mode 100644 index 7e2504506..000000000 Binary files a/lib/build/Content/Songs/elmslab.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/entei_battle.xnb b/lib/build/Content/Songs/entei_battle.xnb deleted file mode 100644 index 7bab51123..000000000 Binary files a/lib/build/Content/Songs/entei_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/entei_battle_intro.xnb b/lib/build/Content/Songs/entei_battle_intro.xnb deleted file mode 100644 index b5216c462..000000000 Binary files a/lib/build/Content/Songs/entei_battle_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/eusine_encounter.xnb b/lib/build/Content/Songs/eusine_encounter.xnb deleted file mode 100644 index 3b13e384d..000000000 Binary files a/lib/build/Content/Songs/eusine_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/evolution.xnb b/lib/build/Content/Songs/evolution.xnb deleted file mode 100644 index cc79f4393..000000000 Binary files a/lib/build/Content/Songs/evolution.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/frontier.xnb b/lib/build/Content/Songs/frontier.xnb deleted file mode 100644 index e2bf4be8f..000000000 Binary files a/lib/build/Content/Songs/frontier.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/gamecorner.xnb b/lib/build/Content/Songs/gamecorner.xnb deleted file mode 100644 index 402d56281..000000000 Binary files a/lib/build/Content/Songs/gamecorner.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/gameintro.xnb b/lib/build/Content/Songs/gameintro.xnb deleted file mode 100644 index 8aeddb110..000000000 Binary files a/lib/build/Content/Songs/gameintro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/gts.xnb b/lib/build/Content/Songs/gts.xnb deleted file mode 100644 index d091f400e..000000000 Binary files a/lib/build/Content/Songs/gts.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/gym.xnb b/lib/build/Content/Songs/gym.xnb deleted file mode 100644 index e25220e7a..000000000 Binary files a/lib/build/Content/Songs/gym.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/ho-oh_battle.xnb b/lib/build/Content/Songs/ho-oh_battle.xnb deleted file mode 100644 index f3fcc3069..000000000 Binary files a/lib/build/Content/Songs/ho-oh_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/ho-oh_battle_intro.xnb b/lib/build/Content/Songs/ho-oh_battle_intro.xnb deleted file mode 100644 index dc8db4a58..000000000 Binary files a/lib/build/Content/Songs/ho-oh_battle_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/indigo.xnb b/lib/build/Content/Songs/indigo.xnb deleted file mode 100644 index 54227f0d7..000000000 Binary files a/lib/build/Content/Songs/indigo.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/Goldenrod.xnb b/lib/build/Content/Songs/intro/Goldenrod.xnb deleted file mode 100644 index 2f675f532..000000000 Binary files a/lib/build/Content/Songs/intro/Goldenrod.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/IlexForest.xnb b/lib/build/Content/Songs/intro/IlexForest.xnb deleted file mode 100644 index 46f9ac07a..000000000 Binary files a/lib/build/Content/Songs/intro/IlexForest.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic1.xnb b/lib/build/Content/Songs/intro/RouteMusic1.xnb deleted file mode 100644 index f089c0dbf..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic1.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic10.xnb b/lib/build/Content/Songs/intro/RouteMusic10.xnb deleted file mode 100644 index 53389d577..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic10.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic11.xnb b/lib/build/Content/Songs/intro/RouteMusic11.xnb deleted file mode 100644 index 07b045970..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic11.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic2.xnb b/lib/build/Content/Songs/intro/RouteMusic2.xnb deleted file mode 100644 index f9de59088..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic2.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic3.xnb b/lib/build/Content/Songs/intro/RouteMusic3.xnb deleted file mode 100644 index ed79618d4..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic3.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic4.xnb b/lib/build/Content/Songs/intro/RouteMusic4.xnb deleted file mode 100644 index d648a65f9..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic4.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic5.xnb b/lib/build/Content/Songs/intro/RouteMusic5.xnb deleted file mode 100644 index 59d8e5967..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic5.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic6.xnb b/lib/build/Content/Songs/intro/RouteMusic6.xnb deleted file mode 100644 index 02131f3a0..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic6.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic7.xnb b/lib/build/Content/Songs/intro/RouteMusic7.xnb deleted file mode 100644 index f09befe0f..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic7.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/RouteMusic8.xnb b/lib/build/Content/Songs/intro/RouteMusic8.xnb deleted file mode 100644 index 093864ba5..000000000 Binary files a/lib/build/Content/Songs/intro/RouteMusic8.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/azalea.xnb b/lib/build/Content/Songs/intro/azalea.xnb deleted file mode 100644 index ad4de334e..000000000 Binary files a/lib/build/Content/Songs/intro/azalea.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/barktown.xnb b/lib/build/Content/Songs/intro/barktown.xnb deleted file mode 100644 index d8da836f6..000000000 Binary files a/lib/build/Content/Songs/intro/barktown.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/battlefactory.xnb b/lib/build/Content/Songs/intro/battlefactory.xnb deleted file mode 100644 index 87fab2010..000000000 Binary files a/lib/build/Content/Songs/intro/battlefactory.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/bugcontest.xnb b/lib/build/Content/Songs/intro/bugcontest.xnb deleted file mode 100644 index 3914489d5..000000000 Binary files a/lib/build/Content/Songs/intro/bugcontest.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/burnedtower.xnb b/lib/build/Content/Songs/intro/burnedtower.xnb deleted file mode 100644 index 5b1e96215..000000000 Binary files a/lib/build/Content/Songs/intro/burnedtower.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/celadon.xnb b/lib/build/Content/Songs/intro/celadon.xnb deleted file mode 100644 index b3b2e6999..000000000 Binary files a/lib/build/Content/Songs/intro/celadon.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/cerulean.xnb b/lib/build/Content/Songs/intro/cerulean.xnb deleted file mode 100644 index 06c7ed3c8..000000000 Binary files a/lib/build/Content/Songs/intro/cerulean.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/cerulean_cave.xnb b/lib/build/Content/Songs/intro/cerulean_cave.xnb deleted file mode 100644 index f17aba52d..000000000 Binary files a/lib/build/Content/Songs/intro/cerulean_cave.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/champion_defeat.xnb b/lib/build/Content/Songs/intro/champion_defeat.xnb deleted file mode 100644 index e39d51865..000000000 Binary files a/lib/build/Content/Songs/intro/champion_defeat.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/cherrygrove.xnb b/lib/build/Content/Songs/intro/cherrygrove.xnb deleted file mode 100644 index 0a68e4345..000000000 Binary files a/lib/build/Content/Songs/intro/cherrygrove.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/diglettscave.xnb b/lib/build/Content/Songs/intro/diglettscave.xnb deleted file mode 100644 index 92bdfa9c3..000000000 Binary files a/lib/build/Content/Songs/intro/diglettscave.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/elite_defeat.xnb b/lib/build/Content/Songs/intro/elite_defeat.xnb deleted file mode 100644 index 17d89637a..000000000 Binary files a/lib/build/Content/Songs/intro/elite_defeat.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/elmslab.xnb b/lib/build/Content/Songs/intro/elmslab.xnb deleted file mode 100644 index c5a6da212..000000000 Binary files a/lib/build/Content/Songs/intro/elmslab.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/entei_battle.xnb b/lib/build/Content/Songs/intro/entei_battle.xnb deleted file mode 100644 index 4edfa8b7d..000000000 Binary files a/lib/build/Content/Songs/intro/entei_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/evolution.xnb b/lib/build/Content/Songs/intro/evolution.xnb deleted file mode 100644 index 77ab3389a..000000000 Binary files a/lib/build/Content/Songs/intro/evolution.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/frontier.xnb b/lib/build/Content/Songs/intro/frontier.xnb deleted file mode 100644 index c87351e4e..000000000 Binary files a/lib/build/Content/Songs/intro/frontier.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/gamecorner.xnb b/lib/build/Content/Songs/intro/gamecorner.xnb deleted file mode 100644 index 843789a88..000000000 Binary files a/lib/build/Content/Songs/intro/gamecorner.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/gts.xnb b/lib/build/Content/Songs/intro/gts.xnb deleted file mode 100644 index fa6f82cba..000000000 Binary files a/lib/build/Content/Songs/intro/gts.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/ho-oh_battle.xnb b/lib/build/Content/Songs/intro/ho-oh_battle.xnb deleted file mode 100644 index 4a6b9f029..000000000 Binary files a/lib/build/Content/Songs/intro/ho-oh_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/johto_elite.xnb b/lib/build/Content/Songs/intro/johto_elite.xnb deleted file mode 100644 index 6b8132b9d..000000000 Binary files a/lib/build/Content/Songs/intro/johto_elite.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/johto_leader.xnb b/lib/build/Content/Songs/intro/johto_leader.xnb deleted file mode 100644 index 658f1b7c6..000000000 Binary files a/lib/build/Content/Songs/intro/johto_leader.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/johto_rival_encounter.xnb b/lib/build/Content/Songs/intro/johto_rival_encounter.xnb deleted file mode 100644 index 39214dec6..000000000 Binary files a/lib/build/Content/Songs/intro/johto_rival_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/johto_rocket.xnb b/lib/build/Content/Songs/intro/johto_rocket.xnb deleted file mode 100644 index d7b224ff7..000000000 Binary files a/lib/build/Content/Songs/intro/johto_rocket.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/johto_trainer.xnb b/lib/build/Content/Songs/intro/johto_trainer.xnb deleted file mode 100644 index 59979fec2..000000000 Binary files a/lib/build/Content/Songs/intro/johto_trainer.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/johto_wild.xnb b/lib/build/Content/Songs/intro/johto_wild.xnb deleted file mode 100644 index b16fefb3e..000000000 Binary files a/lib/build/Content/Songs/intro/johto_wild.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/kanto_leader.xnb b/lib/build/Content/Songs/intro/kanto_leader.xnb deleted file mode 100644 index 421eb8aaa..000000000 Binary files a/lib/build/Content/Songs/intro/kanto_leader.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/kanto_trainer.xnb b/lib/build/Content/Songs/intro/kanto_trainer.xnb deleted file mode 100644 index b33a76d91..000000000 Binary files a/lib/build/Content/Songs/intro/kanto_trainer.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/lavender.xnb b/lib/build/Content/Songs/intro/lavender.xnb deleted file mode 100644 index ccfc85467..000000000 Binary files a/lib/build/Content/Songs/intro/lavender.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/leader_defeat.xnb b/lib/build/Content/Songs/intro/leader_defeat.xnb deleted file mode 100644 index 0cd5a326a..000000000 Binary files a/lib/build/Content/Songs/intro/leader_defeat.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/lobby.xnb b/lib/build/Content/Songs/intro/lobby.xnb deleted file mode 100644 index a85d8f8e5..000000000 Binary files a/lib/build/Content/Songs/intro/lobby.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/lugia_battle.xnb b/lib/build/Content/Songs/intro/lugia_battle.xnb deleted file mode 100644 index b46b86ad0..000000000 Binary files a/lib/build/Content/Songs/intro/lugia_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/mart.xnb b/lib/build/Content/Songs/intro/mart.xnb deleted file mode 100644 index e2e31eb1c..000000000 Binary files a/lib/build/Content/Songs/intro/mart.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/mary_encounter.xnb b/lib/build/Content/Songs/intro/mary_encounter.xnb deleted file mode 100644 index f87d74ad6..000000000 Binary files a/lib/build/Content/Songs/intro/mary_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/oak_encounter.xnb b/lib/build/Content/Songs/intro/oak_encounter.xnb deleted file mode 100644 index 95d94285d..000000000 Binary files a/lib/build/Content/Songs/intro/oak_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/oakslab.xnb b/lib/build/Content/Songs/intro/oakslab.xnb deleted file mode 100644 index 52b3d1434..000000000 Binary files a/lib/build/Content/Songs/intro/oakslab.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/pokeflute.xnb b/lib/build/Content/Songs/intro/pokeflute.xnb deleted file mode 100644 index 58d095711..000000000 Binary files a/lib/build/Content/Songs/intro/pokeflute.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/pokemon_lullaby.xnb b/lib/build/Content/Songs/intro/pokemon_lullaby.xnb deleted file mode 100644 index 19802af0a..000000000 Binary files a/lib/build/Content/Songs/intro/pokemon_lullaby.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/pokemon_march.xnb b/lib/build/Content/Songs/intro/pokemon_march.xnb deleted file mode 100644 index 59c265aa9..000000000 Binary files a/lib/build/Content/Songs/intro/pokemon_march.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/pvp.xnb b/lib/build/Content/Songs/intro/pvp.xnb deleted file mode 100644 index ff474ead8..000000000 Binary files a/lib/build/Content/Songs/intro/pvp.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/raikou_battle.xnb b/lib/build/Content/Songs/intro/raikou_battle.xnb deleted file mode 100644 index ed877e8e4..000000000 Binary files a/lib/build/Content/Songs/intro/raikou_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/ride.xnb b/lib/build/Content/Songs/intro/ride.xnb deleted file mode 100644 index 657a95480..000000000 Binary files a/lib/build/Content/Songs/intro/ride.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/safari.xnb b/lib/build/Content/Songs/intro/safari.xnb deleted file mode 100644 index ccb1db9ca..000000000 Binary files a/lib/build/Content/Songs/intro/safari.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/show_me_around.xnb b/lib/build/Content/Songs/intro/show_me_around.xnb deleted file mode 100644 index 30b7fb6f4..000000000 Binary files a/lib/build/Content/Songs/intro/show_me_around.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/space_legend_battle.xnb b/lib/build/Content/Songs/intro/space_legend_battle.xnb deleted file mode 100644 index 6839d929c..000000000 Binary files a/lib/build/Content/Songs/intro/space_legend_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/sprout_tower.xnb b/lib/build/Content/Songs/intro/sprout_tower.xnb deleted file mode 100644 index 7a3e6b075..000000000 Binary files a/lib/build/Content/Songs/intro/sprout_tower.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/ssaqua.xnb b/lib/build/Content/Songs/intro/ssaqua.xnb deleted file mode 100644 index ed5252d22..000000000 Binary files a/lib/build/Content/Songs/intro/ssaqua.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/startower.xnb b/lib/build/Content/Songs/intro/startower.xnb deleted file mode 100644 index 6c3f24c26..000000000 Binary files a/lib/build/Content/Songs/intro/startower.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/suicune_battle.xnb b/lib/build/Content/Songs/intro/suicune_battle.xnb deleted file mode 100644 index 7b0a435c9..000000000 Binary files a/lib/build/Content/Songs/intro/suicune_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/tao_legend_battle.xnb b/lib/build/Content/Songs/intro/tao_legend_battle.xnb deleted file mode 100644 index fa9365329..000000000 Binary files a/lib/build/Content/Songs/intro/tao_legend_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/trainer_encounter.xnb b/lib/build/Content/Songs/intro/trainer_encounter.xnb deleted file mode 100644 index 96b582f72..000000000 Binary files a/lib/build/Content/Songs/intro/trainer_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/trainerschool.xnb b/lib/build/Content/Songs/intro/trainerschool.xnb deleted file mode 100644 index 6052deda0..000000000 Binary files a/lib/build/Content/Songs/intro/trainerschool.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/vermilion.xnb b/lib/build/Content/Songs/intro/vermilion.xnb deleted file mode 100644 index cbce9c1f3..000000000 Binary files a/lib/build/Content/Songs/intro/vermilion.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/intro/violet.xnb b/lib/build/Content/Songs/intro/violet.xnb deleted file mode 100644 index 58b16c8cc..000000000 Binary files a/lib/build/Content/Songs/intro/violet.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_champion.xnb b/lib/build/Content/Songs/johto_champion.xnb deleted file mode 100644 index a89a1a9e7..000000000 Binary files a/lib/build/Content/Songs/johto_champion.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_elite.xnb b/lib/build/Content/Songs/johto_elite.xnb deleted file mode 100644 index 4bc469a85..000000000 Binary files a/lib/build/Content/Songs/johto_elite.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_elite_intro.xnb b/lib/build/Content/Songs/johto_elite_intro.xnb deleted file mode 100644 index d126af0ec..000000000 Binary files a/lib/build/Content/Songs/johto_elite_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_leader.xnb b/lib/build/Content/Songs/johto_leader.xnb deleted file mode 100644 index 00b96fee2..000000000 Binary files a/lib/build/Content/Songs/johto_leader.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_leader_intro.xnb b/lib/build/Content/Songs/johto_leader_intro.xnb deleted file mode 100644 index 3ccce96a7..000000000 Binary files a/lib/build/Content/Songs/johto_leader_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_rival.xnb b/lib/build/Content/Songs/johto_rival.xnb deleted file mode 100644 index b693d2552..000000000 Binary files a/lib/build/Content/Songs/johto_rival.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_rival_encounter.xnb b/lib/build/Content/Songs/johto_rival_encounter.xnb deleted file mode 100644 index d71142f47..000000000 Binary files a/lib/build/Content/Songs/johto_rival_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_rivalintro.xnb b/lib/build/Content/Songs/johto_rivalintro.xnb deleted file mode 100644 index 62bc13134..000000000 Binary files a/lib/build/Content/Songs/johto_rivalintro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_rocket.xnb b/lib/build/Content/Songs/johto_rocket.xnb deleted file mode 100644 index 504262b0f..000000000 Binary files a/lib/build/Content/Songs/johto_rocket.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_rocket_encounter.xnb b/lib/build/Content/Songs/johto_rocket_encounter.xnb deleted file mode 100644 index 52ebff169..000000000 Binary files a/lib/build/Content/Songs/johto_rocket_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_rocket_intro.xnb b/lib/build/Content/Songs/johto_rocket_intro.xnb deleted file mode 100644 index 5938183f7..000000000 Binary files a/lib/build/Content/Songs/johto_rocket_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_trainer.xnb b/lib/build/Content/Songs/johto_trainer.xnb deleted file mode 100644 index 4929f172f..000000000 Binary files a/lib/build/Content/Songs/johto_trainer.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_trainer_intro.xnb b/lib/build/Content/Songs/johto_trainer_intro.xnb deleted file mode 100644 index 4f84f41f5..000000000 Binary files a/lib/build/Content/Songs/johto_trainer_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_wild.xnb b/lib/build/Content/Songs/johto_wild.xnb deleted file mode 100644 index babc890ca..000000000 Binary files a/lib/build/Content/Songs/johto_wild.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/johto_wild_intro.xnb b/lib/build/Content/Songs/johto_wild_intro.xnb deleted file mode 100644 index 8adbca413..000000000 Binary files a/lib/build/Content/Songs/johto_wild_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/kanto_leader.xnb b/lib/build/Content/Songs/kanto_leader.xnb deleted file mode 100644 index 7aad7e1d5..000000000 Binary files a/lib/build/Content/Songs/kanto_leader.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/kanto_leader_intro.xnb b/lib/build/Content/Songs/kanto_leader_intro.xnb deleted file mode 100644 index 386e0bd8e..000000000 Binary files a/lib/build/Content/Songs/kanto_leader_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/kanto_trainer.xnb b/lib/build/Content/Songs/kanto_trainer.xnb deleted file mode 100644 index b3016d2e7..000000000 Binary files a/lib/build/Content/Songs/kanto_trainer.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/kanto_trainer_intro.xnb b/lib/build/Content/Songs/kanto_trainer_intro.xnb deleted file mode 100644 index 562d5da53..000000000 Binary files a/lib/build/Content/Songs/kanto_trainer_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/kanto_wild.xnb b/lib/build/Content/Songs/kanto_wild.xnb deleted file mode 100644 index 9dea61342..000000000 Binary files a/lib/build/Content/Songs/kanto_wild.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/kanto_wild_intro.xnb b/lib/build/Content/Songs/kanto_wild_intro.xnb deleted file mode 100644 index 751f6fe88..000000000 Binary files a/lib/build/Content/Songs/kanto_wild_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/kimono.xnb b/lib/build/Content/Songs/kimono.xnb deleted file mode 100644 index 04e39296b..000000000 Binary files a/lib/build/Content/Songs/kimono.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/kvictoryroad.xnb b/lib/build/Content/Songs/kvictoryroad.xnb deleted file mode 100644 index 77b652e46..000000000 Binary files a/lib/build/Content/Songs/kvictoryroad.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/lavender.xnb b/lib/build/Content/Songs/lavender.xnb deleted file mode 100644 index 83c606491..000000000 Binary files a/lib/build/Content/Songs/lavender.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/leader_defeat.xnb b/lib/build/Content/Songs/leader_defeat.xnb deleted file mode 100644 index 6c7564105..000000000 Binary files a/lib/build/Content/Songs/leader_defeat.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/lighthouse.xnb b/lib/build/Content/Songs/lighthouse.xnb deleted file mode 100644 index 519c39e9a..000000000 Binary files a/lib/build/Content/Songs/lighthouse.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/lobby.xnb b/lib/build/Content/Songs/lobby.xnb deleted file mode 100644 index 86a7cc5ce..000000000 Binary files a/lib/build/Content/Songs/lobby.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/lugia_battle.xnb b/lib/build/Content/Songs/lugia_battle.xnb deleted file mode 100644 index fffb16b47..000000000 Binary files a/lib/build/Content/Songs/lugia_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/lugia_battle_intro.xnb b/lib/build/Content/Songs/lugia_battle_intro.xnb deleted file mode 100644 index c7754b6be..000000000 Binary files a/lib/build/Content/Songs/lugia_battle_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/mart.xnb b/lib/build/Content/Songs/mart.xnb deleted file mode 100644 index e550bf36b..000000000 Binary files a/lib/build/Content/Songs/mart.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/mary_encounter.xnb b/lib/build/Content/Songs/mary_encounter.xnb deleted file mode 100644 index aa8b77e29..000000000 Binary files a/lib/build/Content/Songs/mary_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/mtmoonsq.xnb b/lib/build/Content/Songs/mtmoonsq.xnb deleted file mode 100644 index bafecde9f..000000000 Binary files a/lib/build/Content/Songs/mtmoonsq.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/nationalpark.xnb b/lib/build/Content/Songs/nationalpark.xnb deleted file mode 100644 index f6d6627ba..000000000 Binary files a/lib/build/Content/Songs/nationalpark.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/oak_encounter.xnb b/lib/build/Content/Songs/oak_encounter.xnb deleted file mode 100644 index 229fbd30d..000000000 Binary files a/lib/build/Content/Songs/oak_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/oakslab.xnb b/lib/build/Content/Songs/oakslab.xnb deleted file mode 100644 index b28479e51..000000000 Binary files a/lib/build/Content/Songs/oakslab.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/pallet.xnb b/lib/build/Content/Songs/pallet.xnb deleted file mode 100644 index 3e2341b6d..000000000 Binary files a/lib/build/Content/Songs/pallet.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/pokeflute.xnb b/lib/build/Content/Songs/pokeflute.xnb deleted file mode 100644 index fb5fc11dd..000000000 Binary files a/lib/build/Content/Songs/pokeflute.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/pokemon_lullaby.xnb b/lib/build/Content/Songs/pokemon_lullaby.xnb deleted file mode 100644 index d2444ce17..000000000 Binary files a/lib/build/Content/Songs/pokemon_lullaby.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/pokemon_march.xnb b/lib/build/Content/Songs/pokemon_march.xnb deleted file mode 100644 index fb9dde632..000000000 Binary files a/lib/build/Content/Songs/pokemon_march.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/pvp.xnb b/lib/build/Content/Songs/pvp.xnb deleted file mode 100644 index c62d3fec7..000000000 Binary files a/lib/build/Content/Songs/pvp.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/rHideout.xnb b/lib/build/Content/Songs/rHideout.xnb deleted file mode 100644 index 6cb48d16f..000000000 Binary files a/lib/build/Content/Songs/rHideout.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/raikou_battle.xnb b/lib/build/Content/Songs/raikou_battle.xnb deleted file mode 100644 index 42c05cefb..000000000 Binary files a/lib/build/Content/Songs/raikou_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/raikou_battle_intro.xnb b/lib/build/Content/Songs/raikou_battle_intro.xnb deleted file mode 100644 index 3e310849f..000000000 Binary files a/lib/build/Content/Songs/raikou_battle_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/ride.xnb b/lib/build/Content/Songs/ride.xnb deleted file mode 100644 index 894f876b2..000000000 Binary files a/lib/build/Content/Songs/ride.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/rocket_broadcast.xnb b/lib/build/Content/Songs/rocket_broadcast.xnb deleted file mode 100644 index 5c37021d9..000000000 Binary files a/lib/build/Content/Songs/rocket_broadcast.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/safari.xnb b/lib/build/Content/Songs/safari.xnb deleted file mode 100644 index 195428e7e..000000000 Binary files a/lib/build/Content/Songs/safari.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/safarigate.xnb b/lib/build/Content/Songs/safarigate.xnb deleted file mode 100644 index f86404ce2..000000000 Binary files a/lib/build/Content/Songs/safarigate.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/show_me_around.xnb b/lib/build/Content/Songs/show_me_around.xnb deleted file mode 100644 index 9b1e70c91..000000000 Binary files a/lib/build/Content/Songs/show_me_around.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/sovietmarch.xnb b/lib/build/Content/Songs/sovietmarch.xnb deleted file mode 100644 index 0af9beb85..000000000 Binary files a/lib/build/Content/Songs/sovietmarch.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/space_legend_battle.xnb b/lib/build/Content/Songs/space_legend_battle.xnb deleted file mode 100644 index e9ed50f5a..000000000 Binary files a/lib/build/Content/Songs/space_legend_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/space_legend_battle_intro.xnb b/lib/build/Content/Songs/space_legend_battle_intro.xnb deleted file mode 100644 index 67bc84723..000000000 Binary files a/lib/build/Content/Songs/space_legend_battle_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/sprout_tower.xnb b/lib/build/Content/Songs/sprout_tower.xnb deleted file mode 100644 index f08c5d53c..000000000 Binary files a/lib/build/Content/Songs/sprout_tower.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/ssaqua.xnb b/lib/build/Content/Songs/ssaqua.xnb deleted file mode 100644 index 2ade59480..000000000 Binary files a/lib/build/Content/Songs/ssaqua.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/startower.xnb b/lib/build/Content/Songs/startower.xnb deleted file mode 100644 index be431f2d0..000000000 Binary files a/lib/build/Content/Songs/startower.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/suicune_battle.xnb b/lib/build/Content/Songs/suicune_battle.xnb deleted file mode 100644 index c696bf9ae..000000000 Binary files a/lib/build/Content/Songs/suicune_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/suicune_battle_intro.xnb b/lib/build/Content/Songs/suicune_battle_intro.xnb deleted file mode 100644 index d8bfee204..000000000 Binary files a/lib/build/Content/Songs/suicune_battle_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/surf.xnb b/lib/build/Content/Songs/surf.xnb deleted file mode 100644 index f47b36223..000000000 Binary files a/lib/build/Content/Songs/surf.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/tao_legend_battle.xnb b/lib/build/Content/Songs/tao_legend_battle.xnb deleted file mode 100644 index 71d34e03e..000000000 Binary files a/lib/build/Content/Songs/tao_legend_battle.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/tao_legend_battle_intro.xnb b/lib/build/Content/Songs/tao_legend_battle_intro.xnb deleted file mode 100644 index 1467d68ea..000000000 Binary files a/lib/build/Content/Songs/tao_legend_battle_intro.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/tintower.xnb b/lib/build/Content/Songs/tintower.xnb deleted file mode 100644 index 43e2939da..000000000 Binary files a/lib/build/Content/Songs/tintower.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/title.xnb b/lib/build/Content/Songs/title.xnb deleted file mode 100644 index e03537864..000000000 Binary files a/lib/build/Content/Songs/title.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/trainer_defeat.xnb b/lib/build/Content/Songs/trainer_defeat.xnb deleted file mode 100644 index 0a16bef77..000000000 Binary files a/lib/build/Content/Songs/trainer_defeat.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/trainer_encounter.xnb b/lib/build/Content/Songs/trainer_encounter.xnb deleted file mode 100644 index 87cede2f8..000000000 Binary files a/lib/build/Content/Songs/trainer_encounter.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/trainerschool.xnb b/lib/build/Content/Songs/trainerschool.xnb deleted file mode 100644 index c504836c1..000000000 Binary files a/lib/build/Content/Songs/trainerschool.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/unown_broadcast.xnb b/lib/build/Content/Songs/unown_broadcast.xnb deleted file mode 100644 index 7385abb5f..000000000 Binary files a/lib/build/Content/Songs/unown_broadcast.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/vermilion.xnb b/lib/build/Content/Songs/vermilion.xnb deleted file mode 100644 index 838ad6ea2..000000000 Binary files a/lib/build/Content/Songs/vermilion.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/violet.xnb b/lib/build/Content/Songs/violet.xnb deleted file mode 100644 index 48dfe747e..000000000 Binary files a/lib/build/Content/Songs/violet.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/viridian_forest.xnb b/lib/build/Content/Songs/viridian_forest.xnb deleted file mode 100644 index 65df8d5a5..000000000 Binary files a/lib/build/Content/Songs/viridian_forest.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/wild_defeat.xnb b/lib/build/Content/Songs/wild_defeat.xnb deleted file mode 100644 index 65572440f..000000000 Binary files a/lib/build/Content/Songs/wild_defeat.xnb and /dev/null differ diff --git a/lib/build/Content/Songs/wind.xnb b/lib/build/Content/Songs/wind.xnb deleted file mode 100644 index 7c3495d0e..000000000 Binary files a/lib/build/Content/Songs/wind.xnb and /dev/null differ diff --git a/lib/build/GameDevCommon.dll b/lib/build/GameDevCommon.dll index 9afd80d89..3a280ea2c 100644 Binary files a/lib/build/GameDevCommon.dll and b/lib/build/GameDevCommon.dll differ diff --git a/lib/build/NAudio.Vorbis.dll b/lib/build/NAudio.Vorbis.dll new file mode 100644 index 000000000..c6a5dcec6 Binary files /dev/null and b/lib/build/NAudio.Vorbis.dll differ diff --git a/lib/build/NAudio.dll b/lib/build/NAudio.dll index 9425d4029..84643f17c 100644 Binary files a/lib/build/NAudio.dll and b/lib/build/NAudio.dll differ diff --git a/lib/build/NVorbis.dll b/lib/build/NVorbis.dll new file mode 100644 index 000000000..abc7e1810 Binary files /dev/null and b/lib/build/NVorbis.dll differ diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe index d66c69a9e..8bb593e67 100644 Binary files a/lib/build/Pokemon3D.exe and b/lib/build/Pokemon3D.exe differ diff --git a/lib/build/System.Buffers.dll b/lib/build/System.Buffers.dll new file mode 100644 index 000000000..fb2911dd6 Binary files /dev/null and b/lib/build/System.Buffers.dll differ diff --git a/lib/build/System.Memory.dll b/lib/build/System.Memory.dll new file mode 100644 index 000000000..342368065 Binary files /dev/null and b/lib/build/System.Memory.dll differ diff --git a/lib/build/System.Runtime.CompilerServices.Unsafe.dll b/lib/build/System.Runtime.CompilerServices.Unsafe.dll new file mode 100644 index 000000000..d99e9f9eb Binary files /dev/null and b/lib/build/System.Runtime.CompilerServices.Unsafe.dll differ diff --git a/lib/build/System.ValueTuple.dll b/lib/build/System.ValueTuple.dll new file mode 100644 index 000000000..65fa9eeea Binary files /dev/null and b/lib/build/System.ValueTuple.dll differ