diff --git a/P3D/Content/Songs/Goldenrod.mp3 b/P3D/Content/Songs/Goldenrod.mp3 deleted file mode 100644 index 9bb2c6c72..000000000 Binary files a/P3D/Content/Songs/Goldenrod.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/HallofFame.mp3 b/P3D/Content/Songs/HallofFame.mp3 deleted file mode 100644 index e5a8e034e..000000000 Binary files a/P3D/Content/Songs/HallofFame.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/IlexForest.mp3 b/P3D/Content/Songs/IlexForest.mp3 deleted file mode 100644 index b09964ba7..000000000 Binary files a/P3D/Content/Songs/IlexForest.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/Johto_champion_intro.mp3 b/P3D/Content/Songs/Johto_champion_intro.mp3 deleted file mode 100644 index 5a3eaf435..000000000 Binary files a/P3D/Content/Songs/Johto_champion_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/Looker_encounter.mp3 b/P3D/Content/Songs/Looker_encounter.mp3 deleted file mode 100644 index 4d9443f7d..000000000 Binary files a/P3D/Content/Songs/Looker_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic0.mp3 b/P3D/Content/Songs/RouteMusic0.mp3 deleted file mode 100644 index e53b46920..000000000 Binary files a/P3D/Content/Songs/RouteMusic0.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic1.mp3 b/P3D/Content/Songs/RouteMusic1.mp3 deleted file mode 100644 index 0d821c966..000000000 Binary files a/P3D/Content/Songs/RouteMusic1.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic10.mp3 b/P3D/Content/Songs/RouteMusic10.mp3 deleted file mode 100644 index 917c39637..000000000 Binary files a/P3D/Content/Songs/RouteMusic10.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic11.mp3 b/P3D/Content/Songs/RouteMusic11.mp3 deleted file mode 100644 index 4b432f8a2..000000000 Binary files a/P3D/Content/Songs/RouteMusic11.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic2.mp3 b/P3D/Content/Songs/RouteMusic2.mp3 deleted file mode 100644 index 949281189..000000000 Binary files a/P3D/Content/Songs/RouteMusic2.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic3.mp3 b/P3D/Content/Songs/RouteMusic3.mp3 deleted file mode 100644 index 392593d48..000000000 Binary files a/P3D/Content/Songs/RouteMusic3.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic4.mp3 b/P3D/Content/Songs/RouteMusic4.mp3 deleted file mode 100644 index 288e657a3..000000000 Binary files a/P3D/Content/Songs/RouteMusic4.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic5.mp3 b/P3D/Content/Songs/RouteMusic5.mp3 deleted file mode 100644 index 102223a8b..000000000 Binary files a/P3D/Content/Songs/RouteMusic5.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic6.mp3 b/P3D/Content/Songs/RouteMusic6.mp3 deleted file mode 100644 index 6acd7e001..000000000 Binary files a/P3D/Content/Songs/RouteMusic6.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic7.mp3 b/P3D/Content/Songs/RouteMusic7.mp3 deleted file mode 100644 index d553527bd..000000000 Binary files a/P3D/Content/Songs/RouteMusic7.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic8.mp3 b/P3D/Content/Songs/RouteMusic8.mp3 deleted file mode 100644 index c7c125223..000000000 Binary files a/P3D/Content/Songs/RouteMusic8.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/RouteMusic9.mp3 b/P3D/Content/Songs/RouteMusic9.mp3 deleted file mode 100644 index 5540b18dd..000000000 Binary files a/P3D/Content/Songs/RouteMusic9.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/alph.mp3 b/P3D/Content/Songs/alph.mp3 deleted file mode 100644 index 50c7b750a..000000000 Binary files a/P3D/Content/Songs/alph.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/ancient_ruins.mp3 b/P3D/Content/Songs/ancient_ruins.mp3 deleted file mode 100644 index 7001f14c7..000000000 Binary files a/P3D/Content/Songs/ancient_ruins.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/azalea.mp3 b/P3D/Content/Songs/azalea.mp3 deleted file mode 100644 index 3f1303214..000000000 Binary files a/P3D/Content/Songs/azalea.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/barktown.mp3 b/P3D/Content/Songs/barktown.mp3 deleted file mode 100644 index 25a9786c3..000000000 Binary files a/P3D/Content/Songs/barktown.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/battlefactory.mp3 b/P3D/Content/Songs/battlefactory.mp3 deleted file mode 100644 index 50125b1d0..000000000 Binary files a/P3D/Content/Songs/battlefactory.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/battletower.mp3 b/P3D/Content/Songs/battletower.mp3 deleted file mode 100644 index b4fdffd45..000000000 Binary files a/P3D/Content/Songs/battletower.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/brain_battle.mp3 b/P3D/Content/Songs/brain_battle.mp3 deleted file mode 100644 index d33acf313..000000000 Binary files a/P3D/Content/Songs/brain_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/brain_battle_intro.mp3 b/P3D/Content/Songs/brain_battle_intro.mp3 deleted file mode 100644 index 56ac580bc..000000000 Binary files a/P3D/Content/Songs/brain_battle_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/bugcontest.mp3 b/P3D/Content/Songs/bugcontest.mp3 deleted file mode 100644 index ec91f4af5..000000000 Binary files a/P3D/Content/Songs/bugcontest.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/burnedtower.mp3 b/P3D/Content/Songs/burnedtower.mp3 deleted file mode 100644 index fb7ed56b2..000000000 Binary files a/P3D/Content/Songs/burnedtower.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/celadon.mp3 b/P3D/Content/Songs/celadon.mp3 deleted file mode 100644 index 59349074b..000000000 Binary files a/P3D/Content/Songs/celadon.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/center.mp3 b/P3D/Content/Songs/center.mp3 deleted file mode 100644 index 6381d8722..000000000 Binary files a/P3D/Content/Songs/center.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/cerulean.mp3 b/P3D/Content/Songs/cerulean.mp3 deleted file mode 100644 index 89e86095f..000000000 Binary files a/P3D/Content/Songs/cerulean.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/cerulean_cave.mp3 b/P3D/Content/Songs/cerulean_cave.mp3 deleted file mode 100644 index 1c50e35f7..000000000 Binary files a/P3D/Content/Songs/cerulean_cave.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/champion_defeat.mp3 b/P3D/Content/Songs/champion_defeat.mp3 deleted file mode 100644 index 60bc608a2..000000000 Binary files a/P3D/Content/Songs/champion_defeat.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/cherrygrove.mp3 b/P3D/Content/Songs/cherrygrove.mp3 deleted file mode 100644 index 5bf338877..000000000 Binary files a/P3D/Content/Songs/cherrygrove.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/cinnabar.mp3 b/P3D/Content/Songs/cinnabar.mp3 deleted file mode 100644 index fb754e3e4..000000000 Binary files a/P3D/Content/Songs/cinnabar.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/credits.mp3 b/P3D/Content/Songs/credits.mp3 deleted file mode 100644 index 79ee8f0ef..000000000 Binary files a/P3D/Content/Songs/credits.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/dark_cave.mp3 b/P3D/Content/Songs/dark_cave.mp3 deleted file mode 100644 index 2db159629..000000000 Binary files a/P3D/Content/Songs/dark_cave.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/diglettscave.mp3 b/P3D/Content/Songs/diglettscave.mp3 deleted file mode 100644 index 72bdbfdac..000000000 Binary files a/P3D/Content/Songs/diglettscave.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/dragonsden.mp3 b/P3D/Content/Songs/dragonsden.mp3 deleted file mode 100644 index 240ef14f3..000000000 Binary files a/P3D/Content/Songs/dragonsden.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/ecruteak.mp3 b/P3D/Content/Songs/ecruteak.mp3 deleted file mode 100644 index 5b7400ef9..000000000 Binary files a/P3D/Content/Songs/ecruteak.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/elite_defeat.mp3 b/P3D/Content/Songs/elite_defeat.mp3 deleted file mode 100644 index 60bc608a2..000000000 Binary files a/P3D/Content/Songs/elite_defeat.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/elmslab.mp3 b/P3D/Content/Songs/elmslab.mp3 deleted file mode 100644 index 2f0935ec8..000000000 Binary files a/P3D/Content/Songs/elmslab.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/entei_battle.mp3 b/P3D/Content/Songs/entei_battle.mp3 deleted file mode 100644 index 0a55dd711..000000000 Binary files a/P3D/Content/Songs/entei_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/entei_battle_intro.mp3 b/P3D/Content/Songs/entei_battle_intro.mp3 deleted file mode 100644 index 9f0819348..000000000 Binary files a/P3D/Content/Songs/entei_battle_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/eusine_encounter.mp3 b/P3D/Content/Songs/eusine_encounter.mp3 deleted file mode 100644 index 8b8d8237e..000000000 Binary files a/P3D/Content/Songs/eusine_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/evolution.mp3 b/P3D/Content/Songs/evolution.mp3 deleted file mode 100644 index 6268848da..000000000 Binary files a/P3D/Content/Songs/evolution.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/frontier.mp3 b/P3D/Content/Songs/frontier.mp3 deleted file mode 100644 index b9fc8c533..000000000 Binary files a/P3D/Content/Songs/frontier.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/gamecorner.mp3 b/P3D/Content/Songs/gamecorner.mp3 deleted file mode 100644 index 137ab0a8d..000000000 Binary files a/P3D/Content/Songs/gamecorner.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/gameintro.mp3 b/P3D/Content/Songs/gameintro.mp3 deleted file mode 100644 index 4c9f9b97f..000000000 Binary files a/P3D/Content/Songs/gameintro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/gts.mp3 b/P3D/Content/Songs/gts.mp3 deleted file mode 100644 index 0c34aa640..000000000 Binary files a/P3D/Content/Songs/gts.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/gym.mp3 b/P3D/Content/Songs/gym.mp3 deleted file mode 100644 index d07bfc703..000000000 Binary files a/P3D/Content/Songs/gym.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/ho-oh_battle.mp3 b/P3D/Content/Songs/ho-oh_battle.mp3 deleted file mode 100644 index 2a6f17a9c..000000000 Binary files a/P3D/Content/Songs/ho-oh_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/ho-oh_battle_intro.mp3 b/P3D/Content/Songs/ho-oh_battle_intro.mp3 deleted file mode 100644 index 8ab478d5c..000000000 Binary files a/P3D/Content/Songs/ho-oh_battle_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/indigo.mp3 b/P3D/Content/Songs/indigo.mp3 deleted file mode 100644 index 2be10d7d2..000000000 Binary files a/P3D/Content/Songs/indigo.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/IlexForest.mp3 b/P3D/Content/Songs/intro/IlexForest.mp3 deleted file mode 100644 index 74249e874..000000000 Binary files a/P3D/Content/Songs/intro/IlexForest.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic1.mp3 b/P3D/Content/Songs/intro/RouteMusic1.mp3 deleted file mode 100644 index 490db9d26..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic1.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic10.mp3 b/P3D/Content/Songs/intro/RouteMusic10.mp3 deleted file mode 100644 index 7ec817515..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic10.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic11.mp3 b/P3D/Content/Songs/intro/RouteMusic11.mp3 deleted file mode 100644 index c4f119bfb..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic11.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic2.mp3 b/P3D/Content/Songs/intro/RouteMusic2.mp3 deleted file mode 100644 index 3facaa3f7..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic2.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic3.mp3 b/P3D/Content/Songs/intro/RouteMusic3.mp3 deleted file mode 100644 index 881fb1497..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic3.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic4.mp3 b/P3D/Content/Songs/intro/RouteMusic4.mp3 deleted file mode 100644 index 4671c95fd..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic4.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic5.mp3 b/P3D/Content/Songs/intro/RouteMusic5.mp3 deleted file mode 100644 index ba7237eb7..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic5.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic6.mp3 b/P3D/Content/Songs/intro/RouteMusic6.mp3 deleted file mode 100644 index 89042bc92..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic6.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic7.mp3 b/P3D/Content/Songs/intro/RouteMusic7.mp3 deleted file mode 100644 index 66f12350c..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic7.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/RouteMusic8.mp3 b/P3D/Content/Songs/intro/RouteMusic8.mp3 deleted file mode 100644 index 5cff81323..000000000 Binary files a/P3D/Content/Songs/intro/RouteMusic8.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/azalea.mp3 b/P3D/Content/Songs/intro/azalea.mp3 deleted file mode 100644 index fdd43e930..000000000 Binary files a/P3D/Content/Songs/intro/azalea.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/barktown.mp3 b/P3D/Content/Songs/intro/barktown.mp3 deleted file mode 100644 index 2e5a9e38d..000000000 Binary files a/P3D/Content/Songs/intro/barktown.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/battlefactory.mp3 b/P3D/Content/Songs/intro/battlefactory.mp3 deleted file mode 100644 index cc45b4242..000000000 Binary files a/P3D/Content/Songs/intro/battlefactory.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/bugcontest.mp3 b/P3D/Content/Songs/intro/bugcontest.mp3 deleted file mode 100644 index fedd331ab..000000000 Binary files a/P3D/Content/Songs/intro/bugcontest.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/burnedtower.mp3 b/P3D/Content/Songs/intro/burnedtower.mp3 deleted file mode 100644 index 6f2da8133..000000000 Binary files a/P3D/Content/Songs/intro/burnedtower.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/celadon.mp3 b/P3D/Content/Songs/intro/celadon.mp3 deleted file mode 100644 index b60544f39..000000000 Binary files a/P3D/Content/Songs/intro/celadon.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/cerulean.mp3 b/P3D/Content/Songs/intro/cerulean.mp3 deleted file mode 100644 index f273e8193..000000000 Binary files a/P3D/Content/Songs/intro/cerulean.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/cerulean_cave.mp3 b/P3D/Content/Songs/intro/cerulean_cave.mp3 deleted file mode 100644 index ed00fe972..000000000 Binary files a/P3D/Content/Songs/intro/cerulean_cave.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/champion_defeat.mp3 b/P3D/Content/Songs/intro/champion_defeat.mp3 deleted file mode 100644 index 1f8605100..000000000 Binary files a/P3D/Content/Songs/intro/champion_defeat.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/cherrygrove.mp3 b/P3D/Content/Songs/intro/cherrygrove.mp3 deleted file mode 100644 index 5b5730ce1..000000000 Binary files a/P3D/Content/Songs/intro/cherrygrove.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/diglettscave.mp3 b/P3D/Content/Songs/intro/diglettscave.mp3 deleted file mode 100644 index 42dc85173..000000000 Binary files a/P3D/Content/Songs/intro/diglettscave.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/elite_defeat.mp3 b/P3D/Content/Songs/intro/elite_defeat.mp3 deleted file mode 100644 index d19291fb3..000000000 Binary files a/P3D/Content/Songs/intro/elite_defeat.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/elmslab.mp3 b/P3D/Content/Songs/intro/elmslab.mp3 deleted file mode 100644 index ea33faa30..000000000 Binary files a/P3D/Content/Songs/intro/elmslab.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/entei_battle.mp3 b/P3D/Content/Songs/intro/entei_battle.mp3 deleted file mode 100644 index 28f486a4a..000000000 Binary files a/P3D/Content/Songs/intro/entei_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/evolution.mp3 b/P3D/Content/Songs/intro/evolution.mp3 deleted file mode 100644 index 67a337b7e..000000000 Binary files a/P3D/Content/Songs/intro/evolution.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/frontier.mp3 b/P3D/Content/Songs/intro/frontier.mp3 deleted file mode 100644 index ab0ee341c..000000000 Binary files a/P3D/Content/Songs/intro/frontier.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/gamecorner.mp3 b/P3D/Content/Songs/intro/gamecorner.mp3 deleted file mode 100644 index 64a179e10..000000000 Binary files a/P3D/Content/Songs/intro/gamecorner.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/goldenrod.mp3 b/P3D/Content/Songs/intro/goldenrod.mp3 deleted file mode 100644 index 1fb53a4ac..000000000 Binary files a/P3D/Content/Songs/intro/goldenrod.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/gts.mp3 b/P3D/Content/Songs/intro/gts.mp3 deleted file mode 100644 index 592911db3..000000000 Binary files a/P3D/Content/Songs/intro/gts.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/ho-oh_battle.mp3 b/P3D/Content/Songs/intro/ho-oh_battle.mp3 deleted file mode 100644 index 44b334743..000000000 Binary files a/P3D/Content/Songs/intro/ho-oh_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/johto_elite.mp3 b/P3D/Content/Songs/intro/johto_elite.mp3 deleted file mode 100644 index 47c05abe4..000000000 Binary files a/P3D/Content/Songs/intro/johto_elite.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/johto_leader.mp3 b/P3D/Content/Songs/intro/johto_leader.mp3 deleted file mode 100644 index 2396c56e8..000000000 Binary files a/P3D/Content/Songs/intro/johto_leader.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/johto_rival_encounter.mp3 b/P3D/Content/Songs/intro/johto_rival_encounter.mp3 deleted file mode 100644 index 9a1549dab..000000000 Binary files a/P3D/Content/Songs/intro/johto_rival_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/johto_rocket.mp3 b/P3D/Content/Songs/intro/johto_rocket.mp3 deleted file mode 100644 index 43d2a88b5..000000000 Binary files a/P3D/Content/Songs/intro/johto_rocket.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/johto_trainer.mp3 b/P3D/Content/Songs/intro/johto_trainer.mp3 deleted file mode 100644 index 7debedf2f..000000000 Binary files a/P3D/Content/Songs/intro/johto_trainer.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/johto_wild.mp3 b/P3D/Content/Songs/intro/johto_wild.mp3 deleted file mode 100644 index 946c48a3a..000000000 Binary files a/P3D/Content/Songs/intro/johto_wild.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/kanto_leader.mp3 b/P3D/Content/Songs/intro/kanto_leader.mp3 deleted file mode 100644 index 9c3c26d8e..000000000 Binary files a/P3D/Content/Songs/intro/kanto_leader.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/kanto_trainer.mp3 b/P3D/Content/Songs/intro/kanto_trainer.mp3 deleted file mode 100644 index 04390463c..000000000 Binary files a/P3D/Content/Songs/intro/kanto_trainer.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/lavender.mp3 b/P3D/Content/Songs/intro/lavender.mp3 deleted file mode 100644 index 483140387..000000000 Binary files a/P3D/Content/Songs/intro/lavender.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/leader_defeat.mp3 b/P3D/Content/Songs/intro/leader_defeat.mp3 deleted file mode 100644 index 80266f3ec..000000000 Binary files a/P3D/Content/Songs/intro/leader_defeat.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/lobby.mp3 b/P3D/Content/Songs/intro/lobby.mp3 deleted file mode 100644 index f25057145..000000000 Binary files a/P3D/Content/Songs/intro/lobby.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/lugia_battle.mp3 b/P3D/Content/Songs/intro/lugia_battle.mp3 deleted file mode 100644 index 4abf18371..000000000 Binary files a/P3D/Content/Songs/intro/lugia_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/mart.mp3 b/P3D/Content/Songs/intro/mart.mp3 deleted file mode 100644 index 600dd3e68..000000000 Binary files a/P3D/Content/Songs/intro/mart.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/mary_encounter.mp3 b/P3D/Content/Songs/intro/mary_encounter.mp3 deleted file mode 100644 index 217189c75..000000000 Binary files a/P3D/Content/Songs/intro/mary_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/oak_encounter.mp3 b/P3D/Content/Songs/intro/oak_encounter.mp3 deleted file mode 100644 index 4713d516f..000000000 Binary files a/P3D/Content/Songs/intro/oak_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/oakslab.mp3 b/P3D/Content/Songs/intro/oakslab.mp3 deleted file mode 100644 index c05b89935..000000000 Binary files a/P3D/Content/Songs/intro/oakslab.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/pokeflute.mp3 b/P3D/Content/Songs/intro/pokeflute.mp3 deleted file mode 100644 index 931956b78..000000000 Binary files a/P3D/Content/Songs/intro/pokeflute.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/pokemon_lullaby.mp3 b/P3D/Content/Songs/intro/pokemon_lullaby.mp3 deleted file mode 100644 index b4926059e..000000000 Binary files a/P3D/Content/Songs/intro/pokemon_lullaby.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/pokemon_march.mp3 b/P3D/Content/Songs/intro/pokemon_march.mp3 deleted file mode 100644 index 13a0df58f..000000000 Binary files a/P3D/Content/Songs/intro/pokemon_march.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/pvp.mp3 b/P3D/Content/Songs/intro/pvp.mp3 deleted file mode 100644 index 5880ac929..000000000 Binary files a/P3D/Content/Songs/intro/pvp.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/raikou_battle.mp3 b/P3D/Content/Songs/intro/raikou_battle.mp3 deleted file mode 100644 index 28f486a4a..000000000 Binary files a/P3D/Content/Songs/intro/raikou_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/ride.mp3 b/P3D/Content/Songs/intro/ride.mp3 deleted file mode 100644 index 901745b7f..000000000 Binary files a/P3D/Content/Songs/intro/ride.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/safari.mp3 b/P3D/Content/Songs/intro/safari.mp3 deleted file mode 100644 index 66070ee87..000000000 Binary files a/P3D/Content/Songs/intro/safari.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/show_me_around.mp3 b/P3D/Content/Songs/intro/show_me_around.mp3 deleted file mode 100644 index 1023b253f..000000000 Binary files a/P3D/Content/Songs/intro/show_me_around.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/space_legend_battle.mp3 b/P3D/Content/Songs/intro/space_legend_battle.mp3 deleted file mode 100644 index d6859cb18..000000000 Binary files a/P3D/Content/Songs/intro/space_legend_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/sprout_tower.mp3 b/P3D/Content/Songs/intro/sprout_tower.mp3 deleted file mode 100644 index 1e26489b4..000000000 Binary files a/P3D/Content/Songs/intro/sprout_tower.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/ssaqua.mp3 b/P3D/Content/Songs/intro/ssaqua.mp3 deleted file mode 100644 index e8a182125..000000000 Binary files a/P3D/Content/Songs/intro/ssaqua.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/startower.mp3 b/P3D/Content/Songs/intro/startower.mp3 deleted file mode 100644 index d774c0329..000000000 Binary files a/P3D/Content/Songs/intro/startower.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/suicune_battle.mp3 b/P3D/Content/Songs/intro/suicune_battle.mp3 deleted file mode 100644 index 28f486a4a..000000000 Binary files a/P3D/Content/Songs/intro/suicune_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/trainer_encounter.mp3 b/P3D/Content/Songs/intro/trainer_encounter.mp3 deleted file mode 100644 index 6fa734fbf..000000000 Binary files a/P3D/Content/Songs/intro/trainer_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/vermilion.mp3 b/P3D/Content/Songs/intro/vermilion.mp3 deleted file mode 100644 index 2cc1d6d9d..000000000 Binary files a/P3D/Content/Songs/intro/vermilion.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/intro/violet.mp3 b/P3D/Content/Songs/intro/violet.mp3 deleted file mode 100644 index a1553cb11..000000000 Binary files a/P3D/Content/Songs/intro/violet.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_champion.mp3 b/P3D/Content/Songs/johto_champion.mp3 deleted file mode 100644 index 83d374170..000000000 Binary files a/P3D/Content/Songs/johto_champion.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_elite.mp3 b/P3D/Content/Songs/johto_elite.mp3 deleted file mode 100644 index cd91eacca..000000000 Binary files a/P3D/Content/Songs/johto_elite.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_elite_intro.mp3 b/P3D/Content/Songs/johto_elite_intro.mp3 deleted file mode 100644 index 2065298ff..000000000 Binary files a/P3D/Content/Songs/johto_elite_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_leader.mp3 b/P3D/Content/Songs/johto_leader.mp3 deleted file mode 100644 index f5f3c73be..000000000 Binary files a/P3D/Content/Songs/johto_leader.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_leader_intro.mp3 b/P3D/Content/Songs/johto_leader_intro.mp3 deleted file mode 100644 index 8573a7c35..000000000 Binary files a/P3D/Content/Songs/johto_leader_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_rival.mp3 b/P3D/Content/Songs/johto_rival.mp3 deleted file mode 100644 index 8724c23e5..000000000 Binary files a/P3D/Content/Songs/johto_rival.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_rival_encounter.mp3 b/P3D/Content/Songs/johto_rival_encounter.mp3 deleted file mode 100644 index f3e7e3820..000000000 Binary files a/P3D/Content/Songs/johto_rival_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_rivalintro.mp3 b/P3D/Content/Songs/johto_rivalintro.mp3 deleted file mode 100644 index 0cb49980d..000000000 Binary files a/P3D/Content/Songs/johto_rivalintro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_rocket.mp3 b/P3D/Content/Songs/johto_rocket.mp3 deleted file mode 100644 index 53d7c01ca..000000000 Binary files a/P3D/Content/Songs/johto_rocket.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_rocket_encounter.mp3 b/P3D/Content/Songs/johto_rocket_encounter.mp3 deleted file mode 100644 index b17326378..000000000 Binary files a/P3D/Content/Songs/johto_rocket_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_rocket_intro.mp3 b/P3D/Content/Songs/johto_rocket_intro.mp3 deleted file mode 100644 index 44987b93d..000000000 Binary files a/P3D/Content/Songs/johto_rocket_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_trainer.mp3 b/P3D/Content/Songs/johto_trainer.mp3 deleted file mode 100644 index 7c7a98ed7..000000000 Binary files a/P3D/Content/Songs/johto_trainer.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_trainer_intro.mp3 b/P3D/Content/Songs/johto_trainer_intro.mp3 deleted file mode 100644 index cb4c941c4..000000000 Binary files a/P3D/Content/Songs/johto_trainer_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_wild.mp3 b/P3D/Content/Songs/johto_wild.mp3 deleted file mode 100644 index b81fada30..000000000 Binary files a/P3D/Content/Songs/johto_wild.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/johto_wild_intro.mp3 b/P3D/Content/Songs/johto_wild_intro.mp3 deleted file mode 100644 index 51c17def3..000000000 Binary files a/P3D/Content/Songs/johto_wild_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/kanto_leader.mp3 b/P3D/Content/Songs/kanto_leader.mp3 deleted file mode 100644 index c66d8ad34..000000000 Binary files a/P3D/Content/Songs/kanto_leader.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/kanto_leader_intro.mp3 b/P3D/Content/Songs/kanto_leader_intro.mp3 deleted file mode 100644 index 183be902a..000000000 Binary files a/P3D/Content/Songs/kanto_leader_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/kanto_trainer.mp3 b/P3D/Content/Songs/kanto_trainer.mp3 deleted file mode 100644 index 918dbad6d..000000000 Binary files a/P3D/Content/Songs/kanto_trainer.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/kanto_trainer_intro.mp3 b/P3D/Content/Songs/kanto_trainer_intro.mp3 deleted file mode 100644 index c8809a5d4..000000000 Binary files a/P3D/Content/Songs/kanto_trainer_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/kanto_wild.mp3 b/P3D/Content/Songs/kanto_wild.mp3 deleted file mode 100644 index 3759e6f18..000000000 Binary files a/P3D/Content/Songs/kanto_wild.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/kanto_wild_intro.mp3 b/P3D/Content/Songs/kanto_wild_intro.mp3 deleted file mode 100644 index c7bcdb8ed..000000000 Binary files a/P3D/Content/Songs/kanto_wild_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/kimono.mp3 b/P3D/Content/Songs/kimono.mp3 deleted file mode 100644 index 4f7afda6d..000000000 Binary files a/P3D/Content/Songs/kimono.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/kvictoryroad.mp3 b/P3D/Content/Songs/kvictoryroad.mp3 deleted file mode 100644 index 55b081b63..000000000 Binary files a/P3D/Content/Songs/kvictoryroad.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/lavender.mp3 b/P3D/Content/Songs/lavender.mp3 deleted file mode 100644 index 9f714b5b5..000000000 Binary files a/P3D/Content/Songs/lavender.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/leader_defeat.mp3 b/P3D/Content/Songs/leader_defeat.mp3 deleted file mode 100644 index f0c7d2ee7..000000000 Binary files a/P3D/Content/Songs/leader_defeat.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/lighthouse.mp3 b/P3D/Content/Songs/lighthouse.mp3 deleted file mode 100644 index 91ef58c19..000000000 Binary files a/P3D/Content/Songs/lighthouse.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/lobby.mp3 b/P3D/Content/Songs/lobby.mp3 deleted file mode 100644 index c88e6bdbe..000000000 Binary files a/P3D/Content/Songs/lobby.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/lugia_battle.mp3 b/P3D/Content/Songs/lugia_battle.mp3 deleted file mode 100644 index f09469ed6..000000000 Binary files a/P3D/Content/Songs/lugia_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/lugia_battle_intro.mp3 b/P3D/Content/Songs/lugia_battle_intro.mp3 deleted file mode 100644 index 7fe0c2b64..000000000 Binary files a/P3D/Content/Songs/lugia_battle_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/mart.mp3 b/P3D/Content/Songs/mart.mp3 deleted file mode 100644 index f4c59a02e..000000000 Binary files a/P3D/Content/Songs/mart.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/mary_encounter.mp3 b/P3D/Content/Songs/mary_encounter.mp3 deleted file mode 100644 index 6053f7da1..000000000 Binary files a/P3D/Content/Songs/mary_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/mtmoonsq.mp3 b/P3D/Content/Songs/mtmoonsq.mp3 deleted file mode 100644 index 6ced17097..000000000 Binary files a/P3D/Content/Songs/mtmoonsq.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/nationalpark.mp3 b/P3D/Content/Songs/nationalpark.mp3 deleted file mode 100644 index f296d514e..000000000 Binary files a/P3D/Content/Songs/nationalpark.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/oak_encounter.mp3 b/P3D/Content/Songs/oak_encounter.mp3 deleted file mode 100644 index 10410111b..000000000 Binary files a/P3D/Content/Songs/oak_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/oakslab.mp3 b/P3D/Content/Songs/oakslab.mp3 deleted file mode 100644 index 933485449..000000000 Binary files a/P3D/Content/Songs/oakslab.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/pallet.mp3 b/P3D/Content/Songs/pallet.mp3 deleted file mode 100644 index ab05927dc..000000000 Binary files a/P3D/Content/Songs/pallet.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/pokeflute.mp3 b/P3D/Content/Songs/pokeflute.mp3 deleted file mode 100644 index 50044834e..000000000 Binary files a/P3D/Content/Songs/pokeflute.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/pokemon_lullaby.mp3 b/P3D/Content/Songs/pokemon_lullaby.mp3 deleted file mode 100644 index af91ff44d..000000000 Binary files a/P3D/Content/Songs/pokemon_lullaby.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/pokemon_march.mp3 b/P3D/Content/Songs/pokemon_march.mp3 deleted file mode 100644 index 7153d37be..000000000 Binary files a/P3D/Content/Songs/pokemon_march.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/pvp.mp3 b/P3D/Content/Songs/pvp.mp3 deleted file mode 100644 index 65393ccbe..000000000 Binary files a/P3D/Content/Songs/pvp.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/rHideout.mp3 b/P3D/Content/Songs/rHideout.mp3 deleted file mode 100644 index 1e86d2c74..000000000 Binary files a/P3D/Content/Songs/rHideout.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/raikou_battle.mp3 b/P3D/Content/Songs/raikou_battle.mp3 deleted file mode 100644 index 0a55dd711..000000000 Binary files a/P3D/Content/Songs/raikou_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/raikou_battle_intro.mp3 b/P3D/Content/Songs/raikou_battle_intro.mp3 deleted file mode 100644 index 9f0819348..000000000 Binary files a/P3D/Content/Songs/raikou_battle_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/ride.mp3 b/P3D/Content/Songs/ride.mp3 deleted file mode 100644 index a6c333013..000000000 Binary files a/P3D/Content/Songs/ride.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/rocket_broadcast.mp3 b/P3D/Content/Songs/rocket_broadcast.mp3 deleted file mode 100644 index 1ad7f3a22..000000000 Binary files a/P3D/Content/Songs/rocket_broadcast.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/safari.mp3 b/P3D/Content/Songs/safari.mp3 deleted file mode 100644 index 0c6f5399d..000000000 Binary files a/P3D/Content/Songs/safari.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/safarigate.mp3 b/P3D/Content/Songs/safarigate.mp3 deleted file mode 100644 index 5579d67b2..000000000 Binary files a/P3D/Content/Songs/safarigate.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/show_me_around.mp3 b/P3D/Content/Songs/show_me_around.mp3 deleted file mode 100644 index 426244639..000000000 Binary files a/P3D/Content/Songs/show_me_around.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/space_legend_battle.mp3 b/P3D/Content/Songs/space_legend_battle.mp3 deleted file mode 100644 index fda5be1c3..000000000 Binary files a/P3D/Content/Songs/space_legend_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/space_legend_battle_intro.mp3 b/P3D/Content/Songs/space_legend_battle_intro.mp3 deleted file mode 100644 index abe0d2bc8..000000000 Binary files a/P3D/Content/Songs/space_legend_battle_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/sprout_tower.mp3 b/P3D/Content/Songs/sprout_tower.mp3 deleted file mode 100644 index bbe9f9fa2..000000000 Binary files a/P3D/Content/Songs/sprout_tower.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/ssaqua.mp3 b/P3D/Content/Songs/ssaqua.mp3 deleted file mode 100644 index 94b7af0f1..000000000 Binary files a/P3D/Content/Songs/ssaqua.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/startower.mp3 b/P3D/Content/Songs/startower.mp3 deleted file mode 100644 index b231c2814..000000000 Binary files a/P3D/Content/Songs/startower.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/suicune_battle.mp3 b/P3D/Content/Songs/suicune_battle.mp3 deleted file mode 100644 index 0a55dd711..000000000 Binary files a/P3D/Content/Songs/suicune_battle.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/suicune_battle_intro.mp3 b/P3D/Content/Songs/suicune_battle_intro.mp3 deleted file mode 100644 index 9f0819348..000000000 Binary files a/P3D/Content/Songs/suicune_battle_intro.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/surf.mp3 b/P3D/Content/Songs/surf.mp3 deleted file mode 100644 index af4a48973..000000000 Binary files a/P3D/Content/Songs/surf.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/tintower.mp3 b/P3D/Content/Songs/tintower.mp3 deleted file mode 100644 index 2a02db986..000000000 Binary files a/P3D/Content/Songs/tintower.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/title.mp3 b/P3D/Content/Songs/title.mp3 deleted file mode 100644 index ec5741106..000000000 Binary files a/P3D/Content/Songs/title.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/trainer_defeat.mp3 b/P3D/Content/Songs/trainer_defeat.mp3 deleted file mode 100644 index 5c439a5dc..000000000 Binary files a/P3D/Content/Songs/trainer_defeat.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/trainer_encounter.mp3 b/P3D/Content/Songs/trainer_encounter.mp3 deleted file mode 100644 index 0273a05a5..000000000 Binary files a/P3D/Content/Songs/trainer_encounter.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/unown_broadcast.mp3 b/P3D/Content/Songs/unown_broadcast.mp3 deleted file mode 100644 index 8d6dd8734..000000000 Binary files a/P3D/Content/Songs/unown_broadcast.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/vermilion.mp3 b/P3D/Content/Songs/vermilion.mp3 deleted file mode 100644 index 31bcfc47c..000000000 Binary files a/P3D/Content/Songs/vermilion.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/violet.mp3 b/P3D/Content/Songs/violet.mp3 deleted file mode 100644 index ad590895e..000000000 Binary files a/P3D/Content/Songs/violet.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/viridian_forest.mp3 b/P3D/Content/Songs/viridian_forest.mp3 deleted file mode 100644 index a5db0ba15..000000000 Binary files a/P3D/Content/Songs/viridian_forest.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/wild_defeat.mp3 b/P3D/Content/Songs/wild_defeat.mp3 deleted file mode 100644 index 5ce8f8fc9..000000000 Binary files a/P3D/Content/Songs/wild_defeat.mp3 and /dev/null differ diff --git a/P3D/Content/Songs/wind.mp3 b/P3D/Content/Songs/wind.mp3 deleted file mode 100644 index 8d20da65b..000000000 Binary files a/P3D/Content/Songs/wind.mp3 and /dev/null differ diff --git a/P3D/Overworld/OverworldScreen.vb b/P3D/Overworld/OverworldScreen.vb index 8b995d868..1dd5d7552 100644 --- a/P3D/Overworld/OverworldScreen.vb +++ b/P3D/Overworld/OverworldScreen.vb @@ -419,7 +419,7 @@ Public Class OverworldScreen Level.IsRadioOn = False End If - MusicManager.Play(theme, True) 'remove when debugging music + 'MusicManager.Play(theme, True) 'remove when debugging music End If End Sub diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 48e9498a2..2b2dd8838 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -131,6 +131,10 @@ + + C:\WMSDK\WMPSDK9\redist\wmppia.dll + True + @@ -13513,552 +13517,6 @@ 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 diff --git a/P3D/Resources/Sound/MusicManager.vb b/P3D/Resources/Sound/MusicManager.vb index 6a68040f8..87f8a0a78 100644 --- a/P3D/Resources/Sound/MusicManager.vb +++ b/P3D/Resources/Sound/MusicManager.vb @@ -151,7 +151,7 @@ Public Class MusicManager If _isIntroStarted Then If Date.Now >= _introEndTime Then - + MediaPlayer.Pause() Dim song = GetSong(_introContinueSong) MediaPlayer.IsRepeating = True _isIntroStarted = False @@ -339,11 +339,14 @@ Public Class MusicManager Dim iSong As SongContainer = Nothing If Not _songs.TryGetValue(key, iSong) Then - Dim songFilePath = Path.Combine(GameController.GamePath, "Content", "Songs", key + ".mp3") + Dim songFilePath = Path.Combine(GameController.GamePath, "Content", "Songs", key + ".wma") + Dim songPath = Path.Combine("Songs", key) If File.Exists(songFilePath) Then - Dim duration = GetSongDuration(songFilePath) - iSong = New SongContainer(Song.FromUri(key, New Uri(songFilePath)), key, duration) + 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) End If diff --git a/lib/P3D.ContentPipeline/Content/Content.mgcb b/lib/P3D.ContentPipeline/Content/Content.mgcb index 906f5dfbd..2648f5f0a 100644 --- a/lib/P3D.ContentPipeline/Content/Content.mgcb +++ b/lib/P3D.ContentPipeline/Content/Content.mgcb @@ -292,3 +292,1083 @@ #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/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/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 + diff --git a/lib/P3D.ContentPipeline/Content/Songs/Goldenrod.ogg b/lib/P3D.ContentPipeline/Content/Songs/Goldenrod.ogg new file mode 100644 index 000000000..407156f63 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/Goldenrod.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/HallofFame.ogg b/lib/P3D.ContentPipeline/Content/Songs/HallofFame.ogg new file mode 100644 index 000000000..fd014ffcc Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/HallofFame.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/IlexForest.ogg b/lib/P3D.ContentPipeline/Content/Songs/IlexForest.ogg new file mode 100644 index 000000000..9bea0bf4b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/IlexForest.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/Johto_champion_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/Johto_champion_intro.ogg new file mode 100644 index 000000000..b95c6d957 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/Johto_champion_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/Looker_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/Looker_encounter.ogg new file mode 100644 index 000000000..fe78325ad Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/Looker_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic0.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic0.ogg new file mode 100644 index 000000000..116c906f8 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic0.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic1.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic1.ogg new file mode 100644 index 000000000..9e1461d26 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic1.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic10.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic10.ogg new file mode 100644 index 000000000..3a324fe8e Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic10.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic11.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic11.ogg new file mode 100644 index 000000000..46d11b673 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic11.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic2.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic2.ogg new file mode 100644 index 000000000..3f843799f Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic2.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic3.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic3.ogg new file mode 100644 index 000000000..168c29829 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic3.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic4.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic4.ogg new file mode 100644 index 000000000..2f3f6c905 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic4.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic5.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic5.ogg new file mode 100644 index 000000000..d6f2cf14e Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic5.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic6.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic6.ogg new file mode 100644 index 000000000..7a9f6ed3d Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic6.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic7.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic7.ogg new file mode 100644 index 000000000..04ee22a90 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic7.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic8.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic8.ogg new file mode 100644 index 000000000..8b3d6f935 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic8.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/RouteMusic9.ogg b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic9.ogg new file mode 100644 index 000000000..6334a4504 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/RouteMusic9.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/alph.ogg b/lib/P3D.ContentPipeline/Content/Songs/alph.ogg new file mode 100644 index 000000000..8a9e54f09 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/alph.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/ancient_ruins.ogg b/lib/P3D.ContentPipeline/Content/Songs/ancient_ruins.ogg new file mode 100644 index 000000000..e5efb479e Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/ancient_ruins.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/azalea.ogg b/lib/P3D.ContentPipeline/Content/Songs/azalea.ogg new file mode 100644 index 000000000..c18c1565e Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/azalea.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/barktown.ogg b/lib/P3D.ContentPipeline/Content/Songs/barktown.ogg new file mode 100644 index 000000000..bf8c3583a Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/barktown.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/battlefactory.ogg b/lib/P3D.ContentPipeline/Content/Songs/battlefactory.ogg new file mode 100644 index 000000000..583b43c55 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/battlefactory.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/battletower.ogg b/lib/P3D.ContentPipeline/Content/Songs/battletower.ogg new file mode 100644 index 000000000..b9cdc1662 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/battletower.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/brain_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/brain_battle.ogg new file mode 100644 index 000000000..60b1627a0 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/brain_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/brain_battle_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/brain_battle_intro.ogg new file mode 100644 index 000000000..e38ee1a3b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/brain_battle_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/bugcontest.ogg b/lib/P3D.ContentPipeline/Content/Songs/bugcontest.ogg new file mode 100644 index 000000000..bfde49161 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/bugcontest.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/burnedtower.ogg b/lib/P3D.ContentPipeline/Content/Songs/burnedtower.ogg new file mode 100644 index 000000000..22e331ec4 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/burnedtower.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/celadon.ogg b/lib/P3D.ContentPipeline/Content/Songs/celadon.ogg new file mode 100644 index 000000000..5b0664581 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/celadon.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/center.ogg b/lib/P3D.ContentPipeline/Content/Songs/center.ogg new file mode 100644 index 000000000..cd736fbc5 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/center.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/cerulean.ogg b/lib/P3D.ContentPipeline/Content/Songs/cerulean.ogg new file mode 100644 index 000000000..9311867b4 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/cerulean.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/cerulean_cave.ogg b/lib/P3D.ContentPipeline/Content/Songs/cerulean_cave.ogg new file mode 100644 index 000000000..21552316f Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/cerulean_cave.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/champion_defeat.ogg b/lib/P3D.ContentPipeline/Content/Songs/champion_defeat.ogg new file mode 100644 index 000000000..ba171baf4 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/champion_defeat.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/cherrygrove.ogg b/lib/P3D.ContentPipeline/Content/Songs/cherrygrove.ogg new file mode 100644 index 000000000..65053f442 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/cherrygrove.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/cinnabar.ogg b/lib/P3D.ContentPipeline/Content/Songs/cinnabar.ogg new file mode 100644 index 000000000..3315a5628 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/cinnabar.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/credits.ogg b/lib/P3D.ContentPipeline/Content/Songs/credits.ogg new file mode 100644 index 000000000..f6a760f38 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/credits.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/dark_cave.ogg b/lib/P3D.ContentPipeline/Content/Songs/dark_cave.ogg new file mode 100644 index 000000000..d06173797 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/dark_cave.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/diglettscave.ogg b/lib/P3D.ContentPipeline/Content/Songs/diglettscave.ogg new file mode 100644 index 000000000..8fc3b7079 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/diglettscave.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/dragonsden.ogg b/lib/P3D.ContentPipeline/Content/Songs/dragonsden.ogg new file mode 100644 index 000000000..372d5c034 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/dragonsden.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/ecruteak.ogg b/lib/P3D.ContentPipeline/Content/Songs/ecruteak.ogg new file mode 100644 index 000000000..0cbaac316 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/ecruteak.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/elite_defeat.ogg b/lib/P3D.ContentPipeline/Content/Songs/elite_defeat.ogg new file mode 100644 index 000000000..96f1b26c2 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/elite_defeat.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/elmslab.ogg b/lib/P3D.ContentPipeline/Content/Songs/elmslab.ogg new file mode 100644 index 000000000..e77642482 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/elmslab.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/entei_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/entei_battle.ogg new file mode 100644 index 000000000..f1b63acb4 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/entei_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/entei_battle_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/entei_battle_intro.ogg new file mode 100644 index 000000000..b9b00ea4c Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/entei_battle_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/eusine_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/eusine_encounter.ogg new file mode 100644 index 000000000..fa56ac5d6 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/eusine_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/evolution.ogg b/lib/P3D.ContentPipeline/Content/Songs/evolution.ogg new file mode 100644 index 000000000..61df111f9 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/evolution.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/frontier.ogg b/lib/P3D.ContentPipeline/Content/Songs/frontier.ogg new file mode 100644 index 000000000..f685cd6e2 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/frontier.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/gamecorner.ogg b/lib/P3D.ContentPipeline/Content/Songs/gamecorner.ogg new file mode 100644 index 000000000..e16edd892 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/gamecorner.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/gts.ogg b/lib/P3D.ContentPipeline/Content/Songs/gts.ogg new file mode 100644 index 000000000..a7ba7fe07 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/gts.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/gym.ogg b/lib/P3D.ContentPipeline/Content/Songs/gym.ogg new file mode 100644 index 000000000..29c8bdb9c Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/gym.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/ho-oh_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/ho-oh_battle.ogg new file mode 100644 index 000000000..5cf395be1 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/ho-oh_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/ho-oh_battle_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/ho-oh_battle_intro.ogg new file mode 100644 index 000000000..21cfadb73 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/ho-oh_battle_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/indigo.ogg b/lib/P3D.ContentPipeline/Content/Songs/indigo.ogg new file mode 100644 index 000000000..5c80a64a7 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/indigo.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/Goldenrod.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/Goldenrod.ogg new file mode 100644 index 000000000..0b566106f Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/Goldenrod.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/IlexForest.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/IlexForest.ogg new file mode 100644 index 000000000..fd54e0c96 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/IlexForest.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic1.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic1.ogg new file mode 100644 index 000000000..d00b4f6ea Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic1.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic10.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic10.ogg new file mode 100644 index 000000000..d44ae29b0 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic10.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic11.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic11.ogg new file mode 100644 index 000000000..65af3d0aa Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic11.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic2.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic2.ogg new file mode 100644 index 000000000..ac8ed8ee9 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic2.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic3.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic3.ogg new file mode 100644 index 000000000..20c7acb59 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic3.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic4.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic4.ogg new file mode 100644 index 000000000..ab9ee470d Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic4.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic5.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic5.ogg new file mode 100644 index 000000000..d5670862f Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic5.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic6.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic6.ogg new file mode 100644 index 000000000..85fffa4bb Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic6.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic7.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic7.ogg new file mode 100644 index 000000000..cd9da776f Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic7.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic8.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic8.ogg new file mode 100644 index 000000000..76b85d053 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/RouteMusic8.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/azalea.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/azalea.ogg new file mode 100644 index 000000000..5a3291e44 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/azalea.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/barktown.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/barktown.ogg new file mode 100644 index 000000000..5f192447a Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/barktown.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/battlefactory.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/battlefactory.ogg new file mode 100644 index 000000000..07e305c81 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/battlefactory.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/bugcontest.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/bugcontest.ogg new file mode 100644 index 000000000..cf47d6651 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/bugcontest.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/burnedtower.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/burnedtower.ogg new file mode 100644 index 000000000..e503a201b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/burnedtower.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/celadon.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/celadon.ogg new file mode 100644 index 000000000..f522cfc9b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/celadon.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/cerulean.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/cerulean.ogg new file mode 100644 index 000000000..a790ce878 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/cerulean.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/cerulean_cave.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/cerulean_cave.ogg new file mode 100644 index 000000000..cf5119690 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/cerulean_cave.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/champion_defeat.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/champion_defeat.ogg new file mode 100644 index 000000000..8dda4da08 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/champion_defeat.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/cherrygrove.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/cherrygrove.ogg new file mode 100644 index 000000000..f78fce739 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/cherrygrove.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/diglettscave.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/diglettscave.ogg new file mode 100644 index 000000000..f11d2ad27 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/diglettscave.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/elite_defeat.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/elite_defeat.ogg new file mode 100644 index 000000000..b33af3d8b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/elite_defeat.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/elmslab.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/elmslab.ogg new file mode 100644 index 000000000..8a7a7c6cd Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/elmslab.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/entei_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/entei_battle.ogg new file mode 100644 index 000000000..e61e1ebda Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/entei_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/evolution.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/evolution.ogg new file mode 100644 index 000000000..365965a5b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/evolution.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/frontier.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/frontier.ogg new file mode 100644 index 000000000..7434d90c3 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/frontier.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/gamecorner.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/gamecorner.ogg new file mode 100644 index 000000000..246413580 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/gamecorner.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/gts.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/gts.ogg new file mode 100644 index 000000000..58eee9f13 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/gts.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/ho-oh_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/ho-oh_battle.ogg new file mode 100644 index 000000000..47db55af5 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/ho-oh_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/johto_elite.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_elite.ogg new file mode 100644 index 000000000..d1840dd0d Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_elite.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/johto_leader.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_leader.ogg new file mode 100644 index 000000000..0456a9334 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_leader.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/johto_rival_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_rival_encounter.ogg new file mode 100644 index 000000000..e721840a0 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_rival_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/johto_rocket.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_rocket.ogg new file mode 100644 index 000000000..281b02cc6 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_rocket.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/johto_trainer.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_trainer.ogg new file mode 100644 index 000000000..5138d3c44 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_trainer.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/johto_wild.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_wild.ogg new file mode 100644 index 000000000..dfcc94ff1 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/johto_wild.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/kanto_leader.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/kanto_leader.ogg new file mode 100644 index 000000000..ea86a9fe6 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/kanto_leader.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/kanto_trainer.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/kanto_trainer.ogg new file mode 100644 index 000000000..85b5cb00c Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/kanto_trainer.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/lavender.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/lavender.ogg new file mode 100644 index 000000000..20a6aca5c Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/lavender.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/leader_defeat.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/leader_defeat.ogg new file mode 100644 index 000000000..ddada9b10 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/leader_defeat.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/lobby.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/lobby.ogg new file mode 100644 index 000000000..721ee0323 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/lobby.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/lugia_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/lugia_battle.ogg new file mode 100644 index 000000000..041935d55 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/lugia_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/mart.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/mart.ogg new file mode 100644 index 000000000..a1c3c6dfa Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/mart.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/mary_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/mary_encounter.ogg new file mode 100644 index 000000000..17788d0ae Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/mary_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/oak_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/oak_encounter.ogg new file mode 100644 index 000000000..150581eaa Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/oak_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/oakslab.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/oakslab.ogg new file mode 100644 index 000000000..aec979d92 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/oakslab.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/pokeflute.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/pokeflute.ogg new file mode 100644 index 000000000..7a42fb95c Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/pokeflute.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/pokemon_lullaby.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/pokemon_lullaby.ogg new file mode 100644 index 000000000..ca76af6c5 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/pokemon_lullaby.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/pokemon_march.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/pokemon_march.ogg new file mode 100644 index 000000000..c815054e8 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/pokemon_march.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/pvp.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/pvp.ogg new file mode 100644 index 000000000..7e355655b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/pvp.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/raikou_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/raikou_battle.ogg new file mode 100644 index 000000000..468780d48 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/raikou_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/ride.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/ride.ogg new file mode 100644 index 000000000..b07310a17 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/ride.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/safari.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/safari.ogg new file mode 100644 index 000000000..40b4ff1d3 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/safari.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/show_me_around.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/show_me_around.ogg new file mode 100644 index 000000000..ec09508ff Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/show_me_around.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/space_legend_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/space_legend_battle.ogg new file mode 100644 index 000000000..f86d41cac Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/space_legend_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/sprout_tower.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/sprout_tower.ogg new file mode 100644 index 000000000..f3cef8c1a Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/sprout_tower.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/ssaqua.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/ssaqua.ogg new file mode 100644 index 000000000..8b27d1876 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/ssaqua.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/startower.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/startower.ogg new file mode 100644 index 000000000..90e30010f Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/startower.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/suicune_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/suicune_battle.ogg new file mode 100644 index 000000000..80775d172 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/suicune_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/trainer_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/trainer_encounter.ogg new file mode 100644 index 000000000..57b53b5db Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/trainer_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/vermilion.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/vermilion.ogg new file mode 100644 index 000000000..4a3d6aa31 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/vermilion.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/intro/violet.ogg b/lib/P3D.ContentPipeline/Content/Songs/intro/violet.ogg new file mode 100644 index 000000000..718108f3b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/intro/violet.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_champion.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_champion.ogg new file mode 100644 index 000000000..a1a27cb0f Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_champion.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_elite.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_elite.ogg new file mode 100644 index 000000000..0fb8e2f0e Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_elite.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_elite_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_elite_intro.ogg new file mode 100644 index 000000000..09d5cee94 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_elite_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_leader.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_leader.ogg new file mode 100644 index 000000000..ac2f413d2 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_leader.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_leader_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_leader_intro.ogg new file mode 100644 index 000000000..157d00e41 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_leader_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_rival.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_rival.ogg new file mode 100644 index 000000000..2610ff78b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_rival.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_rival_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_rival_encounter.ogg new file mode 100644 index 000000000..f3879f96f Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_rival_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_rivalintro.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_rivalintro.ogg new file mode 100644 index 000000000..a68cb8d57 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_rivalintro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_rocket.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_rocket.ogg new file mode 100644 index 000000000..d8beeabcf Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_rocket.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_rocket_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_rocket_encounter.ogg new file mode 100644 index 000000000..3e1a9e63b Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_rocket_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_rocket_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_rocket_intro.ogg new file mode 100644 index 000000000..95018e678 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_rocket_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_trainer.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_trainer.ogg new file mode 100644 index 000000000..49732933c Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_trainer.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_trainer_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_trainer_intro.ogg new file mode 100644 index 000000000..7aba311bd Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_trainer_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_wild.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_wild.ogg new file mode 100644 index 000000000..4ee3aee2e Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_wild.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/johto_wild_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/johto_wild_intro.ogg new file mode 100644 index 000000000..cdac4f048 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/johto_wild_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/kanto_leader.ogg b/lib/P3D.ContentPipeline/Content/Songs/kanto_leader.ogg new file mode 100644 index 000000000..1237ba52e Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/kanto_leader.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/kanto_leader_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/kanto_leader_intro.ogg new file mode 100644 index 000000000..f38504060 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/kanto_leader_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/kanto_trainer.ogg b/lib/P3D.ContentPipeline/Content/Songs/kanto_trainer.ogg new file mode 100644 index 000000000..9bec7b8d6 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/kanto_trainer.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/kanto_trainer_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/kanto_trainer_intro.ogg new file mode 100644 index 000000000..6e0719f18 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/kanto_trainer_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/kanto_wild.ogg b/lib/P3D.ContentPipeline/Content/Songs/kanto_wild.ogg new file mode 100644 index 000000000..8c3b255e5 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/kanto_wild.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/kanto_wild_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/kanto_wild_intro.ogg new file mode 100644 index 000000000..8a6c46237 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/kanto_wild_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/kimono.ogg b/lib/P3D.ContentPipeline/Content/Songs/kimono.ogg new file mode 100644 index 000000000..394dbe5c5 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/kimono.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/kvictoryroad.ogg b/lib/P3D.ContentPipeline/Content/Songs/kvictoryroad.ogg new file mode 100644 index 000000000..3d1fd18bd Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/kvictoryroad.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/lavender.ogg b/lib/P3D.ContentPipeline/Content/Songs/lavender.ogg new file mode 100644 index 000000000..24992d395 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/lavender.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/leader_defeat.ogg b/lib/P3D.ContentPipeline/Content/Songs/leader_defeat.ogg new file mode 100644 index 000000000..da68e09ce Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/leader_defeat.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/lighthouse.ogg b/lib/P3D.ContentPipeline/Content/Songs/lighthouse.ogg new file mode 100644 index 000000000..7cca2c4c0 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/lighthouse.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/lobby.ogg b/lib/P3D.ContentPipeline/Content/Songs/lobby.ogg new file mode 100644 index 000000000..2328d81b2 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/lobby.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/lugia_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/lugia_battle.ogg new file mode 100644 index 000000000..5c945159e Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/lugia_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/lugia_battle_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/lugia_battle_intro.ogg new file mode 100644 index 000000000..511a8a302 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/lugia_battle_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/mart.ogg b/lib/P3D.ContentPipeline/Content/Songs/mart.ogg new file mode 100644 index 000000000..22d3c76ca Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/mart.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/mary_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/mary_encounter.ogg new file mode 100644 index 000000000..18c71d2f0 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/mary_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/mtmoonsq.ogg b/lib/P3D.ContentPipeline/Content/Songs/mtmoonsq.ogg new file mode 100644 index 000000000..935413691 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/mtmoonsq.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/nationalpark.ogg b/lib/P3D.ContentPipeline/Content/Songs/nationalpark.ogg new file mode 100644 index 000000000..7b20fd7fd Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/nationalpark.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/oak_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/oak_encounter.ogg new file mode 100644 index 000000000..9ece95ff8 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/oak_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/oakslab.ogg b/lib/P3D.ContentPipeline/Content/Songs/oakslab.ogg new file mode 100644 index 000000000..f093f5286 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/oakslab.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/pallet.ogg b/lib/P3D.ContentPipeline/Content/Songs/pallet.ogg new file mode 100644 index 000000000..b4cace4cb Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/pallet.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/pokeflute.ogg b/lib/P3D.ContentPipeline/Content/Songs/pokeflute.ogg new file mode 100644 index 000000000..b247e4b48 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/pokeflute.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/pokemon_lullaby.ogg b/lib/P3D.ContentPipeline/Content/Songs/pokemon_lullaby.ogg new file mode 100644 index 000000000..b49278071 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/pokemon_lullaby.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/pokemon_march.ogg b/lib/P3D.ContentPipeline/Content/Songs/pokemon_march.ogg new file mode 100644 index 000000000..8640fa234 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/pokemon_march.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/pvp.ogg b/lib/P3D.ContentPipeline/Content/Songs/pvp.ogg new file mode 100644 index 000000000..c38e4fdff Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/pvp.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/rHideout.ogg b/lib/P3D.ContentPipeline/Content/Songs/rHideout.ogg new file mode 100644 index 000000000..8dd32d756 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/rHideout.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/raikou_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/raikou_battle.ogg new file mode 100644 index 000000000..ecd737540 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/raikou_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/raikou_battle_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/raikou_battle_intro.ogg new file mode 100644 index 000000000..062ead39f Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/raikou_battle_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/ride.ogg b/lib/P3D.ContentPipeline/Content/Songs/ride.ogg new file mode 100644 index 000000000..18e7391a2 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/ride.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/rocket_broadcast.ogg b/lib/P3D.ContentPipeline/Content/Songs/rocket_broadcast.ogg new file mode 100644 index 000000000..b976905be Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/rocket_broadcast.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/safari.ogg b/lib/P3D.ContentPipeline/Content/Songs/safari.ogg new file mode 100644 index 000000000..2dc84d718 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/safari.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/safarigate.ogg b/lib/P3D.ContentPipeline/Content/Songs/safarigate.ogg new file mode 100644 index 000000000..176830365 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/safarigate.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/show_me_around.ogg b/lib/P3D.ContentPipeline/Content/Songs/show_me_around.ogg new file mode 100644 index 000000000..ea3612143 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/show_me_around.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/space_legend_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/space_legend_battle.ogg new file mode 100644 index 000000000..3c0de6f18 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/space_legend_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/space_legend_battle_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/space_legend_battle_intro.ogg new file mode 100644 index 000000000..fae4f3399 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/space_legend_battle_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/sprout_tower.ogg b/lib/P3D.ContentPipeline/Content/Songs/sprout_tower.ogg new file mode 100644 index 000000000..f5772b6f9 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/sprout_tower.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/ssaqua.ogg b/lib/P3D.ContentPipeline/Content/Songs/ssaqua.ogg new file mode 100644 index 000000000..cac040cbb Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/ssaqua.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/startower.ogg b/lib/P3D.ContentPipeline/Content/Songs/startower.ogg new file mode 100644 index 000000000..9d635e573 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/startower.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/suicune_battle.ogg b/lib/P3D.ContentPipeline/Content/Songs/suicune_battle.ogg new file mode 100644 index 000000000..499e61281 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/suicune_battle.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/suicune_battle_intro.ogg b/lib/P3D.ContentPipeline/Content/Songs/suicune_battle_intro.ogg new file mode 100644 index 000000000..23ce126a0 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/suicune_battle_intro.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/surf.ogg b/lib/P3D.ContentPipeline/Content/Songs/surf.ogg new file mode 100644 index 000000000..6493a7ffd Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/surf.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/tintower.ogg b/lib/P3D.ContentPipeline/Content/Songs/tintower.ogg new file mode 100644 index 000000000..f421e137a Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/tintower.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/title.ogg b/lib/P3D.ContentPipeline/Content/Songs/title.ogg new file mode 100644 index 000000000..2198ea262 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/title.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/trainer_defeat.ogg b/lib/P3D.ContentPipeline/Content/Songs/trainer_defeat.ogg new file mode 100644 index 000000000..99aad0a30 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/trainer_defeat.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/trainer_encounter.ogg b/lib/P3D.ContentPipeline/Content/Songs/trainer_encounter.ogg new file mode 100644 index 000000000..c0978f626 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/trainer_encounter.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/unown_broadcast.ogg b/lib/P3D.ContentPipeline/Content/Songs/unown_broadcast.ogg new file mode 100644 index 000000000..99a0ef076 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/unown_broadcast.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/vermilion.ogg b/lib/P3D.ContentPipeline/Content/Songs/vermilion.ogg new file mode 100644 index 000000000..e1b6d5ac6 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/vermilion.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/violet.ogg b/lib/P3D.ContentPipeline/Content/Songs/violet.ogg new file mode 100644 index 000000000..e95318307 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/violet.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/viridian_forest.ogg b/lib/P3D.ContentPipeline/Content/Songs/viridian_forest.ogg new file mode 100644 index 000000000..a4c28a585 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/viridian_forest.ogg differ diff --git a/lib/P3D.ContentPipeline/Content/Songs/wild_defeat.ogg b/lib/P3D.ContentPipeline/Content/Songs/wild_defeat.ogg new file mode 100644 index 000000000..e0cd5e5eb Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Songs/wild_defeat.ogg differ diff --git a/lib/build/Content/Songs/Goldenrod.xnb b/lib/build/Content/Songs/Goldenrod.xnb new file mode 100644 index 000000000..c254f3da5 Binary files /dev/null and b/lib/build/Content/Songs/Goldenrod.xnb differ diff --git a/lib/build/Content/Songs/HallofFame.xnb b/lib/build/Content/Songs/HallofFame.xnb new file mode 100644 index 000000000..b5b3a2568 Binary files /dev/null and b/lib/build/Content/Songs/HallofFame.xnb differ diff --git a/lib/build/Content/Songs/IlexForest.xnb b/lib/build/Content/Songs/IlexForest.xnb new file mode 100644 index 000000000..f09e20b4b Binary files /dev/null and b/lib/build/Content/Songs/IlexForest.xnb differ diff --git a/lib/build/Content/Songs/Johto_champion_intro.xnb b/lib/build/Content/Songs/Johto_champion_intro.xnb new file mode 100644 index 000000000..8ee285824 Binary files /dev/null and b/lib/build/Content/Songs/Johto_champion_intro.xnb differ diff --git a/lib/build/Content/Songs/Looker_encounter.xnb b/lib/build/Content/Songs/Looker_encounter.xnb new file mode 100644 index 000000000..5ddc03e93 Binary files /dev/null and b/lib/build/Content/Songs/Looker_encounter.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic0.xnb b/lib/build/Content/Songs/RouteMusic0.xnb new file mode 100644 index 000000000..b32330a7b Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic0.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic1.xnb b/lib/build/Content/Songs/RouteMusic1.xnb new file mode 100644 index 000000000..25b17ab4d Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic1.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic10.xnb b/lib/build/Content/Songs/RouteMusic10.xnb new file mode 100644 index 000000000..ecaab87e9 Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic10.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic11.xnb b/lib/build/Content/Songs/RouteMusic11.xnb new file mode 100644 index 000000000..d256a4df0 Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic11.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic2.xnb b/lib/build/Content/Songs/RouteMusic2.xnb new file mode 100644 index 000000000..03c925c46 Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic2.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic3.xnb b/lib/build/Content/Songs/RouteMusic3.xnb new file mode 100644 index 000000000..067185f45 Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic3.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic4.xnb b/lib/build/Content/Songs/RouteMusic4.xnb new file mode 100644 index 000000000..64c88e20c Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic4.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic5.xnb b/lib/build/Content/Songs/RouteMusic5.xnb new file mode 100644 index 000000000..efe161535 Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic5.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic6.xnb b/lib/build/Content/Songs/RouteMusic6.xnb new file mode 100644 index 000000000..024f623ea Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic6.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic7.xnb b/lib/build/Content/Songs/RouteMusic7.xnb new file mode 100644 index 000000000..e6db24c8d Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic7.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic8.xnb b/lib/build/Content/Songs/RouteMusic8.xnb new file mode 100644 index 000000000..ab8b341ed Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic8.xnb differ diff --git a/lib/build/Content/Songs/RouteMusic9.xnb b/lib/build/Content/Songs/RouteMusic9.xnb new file mode 100644 index 000000000..4278ff690 Binary files /dev/null and b/lib/build/Content/Songs/RouteMusic9.xnb differ diff --git a/lib/build/Content/Songs/alph.xnb b/lib/build/Content/Songs/alph.xnb new file mode 100644 index 000000000..5ca026086 Binary files /dev/null and b/lib/build/Content/Songs/alph.xnb differ diff --git a/lib/build/Content/Songs/ancient_ruins.xnb b/lib/build/Content/Songs/ancient_ruins.xnb new file mode 100644 index 000000000..7903677e6 Binary files /dev/null and b/lib/build/Content/Songs/ancient_ruins.xnb differ diff --git a/lib/build/Content/Songs/azalea.xnb b/lib/build/Content/Songs/azalea.xnb new file mode 100644 index 000000000..f2f9dcb84 Binary files /dev/null and b/lib/build/Content/Songs/azalea.xnb differ diff --git a/lib/build/Content/Songs/barktown.xnb b/lib/build/Content/Songs/barktown.xnb new file mode 100644 index 000000000..17b05b23c Binary files /dev/null and b/lib/build/Content/Songs/barktown.xnb differ diff --git a/lib/build/Content/Songs/battlefactory.xnb b/lib/build/Content/Songs/battlefactory.xnb new file mode 100644 index 000000000..7b7cb2332 Binary files /dev/null and b/lib/build/Content/Songs/battlefactory.xnb differ diff --git a/lib/build/Content/Songs/battletower.xnb b/lib/build/Content/Songs/battletower.xnb new file mode 100644 index 000000000..f56b3fe75 Binary files /dev/null and b/lib/build/Content/Songs/battletower.xnb differ diff --git a/lib/build/Content/Songs/brain_battle.xnb b/lib/build/Content/Songs/brain_battle.xnb new file mode 100644 index 000000000..a451c4e8d Binary files /dev/null and b/lib/build/Content/Songs/brain_battle.xnb differ diff --git a/lib/build/Content/Songs/brain_battle_intro.xnb b/lib/build/Content/Songs/brain_battle_intro.xnb new file mode 100644 index 000000000..e2936f73d Binary files /dev/null and b/lib/build/Content/Songs/brain_battle_intro.xnb differ diff --git a/lib/build/Content/Songs/bugcontest.xnb b/lib/build/Content/Songs/bugcontest.xnb new file mode 100644 index 000000000..ae29c3743 Binary files /dev/null and b/lib/build/Content/Songs/bugcontest.xnb differ diff --git a/lib/build/Content/Songs/burnedtower.xnb b/lib/build/Content/Songs/burnedtower.xnb new file mode 100644 index 000000000..19642cd6b Binary files /dev/null and b/lib/build/Content/Songs/burnedtower.xnb differ diff --git a/lib/build/Content/Songs/celadon.xnb b/lib/build/Content/Songs/celadon.xnb new file mode 100644 index 000000000..a108d61e7 Binary files /dev/null and b/lib/build/Content/Songs/celadon.xnb differ diff --git a/lib/build/Content/Songs/center.xnb b/lib/build/Content/Songs/center.xnb new file mode 100644 index 000000000..b5d7130ee Binary files /dev/null and b/lib/build/Content/Songs/center.xnb differ diff --git a/lib/build/Content/Songs/cerulean.xnb b/lib/build/Content/Songs/cerulean.xnb new file mode 100644 index 000000000..632f9b794 Binary files /dev/null and b/lib/build/Content/Songs/cerulean.xnb differ diff --git a/lib/build/Content/Songs/cerulean_cave.xnb b/lib/build/Content/Songs/cerulean_cave.xnb new file mode 100644 index 000000000..e88f0fa58 Binary files /dev/null and b/lib/build/Content/Songs/cerulean_cave.xnb differ diff --git a/lib/build/Content/Songs/champion_defeat.xnb b/lib/build/Content/Songs/champion_defeat.xnb new file mode 100644 index 000000000..79dbbbc39 Binary files /dev/null and b/lib/build/Content/Songs/champion_defeat.xnb differ diff --git a/lib/build/Content/Songs/cherrygrove.xnb b/lib/build/Content/Songs/cherrygrove.xnb new file mode 100644 index 000000000..1f55247b4 Binary files /dev/null and b/lib/build/Content/Songs/cherrygrove.xnb differ diff --git a/lib/build/Content/Songs/cinnabar.xnb b/lib/build/Content/Songs/cinnabar.xnb new file mode 100644 index 000000000..4416726c3 Binary files /dev/null and b/lib/build/Content/Songs/cinnabar.xnb differ diff --git a/lib/build/Content/Songs/credits.xnb b/lib/build/Content/Songs/credits.xnb new file mode 100644 index 000000000..576fe329c Binary files /dev/null and b/lib/build/Content/Songs/credits.xnb differ diff --git a/lib/build/Content/Songs/dark_cave.xnb b/lib/build/Content/Songs/dark_cave.xnb new file mode 100644 index 000000000..36f2d6e09 Binary files /dev/null and b/lib/build/Content/Songs/dark_cave.xnb differ diff --git a/lib/build/Content/Songs/diglettscave.xnb b/lib/build/Content/Songs/diglettscave.xnb new file mode 100644 index 000000000..786e7c9a4 Binary files /dev/null and b/lib/build/Content/Songs/diglettscave.xnb differ diff --git a/lib/build/Content/Songs/dragonsden.xnb b/lib/build/Content/Songs/dragonsden.xnb new file mode 100644 index 000000000..dba212e06 Binary files /dev/null and b/lib/build/Content/Songs/dragonsden.xnb differ diff --git a/lib/build/Content/Songs/ecruteak.xnb b/lib/build/Content/Songs/ecruteak.xnb new file mode 100644 index 000000000..3d16a2b36 Binary files /dev/null and b/lib/build/Content/Songs/ecruteak.xnb differ diff --git a/lib/build/Content/Songs/elite_defeat.xnb b/lib/build/Content/Songs/elite_defeat.xnb new file mode 100644 index 000000000..ff00e9056 Binary files /dev/null and b/lib/build/Content/Songs/elite_defeat.xnb differ diff --git a/lib/build/Content/Songs/elmslab.xnb b/lib/build/Content/Songs/elmslab.xnb new file mode 100644 index 000000000..7e2504506 Binary files /dev/null and b/lib/build/Content/Songs/elmslab.xnb differ diff --git a/lib/build/Content/Songs/entei_battle.xnb b/lib/build/Content/Songs/entei_battle.xnb new file mode 100644 index 000000000..7bab51123 Binary files /dev/null and b/lib/build/Content/Songs/entei_battle.xnb differ diff --git a/lib/build/Content/Songs/entei_battle_intro.xnb b/lib/build/Content/Songs/entei_battle_intro.xnb new file mode 100644 index 000000000..b5216c462 Binary files /dev/null and b/lib/build/Content/Songs/entei_battle_intro.xnb differ diff --git a/lib/build/Content/Songs/eusine_encounter.xnb b/lib/build/Content/Songs/eusine_encounter.xnb new file mode 100644 index 000000000..3b13e384d Binary files /dev/null and b/lib/build/Content/Songs/eusine_encounter.xnb differ diff --git a/lib/build/Content/Songs/evolution.xnb b/lib/build/Content/Songs/evolution.xnb new file mode 100644 index 000000000..cc79f4393 Binary files /dev/null and b/lib/build/Content/Songs/evolution.xnb differ diff --git a/lib/build/Content/Songs/frontier.xnb b/lib/build/Content/Songs/frontier.xnb new file mode 100644 index 000000000..e2bf4be8f Binary files /dev/null and b/lib/build/Content/Songs/frontier.xnb differ diff --git a/lib/build/Content/Songs/gamecorner.xnb b/lib/build/Content/Songs/gamecorner.xnb new file mode 100644 index 000000000..402d56281 Binary files /dev/null and b/lib/build/Content/Songs/gamecorner.xnb differ diff --git a/lib/build/Content/Songs/gts.xnb b/lib/build/Content/Songs/gts.xnb new file mode 100644 index 000000000..d091f400e Binary files /dev/null and b/lib/build/Content/Songs/gts.xnb differ diff --git a/lib/build/Content/Songs/gym.xnb b/lib/build/Content/Songs/gym.xnb new file mode 100644 index 000000000..e25220e7a Binary files /dev/null and b/lib/build/Content/Songs/gym.xnb differ diff --git a/lib/build/Content/Songs/ho-oh_battle.xnb b/lib/build/Content/Songs/ho-oh_battle.xnb new file mode 100644 index 000000000..f3fcc3069 Binary files /dev/null and b/lib/build/Content/Songs/ho-oh_battle.xnb differ diff --git a/lib/build/Content/Songs/ho-oh_battle_intro.xnb b/lib/build/Content/Songs/ho-oh_battle_intro.xnb new file mode 100644 index 000000000..dc8db4a58 Binary files /dev/null and b/lib/build/Content/Songs/ho-oh_battle_intro.xnb differ diff --git a/lib/build/Content/Songs/indigo.xnb b/lib/build/Content/Songs/indigo.xnb new file mode 100644 index 000000000..54227f0d7 Binary files /dev/null and b/lib/build/Content/Songs/indigo.xnb differ diff --git a/lib/build/Content/Songs/intro/Goldenrod.xnb b/lib/build/Content/Songs/intro/Goldenrod.xnb new file mode 100644 index 000000000..2f675f532 Binary files /dev/null and b/lib/build/Content/Songs/intro/Goldenrod.xnb differ diff --git a/lib/build/Content/Songs/intro/IlexForest.xnb b/lib/build/Content/Songs/intro/IlexForest.xnb new file mode 100644 index 000000000..46f9ac07a Binary files /dev/null and b/lib/build/Content/Songs/intro/IlexForest.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic1.xnb b/lib/build/Content/Songs/intro/RouteMusic1.xnb new file mode 100644 index 000000000..f089c0dbf Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic1.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic10.xnb b/lib/build/Content/Songs/intro/RouteMusic10.xnb new file mode 100644 index 000000000..53389d577 Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic10.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic11.xnb b/lib/build/Content/Songs/intro/RouteMusic11.xnb new file mode 100644 index 000000000..07b045970 Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic11.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic2.xnb b/lib/build/Content/Songs/intro/RouteMusic2.xnb new file mode 100644 index 000000000..f9de59088 Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic2.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic3.xnb b/lib/build/Content/Songs/intro/RouteMusic3.xnb new file mode 100644 index 000000000..ed79618d4 Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic3.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic4.xnb b/lib/build/Content/Songs/intro/RouteMusic4.xnb new file mode 100644 index 000000000..d648a65f9 Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic4.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic5.xnb b/lib/build/Content/Songs/intro/RouteMusic5.xnb new file mode 100644 index 000000000..2b0a0c0c1 Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic5.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic6.xnb b/lib/build/Content/Songs/intro/RouteMusic6.xnb new file mode 100644 index 000000000..02131f3a0 Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic6.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic7.xnb b/lib/build/Content/Songs/intro/RouteMusic7.xnb new file mode 100644 index 000000000..f09befe0f Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic7.xnb differ diff --git a/lib/build/Content/Songs/intro/RouteMusic8.xnb b/lib/build/Content/Songs/intro/RouteMusic8.xnb new file mode 100644 index 000000000..093864ba5 Binary files /dev/null and b/lib/build/Content/Songs/intro/RouteMusic8.xnb differ diff --git a/lib/build/Content/Songs/intro/azalea.xnb b/lib/build/Content/Songs/intro/azalea.xnb new file mode 100644 index 000000000..ad4de334e Binary files /dev/null and b/lib/build/Content/Songs/intro/azalea.xnb differ diff --git a/lib/build/Content/Songs/intro/barktown.xnb b/lib/build/Content/Songs/intro/barktown.xnb new file mode 100644 index 000000000..d8da836f6 Binary files /dev/null and b/lib/build/Content/Songs/intro/barktown.xnb differ diff --git a/lib/build/Content/Songs/intro/battlefactory.xnb b/lib/build/Content/Songs/intro/battlefactory.xnb new file mode 100644 index 000000000..87fab2010 Binary files /dev/null and b/lib/build/Content/Songs/intro/battlefactory.xnb differ diff --git a/lib/build/Content/Songs/intro/bugcontest.xnb b/lib/build/Content/Songs/intro/bugcontest.xnb new file mode 100644 index 000000000..3914489d5 Binary files /dev/null and b/lib/build/Content/Songs/intro/bugcontest.xnb differ diff --git a/lib/build/Content/Songs/intro/burnedtower.xnb b/lib/build/Content/Songs/intro/burnedtower.xnb new file mode 100644 index 000000000..5b1e96215 Binary files /dev/null and b/lib/build/Content/Songs/intro/burnedtower.xnb differ diff --git a/lib/build/Content/Songs/intro/celadon.xnb b/lib/build/Content/Songs/intro/celadon.xnb new file mode 100644 index 000000000..b3b2e6999 Binary files /dev/null and b/lib/build/Content/Songs/intro/celadon.xnb differ diff --git a/lib/build/Content/Songs/intro/cerulean.xnb b/lib/build/Content/Songs/intro/cerulean.xnb new file mode 100644 index 000000000..06c7ed3c8 Binary files /dev/null and b/lib/build/Content/Songs/intro/cerulean.xnb differ diff --git a/lib/build/Content/Songs/intro/cerulean_cave.xnb b/lib/build/Content/Songs/intro/cerulean_cave.xnb new file mode 100644 index 000000000..f17aba52d Binary files /dev/null and b/lib/build/Content/Songs/intro/cerulean_cave.xnb differ diff --git a/lib/build/Content/Songs/intro/champion_defeat.xnb b/lib/build/Content/Songs/intro/champion_defeat.xnb new file mode 100644 index 000000000..e39d51865 Binary files /dev/null and b/lib/build/Content/Songs/intro/champion_defeat.xnb differ diff --git a/lib/build/Content/Songs/intro/cherrygrove.xnb b/lib/build/Content/Songs/intro/cherrygrove.xnb new file mode 100644 index 000000000..0a68e4345 Binary files /dev/null and b/lib/build/Content/Songs/intro/cherrygrove.xnb differ diff --git a/lib/build/Content/Songs/intro/diglettscave.xnb b/lib/build/Content/Songs/intro/diglettscave.xnb new file mode 100644 index 000000000..92bdfa9c3 Binary files /dev/null and b/lib/build/Content/Songs/intro/diglettscave.xnb differ diff --git a/lib/build/Content/Songs/intro/elite_defeat.xnb b/lib/build/Content/Songs/intro/elite_defeat.xnb new file mode 100644 index 000000000..17d89637a Binary files /dev/null and b/lib/build/Content/Songs/intro/elite_defeat.xnb differ diff --git a/lib/build/Content/Songs/intro/elmslab.xnb b/lib/build/Content/Songs/intro/elmslab.xnb new file mode 100644 index 000000000..c5a6da212 Binary files /dev/null and b/lib/build/Content/Songs/intro/elmslab.xnb differ diff --git a/lib/build/Content/Songs/intro/entei_battle.xnb b/lib/build/Content/Songs/intro/entei_battle.xnb new file mode 100644 index 000000000..4edfa8b7d Binary files /dev/null and b/lib/build/Content/Songs/intro/entei_battle.xnb differ diff --git a/lib/build/Content/Songs/intro/evolution.xnb b/lib/build/Content/Songs/intro/evolution.xnb new file mode 100644 index 000000000..77ab3389a Binary files /dev/null and b/lib/build/Content/Songs/intro/evolution.xnb differ diff --git a/lib/build/Content/Songs/intro/frontier.xnb b/lib/build/Content/Songs/intro/frontier.xnb new file mode 100644 index 000000000..c87351e4e Binary files /dev/null and b/lib/build/Content/Songs/intro/frontier.xnb differ diff --git a/lib/build/Content/Songs/intro/gamecorner.xnb b/lib/build/Content/Songs/intro/gamecorner.xnb new file mode 100644 index 000000000..843789a88 Binary files /dev/null and b/lib/build/Content/Songs/intro/gamecorner.xnb differ diff --git a/lib/build/Content/Songs/intro/gts.xnb b/lib/build/Content/Songs/intro/gts.xnb new file mode 100644 index 000000000..fa6f82cba Binary files /dev/null and b/lib/build/Content/Songs/intro/gts.xnb differ diff --git a/lib/build/Content/Songs/intro/ho-oh_battle.xnb b/lib/build/Content/Songs/intro/ho-oh_battle.xnb new file mode 100644 index 000000000..4a6b9f029 Binary files /dev/null and b/lib/build/Content/Songs/intro/ho-oh_battle.xnb differ diff --git a/lib/build/Content/Songs/intro/johto_elite.xnb b/lib/build/Content/Songs/intro/johto_elite.xnb new file mode 100644 index 000000000..6b8132b9d Binary files /dev/null and b/lib/build/Content/Songs/intro/johto_elite.xnb differ diff --git a/lib/build/Content/Songs/intro/johto_leader.xnb b/lib/build/Content/Songs/intro/johto_leader.xnb new file mode 100644 index 000000000..658f1b7c6 Binary files /dev/null and b/lib/build/Content/Songs/intro/johto_leader.xnb differ diff --git a/lib/build/Content/Songs/intro/johto_rival_encounter.xnb b/lib/build/Content/Songs/intro/johto_rival_encounter.xnb new file mode 100644 index 000000000..39214dec6 Binary files /dev/null and b/lib/build/Content/Songs/intro/johto_rival_encounter.xnb differ diff --git a/lib/build/Content/Songs/intro/johto_rocket.xnb b/lib/build/Content/Songs/intro/johto_rocket.xnb new file mode 100644 index 000000000..d7b224ff7 Binary files /dev/null and b/lib/build/Content/Songs/intro/johto_rocket.xnb differ diff --git a/lib/build/Content/Songs/intro/johto_trainer.xnb b/lib/build/Content/Songs/intro/johto_trainer.xnb new file mode 100644 index 000000000..59979fec2 Binary files /dev/null and b/lib/build/Content/Songs/intro/johto_trainer.xnb differ diff --git a/lib/build/Content/Songs/intro/johto_wild.xnb b/lib/build/Content/Songs/intro/johto_wild.xnb new file mode 100644 index 000000000..b16fefb3e Binary files /dev/null and b/lib/build/Content/Songs/intro/johto_wild.xnb differ diff --git a/lib/build/Content/Songs/intro/kanto_leader.xnb b/lib/build/Content/Songs/intro/kanto_leader.xnb new file mode 100644 index 000000000..421eb8aaa Binary files /dev/null and b/lib/build/Content/Songs/intro/kanto_leader.xnb differ diff --git a/lib/build/Content/Songs/intro/kanto_trainer.xnb b/lib/build/Content/Songs/intro/kanto_trainer.xnb new file mode 100644 index 000000000..b33a76d91 Binary files /dev/null and b/lib/build/Content/Songs/intro/kanto_trainer.xnb differ diff --git a/lib/build/Content/Songs/intro/lavender.xnb b/lib/build/Content/Songs/intro/lavender.xnb new file mode 100644 index 000000000..ccfc85467 Binary files /dev/null and b/lib/build/Content/Songs/intro/lavender.xnb differ diff --git a/lib/build/Content/Songs/intro/leader_defeat.xnb b/lib/build/Content/Songs/intro/leader_defeat.xnb new file mode 100644 index 000000000..0cd5a326a Binary files /dev/null and b/lib/build/Content/Songs/intro/leader_defeat.xnb differ diff --git a/lib/build/Content/Songs/intro/lobby.xnb b/lib/build/Content/Songs/intro/lobby.xnb new file mode 100644 index 000000000..a85d8f8e5 Binary files /dev/null and b/lib/build/Content/Songs/intro/lobby.xnb differ diff --git a/lib/build/Content/Songs/intro/lugia_battle.xnb b/lib/build/Content/Songs/intro/lugia_battle.xnb new file mode 100644 index 000000000..b46b86ad0 Binary files /dev/null and b/lib/build/Content/Songs/intro/lugia_battle.xnb differ diff --git a/lib/build/Content/Songs/intro/mart.xnb b/lib/build/Content/Songs/intro/mart.xnb new file mode 100644 index 000000000..e2e31eb1c Binary files /dev/null and b/lib/build/Content/Songs/intro/mart.xnb differ diff --git a/lib/build/Content/Songs/intro/mary_encounter.xnb b/lib/build/Content/Songs/intro/mary_encounter.xnb new file mode 100644 index 000000000..f87d74ad6 Binary files /dev/null and b/lib/build/Content/Songs/intro/mary_encounter.xnb differ diff --git a/lib/build/Content/Songs/intro/oak_encounter.xnb b/lib/build/Content/Songs/intro/oak_encounter.xnb new file mode 100644 index 000000000..95d94285d Binary files /dev/null and b/lib/build/Content/Songs/intro/oak_encounter.xnb differ diff --git a/lib/build/Content/Songs/intro/oakslab.xnb b/lib/build/Content/Songs/intro/oakslab.xnb new file mode 100644 index 000000000..52b3d1434 Binary files /dev/null and b/lib/build/Content/Songs/intro/oakslab.xnb differ diff --git a/lib/build/Content/Songs/intro/pokeflute.xnb b/lib/build/Content/Songs/intro/pokeflute.xnb new file mode 100644 index 000000000..58d095711 Binary files /dev/null and b/lib/build/Content/Songs/intro/pokeflute.xnb differ diff --git a/lib/build/Content/Songs/intro/pokemon_lullaby.xnb b/lib/build/Content/Songs/intro/pokemon_lullaby.xnb new file mode 100644 index 000000000..19802af0a Binary files /dev/null and b/lib/build/Content/Songs/intro/pokemon_lullaby.xnb differ diff --git a/lib/build/Content/Songs/intro/pokemon_march.xnb b/lib/build/Content/Songs/intro/pokemon_march.xnb new file mode 100644 index 000000000..59c265aa9 Binary files /dev/null and b/lib/build/Content/Songs/intro/pokemon_march.xnb differ diff --git a/lib/build/Content/Songs/intro/pvp.xnb b/lib/build/Content/Songs/intro/pvp.xnb new file mode 100644 index 000000000..ff474ead8 Binary files /dev/null and b/lib/build/Content/Songs/intro/pvp.xnb differ diff --git a/lib/build/Content/Songs/intro/raikou_battle.xnb b/lib/build/Content/Songs/intro/raikou_battle.xnb new file mode 100644 index 000000000..ed877e8e4 Binary files /dev/null and b/lib/build/Content/Songs/intro/raikou_battle.xnb differ diff --git a/lib/build/Content/Songs/intro/ride.xnb b/lib/build/Content/Songs/intro/ride.xnb new file mode 100644 index 000000000..657a95480 Binary files /dev/null and b/lib/build/Content/Songs/intro/ride.xnb differ diff --git a/lib/build/Content/Songs/intro/safari.xnb b/lib/build/Content/Songs/intro/safari.xnb new file mode 100644 index 000000000..ccb1db9ca Binary files /dev/null and b/lib/build/Content/Songs/intro/safari.xnb differ diff --git a/lib/build/Content/Songs/intro/show_me_around.xnb b/lib/build/Content/Songs/intro/show_me_around.xnb new file mode 100644 index 000000000..30b7fb6f4 Binary files /dev/null and b/lib/build/Content/Songs/intro/show_me_around.xnb differ diff --git a/lib/build/Content/Songs/intro/space_legend_battle.xnb b/lib/build/Content/Songs/intro/space_legend_battle.xnb new file mode 100644 index 000000000..6839d929c Binary files /dev/null and b/lib/build/Content/Songs/intro/space_legend_battle.xnb differ diff --git a/lib/build/Content/Songs/intro/sprout_tower.xnb b/lib/build/Content/Songs/intro/sprout_tower.xnb new file mode 100644 index 000000000..7a3e6b075 Binary files /dev/null and b/lib/build/Content/Songs/intro/sprout_tower.xnb differ diff --git a/lib/build/Content/Songs/intro/ssaqua.xnb b/lib/build/Content/Songs/intro/ssaqua.xnb new file mode 100644 index 000000000..ed5252d22 Binary files /dev/null and b/lib/build/Content/Songs/intro/ssaqua.xnb differ diff --git a/lib/build/Content/Songs/intro/startower.xnb b/lib/build/Content/Songs/intro/startower.xnb new file mode 100644 index 000000000..6c3f24c26 Binary files /dev/null and b/lib/build/Content/Songs/intro/startower.xnb differ diff --git a/lib/build/Content/Songs/intro/suicune_battle.xnb b/lib/build/Content/Songs/intro/suicune_battle.xnb new file mode 100644 index 000000000..7b0a435c9 Binary files /dev/null and b/lib/build/Content/Songs/intro/suicune_battle.xnb differ diff --git a/lib/build/Content/Songs/intro/trainer_encounter.xnb b/lib/build/Content/Songs/intro/trainer_encounter.xnb new file mode 100644 index 000000000..96b582f72 Binary files /dev/null and b/lib/build/Content/Songs/intro/trainer_encounter.xnb differ diff --git a/lib/build/Content/Songs/intro/vermilion.xnb b/lib/build/Content/Songs/intro/vermilion.xnb new file mode 100644 index 000000000..cbce9c1f3 Binary files /dev/null and b/lib/build/Content/Songs/intro/vermilion.xnb differ diff --git a/lib/build/Content/Songs/intro/violet.xnb b/lib/build/Content/Songs/intro/violet.xnb new file mode 100644 index 000000000..58b16c8cc Binary files /dev/null and b/lib/build/Content/Songs/intro/violet.xnb differ diff --git a/lib/build/Content/Songs/johto_champion.xnb b/lib/build/Content/Songs/johto_champion.xnb new file mode 100644 index 000000000..a89a1a9e7 Binary files /dev/null and b/lib/build/Content/Songs/johto_champion.xnb differ diff --git a/lib/build/Content/Songs/johto_elite.xnb b/lib/build/Content/Songs/johto_elite.xnb new file mode 100644 index 000000000..4bc469a85 Binary files /dev/null and b/lib/build/Content/Songs/johto_elite.xnb differ diff --git a/lib/build/Content/Songs/johto_elite_intro.xnb b/lib/build/Content/Songs/johto_elite_intro.xnb new file mode 100644 index 000000000..d126af0ec Binary files /dev/null and b/lib/build/Content/Songs/johto_elite_intro.xnb differ diff --git a/lib/build/Content/Songs/johto_leader.xnb b/lib/build/Content/Songs/johto_leader.xnb new file mode 100644 index 000000000..00b96fee2 Binary files /dev/null and b/lib/build/Content/Songs/johto_leader.xnb differ diff --git a/lib/build/Content/Songs/johto_leader_intro.xnb b/lib/build/Content/Songs/johto_leader_intro.xnb new file mode 100644 index 000000000..3ccce96a7 Binary files /dev/null and b/lib/build/Content/Songs/johto_leader_intro.xnb differ diff --git a/lib/build/Content/Songs/johto_rival.xnb b/lib/build/Content/Songs/johto_rival.xnb new file mode 100644 index 000000000..b693d2552 Binary files /dev/null and b/lib/build/Content/Songs/johto_rival.xnb differ diff --git a/lib/build/Content/Songs/johto_rival_encounter.xnb b/lib/build/Content/Songs/johto_rival_encounter.xnb new file mode 100644 index 000000000..d71142f47 Binary files /dev/null and b/lib/build/Content/Songs/johto_rival_encounter.xnb differ diff --git a/lib/build/Content/Songs/johto_rivalintro.xnb b/lib/build/Content/Songs/johto_rivalintro.xnb new file mode 100644 index 000000000..62bc13134 Binary files /dev/null and b/lib/build/Content/Songs/johto_rivalintro.xnb differ diff --git a/lib/build/Content/Songs/johto_rocket.xnb b/lib/build/Content/Songs/johto_rocket.xnb new file mode 100644 index 000000000..504262b0f Binary files /dev/null and b/lib/build/Content/Songs/johto_rocket.xnb differ diff --git a/lib/build/Content/Songs/johto_rocket_encounter.xnb b/lib/build/Content/Songs/johto_rocket_encounter.xnb new file mode 100644 index 000000000..52ebff169 Binary files /dev/null and b/lib/build/Content/Songs/johto_rocket_encounter.xnb differ diff --git a/lib/build/Content/Songs/johto_rocket_intro.xnb b/lib/build/Content/Songs/johto_rocket_intro.xnb new file mode 100644 index 000000000..5938183f7 Binary files /dev/null and b/lib/build/Content/Songs/johto_rocket_intro.xnb differ diff --git a/lib/build/Content/Songs/johto_trainer.xnb b/lib/build/Content/Songs/johto_trainer.xnb new file mode 100644 index 000000000..4929f172f Binary files /dev/null and b/lib/build/Content/Songs/johto_trainer.xnb differ diff --git a/lib/build/Content/Songs/johto_trainer_intro.xnb b/lib/build/Content/Songs/johto_trainer_intro.xnb new file mode 100644 index 000000000..4f84f41f5 Binary files /dev/null and b/lib/build/Content/Songs/johto_trainer_intro.xnb differ diff --git a/lib/build/Content/Songs/johto_wild.xnb b/lib/build/Content/Songs/johto_wild.xnb new file mode 100644 index 000000000..babc890ca Binary files /dev/null and b/lib/build/Content/Songs/johto_wild.xnb differ diff --git a/lib/build/Content/Songs/johto_wild_intro.xnb b/lib/build/Content/Songs/johto_wild_intro.xnb new file mode 100644 index 000000000..8adbca413 Binary files /dev/null and b/lib/build/Content/Songs/johto_wild_intro.xnb differ diff --git a/lib/build/Content/Songs/kanto_leader.xnb b/lib/build/Content/Songs/kanto_leader.xnb new file mode 100644 index 000000000..7aad7e1d5 Binary files /dev/null and b/lib/build/Content/Songs/kanto_leader.xnb differ diff --git a/lib/build/Content/Songs/kanto_leader_intro.xnb b/lib/build/Content/Songs/kanto_leader_intro.xnb new file mode 100644 index 000000000..386e0bd8e Binary files /dev/null and b/lib/build/Content/Songs/kanto_leader_intro.xnb differ diff --git a/lib/build/Content/Songs/kanto_trainer.xnb b/lib/build/Content/Songs/kanto_trainer.xnb new file mode 100644 index 000000000..b3016d2e7 Binary files /dev/null and b/lib/build/Content/Songs/kanto_trainer.xnb differ diff --git a/lib/build/Content/Songs/kanto_trainer_intro.xnb b/lib/build/Content/Songs/kanto_trainer_intro.xnb new file mode 100644 index 000000000..562d5da53 Binary files /dev/null and b/lib/build/Content/Songs/kanto_trainer_intro.xnb differ diff --git a/lib/build/Content/Songs/kanto_wild.xnb b/lib/build/Content/Songs/kanto_wild.xnb new file mode 100644 index 000000000..9dea61342 Binary files /dev/null and b/lib/build/Content/Songs/kanto_wild.xnb differ diff --git a/lib/build/Content/Songs/kanto_wild_intro.xnb b/lib/build/Content/Songs/kanto_wild_intro.xnb new file mode 100644 index 000000000..751f6fe88 Binary files /dev/null and b/lib/build/Content/Songs/kanto_wild_intro.xnb differ diff --git a/lib/build/Content/Songs/kimono.xnb b/lib/build/Content/Songs/kimono.xnb new file mode 100644 index 000000000..04e39296b Binary files /dev/null and b/lib/build/Content/Songs/kimono.xnb differ diff --git a/lib/build/Content/Songs/kvictoryroad.xnb b/lib/build/Content/Songs/kvictoryroad.xnb new file mode 100644 index 000000000..77b652e46 Binary files /dev/null and b/lib/build/Content/Songs/kvictoryroad.xnb differ diff --git a/lib/build/Content/Songs/lavender.xnb b/lib/build/Content/Songs/lavender.xnb new file mode 100644 index 000000000..83c606491 Binary files /dev/null and b/lib/build/Content/Songs/lavender.xnb differ diff --git a/lib/build/Content/Songs/leader_defeat.xnb b/lib/build/Content/Songs/leader_defeat.xnb new file mode 100644 index 000000000..6c7564105 Binary files /dev/null and b/lib/build/Content/Songs/leader_defeat.xnb differ diff --git a/lib/build/Content/Songs/lighthouse.xnb b/lib/build/Content/Songs/lighthouse.xnb new file mode 100644 index 000000000..519c39e9a Binary files /dev/null and b/lib/build/Content/Songs/lighthouse.xnb differ diff --git a/lib/build/Content/Songs/lobby.xnb b/lib/build/Content/Songs/lobby.xnb new file mode 100644 index 000000000..86a7cc5ce Binary files /dev/null and b/lib/build/Content/Songs/lobby.xnb differ diff --git a/lib/build/Content/Songs/lugia_battle.xnb b/lib/build/Content/Songs/lugia_battle.xnb new file mode 100644 index 000000000..fffb16b47 Binary files /dev/null and b/lib/build/Content/Songs/lugia_battle.xnb differ diff --git a/lib/build/Content/Songs/lugia_battle_intro.xnb b/lib/build/Content/Songs/lugia_battle_intro.xnb new file mode 100644 index 000000000..c7754b6be Binary files /dev/null and b/lib/build/Content/Songs/lugia_battle_intro.xnb differ diff --git a/lib/build/Content/Songs/mart.xnb b/lib/build/Content/Songs/mart.xnb new file mode 100644 index 000000000..e550bf36b Binary files /dev/null and b/lib/build/Content/Songs/mart.xnb differ diff --git a/lib/build/Content/Songs/mary_encounter.xnb b/lib/build/Content/Songs/mary_encounter.xnb new file mode 100644 index 000000000..aa8b77e29 Binary files /dev/null and b/lib/build/Content/Songs/mary_encounter.xnb differ diff --git a/lib/build/Content/Songs/mtmoonsq.xnb b/lib/build/Content/Songs/mtmoonsq.xnb new file mode 100644 index 000000000..bafecde9f Binary files /dev/null and b/lib/build/Content/Songs/mtmoonsq.xnb differ diff --git a/lib/build/Content/Songs/nationalpark.xnb b/lib/build/Content/Songs/nationalpark.xnb new file mode 100644 index 000000000..f6d6627ba Binary files /dev/null and b/lib/build/Content/Songs/nationalpark.xnb differ diff --git a/lib/build/Content/Songs/oak_encounter.xnb b/lib/build/Content/Songs/oak_encounter.xnb new file mode 100644 index 000000000..229fbd30d Binary files /dev/null and b/lib/build/Content/Songs/oak_encounter.xnb differ diff --git a/lib/build/Content/Songs/oakslab.xnb b/lib/build/Content/Songs/oakslab.xnb new file mode 100644 index 000000000..b28479e51 Binary files /dev/null and b/lib/build/Content/Songs/oakslab.xnb differ diff --git a/lib/build/Content/Songs/pallet.xnb b/lib/build/Content/Songs/pallet.xnb new file mode 100644 index 000000000..3e2341b6d Binary files /dev/null and b/lib/build/Content/Songs/pallet.xnb differ diff --git a/lib/build/Content/Songs/pokeflute.xnb b/lib/build/Content/Songs/pokeflute.xnb new file mode 100644 index 000000000..fb5fc11dd Binary files /dev/null and b/lib/build/Content/Songs/pokeflute.xnb differ diff --git a/lib/build/Content/Songs/pokemon_lullaby.xnb b/lib/build/Content/Songs/pokemon_lullaby.xnb new file mode 100644 index 000000000..d2444ce17 Binary files /dev/null and b/lib/build/Content/Songs/pokemon_lullaby.xnb differ diff --git a/lib/build/Content/Songs/pokemon_march.xnb b/lib/build/Content/Songs/pokemon_march.xnb new file mode 100644 index 000000000..fb9dde632 Binary files /dev/null and b/lib/build/Content/Songs/pokemon_march.xnb differ diff --git a/lib/build/Content/Songs/pvp.xnb b/lib/build/Content/Songs/pvp.xnb new file mode 100644 index 000000000..c62d3fec7 Binary files /dev/null and b/lib/build/Content/Songs/pvp.xnb differ diff --git a/lib/build/Content/Songs/rHideout.xnb b/lib/build/Content/Songs/rHideout.xnb new file mode 100644 index 000000000..6cb48d16f Binary files /dev/null and b/lib/build/Content/Songs/rHideout.xnb differ diff --git a/lib/build/Content/Songs/raikou_battle.xnb b/lib/build/Content/Songs/raikou_battle.xnb new file mode 100644 index 000000000..42c05cefb Binary files /dev/null and b/lib/build/Content/Songs/raikou_battle.xnb differ diff --git a/lib/build/Content/Songs/raikou_battle_intro.xnb b/lib/build/Content/Songs/raikou_battle_intro.xnb new file mode 100644 index 000000000..3e310849f Binary files /dev/null and b/lib/build/Content/Songs/raikou_battle_intro.xnb differ diff --git a/lib/build/Content/Songs/ride.xnb b/lib/build/Content/Songs/ride.xnb new file mode 100644 index 000000000..894f876b2 Binary files /dev/null and b/lib/build/Content/Songs/ride.xnb differ diff --git a/lib/build/Content/Songs/rocket_broadcast.xnb b/lib/build/Content/Songs/rocket_broadcast.xnb new file mode 100644 index 000000000..5c37021d9 Binary files /dev/null and b/lib/build/Content/Songs/rocket_broadcast.xnb differ diff --git a/lib/build/Content/Songs/safari.xnb b/lib/build/Content/Songs/safari.xnb new file mode 100644 index 000000000..195428e7e Binary files /dev/null and b/lib/build/Content/Songs/safari.xnb differ diff --git a/lib/build/Content/Songs/safarigate.xnb b/lib/build/Content/Songs/safarigate.xnb new file mode 100644 index 000000000..f86404ce2 Binary files /dev/null and b/lib/build/Content/Songs/safarigate.xnb differ diff --git a/lib/build/Content/Songs/show_me_around.xnb b/lib/build/Content/Songs/show_me_around.xnb new file mode 100644 index 000000000..9b1e70c91 Binary files /dev/null and b/lib/build/Content/Songs/show_me_around.xnb differ diff --git a/lib/build/Content/Songs/space_legend_battle.xnb b/lib/build/Content/Songs/space_legend_battle.xnb new file mode 100644 index 000000000..e9ed50f5a Binary files /dev/null and b/lib/build/Content/Songs/space_legend_battle.xnb differ diff --git a/lib/build/Content/Songs/space_legend_battle_intro.xnb b/lib/build/Content/Songs/space_legend_battle_intro.xnb new file mode 100644 index 000000000..67bc84723 Binary files /dev/null and b/lib/build/Content/Songs/space_legend_battle_intro.xnb differ diff --git a/lib/build/Content/Songs/sprout_tower.xnb b/lib/build/Content/Songs/sprout_tower.xnb new file mode 100644 index 000000000..f08c5d53c Binary files /dev/null and b/lib/build/Content/Songs/sprout_tower.xnb differ diff --git a/lib/build/Content/Songs/ssaqua.xnb b/lib/build/Content/Songs/ssaqua.xnb new file mode 100644 index 000000000..2ade59480 Binary files /dev/null and b/lib/build/Content/Songs/ssaqua.xnb differ diff --git a/lib/build/Content/Songs/startower.xnb b/lib/build/Content/Songs/startower.xnb new file mode 100644 index 000000000..be431f2d0 Binary files /dev/null and b/lib/build/Content/Songs/startower.xnb differ diff --git a/lib/build/Content/Songs/suicune_battle.xnb b/lib/build/Content/Songs/suicune_battle.xnb new file mode 100644 index 000000000..c696bf9ae Binary files /dev/null and b/lib/build/Content/Songs/suicune_battle.xnb differ diff --git a/lib/build/Content/Songs/suicune_battle_intro.xnb b/lib/build/Content/Songs/suicune_battle_intro.xnb new file mode 100644 index 000000000..d8bfee204 Binary files /dev/null and b/lib/build/Content/Songs/suicune_battle_intro.xnb differ diff --git a/lib/build/Content/Songs/surf.xnb b/lib/build/Content/Songs/surf.xnb new file mode 100644 index 000000000..f47b36223 Binary files /dev/null and b/lib/build/Content/Songs/surf.xnb differ diff --git a/lib/build/Content/Songs/tintower.xnb b/lib/build/Content/Songs/tintower.xnb new file mode 100644 index 000000000..43e2939da Binary files /dev/null and b/lib/build/Content/Songs/tintower.xnb differ diff --git a/lib/build/Content/Songs/title.xnb b/lib/build/Content/Songs/title.xnb new file mode 100644 index 000000000..e03537864 Binary files /dev/null and b/lib/build/Content/Songs/title.xnb differ diff --git a/lib/build/Content/Songs/trainer_defeat.xnb b/lib/build/Content/Songs/trainer_defeat.xnb new file mode 100644 index 000000000..0a16bef77 Binary files /dev/null and b/lib/build/Content/Songs/trainer_defeat.xnb differ diff --git a/lib/build/Content/Songs/trainer_encounter.xnb b/lib/build/Content/Songs/trainer_encounter.xnb new file mode 100644 index 000000000..87cede2f8 Binary files /dev/null and b/lib/build/Content/Songs/trainer_encounter.xnb differ diff --git a/lib/build/Content/Songs/unown_broadcast.xnb b/lib/build/Content/Songs/unown_broadcast.xnb new file mode 100644 index 000000000..7385abb5f Binary files /dev/null and b/lib/build/Content/Songs/unown_broadcast.xnb differ diff --git a/lib/build/Content/Songs/vermilion.xnb b/lib/build/Content/Songs/vermilion.xnb new file mode 100644 index 000000000..838ad6ea2 Binary files /dev/null and b/lib/build/Content/Songs/vermilion.xnb differ diff --git a/lib/build/Content/Songs/violet.xnb b/lib/build/Content/Songs/violet.xnb new file mode 100644 index 000000000..48dfe747e Binary files /dev/null and b/lib/build/Content/Songs/violet.xnb differ diff --git a/lib/build/Content/Songs/viridian_forest.xnb b/lib/build/Content/Songs/viridian_forest.xnb new file mode 100644 index 000000000..65df8d5a5 Binary files /dev/null and b/lib/build/Content/Songs/viridian_forest.xnb differ diff --git a/lib/build/Content/Songs/wild_defeat.xnb b/lib/build/Content/Songs/wild_defeat.xnb new file mode 100644 index 000000000..65572440f Binary files /dev/null and b/lib/build/Content/Songs/wild_defeat.xnb differ diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe index a08f131cb..d8a64f055 100644 Binary files a/lib/build/Pokemon3D.exe and b/lib/build/Pokemon3D.exe differ