diff --git a/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb b/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb
index 88890fc26..997f76755 100644
--- a/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb
+++ b/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb
@@ -15,7 +15,7 @@
         FadeOutSpeed = 0.0F
         FadeOut = False
         FadeIn = False
-        MediaPlayer.IsRepeating = True
+        MediaPlayer.IsRepeating = False
     End Sub
 
     Class CSong
@@ -211,14 +211,14 @@
                 lastSong = SongList(SongList.Count - 1)
             End If
         End If
-
+        MediaPlayer.IsRepeating = True
         If SearchForIntro = True And lastSong.ToLower() <> Song.ToLower() Then
             If SongFiles.Keys.Contains("intro\" & Song.ToLower()) = True Then
                 If SongFiles("intro\" & Song.ToLower()).Origin = SongFiles(Song.ToLower()).Origin Then
-                    IntroEndTime = Date.Now + SongFiles("intro\" & Song.ToLower()).Song.Duration
+                    IntroEndTime = DateAdd(DateInterval.Second, -1, Date.Now) + SongFiles("intro\" & Song.ToLower()).Song.Duration
 
                     PlayMusic("intro\" & Song.ToLower(), NewFadeInSpeed, NewFadeOutSpeed)
-
+                    MediaPlayer.IsRepeating = False
                     IntroContinue = Song
                     IntroStarted = True
                     If NewFadeInSpeed > 0.0F And NewFadeOutSpeed > 0.0F Then
@@ -354,7 +354,8 @@
 
             If IntroStarted = True Then
                 If Date.Now >= IntroEndTime Then
-                    PlayTrack(IntroContinue)
+                    PlayTrack(IntroContinue)  'Plays the loop that follows the intro
+                    MediaPlayer.IsRepeating = True
                 End If
             End If
         End If
@@ -381,7 +382,7 @@
 
                 If FadeIntoIntro = True Then
                     IntroStarted = True
-                    IntroEndTime = Date.Now + SongFiles(NextSong).Song.Duration
+                    IntroEndTime = DateAdd(DateInterval.Second, -1, Date.Now) + SongFiles(NextSong).Song.Duration
                     FadeIntoIntro = False
                 End If
 
diff --git a/2.5DHero/2.5DHero/Screens/BattleIntroScreen.vb b/2.5DHero/2.5DHero/Screens/BattleIntroScreen.vb
index 31d4fb5cb..7732b792b 100644
--- a/2.5DHero/2.5DHero/Screens/BattleIntroScreen.vb
+++ b/2.5DHero/2.5DHero/Screens/BattleIntroScreen.vb
@@ -519,7 +519,7 @@
     End Sub
 
     Private Function SongOver() As Boolean
-        Return startTime + duration < Date.Now
+        Return startTime + duration < DateAdd(DateInterval.Second, +1, Date.Now)
     End Function
 
     'Protected Overrides Sub Finalize()
diff --git a/2.5DHero/2.5DHeroContent/Content.mgcb b/2.5DHero/2.5DHeroContent/Content.mgcb
index 3c67ab648..7e24c4a7d 100644
--- a/2.5DHero/2.5DHeroContent/Content.mgcb
+++ b/2.5DHero/2.5DHeroContent/Content.mgcb
@@ -13,120 +13,6 @@
 
 #---------------------------------- Content ---------------------------------#
 
-#begin Songs/intro/barktown.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/barktown.mp3
-
-#begin Songs/intro/burnedtower.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/burnedtower.mp3
-
-#begin Songs/intro/cherrygrove.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/cherrygrove.mp3
-
-#begin Songs/intro/elmslab.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/elmslab.mp3
-
-#begin Songs/intro/goldenrod.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/goldenrod.mp3
-
-#begin Songs/intro/lavender.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/lavender.mp3
-
-#begin Songs/intro/mart.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/mart.mp3
-
-#begin Songs/intro/mary_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/mary_encounter.mp3
-
-#begin Songs/intro/oak_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/oak_encounter.mp3
-
-#begin Songs/intro/ride.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/ride.mp3
-
-#begin Songs/intro/RouteMusic1.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic1.mp3
-
-#begin Songs/intro/RouteMusic2.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic2.mp3
-
-#begin Songs/intro/RouteMusic3.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic3.mp3
-
-#begin Songs/intro/RouteMusic4.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic4.mp3
-
-#begin Songs/intro/RouteMusic5.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic5.mp3
-
-#begin Songs/intro/RouteMusic6.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic6.mp3
-
-#begin Songs/intro/show_me_around.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/show_me_around.mp3
-
-#begin Songs/intro/trainer_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/trainer_encounter.mp3
-
-#begin Songs/intro/violet.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/violet.mp3
-
 #begin Textures/indigo.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -283,12 +169,6 @@
 /processorParam:TextureFormat=Color
 /build:GUI/Overworld/Sign.png
 
-#begin Songs/barktown.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/barktown.mp3
-
 #begin Textures/BarkTown.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -601,30 +481,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/Lab.png
 
-#begin Songs/title.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/title.mp3
-
-#begin Songs/cherrygrove.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/cherrygrove.mp3
-
-#begin Songs/RouteMusic0.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic0.mp3
-
-#begin Songs/RouteMusic1.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic1.mp3
-
 #begin Textures/NPC/61.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -637,12 +493,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/61.png
 
-#begin Songs/center.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/center.mp3
-
 #begin Textures/NPC/12.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -715,12 +565,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/63.png
 
-#begin Songs/violet.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/violet.mp3
-
 #begin Textures/NPC/2.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -853,12 +697,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/Lavender.png
 
-#begin Songs/lavender.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/lavender.mp3
-
 #begin Textures/NPC/slender.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -1183,12 +1021,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/Battle/StatChange/statUp.png
 
-#begin Songs/johto_wild.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_wild.mp3
-
 #begin Textures/NPC/Ethan.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -1201,12 +1033,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/Ethan.png
 
-#begin Songs/johto_wild_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_wild_intro.mp3
-
 #begin Textures/NPC/oak.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -1243,24 +1069,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/Gym.png
 
-#begin Songs/gym.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/gym.mp3
-
-#begin Songs/dark_cave.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/dark_cave.mp3
-
-#begin Songs/show_me_around.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/show_me_around.mp3
-
 #begin Sounds/pokemon_heal.mp3
 /importer:Mp3Importer
 /processor:SoundEffectProcessor
@@ -1357,24 +1165,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/bugcatcher.png
 
-#begin Songs/sprout_tower.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/sprout_tower.mp3
-
-#begin Songs/johto_trainer.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_trainer.mp3
-
-#begin Songs/trainer_defeat.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/trainer_defeat.mp3
-
 #begin Textures/NPC/Rattata.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -1399,30 +1189,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/emoticons.png
 
-#begin Songs/johto_rival.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_rival.mp3
-
-#begin Songs/johto_rivalintro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_rivalintro.mp3
-
-#begin Songs/johto_rival_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_rival_encounter.mp3
-
-#begin Songs/trainer_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/trainer_encounter.mp3
-
 #begin Sounds/Cries/1.mp3
 /importer:Mp3Importer
 /processor:SoundEffectProcessor
@@ -1771,18 +1537,6 @@
 /processorParam:Quality=Best
 /build:Sounds/Cries/187.mp3
 
-#begin Songs/wild_defeat.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/wild_defeat.mp3
-
-#begin Songs/johto_trainer_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_trainer_intro.mp3
-
 #begin Textures/NPC/9.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -1807,24 +1561,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/Falkner.png
 
-#begin Songs/johto_leader.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_leader.mp3
-
-#begin Songs/johto_leader_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_leader_intro.mp3
-
-#begin Songs/leader_defeat.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/leader_defeat.mp3
-
 #begin GUI/Badges.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -3199,18 +2935,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/Slowpoke.png
 
-#begin Songs/johto_rocket.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_rocket.mp3
-
-#begin Songs/johto_rocket_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_rocket_intro.mp3
-
 #begin Textures/NPC/Bugsy.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -3247,12 +2971,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/LittleGirl.png
 
-#begin Songs/azalea.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/azalea.mp3
-
 #begin Textures/NPC/Farfetch'd.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -3271,12 +2989,6 @@
 /processorParam:Quality=Best
 /build:Sounds/badge_acquired.mp3
 
-#begin Songs/IlexForest.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/IlexForest.mp3
-
 #begin Textures/NPC/22.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -10075,12 +9787,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/Alph.png
 
-#begin Songs/RouteMusic2.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic2.mp3
-
 #begin Sounds/Battle/running.mp3
 /importer:Mp3Importer
 /processor:SoundEffectProcessor
@@ -10195,12 +9901,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/Whitney.png
 
-#begin Songs/Goldenrod.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/Goldenrod.mp3
-
 #begin Textures/NPC/26.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -10237,12 +9937,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/Kanto0.png
 
-#begin Songs/alph.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/alph.mp3
-
 #begin Textures/NPC/29.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -10423,18 +10117,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/Morty.png
 
-#begin Songs/burnedtower.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/burnedtower.mp3
-
-#begin Songs/ecruteak.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/ecruteak.mp3
-
 #begin Textures/NPC/31.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -10447,24 +10129,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/31.png
 
-#begin Songs/tintower.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/tintower.mp3
-
-#begin Songs/kimono.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/kimono.mp3
-
-#begin Songs/RouteMusic3.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic3.mp3
-
 #begin Textures/NPC/32.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -10537,12 +10201,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/House4.png
 
-#begin Songs/lighthouse.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/lighthouse.mp3
-
 #begin Textures/NPC/33.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -10567,12 +10225,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/cianwood.png
 
-#begin Songs/nationalpark.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/nationalpark.mp3
-
 #begin Textures/NPC/34.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -10657,12 +10309,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/Battle/Water/bubble.png
 
-#begin Songs/RouteMusic4.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic4.mp3
-
 #begin Textures/Battle/Water/Water.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -10711,12 +10357,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/Ariana.png
 
-#begin Songs/rHideout.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/rHideout.mp3
-
 #begin Textures/Emblem/trainer.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -10957,12 +10597,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/princevade.png
 
-#begin Songs/johto_rocket_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_rocket_encounter.mp3
-
 #begin Textures/Emblem/fog.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -12871,18 +12505,6 @@
 /processorParam:Quality=Best
 /build:Sounds/Cries/298.mp3
 
-#begin Songs/dragonsden.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/dragonsden.mp3
-
-#begin Songs/RouteMusic6.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic6.mp3
-
 #begin GUI/Map/kanto_map.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -12901,12 +12523,6 @@
 /processorParam:DebugMode=Auto
 /build:Effects/BlurEffect.fx
 
-#begin Songs/kvictoryroad.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/kvictoryroad.mp3
-
 #begin Textures/Emblem/missingno.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -12943,84 +12559,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/train.png
 
-#begin Songs/mart.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/mart.mp3
-
-#begin Songs/champion_defeat.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/champion_defeat.mp3
-
-#begin Songs/elite_defeat.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/elite_defeat.mp3
-
-#begin Songs/eusine_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/eusine_encounter.mp3
-
-#begin Songs/HallofFame.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/HallofFame.mp3
-
-#begin Songs/johto_champion.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_champion.mp3
-
-#begin Songs/Johto_champion_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/Johto_champion_intro.mp3
-
-#begin Songs/johto_elite.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_elite.mp3
-
-#begin Songs/johto_elite_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/johto_elite_intro.mp3
-
-#begin Songs/mary_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/mary_encounter.mp3
-
-#begin Songs/oak_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/oak_encounter.mp3
-
-#begin Songs/ride.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/ride.mp3
-
-#begin Songs/surf.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/surf.mp3
-
 #begin GUI/Menus/GTS.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -13033,18 +12571,6 @@
 /processorParam:TextureFormat=Color
 /build:GUI/Menus/GTS.png
 
-#begin Songs/elmslab.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/elmslab.mp3
-
-#begin Songs/intro/johto_rival_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/johto_rival_encounter.mp3
-
 #begin Pokemon/Sprites/Abra.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -17123,12 +16649,6 @@
 /processorParam:TextureFormat=DxtCompressed
 /build:SkyDomeResource/SkyDome.x
 
-#begin Songs/intro/johto_wild.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/johto_wild.mp3
-
 #begin GUI/Map/sevii islands_map.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -17153,18 +16673,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/captain.png
 
-#begin Songs/intro/ssaqua.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/ssaqua.mp3
-
-#begin Songs/ssaqua.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/ssaqua.mp3
-
 #begin Sounds/Cries/447.mp3
 /importer:Mp3Importer
 /processor:SoundEffectProcessor
@@ -18311,18 +17819,6 @@
 /processorParam:Quality=Best
 /build:Sounds/Cries/252.mp3
 
-#begin Songs/gts.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/gts.mp3
-
-#begin Songs/intro/gts.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/gts.mp3
-
 #begin GUI/Battle/WeatherIcons.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -19655,24 +19151,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/SafariGate.png
 
-#begin Songs/intro/safari.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/safari.mp3
-
-#begin Songs/safari.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/safari.mp3
-
-#begin Songs/safarigate.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/safarigate.mp3
-
 #begin Textures/Safari.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -19727,18 +19205,6 @@
 /processorParam:TextureFormat=Color
 /build:GUI/Trophies.png
 
-#begin Songs/bugcontest.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/bugcontest.mp3
-
-#begin Songs/intro/bugcontest.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/bugcontest.mp3
-
 #begin Sounds/Cries/261.mp3
 /importer:Mp3Importer
 /processor:SoundEffectProcessor
@@ -20519,18 +19985,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/Weather/ash2.png
 
-#begin Songs/pvp.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/pvp.mp3
-
-#begin Songs/intro/pvp.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/pvp.mp3
-
 #begin Pokemon/Overworld/Normal/700.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -21557,24 +21011,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/battletower/9.png
 
-#begin Songs/frontier.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/frontier.mp3
-
-#begin Songs/intro/frontier.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/frontier.mp3
-
-#begin Songs/battletower.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/battletower.mp3
-
 #begin Textures/Emblem/gold ability.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -23219,36 +22655,6 @@
 /processorParam:TextureFormat=Color
 /build:GUI/Intro/battlefrontier.png
 
-#begin Songs/brain_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/brain_battle.mp3
-
-#begin Songs/brain_battle_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/brain_battle_intro.mp3
-
-#begin Songs/battlefactory.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/battlefactory.mp3
-
-#begin Songs/intro/battlefactory.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/battlefactory.mp3
-
-#begin Songs/intro/johto_trainer.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/johto_trainer.mp3
-
 #begin Textures/battletower.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -26999,78 +26405,6 @@
 /processorParam:TextureFormat=Color
 /build:SkyDomeResource/UnderwaterGround.png
 
-#begin Songs/gamecorner.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/gamecorner.mp3
-
-#begin Songs/oakslab.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/oakslab.mp3
-
-#begin Songs/intro/gamecorner.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/gamecorner.mp3
-
-#begin Songs/intro/oakslab.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/oakslab.mp3
-
-#begin Songs/pokemon_lullaby.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/pokemon_lullaby.mp3
-
-#begin Songs/pokemon_march.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/pokemon_march.mp3
-
-#begin Songs/intro/pokemon_lullaby.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/pokemon_lullaby.mp3
-
-#begin Songs/intro/pokemon_march.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/pokemon_march.mp3
-
-#begin Songs/unown_broadcast.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/unown_broadcast.mp3
-
-#begin Songs/rocket_broadcast.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/rocket_broadcast.mp3
-
-#begin Songs/evolution.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/evolution.mp3
-
-#begin Songs/intro/evolution.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/evolution.mp3
-
 #begin Sounds/success.mp3
 /importer:Mp3Importer
 /processor:SoundEffectProcessor
@@ -27120,66 +26454,6 @@
 /processorParam:TextureFormat=DxtCompressed
 /build:Models/truck2/Truck.fbx
 
-#begin Songs/kanto_leader.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/kanto_leader.mp3
-
-#begin Songs/kanto_leader_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/kanto_leader_intro.mp3
-
-#begin Songs/kanto_trainer.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/kanto_trainer.mp3
-
-#begin Songs/kanto_trainer_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/kanto_trainer_intro.mp3
-
-#begin Songs/RouteMusic7.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic7.mp3
-
-#begin Songs/vermilion.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/vermilion.mp3
-
-#begin Songs/intro/kanto_leader.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/kanto_leader.mp3
-
-#begin Songs/intro/kanto_trainer.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/kanto_trainer.mp3
-
-#begin Songs/intro/RouteMusic7.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic7.mp3
-
-#begin Songs/intro/vermilion.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/vermilion.mp3
-
 #begin Textures/NPC/lightning.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -27204,30 +26478,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/LtSurge.png
 
-#begin Songs/diglettscave.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/diglettscave.mp3
-
-#begin Songs/kanto_wild.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/kanto_wild.mp3
-
-#begin Songs/kanto_wild_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/kanto_wild_intro.mp3
-
-#begin Songs/intro/diglettscave.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/diglettscave.mp3
-
 #begin Pokemon/Overworld/Normal/661.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -27966,24 +27216,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/misty.png
 
-#begin Songs/cerulean.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/cerulean.mp3
-
-#begin Songs/intro/cerulean.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/cerulean.mp3
-
-#begin Songs/RouteMusic9.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic9.mp3
-
 #begin GUI/Box/BattleBox.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -27996,18 +27228,6 @@
 /processorParam:TextureFormat=Color
 /build:GUI/Box/BattleBox.png
 
-#begin Songs/lobby.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/lobby.mp3
-
-#begin Songs/intro/lobby.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/lobby.mp3
-
 #begin Textures/NPC/85.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -28020,42 +27240,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/85.png
 
-#begin Songs/cerulean_cave.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/cerulean_cave.mp3
-
-#begin Songs/pokeflute.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/pokeflute.mp3
-
-#begin Songs/RouteMusic8.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic8.mp3
-
-#begin Songs/intro/cerulean_cave.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/cerulean_cave.mp3
-
-#begin Songs/intro/pokeflute.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/pokeflute.mp3
-
-#begin Songs/intro/RouteMusic8.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic8.mp3
-
 #begin Pokemon/Overworld/Normal/708.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -28572,60 +27756,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/Brock.png
 
-#begin Songs/mtmoonsq.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/mtmoonsq.mp3
-
-#begin Songs/RouteMusic10.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic10.mp3
-
-#begin Songs/RouteMusic11.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic11.mp3
-
-#begin Songs/viridian_forest.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/viridian_forest.mp3
-
-#begin Songs/intro/RouteMusic10.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic10.mp3
-
-#begin Songs/intro/RouteMusic11.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/RouteMusic11.mp3
-
-#begin Songs/credits.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/credits.mp3
-
-#begin Songs/indigo.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/indigo.mp3
-
-#begin Songs/RouteMusic5.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/RouteMusic5.mp3
-
 #begin Pokemon/Sprites/noibat.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -28824,12 +27954,6 @@
 /processorParam:Quality=Best
 /build:Sounds/Battle/Effects/effect_pound.mp3
 
-#begin Songs/intro/azalea.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/azalea.mp3
-
 #begin Sounds/Battle/Effects/effect_ember.mp3
 /importer:Mp3Importer
 /processor:SoundEffectProcessor
@@ -28944,12 +28068,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/Looker.png
 
-#begin Songs/Looker_encounter.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/Looker_encounter.mp3
-
 #begin Textures/NPC/Sabrina.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -28962,96 +28080,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/Sabrina.png
 
-#begin Songs/ho-oh_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/ho-oh_battle.mp3
-
-#begin Songs/ho-oh_battle_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/ho-oh_battle_intro.mp3
-
-#begin Songs/lugia_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/lugia_battle.mp3
-
-#begin Songs/lugia_battle_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/lugia_battle_intro.mp3
-
-#begin Songs/suicune_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/suicune_battle.mp3
-
-#begin Songs/suicune_battle_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/suicune_battle_intro.mp3
-
-#begin Songs/intro/ho-oh_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/ho-oh_battle.mp3
-
-#begin Songs/intro/lugia_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/lugia_battle.mp3
-
-#begin Songs/intro/suicune_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/suicune_battle.mp3
-
-#begin Songs/entei_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/entei_battle.mp3
-
-#begin Songs/entei_battle_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/entei_battle_intro.mp3
-
-#begin Songs/intro/entei_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/entei_battle.mp3
-
-#begin Songs/raikou_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/raikou_battle.mp3
-
-#begin Songs/raikou_battle_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/raikou_battle_intro.mp3
-
-#begin Songs/intro/raikou_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/raikou_battle.mp3
-
 #begin Textures/NPC/Erika.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -29076,18 +28104,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/NPC/MasterRoshi.png
 
-#begin Songs/celadon.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/celadon.mp3
-
-#begin Songs/intro/celadon.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/celadon.mp3
-
 #begin Textures/Emblem/marsh.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -30552,42 +29568,6 @@
 /processorParam:TextureFormat=Color
 /build:Pokemon/Sprites/Yamask.png
 
-#begin Songs/intro/space_legend_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/space_legend_battle.mp3
-
-#begin Songs/intro/startower.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/intro/startower.mp3
-
-#begin Songs/ancient_ruins.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/ancient_ruins.mp3
-
-#begin Songs/space_legend_battle.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/space_legend_battle.mp3
-
-#begin Songs/space_legend_battle_intro.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/space_legend_battle_intro.mp3
-
-#begin Songs/startower.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/startower.mp3
-
 #begin Textures/NPC/queen.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -38358,18 +37338,6 @@
 /processorParam:TextureFormat=Color
 /build:Pokemon/Sprites/Volcanion.png
 
-#begin Songs/cinnabar.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/cinnabar.mp3
-
-#begin Songs/pallet.mp3
-/importer:Mp3Importer
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:Songs/pallet.mp3
-
 #begin Sounds/Cries/721.mp3
 /importer:Mp3Importer
 /processor:SoundEffectProcessor
@@ -39894,3 +38862,1077 @@
 /processorParam:TextureFormat=Color
 /build:Pokemon/Sprites/Venusaur_mega.png
 
+#begin Songs/intro/azalea.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/azalea.ogg
+
+#begin Songs/alph.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/alph.ogg
+
+#begin Songs/azalea.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/azalea.ogg
+
+#begin Songs/cherrygrove.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/cherrygrove.ogg
+
+#begin Songs/intro/cherrygrove.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/cherrygrove.ogg
+
+#begin Songs/barktown.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/barktown.ogg
+
+#begin Songs/intro/barktown.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/barktown.ogg
+
+#begin Songs/battlefactory.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/battlefactory.ogg
+
+#begin Songs/intro/battlefactory.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/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/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/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/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/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/intro/champion_defeat.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/champion_defeat.ogg
+
+#begin Songs/diglettscave.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/diglettscave.ogg
+
+#begin Songs/intro/diglettscave.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/diglettscave.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/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/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/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/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/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_rival_encounter.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/johto_rival_encounter.ogg
+
+#begin Songs/johto_rivalintro.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/johto_rivalintro.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/intro/kanto_leader.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/kanto_leader.ogg
+
+#begin Songs/ancient_ruins.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/ancient_ruins.ogg
+
+#begin Songs/intro/raikou_battle.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/raikou_battle.ogg
+
+#begin Songs/intro/suicune_battle.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/suicune_battle.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/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/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/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/oak_encounter.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/oak_encounter.ogg
+
+#begin Songs/intro/oakslab.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/oakslab.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/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/oak_encounter.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/oak_encounter.ogg
+
+#begin Songs/oakslab.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/oakslab.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/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/intro/ride.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/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/RouteMusic2.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/RouteMusic2.ogg
+
+#begin Songs/intro/RouteMusic1.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/RouteMusic1.ogg
+
+#begin Songs/intro/RouteMusic2.ogg
+/importer:OggImporter
+/processor:SongProcessor
+/processorParam:Quality=Best
+/build:Songs/intro/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/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/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/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/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/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/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/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/2.5DHero/2.5DHeroContent/Songs/Goldenrod.mp3 b/2.5DHero/2.5DHeroContent/Songs/Goldenrod.mp3
deleted file mode 100644
index 9bb2c6c72..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/Goldenrod.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/Goldenrod.ogg b/2.5DHero/2.5DHeroContent/Songs/Goldenrod.ogg
new file mode 100644
index 000000000..6637335a7
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/Goldenrod.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/HallofFame.mp3 b/2.5DHero/2.5DHeroContent/Songs/HallofFame.mp3
deleted file mode 100644
index e5a8e034e..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/HallofFame.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/HallofFame.ogg b/2.5DHero/2.5DHeroContent/Songs/HallofFame.ogg
new file mode 100644
index 000000000..0ad135f86
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/HallofFame.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/IlexForest.mp3 b/2.5DHero/2.5DHeroContent/Songs/IlexForest.mp3
deleted file mode 100644
index b09964ba7..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/IlexForest.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/IlexForest.ogg b/2.5DHero/2.5DHeroContent/Songs/IlexForest.ogg
new file mode 100644
index 000000000..27cb8182d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/IlexForest.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/Johto_champion_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/Johto_champion_intro.mp3
deleted file mode 100644
index 5a3eaf435..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/Johto_champion_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/Johto_champion_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/Johto_champion_intro.ogg
new file mode 100644
index 000000000..9e5a1743a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/Johto_champion_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/Looker_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/Looker_encounter.mp3
deleted file mode 100644
index 4d9443f7d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/Looker_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/Looker_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/Looker_encounter.ogg
new file mode 100644
index 000000000..e6b252a94
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/Looker_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic0.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic0.mp3
deleted file mode 100644
index e53b46920..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic0.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic0.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic0.ogg
new file mode 100644
index 000000000..3b4dd44bd
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic0.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic1.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic1.mp3
deleted file mode 100644
index 0d821c966..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic1.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic1.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic1.ogg
new file mode 100644
index 000000000..5051ddf7a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic1.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic10.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic10.mp3
deleted file mode 100644
index 917c39637..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic10.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic10.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic10.ogg
new file mode 100644
index 000000000..0dab7c1be
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic10.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic11.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic11.mp3
deleted file mode 100644
index 4b432f8a2..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic11.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic11.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic11.ogg
new file mode 100644
index 000000000..cc180b9c5
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic11.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic2.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic2.mp3
deleted file mode 100644
index 949281189..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic2.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic2.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic2.ogg
new file mode 100644
index 000000000..a73a56f66
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic2.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic3.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic3.mp3
deleted file mode 100644
index 392593d48..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic3.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic3.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic3.ogg
new file mode 100644
index 000000000..b352c34d8
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic3.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic4.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic4.mp3
deleted file mode 100644
index 288e657a3..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic4.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic4.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic4.ogg
new file mode 100644
index 000000000..f25a6b463
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic4.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic5.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic5.mp3
deleted file mode 100644
index 102223a8b..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic5.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic5.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic5.ogg
new file mode 100644
index 000000000..699e93b39
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic5.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic6.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic6.mp3
deleted file mode 100644
index 6acd7e001..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic6.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic6.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic6.ogg
new file mode 100644
index 000000000..43135cd51
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic6.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic7.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic7.mp3
deleted file mode 100644
index d553527bd..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic7.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic7.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic7.ogg
new file mode 100644
index 000000000..9a2b8daec
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic7.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic8.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic8.mp3
deleted file mode 100644
index c7c125223..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic8.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic8.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic8.ogg
new file mode 100644
index 000000000..f3bdd9fa3
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic8.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic9.mp3 b/2.5DHero/2.5DHeroContent/Songs/RouteMusic9.mp3
deleted file mode 100644
index 5540b18dd..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/RouteMusic9.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/RouteMusic9.ogg b/2.5DHero/2.5DHeroContent/Songs/RouteMusic9.ogg
new file mode 100644
index 000000000..b53394a8e
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/RouteMusic9.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/alph.mp3 b/2.5DHero/2.5DHeroContent/Songs/alph.mp3
deleted file mode 100644
index 50c7b750a..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/alph.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/alph.ogg b/2.5DHero/2.5DHeroContent/Songs/alph.ogg
new file mode 100644
index 000000000..98fb280c9
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/alph.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ancient_ruins.mp3 b/2.5DHero/2.5DHeroContent/Songs/ancient_ruins.mp3
deleted file mode 100644
index 7001f14c7..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/ancient_ruins.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ancient_ruins.ogg b/2.5DHero/2.5DHeroContent/Songs/ancient_ruins.ogg
new file mode 100644
index 000000000..ccc187846
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/ancient_ruins.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/azalea.mp3 b/2.5DHero/2.5DHeroContent/Songs/azalea.mp3
deleted file mode 100644
index 3f1303214..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/azalea.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/azalea.ogg b/2.5DHero/2.5DHeroContent/Songs/azalea.ogg
new file mode 100644
index 000000000..eac6c7f84
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/azalea.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/barktown.mp3 b/2.5DHero/2.5DHeroContent/Songs/barktown.mp3
deleted file mode 100644
index 25a9786c3..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/barktown.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/barktown.ogg b/2.5DHero/2.5DHeroContent/Songs/barktown.ogg
new file mode 100644
index 000000000..040967abb
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/barktown.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/battlefactory.mp3 b/2.5DHero/2.5DHeroContent/Songs/battlefactory.mp3
deleted file mode 100644
index 50125b1d0..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/battlefactory.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/battlefactory.ogg b/2.5DHero/2.5DHeroContent/Songs/battlefactory.ogg
new file mode 100644
index 000000000..a62ae9b38
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/battlefactory.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/battletower.mp3 b/2.5DHero/2.5DHeroContent/Songs/battletower.mp3
deleted file mode 100644
index b4fdffd45..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/battletower.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/battletower.ogg b/2.5DHero/2.5DHeroContent/Songs/battletower.ogg
new file mode 100644
index 000000000..5a46fd138
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/battletower.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/brain_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/brain_battle.mp3
deleted file mode 100644
index d33acf313..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/brain_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/brain_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/brain_battle.ogg
new file mode 100644
index 000000000..cd5eba274
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/brain_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/brain_battle_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/brain_battle_intro.mp3
deleted file mode 100644
index 56ac580bc..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/brain_battle_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/brain_battle_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/brain_battle_intro.ogg
new file mode 100644
index 000000000..1228df230
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/brain_battle_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/bugcontest.mp3 b/2.5DHero/2.5DHeroContent/Songs/bugcontest.mp3
deleted file mode 100644
index ec91f4af5..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/bugcontest.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/bugcontest.ogg b/2.5DHero/2.5DHeroContent/Songs/bugcontest.ogg
new file mode 100644
index 000000000..57600316a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/bugcontest.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/burnedtower.mp3 b/2.5DHero/2.5DHeroContent/Songs/burnedtower.mp3
deleted file mode 100644
index fb7ed56b2..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/burnedtower.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/burnedtower.ogg b/2.5DHero/2.5DHeroContent/Songs/burnedtower.ogg
new file mode 100644
index 000000000..3681948da
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/burnedtower.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/celadon.mp3 b/2.5DHero/2.5DHeroContent/Songs/celadon.mp3
deleted file mode 100644
index 59349074b..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/celadon.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/celadon.ogg b/2.5DHero/2.5DHeroContent/Songs/celadon.ogg
new file mode 100644
index 000000000..c0bc0356a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/celadon.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/center.mp3 b/2.5DHero/2.5DHeroContent/Songs/center.mp3
deleted file mode 100644
index 6381d8722..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/center.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/center.ogg b/2.5DHero/2.5DHeroContent/Songs/center.ogg
new file mode 100644
index 000000000..aa5d0664d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/center.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/cerulean.mp3 b/2.5DHero/2.5DHeroContent/Songs/cerulean.mp3
deleted file mode 100644
index 89e86095f..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/cerulean.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/cerulean.ogg b/2.5DHero/2.5DHeroContent/Songs/cerulean.ogg
new file mode 100644
index 000000000..8cf244303
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/cerulean.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/cerulean_cave.mp3 b/2.5DHero/2.5DHeroContent/Songs/cerulean_cave.mp3
deleted file mode 100644
index 1c50e35f7..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/cerulean_cave.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/cerulean_cave.ogg b/2.5DHero/2.5DHeroContent/Songs/cerulean_cave.ogg
new file mode 100644
index 000000000..2ec42e667
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/cerulean_cave.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/champion_defeat.mp3 b/2.5DHero/2.5DHeroContent/Songs/champion_defeat.mp3
deleted file mode 100644
index 60bc608a2..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/champion_defeat.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/champion_defeat.ogg b/2.5DHero/2.5DHeroContent/Songs/champion_defeat.ogg
new file mode 100644
index 000000000..5e2cf0f06
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/champion_defeat.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/cherrygrove.mp3 b/2.5DHero/2.5DHeroContent/Songs/cherrygrove.mp3
deleted file mode 100644
index 5bf338877..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/cherrygrove.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/cherrygrove.ogg b/2.5DHero/2.5DHeroContent/Songs/cherrygrove.ogg
new file mode 100644
index 000000000..78d6d79fe
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/cherrygrove.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/cinnabar.mp3 b/2.5DHero/2.5DHeroContent/Songs/cinnabar.mp3
deleted file mode 100644
index fb754e3e4..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/cinnabar.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/cinnabar.ogg b/2.5DHero/2.5DHeroContent/Songs/cinnabar.ogg
new file mode 100644
index 000000000..92a5ece53
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/cinnabar.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/credits.mp3 b/2.5DHero/2.5DHeroContent/Songs/credits.mp3
deleted file mode 100644
index 79ee8f0ef..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/credits.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/credits.ogg b/2.5DHero/2.5DHeroContent/Songs/credits.ogg
new file mode 100644
index 000000000..a3b5c0897
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/credits.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/dark_cave.mp3 b/2.5DHero/2.5DHeroContent/Songs/dark_cave.mp3
deleted file mode 100644
index 2db159629..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/dark_cave.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/dark_cave.ogg b/2.5DHero/2.5DHeroContent/Songs/dark_cave.ogg
new file mode 100644
index 000000000..adee602bc
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/dark_cave.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/diglettscave.mp3 b/2.5DHero/2.5DHeroContent/Songs/diglettscave.mp3
deleted file mode 100644
index 72bdbfdac..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/diglettscave.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/diglettscave.ogg b/2.5DHero/2.5DHeroContent/Songs/diglettscave.ogg
new file mode 100644
index 000000000..7d1a85b6e
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/diglettscave.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/dragonsden.mp3 b/2.5DHero/2.5DHeroContent/Songs/dragonsden.mp3
deleted file mode 100644
index 240ef14f3..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/dragonsden.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/dragonsden.ogg b/2.5DHero/2.5DHeroContent/Songs/dragonsden.ogg
new file mode 100644
index 000000000..0597f9b99
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/dragonsden.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ecruteak.mp3 b/2.5DHero/2.5DHeroContent/Songs/ecruteak.mp3
deleted file mode 100644
index 5b7400ef9..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/ecruteak.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ecruteak.ogg b/2.5DHero/2.5DHeroContent/Songs/ecruteak.ogg
new file mode 100644
index 000000000..f1408e555
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/ecruteak.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/elite_defeat.mp3 b/2.5DHero/2.5DHeroContent/Songs/elite_defeat.mp3
deleted file mode 100644
index 60bc608a2..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/elite_defeat.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/elite_defeat.ogg b/2.5DHero/2.5DHeroContent/Songs/elite_defeat.ogg
new file mode 100644
index 000000000..b09b284f2
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/elite_defeat.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/elmslab.mp3 b/2.5DHero/2.5DHeroContent/Songs/elmslab.mp3
deleted file mode 100644
index 2f0935ec8..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/elmslab.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/elmslab.ogg b/2.5DHero/2.5DHeroContent/Songs/elmslab.ogg
new file mode 100644
index 000000000..201cf5f55
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/elmslab.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/entei_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/entei_battle.mp3
deleted file mode 100644
index 0a55dd711..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/entei_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/entei_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/entei_battle.ogg
new file mode 100644
index 000000000..a7764346c
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/entei_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/entei_battle_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/entei_battle_intro.mp3
deleted file mode 100644
index 9f0819348..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/entei_battle_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/entei_battle_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/entei_battle_intro.ogg
new file mode 100644
index 000000000..8dcf6c3f9
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/entei_battle_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/eusine_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/eusine_encounter.mp3
deleted file mode 100644
index 8b8d8237e..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/eusine_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/eusine_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/eusine_encounter.ogg
new file mode 100644
index 000000000..16e994d76
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/eusine_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/evolution.mp3 b/2.5DHero/2.5DHeroContent/Songs/evolution.mp3
deleted file mode 100644
index 6268848da..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/evolution.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/evolution.ogg b/2.5DHero/2.5DHeroContent/Songs/evolution.ogg
new file mode 100644
index 000000000..a970a94b2
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/evolution.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/frontier.mp3 b/2.5DHero/2.5DHeroContent/Songs/frontier.mp3
deleted file mode 100644
index b9fc8c533..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/frontier.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/frontier.ogg b/2.5DHero/2.5DHeroContent/Songs/frontier.ogg
new file mode 100644
index 000000000..19d757295
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/frontier.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/gamecorner.mp3 b/2.5DHero/2.5DHeroContent/Songs/gamecorner.mp3
deleted file mode 100644
index 137ab0a8d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/gamecorner.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/gamecorner.ogg b/2.5DHero/2.5DHeroContent/Songs/gamecorner.ogg
new file mode 100644
index 000000000..26b72ce23
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/gamecorner.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/gts.mp3 b/2.5DHero/2.5DHeroContent/Songs/gts.mp3
deleted file mode 100644
index 0c34aa640..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/gts.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/gts.ogg b/2.5DHero/2.5DHeroContent/Songs/gts.ogg
new file mode 100644
index 000000000..1c854e8b4
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/gts.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/gym.mp3 b/2.5DHero/2.5DHeroContent/Songs/gym.mp3
deleted file mode 100644
index d07bfc703..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/gym.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/gym.ogg b/2.5DHero/2.5DHeroContent/Songs/gym.ogg
new file mode 100644
index 000000000..ac14f48fc
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/gym.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle.mp3
deleted file mode 100644
index 2a6f17a9c..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle.ogg
new file mode 100644
index 000000000..a9242a01d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle_intro.mp3
deleted file mode 100644
index 8ab478d5c..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle_intro.ogg
new file mode 100644
index 000000000..37a0df39f
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/ho-oh_battle_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/indigo.mp3 b/2.5DHero/2.5DHeroContent/Songs/indigo.mp3
deleted file mode 100644
index 2be10d7d2..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/indigo.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/indigo.ogg b/2.5DHero/2.5DHeroContent/Songs/indigo.ogg
new file mode 100644
index 000000000..12dca7ba7
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/indigo.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/Goldenrod.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/Goldenrod.ogg
new file mode 100644
index 000000000..4bc2d4e42
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/Goldenrod.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/IlexForest.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/IlexForest.ogg
new file mode 100644
index 000000000..327a30643
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/IlexForest.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic1.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic1.mp3
deleted file mode 100644
index 490db9d26..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic1.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic1.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic1.ogg
new file mode 100644
index 000000000..bb9a596b7
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic1.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic10.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic10.mp3
deleted file mode 100644
index 7ec817515..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic10.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic10.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic10.ogg
new file mode 100644
index 000000000..16a2d7a77
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic10.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic11.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic11.mp3
deleted file mode 100644
index c4f119bfb..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic11.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic11.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic11.ogg
new file mode 100644
index 000000000..e716d7653
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic11.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic2.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic2.mp3
deleted file mode 100644
index 3facaa3f7..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic2.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic2.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic2.ogg
new file mode 100644
index 000000000..3d6a4beed
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic2.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic3.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic3.mp3
deleted file mode 100644
index 881fb1497..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic3.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic3.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic3.ogg
new file mode 100644
index 000000000..d4b6a72c6
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic3.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic4.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic4.mp3
deleted file mode 100644
index 4671c95fd..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic4.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic4.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic4.ogg
new file mode 100644
index 000000000..5f7e3827d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic4.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic5.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic5.mp3
deleted file mode 100644
index ba7237eb7..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic5.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic5.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic5.ogg
new file mode 100644
index 000000000..38e642af2
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic5.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic6.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic6.mp3
deleted file mode 100644
index 89042bc92..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic6.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic6.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic6.ogg
new file mode 100644
index 000000000..ec8148ad0
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic6.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic7.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic7.mp3
deleted file mode 100644
index 66f12350c..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic7.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic7.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic7.ogg
new file mode 100644
index 000000000..fbc790d77
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic7.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic8.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic8.mp3
deleted file mode 100644
index 5cff81323..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic8.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic8.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic8.ogg
new file mode 100644
index 000000000..257c2b3f5
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/RouteMusic8.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/azalea.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/azalea.mp3
deleted file mode 100644
index fdd43e930..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/azalea.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/azalea.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/azalea.ogg
new file mode 100644
index 000000000..0108630b9
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/azalea.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/barktown.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/barktown.mp3
deleted file mode 100644
index 2e5a9e38d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/barktown.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/barktown.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/barktown.ogg
new file mode 100644
index 000000000..bd50d9a98
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/barktown.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/battlefactory.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/battlefactory.mp3
deleted file mode 100644
index cc45b4242..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/battlefactory.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/battlefactory.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/battlefactory.ogg
new file mode 100644
index 000000000..108fdf930
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/battlefactory.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/bugcontest.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/bugcontest.mp3
deleted file mode 100644
index fedd331ab..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/bugcontest.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/bugcontest.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/bugcontest.ogg
new file mode 100644
index 000000000..0b84ddebf
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/bugcontest.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/burnedtower.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/burnedtower.mp3
deleted file mode 100644
index 6f2da8133..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/burnedtower.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/burnedtower.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/burnedtower.ogg
new file mode 100644
index 000000000..8cf6e5a81
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/burnedtower.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/celadon.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/celadon.mp3
deleted file mode 100644
index b60544f39..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/celadon.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/celadon.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/celadon.ogg
new file mode 100644
index 000000000..fe10747df
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/celadon.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/cerulean.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/cerulean.mp3
deleted file mode 100644
index f273e8193..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/cerulean.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/cerulean.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/cerulean.ogg
new file mode 100644
index 000000000..b64f72e34
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/cerulean.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/cerulean_cave.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/cerulean_cave.mp3
deleted file mode 100644
index ed00fe972..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/cerulean_cave.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/cerulean_cave.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/cerulean_cave.ogg
new file mode 100644
index 000000000..acfa12b47
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/cerulean_cave.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/champion_defeat.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/champion_defeat.ogg
new file mode 100644
index 000000000..8d9322d26
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/champion_defeat.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/cherrygrove.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/cherrygrove.mp3
deleted file mode 100644
index 5b5730ce1..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/cherrygrove.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/cherrygrove.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/cherrygrove.ogg
new file mode 100644
index 000000000..6636396af
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/cherrygrove.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/diglettscave.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/diglettscave.mp3
deleted file mode 100644
index 42dc85173..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/diglettscave.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/diglettscave.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/diglettscave.ogg
new file mode 100644
index 000000000..1b43b9654
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/diglettscave.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/elite_defeat.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/elite_defeat.ogg
new file mode 100644
index 000000000..233994d6a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/elite_defeat.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/elmslab.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/elmslab.mp3
deleted file mode 100644
index ea33faa30..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/elmslab.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/elmslab.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/elmslab.ogg
new file mode 100644
index 000000000..671f17876
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/elmslab.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/entei_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/entei_battle.mp3
deleted file mode 100644
index 28f486a4a..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/entei_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/entei_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/entei_battle.ogg
new file mode 100644
index 000000000..c8726160d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/entei_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/evolution.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/evolution.mp3
deleted file mode 100644
index 67a337b7e..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/evolution.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/evolution.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/evolution.ogg
new file mode 100644
index 000000000..4b4fa9465
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/evolution.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/frontier.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/frontier.mp3
deleted file mode 100644
index ab0ee341c..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/frontier.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/frontier.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/frontier.ogg
new file mode 100644
index 000000000..b4ef16de6
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/frontier.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/gamecorner.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/gamecorner.mp3
deleted file mode 100644
index 64a179e10..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/gamecorner.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/gamecorner.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/gamecorner.ogg
new file mode 100644
index 000000000..422ccc5c8
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/gamecorner.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/goldenrod.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/goldenrod.mp3
deleted file mode 100644
index 1fb53a4ac..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/goldenrod.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/gts.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/gts.mp3
deleted file mode 100644
index 592911db3..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/gts.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/gts.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/gts.ogg
new file mode 100644
index 000000000..f2f7a3b0b
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/gts.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/ho-oh_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/ho-oh_battle.mp3
deleted file mode 100644
index 44b334743..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/ho-oh_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/ho-oh_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/ho-oh_battle.ogg
new file mode 100644
index 000000000..4848f480b
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/ho-oh_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/johto_elite.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/johto_elite.ogg
new file mode 100644
index 000000000..d1ed825dc
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/johto_elite.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/johto_leader.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/johto_leader.ogg
new file mode 100644
index 000000000..98f3f5aae
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/johto_leader.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/johto_rival_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/johto_rival_encounter.mp3
deleted file mode 100644
index 9a1549dab..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/johto_rival_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/johto_rival_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/johto_rival_encounter.ogg
new file mode 100644
index 000000000..8b212a8e2
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/johto_rival_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/johto_rocket.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/johto_rocket.ogg
new file mode 100644
index 000000000..140854909
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/johto_rocket.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/johto_trainer.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/johto_trainer.mp3
deleted file mode 100644
index 7debedf2f..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/johto_trainer.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/johto_trainer.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/johto_trainer.ogg
new file mode 100644
index 000000000..c7c66b5f9
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/johto_trainer.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/johto_wild.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/johto_wild.mp3
deleted file mode 100644
index 946c48a3a..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/johto_wild.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/johto_wild.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/johto_wild.ogg
new file mode 100644
index 000000000..08a6ff2f9
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/johto_wild.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/kanto_leader.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/kanto_leader.mp3
deleted file mode 100644
index 9c3c26d8e..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/kanto_leader.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/kanto_leader.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/kanto_leader.ogg
new file mode 100644
index 000000000..cdc37eaf2
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/kanto_leader.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/kanto_trainer.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/kanto_trainer.mp3
deleted file mode 100644
index 04390463c..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/kanto_trainer.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/kanto_trainer.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/kanto_trainer.ogg
new file mode 100644
index 000000000..abcec4f46
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/kanto_trainer.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/lavender.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/lavender.mp3
deleted file mode 100644
index 483140387..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/lavender.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/lavender.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/lavender.ogg
new file mode 100644
index 000000000..3b6032401
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/lavender.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/leader_defeat.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/leader_defeat.ogg
new file mode 100644
index 000000000..ea036cccf
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/leader_defeat.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/lobby.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/lobby.mp3
deleted file mode 100644
index f25057145..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/lobby.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/lobby.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/lobby.ogg
new file mode 100644
index 000000000..0a6d322e1
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/lobby.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/lugia_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/lugia_battle.mp3
deleted file mode 100644
index 4abf18371..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/lugia_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/lugia_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/lugia_battle.ogg
new file mode 100644
index 000000000..7bbebb71e
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/lugia_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/mart.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/mart.mp3
deleted file mode 100644
index 600dd3e68..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/mart.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/mart.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/mart.ogg
new file mode 100644
index 000000000..06f9dad5a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/mart.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/mary_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/mary_encounter.mp3
deleted file mode 100644
index 217189c75..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/mary_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/mary_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/mary_encounter.ogg
new file mode 100644
index 000000000..c7553a1dc
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/mary_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/oak_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/oak_encounter.mp3
deleted file mode 100644
index 4713d516f..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/oak_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/oak_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/oak_encounter.ogg
new file mode 100644
index 000000000..973f07206
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/oak_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/oakslab.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/oakslab.mp3
deleted file mode 100644
index c05b89935..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/oakslab.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/oakslab.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/oakslab.ogg
new file mode 100644
index 000000000..ca26297ef
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/oakslab.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/pokeflute.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/pokeflute.mp3
deleted file mode 100644
index 931956b78..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/pokeflute.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/pokeflute.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/pokeflute.ogg
new file mode 100644
index 000000000..89f9c7035
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/pokeflute.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_lullaby.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_lullaby.mp3
deleted file mode 100644
index b4926059e..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_lullaby.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_lullaby.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_lullaby.ogg
new file mode 100644
index 000000000..22bd101be
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_lullaby.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_march.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_march.mp3
deleted file mode 100644
index 13a0df58f..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_march.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_march.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_march.ogg
new file mode 100644
index 000000000..a831ff9c5
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/pokemon_march.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/pvp.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/pvp.mp3
deleted file mode 100644
index 5880ac929..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/pvp.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/pvp.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/pvp.ogg
new file mode 100644
index 000000000..4ee94505e
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/pvp.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/raikou_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/raikou_battle.mp3
deleted file mode 100644
index 28f486a4a..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/raikou_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/raikou_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/raikou_battle.ogg
new file mode 100644
index 000000000..d9d598d32
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/raikou_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/ride.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/ride.mp3
deleted file mode 100644
index 901745b7f..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/ride.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/ride.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/ride.ogg
new file mode 100644
index 000000000..0479c228f
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/ride.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/safari.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/safari.mp3
deleted file mode 100644
index 66070ee87..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/safari.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/safari.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/safari.ogg
new file mode 100644
index 000000000..1f442e728
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/safari.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/show_me_around.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/show_me_around.mp3
deleted file mode 100644
index 1023b253f..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/show_me_around.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/show_me_around.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/show_me_around.ogg
new file mode 100644
index 000000000..6b921fadd
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/show_me_around.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/space_legend_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/space_legend_battle.mp3
deleted file mode 100644
index d6859cb18..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/space_legend_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/space_legend_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/space_legend_battle.ogg
new file mode 100644
index 000000000..86e495b38
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/space_legend_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/sprout_tower.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/sprout_tower.ogg
new file mode 100644
index 000000000..adb6d9ada
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/sprout_tower.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/ssaqua.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/ssaqua.mp3
deleted file mode 100644
index e8a182125..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/ssaqua.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/ssaqua.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/ssaqua.ogg
new file mode 100644
index 000000000..2d47173c3
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/ssaqua.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/startower.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/startower.mp3
deleted file mode 100644
index d774c0329..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/startower.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/startower.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/startower.ogg
new file mode 100644
index 000000000..b6bb81773
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/startower.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/suicune_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/suicune_battle.mp3
deleted file mode 100644
index 28f486a4a..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/suicune_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/suicune_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/suicune_battle.ogg
new file mode 100644
index 000000000..5ce89714a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/suicune_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/trainer_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/trainer_encounter.mp3
deleted file mode 100644
index 6fa734fbf..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/trainer_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/trainer_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/trainer_encounter.ogg
new file mode 100644
index 000000000..df8bcf8cb
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/trainer_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/vermilion.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/vermilion.mp3
deleted file mode 100644
index 2cc1d6d9d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/vermilion.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/vermilion.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/vermilion.ogg
new file mode 100644
index 000000000..1e69c8feb
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/vermilion.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/violet.mp3 b/2.5DHero/2.5DHeroContent/Songs/intro/violet.mp3
deleted file mode 100644
index a1553cb11..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/intro/violet.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/intro/violet.ogg b/2.5DHero/2.5DHeroContent/Songs/intro/violet.ogg
new file mode 100644
index 000000000..58836e849
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/intro/violet.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_champion.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_champion.mp3
deleted file mode 100644
index 83d374170..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_champion.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_champion.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_champion.ogg
new file mode 100644
index 000000000..a82ec2f84
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_champion.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_elite.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_elite.mp3
deleted file mode 100644
index cd91eacca..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_elite.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_elite.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_elite.ogg
new file mode 100644
index 000000000..40381134b
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_elite.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_elite_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_elite_intro.mp3
deleted file mode 100644
index 2065298ff..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_elite_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_elite_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_elite_intro.ogg
new file mode 100644
index 000000000..818aab608
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_elite_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_leader.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_leader.mp3
deleted file mode 100644
index f5f3c73be..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_leader.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_leader.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_leader.ogg
new file mode 100644
index 000000000..3cc5a4a7f
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_leader.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_leader_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_leader_intro.mp3
deleted file mode 100644
index 8573a7c35..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_leader_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_leader_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_leader_intro.ogg
new file mode 100644
index 000000000..8df135117
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_leader_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rival.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_rival.mp3
deleted file mode 100644
index 8724c23e5..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_rival.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rival.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_rival.ogg
new file mode 100644
index 000000000..e09d1dfbc
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_rival.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rival_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_rival_encounter.mp3
deleted file mode 100644
index f3e7e3820..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_rival_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rival_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_rival_encounter.ogg
new file mode 100644
index 000000000..daaa51c5e
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_rival_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rivalintro.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_rivalintro.mp3
deleted file mode 100644
index 0cb49980d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_rivalintro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rivalintro.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_rivalintro.ogg
new file mode 100644
index 000000000..ae399e343
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_rivalintro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rocket.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_rocket.mp3
deleted file mode 100644
index 53d7c01ca..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_rocket.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rocket.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_rocket.ogg
new file mode 100644
index 000000000..146c4309a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_rocket.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rocket_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_rocket_encounter.mp3
deleted file mode 100644
index b17326378..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_rocket_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rocket_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_rocket_encounter.ogg
new file mode 100644
index 000000000..ca5f1578d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_rocket_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rocket_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_rocket_intro.mp3
deleted file mode 100644
index 44987b93d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_rocket_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_rocket_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_rocket_intro.ogg
new file mode 100644
index 000000000..a60bbc0dc
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_rocket_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_trainer.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_trainer.mp3
deleted file mode 100644
index 7c7a98ed7..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_trainer.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_trainer.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_trainer.ogg
new file mode 100644
index 000000000..d3b34d74b
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_trainer.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_trainer_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_trainer_intro.mp3
deleted file mode 100644
index cb4c941c4..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_trainer_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_trainer_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_trainer_intro.ogg
new file mode 100644
index 000000000..1b6d1c52f
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_trainer_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_wild.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_wild.mp3
deleted file mode 100644
index b81fada30..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_wild.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_wild.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_wild.ogg
new file mode 100644
index 000000000..cf0d1eabd
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_wild.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_wild_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/johto_wild_intro.mp3
deleted file mode 100644
index 51c17def3..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/johto_wild_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/johto_wild_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/johto_wild_intro.ogg
new file mode 100644
index 000000000..93bb8f95e
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/johto_wild_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_leader.mp3 b/2.5DHero/2.5DHeroContent/Songs/kanto_leader.mp3
deleted file mode 100644
index c66d8ad34..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/kanto_leader.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_leader.ogg b/2.5DHero/2.5DHeroContent/Songs/kanto_leader.ogg
new file mode 100644
index 000000000..815a026f5
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/kanto_leader.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_leader_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/kanto_leader_intro.mp3
deleted file mode 100644
index 183be902a..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/kanto_leader_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_leader_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/kanto_leader_intro.ogg
new file mode 100644
index 000000000..4e540190b
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/kanto_leader_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_trainer.mp3 b/2.5DHero/2.5DHeroContent/Songs/kanto_trainer.mp3
deleted file mode 100644
index 918dbad6d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/kanto_trainer.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_trainer.ogg b/2.5DHero/2.5DHeroContent/Songs/kanto_trainer.ogg
new file mode 100644
index 000000000..2f8d1639e
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/kanto_trainer.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_trainer_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/kanto_trainer_intro.mp3
deleted file mode 100644
index c8809a5d4..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/kanto_trainer_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_trainer_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/kanto_trainer_intro.ogg
new file mode 100644
index 000000000..3a33666cd
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/kanto_trainer_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_wild.mp3 b/2.5DHero/2.5DHeroContent/Songs/kanto_wild.mp3
deleted file mode 100644
index 3759e6f18..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/kanto_wild.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_wild.ogg b/2.5DHero/2.5DHeroContent/Songs/kanto_wild.ogg
new file mode 100644
index 000000000..ee59c1fd8
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/kanto_wild.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_wild_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/kanto_wild_intro.mp3
deleted file mode 100644
index c7bcdb8ed..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/kanto_wild_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kanto_wild_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/kanto_wild_intro.ogg
new file mode 100644
index 000000000..ed0339810
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/kanto_wild_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kimono.mp3 b/2.5DHero/2.5DHeroContent/Songs/kimono.mp3
deleted file mode 100644
index 4f7afda6d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/kimono.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kimono.ogg b/2.5DHero/2.5DHeroContent/Songs/kimono.ogg
new file mode 100644
index 000000000..d46cb3b5d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/kimono.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kvictoryroad.mp3 b/2.5DHero/2.5DHeroContent/Songs/kvictoryroad.mp3
deleted file mode 100644
index 55b081b63..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/kvictoryroad.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/kvictoryroad.ogg b/2.5DHero/2.5DHeroContent/Songs/kvictoryroad.ogg
new file mode 100644
index 000000000..865d112de
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/kvictoryroad.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lavender.mp3 b/2.5DHero/2.5DHeroContent/Songs/lavender.mp3
deleted file mode 100644
index 9f714b5b5..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/lavender.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lavender.ogg b/2.5DHero/2.5DHeroContent/Songs/lavender.ogg
new file mode 100644
index 000000000..eaac7d8c4
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/lavender.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/leader_defeat.mp3 b/2.5DHero/2.5DHeroContent/Songs/leader_defeat.mp3
deleted file mode 100644
index f0c7d2ee7..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/leader_defeat.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/leader_defeat.ogg b/2.5DHero/2.5DHeroContent/Songs/leader_defeat.ogg
new file mode 100644
index 000000000..85e4bbd0e
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/leader_defeat.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lighthouse.mp3 b/2.5DHero/2.5DHeroContent/Songs/lighthouse.mp3
deleted file mode 100644
index 91ef58c19..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/lighthouse.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lighthouse.ogg b/2.5DHero/2.5DHeroContent/Songs/lighthouse.ogg
new file mode 100644
index 000000000..104a33114
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/lighthouse.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lobby.mp3 b/2.5DHero/2.5DHeroContent/Songs/lobby.mp3
deleted file mode 100644
index c88e6bdbe..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/lobby.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lobby.ogg b/2.5DHero/2.5DHeroContent/Songs/lobby.ogg
new file mode 100644
index 000000000..83270e4b8
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/lobby.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lugia_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/lugia_battle.mp3
deleted file mode 100644
index f09469ed6..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/lugia_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lugia_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/lugia_battle.ogg
new file mode 100644
index 000000000..223b3a02b
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/lugia_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lugia_battle_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/lugia_battle_intro.mp3
deleted file mode 100644
index 7fe0c2b64..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/lugia_battle_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/lugia_battle_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/lugia_battle_intro.ogg
new file mode 100644
index 000000000..65bfd12b5
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/lugia_battle_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/mart.mp3 b/2.5DHero/2.5DHeroContent/Songs/mart.mp3
deleted file mode 100644
index f4c59a02e..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/mart.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/mart.ogg b/2.5DHero/2.5DHeroContent/Songs/mart.ogg
new file mode 100644
index 000000000..0acfcae81
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/mart.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/mary_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/mary_encounter.mp3
deleted file mode 100644
index 6053f7da1..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/mary_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/mary_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/mary_encounter.ogg
new file mode 100644
index 000000000..20919f2d8
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/mary_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/mtmoonsq.mp3 b/2.5DHero/2.5DHeroContent/Songs/mtmoonsq.mp3
deleted file mode 100644
index 6ced17097..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/mtmoonsq.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/mtmoonsq.ogg b/2.5DHero/2.5DHeroContent/Songs/mtmoonsq.ogg
new file mode 100644
index 000000000..938a55721
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/mtmoonsq.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/nationalpark.mp3 b/2.5DHero/2.5DHeroContent/Songs/nationalpark.mp3
deleted file mode 100644
index f296d514e..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/nationalpark.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/nationalpark.ogg b/2.5DHero/2.5DHeroContent/Songs/nationalpark.ogg
new file mode 100644
index 000000000..e7bf5bc9e
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/nationalpark.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/oak_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/oak_encounter.mp3
deleted file mode 100644
index 10410111b..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/oak_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/oak_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/oak_encounter.ogg
new file mode 100644
index 000000000..dbcd69df4
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/oak_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/oakslab.mp3 b/2.5DHero/2.5DHeroContent/Songs/oakslab.mp3
deleted file mode 100644
index 933485449..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/oakslab.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/oakslab.ogg b/2.5DHero/2.5DHeroContent/Songs/oakslab.ogg
new file mode 100644
index 000000000..5dafd121a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/oakslab.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pallet.mp3 b/2.5DHero/2.5DHeroContent/Songs/pallet.mp3
deleted file mode 100644
index ab05927dc..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/pallet.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pallet.ogg b/2.5DHero/2.5DHeroContent/Songs/pallet.ogg
new file mode 100644
index 000000000..ecbffefd0
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/pallet.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pokeflute.mp3 b/2.5DHero/2.5DHeroContent/Songs/pokeflute.mp3
deleted file mode 100644
index 50044834e..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/pokeflute.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pokeflute.ogg b/2.5DHero/2.5DHeroContent/Songs/pokeflute.ogg
new file mode 100644
index 000000000..fd02e0eba
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/pokeflute.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pokemon_lullaby.mp3 b/2.5DHero/2.5DHeroContent/Songs/pokemon_lullaby.mp3
deleted file mode 100644
index af91ff44d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/pokemon_lullaby.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pokemon_lullaby.ogg b/2.5DHero/2.5DHeroContent/Songs/pokemon_lullaby.ogg
new file mode 100644
index 000000000..af251c4ad
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/pokemon_lullaby.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pokemon_march.mp3 b/2.5DHero/2.5DHeroContent/Songs/pokemon_march.mp3
deleted file mode 100644
index 7153d37be..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/pokemon_march.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pokemon_march.ogg b/2.5DHero/2.5DHeroContent/Songs/pokemon_march.ogg
new file mode 100644
index 000000000..5bb97d647
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/pokemon_march.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pvp.mp3 b/2.5DHero/2.5DHeroContent/Songs/pvp.mp3
deleted file mode 100644
index 65393ccbe..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/pvp.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/pvp.ogg b/2.5DHero/2.5DHeroContent/Songs/pvp.ogg
new file mode 100644
index 000000000..8c954748d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/pvp.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/rHideout.mp3 b/2.5DHero/2.5DHeroContent/Songs/rHideout.mp3
deleted file mode 100644
index 1e86d2c74..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/rHideout.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/rHideout.ogg b/2.5DHero/2.5DHeroContent/Songs/rHideout.ogg
new file mode 100644
index 000000000..0047ebacf
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/rHideout.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/raikou_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/raikou_battle.mp3
deleted file mode 100644
index 0a55dd711..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/raikou_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/raikou_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/raikou_battle.ogg
new file mode 100644
index 000000000..272b4e187
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/raikou_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/raikou_battle_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/raikou_battle_intro.mp3
deleted file mode 100644
index 9f0819348..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/raikou_battle_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/raikou_battle_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/raikou_battle_intro.ogg
new file mode 100644
index 000000000..0c6da7f60
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/raikou_battle_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ride.mp3 b/2.5DHero/2.5DHeroContent/Songs/ride.mp3
deleted file mode 100644
index a6c333013..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/ride.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ride.ogg b/2.5DHero/2.5DHeroContent/Songs/ride.ogg
new file mode 100644
index 000000000..068b3da0d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/ride.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/rocket_broadcast.mp3 b/2.5DHero/2.5DHeroContent/Songs/rocket_broadcast.mp3
deleted file mode 100644
index 1ad7f3a22..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/rocket_broadcast.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/rocket_broadcast.ogg b/2.5DHero/2.5DHeroContent/Songs/rocket_broadcast.ogg
new file mode 100644
index 000000000..69392aa3d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/rocket_broadcast.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/safari.mp3 b/2.5DHero/2.5DHeroContent/Songs/safari.mp3
deleted file mode 100644
index 0c6f5399d..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/safari.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/safari.ogg b/2.5DHero/2.5DHeroContent/Songs/safari.ogg
new file mode 100644
index 000000000..e2eebfe38
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/safari.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/safarigate.mp3 b/2.5DHero/2.5DHeroContent/Songs/safarigate.mp3
deleted file mode 100644
index 5579d67b2..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/safarigate.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/safarigate.ogg b/2.5DHero/2.5DHeroContent/Songs/safarigate.ogg
new file mode 100644
index 000000000..ff95153ab
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/safarigate.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/show_me_around.mp3 b/2.5DHero/2.5DHeroContent/Songs/show_me_around.mp3
deleted file mode 100644
index 426244639..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/show_me_around.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/show_me_around.ogg b/2.5DHero/2.5DHeroContent/Songs/show_me_around.ogg
new file mode 100644
index 000000000..2e73e8362
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/show_me_around.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/space_legend_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/space_legend_battle.mp3
deleted file mode 100644
index fda5be1c3..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/space_legend_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/space_legend_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/space_legend_battle.ogg
new file mode 100644
index 000000000..211e2577d
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/space_legend_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/space_legend_battle_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/space_legend_battle_intro.mp3
deleted file mode 100644
index abe0d2bc8..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/space_legend_battle_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/space_legend_battle_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/space_legend_battle_intro.ogg
new file mode 100644
index 000000000..791d14603
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/space_legend_battle_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/sprout_tower.mp3 b/2.5DHero/2.5DHeroContent/Songs/sprout_tower.mp3
deleted file mode 100644
index bbe9f9fa2..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/sprout_tower.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/sprout_tower.ogg b/2.5DHero/2.5DHeroContent/Songs/sprout_tower.ogg
new file mode 100644
index 000000000..8105bf4a5
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/sprout_tower.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ssaqua.mp3 b/2.5DHero/2.5DHeroContent/Songs/ssaqua.mp3
deleted file mode 100644
index 94b7af0f1..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/ssaqua.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/ssaqua.ogg b/2.5DHero/2.5DHeroContent/Songs/ssaqua.ogg
new file mode 100644
index 000000000..aa14a51e9
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/ssaqua.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/startower.mp3 b/2.5DHero/2.5DHeroContent/Songs/startower.mp3
deleted file mode 100644
index b231c2814..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/startower.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/startower.ogg b/2.5DHero/2.5DHeroContent/Songs/startower.ogg
new file mode 100644
index 000000000..6672f27aa
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/startower.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/suicune_battle.mp3 b/2.5DHero/2.5DHeroContent/Songs/suicune_battle.mp3
deleted file mode 100644
index 0a55dd711..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/suicune_battle.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/suicune_battle.ogg b/2.5DHero/2.5DHeroContent/Songs/suicune_battle.ogg
new file mode 100644
index 000000000..35c7dd2b0
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/suicune_battle.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/suicune_battle_intro.mp3 b/2.5DHero/2.5DHeroContent/Songs/suicune_battle_intro.mp3
deleted file mode 100644
index 9f0819348..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/suicune_battle_intro.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/suicune_battle_intro.ogg b/2.5DHero/2.5DHeroContent/Songs/suicune_battle_intro.ogg
new file mode 100644
index 000000000..fef189b88
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/suicune_battle_intro.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/surf.mp3 b/2.5DHero/2.5DHeroContent/Songs/surf.mp3
deleted file mode 100644
index af4a48973..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/surf.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/surf.ogg b/2.5DHero/2.5DHeroContent/Songs/surf.ogg
new file mode 100644
index 000000000..3b1c23cf8
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/surf.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/tintower.mp3 b/2.5DHero/2.5DHeroContent/Songs/tintower.mp3
deleted file mode 100644
index 2a02db986..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/tintower.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/tintower.ogg b/2.5DHero/2.5DHeroContent/Songs/tintower.ogg
new file mode 100644
index 000000000..d577e6dbd
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/tintower.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/title.mp3 b/2.5DHero/2.5DHeroContent/Songs/title.mp3
deleted file mode 100644
index ec5741106..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/title.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/title.ogg b/2.5DHero/2.5DHeroContent/Songs/title.ogg
new file mode 100644
index 000000000..d31280b2a
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/title.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/trainer_defeat.mp3 b/2.5DHero/2.5DHeroContent/Songs/trainer_defeat.mp3
deleted file mode 100644
index 5c439a5dc..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/trainer_defeat.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/trainer_defeat.ogg b/2.5DHero/2.5DHeroContent/Songs/trainer_defeat.ogg
new file mode 100644
index 000000000..54bcd0b2c
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/trainer_defeat.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/trainer_encounter.mp3 b/2.5DHero/2.5DHeroContent/Songs/trainer_encounter.mp3
deleted file mode 100644
index 0273a05a5..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/trainer_encounter.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/trainer_encounter.ogg b/2.5DHero/2.5DHeroContent/Songs/trainer_encounter.ogg
new file mode 100644
index 000000000..15628f3de
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/trainer_encounter.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/unown_broadcast.mp3 b/2.5DHero/2.5DHeroContent/Songs/unown_broadcast.mp3
deleted file mode 100644
index 8d6dd8734..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/unown_broadcast.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/unown_broadcast.ogg b/2.5DHero/2.5DHeroContent/Songs/unown_broadcast.ogg
new file mode 100644
index 000000000..4834726cf
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/unown_broadcast.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/vermilion.mp3 b/2.5DHero/2.5DHeroContent/Songs/vermilion.mp3
deleted file mode 100644
index 31bcfc47c..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/vermilion.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/vermilion.ogg b/2.5DHero/2.5DHeroContent/Songs/vermilion.ogg
new file mode 100644
index 000000000..aa26d87ce
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/vermilion.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/violet.mp3 b/2.5DHero/2.5DHeroContent/Songs/violet.mp3
deleted file mode 100644
index ad590895e..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/violet.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/violet.ogg b/2.5DHero/2.5DHeroContent/Songs/violet.ogg
new file mode 100644
index 000000000..4022c6ef2
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/violet.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/viridian_forest.mp3 b/2.5DHero/2.5DHeroContent/Songs/viridian_forest.mp3
deleted file mode 100644
index a5db0ba15..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/viridian_forest.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/viridian_forest.ogg b/2.5DHero/2.5DHeroContent/Songs/viridian_forest.ogg
new file mode 100644
index 000000000..0ee67fd25
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/viridian_forest.ogg differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/wild_defeat.mp3 b/2.5DHero/2.5DHeroContent/Songs/wild_defeat.mp3
deleted file mode 100644
index 5ce8f8fc9..000000000
Binary files a/2.5DHero/2.5DHeroContent/Songs/wild_defeat.mp3 and /dev/null differ
diff --git a/2.5DHero/2.5DHeroContent/Songs/wild_defeat.ogg b/2.5DHero/2.5DHeroContent/Songs/wild_defeat.ogg
new file mode 100644
index 000000000..816e3ec32
Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Songs/wild_defeat.ogg differ