diff --git a/P3D/Content/Data/Scripts/barktown/mom.dat b/P3D/Content/Data/Scripts/barktown/mom.dat
index be960d11e..ce6b5aba4 100644
Binary files a/P3D/Content/Data/Scripts/barktown/mom.dat and b/P3D/Content/Data/Scripts/barktown/mom.dat differ
diff --git a/P3D/Content/Data/Scripts/barktown/momdoor.dat b/P3D/Content/Data/Scripts/barktown/momdoor.dat
index c60422553..127fc083e 100644
Binary files a/P3D/Content/Data/Scripts/barktown/momdoor.dat and b/P3D/Content/Data/Scripts/barktown/momdoor.dat differ
diff --git a/P3D/Content/Data/Scripts/floe/daycare/man.dat b/P3D/Content/Data/Scripts/floe/daycare/man.dat
index 976a69be3..1d2ec63c6 100644
Binary files a/P3D/Content/Data/Scripts/floe/daycare/man.dat and b/P3D/Content/Data/Scripts/floe/daycare/man.dat differ
diff --git a/P3D/Content/Data/Scripts/goldenrod/bill_sister.dat b/P3D/Content/Data/Scripts/goldenrod/bill_sister.dat
index 69d5a57b3..5d17cffdb 100644
Binary files a/P3D/Content/Data/Scripts/goldenrod/bill_sister.dat and b/P3D/Content/Data/Scripts/goldenrod/bill_sister.dat differ
diff --git a/P3D/Content/Data/Scripts/league/halloffame.dat b/P3D/Content/Data/Scripts/league/halloffame.dat
index cab4e9375..b2da36115 100644
Binary files a/P3D/Content/Data/Scripts/league/halloffame.dat and b/P3D/Content/Data/Scripts/league/halloffame.dat differ
diff --git a/P3D/Content/Data/Scripts/newgame/intro.dat b/P3D/Content/Data/Scripts/newgame/intro.dat
index 94984656c..474ceb846 100644
--- a/P3D/Content/Data/Scripts/newgame/intro.dat
+++ b/P3D/Content/Data/Scripts/newgame/intro.dat
@@ -127,7 +127,7 @@
 @text.show(There are still~many mysteries to solve.*That's why I study~Pokémon every day.)
 @text.show(But let's get~back to you.)
 
-@screen.skinselection(Ethan,Lyra,Hilbert,Hilda,Nate,Rosa)
+@screen.skinselection()
 
 @player.wearskin(<screen.selectedskin>)
 @npc.wearskin(1,<screen.selectedskin>)
diff --git a/P3D/Content/Data/Scripts/rival/rival_league.dat b/P3D/Content/Data/Scripts/rival/rival_league.dat
index 375c86d48..2fa54b9e4 100644
Binary files a/P3D/Content/Data/Scripts/rival/rival_league.dat and b/P3D/Content/Data/Scripts/rival/rival_league.dat differ
diff --git a/P3D/Content/Data/Scripts/rival/rival_mahogany.dat b/P3D/Content/Data/Scripts/rival/rival_mahogany.dat
index ca9ead566..3cd992ad5 100644
Binary files a/P3D/Content/Data/Scripts/rival/rival_mahogany.dat and b/P3D/Content/Data/Scripts/rival/rival_mahogany.dat differ
diff --git a/P3D/Content/Data/Scripts/rival/rival_victoryroad.dat b/P3D/Content/Data/Scripts/rival/rival_victoryroad.dat
index e63e04862..cdf953a4c 100644
Binary files a/P3D/Content/Data/Scripts/rival/rival_victoryroad.dat and b/P3D/Content/Data/Scripts/rival/rival_victoryroad.dat differ
diff --git a/P3D/Content/Data/Scripts/rocketbase/elec1.dat b/P3D/Content/Data/Scripts/rocketbase/elec1.dat
index dea84c93b..243e7d17f 100644
Binary files a/P3D/Content/Data/Scripts/rocketbase/elec1.dat and b/P3D/Content/Data/Scripts/rocketbase/elec1.dat differ
diff --git a/P3D/Content/Data/Scripts/rocketbase/elec2.dat b/P3D/Content/Data/Scripts/rocketbase/elec2.dat
index 95b65de0d..9b8e4cddf 100644
Binary files a/P3D/Content/Data/Scripts/rocketbase/elec2.dat and b/P3D/Content/Data/Scripts/rocketbase/elec2.dat differ
diff --git a/P3D/Content/Data/Scripts/rocketbase/elec3.dat b/P3D/Content/Data/Scripts/rocketbase/elec3.dat
index 1538d6567..0e8367e1a 100644
Binary files a/P3D/Content/Data/Scripts/rocketbase/elec3.dat and b/P3D/Content/Data/Scripts/rocketbase/elec3.dat differ
diff --git a/P3D/Content/Data/Scripts/rocketbase/trap1.dat b/P3D/Content/Data/Scripts/rocketbase/trap1.dat
index c5bd471d0..63fc37aba 100644
Binary files a/P3D/Content/Data/Scripts/rocketbase/trap1.dat and b/P3D/Content/Data/Scripts/rocketbase/trap1.dat differ
diff --git a/P3D/Content/Data/Scripts/rocketbase/trap2.dat b/P3D/Content/Data/Scripts/rocketbase/trap2.dat
index daa10187b..215583841 100644
Binary files a/P3D/Content/Data/Scripts/rocketbase/trap2.dat and b/P3D/Content/Data/Scripts/rocketbase/trap2.dat differ
diff --git a/P3D/Content/Data/Scripts/rocketbase/trap3.dat b/P3D/Content/Data/Scripts/rocketbase/trap3.dat
index c33b16c00..1c8e32d2b 100644
Binary files a/P3D/Content/Data/Scripts/rocketbase/trap3.dat and b/P3D/Content/Data/Scripts/rocketbase/trap3.dat differ
diff --git a/P3D/Content/Data/Scripts/rocketbase/trap4.dat b/P3D/Content/Data/Scripts/rocketbase/trap4.dat
index 323231625..2f61adc8f 100644
Binary files a/P3D/Content/Data/Scripts/rocketbase/trap4.dat and b/P3D/Content/Data/Scripts/rocketbase/trap4.dat differ
diff --git a/P3D/Content/Data/Scripts/rocketbase/trap5.dat b/P3D/Content/Data/Scripts/rocketbase/trap5.dat
index a3331b928..c1d94ecee 100644
Binary files a/P3D/Content/Data/Scripts/rocketbase/trap5.dat and b/P3D/Content/Data/Scripts/rocketbase/trap5.dat differ
diff --git a/P3D/Content/Data/Scripts/route34/daycare/main.dat b/P3D/Content/Data/Scripts/route34/daycare/main.dat
index 1aa3ab024..f1eec4a87 100644
Binary files a/P3D/Content/Data/Scripts/route34/daycare/main.dat and b/P3D/Content/Data/Scripts/route34/daycare/main.dat differ
diff --git a/P3D/Content/Data/Scripts/route5/daycare/main.dat b/P3D/Content/Data/Scripts/route5/daycare/main.dat
index 945897fad..c158ae633 100644
Binary files a/P3D/Content/Data/Scripts/route5/daycare/main.dat and b/P3D/Content/Data/Scripts/route5/daycare/main.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/Lighthouse/001.dat b/P3D/Content/Data/Scripts/trainer/Lighthouse/001.dat
index 8c91c6215..683f9fe9f 100644
Binary files a/P3D/Content/Data/Scripts/trainer/Lighthouse/001.dat and b/P3D/Content/Data/Scripts/trainer/Lighthouse/001.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/Lighthouse/002.dat b/P3D/Content/Data/Scripts/trainer/Lighthouse/002.dat
index 035226471..bed34c976 100644
Binary files a/P3D/Content/Data/Scripts/trainer/Lighthouse/002.dat and b/P3D/Content/Data/Scripts/trainer/Lighthouse/002.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/nationalpark/001.dat b/P3D/Content/Data/Scripts/trainer/nationalpark/001.dat
index 52a16ad63..46784c777 100644
Binary files a/P3D/Content/Data/Scripts/trainer/nationalpark/001.dat and b/P3D/Content/Data/Scripts/trainer/nationalpark/001.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/nationalpark/003.dat b/P3D/Content/Data/Scripts/trainer/nationalpark/003.dat
index e389fc3ae..a20eb719b 100644
Binary files a/P3D/Content/Data/Scripts/trainer/nationalpark/003.dat and b/P3D/Content/Data/Scripts/trainer/nationalpark/003.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/nationalpark/004.dat b/P3D/Content/Data/Scripts/trainer/nationalpark/004.dat
index c6bc1e2c4..fd1cfc544 100644
Binary files a/P3D/Content/Data/Scripts/trainer/nationalpark/004.dat and b/P3D/Content/Data/Scripts/trainer/nationalpark/004.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/rocketbase/Ariana.dat b/P3D/Content/Data/Scripts/trainer/rocketbase/Ariana.dat
index 89fb0117f..c8c13fd2f 100644
Binary files a/P3D/Content/Data/Scripts/trainer/rocketbase/Ariana.dat and b/P3D/Content/Data/Scripts/trainer/rocketbase/Ariana.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route30/001.dat b/P3D/Content/Data/Scripts/trainer/route30/001.dat
index f72ed02fd..199bd6d11 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route30/001.dat and b/P3D/Content/Data/Scripts/trainer/route30/001.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route31/001.dat b/P3D/Content/Data/Scripts/trainer/route31/001.dat
index 720cf6fa2..9cee5a7d3 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route31/001.dat and b/P3D/Content/Data/Scripts/trainer/route31/001.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route32/002.dat b/P3D/Content/Data/Scripts/trainer/route32/002.dat
index 861c3a177..3d091eaff 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route32/002.dat and b/P3D/Content/Data/Scripts/trainer/route32/002.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route32/005.dat b/P3D/Content/Data/Scripts/trainer/route32/005.dat
index d3e46513e..c05f3bf0b 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route32/005.dat and b/P3D/Content/Data/Scripts/trainer/route32/005.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route33/001.dat b/P3D/Content/Data/Scripts/trainer/route33/001.dat
index 50e417c40..3b28b52ed 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route33/001.dat and b/P3D/Content/Data/Scripts/trainer/route33/001.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route34/003.dat b/P3D/Content/Data/Scripts/trainer/route34/003.dat
index fb349d6f4..5a2d16d11 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route34/003.dat and b/P3D/Content/Data/Scripts/trainer/route34/003.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route34/004.dat b/P3D/Content/Data/Scripts/trainer/route34/004.dat
index bd132583a..67d6c489e 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route34/004.dat and b/P3D/Content/Data/Scripts/trainer/route34/004.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route34/005.dat b/P3D/Content/Data/Scripts/trainer/route34/005.dat
index 313fe45b0..58a255830 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route34/005.dat and b/P3D/Content/Data/Scripts/trainer/route34/005.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route35/005.dat b/P3D/Content/Data/Scripts/trainer/route35/005.dat
index 112054fdc..c66fe2728 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route35/005.dat and b/P3D/Content/Data/Scripts/trainer/route35/005.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route35/007.dat b/P3D/Content/Data/Scripts/trainer/route35/007.dat
index 2e0c904b3..176b5396d 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route35/007.dat and b/P3D/Content/Data/Scripts/trainer/route35/007.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route35/008.dat b/P3D/Content/Data/Scripts/trainer/route35/008.dat
index fb64ba9db..bc3a4fba6 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route35/008.dat and b/P3D/Content/Data/Scripts/trainer/route35/008.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route36/002.dat b/P3D/Content/Data/Scripts/trainer/route36/002.dat
index 6d9c84b2a..2d280d062 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route36/002.dat and b/P3D/Content/Data/Scripts/trainer/route36/002.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route38/002.dat b/P3D/Content/Data/Scripts/trainer/route38/002.dat
index a58e1b574..b59030c5f 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route38/002.dat and b/P3D/Content/Data/Scripts/trainer/route38/002.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route38/005.dat b/P3D/Content/Data/Scripts/trainer/route38/005.dat
index 3dac4e9c0..3218b2bef 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route38/005.dat and b/P3D/Content/Data/Scripts/trainer/route38/005.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route39/003.dat b/P3D/Content/Data/Scripts/trainer/route39/003.dat
index fd27d8137..11c4791de 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route39/003.dat and b/P3D/Content/Data/Scripts/trainer/route39/003.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route43/002.dat b/P3D/Content/Data/Scripts/trainer/route43/002.dat
index 36a038a42..6e448b250 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route43/002.dat and b/P3D/Content/Data/Scripts/trainer/route43/002.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route43/004.dat b/P3D/Content/Data/Scripts/trainer/route43/004.dat
index d4e7ae60d..dffc95254 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route43/004.dat and b/P3D/Content/Data/Scripts/trainer/route43/004.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route45/002.dat b/P3D/Content/Data/Scripts/trainer/route45/002.dat
index 9a98fc119..856d22c66 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route45/002.dat and b/P3D/Content/Data/Scripts/trainer/route45/002.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route45/005.dat b/P3D/Content/Data/Scripts/trainer/route45/005.dat
index 943d51efa..e67d7be33 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route45/005.dat and b/P3D/Content/Data/Scripts/trainer/route45/005.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route46/002.dat b/P3D/Content/Data/Scripts/trainer/route46/002.dat
index 107bbd964..3001881b9 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route46/002.dat and b/P3D/Content/Data/Scripts/trainer/route46/002.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph01.dat b/P3D/Content/Data/maps/alph/alph01.dat
index f2ded7ae5..6c76a2a34 100644
Binary files a/P3D/Content/Data/maps/alph/alph01.dat and b/P3D/Content/Data/maps/alph/alph01.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph02.dat b/P3D/Content/Data/maps/alph/alph02.dat
index 3058d3eb8..e0bbece5d 100644
Binary files a/P3D/Content/Data/maps/alph/alph02.dat and b/P3D/Content/Data/maps/alph/alph02.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph03.dat b/P3D/Content/Data/maps/alph/alph03.dat
index 6e0b579a5..2f030b594 100644
Binary files a/P3D/Content/Data/maps/alph/alph03.dat and b/P3D/Content/Data/maps/alph/alph03.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph04.dat b/P3D/Content/Data/maps/alph/alph04.dat
index 8481da70f..a81ea6828 100644
Binary files a/P3D/Content/Data/maps/alph/alph04.dat and b/P3D/Content/Data/maps/alph/alph04.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph05.dat b/P3D/Content/Data/maps/alph/alph05.dat
index 4b7929fb0..6ed07f24c 100644
Binary files a/P3D/Content/Data/maps/alph/alph05.dat and b/P3D/Content/Data/maps/alph/alph05.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph06.dat b/P3D/Content/Data/maps/alph/alph06.dat
index 9b766a3f8..a930a84c3 100644
Binary files a/P3D/Content/Data/maps/alph/alph06.dat and b/P3D/Content/Data/maps/alph/alph06.dat differ
diff --git a/P3D/Content/Data/maps/alph/deepruins.dat b/P3D/Content/Data/maps/alph/deepruins.dat
index abfeae2f7..209f920ac 100644
Binary files a/P3D/Content/Data/maps/alph/deepruins.dat and b/P3D/Content/Data/maps/alph/deepruins.dat differ
diff --git a/P3D/Content/Data/maps/barktown.dat b/P3D/Content/Data/maps/barktown.dat
index 711ab2a28..8f990c4ef 100644
Binary files a/P3D/Content/Data/maps/barktown.dat and b/P3D/Content/Data/maps/barktown.dat differ
diff --git a/P3D/Content/Data/maps/barktown/0.dat b/P3D/Content/Data/maps/barktown/0.dat
index fca86e794..ba3c2b463 100644
Binary files a/P3D/Content/Data/maps/barktown/0.dat and b/P3D/Content/Data/maps/barktown/0.dat differ
diff --git a/P3D/Content/Data/maps/barktown/1.dat b/P3D/Content/Data/maps/barktown/1.dat
index 40b83b924..23899c868 100644
Binary files a/P3D/Content/Data/maps/barktown/1.dat and b/P3D/Content/Data/maps/barktown/1.dat differ
diff --git a/P3D/Content/Data/maps/barktown0.dat b/P3D/Content/Data/maps/barktown0.dat
index a671b6705..47e9ea8c2 100644
Binary files a/P3D/Content/Data/maps/barktown0.dat and b/P3D/Content/Data/maps/barktown0.dat differ
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/dilford.dat b/P3D/Content/Data/maps/battle/quest/tanoby/dilford.dat
index 86c2ce892..bcc9d3138 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/dilford.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/dilford.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Dilford Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Dilford Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/liptoo.dat b/P3D/Content/Data/maps/battle/quest/tanoby/liptoo.dat
index 8cd9b7842..9cdc734bc 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/liptoo.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/liptoo.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Liptoo Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Liptoo Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/monean.dat b/P3D/Content/Data/maps/battle/quest/tanoby/monean.dat
index 75c740b1b..992b7561e 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/monean.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/monean.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Monean Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Monean Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/rixy.dat b/P3D/Content/Data/maps/battle/quest/tanoby/rixy.dat
index d8ddadfbb..82d8bbcf4 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/rixy.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/rixy.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Rixy Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Rixy Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/scufib.dat b/P3D/Content/Data/maps/battle/quest/tanoby/scufib.dat
index 8b3a02eb3..033ec649d 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/scufib.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/scufib.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Scufib Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Scufib Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/viapois.dat b/P3D/Content/Data/maps/battle/quest/tanoby/viapois.dat
index 901ff33e6..9205f6a8d 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/viapois.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/viapois.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Viapois Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Viapois Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/weepth.dat b/P3D/Content/Data/maps/battle/quest/tanoby/weepth.dat
index 2f830b6d9..668b3ad0b 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/weepth.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/weepth.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Weepth Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Weepth Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/diamonddive/exterior/end.dat b/P3D/Content/Data/maps/diamonddive/exterior/end.dat
index 72a80de15..34154eee7 100644
--- a/P3D/Content/Data/maps/diamonddive/exterior/end.dat
+++ b/P3D/Content/Data/maps/diamonddive/exterior/end.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Indigo Plateau]}}{"MusicLoop"{str[indigo]}}{"CurrentRegion"{str[Johto,Kanto]}}]}}
+{"Level"{LEV[{"Name"{str[Indigo Plateau]}}{"MusicLoop"{str[IndigoPlateau]}}{"CurrentRegion"{str[Johto,Kanto]}}]}}
 {"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
 
 Floor:
diff --git a/P3D/Content/Data/maps/ecruteak/event.dat b/P3D/Content/Data/maps/ecruteak/event.dat
index 598269df7..a9c6d4052 100644
Binary files a/P3D/Content/Data/maps/ecruteak/event.dat and b/P3D/Content/Data/maps/ecruteak/event.dat differ
diff --git a/P3D/Content/Data/maps/frontier/battlefrontier.dat b/P3D/Content/Data/maps/frontier/battlefrontier.dat
index bbcd7a2b8..abf292479 100644
Binary files a/P3D/Content/Data/maps/frontier/battlefrontier.dat and b/P3D/Content/Data/maps/frontier/battlefrontier.dat differ
diff --git a/P3D/Content/Data/maps/frontier/main.dat b/P3D/Content/Data/maps/frontier/main.dat
index eae063176..c54dc67e8 100644
Binary files a/P3D/Content/Data/maps/frontier/main.dat and b/P3D/Content/Data/maps/frontier/main.dat differ
diff --git a/P3D/Content/Data/maps/gates/boulder.dat b/P3D/Content/Data/maps/gates/boulder.dat
index 5dcf4f8cf..db3b87cf1 100644
Binary files a/P3D/Content/Data/maps/gates/boulder.dat and b/P3D/Content/Data/maps/gates/boulder.dat differ
diff --git a/P3D/Content/Data/maps/gates/zephyr.dat b/P3D/Content/Data/maps/gates/zephyr.dat
index 68744a4b0..feefbf70f 100644
Binary files a/P3D/Content/Data/maps/gates/zephyr.dat and b/P3D/Content/Data/maps/gates/zephyr.dat differ
diff --git a/P3D/Content/Data/maps/icepath/1f.dat b/P3D/Content/Data/maps/icepath/1f.dat
index 56095e4de..97df21c15 100644
Binary files a/P3D/Content/Data/maps/icepath/1f.dat and b/P3D/Content/Data/maps/icepath/1f.dat differ
diff --git a/P3D/Content/Data/maps/icepath/2f.dat b/P3D/Content/Data/maps/icepath/2f.dat
index 84c681b50..4fe48718b 100644
Binary files a/P3D/Content/Data/maps/icepath/2f.dat and b/P3D/Content/Data/maps/icepath/2f.dat differ
diff --git a/P3D/Content/Data/maps/icepath/3f.dat b/P3D/Content/Data/maps/icepath/3f.dat
index d4b549517..f1f529aaf 100644
Binary files a/P3D/Content/Data/maps/icepath/3f.dat and b/P3D/Content/Data/maps/icepath/3f.dat differ
diff --git a/P3D/Content/Data/maps/icepath/4f.dat b/P3D/Content/Data/maps/icepath/4f.dat
index c8310e8cb..36094e2ab 100644
Binary files a/P3D/Content/Data/maps/icepath/4f.dat and b/P3D/Content/Data/maps/icepath/4f.dat differ
diff --git a/P3D/Content/Data/maps/indigo/bruno.dat b/P3D/Content/Data/maps/indigo/bruno.dat
index 8521e17ef..297192306 100644
Binary files a/P3D/Content/Data/maps/indigo/bruno.dat and b/P3D/Content/Data/maps/indigo/bruno.dat differ
diff --git a/P3D/Content/Data/maps/indigo/halloffame.dat b/P3D/Content/Data/maps/indigo/halloffame.dat
index c6cbe263d..441936a2f 100644
Binary files a/P3D/Content/Data/maps/indigo/halloffame.dat and b/P3D/Content/Data/maps/indigo/halloffame.dat differ
diff --git a/P3D/Content/Data/maps/indigo/inside.dat b/P3D/Content/Data/maps/indigo/inside.dat
index ec0bfdb54..d8c68f04f 100644
Binary files a/P3D/Content/Data/maps/indigo/inside.dat and b/P3D/Content/Data/maps/indigo/inside.dat differ
diff --git a/P3D/Content/Data/maps/indigo/karen.dat b/P3D/Content/Data/maps/indigo/karen.dat
index 7058a0cfb..b39119dbf 100644
Binary files a/P3D/Content/Data/maps/indigo/karen.dat and b/P3D/Content/Data/maps/indigo/karen.dat differ
diff --git a/P3D/Content/Data/maps/indigo/koga.dat b/P3D/Content/Data/maps/indigo/koga.dat
index ca50e6417..42d5d9305 100644
Binary files a/P3D/Content/Data/maps/indigo/koga.dat and b/P3D/Content/Data/maps/indigo/koga.dat differ
diff --git a/P3D/Content/Data/maps/indigo/lance.dat b/P3D/Content/Data/maps/indigo/lance.dat
index 84991944a..16d114d2c 100644
Binary files a/P3D/Content/Data/maps/indigo/lance.dat and b/P3D/Content/Data/maps/indigo/lance.dat differ
diff --git a/P3D/Content/Data/maps/indigo/outside.dat b/P3D/Content/Data/maps/indigo/outside.dat
index da1752c74..4062cab19 100644
--- a/P3D/Content/Data/maps/indigo/outside.dat
+++ b/P3D/Content/Data/maps/indigo/outside.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Indigo Plateau]}}{"MusicLoop"{str[indigo]}}{"CurrentRegion"{str[Johto,Kanto]}}]}}
+{"Level"{LEV[{"Name"{str[Indigo Plateau]}}{"MusicLoop"{str[IndigoPlateau]}}{"CurrentRegion"{str[Johto,Kanto]}}]}}
 {"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
 
 Floor:
diff --git a/P3D/Content/Data/maps/indigo/will.dat b/P3D/Content/Data/maps/indigo/will.dat
index 406112403..7c9e4f13c 100644
Binary files a/P3D/Content/Data/maps/indigo/will.dat and b/P3D/Content/Data/maps/indigo/will.dat differ
diff --git a/P3D/Content/Data/maps/mainmenu/mainmenu0.dat b/P3D/Content/Data/maps/mainmenu/mainmenu0.dat
index c077178d3..173597ee9 100644
Binary files a/P3D/Content/Data/maps/mainmenu/mainmenu0.dat and b/P3D/Content/Data/maps/mainmenu/mainmenu0.dat differ
diff --git a/P3D/Content/Data/maps/mtmoon/shop.dat b/P3D/Content/Data/maps/mtmoon/shop.dat
index 1596a3ea1..f0c983f2b 100644
Binary files a/P3D/Content/Data/maps/mtmoon/shop.dat and b/P3D/Content/Data/maps/mtmoon/shop.dat differ
diff --git a/P3D/Content/Data/maps/mtmoon/square.dat b/P3D/Content/Data/maps/mtmoon/square.dat
index 646017db8..c5e14890d 100644
Binary files a/P3D/Content/Data/maps/mtmoon/square.dat and b/P3D/Content/Data/maps/mtmoon/square.dat differ
diff --git a/P3D/Content/Data/maps/quest/tanoby/dilford.dat b/P3D/Content/Data/maps/quest/tanoby/dilford.dat
index d58c5c71e..5aec152cd 100644
--- a/P3D/Content/Data/maps/quest/tanoby/dilford.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/dilford.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Dilford Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Dilford Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/quest/tanoby/liptoo.dat b/P3D/Content/Data/maps/quest/tanoby/liptoo.dat
index 6b6c0536e..53fe67352 100644
--- a/P3D/Content/Data/maps/quest/tanoby/liptoo.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/liptoo.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Liptoo Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Liptoo Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/quest/tanoby/monean.dat b/P3D/Content/Data/maps/quest/tanoby/monean.dat
index cf417a4ad..cf1f6f9b0 100644
--- a/P3D/Content/Data/maps/quest/tanoby/monean.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/monean.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Monean Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Monean Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\moneanmap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/quest/tanoby/rixy.dat b/P3D/Content/Data/maps/quest/tanoby/rixy.dat
index fb8b88965..3390d3307 100644
--- a/P3D/Content/Data/maps/quest/tanoby/rixy.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/rixy.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Rixy Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Rixy Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/quest/tanoby/scufib.dat b/P3D/Content/Data/maps/quest/tanoby/scufib.dat
index 17452952d..33295d532 100644
--- a/P3D/Content/Data/maps/quest/tanoby/scufib.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/scufib.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Scufib Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Scufib Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/quest/tanoby/viapois.dat b/P3D/Content/Data/maps/quest/tanoby/viapois.dat
index d5b6960ad..0810d11f1 100644
--- a/P3D/Content/Data/maps/quest/tanoby/viapois.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/viapois.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Viapois Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Viapois Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/quest/tanoby/weepth.dat b/P3D/Content/Data/maps/quest/tanoby/weepth.dat
index 32e6b6a95..c6ea29661 100644
--- a/P3D/Content/Data/maps/quest/tanoby/weepth.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/weepth.dat
@@ -1,4 +1,4 @@
-{"Level"{LEV[{"Name"{str[Weepth Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
+{"Level"{LEV[{"Name"{str[Weepth Chamber]}}{"MusicLoop"{str[RuinsOfAlph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
 {"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
diff --git a/P3D/Content/Data/maps/rocketbase/rocketbase1.dat b/P3D/Content/Data/maps/rocketbase/rocketbase1.dat
index 227c85e1d..e030166c3 100644
Binary files a/P3D/Content/Data/maps/rocketbase/rocketbase1.dat and b/P3D/Content/Data/maps/rocketbase/rocketbase1.dat differ
diff --git a/P3D/Content/Data/maps/rocketbase/rocketbase2.dat b/P3D/Content/Data/maps/rocketbase/rocketbase2.dat
index 3e52c1901..585d13b2d 100644
Binary files a/P3D/Content/Data/maps/rocketbase/rocketbase2.dat and b/P3D/Content/Data/maps/rocketbase/rocketbase2.dat differ
diff --git a/P3D/Content/Data/maps/rocketbase/rocketbase3.dat b/P3D/Content/Data/maps/rocketbase/rocketbase3.dat
index ea8c809a4..a1a086cb1 100644
Binary files a/P3D/Content/Data/maps/rocketbase/rocketbase3.dat and b/P3D/Content/Data/maps/rocketbase/rocketbase3.dat differ
diff --git a/P3D/Content/Data/maps/routes/route27/1.dat b/P3D/Content/Data/maps/routes/route27/1.dat
index 29e65d937..4cfe73a93 100644
Binary files a/P3D/Content/Data/maps/routes/route27/1.dat and b/P3D/Content/Data/maps/routes/route27/1.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/0.dat b/P3D/Content/Data/maps/safarizone/areas/0.dat
index 1ef0f66f9..4d696a17b 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/0.dat and b/P3D/Content/Data/maps/safarizone/areas/0.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/1.dat b/P3D/Content/Data/maps/safarizone/areas/1.dat
index eb2225983..57e41dda6 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/1.dat and b/P3D/Content/Data/maps/safarizone/areas/1.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/10.dat b/P3D/Content/Data/maps/safarizone/areas/10.dat
index 9830072de..a4a3ab719 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/10.dat and b/P3D/Content/Data/maps/safarizone/areas/10.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/11.dat b/P3D/Content/Data/maps/safarizone/areas/11.dat
index 3fa7afecc..3464d1fe4 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/11.dat and b/P3D/Content/Data/maps/safarizone/areas/11.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/12.dat b/P3D/Content/Data/maps/safarizone/areas/12.dat
index e40a0ef35..ae949ba3c 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/12.dat and b/P3D/Content/Data/maps/safarizone/areas/12.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/13.dat b/P3D/Content/Data/maps/safarizone/areas/13.dat
index 6f9d29093..a70c10acc 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/13.dat and b/P3D/Content/Data/maps/safarizone/areas/13.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/14.dat b/P3D/Content/Data/maps/safarizone/areas/14.dat
index a24434ef3..c1f16d924 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/14.dat and b/P3D/Content/Data/maps/safarizone/areas/14.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/15.dat b/P3D/Content/Data/maps/safarizone/areas/15.dat
index e13c55fd6..7feb1f51c 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/15.dat and b/P3D/Content/Data/maps/safarizone/areas/15.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/16.dat b/P3D/Content/Data/maps/safarizone/areas/16.dat
index 3ae655ab6..75d32e296 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/16.dat and b/P3D/Content/Data/maps/safarizone/areas/16.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/17.dat b/P3D/Content/Data/maps/safarizone/areas/17.dat
index 526e5c9f3..b43179fce 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/17.dat and b/P3D/Content/Data/maps/safarizone/areas/17.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/18.dat b/P3D/Content/Data/maps/safarizone/areas/18.dat
index 003cf78be..0a28894ed 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/18.dat and b/P3D/Content/Data/maps/safarizone/areas/18.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/19.dat b/P3D/Content/Data/maps/safarizone/areas/19.dat
index 7608f2149..ba74df8e0 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/19.dat and b/P3D/Content/Data/maps/safarizone/areas/19.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/2.dat b/P3D/Content/Data/maps/safarizone/areas/2.dat
index 94b7e2be7..2797c91cb 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/2.dat and b/P3D/Content/Data/maps/safarizone/areas/2.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/3.dat b/P3D/Content/Data/maps/safarizone/areas/3.dat
index a189e7d14..da6ddcae1 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/3.dat and b/P3D/Content/Data/maps/safarizone/areas/3.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/4.dat b/P3D/Content/Data/maps/safarizone/areas/4.dat
index 9ffdee8a9..c27e1e446 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/4.dat and b/P3D/Content/Data/maps/safarizone/areas/4.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/5.dat b/P3D/Content/Data/maps/safarizone/areas/5.dat
index b898f0d66..e3817cca7 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/5.dat and b/P3D/Content/Data/maps/safarizone/areas/5.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/6.dat b/P3D/Content/Data/maps/safarizone/areas/6.dat
index 97fa53730..15509a9fe 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/6.dat and b/P3D/Content/Data/maps/safarizone/areas/6.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/7.dat b/P3D/Content/Data/maps/safarizone/areas/7.dat
index 47266ec70..72fabdd54 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/7.dat and b/P3D/Content/Data/maps/safarizone/areas/7.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/8.dat b/P3D/Content/Data/maps/safarizone/areas/8.dat
index 0d6e91c51..0e23b93e4 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/8.dat and b/P3D/Content/Data/maps/safarizone/areas/8.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/9.dat b/P3D/Content/Data/maps/safarizone/areas/9.dat
index 2b7568b80..b066a78a2 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/9.dat and b/P3D/Content/Data/maps/safarizone/areas/9.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/main.dat b/P3D/Content/Data/maps/safarizone/main.dat
index d90e5178e..0c0047bf8 100644
Binary files a/P3D/Content/Data/maps/safarizone/main.dat and b/P3D/Content/Data/maps/safarizone/main.dat differ
diff --git a/P3D/Content/Data/maps/victoryroad/1.dat b/P3D/Content/Data/maps/victoryroad/1.dat
index f96547ae2..725c2f1e3 100644
Binary files a/P3D/Content/Data/maps/victoryroad/1.dat and b/P3D/Content/Data/maps/victoryroad/1.dat differ
diff --git a/P3D/Content/Data/maps/victoryroad/2.dat b/P3D/Content/Data/maps/victoryroad/2.dat
index c5dd9e31c..01518d286 100644
Binary files a/P3D/Content/Data/maps/victoryroad/2.dat and b/P3D/Content/Data/maps/victoryroad/2.dat differ
diff --git a/P3D/Content/Data/maps/victoryroad/3.dat b/P3D/Content/Data/maps/victoryroad/3.dat
index 617e33808..b7b6fec5c 100644
Binary files a/P3D/Content/Data/maps/victoryroad/3.dat and b/P3D/Content/Data/maps/victoryroad/3.dat differ
diff --git a/P3D/Content/Data/maps/yourroom.dat b/P3D/Content/Data/maps/yourroom.dat
index 194a53f71..1df4263c8 100644
Binary files a/P3D/Content/Data/maps/yourroom.dat and b/P3D/Content/Data/maps/yourroom.dat differ
diff --git a/P3D/Content/Songs/frontier.ogg b/P3D/Content/Songs/BattleFrontier.ogg
similarity index 100%
rename from P3D/Content/Songs/frontier.ogg
rename to P3D/Content/Songs/BattleFrontier.ogg
diff --git a/P3D/Content/Songs/indigo.ogg b/P3D/Content/Songs/IndigoPlateau.ogg
similarity index 100%
rename from P3D/Content/Songs/indigo.ogg
rename to P3D/Content/Songs/IndigoPlateau.ogg
diff --git a/P3D/Content/Songs/intro/frontier.ogg b/P3D/Content/Songs/Intro/BattleFrontier.ogg
similarity index 100%
rename from P3D/Content/Songs/intro/frontier.ogg
rename to P3D/Content/Songs/Intro/BattleFrontier.ogg
diff --git a/P3D/Content/Songs/Intro/Mom.ogg b/P3D/Content/Songs/Intro/Mom.ogg
new file mode 100644
index 000000000..ec09508ff
Binary files /dev/null and b/P3D/Content/Songs/Intro/Mom.ogg differ
diff --git a/P3D/Content/Songs/intro/barktown.ogg b/P3D/Content/Songs/Intro/NewBark.ogg
similarity index 100%
rename from P3D/Content/Songs/intro/barktown.ogg
rename to P3D/Content/Songs/Intro/NewBark.ogg
diff --git a/P3D/Content/Songs/intro/safari.ogg b/P3D/Content/Songs/Intro/SafariZone.ogg
similarity index 100%
rename from P3D/Content/Songs/intro/safari.ogg
rename to P3D/Content/Songs/Intro/SafariZone.ogg
diff --git a/P3D/Content/Songs/johto_rivalintro.ogg b/P3D/Content/Songs/Johto_Rival_Intro.ogg
similarity index 100%
rename from P3D/Content/Songs/johto_rivalintro.ogg
rename to P3D/Content/Songs/Johto_Rival_Intro.ogg
diff --git a/P3D/Content/Songs/Mom.ogg b/P3D/Content/Songs/Mom.ogg
new file mode 100644
index 000000000..ea3612143
Binary files /dev/null and b/P3D/Content/Songs/Mom.ogg differ
diff --git a/P3D/Content/Songs/mtmoonsq.ogg b/P3D/Content/Songs/MtMoonSquare.ogg
similarity index 100%
rename from P3D/Content/Songs/mtmoonsq.ogg
rename to P3D/Content/Songs/MtMoonSquare.ogg
diff --git a/P3D/Content/Songs/barktown.ogg b/P3D/Content/Songs/NewBark.ogg
similarity index 100%
rename from P3D/Content/Songs/barktown.ogg
rename to P3D/Content/Songs/NewBark.ogg
diff --git a/P3D/Content/Songs/PVP_Intro.ogg b/P3D/Content/Songs/PVP_Intro.ogg
new file mode 100644
index 000000000..cdaad266e
Binary files /dev/null and b/P3D/Content/Songs/PVP_Intro.ogg differ
diff --git a/P3D/Content/Songs/rHideout.ogg b/P3D/Content/Songs/Rocket_Hideout.ogg
similarity index 100%
rename from P3D/Content/Songs/rHideout.ogg
rename to P3D/Content/Songs/Rocket_Hideout.ogg
diff --git a/P3D/Content/Songs/alph.ogg b/P3D/Content/Songs/RuinsOfAlph.ogg
similarity index 100%
rename from P3D/Content/Songs/alph.ogg
rename to P3D/Content/Songs/RuinsOfAlph.ogg
diff --git a/P3D/Content/Songs/safari.ogg b/P3D/Content/Songs/SafariZone.ogg
similarity index 100%
rename from P3D/Content/Songs/safari.ogg
rename to P3D/Content/Songs/SafariZone.ogg
diff --git a/P3D/Content/Songs/safarigate.ogg b/P3D/Content/Songs/SafariZone_Gate.ogg
similarity index 100%
rename from P3D/Content/Songs/safarigate.ogg
rename to P3D/Content/Songs/SafariZone_Gate.ogg
diff --git a/P3D/Content/Songs/kvictoryroad.ogg b/P3D/Content/Songs/VictoryRoad.ogg
similarity index 100%
rename from P3D/Content/Songs/kvictoryroad.ogg
rename to P3D/Content/Songs/VictoryRoad.ogg
diff --git a/P3D/Content/Songs/pvp.ogg b/P3D/Content/Songs/pvp.ogg
index c38e4fdff..db750b75b 100644
Binary files a/P3D/Content/Songs/pvp.ogg and b/P3D/Content/Songs/pvp.ogg differ
diff --git a/P3D/Content/Sounds/Contest/rankplace.wav b/P3D/Content/Sounds/Contest/rankplace.wav
index eb8a5d9ce..884aea2a0 100644
Binary files a/P3D/Content/Sounds/Contest/rankplace.wav and b/P3D/Content/Sounds/Contest/rankplace.wav differ
diff --git a/P3D/Content/Sounds/Emote_Exclamation.wav b/P3D/Content/Sounds/Emote_Exclamation.wav
new file mode 100644
index 000000000..06ccd271c
Binary files /dev/null and b/P3D/Content/Sounds/Emote_Exclamation.wav differ
diff --git a/P3D/Content/Sounds/Heal_Party.wav b/P3D/Content/Sounds/Heal_Party.wav
index 5a89e1328..31b7d4526 100644
Binary files a/P3D/Content/Sounds/Heal_Party.wav and b/P3D/Content/Sounds/Heal_Party.wav differ
diff --git a/P3D/Content/Sounds/Receive_Egg.wav b/P3D/Content/Sounds/Receive_Egg.wav
index a2a82d763..a61e1ae04 100644
Binary files a/P3D/Content/Sounds/Receive_Egg.wav and b/P3D/Content/Sounds/Receive_Egg.wav differ
diff --git a/P3D/Content/Sounds/Receive_HM.wav b/P3D/Content/Sounds/Receive_HM.wav
new file mode 100644
index 000000000..081f3068b
Binary files /dev/null and b/P3D/Content/Sounds/Receive_HM.wav differ
diff --git a/P3D/Content/Sounds/Receive_Item.wav b/P3D/Content/Sounds/Receive_Item.wav
index b9fa21981..ef64fcc2e 100644
Binary files a/P3D/Content/Sounds/Receive_Item.wav and b/P3D/Content/Sounds/Receive_Item.wav differ
diff --git a/P3D/Content/Sounds/Receive_PhoneNumber.wav b/P3D/Content/Sounds/Receive_PhoneNumber.wav
index 162aefed4..b717f1017 100644
Binary files a/P3D/Content/Sounds/Receive_PhoneNumber.wav and b/P3D/Content/Sounds/Receive_PhoneNumber.wav differ
diff --git a/P3D/Content/Sounds/success.wav b/P3D/Content/Sounds/success.wav
index 7df9b0bbe..d569fd1a2 100644
Binary files a/P3D/Content/Sounds/success.wav and b/P3D/Content/Sounds/success.wav differ
diff --git a/P3D/Content/Sounds/success_small.wav b/P3D/Content/Sounds/success_small.wav
index 4a487b3fa..6549bf5f6 100644
Binary files a/P3D/Content/Sounds/success_small.wav and b/P3D/Content/Sounds/success_small.wav differ
diff --git a/P3D/Entites/Enviroment/ItemObject.vb b/P3D/Entites/Enviroment/ItemObject.vb
index 414b8a9a4..80b9bb211 100644
--- a/P3D/Entites/Enviroment/ItemObject.vb
+++ b/P3D/Entites/Enviroment/ItemObject.vb
@@ -140,7 +140,11 @@
     Public Overrides Sub ClickFunction()
         If CanInteractWith Then
             RemoveItem(Me)
-            SoundManager.PlaySound("Receive_Item", True)
+            If Me.Item.Name.Contains("HM") Then
+                SoundManager.PlaySound("Receive_HM", True)
+            Else
+                SoundManager.PlaySound("Receive_Item", True)
+            End If
             Screen.TextBox.TextColor = TextBox.PlayerColor
             Screen.TextBox.Show(Core.Player.Name & " found~" & Me.Item.Name & "!*" & Core.Player.Inventory.GetMessageReceive(Item, 1), {Me})
             Core.Player.Inventory.AddItem(Me.Item.ID, 1)
diff --git a/P3D/Network/Servers/PVPLobbyScreen.vb b/P3D/Network/Servers/PVPLobbyScreen.vb
index 8b432bf7f..19d83f00f 100644
--- a/P3D/Network/Servers/PVPLobbyScreen.vb
+++ b/P3D/Network/Servers/PVPLobbyScreen.vb
@@ -628,7 +628,7 @@
             b.PVPGameJoltID = tempPlayer.GameJoltId
         End If
 
-        Core.SetScreen(New BattleIntroScreen(Core.CurrentScreen, b, t, t.GetIniMusicName(), t.IntroType))
+        Core.SetScreen(New BattleIntroScreen(Core.CurrentScreen, b, t, "PVP_Intro", t.IntroType))
         PlayerStatistics.Track("PVP battles", 1)
     End Sub
 
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 4a8baf212..f412b709e 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -14086,457 +14086,466 @@
     <Content Include="Content\SkyDomeResource\Sky_Night.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\alph.ogg">
+    <Content Include="Content\Songs\RuinsOfAlph.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\ancient_ruins.ogg">
+    <Content Include="Content\Songs\Ancient_Ruins.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\azalea.ogg">
+    <Content Include="Content\Songs\Azalea.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\barktown.ogg">
+    <Content Include="Content\Songs\NewBark.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\battlefactory.ogg">
+    <Content Include="Content\Songs\BattleFactory.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\battletower.ogg">
+    <Content Include="Content\Songs\BattleTower.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\brain_battle.ogg">
+    <Content Include="Content\Songs\Brain_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\brain_battle_intro.ogg">
+    <Content Include="Content\Songs\Brain_Battle_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\bugcontest.ogg">
+    <Content Include="Content\Songs\BugContest.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\burnedtower.ogg">
+    <Content Include="Content\Songs\BurnedTower.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\celadon.ogg">
+    <Content Include="Content\Songs\Celadon.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\center.ogg">
+    <Content Include="Content\Songs\Center.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\cerulean.ogg">
+    <Content Include="Content\Songs\Cerulean.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\cerulean_cave.ogg">
+    <Content Include="Content\Songs\Cerulean_Cave.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\champion_defeat.ogg">
+    <Content Include="Content\Songs\Champion_Defeat.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\cherrygrove.ogg">
+    <Content Include="Content\Songs\Cherrygrove.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\cinnabar.ogg">
+    <Content Include="Content\Songs\Cinnabar.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\credits.ogg">
+    <Content Include="Content\Songs\Credits.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\dark_cave.ogg">
+    <Content Include="Content\Songs\Dark_Cave.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\diglettscave.ogg">
+    <Content Include="Content\Songs\DiglettsCave.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\dragonsden.ogg">
+    <Content Include="Content\Songs\DragonsDen.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\ecruteak.ogg">
+    <Content Include="Content\Songs\Ecruteak.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\elite_defeat.ogg">
+    <Content Include="Content\Songs\Elite_Defeat.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\elmslab.ogg">
+    <Content Include="Content\Songs\ElmsLab.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\entei_battle.ogg">
+    <Content Include="Content\Songs\Entei_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\entei_battle_intro.ogg">
+    <Content Include="Content\Songs\Entei_Battle_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\eusine_encounter.ogg">
+    <Content Include="Content\Songs\Eusine_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\evolution.ogg">
+    <Content Include="Content\Songs\Evolution.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\frontier.ogg">
+    <Content Include="Content\Songs\BattleFrontier.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\gamecorner.ogg">
+    <Content Include="Content\Songs\GameCorner.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\gameintro.ogg">
+    <Content Include="Content\Songs\GameIntro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Songs\Goldenrod.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\gts.ogg">
+    <Content Include="Content\Songs\GTS.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\gym.ogg">
+    <Content Include="Content\Songs\Gym.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\HallofFame.ogg">
+    <Content Include="Content\Songs\HallOfFame.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\ho-oh_battle.ogg">
+    <Content Include="Content\Songs\Ho-oh_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\ho-oh_battle_intro.ogg">
+    <Content Include="Content\Songs\Ho-oh_Battle_intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Songs\IlexForest.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\indigo.ogg">
+    <Content Include="Content\Songs\IndigoPlateau.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\azalea.ogg">
+    <Content Include="Content\Songs\Intro\Azalea.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\barktown.ogg">
+    <Content Include="Content\Songs\Intro\NewBark.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\battlefactory.ogg">
+    <Content Include="Content\Songs\Intro\BattleFactory.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\bugcontest.ogg">
+    <Content Include="Content\Songs\Intro\BugContest.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\burnedtower.ogg">
+    <Content Include="Content\Songs\Intro\BurnedTower.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\celadon.ogg">
+    <Content Include="Content\Songs\Intro\Celadon.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\cerulean.ogg">
+    <Content Include="Content\Songs\Intro\Cerulean.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\cerulean_cave.ogg">
+    <Content Include="Content\Songs\Intro\Cerulean_Cave.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\champion_defeat.ogg">
+    <Content Include="Content\Songs\Intro\Champion_Defeat.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\cherrygrove.ogg">
+    <Content Include="Content\Songs\Intro\Cherrygrove.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\diglettscave.ogg">
+    <Content Include="Content\Songs\Intro\DiglettsCave.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\elite_defeat.ogg">
+    <Content Include="Content\Songs\Intro\Elite_Defeat.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\elmslab.ogg">
+    <Content Include="Content\Songs\Intro\ElmsLab.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\entei_battle.ogg">
+    <Content Include="Content\Songs\Intro\Entei_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\evolution.ogg">
+    <Content Include="Content\Songs\Intro\Evolution.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\frontier.ogg">
+    <Content Include="Content\Songs\Intro\BattleFrontier.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\gamecorner.ogg">
+    <Content Include="Content\Songs\Intro\GameCorner.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\Goldenrod.ogg">
+    <Content Include="Content\Songs\Intro\Goldenrod.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\gts.ogg">
+    <Content Include="Content\Songs\Intro\GTS.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\ho-oh_battle.ogg">
+    <Content Include="Content\Songs\Intro\Ho-oh_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\IlexForest.ogg">
+    <Content Include="Content\Songs\Intro\IlexForest.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\johto_elite.ogg">
+    <Content Include="Content\Songs\Intro\Johto_Elite.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\johto_leader.ogg">
+    <Content Include="Content\Songs\Intro\Johto_Leader.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\johto_rival_encounter.ogg">
+    <Content Include="Content\Songs\Intro\Johto_Rival_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\johto_rocket.ogg">
+    <Content Include="Content\Songs\Intro\Johto_Rocket.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\johto_trainer.ogg">
+    <Content Include="Content\Songs\Intro\Johto_Trainer.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\johto_wild.ogg">
+    <Content Include="Content\Songs\Intro\Johto_Wild.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\kanto_leader.ogg">
+    <Content Include="Content\Songs\Intro\Kanto_Leader.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\kanto_trainer.ogg">
+    <Content Include="Content\Songs\Intro\Kanto_Trainer.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\lavender.ogg">
+    <Content Include="Content\Songs\Intro\Lavender.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\leader_defeat.ogg">
+    <Content Include="Content\Songs\Intro\Leader_Defeat.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\lobby.ogg">
+    <Content Include="Content\Songs\Intro\Lobby.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\lugia_battle.ogg">
+    <Content Include="Content\Songs\Intro\Lugia_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\mart.ogg">
+    <Content Include="Content\Songs\Intro\Mart.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\mary_encounter.ogg">
+    <Content Include="Content\Songs\Intro\Mary_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\oakslab.ogg">
+    <Content Include="Content\Songs\Intro\Mom.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\oak_encounter.ogg">
+    <Content Include="Content\Songs\Intro\OaksLab.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\pokeflute.ogg">
+    <Content Include="Content\Songs\Intro\Oak_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\pokemon_lullaby.ogg">
+    <Content Include="Content\Songs\Intro\PokeFlute.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\pokemon_march.ogg">
+    <Content Include="Content\Songs\Intro\Pokemon_Lullaby.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\pvp.ogg">
+    <Content Include="Content\Songs\Intro\Pokemon_March.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\raikou_battle.ogg">
+    <Content Include="Content\Songs\Intro\PVP.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\ride.ogg">
+    <Content Include="Content\Songs\Intro\Raikou_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic1.ogg">
+    <Content Include="Content\Songs\Intro\Ride.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic10.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic1.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic11.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic10.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic2.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic11.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic3.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic2.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic4.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic3.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic5.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic4.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic6.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic5.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic7.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic6.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\RouteMusic8.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic7.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\safari.ogg">
+    <Content Include="Content\Songs\Intro\RouteMusic8.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\show_me_around.ogg">
+    <Content Include="Content\Songs\Intro\SafariZone.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\space_legend_battle.ogg">
+    <Content Include="Content\Songs\Intro\Show_Me_Around.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\sprout_tower.ogg">
+    <Content Include="Content\Songs\Intro\Space_Legend_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\ssaqua.ogg">
+    <Content Include="Content\Songs\Intro\Sprout_Tower.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\startower.ogg">
+    <Content Include="Content\Songs\Intro\SSAqua.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\suicune_battle.ogg">
+    <Content Include="Content\Songs\Intro\StarTower.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\tao_legend_battle.ogg">
+    <Content Include="Content\Songs\Intro\Suicune_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\trainerschool.ogg">
+    <Content Include="Content\Songs\Intro\Tao_Legend_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\trainer_encounter.ogg">
+    <Content Include="Content\Songs\Intro\TrainerSchool.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\vermilion.ogg">
+    <Content Include="Content\Songs\Intro\Trainer_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\intro\violet.ogg">
+    <Content Include="Content\Songs\Intro\Vermilion.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_champion.ogg">
+    <Content Include="Content\Songs\Intro\Violet.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\Johto_champion_intro.ogg">
+    <Content Include="Content\Songs\Johto_Champion.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_elite.ogg">
+    <Content Include="Content\Songs\Johto_Champion_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_elite_intro.ogg">
+    <Content Include="Content\Songs\Johto_Elite.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_leader.ogg">
+    <Content Include="Content\Songs\Johto_Elite_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_leader_intro.ogg">
+    <Content Include="Content\Songs\Johto_Leader.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_rival.ogg">
+    <Content Include="Content\Songs\Johto_Leader_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_rivalintro.ogg">
+    <Content Include="Content\Songs\Johto_Rival.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_rival_encounter.ogg">
+    <Content Include="Content\Songs\Johto_Rival_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_rocket.ogg">
+    <Content Include="Content\Songs\Johto_Rival_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_rocket_encounter.ogg">
+    <Content Include="Content\Songs\Johto_Rocket.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_rocket_intro.ogg">
+    <Content Include="Content\Songs\Johto_Rocket_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_trainer.ogg">
+    <Content Include="Content\Songs\Johto_Rocket_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_trainer_intro.ogg">
+    <Content Include="Content\Songs\Johto_Trainer.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_wild.ogg">
+    <Content Include="Content\Songs\Johto_Trainer_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\johto_wild_intro.ogg">
+    <Content Include="Content\Songs\Johto_Wild.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\kanto_leader.ogg">
+    <Content Include="Content\Songs\Johto_Wild_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\kanto_leader_intro.ogg">
+    <Content Include="Content\Songs\Kanto_Leader.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\kanto_trainer.ogg">
+    <Content Include="Content\Songs\Kanto_Leader_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\kanto_trainer_intro.ogg">
+    <Content Include="Content\Songs\Kanto_Trainer.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\kanto_wild.ogg">
+    <Content Include="Content\Songs\Kanto_Trainer_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\kanto_wild_intro.ogg">
+    <Content Include="Content\Songs\Kanto_Wild.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\kimono.ogg">
+    <Content Include="Content\Songs\Kanto_Wild_intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\kvictoryroad.ogg">
+    <Content Include="Content\Songs\Kimono.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\lavender.ogg">
+    <Content Include="Content\Songs\VictoryRoad.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\leader_defeat.ogg">
+    <Content Include="Content\Songs\Lavender.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\lighthouse.ogg">
+    <Content Include="Content\Songs\Leader_Defeat.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\lobby.ogg">
+    <Content Include="Content\Songs\Lighthouse.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\Looker_encounter.ogg">
+    <Content Include="Content\Songs\Lobby.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\lugia_battle.ogg">
+    <Content Include="Content\Songs\Looker_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\lugia_battle_intro.ogg">
+    <Content Include="Content\Songs\Lugia_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\mart.ogg">
+    <Content Include="Content\Songs\Lugia_Battle_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\mary_encounter.ogg">
+    <Content Include="Content\Songs\Mart.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\mtmoonsq.ogg">
+    <Content Include="Content\Songs\Mary_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\nationalpark.ogg">
+    <Content Include="Content\Songs\Mom.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\oakslab.ogg">
+    <Content Include="Content\Songs\MtMoonSquare.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\oak_encounter.ogg">
+    <Content Include="Content\Songs\NationalPark.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\pallet.ogg">
+    <Content Include="Content\Songs\OaksLab.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\pokeflute.ogg">
+    <Content Include="Content\Songs\Oak_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\pokemon_lullaby.ogg">
+    <Content Include="Content\Songs\Pallet.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\pokemon_march.ogg">
+    <Content Include="Content\Songs\PokeFlute.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\pvp.ogg">
+    <Content Include="Content\Songs\Pokemon_Lullaby.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\raikou_battle.ogg">
+    <Content Include="Content\Songs\Pokemon_March.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\raikou_battle_intro.ogg">
+    <Content Include="Content\Songs\PVP.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\rHideout.ogg">
+    <Content Include="Content\Songs\PVP_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\ride.ogg">
+    <Content Include="Content\Songs\Raikou_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\rocket_broadcast.ogg">
+    <Content Include="Content\Songs\Raikou_Battle_Intro.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Songs\Rocket_Hideout.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Songs\Ride.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Songs\Rocket_Broadcast.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Songs\RouteMusic0.ogg">
@@ -14575,82 +14584,82 @@
     <Content Include="Content\Songs\RouteMusic9.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\safari.ogg">
+    <Content Include="Content\Songs\SafariZone.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\safarigate.ogg">
+    <Content Include="Content\Songs\SafariZone_Gate.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\show_me_around.ogg">
+    <Content Include="Content\Songs\Show_Me_Around.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Songs\Silence.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\sovietmarch.ogg">
+    <Content Include="Content\Songs\SovietMarch.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\space_legend_battle.ogg">
+    <Content Include="Content\Songs\Space_Legend_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\space_legend_battle_intro.ogg">
+    <Content Include="Content\Songs\Space_Legend_Battle_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\sprout_tower.ogg">
+    <Content Include="Content\Songs\Sprout_Tower.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\ssaqua.ogg">
+    <Content Include="Content\Songs\SSAqua.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\startower.ogg">
+    <Content Include="Content\Songs\StarTower.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\suicune_battle.ogg">
+    <Content Include="Content\Songs\Suicune_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\suicune_battle_intro.ogg">
+    <Content Include="Content\Songs\Suicune_Battle_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\surf.ogg">
+    <Content Include="Content\Songs\Surf.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\tao_legend_battle.ogg">
+    <Content Include="Content\Songs\Tao_Legend_Battle.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\tao_legend_battle_intro.ogg">
+    <Content Include="Content\Songs\Tao_Legend_Battle_Intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\tintower.ogg">
+    <Content Include="Content\Songs\TinTower.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\title.ogg">
+    <Content Include="Content\Songs\Title.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\trainerschool.ogg">
+    <Content Include="Content\Songs\TrainerSchool.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\trainer_defeat.ogg">
+    <Content Include="Content\Songs\Trainer_Defeat.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\trainer_encounter.ogg">
+    <Content Include="Content\Songs\Trainer_Encounter.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\unown_broadcast.ogg">
+    <Content Include="Content\Songs\Unown_Broadcast.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\vermilion.ogg">
+    <Content Include="Content\Songs\Vermilion.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\violet.ogg">
+    <Content Include="Content\Songs\Violet.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\viridian_forest.ogg">
+    <Content Include="Content\Songs\Viridian_Forest.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\wild_defeat.ogg">
+    <Content Include="Content\Songs\Wild_Defeat.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Songs\wind.ogg">
+    <Content Include="Content\Songs\Wind.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Sounds\Battle\Attacks\Ember_Hit.wav">
@@ -15298,6 +15307,9 @@
     <Content Include="Content\Sounds\ElevatorEnd.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Sounds\Emote_Exclamation.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Sounds\enter.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -15334,6 +15346,9 @@
     <Content Include="Content\Sounds\Receive_Egg.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Sounds\Receive_HM.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Sounds\Receive_Item.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>