diff --git a/Audio/BGM/BLAZIKEN.mp3 b/Audio/BGM/BLAZIKEN.mp3
new file mode 100644
index 000000000..ec1019014
Binary files /dev/null and b/Audio/BGM/BLAZIKEN.mp3 differ
diff --git a/Audio/BGM/GENGAR.mp3 b/Audio/BGM/GENGAR.mp3
new file mode 100644
index 000000000..6c784a6d9
Binary files /dev/null and b/Audio/BGM/GENGAR.mp3 differ
diff --git a/Audio/BGM/INTRO_music_cries.mp3 b/Audio/BGM/INTRO_music_cries.mp3
new file mode 100644
index 000000000..4b8320d80
Binary files /dev/null and b/Audio/BGM/INTRO_music_cries.mp3 differ
diff --git a/Audio/BGM/NIDORINO.mp3 b/Audio/BGM/NIDORINO.mp3
new file mode 100644
index 000000000..56ce9cf8b
Binary files /dev/null and b/Audio/BGM/NIDORINO.mp3 differ
diff --git a/Audio/BGM/Pallet Town.mp3 b/Audio/BGM/Pallet Town.mp3
new file mode 100644
index 000000000..22a0da96e
Binary files /dev/null and b/Audio/BGM/Pallet Town.mp3 differ
diff --git a/Audio/BGM/Pokemon Red-Blue Opening.mp3 b/Audio/BGM/Pokemon Red-Blue Opening.mp3
index 8ff5effd1..00ed2fc32 100644
Binary files a/Audio/BGM/Pokemon Red-Blue Opening.mp3 and b/Audio/BGM/Pokemon Red-Blue Opening.mp3 differ
diff --git a/Audio/BGM/Pokémon Center - Pokémon HeartGold-SoulSilver.mp3 b/Audio/BGM/Pokémon Center - Pokémon HeartGold-SoulSilver.mp3
index eba618ad0..ec4c7638e 100644
Binary files a/Audio/BGM/Pokémon Center - Pokémon HeartGold-SoulSilver.mp3 and b/Audio/BGM/Pokémon Center - Pokémon HeartGold-SoulSilver.mp3 differ
diff --git a/Audio/BGM/Surfing (Kanto) - Remastered.mp3 b/Audio/BGM/Surfing (Kanto) - Remastered.mp3
index e8e531a58..9af6b4037 100644
Binary files a/Audio/BGM/Surfing (Kanto) - Remastered.mp3 and b/Audio/BGM/Surfing (Kanto) - Remastered.mp3 differ
diff --git a/Audio/BGM/pokecenter copy.mp3 b/Audio/BGM/pokecenter copy.mp3
new file mode 100644
index 000000000..5cd202f62
Binary files /dev/null and b/Audio/BGM/pokecenter copy.mp3 differ
diff --git a/Audio/BGM/pokecenter.mp3 b/Audio/BGM/pokecenter.mp3
index eba618ad0..52e84ba0e 100644
Binary files a/Audio/BGM/pokecenter.mp3 and b/Audio/BGM/pokecenter.mp3 differ
diff --git a/Audio/BGM/pokecenter.wav b/Audio/BGM/pokecenter.wav
new file mode 100644
index 000000000..c151e2b11
Binary files /dev/null and b/Audio/BGM/pokecenter.wav differ
diff --git a/Audio/BGM/shop.mp3 b/Audio/BGM/shop.mp3
index dba33b9a0..ea31ebe4a 100644
Binary files a/Audio/BGM/shop.mp3 and b/Audio/BGM/shop.mp3 differ
diff --git a/Audio/BGM/underwater.wav b/Audio/BGM/underwater.wav
new file mode 100644
index 000000000..eba901e3f
Binary files /dev/null and b/Audio/BGM/underwater.wav differ
diff --git a/Audio/BGM/uwater.mp3 b/Audio/BGM/uwater.mp3
index bfb6c628e..7d28bda46 100644
Binary files a/Audio/BGM/uwater.mp3 and b/Audio/BGM/uwater.mp3 differ
diff --git a/Audio/ME/wild-victory.mp3 b/Audio/ME/wild-victory.mp3
index 1d993f194..60052ddea 100644
Binary files a/Audio/ME/wild-victory.mp3 and b/Audio/ME/wild-victory.mp3 differ
diff --git a/Audio/SE/Cries/ABOMASNOW.ogg b/Audio/SE/Cries/ABOMASNOW.ogg
deleted file mode 100644
index a6360cdfb..000000000
Binary files a/Audio/SE/Cries/ABOMASNOW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ABOMASNOW_1.ogg b/Audio/SE/Cries/ABOMASNOW_1.ogg
deleted file mode 100644
index 1419e394c..000000000
Binary files a/Audio/SE/Cries/ABOMASNOW_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ABRA.mp3 b/Audio/SE/Cries/ABRA.mp3
new file mode 100644
index 000000000..b7928f6d4
Binary files /dev/null and b/Audio/SE/Cries/ABRA.mp3 differ
diff --git a/Audio/SE/Cries/ABRA.ogg b/Audio/SE/Cries/ABRA.ogg
deleted file mode 100644
index 879196c5b..000000000
Binary files a/Audio/SE/Cries/ABRA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ABSOL.mp3 b/Audio/SE/Cries/ABSOL.mp3
new file mode 100644
index 000000000..cee7ff52d
Binary files /dev/null and b/Audio/SE/Cries/ABSOL.mp3 differ
diff --git a/Audio/SE/Cries/ABSOL.ogg b/Audio/SE/Cries/ABSOL.ogg
deleted file mode 100644
index a73350b7d..000000000
Binary files a/Audio/SE/Cries/ABSOL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ABSOL_1.ogg b/Audio/SE/Cries/ABSOL_1.ogg
deleted file mode 100644
index cb4c4909e..000000000
Binary files a/Audio/SE/Cries/ABSOL_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ACCELGOR.ogg b/Audio/SE/Cries/ACCELGOR.ogg
deleted file mode 100644
index 2e60768e5..000000000
Binary files a/Audio/SE/Cries/ACCELGOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AEGISLASH.mp3 b/Audio/SE/Cries/AEGISLASH.mp3
new file mode 100644
index 000000000..d4ac5ec29
Binary files /dev/null and b/Audio/SE/Cries/AEGISLASH.mp3 differ
diff --git a/Audio/SE/Cries/AEGISLASH.ogg b/Audio/SE/Cries/AEGISLASH.ogg
deleted file mode 100644
index a57dc39c7..000000000
Binary files a/Audio/SE/Cries/AEGISLASH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AERODACTYL.mp3 b/Audio/SE/Cries/AERODACTYL.mp3
new file mode 100644
index 000000000..2324c24c2
Binary files /dev/null and b/Audio/SE/Cries/AERODACTYL.mp3 differ
diff --git a/Audio/SE/Cries/AERODACTYL.ogg b/Audio/SE/Cries/AERODACTYL.ogg
deleted file mode 100644
index f94a4465c..000000000
Binary files a/Audio/SE/Cries/AERODACTYL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AERODACTYL_1.ogg b/Audio/SE/Cries/AERODACTYL_1.ogg
deleted file mode 100644
index d2d1f186a..000000000
Binary files a/Audio/SE/Cries/AERODACTYL_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AGGRON.mp3 b/Audio/SE/Cries/AGGRON.mp3
new file mode 100644
index 000000000..bcc27852a
Binary files /dev/null and b/Audio/SE/Cries/AGGRON.mp3 differ
diff --git a/Audio/SE/Cries/AGGRON.ogg b/Audio/SE/Cries/AGGRON.ogg
deleted file mode 100644
index 5fa051694..000000000
Binary files a/Audio/SE/Cries/AGGRON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AGGRON_1.ogg b/Audio/SE/Cries/AGGRON_1.ogg
deleted file mode 100644
index 22df0401d..000000000
Binary files a/Audio/SE/Cries/AGGRON_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AIPOM.mp3 b/Audio/SE/Cries/AIPOM.mp3
new file mode 100644
index 000000000..40d934401
Binary files /dev/null and b/Audio/SE/Cries/AIPOM.mp3 differ
diff --git a/Audio/SE/Cries/AIPOM.ogg b/Audio/SE/Cries/AIPOM.ogg
deleted file mode 100644
index f311955a9..000000000
Binary files a/Audio/SE/Cries/AIPOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ALAKAZAM.mp3 b/Audio/SE/Cries/ALAKAZAM.mp3
new file mode 100644
index 000000000..e86391444
Binary files /dev/null and b/Audio/SE/Cries/ALAKAZAM.mp3 differ
diff --git a/Audio/SE/Cries/ALAKAZAM.ogg b/Audio/SE/Cries/ALAKAZAM.ogg
deleted file mode 100644
index f6b023b77..000000000
Binary files a/Audio/SE/Cries/ALAKAZAM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ALAKAZAM_1.ogg b/Audio/SE/Cries/ALAKAZAM_1.ogg
deleted file mode 100644
index 3ad4f620d..000000000
Binary files a/Audio/SE/Cries/ALAKAZAM_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ALCREMIE.ogg b/Audio/SE/Cries/ALCREMIE.ogg
deleted file mode 100644
index b35fb9293..000000000
Binary files a/Audio/SE/Cries/ALCREMIE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ALOMOMOLA.ogg b/Audio/SE/Cries/ALOMOMOLA.ogg
deleted file mode 100644
index 5e5a70b17..000000000
Binary files a/Audio/SE/Cries/ALOMOMOLA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ALTARIA.mp3 b/Audio/SE/Cries/ALTARIA.mp3
new file mode 100644
index 000000000..de160264d
Binary files /dev/null and b/Audio/SE/Cries/ALTARIA.mp3 differ
diff --git a/Audio/SE/Cries/ALTARIA.ogg b/Audio/SE/Cries/ALTARIA.ogg
deleted file mode 100644
index 661003b0a..000000000
Binary files a/Audio/SE/Cries/ALTARIA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ALTARIA_1.ogg b/Audio/SE/Cries/ALTARIA_1.ogg
deleted file mode 100644
index afb6bf55d..000000000
Binary files a/Audio/SE/Cries/ALTARIA_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AMAURA.mp3 b/Audio/SE/Cries/AMAURA.mp3
new file mode 100644
index 000000000..7944e92ad
Binary files /dev/null and b/Audio/SE/Cries/AMAURA.mp3 differ
diff --git a/Audio/SE/Cries/AMAURA.ogg b/Audio/SE/Cries/AMAURA.ogg
deleted file mode 100644
index c1d6d0fe6..000000000
Binary files a/Audio/SE/Cries/AMAURA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AMBIPOM.mp3 b/Audio/SE/Cries/AMBIPOM.mp3
new file mode 100644
index 000000000..86b40b1b9
Binary files /dev/null and b/Audio/SE/Cries/AMBIPOM.mp3 differ
diff --git a/Audio/SE/Cries/AMBIPOM.ogg b/Audio/SE/Cries/AMBIPOM.ogg
deleted file mode 100644
index fffe67a58..000000000
Binary files a/Audio/SE/Cries/AMBIPOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AMOONGUSS.ogg b/Audio/SE/Cries/AMOONGUSS.ogg
deleted file mode 100644
index c315553b8..000000000
Binary files a/Audio/SE/Cries/AMOONGUSS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AMPHAROS.mp3 b/Audio/SE/Cries/AMPHAROS.mp3
new file mode 100644
index 000000000..19e695579
Binary files /dev/null and b/Audio/SE/Cries/AMPHAROS.mp3 differ
diff --git a/Audio/SE/Cries/AMPHAROS.ogg b/Audio/SE/Cries/AMPHAROS.ogg
deleted file mode 100644
index c96408b61..000000000
Binary files a/Audio/SE/Cries/AMPHAROS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AMPHAROS_1.ogg b/Audio/SE/Cries/AMPHAROS_1.ogg
deleted file mode 100644
index 6df907065..000000000
Binary files a/Audio/SE/Cries/AMPHAROS_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ANORITH-2.mp3 b/Audio/SE/Cries/ANORITH-2.mp3
new file mode 100644
index 000000000..2a79f85f3
Binary files /dev/null and b/Audio/SE/Cries/ANORITH-2.mp3 differ
diff --git a/Audio/SE/Cries/ANORITH.mp3 b/Audio/SE/Cries/ANORITH.mp3
new file mode 100644
index 000000000..1cced7716
Binary files /dev/null and b/Audio/SE/Cries/ANORITH.mp3 differ
diff --git a/Audio/SE/Cries/ANORITH.ogg b/Audio/SE/Cries/ANORITH.ogg
deleted file mode 100644
index 61d9d33a8..000000000
Binary files a/Audio/SE/Cries/ANORITH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/APPLETUN.ogg b/Audio/SE/Cries/APPLETUN.ogg
deleted file mode 100644
index e1711a9da..000000000
Binary files a/Audio/SE/Cries/APPLETUN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/APPLIN.ogg b/Audio/SE/Cries/APPLIN.ogg
deleted file mode 100644
index c08b101ad..000000000
Binary files a/Audio/SE/Cries/APPLIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARAQUANID.ogg b/Audio/SE/Cries/ARAQUANID.ogg
deleted file mode 100644
index 5da8002e8..000000000
Binary files a/Audio/SE/Cries/ARAQUANID.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARBOK.mp3 b/Audio/SE/Cries/ARBOK.mp3
new file mode 100644
index 000000000..e38b4d4c3
Binary files /dev/null and b/Audio/SE/Cries/ARBOK.mp3 differ
diff --git a/Audio/SE/Cries/ARBOK.ogg b/Audio/SE/Cries/ARBOK.ogg
deleted file mode 100644
index 03897eded..000000000
Binary files a/Audio/SE/Cries/ARBOK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARCANINE.mp3 b/Audio/SE/Cries/ARCANINE.mp3
new file mode 100644
index 000000000..f9eb9b792
Binary files /dev/null and b/Audio/SE/Cries/ARCANINE.mp3 differ
diff --git a/Audio/SE/Cries/ARCANINE.ogg b/Audio/SE/Cries/ARCANINE.ogg
deleted file mode 100644
index a921bd845..000000000
Binary files a/Audio/SE/Cries/ARCANINE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARCANINE.wav b/Audio/SE/Cries/ARCANINE.wav
new file mode 100644
index 000000000..b2c762e9a
Binary files /dev/null and b/Audio/SE/Cries/ARCANINE.wav differ
diff --git a/Audio/SE/Cries/ARCEUS.mp3 b/Audio/SE/Cries/ARCEUS.mp3
new file mode 100644
index 000000000..64daf4ee4
Binary files /dev/null and b/Audio/SE/Cries/ARCEUS.mp3 differ
diff --git a/Audio/SE/Cries/ARCEUS.ogg b/Audio/SE/Cries/ARCEUS.ogg
deleted file mode 100644
index 1200ca301..000000000
Binary files a/Audio/SE/Cries/ARCEUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARCEUS.wav b/Audio/SE/Cries/ARCEUS.wav
new file mode 100644
index 000000000..835255578
Binary files /dev/null and b/Audio/SE/Cries/ARCEUS.wav differ
diff --git a/Audio/SE/Cries/ARCHEN.ogg b/Audio/SE/Cries/ARCHEN.ogg
deleted file mode 100644
index a8d97530e..000000000
Binary files a/Audio/SE/Cries/ARCHEN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARCHEOPS.ogg b/Audio/SE/Cries/ARCHEOPS.ogg
deleted file mode 100644
index b021b3773..000000000
Binary files a/Audio/SE/Cries/ARCHEOPS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARCTOVISH.ogg b/Audio/SE/Cries/ARCTOVISH.ogg
deleted file mode 100644
index 029b23575..000000000
Binary files a/Audio/SE/Cries/ARCTOVISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARCTOZOLT.ogg b/Audio/SE/Cries/ARCTOZOLT.ogg
deleted file mode 100644
index fe52024a9..000000000
Binary files a/Audio/SE/Cries/ARCTOZOLT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARIADOS.mp3 b/Audio/SE/Cries/ARIADOS.mp3
new file mode 100644
index 000000000..6c30bd065
Binary files /dev/null and b/Audio/SE/Cries/ARIADOS.mp3 differ
diff --git a/Audio/SE/Cries/ARIADOS.ogg b/Audio/SE/Cries/ARIADOS.ogg
deleted file mode 100644
index 736fc0431..000000000
Binary files a/Audio/SE/Cries/ARIADOS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARMALDO.mp3 b/Audio/SE/Cries/ARMALDO.mp3
new file mode 100644
index 000000000..75f4883e3
Binary files /dev/null and b/Audio/SE/Cries/ARMALDO.mp3 differ
diff --git a/Audio/SE/Cries/ARMALDO.ogg b/Audio/SE/Cries/ARMALDO.ogg
deleted file mode 100644
index dd5a54ce4..000000000
Binary files a/Audio/SE/Cries/ARMALDO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AROMATISSE.ogg b/Audio/SE/Cries/AROMATISSE.ogg
deleted file mode 100644
index 360a2bbda..000000000
Binary files a/Audio/SE/Cries/AROMATISSE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARON.mp3 b/Audio/SE/Cries/ARON.mp3
new file mode 100644
index 000000000..1a40e1bac
Binary files /dev/null and b/Audio/SE/Cries/ARON.mp3 differ
diff --git a/Audio/SE/Cries/ARON.ogg b/Audio/SE/Cries/ARON.ogg
deleted file mode 100644
index 71f10f2e5..000000000
Binary files a/Audio/SE/Cries/ARON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARROKUDA.ogg b/Audio/SE/Cries/ARROKUDA.ogg
deleted file mode 100644
index cd77da6b0..000000000
Binary files a/Audio/SE/Cries/ARROKUDA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ARTICUNO.mp3 b/Audio/SE/Cries/ARTICUNO.mp3
new file mode 100644
index 000000000..8b333fa9b
Binary files /dev/null and b/Audio/SE/Cries/ARTICUNO.mp3 differ
diff --git a/Audio/SE/Cries/ARTICUNO.ogg b/Audio/SE/Cries/ARTICUNO.ogg
deleted file mode 100644
index bfcced598..000000000
Binary files a/Audio/SE/Cries/ARTICUNO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AUDINO.ogg b/Audio/SE/Cries/AUDINO.ogg
deleted file mode 100644
index fd5e74326..000000000
Binary files a/Audio/SE/Cries/AUDINO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AUDINO_1.ogg b/Audio/SE/Cries/AUDINO_1.ogg
deleted file mode 100644
index 69d254e95..000000000
Binary files a/Audio/SE/Cries/AUDINO_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AURORUS.mp3 b/Audio/SE/Cries/AURORUS.mp3
new file mode 100644
index 000000000..ba70def03
Binary files /dev/null and b/Audio/SE/Cries/AURORUS.mp3 differ
diff --git a/Audio/SE/Cries/AURORUS.ogg b/Audio/SE/Cries/AURORUS.ogg
deleted file mode 100644
index a71a87207..000000000
Binary files a/Audio/SE/Cries/AURORUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AVALUGG.ogg b/Audio/SE/Cries/AVALUGG.ogg
deleted file mode 100644
index ada3987eb..000000000
Binary files a/Audio/SE/Cries/AVALUGG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AXEW.mp3 b/Audio/SE/Cries/AXEW.mp3
new file mode 100644
index 000000000..fbe724959
Binary files /dev/null and b/Audio/SE/Cries/AXEW.mp3 differ
diff --git a/Audio/SE/Cries/AXEW.ogg b/Audio/SE/Cries/AXEW.ogg
deleted file mode 100644
index 982a5a883..000000000
Binary files a/Audio/SE/Cries/AXEW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AZELF.ogg b/Audio/SE/Cries/AZELF.ogg
deleted file mode 100644
index 03e7262d2..000000000
Binary files a/Audio/SE/Cries/AZELF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AZUMARILL.mp3 b/Audio/SE/Cries/AZUMARILL.mp3
new file mode 100644
index 000000000..27c940e43
Binary files /dev/null and b/Audio/SE/Cries/AZUMARILL.mp3 differ
diff --git a/Audio/SE/Cries/AZUMARILL.ogg b/Audio/SE/Cries/AZUMARILL.ogg
deleted file mode 100644
index 7d2017b40..000000000
Binary files a/Audio/SE/Cries/AZUMARILL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/AZURILL.mp3 b/Audio/SE/Cries/AZURILL.mp3
new file mode 100644
index 000000000..6800fd602
Binary files /dev/null and b/Audio/SE/Cries/AZURILL.mp3 differ
diff --git a/Audio/SE/Cries/AZURILL.ogg b/Audio/SE/Cries/AZURILL.ogg
deleted file mode 100644
index 287ed0cc8..000000000
Binary files a/Audio/SE/Cries/AZURILL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BAGON.mp3 b/Audio/SE/Cries/BAGON.mp3
new file mode 100644
index 000000000..84d67b7ae
Binary files /dev/null and b/Audio/SE/Cries/BAGON.mp3 differ
diff --git a/Audio/SE/Cries/BAGON.ogg b/Audio/SE/Cries/BAGON.ogg
deleted file mode 100644
index 79a67277f..000000000
Binary files a/Audio/SE/Cries/BAGON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BALTOY.ogg b/Audio/SE/Cries/BALTOY.ogg
deleted file mode 100644
index 46480c4bf..000000000
Binary files a/Audio/SE/Cries/BALTOY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BANETTE.mp3 b/Audio/SE/Cries/BANETTE.mp3
new file mode 100644
index 000000000..93141f853
Binary files /dev/null and b/Audio/SE/Cries/BANETTE.mp3 differ
diff --git a/Audio/SE/Cries/BANETTE.ogg b/Audio/SE/Cries/BANETTE.ogg
deleted file mode 100644
index f13072d52..000000000
Binary files a/Audio/SE/Cries/BANETTE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BANETTE_1.ogg b/Audio/SE/Cries/BANETTE_1.ogg
deleted file mode 100644
index 323fe9cc3..000000000
Binary files a/Audio/SE/Cries/BANETTE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BARBARACLE.ogg b/Audio/SE/Cries/BARBARACLE.ogg
deleted file mode 100644
index acb8038e8..000000000
Binary files a/Audio/SE/Cries/BARBARACLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BARBOACH.ogg b/Audio/SE/Cries/BARBOACH.ogg
deleted file mode 100644
index 392b96fce..000000000
Binary files a/Audio/SE/Cries/BARBOACH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BARRASKEWDA.ogg b/Audio/SE/Cries/BARRASKEWDA.ogg
deleted file mode 100644
index c7f6e82ad..000000000
Binary files a/Audio/SE/Cries/BARRASKEWDA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BASCULIN.ogg b/Audio/SE/Cries/BASCULIN.ogg
deleted file mode 100644
index 3a60e4b95..000000000
Binary files a/Audio/SE/Cries/BASCULIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BASTIODON.mp3 b/Audio/SE/Cries/BASTIODON.mp3
new file mode 100644
index 000000000..97b53f1c6
Binary files /dev/null and b/Audio/SE/Cries/BASTIODON.mp3 differ
diff --git a/Audio/SE/Cries/BASTIODON.ogg b/Audio/SE/Cries/BASTIODON.ogg
deleted file mode 100644
index dc794ed3d..000000000
Binary files a/Audio/SE/Cries/BASTIODON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BAYLEEF.mp3 b/Audio/SE/Cries/BAYLEEF.mp3
new file mode 100644
index 000000000..374001a81
Binary files /dev/null and b/Audio/SE/Cries/BAYLEEF.mp3 differ
diff --git a/Audio/SE/Cries/BAYLEEF.ogg b/Audio/SE/Cries/BAYLEEF.ogg
deleted file mode 100644
index 987ef2b8d..000000000
Binary files a/Audio/SE/Cries/BAYLEEF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BEARTIC.ogg b/Audio/SE/Cries/BEARTIC.ogg
deleted file mode 100644
index 06b6b6ffc..000000000
Binary files a/Audio/SE/Cries/BEARTIC.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BEAUTIFLY.ogg b/Audio/SE/Cries/BEAUTIFLY.ogg
deleted file mode 100644
index bace755ca..000000000
Binary files a/Audio/SE/Cries/BEAUTIFLY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BEEDRILL.mp3 b/Audio/SE/Cries/BEEDRILL.mp3
new file mode 100644
index 000000000..b39a262d7
Binary files /dev/null and b/Audio/SE/Cries/BEEDRILL.mp3 differ
diff --git a/Audio/SE/Cries/BEEDRILL.ogg b/Audio/SE/Cries/BEEDRILL.ogg
deleted file mode 100644
index c32a880bd..000000000
Binary files a/Audio/SE/Cries/BEEDRILL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BEEDRILL.wav b/Audio/SE/Cries/BEEDRILL.wav
new file mode 100644
index 000000000..5bf5ded2b
Binary files /dev/null and b/Audio/SE/Cries/BEEDRILL.wav differ
diff --git a/Audio/SE/Cries/BEEDRILL_1.ogg b/Audio/SE/Cries/BEEDRILL_1.ogg
deleted file mode 100644
index 0dd8e20a1..000000000
Binary files a/Audio/SE/Cries/BEEDRILL_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BEHEEYEM.ogg b/Audio/SE/Cries/BEHEEYEM.ogg
deleted file mode 100644
index dbc6c4ec9..000000000
Binary files a/Audio/SE/Cries/BEHEEYEM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BELDUM.mp3 b/Audio/SE/Cries/BELDUM.mp3
new file mode 100644
index 000000000..269474dfc
Binary files /dev/null and b/Audio/SE/Cries/BELDUM.mp3 differ
diff --git a/Audio/SE/Cries/BELDUM.ogg b/Audio/SE/Cries/BELDUM.ogg
deleted file mode 100644
index fc91bd079..000000000
Binary files a/Audio/SE/Cries/BELDUM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BELLOSSOM.mp3 b/Audio/SE/Cries/BELLOSSOM.mp3
new file mode 100644
index 000000000..a83ddcab9
Binary files /dev/null and b/Audio/SE/Cries/BELLOSSOM.mp3 differ
diff --git a/Audio/SE/Cries/BELLOSSOM.ogg b/Audio/SE/Cries/BELLOSSOM.ogg
deleted file mode 100644
index 153127b12..000000000
Binary files a/Audio/SE/Cries/BELLOSSOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BELLSPROUT.mp3 b/Audio/SE/Cries/BELLSPROUT.mp3
new file mode 100644
index 000000000..972b1d028
Binary files /dev/null and b/Audio/SE/Cries/BELLSPROUT.mp3 differ
diff --git a/Audio/SE/Cries/BELLSPROUT.ogg b/Audio/SE/Cries/BELLSPROUT.ogg
deleted file mode 100644
index 8860be0a3..000000000
Binary files a/Audio/SE/Cries/BELLSPROUT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BERGMITE.ogg b/Audio/SE/Cries/BERGMITE.ogg
deleted file mode 100644
index 6dc0ab544..000000000
Binary files a/Audio/SE/Cries/BERGMITE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BEWEAR.mp3 b/Audio/SE/Cries/BEWEAR.mp3
new file mode 100644
index 000000000..fcdaf9d5b
Binary files /dev/null and b/Audio/SE/Cries/BEWEAR.mp3 differ
diff --git a/Audio/SE/Cries/BEWEAR.ogg b/Audio/SE/Cries/BEWEAR.ogg
deleted file mode 100644
index 8bef42eec..000000000
Binary files a/Audio/SE/Cries/BEWEAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BIBAREL.mp3 b/Audio/SE/Cries/BIBAREL.mp3
new file mode 100644
index 000000000..0e65a993d
Binary files /dev/null and b/Audio/SE/Cries/BIBAREL.mp3 differ
diff --git a/Audio/SE/Cries/BIBAREL.ogg b/Audio/SE/Cries/BIBAREL.ogg
deleted file mode 100644
index 5c50fa87a..000000000
Binary files a/Audio/SE/Cries/BIBAREL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BIDOOF.mp3 b/Audio/SE/Cries/BIDOOF.mp3
new file mode 100644
index 000000000..4495b104d
Binary files /dev/null and b/Audio/SE/Cries/BIDOOF.mp3 differ
diff --git a/Audio/SE/Cries/BIDOOF.ogg b/Audio/SE/Cries/BIDOOF.ogg
deleted file mode 100644
index 07fb1fe35..000000000
Binary files a/Audio/SE/Cries/BIDOOF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BINACLE.ogg b/Audio/SE/Cries/BINACLE.ogg
deleted file mode 100644
index 606a29895..000000000
Binary files a/Audio/SE/Cries/BINACLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BISHARP.mp3 b/Audio/SE/Cries/BISHARP.mp3
new file mode 100644
index 000000000..2185abab2
Binary files /dev/null and b/Audio/SE/Cries/BISHARP.mp3 differ
diff --git a/Audio/SE/Cries/BISHARP.ogg b/Audio/SE/Cries/BISHARP.ogg
deleted file mode 100644
index 975cfd9a5..000000000
Binary files a/Audio/SE/Cries/BISHARP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BLACEPHALON.ogg b/Audio/SE/Cries/BLACEPHALON.ogg
deleted file mode 100644
index 49805f533..000000000
Binary files a/Audio/SE/Cries/BLACEPHALON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BLASTOISE.mp3 b/Audio/SE/Cries/BLASTOISE.mp3
new file mode 100644
index 000000000..fa33e93e5
Binary files /dev/null and b/Audio/SE/Cries/BLASTOISE.mp3 differ
diff --git a/Audio/SE/Cries/BLASTOISE.ogg b/Audio/SE/Cries/BLASTOISE.ogg
deleted file mode 100644
index c29295eec..000000000
Binary files a/Audio/SE/Cries/BLASTOISE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BLASTOISE_1.ogg b/Audio/SE/Cries/BLASTOISE_1.ogg
deleted file mode 100644
index a78f2e2e4..000000000
Binary files a/Audio/SE/Cries/BLASTOISE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BLAZIKEN.ogg b/Audio/SE/Cries/BLAZIKEN.ogg
deleted file mode 100644
index 8fdffbbef..000000000
Binary files a/Audio/SE/Cries/BLAZIKEN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BLAZIKEN_1.ogg b/Audio/SE/Cries/BLAZIKEN_1.ogg
deleted file mode 100644
index 90c215c24..000000000
Binary files a/Audio/SE/Cries/BLAZIKEN_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BLIPBUG.ogg b/Audio/SE/Cries/BLIPBUG.ogg
deleted file mode 100644
index 8fd266440..000000000
Binary files a/Audio/SE/Cries/BLIPBUG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BLISSEY.mp3 b/Audio/SE/Cries/BLISSEY.mp3
new file mode 100644
index 000000000..09a0a7e00
Binary files /dev/null and b/Audio/SE/Cries/BLISSEY.mp3 differ
diff --git a/Audio/SE/Cries/BLISSEY.ogg b/Audio/SE/Cries/BLISSEY.ogg
deleted file mode 100644
index faa69b41e..000000000
Binary files a/Audio/SE/Cries/BLISSEY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BLITZLE.ogg b/Audio/SE/Cries/BLITZLE.ogg
deleted file mode 100644
index 66839ab7d..000000000
Binary files a/Audio/SE/Cries/BLITZLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BOLDORE.ogg b/Audio/SE/Cries/BOLDORE.ogg
deleted file mode 100644
index e11628e46..000000000
Binary files a/Audio/SE/Cries/BOLDORE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BOLTUND.ogg b/Audio/SE/Cries/BOLTUND.ogg
deleted file mode 100644
index 6999c4d00..000000000
Binary files a/Audio/SE/Cries/BOLTUND.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BONSLY.mp3 b/Audio/SE/Cries/BONSLY.mp3
new file mode 100644
index 000000000..d358e0789
Binary files /dev/null and b/Audio/SE/Cries/BONSLY.mp3 differ
diff --git a/Audio/SE/Cries/BONSLY.ogg b/Audio/SE/Cries/BONSLY.ogg
deleted file mode 100644
index 5b56cee32..000000000
Binary files a/Audio/SE/Cries/BONSLY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BOUFFALANT.ogg b/Audio/SE/Cries/BOUFFALANT.ogg
deleted file mode 100644
index 31980c035..000000000
Binary files a/Audio/SE/Cries/BOUFFALANT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BOUNSWEET.ogg b/Audio/SE/Cries/BOUNSWEET.ogg
deleted file mode 100644
index 7184d8d56..000000000
Binary files a/Audio/SE/Cries/BOUNSWEET.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BRAIXEN.mp3 b/Audio/SE/Cries/BRAIXEN.mp3
new file mode 100644
index 000000000..e33939af8
Binary files /dev/null and b/Audio/SE/Cries/BRAIXEN.mp3 differ
diff --git a/Audio/SE/Cries/BRAIXEN.ogg b/Audio/SE/Cries/BRAIXEN.ogg
deleted file mode 100644
index fa7fb6c97..000000000
Binary files a/Audio/SE/Cries/BRAIXEN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BRAVIARY.ogg b/Audio/SE/Cries/BRAVIARY.ogg
deleted file mode 100644
index 10252f7df..000000000
Binary files a/Audio/SE/Cries/BRAVIARY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BRELOOM.mp3 b/Audio/SE/Cries/BRELOOM.mp3
new file mode 100644
index 000000000..f1a210d82
Binary files /dev/null and b/Audio/SE/Cries/BRELOOM.mp3 differ
diff --git a/Audio/SE/Cries/BRELOOM.ogg b/Audio/SE/Cries/BRELOOM.ogg
deleted file mode 100644
index 6990d004b..000000000
Binary files a/Audio/SE/Cries/BRELOOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BRIONNE.ogg b/Audio/SE/Cries/BRIONNE.ogg
deleted file mode 100644
index 77990b6fb..000000000
Binary files a/Audio/SE/Cries/BRIONNE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BRONZONG.ogg b/Audio/SE/Cries/BRONZONG.ogg
deleted file mode 100644
index 62c7115d9..000000000
Binary files a/Audio/SE/Cries/BRONZONG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BRONZOR.ogg b/Audio/SE/Cries/BRONZOR.ogg
deleted file mode 100644
index 82c541eea..000000000
Binary files a/Audio/SE/Cries/BRONZOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BRUXISH.mp3 b/Audio/SE/Cries/BRUXISH.mp3
new file mode 100644
index 000000000..1d80ed75c
Binary files /dev/null and b/Audio/SE/Cries/BRUXISH.mp3 differ
diff --git a/Audio/SE/Cries/BRUXISH.ogg b/Audio/SE/Cries/BRUXISH.ogg
deleted file mode 100644
index 2535b7194..000000000
Binary files a/Audio/SE/Cries/BRUXISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BUDEW.mp3 b/Audio/SE/Cries/BUDEW.mp3
new file mode 100644
index 000000000..c5ace6254
Binary files /dev/null and b/Audio/SE/Cries/BUDEW.mp3 differ
diff --git a/Audio/SE/Cries/BUDEW.ogg b/Audio/SE/Cries/BUDEW.ogg
deleted file mode 100644
index 3c4fa57a1..000000000
Binary files a/Audio/SE/Cries/BUDEW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BUIZEL.ogg b/Audio/SE/Cries/BUIZEL.ogg
deleted file mode 100644
index 88de50000..000000000
Binary files a/Audio/SE/Cries/BUIZEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BULBASAUR.mp3 b/Audio/SE/Cries/BULBASAUR.mp3
new file mode 100644
index 000000000..4b6facd4b
Binary files /dev/null and b/Audio/SE/Cries/BULBASAUR.mp3 differ
diff --git a/Audio/SE/Cries/BULBASAUR.ogg b/Audio/SE/Cries/BULBASAUR.ogg
deleted file mode 100644
index a9ccc0575..000000000
Binary files a/Audio/SE/Cries/BULBASAUR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BUNEARY.mp3 b/Audio/SE/Cries/BUNEARY.mp3
new file mode 100644
index 000000000..076323089
Binary files /dev/null and b/Audio/SE/Cries/BUNEARY.mp3 differ
diff --git a/Audio/SE/Cries/BUNEARY.ogg b/Audio/SE/Cries/BUNEARY.ogg
deleted file mode 100644
index f1c01d88e..000000000
Binary files a/Audio/SE/Cries/BUNEARY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BUNNELBY.ogg b/Audio/SE/Cries/BUNNELBY.ogg
deleted file mode 100644
index 047a7229f..000000000
Binary files a/Audio/SE/Cries/BUNNELBY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BURMY.ogg b/Audio/SE/Cries/BURMY.ogg
deleted file mode 100644
index aa874dfd3..000000000
Binary files a/Audio/SE/Cries/BURMY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BUTTERFREE.mp3 b/Audio/SE/Cries/BUTTERFREE.mp3
new file mode 100644
index 000000000..14156019a
Binary files /dev/null and b/Audio/SE/Cries/BUTTERFREE.mp3 differ
diff --git a/Audio/SE/Cries/BUTTERFREE.ogg b/Audio/SE/Cries/BUTTERFREE.ogg
deleted file mode 100644
index c80575e8d..000000000
Binary files a/Audio/SE/Cries/BUTTERFREE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/BUTTERFREE.wav b/Audio/SE/Cries/BUTTERFREE.wav
new file mode 100644
index 000000000..e7d546b88
Binary files /dev/null and b/Audio/SE/Cries/BUTTERFREE.wav differ
diff --git a/Audio/SE/Cries/BUZZWOLE.ogg b/Audio/SE/Cries/BUZZWOLE.ogg
deleted file mode 100644
index 6a74af53c..000000000
Binary files a/Audio/SE/Cries/BUZZWOLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CACNEA.mp3 b/Audio/SE/Cries/CACNEA.mp3
new file mode 100644
index 000000000..14f1bfb07
Binary files /dev/null and b/Audio/SE/Cries/CACNEA.mp3 differ
diff --git a/Audio/SE/Cries/CACNEA.ogg b/Audio/SE/Cries/CACNEA.ogg
deleted file mode 100644
index c934fdbaf..000000000
Binary files a/Audio/SE/Cries/CACNEA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CACTURNE.mp3 b/Audio/SE/Cries/CACTURNE.mp3
new file mode 100644
index 000000000..9539d2e83
Binary files /dev/null and b/Audio/SE/Cries/CACTURNE.mp3 differ
diff --git a/Audio/SE/Cries/CACTURNE.ogg b/Audio/SE/Cries/CACTURNE.ogg
deleted file mode 100644
index d6f4c17e7..000000000
Binary files a/Audio/SE/Cries/CACTURNE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CALYREX.ogg b/Audio/SE/Cries/CALYREX.ogg
deleted file mode 100644
index 934d1c458..000000000
Binary files a/Audio/SE/Cries/CALYREX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CALYREX_1.ogg b/Audio/SE/Cries/CALYREX_1.ogg
deleted file mode 100644
index ed51a1672..000000000
Binary files a/Audio/SE/Cries/CALYREX_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CALYREX_2.ogg b/Audio/SE/Cries/CALYREX_2.ogg
deleted file mode 100644
index de122e232..000000000
Binary files a/Audio/SE/Cries/CALYREX_2.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CAMERUPT.ogg b/Audio/SE/Cries/CAMERUPT.ogg
deleted file mode 100644
index d38416e4c..000000000
Binary files a/Audio/SE/Cries/CAMERUPT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CAMERUPT_1.ogg b/Audio/SE/Cries/CAMERUPT_1.ogg
deleted file mode 100644
index b387f0835..000000000
Binary files a/Audio/SE/Cries/CAMERUPT_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CARBINK.mp3 b/Audio/SE/Cries/CARBINK.mp3
new file mode 100644
index 000000000..b20e49a6d
Binary files /dev/null and b/Audio/SE/Cries/CARBINK.mp3 differ
diff --git a/Audio/SE/Cries/CARBINK.ogg b/Audio/SE/Cries/CARBINK.ogg
deleted file mode 100644
index 610b02222..000000000
Binary files a/Audio/SE/Cries/CARBINK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CARKOL.ogg b/Audio/SE/Cries/CARKOL.ogg
deleted file mode 100644
index c24f356a6..000000000
Binary files a/Audio/SE/Cries/CARKOL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CARNIVINE.ogg b/Audio/SE/Cries/CARNIVINE.ogg
deleted file mode 100644
index c8cba8654..000000000
Binary files a/Audio/SE/Cries/CARNIVINE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CARRACOSTA.ogg b/Audio/SE/Cries/CARRACOSTA.ogg
deleted file mode 100644
index 7da1f6328..000000000
Binary files a/Audio/SE/Cries/CARRACOSTA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CARVANHA.mp3 b/Audio/SE/Cries/CARVANHA.mp3
new file mode 100644
index 000000000..365f73875
Binary files /dev/null and b/Audio/SE/Cries/CARVANHA.mp3 differ
diff --git a/Audio/SE/Cries/CARVANHA.ogg b/Audio/SE/Cries/CARVANHA.ogg
deleted file mode 100644
index 51ed64967..000000000
Binary files a/Audio/SE/Cries/CARVANHA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CASCOON.ogg b/Audio/SE/Cries/CASCOON.ogg
deleted file mode 100644
index 3c7a9e80c..000000000
Binary files a/Audio/SE/Cries/CASCOON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CASTFORM.ogg b/Audio/SE/Cries/CASTFORM.ogg
deleted file mode 100644
index d30584b1a..000000000
Binary files a/Audio/SE/Cries/CASTFORM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CATERPIE.mp3 b/Audio/SE/Cries/CATERPIE.mp3
new file mode 100644
index 000000000..3ec9a5767
Binary files /dev/null and b/Audio/SE/Cries/CATERPIE.mp3 differ
diff --git a/Audio/SE/Cries/CATERPIE.ogg b/Audio/SE/Cries/CATERPIE.ogg
deleted file mode 100644
index 7e9080efc..000000000
Binary files a/Audio/SE/Cries/CATERPIE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CATERPIE.wav b/Audio/SE/Cries/CATERPIE.wav
new file mode 100644
index 000000000..f1e946bc0
Binary files /dev/null and b/Audio/SE/Cries/CATERPIE.wav differ
diff --git a/Audio/SE/Cries/CELEBI.mp3 b/Audio/SE/Cries/CELEBI.mp3
new file mode 100644
index 000000000..e418d39b7
Binary files /dev/null and b/Audio/SE/Cries/CELEBI.mp3 differ
diff --git a/Audio/SE/Cries/CELEBI.ogg b/Audio/SE/Cries/CELEBI.ogg
deleted file mode 100644
index a9c76b25d..000000000
Binary files a/Audio/SE/Cries/CELEBI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CELESTEELA.ogg b/Audio/SE/Cries/CELESTEELA.ogg
deleted file mode 100644
index 7fd7528f8..000000000
Binary files a/Audio/SE/Cries/CELESTEELA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CENTISKORCH.ogg b/Audio/SE/Cries/CENTISKORCH.ogg
deleted file mode 100644
index a5a0ac50d..000000000
Binary files a/Audio/SE/Cries/CENTISKORCH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHANDELURE.mp3 b/Audio/SE/Cries/CHANDELURE.mp3
new file mode 100644
index 000000000..f9df88e79
Binary files /dev/null and b/Audio/SE/Cries/CHANDELURE.mp3 differ
diff --git a/Audio/SE/Cries/CHANDELURE.ogg b/Audio/SE/Cries/CHANDELURE.ogg
deleted file mode 100644
index a6e168d2a..000000000
Binary files a/Audio/SE/Cries/CHANDELURE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHANSEY.mp3 b/Audio/SE/Cries/CHANSEY.mp3
new file mode 100644
index 000000000..ba984fe4e
Binary files /dev/null and b/Audio/SE/Cries/CHANSEY.mp3 differ
diff --git a/Audio/SE/Cries/CHANSEY.ogg b/Audio/SE/Cries/CHANSEY.ogg
deleted file mode 100644
index 4b68213d3..000000000
Binary files a/Audio/SE/Cries/CHANSEY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHARIZARD.mp3 b/Audio/SE/Cries/CHARIZARD.mp3
new file mode 100644
index 000000000..185d1333f
Binary files /dev/null and b/Audio/SE/Cries/CHARIZARD.mp3 differ
diff --git a/Audio/SE/Cries/CHARIZARD.ogg b/Audio/SE/Cries/CHARIZARD.ogg
deleted file mode 100644
index c68b18775..000000000
Binary files a/Audio/SE/Cries/CHARIZARD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHARIZARD_1.ogg b/Audio/SE/Cries/CHARIZARD_1.ogg
deleted file mode 100644
index 0a12fe2ff..000000000
Binary files a/Audio/SE/Cries/CHARIZARD_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHARIZARD_2.ogg b/Audio/SE/Cries/CHARIZARD_2.ogg
deleted file mode 100644
index cb50f799e..000000000
Binary files a/Audio/SE/Cries/CHARIZARD_2.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHARJABUG.ogg b/Audio/SE/Cries/CHARJABUG.ogg
deleted file mode 100644
index 761149797..000000000
Binary files a/Audio/SE/Cries/CHARJABUG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHARMANDER.mp3 b/Audio/SE/Cries/CHARMANDER.mp3
new file mode 100644
index 000000000..17e0a25b9
Binary files /dev/null and b/Audio/SE/Cries/CHARMANDER.mp3 differ
diff --git a/Audio/SE/Cries/CHARMANDER.ogg b/Audio/SE/Cries/CHARMANDER.ogg
deleted file mode 100644
index 058b3e451..000000000
Binary files a/Audio/SE/Cries/CHARMANDER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHARMELEON-2.mp3 b/Audio/SE/Cries/CHARMELEON-2.mp3
new file mode 100644
index 000000000..78ac8f4b5
Binary files /dev/null and b/Audio/SE/Cries/CHARMELEON-2.mp3 differ
diff --git a/Audio/SE/Cries/CHARMELEON.mp3 b/Audio/SE/Cries/CHARMELEON.mp3
new file mode 100644
index 000000000..855e9417d
Binary files /dev/null and b/Audio/SE/Cries/CHARMELEON.mp3 differ
diff --git a/Audio/SE/Cries/CHARMELEON.ogg b/Audio/SE/Cries/CHARMELEON.ogg
deleted file mode 100644
index c0ad014a7..000000000
Binary files a/Audio/SE/Cries/CHARMELEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHATOT.ogg b/Audio/SE/Cries/CHATOT.ogg
deleted file mode 100644
index 8269afcd4..000000000
Binary files a/Audio/SE/Cries/CHATOT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHERRIM.ogg b/Audio/SE/Cries/CHERRIM.ogg
deleted file mode 100644
index 5247ba4b4..000000000
Binary files a/Audio/SE/Cries/CHERRIM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHERUBI.ogg b/Audio/SE/Cries/CHERUBI.ogg
deleted file mode 100644
index 2d3bf1d46..000000000
Binary files a/Audio/SE/Cries/CHERUBI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHESNAUGHT.mp3 b/Audio/SE/Cries/CHESNAUGHT.mp3
new file mode 100644
index 000000000..c0071a23a
Binary files /dev/null and b/Audio/SE/Cries/CHESNAUGHT.mp3 differ
diff --git a/Audio/SE/Cries/CHESNAUGHT.ogg b/Audio/SE/Cries/CHESNAUGHT.ogg
deleted file mode 100644
index 3f1c51454..000000000
Binary files a/Audio/SE/Cries/CHESNAUGHT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHESPIN.mp3 b/Audio/SE/Cries/CHESPIN.mp3
new file mode 100644
index 000000000..0dc9d85a5
Binary files /dev/null and b/Audio/SE/Cries/CHESPIN.mp3 differ
diff --git a/Audio/SE/Cries/CHESPIN.ogg b/Audio/SE/Cries/CHESPIN.ogg
deleted file mode 100644
index 720bf4aaf..000000000
Binary files a/Audio/SE/Cries/CHESPIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHEWTLE.ogg b/Audio/SE/Cries/CHEWTLE.ogg
deleted file mode 100644
index ed23a6b79..000000000
Binary files a/Audio/SE/Cries/CHEWTLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHIKORITA.mp3 b/Audio/SE/Cries/CHIKORITA.mp3
new file mode 100644
index 000000000..576a0804d
Binary files /dev/null and b/Audio/SE/Cries/CHIKORITA.mp3 differ
diff --git a/Audio/SE/Cries/CHIKORITA.ogg b/Audio/SE/Cries/CHIKORITA.ogg
deleted file mode 100644
index 88edc6042..000000000
Binary files a/Audio/SE/Cries/CHIKORITA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHIMCHAR.mp3 b/Audio/SE/Cries/CHIMCHAR.mp3
new file mode 100644
index 000000000..f0495b234
Binary files /dev/null and b/Audio/SE/Cries/CHIMCHAR.mp3 differ
diff --git a/Audio/SE/Cries/CHIMCHAR.ogg b/Audio/SE/Cries/CHIMCHAR.ogg
deleted file mode 100644
index bf0059734..000000000
Binary files a/Audio/SE/Cries/CHIMCHAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHIMECHO.ogg b/Audio/SE/Cries/CHIMECHO.ogg
deleted file mode 100644
index 89a1aca9b..000000000
Binary files a/Audio/SE/Cries/CHIMECHO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHINCHOU.mp3 b/Audio/SE/Cries/CHINCHOU.mp3
new file mode 100644
index 000000000..bbb2462de
Binary files /dev/null and b/Audio/SE/Cries/CHINCHOU.mp3 differ
diff --git a/Audio/SE/Cries/CHINCHOU.ogg b/Audio/SE/Cries/CHINCHOU.ogg
deleted file mode 100644
index a5e557bfe..000000000
Binary files a/Audio/SE/Cries/CHINCHOU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CHINGLING.ogg b/Audio/SE/Cries/CHINGLING.ogg
deleted file mode 100644
index e3871a3d3..000000000
Binary files a/Audio/SE/Cries/CHINGLING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CINCCINO.ogg b/Audio/SE/Cries/CINCCINO.ogg
deleted file mode 100644
index 36f84853d..000000000
Binary files a/Audio/SE/Cries/CINCCINO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CINDERACE.ogg b/Audio/SE/Cries/CINDERACE.ogg
deleted file mode 100644
index 85cb538be..000000000
Binary files a/Audio/SE/Cries/CINDERACE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CLAMPERL.ogg b/Audio/SE/Cries/CLAMPERL.ogg
deleted file mode 100644
index 7a52d033a..000000000
Binary files a/Audio/SE/Cries/CLAMPERL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CLAUNCHER.ogg b/Audio/SE/Cries/CLAUNCHER.ogg
deleted file mode 100644
index 10d7afacc..000000000
Binary files a/Audio/SE/Cries/CLAUNCHER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CLAWITZER.ogg b/Audio/SE/Cries/CLAWITZER.ogg
deleted file mode 100644
index c4c597e62..000000000
Binary files a/Audio/SE/Cries/CLAWITZER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CLAYDOL.ogg b/Audio/SE/Cries/CLAYDOL.ogg
deleted file mode 100644
index c5b51a34e..000000000
Binary files a/Audio/SE/Cries/CLAYDOL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CLEFABLE.mp3 b/Audio/SE/Cries/CLEFABLE.mp3
new file mode 100644
index 000000000..5f03da585
Binary files /dev/null and b/Audio/SE/Cries/CLEFABLE.mp3 differ
diff --git a/Audio/SE/Cries/CLEFABLE.ogg b/Audio/SE/Cries/CLEFABLE.ogg
deleted file mode 100644
index ec506af5c..000000000
Binary files a/Audio/SE/Cries/CLEFABLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CLEFAIRY-2.mp3 b/Audio/SE/Cries/CLEFAIRY-2.mp3
new file mode 100644
index 000000000..c8b52a784
Binary files /dev/null and b/Audio/SE/Cries/CLEFAIRY-2.mp3 differ
diff --git a/Audio/SE/Cries/CLEFAIRY.mp3 b/Audio/SE/Cries/CLEFAIRY.mp3
new file mode 100644
index 000000000..987f1f9d3
Binary files /dev/null and b/Audio/SE/Cries/CLEFAIRY.mp3 differ
diff --git a/Audio/SE/Cries/CLEFAIRY.ogg b/Audio/SE/Cries/CLEFAIRY.ogg
deleted file mode 100644
index e7d4d6b2a..000000000
Binary files a/Audio/SE/Cries/CLEFAIRY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CLEFAIRY.wav b/Audio/SE/Cries/CLEFAIRY.wav
new file mode 100644
index 000000000..b9c2a015d
Binary files /dev/null and b/Audio/SE/Cries/CLEFAIRY.wav differ
diff --git a/Audio/SE/Cries/CLEFFA.mp3 b/Audio/SE/Cries/CLEFFA.mp3
new file mode 100644
index 000000000..eef264d53
Binary files /dev/null and b/Audio/SE/Cries/CLEFFA.mp3 differ
diff --git a/Audio/SE/Cries/CLEFFA.ogg b/Audio/SE/Cries/CLEFFA.ogg
deleted file mode 100644
index c0489b273..000000000
Binary files a/Audio/SE/Cries/CLEFFA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CLOBBOPUS.ogg b/Audio/SE/Cries/CLOBBOPUS.ogg
deleted file mode 100644
index d1db4d7cf..000000000
Binary files a/Audio/SE/Cries/CLOBBOPUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CLOYSTER.mp3 b/Audio/SE/Cries/CLOYSTER.mp3
new file mode 100644
index 000000000..c513f3955
Binary files /dev/null and b/Audio/SE/Cries/CLOYSTER.mp3 differ
diff --git a/Audio/SE/Cries/CLOYSTER.ogg b/Audio/SE/Cries/CLOYSTER.ogg
deleted file mode 100644
index d40928861..000000000
Binary files a/Audio/SE/Cries/CLOYSTER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COALOSSAL.ogg b/Audio/SE/Cries/COALOSSAL.ogg
deleted file mode 100644
index 501154c75..000000000
Binary files a/Audio/SE/Cries/COALOSSAL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COBALION.ogg b/Audio/SE/Cries/COBALION.ogg
deleted file mode 100644
index 043a60619..000000000
Binary files a/Audio/SE/Cries/COBALION.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COFAGRIGUS.mp3 b/Audio/SE/Cries/COFAGRIGUS.mp3
new file mode 100644
index 000000000..9d014ddac
Binary files /dev/null and b/Audio/SE/Cries/COFAGRIGUS.mp3 differ
diff --git a/Audio/SE/Cries/COFAGRIGUS.ogg b/Audio/SE/Cries/COFAGRIGUS.ogg
deleted file mode 100644
index 2b9901e2f..000000000
Binary files a/Audio/SE/Cries/COFAGRIGUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COMBEE.ogg b/Audio/SE/Cries/COMBEE.ogg
deleted file mode 100644
index 56bac7224..000000000
Binary files a/Audio/SE/Cries/COMBEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COMBUSKEN.mp3 b/Audio/SE/Cries/COMBUSKEN.mp3
new file mode 100644
index 000000000..69e4f87a5
Binary files /dev/null and b/Audio/SE/Cries/COMBUSKEN.mp3 differ
diff --git a/Audio/SE/Cries/COMBUSKEN.ogg b/Audio/SE/Cries/COMBUSKEN.ogg
deleted file mode 100644
index 06014f350..000000000
Binary files a/Audio/SE/Cries/COMBUSKEN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COMFEY.ogg b/Audio/SE/Cries/COMFEY.ogg
deleted file mode 100644
index c71a6711a..000000000
Binary files a/Audio/SE/Cries/COMFEY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CONKELDURR.ogg b/Audio/SE/Cries/CONKELDURR.ogg
deleted file mode 100644
index dd0d00dde..000000000
Binary files a/Audio/SE/Cries/CONKELDURR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COPPERAJAH.ogg b/Audio/SE/Cries/COPPERAJAH.ogg
deleted file mode 100644
index 2003ae5f4..000000000
Binary files a/Audio/SE/Cries/COPPERAJAH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CORPHISH.ogg b/Audio/SE/Cries/CORPHISH.ogg
deleted file mode 100644
index 7fbde643c..000000000
Binary files a/Audio/SE/Cries/CORPHISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CORSOLA.mp3 b/Audio/SE/Cries/CORSOLA.mp3
new file mode 100644
index 000000000..2777c2ce3
Binary files /dev/null and b/Audio/SE/Cries/CORSOLA.mp3 differ
diff --git a/Audio/SE/Cries/CORSOLA.ogg b/Audio/SE/Cries/CORSOLA.ogg
deleted file mode 100644
index eeddaa2e3..000000000
Binary files a/Audio/SE/Cries/CORSOLA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CORVIKNIGHT.ogg b/Audio/SE/Cries/CORVIKNIGHT.ogg
deleted file mode 100644
index 68287c824..000000000
Binary files a/Audio/SE/Cries/CORVIKNIGHT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CORVISQUIRE.ogg b/Audio/SE/Cries/CORVISQUIRE.ogg
deleted file mode 100644
index a2c0c4831..000000000
Binary files a/Audio/SE/Cries/CORVISQUIRE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COSMOEM.ogg b/Audio/SE/Cries/COSMOEM.ogg
deleted file mode 100644
index a6bf285b7..000000000
Binary files a/Audio/SE/Cries/COSMOEM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COSMOG.ogg b/Audio/SE/Cries/COSMOG.ogg
deleted file mode 100644
index e8743075a..000000000
Binary files a/Audio/SE/Cries/COSMOG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/COTTONEE.mp3 b/Audio/SE/Cries/COTTONEE.mp3
new file mode 100644
index 000000000..7b09610ec
Binary files /dev/null and b/Audio/SE/Cries/COTTONEE.mp3 differ
diff --git a/Audio/SE/Cries/COTTONEE.ogg b/Audio/SE/Cries/COTTONEE.ogg
deleted file mode 100644
index ac192076c..000000000
Binary files a/Audio/SE/Cries/COTTONEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CRABOMINABLE.ogg b/Audio/SE/Cries/CRABOMINABLE.ogg
deleted file mode 100644
index 5055427e4..000000000
Binary files a/Audio/SE/Cries/CRABOMINABLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CRABRAWLER.ogg b/Audio/SE/Cries/CRABRAWLER.ogg
deleted file mode 100644
index c7e95ea3d..000000000
Binary files a/Audio/SE/Cries/CRABRAWLER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CRADILY.mp3 b/Audio/SE/Cries/CRADILY.mp3
new file mode 100644
index 000000000..90144ecdd
Binary files /dev/null and b/Audio/SE/Cries/CRADILY.mp3 differ
diff --git a/Audio/SE/Cries/CRADILY.ogg b/Audio/SE/Cries/CRADILY.ogg
deleted file mode 100644
index 6f81fa36f..000000000
Binary files a/Audio/SE/Cries/CRADILY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CRAMORANT.ogg b/Audio/SE/Cries/CRAMORANT.ogg
deleted file mode 100644
index ff04590f8..000000000
Binary files a/Audio/SE/Cries/CRAMORANT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CRANIDOS.mp3 b/Audio/SE/Cries/CRANIDOS.mp3
new file mode 100644
index 000000000..e8b5995dd
Binary files /dev/null and b/Audio/SE/Cries/CRANIDOS.mp3 differ
diff --git a/Audio/SE/Cries/CRANIDOS.ogg b/Audio/SE/Cries/CRANIDOS.ogg
deleted file mode 100644
index 55c167a39..000000000
Binary files a/Audio/SE/Cries/CRANIDOS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CRAWDAUNT.ogg b/Audio/SE/Cries/CRAWDAUNT.ogg
deleted file mode 100644
index 943b39159..000000000
Binary files a/Audio/SE/Cries/CRAWDAUNT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CRESSELIA.mp3 b/Audio/SE/Cries/CRESSELIA.mp3
new file mode 100644
index 000000000..816057ed6
Binary files /dev/null and b/Audio/SE/Cries/CRESSELIA.mp3 differ
diff --git a/Audio/SE/Cries/CRESSELIA.ogg b/Audio/SE/Cries/CRESSELIA.ogg
deleted file mode 100644
index b8ec3702f..000000000
Binary files a/Audio/SE/Cries/CRESSELIA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CROAGUNK.ogg b/Audio/SE/Cries/CROAGUNK.ogg
deleted file mode 100644
index 55ad0fe9f..000000000
Binary files a/Audio/SE/Cries/CROAGUNK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CROBAT.mp3 b/Audio/SE/Cries/CROBAT.mp3
new file mode 100644
index 000000000..a5d9e763e
Binary files /dev/null and b/Audio/SE/Cries/CROBAT.mp3 differ
diff --git a/Audio/SE/Cries/CROBAT.ogg b/Audio/SE/Cries/CROBAT.ogg
deleted file mode 100644
index bc9b94726..000000000
Binary files a/Audio/SE/Cries/CROBAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CROCONAW.mp3 b/Audio/SE/Cries/CROCONAW.mp3
new file mode 100644
index 000000000..6748f9838
Binary files /dev/null and b/Audio/SE/Cries/CROCONAW.mp3 differ
diff --git a/Audio/SE/Cries/CROCONAW.ogg b/Audio/SE/Cries/CROCONAW.ogg
deleted file mode 100644
index 7094b477c..000000000
Binary files a/Audio/SE/Cries/CROCONAW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CRUSTLE.ogg b/Audio/SE/Cries/CRUSTLE.ogg
deleted file mode 100644
index d9a4a1230..000000000
Binary files a/Audio/SE/Cries/CRUSTLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CRYOGONAL.ogg b/Audio/SE/Cries/CRYOGONAL.ogg
deleted file mode 100644
index a13d0bce4..000000000
Binary files a/Audio/SE/Cries/CRYOGONAL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CUBCHOO.ogg b/Audio/SE/Cries/CUBCHOO.ogg
deleted file mode 100644
index 91fe6e6c0..000000000
Binary files a/Audio/SE/Cries/CUBCHOO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CUBONE.mp3 b/Audio/SE/Cries/CUBONE.mp3
new file mode 100644
index 000000000..c7ca2f25d
Binary files /dev/null and b/Audio/SE/Cries/CUBONE.mp3 differ
diff --git a/Audio/SE/Cries/CUBONE.ogg b/Audio/SE/Cries/CUBONE.ogg
deleted file mode 100644
index 21fb4b527..000000000
Binary files a/Audio/SE/Cries/CUBONE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CUFANT.ogg b/Audio/SE/Cries/CUFANT.ogg
deleted file mode 100644
index 304e82406..000000000
Binary files a/Audio/SE/Cries/CUFANT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CURSOLA.ogg b/Audio/SE/Cries/CURSOLA.ogg
deleted file mode 100644
index 5e3fb0af0..000000000
Binary files a/Audio/SE/Cries/CURSOLA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CUTIEFLY.ogg b/Audio/SE/Cries/CUTIEFLY.ogg
deleted file mode 100644
index 295bc1ea5..000000000
Binary files a/Audio/SE/Cries/CUTIEFLY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/CYNDAQUIL.mp3 b/Audio/SE/Cries/CYNDAQUIL.mp3
new file mode 100644
index 000000000..649844e81
Binary files /dev/null and b/Audio/SE/Cries/CYNDAQUIL.mp3 differ
diff --git a/Audio/SE/Cries/CYNDAQUIL.ogg b/Audio/SE/Cries/CYNDAQUIL.ogg
deleted file mode 100644
index d34a3c546..000000000
Binary files a/Audio/SE/Cries/CYNDAQUIL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DARKRAI.mp3 b/Audio/SE/Cries/DARKRAI.mp3
new file mode 100644
index 000000000..4f4b212b7
Binary files /dev/null and b/Audio/SE/Cries/DARKRAI.mp3 differ
diff --git a/Audio/SE/Cries/DARKRAI.ogg b/Audio/SE/Cries/DARKRAI.ogg
deleted file mode 100644
index ccb574600..000000000
Binary files a/Audio/SE/Cries/DARKRAI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DARMANITAN.ogg b/Audio/SE/Cries/DARMANITAN.ogg
deleted file mode 100644
index 1e49c22a3..000000000
Binary files a/Audio/SE/Cries/DARMANITAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DARTRIX.ogg b/Audio/SE/Cries/DARTRIX.ogg
deleted file mode 100644
index 840914b2b..000000000
Binary files a/Audio/SE/Cries/DARTRIX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DARUMAKA.ogg b/Audio/SE/Cries/DARUMAKA.ogg
deleted file mode 100644
index 4bfe608d4..000000000
Binary files a/Audio/SE/Cries/DARUMAKA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DECIDUEYE.ogg b/Audio/SE/Cries/DECIDUEYE.ogg
deleted file mode 100644
index a79c72769..000000000
Binary files a/Audio/SE/Cries/DECIDUEYE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DEDENNE.ogg b/Audio/SE/Cries/DEDENNE.ogg
deleted file mode 100644
index 2109c6990..000000000
Binary files a/Audio/SE/Cries/DEDENNE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DEERLING.ogg b/Audio/SE/Cries/DEERLING.ogg
deleted file mode 100644
index 008075ab4..000000000
Binary files a/Audio/SE/Cries/DEERLING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DEINO.mp3 b/Audio/SE/Cries/DEINO.mp3
new file mode 100644
index 000000000..4625dc987
Binary files /dev/null and b/Audio/SE/Cries/DEINO.mp3 differ
diff --git a/Audio/SE/Cries/DEINO.ogg b/Audio/SE/Cries/DEINO.ogg
deleted file mode 100644
index 6e2fc565c..000000000
Binary files a/Audio/SE/Cries/DEINO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DELCATTY.ogg b/Audio/SE/Cries/DELCATTY.ogg
deleted file mode 100644
index 0ce8f06ff..000000000
Binary files a/Audio/SE/Cries/DELCATTY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DELIBIRD.mp3 b/Audio/SE/Cries/DELIBIRD.mp3
new file mode 100644
index 000000000..82321cd17
Binary files /dev/null and b/Audio/SE/Cries/DELIBIRD.mp3 differ
diff --git a/Audio/SE/Cries/DELIBIRD.ogg b/Audio/SE/Cries/DELIBIRD.ogg
deleted file mode 100644
index 73d63c8ee..000000000
Binary files a/Audio/SE/Cries/DELIBIRD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DELPHOX.mp3 b/Audio/SE/Cries/DELPHOX.mp3
new file mode 100644
index 000000000..5c063eae5
Binary files /dev/null and b/Audio/SE/Cries/DELPHOX.mp3 differ
diff --git a/Audio/SE/Cries/DELPHOX.ogg b/Audio/SE/Cries/DELPHOX.ogg
deleted file mode 100644
index cd8231a5c..000000000
Binary files a/Audio/SE/Cries/DELPHOX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DEOXYS.mp3 b/Audio/SE/Cries/DEOXYS.mp3
new file mode 100644
index 000000000..e5eb09292
Binary files /dev/null and b/Audio/SE/Cries/DEOXYS.mp3 differ
diff --git a/Audio/SE/Cries/DEOXYS.ogg b/Audio/SE/Cries/DEOXYS.ogg
deleted file mode 100644
index 1d5a664c7..000000000
Binary files a/Audio/SE/Cries/DEOXYS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DEWGONG.mp3 b/Audio/SE/Cries/DEWGONG.mp3
new file mode 100644
index 000000000..479ae6474
Binary files /dev/null and b/Audio/SE/Cries/DEWGONG.mp3 differ
diff --git a/Audio/SE/Cries/DEWGONG.ogg b/Audio/SE/Cries/DEWGONG.ogg
deleted file mode 100644
index a27ffc450..000000000
Binary files a/Audio/SE/Cries/DEWGONG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DEWOTT.ogg b/Audio/SE/Cries/DEWOTT.ogg
deleted file mode 100644
index 79cf70068..000000000
Binary files a/Audio/SE/Cries/DEWOTT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DEWPIDER.ogg b/Audio/SE/Cries/DEWPIDER.ogg
deleted file mode 100644
index cdafbe2a6..000000000
Binary files a/Audio/SE/Cries/DEWPIDER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DHELMISE.mp3 b/Audio/SE/Cries/DHELMISE.mp3
new file mode 100644
index 000000000..ed6906802
Binary files /dev/null and b/Audio/SE/Cries/DHELMISE.mp3 differ
diff --git a/Audio/SE/Cries/DHELMISE.ogg b/Audio/SE/Cries/DHELMISE.ogg
deleted file mode 100644
index 7672b5f87..000000000
Binary files a/Audio/SE/Cries/DHELMISE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DIALGA.mp3 b/Audio/SE/Cries/DIALGA.mp3
new file mode 100644
index 000000000..7528729a4
Binary files /dev/null and b/Audio/SE/Cries/DIALGA.mp3 differ
diff --git a/Audio/SE/Cries/DIALGA.ogg b/Audio/SE/Cries/DIALGA.ogg
deleted file mode 100644
index cdb43c1f4..000000000
Binary files a/Audio/SE/Cries/DIALGA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DIANCIE.mp3 b/Audio/SE/Cries/DIANCIE.mp3
new file mode 100644
index 000000000..556f6660b
Binary files /dev/null and b/Audio/SE/Cries/DIANCIE.mp3 differ
diff --git a/Audio/SE/Cries/DIANCIE.ogg b/Audio/SE/Cries/DIANCIE.ogg
deleted file mode 100644
index 60cf1063e..000000000
Binary files a/Audio/SE/Cries/DIANCIE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DIANCIE_1.ogg b/Audio/SE/Cries/DIANCIE_1.ogg
deleted file mode 100644
index 71d0bd315..000000000
Binary files a/Audio/SE/Cries/DIANCIE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DIGGERSBY.ogg b/Audio/SE/Cries/DIGGERSBY.ogg
deleted file mode 100644
index e32a3b462..000000000
Binary files a/Audio/SE/Cries/DIGGERSBY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DIGLETT.mp3 b/Audio/SE/Cries/DIGLETT.mp3
new file mode 100644
index 000000000..6c856e653
Binary files /dev/null and b/Audio/SE/Cries/DIGLETT.mp3 differ
diff --git a/Audio/SE/Cries/DIGLETT.ogg b/Audio/SE/Cries/DIGLETT.ogg
deleted file mode 100644
index 27dea6122..000000000
Binary files a/Audio/SE/Cries/DIGLETT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DITTO.mp3 b/Audio/SE/Cries/DITTO.mp3
new file mode 100644
index 000000000..162d40fb5
Binary files /dev/null and b/Audio/SE/Cries/DITTO.mp3 differ
diff --git a/Audio/SE/Cries/DITTO.ogg b/Audio/SE/Cries/DITTO.ogg
deleted file mode 100644
index 713f61fe8..000000000
Binary files a/Audio/SE/Cries/DITTO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DODRIO.mp3 b/Audio/SE/Cries/DODRIO.mp3
new file mode 100644
index 000000000..ad4fc4fc1
Binary files /dev/null and b/Audio/SE/Cries/DODRIO.mp3 differ
diff --git a/Audio/SE/Cries/DODRIO.ogg b/Audio/SE/Cries/DODRIO.ogg
deleted file mode 100644
index 11c301364..000000000
Binary files a/Audio/SE/Cries/DODRIO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DODUO.mp3 b/Audio/SE/Cries/DODUO.mp3
new file mode 100644
index 000000000..a58fcb5e4
Binary files /dev/null and b/Audio/SE/Cries/DODUO.mp3 differ
diff --git a/Audio/SE/Cries/DODUO.ogg b/Audio/SE/Cries/DODUO.ogg
deleted file mode 100644
index aba6ba12a..000000000
Binary files a/Audio/SE/Cries/DODUO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DONPHAN.mp3 b/Audio/SE/Cries/DONPHAN.mp3
new file mode 100644
index 000000000..cdfcdbbef
Binary files /dev/null and b/Audio/SE/Cries/DONPHAN.mp3 differ
diff --git a/Audio/SE/Cries/DONPHAN.ogg b/Audio/SE/Cries/DONPHAN.ogg
deleted file mode 100644
index 85d87c0bf..000000000
Binary files a/Audio/SE/Cries/DONPHAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DOTTLER.ogg b/Audio/SE/Cries/DOTTLER.ogg
deleted file mode 100644
index 97f3bf4cb..000000000
Binary files a/Audio/SE/Cries/DOTTLER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DOUBLADE.mp3 b/Audio/SE/Cries/DOUBLADE.mp3
new file mode 100644
index 000000000..61217a0f5
Binary files /dev/null and b/Audio/SE/Cries/DOUBLADE.mp3 differ
diff --git a/Audio/SE/Cries/DOUBLADE.ogg b/Audio/SE/Cries/DOUBLADE.ogg
deleted file mode 100644
index 49ca3e278..000000000
Binary files a/Audio/SE/Cries/DOUBLADE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRACOVISH.ogg b/Audio/SE/Cries/DRACOVISH.ogg
deleted file mode 100644
index 4e8d2f8dd..000000000
Binary files a/Audio/SE/Cries/DRACOVISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRACOZOLT.ogg b/Audio/SE/Cries/DRACOZOLT.ogg
deleted file mode 100644
index f302dd3e4..000000000
Binary files a/Audio/SE/Cries/DRACOZOLT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRAGALGE.ogg b/Audio/SE/Cries/DRAGALGE.ogg
deleted file mode 100644
index b7e00ae59..000000000
Binary files a/Audio/SE/Cries/DRAGALGE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRAGAPULT.ogg b/Audio/SE/Cries/DRAGAPULT.ogg
deleted file mode 100644
index e66839b5d..000000000
Binary files a/Audio/SE/Cries/DRAGAPULT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRAGONAIR.mp3 b/Audio/SE/Cries/DRAGONAIR.mp3
new file mode 100644
index 000000000..292da2aad
Binary files /dev/null and b/Audio/SE/Cries/DRAGONAIR.mp3 differ
diff --git a/Audio/SE/Cries/DRAGONAIR.ogg b/Audio/SE/Cries/DRAGONAIR.ogg
deleted file mode 100644
index 27ed15a7a..000000000
Binary files a/Audio/SE/Cries/DRAGONAIR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRAGONITE.mp3 b/Audio/SE/Cries/DRAGONITE.mp3
new file mode 100644
index 000000000..864d66b22
Binary files /dev/null and b/Audio/SE/Cries/DRAGONITE.mp3 differ
diff --git a/Audio/SE/Cries/DRAGONITE.ogg b/Audio/SE/Cries/DRAGONITE.ogg
deleted file mode 100644
index e1b6f815e..000000000
Binary files a/Audio/SE/Cries/DRAGONITE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRAKLOAK.ogg b/Audio/SE/Cries/DRAKLOAK.ogg
deleted file mode 100644
index 112e9a7d0..000000000
Binary files a/Audio/SE/Cries/DRAKLOAK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRAMPA.ogg b/Audio/SE/Cries/DRAMPA.ogg
deleted file mode 100644
index 8683d619f..000000000
Binary files a/Audio/SE/Cries/DRAMPA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRAPION.ogg b/Audio/SE/Cries/DRAPION.ogg
deleted file mode 100644
index b6b9143ea..000000000
Binary files a/Audio/SE/Cries/DRAPION.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRATINI.mp3 b/Audio/SE/Cries/DRATINI.mp3
new file mode 100644
index 000000000..ac8bf69d0
Binary files /dev/null and b/Audio/SE/Cries/DRATINI.mp3 differ
diff --git a/Audio/SE/Cries/DRATINI.ogg b/Audio/SE/Cries/DRATINI.ogg
deleted file mode 100644
index c1530800b..000000000
Binary files a/Audio/SE/Cries/DRATINI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DREDNAW.ogg b/Audio/SE/Cries/DREDNAW.ogg
deleted file mode 100644
index 2ba634c9b..000000000
Binary files a/Audio/SE/Cries/DREDNAW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DREEPY.ogg b/Audio/SE/Cries/DREEPY.ogg
deleted file mode 100644
index 61ce9dcd1..000000000
Binary files a/Audio/SE/Cries/DREEPY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRIFBLIM.mp3 b/Audio/SE/Cries/DRIFBLIM.mp3
new file mode 100644
index 000000000..5a15cc1eb
Binary files /dev/null and b/Audio/SE/Cries/DRIFBLIM.mp3 differ
diff --git a/Audio/SE/Cries/DRIFBLIM.ogg b/Audio/SE/Cries/DRIFBLIM.ogg
deleted file mode 100644
index a92b31f33..000000000
Binary files a/Audio/SE/Cries/DRIFBLIM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRIFLOON.mp3 b/Audio/SE/Cries/DRIFLOON.mp3
new file mode 100644
index 000000000..45a62745b
Binary files /dev/null and b/Audio/SE/Cries/DRIFLOON.mp3 differ
diff --git a/Audio/SE/Cries/DRIFLOON.ogg b/Audio/SE/Cries/DRIFLOON.ogg
deleted file mode 100644
index e4543a687..000000000
Binary files a/Audio/SE/Cries/DRIFLOON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRILBUR.ogg b/Audio/SE/Cries/DRILBUR.ogg
deleted file mode 100644
index 1be3d91d3..000000000
Binary files a/Audio/SE/Cries/DRILBUR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRIZZILE.ogg b/Audio/SE/Cries/DRIZZILE.ogg
deleted file mode 100644
index d85840110..000000000
Binary files a/Audio/SE/Cries/DRIZZILE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DROWZEE.mp3 b/Audio/SE/Cries/DROWZEE.mp3
new file mode 100644
index 000000000..058a96af4
Binary files /dev/null and b/Audio/SE/Cries/DROWZEE.mp3 differ
diff --git a/Audio/SE/Cries/DROWZEE.ogg b/Audio/SE/Cries/DROWZEE.ogg
deleted file mode 100644
index 5e9b33803..000000000
Binary files a/Audio/SE/Cries/DROWZEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DRUDDIGON.ogg b/Audio/SE/Cries/DRUDDIGON.ogg
deleted file mode 100644
index 924df0626..000000000
Binary files a/Audio/SE/Cries/DRUDDIGON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DUBWOOL.ogg b/Audio/SE/Cries/DUBWOOL.ogg
deleted file mode 100644
index 4f66bdaaa..000000000
Binary files a/Audio/SE/Cries/DUBWOOL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DUCKLETT.ogg b/Audio/SE/Cries/DUCKLETT.ogg
deleted file mode 100644
index b31b544f2..000000000
Binary files a/Audio/SE/Cries/DUCKLETT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DUGTRIO.mp3 b/Audio/SE/Cries/DUGTRIO.mp3
new file mode 100644
index 000000000..5c96206e4
Binary files /dev/null and b/Audio/SE/Cries/DUGTRIO.mp3 differ
diff --git a/Audio/SE/Cries/DUGTRIO.ogg b/Audio/SE/Cries/DUGTRIO.ogg
deleted file mode 100644
index 260255024..000000000
Binary files a/Audio/SE/Cries/DUGTRIO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DUNSPARCE.mp3 b/Audio/SE/Cries/DUNSPARCE.mp3
new file mode 100644
index 000000000..9ffd8f9b7
Binary files /dev/null and b/Audio/SE/Cries/DUNSPARCE.mp3 differ
diff --git a/Audio/SE/Cries/DUNSPARCE.ogg b/Audio/SE/Cries/DUNSPARCE.ogg
deleted file mode 100644
index dd4e495b4..000000000
Binary files a/Audio/SE/Cries/DUNSPARCE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DUOSION.mp3 b/Audio/SE/Cries/DUOSION.mp3
new file mode 100644
index 000000000..5c1117084
Binary files /dev/null and b/Audio/SE/Cries/DUOSION.mp3 differ
diff --git a/Audio/SE/Cries/DUOSION.ogg b/Audio/SE/Cries/DUOSION.ogg
deleted file mode 100644
index bcccdc482..000000000
Binary files a/Audio/SE/Cries/DUOSION.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DURALUDON.ogg b/Audio/SE/Cries/DURALUDON.ogg
deleted file mode 100644
index 25d6cc3a0..000000000
Binary files a/Audio/SE/Cries/DURALUDON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DURANT.ogg b/Audio/SE/Cries/DURANT.ogg
deleted file mode 100644
index e57e84cf4..000000000
Binary files a/Audio/SE/Cries/DURANT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DUSCLOPS.mp3 b/Audio/SE/Cries/DUSCLOPS.mp3
new file mode 100644
index 000000000..3e6d559da
Binary files /dev/null and b/Audio/SE/Cries/DUSCLOPS.mp3 differ
diff --git a/Audio/SE/Cries/DUSCLOPS.ogg b/Audio/SE/Cries/DUSCLOPS.ogg
deleted file mode 100644
index 24a971d32..000000000
Binary files a/Audio/SE/Cries/DUSCLOPS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DUSKNOIR.mp3 b/Audio/SE/Cries/DUSKNOIR.mp3
new file mode 100644
index 000000000..13232b820
Binary files /dev/null and b/Audio/SE/Cries/DUSKNOIR.mp3 differ
diff --git a/Audio/SE/Cries/DUSKNOIR.ogg b/Audio/SE/Cries/DUSKNOIR.ogg
deleted file mode 100644
index 60573dd9e..000000000
Binary files a/Audio/SE/Cries/DUSKNOIR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DUSKULL.mp3 b/Audio/SE/Cries/DUSKULL.mp3
new file mode 100644
index 000000000..343b1c0f2
Binary files /dev/null and b/Audio/SE/Cries/DUSKULL.mp3 differ
diff --git a/Audio/SE/Cries/DUSKULL.ogg b/Audio/SE/Cries/DUSKULL.ogg
deleted file mode 100644
index 68c535b62..000000000
Binary files a/Audio/SE/Cries/DUSKULL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DUSTOX.ogg b/Audio/SE/Cries/DUSTOX.ogg
deleted file mode 100644
index dc6f6379c..000000000
Binary files a/Audio/SE/Cries/DUSTOX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/DWEBBLE.ogg b/Audio/SE/Cries/DWEBBLE.ogg
deleted file mode 100644
index 94255ebfc..000000000
Binary files a/Audio/SE/Cries/DWEBBLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EELEKTRIK.ogg b/Audio/SE/Cries/EELEKTRIK.ogg
deleted file mode 100644
index e44b11af2..000000000
Binary files a/Audio/SE/Cries/EELEKTRIK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EELEKTROSS.ogg b/Audio/SE/Cries/EELEKTROSS.ogg
deleted file mode 100644
index 9402c979b..000000000
Binary files a/Audio/SE/Cries/EELEKTROSS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EEVEE.mp3 b/Audio/SE/Cries/EEVEE.mp3
new file mode 100644
index 000000000..2466ced36
Binary files /dev/null and b/Audio/SE/Cries/EEVEE.mp3 differ
diff --git a/Audio/SE/Cries/EEVEE.ogg b/Audio/SE/Cries/EEVEE.ogg
deleted file mode 100644
index 4f8e95c9e..000000000
Binary files a/Audio/SE/Cries/EEVEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EEVEE.wav b/Audio/SE/Cries/EEVEE.wav
new file mode 100644
index 000000000..e0afb9df7
Binary files /dev/null and b/Audio/SE/Cries/EEVEE.wav differ
diff --git a/Audio/SE/Cries/EISCUE.ogg b/Audio/SE/Cries/EISCUE.ogg
deleted file mode 100644
index 4664723d2..000000000
Binary files a/Audio/SE/Cries/EISCUE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EISCUE_1.ogg b/Audio/SE/Cries/EISCUE_1.ogg
deleted file mode 100644
index 0ac30202f..000000000
Binary files a/Audio/SE/Cries/EISCUE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EKANS.mp3 b/Audio/SE/Cries/EKANS.mp3
new file mode 100644
index 000000000..7db0f9a92
Binary files /dev/null and b/Audio/SE/Cries/EKANS.mp3 differ
diff --git a/Audio/SE/Cries/EKANS.ogg b/Audio/SE/Cries/EKANS.ogg
deleted file mode 100644
index 45a558598..000000000
Binary files a/Audio/SE/Cries/EKANS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ELDEGOSS.ogg b/Audio/SE/Cries/ELDEGOSS.ogg
deleted file mode 100644
index 25d61c01b..000000000
Binary files a/Audio/SE/Cries/ELDEGOSS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ELECTABUZZ.mp3 b/Audio/SE/Cries/ELECTABUZZ.mp3
new file mode 100644
index 000000000..e5c729566
Binary files /dev/null and b/Audio/SE/Cries/ELECTABUZZ.mp3 differ
diff --git a/Audio/SE/Cries/ELECTABUZZ.ogg b/Audio/SE/Cries/ELECTABUZZ.ogg
deleted file mode 100644
index e2532c18d..000000000
Binary files a/Audio/SE/Cries/ELECTABUZZ.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ELECTIVIRE.mp3 b/Audio/SE/Cries/ELECTIVIRE.mp3
new file mode 100644
index 000000000..c3f0876f9
Binary files /dev/null and b/Audio/SE/Cries/ELECTIVIRE.mp3 differ
diff --git a/Audio/SE/Cries/ELECTIVIRE.ogg b/Audio/SE/Cries/ELECTIVIRE.ogg
deleted file mode 100644
index 625a5c8f7..000000000
Binary files a/Audio/SE/Cries/ELECTIVIRE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ELECTRIKE.ogg b/Audio/SE/Cries/ELECTRIKE.ogg
deleted file mode 100644
index c44f4649e..000000000
Binary files a/Audio/SE/Cries/ELECTRIKE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ELECTRODE.mp3 b/Audio/SE/Cries/ELECTRODE.mp3
new file mode 100644
index 000000000..7de4c3b96
Binary files /dev/null and b/Audio/SE/Cries/ELECTRODE.mp3 differ
diff --git a/Audio/SE/Cries/ELECTRODE.ogg b/Audio/SE/Cries/ELECTRODE.ogg
deleted file mode 100644
index 957695d05..000000000
Binary files a/Audio/SE/Cries/ELECTRODE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ELEKID.mp3 b/Audio/SE/Cries/ELEKID.mp3
new file mode 100644
index 000000000..e3c45a8c2
Binary files /dev/null and b/Audio/SE/Cries/ELEKID.mp3 differ
diff --git a/Audio/SE/Cries/ELEKID.ogg b/Audio/SE/Cries/ELEKID.ogg
deleted file mode 100644
index 494925206..000000000
Binary files a/Audio/SE/Cries/ELEKID.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ELGYEM.ogg b/Audio/SE/Cries/ELGYEM.ogg
deleted file mode 100644
index fd802e175..000000000
Binary files a/Audio/SE/Cries/ELGYEM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EMBOAR.ogg b/Audio/SE/Cries/EMBOAR.ogg
deleted file mode 100644
index ea95dfe8e..000000000
Binary files a/Audio/SE/Cries/EMBOAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EMOLGA.ogg b/Audio/SE/Cries/EMOLGA.ogg
deleted file mode 100644
index 8c7ac328b..000000000
Binary files a/Audio/SE/Cries/EMOLGA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EMPOLEON.mp3 b/Audio/SE/Cries/EMPOLEON.mp3
new file mode 100644
index 000000000..8f07cee87
Binary files /dev/null and b/Audio/SE/Cries/EMPOLEON.mp3 differ
diff --git a/Audio/SE/Cries/EMPOLEON.ogg b/Audio/SE/Cries/EMPOLEON.ogg
deleted file mode 100644
index 2950f5959..000000000
Binary files a/Audio/SE/Cries/EMPOLEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ENTEI.mp3 b/Audio/SE/Cries/ENTEI.mp3
new file mode 100644
index 000000000..fa6a3dd9d
Binary files /dev/null and b/Audio/SE/Cries/ENTEI.mp3 differ
diff --git a/Audio/SE/Cries/ENTEI.ogg b/Audio/SE/Cries/ENTEI.ogg
deleted file mode 100644
index fb4587cdc..000000000
Binary files a/Audio/SE/Cries/ENTEI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ESCAVALIER.ogg b/Audio/SE/Cries/ESCAVALIER.ogg
deleted file mode 100644
index 2300896ee..000000000
Binary files a/Audio/SE/Cries/ESCAVALIER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ESPEON.mp3 b/Audio/SE/Cries/ESPEON.mp3
new file mode 100644
index 000000000..8a4341aef
Binary files /dev/null and b/Audio/SE/Cries/ESPEON.mp3 differ
diff --git a/Audio/SE/Cries/ESPEON.ogg b/Audio/SE/Cries/ESPEON.ogg
deleted file mode 100644
index ffeadf164..000000000
Binary files a/Audio/SE/Cries/ESPEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ESPURR.ogg b/Audio/SE/Cries/ESPURR.ogg
deleted file mode 100644
index e434ef219..000000000
Binary files a/Audio/SE/Cries/ESPURR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ETERNATUS.ogg b/Audio/SE/Cries/ETERNATUS.ogg
deleted file mode 100644
index 234c71b0b..000000000
Binary files a/Audio/SE/Cries/ETERNATUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EXCADRILL.ogg b/Audio/SE/Cries/EXCADRILL.ogg
deleted file mode 100644
index a6a884160..000000000
Binary files a/Audio/SE/Cries/EXCADRILL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EXEGGCUTE.mp3 b/Audio/SE/Cries/EXEGGCUTE.mp3
new file mode 100644
index 000000000..018fc10bb
Binary files /dev/null and b/Audio/SE/Cries/EXEGGCUTE.mp3 differ
diff --git a/Audio/SE/Cries/EXEGGCUTE.ogg b/Audio/SE/Cries/EXEGGCUTE.ogg
deleted file mode 100644
index 8f8308c83..000000000
Binary files a/Audio/SE/Cries/EXEGGCUTE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EXEGGUTOR.mp3 b/Audio/SE/Cries/EXEGGUTOR.mp3
new file mode 100644
index 000000000..a2b459ac2
Binary files /dev/null and b/Audio/SE/Cries/EXEGGUTOR.mp3 differ
diff --git a/Audio/SE/Cries/EXEGGUTOR.ogg b/Audio/SE/Cries/EXEGGUTOR.ogg
deleted file mode 100644
index 4324e86ce..000000000
Binary files a/Audio/SE/Cries/EXEGGUTOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/EXPLOUD.ogg b/Audio/SE/Cries/EXPLOUD.ogg
deleted file mode 100644
index d0df79539..000000000
Binary files a/Audio/SE/Cries/EXPLOUD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FALINKS.ogg b/Audio/SE/Cries/FALINKS.ogg
deleted file mode 100644
index 048e5ceb9..000000000
Binary files a/Audio/SE/Cries/FALINKS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FARFETCHD.mp3 b/Audio/SE/Cries/FARFETCHD.mp3
new file mode 100644
index 000000000..efde8f5de
Binary files /dev/null and b/Audio/SE/Cries/FARFETCHD.mp3 differ
diff --git a/Audio/SE/Cries/FARFETCHD.ogg b/Audio/SE/Cries/FARFETCHD.ogg
deleted file mode 100644
index 4de84af86..000000000
Binary files a/Audio/SE/Cries/FARFETCHD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FEAROW.mp3 b/Audio/SE/Cries/FEAROW.mp3
new file mode 100644
index 000000000..99fc750dd
Binary files /dev/null and b/Audio/SE/Cries/FEAROW.mp3 differ
diff --git a/Audio/SE/Cries/FEAROW.ogg b/Audio/SE/Cries/FEAROW.ogg
deleted file mode 100644
index 3d3eca5a1..000000000
Binary files a/Audio/SE/Cries/FEAROW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FEEBAS.mp3 b/Audio/SE/Cries/FEEBAS.mp3
new file mode 100644
index 000000000..87bc37a1d
Binary files /dev/null and b/Audio/SE/Cries/FEEBAS.mp3 differ
diff --git a/Audio/SE/Cries/FEEBAS.ogg b/Audio/SE/Cries/FEEBAS.ogg
deleted file mode 100644
index 1bffeed63..000000000
Binary files a/Audio/SE/Cries/FEEBAS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FENNEKIN.mp3 b/Audio/SE/Cries/FENNEKIN.mp3
new file mode 100644
index 000000000..788cd5c65
Binary files /dev/null and b/Audio/SE/Cries/FENNEKIN.mp3 differ
diff --git a/Audio/SE/Cries/FENNEKIN.ogg b/Audio/SE/Cries/FENNEKIN.ogg
deleted file mode 100644
index 9d51c421b..000000000
Binary files a/Audio/SE/Cries/FENNEKIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FERALIGATR.mp3 b/Audio/SE/Cries/FERALIGATR.mp3
new file mode 100644
index 000000000..b845c810e
Binary files /dev/null and b/Audio/SE/Cries/FERALIGATR.mp3 differ
diff --git a/Audio/SE/Cries/FERALIGATR.ogg b/Audio/SE/Cries/FERALIGATR.ogg
deleted file mode 100644
index 568a8f4f3..000000000
Binary files a/Audio/SE/Cries/FERALIGATR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FERROSEED.mp3 b/Audio/SE/Cries/FERROSEED.mp3
new file mode 100644
index 000000000..fda160894
Binary files /dev/null and b/Audio/SE/Cries/FERROSEED.mp3 differ
diff --git a/Audio/SE/Cries/FERROSEED.ogg b/Audio/SE/Cries/FERROSEED.ogg
deleted file mode 100644
index 667360ad0..000000000
Binary files a/Audio/SE/Cries/FERROSEED.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FERROTHORN.mp3 b/Audio/SE/Cries/FERROTHORN.mp3
new file mode 100644
index 000000000..1c822aaaa
Binary files /dev/null and b/Audio/SE/Cries/FERROTHORN.mp3 differ
diff --git a/Audio/SE/Cries/FERROTHORN.ogg b/Audio/SE/Cries/FERROTHORN.ogg
deleted file mode 100644
index e4c21c198..000000000
Binary files a/Audio/SE/Cries/FERROTHORN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FINNEON.ogg b/Audio/SE/Cries/FINNEON.ogg
deleted file mode 100644
index 881cb60d0..000000000
Binary files a/Audio/SE/Cries/FINNEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLAAFFY.mp3 b/Audio/SE/Cries/FLAAFFY.mp3
new file mode 100644
index 000000000..2b7cb2ec5
Binary files /dev/null and b/Audio/SE/Cries/FLAAFFY.mp3 differ
diff --git a/Audio/SE/Cries/FLAAFFY.ogg b/Audio/SE/Cries/FLAAFFY.ogg
deleted file mode 100644
index d91c737df..000000000
Binary files a/Audio/SE/Cries/FLAAFFY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLABEBE.ogg b/Audio/SE/Cries/FLABEBE.ogg
deleted file mode 100644
index d7c78a6aa..000000000
Binary files a/Audio/SE/Cries/FLABEBE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLAPPLE.ogg b/Audio/SE/Cries/FLAPPLE.ogg
deleted file mode 100644
index 3c9329314..000000000
Binary files a/Audio/SE/Cries/FLAPPLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLAREON.mp3 b/Audio/SE/Cries/FLAREON.mp3
new file mode 100644
index 000000000..f9697d605
Binary files /dev/null and b/Audio/SE/Cries/FLAREON.mp3 differ
diff --git a/Audio/SE/Cries/FLAREON.ogg b/Audio/SE/Cries/FLAREON.ogg
deleted file mode 100644
index 08cf9b996..000000000
Binary files a/Audio/SE/Cries/FLAREON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLETCHINDER.mp3 b/Audio/SE/Cries/FLETCHINDER.mp3
new file mode 100644
index 000000000..e3b9ef559
Binary files /dev/null and b/Audio/SE/Cries/FLETCHINDER.mp3 differ
diff --git a/Audio/SE/Cries/FLETCHINDER.ogg b/Audio/SE/Cries/FLETCHINDER.ogg
deleted file mode 100644
index 67176ff8c..000000000
Binary files a/Audio/SE/Cries/FLETCHINDER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLETCHLING.mp3 b/Audio/SE/Cries/FLETCHLING.mp3
new file mode 100644
index 000000000..fbbedda8b
Binary files /dev/null and b/Audio/SE/Cries/FLETCHLING.mp3 differ
diff --git a/Audio/SE/Cries/FLETCHLING.ogg b/Audio/SE/Cries/FLETCHLING.ogg
deleted file mode 100644
index 66cd919c4..000000000
Binary files a/Audio/SE/Cries/FLETCHLING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLOATZEL.ogg b/Audio/SE/Cries/FLOATZEL.ogg
deleted file mode 100644
index bf983916d..000000000
Binary files a/Audio/SE/Cries/FLOATZEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLOETTE.ogg b/Audio/SE/Cries/FLOETTE.ogg
deleted file mode 100644
index 7f8093f0e..000000000
Binary files a/Audio/SE/Cries/FLOETTE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLOETTE_5.ogg b/Audio/SE/Cries/FLOETTE_5.ogg
deleted file mode 100644
index 7abf39279..000000000
Binary files a/Audio/SE/Cries/FLOETTE_5.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLORGES.ogg b/Audio/SE/Cries/FLORGES.ogg
deleted file mode 100644
index 6116f6ee9..000000000
Binary files a/Audio/SE/Cries/FLORGES.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FLYGON.mp3 b/Audio/SE/Cries/FLYGON.mp3
new file mode 100644
index 000000000..0dc0ab64a
Binary files /dev/null and b/Audio/SE/Cries/FLYGON.mp3 differ
diff --git a/Audio/SE/Cries/FLYGON.ogg b/Audio/SE/Cries/FLYGON.ogg
deleted file mode 100644
index fe661bab5..000000000
Binary files a/Audio/SE/Cries/FLYGON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FOMANTIS.mp3 b/Audio/SE/Cries/FOMANTIS.mp3
new file mode 100644
index 000000000..ff00b1582
Binary files /dev/null and b/Audio/SE/Cries/FOMANTIS.mp3 differ
diff --git a/Audio/SE/Cries/FOMANTIS.ogg b/Audio/SE/Cries/FOMANTIS.ogg
deleted file mode 100644
index b5a42f74e..000000000
Binary files a/Audio/SE/Cries/FOMANTIS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FOONGUS.ogg b/Audio/SE/Cries/FOONGUS.ogg
deleted file mode 100644
index fd3c006f6..000000000
Binary files a/Audio/SE/Cries/FOONGUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FORRETRESS.mp3 b/Audio/SE/Cries/FORRETRESS.mp3
new file mode 100644
index 000000000..576473747
Binary files /dev/null and b/Audio/SE/Cries/FORRETRESS.mp3 differ
diff --git a/Audio/SE/Cries/FORRETRESS.ogg b/Audio/SE/Cries/FORRETRESS.ogg
deleted file mode 100644
index eb99081fb..000000000
Binary files a/Audio/SE/Cries/FORRETRESS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FRAXURE.mp3 b/Audio/SE/Cries/FRAXURE.mp3
new file mode 100644
index 000000000..720d31453
Binary files /dev/null and b/Audio/SE/Cries/FRAXURE.mp3 differ
diff --git a/Audio/SE/Cries/FRAXURE.ogg b/Audio/SE/Cries/FRAXURE.ogg
deleted file mode 100644
index 8c2e5c0bb..000000000
Binary files a/Audio/SE/Cries/FRAXURE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FRILLISH.ogg b/Audio/SE/Cries/FRILLISH.ogg
deleted file mode 100644
index 575f7743a..000000000
Binary files a/Audio/SE/Cries/FRILLISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FROAKIE.mp3 b/Audio/SE/Cries/FROAKIE.mp3
new file mode 100644
index 000000000..ec203c504
Binary files /dev/null and b/Audio/SE/Cries/FROAKIE.mp3 differ
diff --git a/Audio/SE/Cries/FROAKIE.ogg b/Audio/SE/Cries/FROAKIE.ogg
deleted file mode 100644
index 5054b9bbc..000000000
Binary files a/Audio/SE/Cries/FROAKIE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FROGADIER.mp3 b/Audio/SE/Cries/FROGADIER.mp3
new file mode 100644
index 000000000..326b71a54
Binary files /dev/null and b/Audio/SE/Cries/FROGADIER.mp3 differ
diff --git a/Audio/SE/Cries/FROGADIER.ogg b/Audio/SE/Cries/FROGADIER.ogg
deleted file mode 100644
index 0f1b9e519..000000000
Binary files a/Audio/SE/Cries/FROGADIER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FROSLASS.mp3 b/Audio/SE/Cries/FROSLASS.mp3
new file mode 100644
index 000000000..be4d0c91d
Binary files /dev/null and b/Audio/SE/Cries/FROSLASS.mp3 differ
diff --git a/Audio/SE/Cries/FROSLASS.ogg b/Audio/SE/Cries/FROSLASS.ogg
deleted file mode 100644
index 93a6c8b5f..000000000
Binary files a/Audio/SE/Cries/FROSLASS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FROSMOTH.ogg b/Audio/SE/Cries/FROSMOTH.ogg
deleted file mode 100644
index 69cb2b817..000000000
Binary files a/Audio/SE/Cries/FROSMOTH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FURFROU.ogg b/Audio/SE/Cries/FURFROU.ogg
deleted file mode 100644
index 742ff1d96..000000000
Binary files a/Audio/SE/Cries/FURFROU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/FURRET.mp3 b/Audio/SE/Cries/FURRET.mp3
new file mode 100644
index 000000000..2bf18dce3
Binary files /dev/null and b/Audio/SE/Cries/FURRET.mp3 differ
diff --git a/Audio/SE/Cries/FURRET.ogg b/Audio/SE/Cries/FURRET.ogg
deleted file mode 100644
index d8ca2353d..000000000
Binary files a/Audio/SE/Cries/FURRET.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GABITE.mp3 b/Audio/SE/Cries/GABITE.mp3
new file mode 100644
index 000000000..375870819
Binary files /dev/null and b/Audio/SE/Cries/GABITE.mp3 differ
diff --git a/Audio/SE/Cries/GABITE.ogg b/Audio/SE/Cries/GABITE.ogg
deleted file mode 100644
index e1ee393d1..000000000
Binary files a/Audio/SE/Cries/GABITE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GALLADE.mp3 b/Audio/SE/Cries/GALLADE.mp3
new file mode 100644
index 000000000..ddbafa1a6
Binary files /dev/null and b/Audio/SE/Cries/GALLADE.mp3 differ
diff --git a/Audio/SE/Cries/GALLADE.ogg b/Audio/SE/Cries/GALLADE.ogg
deleted file mode 100644
index 908a80818..000000000
Binary files a/Audio/SE/Cries/GALLADE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GALLADE_1.ogg b/Audio/SE/Cries/GALLADE_1.ogg
deleted file mode 100644
index f71447d63..000000000
Binary files a/Audio/SE/Cries/GALLADE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GALVANTULA.mp3 b/Audio/SE/Cries/GALVANTULA.mp3
new file mode 100644
index 000000000..9009c5dbc
Binary files /dev/null and b/Audio/SE/Cries/GALVANTULA.mp3 differ
diff --git a/Audio/SE/Cries/GALVANTULA.ogg b/Audio/SE/Cries/GALVANTULA.ogg
deleted file mode 100644
index f1346d521..000000000
Binary files a/Audio/SE/Cries/GALVANTULA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GARBODOR.mp3 b/Audio/SE/Cries/GARBODOR.mp3
new file mode 100644
index 000000000..049336715
Binary files /dev/null and b/Audio/SE/Cries/GARBODOR.mp3 differ
diff --git a/Audio/SE/Cries/GARBODOR.ogg b/Audio/SE/Cries/GARBODOR.ogg
deleted file mode 100644
index 61d212a58..000000000
Binary files a/Audio/SE/Cries/GARBODOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GARCHOMP.mp3 b/Audio/SE/Cries/GARCHOMP.mp3
new file mode 100644
index 000000000..fa1fbc09c
Binary files /dev/null and b/Audio/SE/Cries/GARCHOMP.mp3 differ
diff --git a/Audio/SE/Cries/GARCHOMP.ogg b/Audio/SE/Cries/GARCHOMP.ogg
deleted file mode 100644
index 55af3c8ca..000000000
Binary files a/Audio/SE/Cries/GARCHOMP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GARCHOMP_1.ogg b/Audio/SE/Cries/GARCHOMP_1.ogg
deleted file mode 100644
index 558f48be2..000000000
Binary files a/Audio/SE/Cries/GARCHOMP_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GARDEVOIR.mp3 b/Audio/SE/Cries/GARDEVOIR.mp3
new file mode 100644
index 000000000..1da3ed1f7
Binary files /dev/null and b/Audio/SE/Cries/GARDEVOIR.mp3 differ
diff --git a/Audio/SE/Cries/GARDEVOIR.ogg b/Audio/SE/Cries/GARDEVOIR.ogg
deleted file mode 100644
index 1aa7ed6f2..000000000
Binary files a/Audio/SE/Cries/GARDEVOIR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GARDEVOIR_1.ogg b/Audio/SE/Cries/GARDEVOIR_1.ogg
deleted file mode 100644
index e034700b4..000000000
Binary files a/Audio/SE/Cries/GARDEVOIR_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GASTLY.mp3 b/Audio/SE/Cries/GASTLY.mp3
new file mode 100644
index 000000000..fe51f2508
Binary files /dev/null and b/Audio/SE/Cries/GASTLY.mp3 differ
diff --git a/Audio/SE/Cries/GASTLY.ogg b/Audio/SE/Cries/GASTLY.ogg
deleted file mode 100644
index 503cb41d4..000000000
Binary files a/Audio/SE/Cries/GASTLY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GASTRODON.ogg b/Audio/SE/Cries/GASTRODON.ogg
deleted file mode 100644
index 9b6c6982c..000000000
Binary files a/Audio/SE/Cries/GASTRODON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GENESECT.mp3 b/Audio/SE/Cries/GENESECT.mp3
new file mode 100644
index 000000000..681af8bd7
Binary files /dev/null and b/Audio/SE/Cries/GENESECT.mp3 differ
diff --git a/Audio/SE/Cries/GENESECT.ogg b/Audio/SE/Cries/GENESECT.ogg
deleted file mode 100644
index 29ff92eb9..000000000
Binary files a/Audio/SE/Cries/GENESECT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GENGAR.ogg b/Audio/SE/Cries/GENGAR.ogg
deleted file mode 100644
index 92515d5cb..000000000
Binary files a/Audio/SE/Cries/GENGAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GENGAR_1.ogg b/Audio/SE/Cries/GENGAR_1.ogg
deleted file mode 100644
index f08ba2192..000000000
Binary files a/Audio/SE/Cries/GENGAR_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GEODUDE.mp3 b/Audio/SE/Cries/GEODUDE.mp3
new file mode 100644
index 000000000..9e76ba902
Binary files /dev/null and b/Audio/SE/Cries/GEODUDE.mp3 differ
diff --git a/Audio/SE/Cries/GEODUDE.ogg b/Audio/SE/Cries/GEODUDE.ogg
deleted file mode 100644
index 5333d5ac5..000000000
Binary files a/Audio/SE/Cries/GEODUDE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GIBLE.mp3 b/Audio/SE/Cries/GIBLE.mp3
new file mode 100644
index 000000000..e3fe91a3d
Binary files /dev/null and b/Audio/SE/Cries/GIBLE.mp3 differ
diff --git a/Audio/SE/Cries/GIBLE.ogg b/Audio/SE/Cries/GIBLE.ogg
deleted file mode 100644
index fa62b8b62..000000000
Binary files a/Audio/SE/Cries/GIBLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GIGALITH.ogg b/Audio/SE/Cries/GIGALITH.ogg
deleted file mode 100644
index aa573d653..000000000
Binary files a/Audio/SE/Cries/GIGALITH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GIRAFARIG.mp3 b/Audio/SE/Cries/GIRAFARIG.mp3
new file mode 100644
index 000000000..84b265c35
Binary files /dev/null and b/Audio/SE/Cries/GIRAFARIG.mp3 differ
diff --git a/Audio/SE/Cries/GIRAFARIG.ogg b/Audio/SE/Cries/GIRAFARIG.ogg
deleted file mode 100644
index a52a74115..000000000
Binary files a/Audio/SE/Cries/GIRAFARIG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GIRATINA.mp3 b/Audio/SE/Cries/GIRATINA.mp3
new file mode 100644
index 000000000..c26e82b74
Binary files /dev/null and b/Audio/SE/Cries/GIRATINA.mp3 differ
diff --git a/Audio/SE/Cries/GIRATINA.ogg b/Audio/SE/Cries/GIRATINA.ogg
deleted file mode 100644
index cb93fe9bd..000000000
Binary files a/Audio/SE/Cries/GIRATINA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GLACEON.mp3 b/Audio/SE/Cries/GLACEON.mp3
new file mode 100644
index 000000000..64e0963cc
Binary files /dev/null and b/Audio/SE/Cries/GLACEON.mp3 differ
diff --git a/Audio/SE/Cries/GLACEON.ogg b/Audio/SE/Cries/GLACEON.ogg
deleted file mode 100644
index f3d106a0c..000000000
Binary files a/Audio/SE/Cries/GLACEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GLALIE.mp3 b/Audio/SE/Cries/GLALIE.mp3
new file mode 100644
index 000000000..0ec1ddefc
Binary files /dev/null and b/Audio/SE/Cries/GLALIE.mp3 differ
diff --git a/Audio/SE/Cries/GLALIE.ogg b/Audio/SE/Cries/GLALIE.ogg
deleted file mode 100644
index e6d2e3b30..000000000
Binary files a/Audio/SE/Cries/GLALIE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GLALIE_1.ogg b/Audio/SE/Cries/GLALIE_1.ogg
deleted file mode 100644
index 15ea0e117..000000000
Binary files a/Audio/SE/Cries/GLALIE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GLAMEOW.ogg b/Audio/SE/Cries/GLAMEOW.ogg
deleted file mode 100644
index f369e28c5..000000000
Binary files a/Audio/SE/Cries/GLAMEOW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GLASTRIER.ogg b/Audio/SE/Cries/GLASTRIER.ogg
deleted file mode 100644
index 3f5ac6b6e..000000000
Binary files a/Audio/SE/Cries/GLASTRIER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GLIGAR.mp3 b/Audio/SE/Cries/GLIGAR.mp3
new file mode 100644
index 000000000..d2374b48f
Binary files /dev/null and b/Audio/SE/Cries/GLIGAR.mp3 differ
diff --git a/Audio/SE/Cries/GLIGAR.ogg b/Audio/SE/Cries/GLIGAR.ogg
deleted file mode 100644
index e27c54e6a..000000000
Binary files a/Audio/SE/Cries/GLIGAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GLISCOR.mp3 b/Audio/SE/Cries/GLISCOR.mp3
new file mode 100644
index 000000000..7c4d545c1
Binary files /dev/null and b/Audio/SE/Cries/GLISCOR.mp3 differ
diff --git a/Audio/SE/Cries/GLISCOR.ogg b/Audio/SE/Cries/GLISCOR.ogg
deleted file mode 100644
index a602d1cbe..000000000
Binary files a/Audio/SE/Cries/GLISCOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GLOOM.mp3 b/Audio/SE/Cries/GLOOM.mp3
new file mode 100644
index 000000000..4d02c2d7d
Binary files /dev/null and b/Audio/SE/Cries/GLOOM.mp3 differ
diff --git a/Audio/SE/Cries/GLOOM.ogg b/Audio/SE/Cries/GLOOM.ogg
deleted file mode 100644
index 1cff3a936..000000000
Binary files a/Audio/SE/Cries/GLOOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GLOOM.wav b/Audio/SE/Cries/GLOOM.wav
new file mode 100644
index 000000000..1e443e2bd
Binary files /dev/null and b/Audio/SE/Cries/GLOOM.wav differ
diff --git a/Audio/SE/Cries/GOGOAT.ogg b/Audio/SE/Cries/GOGOAT.ogg
deleted file mode 100644
index 63f76158f..000000000
Binary files a/Audio/SE/Cries/GOGOAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOLBAT.mp3 b/Audio/SE/Cries/GOLBAT.mp3
new file mode 100644
index 000000000..2ebccf5ee
Binary files /dev/null and b/Audio/SE/Cries/GOLBAT.mp3 differ
diff --git a/Audio/SE/Cries/GOLBAT.ogg b/Audio/SE/Cries/GOLBAT.ogg
deleted file mode 100644
index ef3b346c4..000000000
Binary files a/Audio/SE/Cries/GOLBAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOLDEEN.mp3 b/Audio/SE/Cries/GOLDEEN.mp3
new file mode 100644
index 000000000..ef52d83b1
Binary files /dev/null and b/Audio/SE/Cries/GOLDEEN.mp3 differ
diff --git a/Audio/SE/Cries/GOLDEEN.ogg b/Audio/SE/Cries/GOLDEEN.ogg
deleted file mode 100644
index 4a098052d..000000000
Binary files a/Audio/SE/Cries/GOLDEEN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOLDUCK.mp3 b/Audio/SE/Cries/GOLDUCK.mp3
new file mode 100644
index 000000000..48e5b8f06
Binary files /dev/null and b/Audio/SE/Cries/GOLDUCK.mp3 differ
diff --git a/Audio/SE/Cries/GOLDUCK.ogg b/Audio/SE/Cries/GOLDUCK.ogg
deleted file mode 100644
index b932f44e6..000000000
Binary files a/Audio/SE/Cries/GOLDUCK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOLEM.mp3 b/Audio/SE/Cries/GOLEM.mp3
new file mode 100644
index 000000000..57d836edc
Binary files /dev/null and b/Audio/SE/Cries/GOLEM.mp3 differ
diff --git a/Audio/SE/Cries/GOLEM.ogg b/Audio/SE/Cries/GOLEM.ogg
deleted file mode 100644
index 4e0f1911d..000000000
Binary files a/Audio/SE/Cries/GOLEM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOLETT.mp3 b/Audio/SE/Cries/GOLETT.mp3
new file mode 100644
index 000000000..a6f73f9d6
Binary files /dev/null and b/Audio/SE/Cries/GOLETT.mp3 differ
diff --git a/Audio/SE/Cries/GOLETT.ogg b/Audio/SE/Cries/GOLETT.ogg
deleted file mode 100644
index 7c85f2140..000000000
Binary files a/Audio/SE/Cries/GOLETT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOLISOPOD.mp3 b/Audio/SE/Cries/GOLISOPOD.mp3
new file mode 100644
index 000000000..675bdca14
Binary files /dev/null and b/Audio/SE/Cries/GOLISOPOD.mp3 differ
diff --git a/Audio/SE/Cries/GOLISOPOD.ogg b/Audio/SE/Cries/GOLISOPOD.ogg
deleted file mode 100644
index 8930e3f88..000000000
Binary files a/Audio/SE/Cries/GOLISOPOD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOLURK.mp3 b/Audio/SE/Cries/GOLURK.mp3
new file mode 100644
index 000000000..310dc152f
Binary files /dev/null and b/Audio/SE/Cries/GOLURK.mp3 differ
diff --git a/Audio/SE/Cries/GOLURK.ogg b/Audio/SE/Cries/GOLURK.ogg
deleted file mode 100644
index 41a2d8e2a..000000000
Binary files a/Audio/SE/Cries/GOLURK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOODRA.mp3 b/Audio/SE/Cries/GOODRA.mp3
new file mode 100644
index 000000000..41d911919
Binary files /dev/null and b/Audio/SE/Cries/GOODRA.mp3 differ
diff --git a/Audio/SE/Cries/GOODRA.ogg b/Audio/SE/Cries/GOODRA.ogg
deleted file mode 100644
index 0a6da81be..000000000
Binary files a/Audio/SE/Cries/GOODRA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOOMY.mp3 b/Audio/SE/Cries/GOOMY.mp3
new file mode 100644
index 000000000..52819e1c2
Binary files /dev/null and b/Audio/SE/Cries/GOOMY.mp3 differ
diff --git a/Audio/SE/Cries/GOOMY.ogg b/Audio/SE/Cries/GOOMY.ogg
deleted file mode 100644
index dd3084faf..000000000
Binary files a/Audio/SE/Cries/GOOMY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOREBYSS.ogg b/Audio/SE/Cries/GOREBYSS.ogg
deleted file mode 100644
index af7bce082..000000000
Binary files a/Audio/SE/Cries/GOREBYSS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOSSIFLEUR.ogg b/Audio/SE/Cries/GOSSIFLEUR.ogg
deleted file mode 100644
index 2e9b2618c..000000000
Binary files a/Audio/SE/Cries/GOSSIFLEUR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOTHITA.ogg b/Audio/SE/Cries/GOTHITA.ogg
deleted file mode 100644
index 542eef758..000000000
Binary files a/Audio/SE/Cries/GOTHITA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOTHITELLE.ogg b/Audio/SE/Cries/GOTHITELLE.ogg
deleted file mode 100644
index c27666090..000000000
Binary files a/Audio/SE/Cries/GOTHITELLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOTHORITA.ogg b/Audio/SE/Cries/GOTHORITA.ogg
deleted file mode 100644
index a4c4843d8..000000000
Binary files a/Audio/SE/Cries/GOTHORITA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOURGEIST.mp3 b/Audio/SE/Cries/GOURGEIST.mp3
new file mode 100644
index 000000000..cc92513d4
Binary files /dev/null and b/Audio/SE/Cries/GOURGEIST.mp3 differ
diff --git a/Audio/SE/Cries/GOURGEIST.ogg b/Audio/SE/Cries/GOURGEIST.ogg
deleted file mode 100644
index 56f0c7502..000000000
Binary files a/Audio/SE/Cries/GOURGEIST.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GOURGEIST_3.ogg b/Audio/SE/Cries/GOURGEIST_3.ogg
deleted file mode 100644
index 9625836ef..000000000
Binary files a/Audio/SE/Cries/GOURGEIST_3.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GRANBULL.mp3 b/Audio/SE/Cries/GRANBULL.mp3
new file mode 100644
index 000000000..3b94e5003
Binary files /dev/null and b/Audio/SE/Cries/GRANBULL.mp3 differ
diff --git a/Audio/SE/Cries/GRANBULL.ogg b/Audio/SE/Cries/GRANBULL.ogg
deleted file mode 100644
index 69a773775..000000000
Binary files a/Audio/SE/Cries/GRANBULL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GRAPPLOCT.ogg b/Audio/SE/Cries/GRAPPLOCT.ogg
deleted file mode 100644
index 7f90bb538..000000000
Binary files a/Audio/SE/Cries/GRAPPLOCT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GRAVELER.mp3 b/Audio/SE/Cries/GRAVELER.mp3
new file mode 100644
index 000000000..7ab3dd7b3
Binary files /dev/null and b/Audio/SE/Cries/GRAVELER.mp3 differ
diff --git a/Audio/SE/Cries/GRAVELER.ogg b/Audio/SE/Cries/GRAVELER.ogg
deleted file mode 100644
index a7c4bf1e0..000000000
Binary files a/Audio/SE/Cries/GRAVELER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GREEDENT.ogg b/Audio/SE/Cries/GREEDENT.ogg
deleted file mode 100644
index 051a006f4..000000000
Binary files a/Audio/SE/Cries/GREEDENT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GRENINJA.mp3 b/Audio/SE/Cries/GRENINJA.mp3
new file mode 100644
index 000000000..1afafe01d
Binary files /dev/null and b/Audio/SE/Cries/GRENINJA.mp3 differ
diff --git a/Audio/SE/Cries/GRENINJA.ogg b/Audio/SE/Cries/GRENINJA.ogg
deleted file mode 100644
index 8ad03c437..000000000
Binary files a/Audio/SE/Cries/GRENINJA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GRIMER.mp3 b/Audio/SE/Cries/GRIMER.mp3
new file mode 100644
index 000000000..e8f75967f
Binary files /dev/null and b/Audio/SE/Cries/GRIMER.mp3 differ
diff --git a/Audio/SE/Cries/GRIMER.ogg b/Audio/SE/Cries/GRIMER.ogg
deleted file mode 100644
index ba5258363..000000000
Binary files a/Audio/SE/Cries/GRIMER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GRIMMSNARL.ogg b/Audio/SE/Cries/GRIMMSNARL.ogg
deleted file mode 100644
index 997530e86..000000000
Binary files a/Audio/SE/Cries/GRIMMSNARL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GROOKEY.ogg b/Audio/SE/Cries/GROOKEY.ogg
deleted file mode 100644
index d2a2672c0..000000000
Binary files a/Audio/SE/Cries/GROOKEY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GROTLE.mp3 b/Audio/SE/Cries/GROTLE.mp3
new file mode 100644
index 000000000..1f4f5197d
Binary files /dev/null and b/Audio/SE/Cries/GROTLE.mp3 differ
diff --git a/Audio/SE/Cries/GROTLE.ogg b/Audio/SE/Cries/GROTLE.ogg
deleted file mode 100644
index a0210430a..000000000
Binary files a/Audio/SE/Cries/GROTLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GROUDON.mp3 b/Audio/SE/Cries/GROUDON.mp3
new file mode 100644
index 000000000..4a2aaf35c
Binary files /dev/null and b/Audio/SE/Cries/GROUDON.mp3 differ
diff --git a/Audio/SE/Cries/GROUDON.ogg b/Audio/SE/Cries/GROUDON.ogg
deleted file mode 100644
index 2542f780b..000000000
Binary files a/Audio/SE/Cries/GROUDON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GROUDON_1.ogg b/Audio/SE/Cries/GROUDON_1.ogg
deleted file mode 100644
index 6a78ca78f..000000000
Binary files a/Audio/SE/Cries/GROUDON_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GROVYLE.mp3 b/Audio/SE/Cries/GROVYLE.mp3
new file mode 100644
index 000000000..8f2548cfa
Binary files /dev/null and b/Audio/SE/Cries/GROVYLE.mp3 differ
diff --git a/Audio/SE/Cries/GROVYLE.ogg b/Audio/SE/Cries/GROVYLE.ogg
deleted file mode 100644
index e30584583..000000000
Binary files a/Audio/SE/Cries/GROVYLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GROWLITHE.mp3 b/Audio/SE/Cries/GROWLITHE.mp3
new file mode 100644
index 000000000..83c8a3c63
Binary files /dev/null and b/Audio/SE/Cries/GROWLITHE.mp3 differ
diff --git a/Audio/SE/Cries/GROWLITHE.ogg b/Audio/SE/Cries/GROWLITHE.ogg
deleted file mode 100644
index 7a247e3c2..000000000
Binary files a/Audio/SE/Cries/GROWLITHE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GROWLITHE.wav b/Audio/SE/Cries/GROWLITHE.wav
new file mode 100644
index 000000000..6512a0ea2
Binary files /dev/null and b/Audio/SE/Cries/GROWLITHE.wav differ
diff --git a/Audio/SE/Cries/GRUBBIN.ogg b/Audio/SE/Cries/GRUBBIN.ogg
deleted file mode 100644
index 45ad649e9..000000000
Binary files a/Audio/SE/Cries/GRUBBIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GRUMPIG.ogg b/Audio/SE/Cries/GRUMPIG.ogg
deleted file mode 100644
index 32f26484c..000000000
Binary files a/Audio/SE/Cries/GRUMPIG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GULPIN.ogg b/Audio/SE/Cries/GULPIN.ogg
deleted file mode 100644
index cac49e7da..000000000
Binary files a/Audio/SE/Cries/GULPIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GUMSHOOS.ogg b/Audio/SE/Cries/GUMSHOOS.ogg
deleted file mode 100644
index 4d6c4653f..000000000
Binary files a/Audio/SE/Cries/GUMSHOOS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GURDURR.ogg b/Audio/SE/Cries/GURDURR.ogg
deleted file mode 100644
index 25676e014..000000000
Binary files a/Audio/SE/Cries/GURDURR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GUZZLORD.ogg b/Audio/SE/Cries/GUZZLORD.ogg
deleted file mode 100644
index bd45f70b7..000000000
Binary files a/Audio/SE/Cries/GUZZLORD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GYARADOS.ogg b/Audio/SE/Cries/GYARADOS.ogg
deleted file mode 100644
index aa80ae956..000000000
Binary files a/Audio/SE/Cries/GYARADOS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/GYARADOS_1.ogg b/Audio/SE/Cries/GYARADOS_1.ogg
deleted file mode 100644
index a19ca7bb0..000000000
Binary files a/Audio/SE/Cries/GYARADOS_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HAKAMO-O.mp3 b/Audio/SE/Cries/HAKAMO-O.mp3
new file mode 100644
index 000000000..d5f85ccad
Binary files /dev/null and b/Audio/SE/Cries/HAKAMO-O.mp3 differ
diff --git a/Audio/SE/Cries/HAKAMOO.ogg b/Audio/SE/Cries/HAKAMOO.ogg
deleted file mode 100644
index 59142affe..000000000
Binary files a/Audio/SE/Cries/HAKAMOO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HAPPINY.mp3 b/Audio/SE/Cries/HAPPINY.mp3
new file mode 100644
index 000000000..46830f7ec
Binary files /dev/null and b/Audio/SE/Cries/HAPPINY.mp3 differ
diff --git a/Audio/SE/Cries/HAPPINY.ogg b/Audio/SE/Cries/HAPPINY.ogg
deleted file mode 100644
index fcce2dd5a..000000000
Binary files a/Audio/SE/Cries/HAPPINY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HARIYAMA.ogg b/Audio/SE/Cries/HARIYAMA.ogg
deleted file mode 100644
index 3fae71df2..000000000
Binary files a/Audio/SE/Cries/HARIYAMA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HATENNA.ogg b/Audio/SE/Cries/HATENNA.ogg
deleted file mode 100644
index a0412217f..000000000
Binary files a/Audio/SE/Cries/HATENNA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HATTERENE.ogg b/Audio/SE/Cries/HATTERENE.ogg
deleted file mode 100644
index a95e5a4f0..000000000
Binary files a/Audio/SE/Cries/HATTERENE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HATTREM.ogg b/Audio/SE/Cries/HATTREM.ogg
deleted file mode 100644
index fd8a8b023..000000000
Binary files a/Audio/SE/Cries/HATTREM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HAUNTER.mp3 b/Audio/SE/Cries/HAUNTER.mp3
new file mode 100644
index 000000000..7612c9771
Binary files /dev/null and b/Audio/SE/Cries/HAUNTER.mp3 differ
diff --git a/Audio/SE/Cries/HAUNTER.ogg b/Audio/SE/Cries/HAUNTER.ogg
deleted file mode 100644
index 238e0d2c1..000000000
Binary files a/Audio/SE/Cries/HAUNTER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HAWLUCHA.mp3 b/Audio/SE/Cries/HAWLUCHA.mp3
new file mode 100644
index 000000000..2a89e7630
Binary files /dev/null and b/Audio/SE/Cries/HAWLUCHA.mp3 differ
diff --git a/Audio/SE/Cries/HAWLUCHA.ogg b/Audio/SE/Cries/HAWLUCHA.ogg
deleted file mode 100644
index 34eef54dc..000000000
Binary files a/Audio/SE/Cries/HAWLUCHA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HAXORUS.mp3 b/Audio/SE/Cries/HAXORUS.mp3
new file mode 100644
index 000000000..3cbd03367
Binary files /dev/null and b/Audio/SE/Cries/HAXORUS.mp3 differ
diff --git a/Audio/SE/Cries/HAXORUS.ogg b/Audio/SE/Cries/HAXORUS.ogg
deleted file mode 100644
index 939159c2c..000000000
Binary files a/Audio/SE/Cries/HAXORUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HEATMOR.ogg b/Audio/SE/Cries/HEATMOR.ogg
deleted file mode 100644
index 91c067691..000000000
Binary files a/Audio/SE/Cries/HEATMOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HEATRAN.ogg b/Audio/SE/Cries/HEATRAN.ogg
deleted file mode 100644
index ffed13132..000000000
Binary files a/Audio/SE/Cries/HEATRAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HELIOLISK.ogg b/Audio/SE/Cries/HELIOLISK.ogg
deleted file mode 100644
index 842eb6c64..000000000
Binary files a/Audio/SE/Cries/HELIOLISK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HELIOPTILE.ogg b/Audio/SE/Cries/HELIOPTILE.ogg
deleted file mode 100644
index db0b4db59..000000000
Binary files a/Audio/SE/Cries/HELIOPTILE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HERACROSS.mp3 b/Audio/SE/Cries/HERACROSS.mp3
new file mode 100644
index 000000000..42ee2545d
Binary files /dev/null and b/Audio/SE/Cries/HERACROSS.mp3 differ
diff --git a/Audio/SE/Cries/HERACROSS.ogg b/Audio/SE/Cries/HERACROSS.ogg
deleted file mode 100644
index 07efd71ce..000000000
Binary files a/Audio/SE/Cries/HERACROSS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HERACROSS_1.ogg b/Audio/SE/Cries/HERACROSS_1.ogg
deleted file mode 100644
index 453dc4c55..000000000
Binary files a/Audio/SE/Cries/HERACROSS_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HERDIER.ogg b/Audio/SE/Cries/HERDIER.ogg
deleted file mode 100644
index 1f463b113..000000000
Binary files a/Audio/SE/Cries/HERDIER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HIPPOPOTAS.ogg b/Audio/SE/Cries/HIPPOPOTAS.ogg
deleted file mode 100644
index 2520f2dad..000000000
Binary files a/Audio/SE/Cries/HIPPOPOTAS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HIPPOWDON.ogg b/Audio/SE/Cries/HIPPOWDON.ogg
deleted file mode 100644
index c3b79576d..000000000
Binary files a/Audio/SE/Cries/HIPPOWDON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HITMONCHAN.mp3 b/Audio/SE/Cries/HITMONCHAN.mp3
new file mode 100644
index 000000000..517aa031f
Binary files /dev/null and b/Audio/SE/Cries/HITMONCHAN.mp3 differ
diff --git a/Audio/SE/Cries/HITMONCHAN.ogg b/Audio/SE/Cries/HITMONCHAN.ogg
deleted file mode 100644
index 61d8bfae4..000000000
Binary files a/Audio/SE/Cries/HITMONCHAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HITMONLEE.mp3 b/Audio/SE/Cries/HITMONLEE.mp3
new file mode 100644
index 000000000..0d0af2d80
Binary files /dev/null and b/Audio/SE/Cries/HITMONLEE.mp3 differ
diff --git a/Audio/SE/Cries/HITMONLEE.ogg b/Audio/SE/Cries/HITMONLEE.ogg
deleted file mode 100644
index 35326cc4a..000000000
Binary files a/Audio/SE/Cries/HITMONLEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HITMONTOP.mp3 b/Audio/SE/Cries/HITMONTOP.mp3
new file mode 100644
index 000000000..00fd8f4be
Binary files /dev/null and b/Audio/SE/Cries/HITMONTOP.mp3 differ
diff --git a/Audio/SE/Cries/HITMONTOP.ogg b/Audio/SE/Cries/HITMONTOP.ogg
deleted file mode 100644
index 70c35d1ec..000000000
Binary files a/Audio/SE/Cries/HITMONTOP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HO-OH.mp3 b/Audio/SE/Cries/HO-OH.mp3
new file mode 100644
index 000000000..9a856c579
Binary files /dev/null and b/Audio/SE/Cries/HO-OH.mp3 differ
diff --git a/Audio/SE/Cries/HONCHKROW.mp3 b/Audio/SE/Cries/HONCHKROW.mp3
new file mode 100644
index 000000000..e7f8c5565
Binary files /dev/null and b/Audio/SE/Cries/HONCHKROW.mp3 differ
diff --git a/Audio/SE/Cries/HONCHKROW.ogg b/Audio/SE/Cries/HONCHKROW.ogg
deleted file mode 100644
index 51c12775b..000000000
Binary files a/Audio/SE/Cries/HONCHKROW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HONEDGE.mp3 b/Audio/SE/Cries/HONEDGE.mp3
new file mode 100644
index 000000000..96a9b9a69
Binary files /dev/null and b/Audio/SE/Cries/HONEDGE.mp3 differ
diff --git a/Audio/SE/Cries/HONEDGE.ogg b/Audio/SE/Cries/HONEDGE.ogg
deleted file mode 100644
index 78ec6d364..000000000
Binary files a/Audio/SE/Cries/HONEDGE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HOOH.ogg b/Audio/SE/Cries/HOOH.ogg
deleted file mode 100644
index 73561251b..000000000
Binary files a/Audio/SE/Cries/HOOH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HOOPA.ogg b/Audio/SE/Cries/HOOPA.ogg
deleted file mode 100644
index 09f0b8bdc..000000000
Binary files a/Audio/SE/Cries/HOOPA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HOOPA_1.ogg b/Audio/SE/Cries/HOOPA_1.ogg
deleted file mode 100644
index 82401d0c9..000000000
Binary files a/Audio/SE/Cries/HOOPA_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HOOTHOOT.mp3 b/Audio/SE/Cries/HOOTHOOT.mp3
new file mode 100644
index 000000000..a08d17c5a
Binary files /dev/null and b/Audio/SE/Cries/HOOTHOOT.mp3 differ
diff --git a/Audio/SE/Cries/HOOTHOOT.ogg b/Audio/SE/Cries/HOOTHOOT.ogg
deleted file mode 100644
index abdcb7a58..000000000
Binary files a/Audio/SE/Cries/HOOTHOOT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HOOTHOOT.wav b/Audio/SE/Cries/HOOTHOOT.wav
new file mode 100644
index 000000000..927fedca0
Binary files /dev/null and b/Audio/SE/Cries/HOOTHOOT.wav differ
diff --git a/Audio/SE/Cries/HOPPIP.mp3 b/Audio/SE/Cries/HOPPIP.mp3
new file mode 100644
index 000000000..eb38f74f7
Binary files /dev/null and b/Audio/SE/Cries/HOPPIP.mp3 differ
diff --git a/Audio/SE/Cries/HOPPIP.ogg b/Audio/SE/Cries/HOPPIP.ogg
deleted file mode 100644
index bf2e157cb..000000000
Binary files a/Audio/SE/Cries/HOPPIP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HOPPIP.wav b/Audio/SE/Cries/HOPPIP.wav
new file mode 100644
index 000000000..25e3dfb77
Binary files /dev/null and b/Audio/SE/Cries/HOPPIP.wav differ
diff --git a/Audio/SE/Cries/HORSEA.mp3 b/Audio/SE/Cries/HORSEA.mp3
new file mode 100644
index 000000000..28cc87e5b
Binary files /dev/null and b/Audio/SE/Cries/HORSEA.mp3 differ
diff --git a/Audio/SE/Cries/HORSEA.ogg b/Audio/SE/Cries/HORSEA.ogg
deleted file mode 100644
index 62962165c..000000000
Binary files a/Audio/SE/Cries/HORSEA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HORSEA.wav b/Audio/SE/Cries/HORSEA.wav
new file mode 100644
index 000000000..9dac0d148
Binary files /dev/null and b/Audio/SE/Cries/HORSEA.wav differ
diff --git a/Audio/SE/Cries/HOUNDOOM.mp3 b/Audio/SE/Cries/HOUNDOOM.mp3
new file mode 100644
index 000000000..03fa4726d
Binary files /dev/null and b/Audio/SE/Cries/HOUNDOOM.mp3 differ
diff --git a/Audio/SE/Cries/HOUNDOOM.ogg b/Audio/SE/Cries/HOUNDOOM.ogg
deleted file mode 100644
index 675eac30a..000000000
Binary files a/Audio/SE/Cries/HOUNDOOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HOUNDOOM_1.ogg b/Audio/SE/Cries/HOUNDOOM_1.ogg
deleted file mode 100644
index 7826df6b6..000000000
Binary files a/Audio/SE/Cries/HOUNDOOM_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HOUNDOUR.mp3 b/Audio/SE/Cries/HOUNDOUR.mp3
new file mode 100644
index 000000000..dedc73178
Binary files /dev/null and b/Audio/SE/Cries/HOUNDOUR.mp3 differ
diff --git a/Audio/SE/Cries/HOUNDOUR.ogg b/Audio/SE/Cries/HOUNDOUR.ogg
deleted file mode 100644
index 73f940bd4..000000000
Binary files a/Audio/SE/Cries/HOUNDOUR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HUNTAIL.ogg b/Audio/SE/Cries/HUNTAIL.ogg
deleted file mode 100644
index 529ab8604..000000000
Binary files a/Audio/SE/Cries/HUNTAIL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HYDREIGON.mp3 b/Audio/SE/Cries/HYDREIGON.mp3
new file mode 100644
index 000000000..1e4d3f2d5
Binary files /dev/null and b/Audio/SE/Cries/HYDREIGON.mp3 differ
diff --git a/Audio/SE/Cries/HYDREIGON.ogg b/Audio/SE/Cries/HYDREIGON.ogg
deleted file mode 100644
index f56188368..000000000
Binary files a/Audio/SE/Cries/HYDREIGON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/HYPNO.mp3 b/Audio/SE/Cries/HYPNO.mp3
new file mode 100644
index 000000000..2495dc8d3
Binary files /dev/null and b/Audio/SE/Cries/HYPNO.mp3 differ
diff --git a/Audio/SE/Cries/HYPNO.ogg b/Audio/SE/Cries/HYPNO.ogg
deleted file mode 100644
index 8f22b8998..000000000
Binary files a/Audio/SE/Cries/HYPNO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/IGGLYBUFF.mp3 b/Audio/SE/Cries/IGGLYBUFF.mp3
new file mode 100644
index 000000000..5df4e719f
Binary files /dev/null and b/Audio/SE/Cries/IGGLYBUFF.mp3 differ
diff --git a/Audio/SE/Cries/IGGLYBUFF.ogg b/Audio/SE/Cries/IGGLYBUFF.ogg
deleted file mode 100644
index 866610f5e..000000000
Binary files a/Audio/SE/Cries/IGGLYBUFF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ILLUMISE.ogg b/Audio/SE/Cries/ILLUMISE.ogg
deleted file mode 100644
index 02743f339..000000000
Binary files a/Audio/SE/Cries/ILLUMISE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/IMPIDIMP.ogg b/Audio/SE/Cries/IMPIDIMP.ogg
deleted file mode 100644
index 91666d398..000000000
Binary files a/Audio/SE/Cries/IMPIDIMP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/INCINEROAR.ogg b/Audio/SE/Cries/INCINEROAR.ogg
deleted file mode 100644
index a58eefc73..000000000
Binary files a/Audio/SE/Cries/INCINEROAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/INDEEDEE.ogg b/Audio/SE/Cries/INDEEDEE.ogg
deleted file mode 100644
index f10006ade..000000000
Binary files a/Audio/SE/Cries/INDEEDEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/INDEEDEE_1.ogg b/Audio/SE/Cries/INDEEDEE_1.ogg
deleted file mode 100644
index c8bf86157..000000000
Binary files a/Audio/SE/Cries/INDEEDEE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/INFERNAPE.mp3 b/Audio/SE/Cries/INFERNAPE.mp3
new file mode 100644
index 000000000..e11fdada4
Binary files /dev/null and b/Audio/SE/Cries/INFERNAPE.mp3 differ
diff --git a/Audio/SE/Cries/INFERNAPE.ogg b/Audio/SE/Cries/INFERNAPE.ogg
deleted file mode 100644
index 8fe8dffa7..000000000
Binary files a/Audio/SE/Cries/INFERNAPE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/INKAY.ogg b/Audio/SE/Cries/INKAY.ogg
deleted file mode 100644
index 780846ec5..000000000
Binary files a/Audio/SE/Cries/INKAY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/INTELEON.ogg b/Audio/SE/Cries/INTELEON.ogg
deleted file mode 100644
index 34b1009a2..000000000
Binary files a/Audio/SE/Cries/INTELEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/IVYSAUR.mp3 b/Audio/SE/Cries/IVYSAUR.mp3
new file mode 100644
index 000000000..47deafd6e
Binary files /dev/null and b/Audio/SE/Cries/IVYSAUR.mp3 differ
diff --git a/Audio/SE/Cries/IVYSAUR.ogg b/Audio/SE/Cries/IVYSAUR.ogg
deleted file mode 100644
index 1df780ba7..000000000
Binary files a/Audio/SE/Cries/IVYSAUR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/IVYSAUR.wav b/Audio/SE/Cries/IVYSAUR.wav
new file mode 100644
index 000000000..9e3bb0ff8
Binary files /dev/null and b/Audio/SE/Cries/IVYSAUR.wav differ
diff --git a/Audio/SE/Cries/JANGMO-O.mp3 b/Audio/SE/Cries/JANGMO-O.mp3
new file mode 100644
index 000000000..c64fa21a4
Binary files /dev/null and b/Audio/SE/Cries/JANGMO-O.mp3 differ
diff --git a/Audio/SE/Cries/JANGMOO.ogg b/Audio/SE/Cries/JANGMOO.ogg
deleted file mode 100644
index 5ddaa39b7..000000000
Binary files a/Audio/SE/Cries/JANGMOO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/JELLICENT.ogg b/Audio/SE/Cries/JELLICENT.ogg
deleted file mode 100644
index ac4af3e76..000000000
Binary files a/Audio/SE/Cries/JELLICENT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/JIGGLYPUFF.mp3 b/Audio/SE/Cries/JIGGLYPUFF.mp3
new file mode 100644
index 000000000..c19785819
Binary files /dev/null and b/Audio/SE/Cries/JIGGLYPUFF.mp3 differ
diff --git a/Audio/SE/Cries/JIGGLYPUFF.ogg b/Audio/SE/Cries/JIGGLYPUFF.ogg
deleted file mode 100644
index aa75f793e..000000000
Binary files a/Audio/SE/Cries/JIGGLYPUFF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/JIRACHI.mp3 b/Audio/SE/Cries/JIRACHI.mp3
new file mode 100644
index 000000000..d5a215558
Binary files /dev/null and b/Audio/SE/Cries/JIRACHI.mp3 differ
diff --git a/Audio/SE/Cries/JIRACHI.ogg b/Audio/SE/Cries/JIRACHI.ogg
deleted file mode 100644
index 580410542..000000000
Binary files a/Audio/SE/Cries/JIRACHI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/JOLTEON.mp3 b/Audio/SE/Cries/JOLTEON.mp3
new file mode 100644
index 000000000..87a6b0ce2
Binary files /dev/null and b/Audio/SE/Cries/JOLTEON.mp3 differ
diff --git a/Audio/SE/Cries/JOLTEON.ogg b/Audio/SE/Cries/JOLTEON.ogg
deleted file mode 100644
index 9673f98ce..000000000
Binary files a/Audio/SE/Cries/JOLTEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/JOLTIK.mp3 b/Audio/SE/Cries/JOLTIK.mp3
new file mode 100644
index 000000000..d418cc4e6
Binary files /dev/null and b/Audio/SE/Cries/JOLTIK.mp3 differ
diff --git a/Audio/SE/Cries/JOLTIK.ogg b/Audio/SE/Cries/JOLTIK.ogg
deleted file mode 100644
index dcfb9e076..000000000
Binary files a/Audio/SE/Cries/JOLTIK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/JUMPLUFF.mp3 b/Audio/SE/Cries/JUMPLUFF.mp3
new file mode 100644
index 000000000..891305892
Binary files /dev/null and b/Audio/SE/Cries/JUMPLUFF.mp3 differ
diff --git a/Audio/SE/Cries/JUMPLUFF.ogg b/Audio/SE/Cries/JUMPLUFF.ogg
deleted file mode 100644
index 960f7b9c1..000000000
Binary files a/Audio/SE/Cries/JUMPLUFF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/JYNX.mp3 b/Audio/SE/Cries/JYNX.mp3
new file mode 100644
index 000000000..e44d15bdc
Binary files /dev/null and b/Audio/SE/Cries/JYNX.mp3 differ
diff --git a/Audio/SE/Cries/JYNX.ogg b/Audio/SE/Cries/JYNX.ogg
deleted file mode 100644
index 1c28e2d25..000000000
Binary files a/Audio/SE/Cries/JYNX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KABUTO.mp3 b/Audio/SE/Cries/KABUTO.mp3
new file mode 100644
index 000000000..22f33adb6
Binary files /dev/null and b/Audio/SE/Cries/KABUTO.mp3 differ
diff --git a/Audio/SE/Cries/KABUTO.ogg b/Audio/SE/Cries/KABUTO.ogg
deleted file mode 100644
index c6371229a..000000000
Binary files a/Audio/SE/Cries/KABUTO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KABUTOPS.ogg b/Audio/SE/Cries/KABUTOPS.ogg
deleted file mode 100644
index 8884bb30b..000000000
Binary files a/Audio/SE/Cries/KABUTOPS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KADABRA.mp3 b/Audio/SE/Cries/KADABRA.mp3
new file mode 100644
index 000000000..abfaa499d
Binary files /dev/null and b/Audio/SE/Cries/KADABRA.mp3 differ
diff --git a/Audio/SE/Cries/KADABRA.ogg b/Audio/SE/Cries/KADABRA.ogg
deleted file mode 100644
index 4c1033969..000000000
Binary files a/Audio/SE/Cries/KADABRA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KAKUNA.mp3 b/Audio/SE/Cries/KAKUNA.mp3
new file mode 100644
index 000000000..24dc54c51
Binary files /dev/null and b/Audio/SE/Cries/KAKUNA.mp3 differ
diff --git a/Audio/SE/Cries/KAKUNA.ogg b/Audio/SE/Cries/KAKUNA.ogg
deleted file mode 100644
index ee3a6c60a..000000000
Binary files a/Audio/SE/Cries/KAKUNA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KAKUNA.wav b/Audio/SE/Cries/KAKUNA.wav
new file mode 100644
index 000000000..8ee1fb7cb
Binary files /dev/null and b/Audio/SE/Cries/KAKUNA.wav differ
diff --git a/Audio/SE/Cries/KANGASKHAN.mp3 b/Audio/SE/Cries/KANGASKHAN.mp3
new file mode 100644
index 000000000..1a06e168f
Binary files /dev/null and b/Audio/SE/Cries/KANGASKHAN.mp3 differ
diff --git a/Audio/SE/Cries/KANGASKHAN.ogg b/Audio/SE/Cries/KANGASKHAN.ogg
deleted file mode 100644
index 009ec8a1c..000000000
Binary files a/Audio/SE/Cries/KANGASKHAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KANGASKHAN_1.ogg b/Audio/SE/Cries/KANGASKHAN_1.ogg
deleted file mode 100644
index 15f34f0f3..000000000
Binary files a/Audio/SE/Cries/KANGASKHAN_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KARRABLAST.ogg b/Audio/SE/Cries/KARRABLAST.ogg
deleted file mode 100644
index ec926d175..000000000
Binary files a/Audio/SE/Cries/KARRABLAST.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KARTANA.ogg b/Audio/SE/Cries/KARTANA.ogg
deleted file mode 100644
index 5d38b5b03..000000000
Binary files a/Audio/SE/Cries/KARTANA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KECLEON.mp3 b/Audio/SE/Cries/KECLEON.mp3
new file mode 100644
index 000000000..1fec2f77a
Binary files /dev/null and b/Audio/SE/Cries/KECLEON.mp3 differ
diff --git a/Audio/SE/Cries/KECLEON.ogg b/Audio/SE/Cries/KECLEON.ogg
deleted file mode 100644
index 8d7c98ff9..000000000
Binary files a/Audio/SE/Cries/KECLEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KELDEO.ogg b/Audio/SE/Cries/KELDEO.ogg
deleted file mode 100644
index 4d3461d69..000000000
Binary files a/Audio/SE/Cries/KELDEO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KINGDRA.mp3 b/Audio/SE/Cries/KINGDRA.mp3
new file mode 100644
index 000000000..f73f72ed1
Binary files /dev/null and b/Audio/SE/Cries/KINGDRA.mp3 differ
diff --git a/Audio/SE/Cries/KINGDRA.ogg b/Audio/SE/Cries/KINGDRA.ogg
deleted file mode 100644
index e6b38ce14..000000000
Binary files a/Audio/SE/Cries/KINGDRA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KINGLER.mp3 b/Audio/SE/Cries/KINGLER.mp3
new file mode 100644
index 000000000..07e2dfcf7
Binary files /dev/null and b/Audio/SE/Cries/KINGLER.mp3 differ
diff --git a/Audio/SE/Cries/KINGLER.ogg b/Audio/SE/Cries/KINGLER.ogg
deleted file mode 100644
index 98aed8d31..000000000
Binary files a/Audio/SE/Cries/KINGLER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KIRLIA.mp3 b/Audio/SE/Cries/KIRLIA.mp3
new file mode 100644
index 000000000..773e4924d
Binary files /dev/null and b/Audio/SE/Cries/KIRLIA.mp3 differ
diff --git a/Audio/SE/Cries/KIRLIA.ogg b/Audio/SE/Cries/KIRLIA.ogg
deleted file mode 100644
index c48298e5d..000000000
Binary files a/Audio/SE/Cries/KIRLIA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KLANG.mp3 b/Audio/SE/Cries/KLANG.mp3
new file mode 100644
index 000000000..93ce1b396
Binary files /dev/null and b/Audio/SE/Cries/KLANG.mp3 differ
diff --git a/Audio/SE/Cries/KLANG.ogg b/Audio/SE/Cries/KLANG.ogg
deleted file mode 100644
index 61f0bac87..000000000
Binary files a/Audio/SE/Cries/KLANG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KLEFKI.mp3 b/Audio/SE/Cries/KLEFKI.mp3
new file mode 100644
index 000000000..7dfdba353
Binary files /dev/null and b/Audio/SE/Cries/KLEFKI.mp3 differ
diff --git a/Audio/SE/Cries/KLEFKI.ogg b/Audio/SE/Cries/KLEFKI.ogg
deleted file mode 100644
index a77b98c7e..000000000
Binary files a/Audio/SE/Cries/KLEFKI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KLINK.mp3 b/Audio/SE/Cries/KLINK.mp3
new file mode 100644
index 000000000..d05346aa2
Binary files /dev/null and b/Audio/SE/Cries/KLINK.mp3 differ
diff --git a/Audio/SE/Cries/KLINK.ogg b/Audio/SE/Cries/KLINK.ogg
deleted file mode 100644
index 5f7955ce6..000000000
Binary files a/Audio/SE/Cries/KLINK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KLINKLANG.mp3 b/Audio/SE/Cries/KLINKLANG.mp3
new file mode 100644
index 000000000..1cf3b97ff
Binary files /dev/null and b/Audio/SE/Cries/KLINKLANG.mp3 differ
diff --git a/Audio/SE/Cries/KLINKLANG.ogg b/Audio/SE/Cries/KLINKLANG.ogg
deleted file mode 100644
index caa1cc8d4..000000000
Binary files a/Audio/SE/Cries/KLINKLANG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KOFFING.mp3 b/Audio/SE/Cries/KOFFING.mp3
new file mode 100644
index 000000000..10b7232cc
Binary files /dev/null and b/Audio/SE/Cries/KOFFING.mp3 differ
diff --git a/Audio/SE/Cries/KOFFING.ogg b/Audio/SE/Cries/KOFFING.ogg
deleted file mode 100644
index 23896bfdd..000000000
Binary files a/Audio/SE/Cries/KOFFING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KOMALA.ogg b/Audio/SE/Cries/KOMALA.ogg
deleted file mode 100644
index 9f700f3a1..000000000
Binary files a/Audio/SE/Cries/KOMALA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KOMMO-O.mp3 b/Audio/SE/Cries/KOMMO-O.mp3
new file mode 100644
index 000000000..82af88e2d
Binary files /dev/null and b/Audio/SE/Cries/KOMMO-O.mp3 differ
diff --git a/Audio/SE/Cries/KOMMOO.ogg b/Audio/SE/Cries/KOMMOO.ogg
deleted file mode 100644
index 71cabd72b..000000000
Binary files a/Audio/SE/Cries/KOMMOO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KRABBY.mp3 b/Audio/SE/Cries/KRABBY.mp3
new file mode 100644
index 000000000..2c1218dd5
Binary files /dev/null and b/Audio/SE/Cries/KRABBY.mp3 differ
diff --git a/Audio/SE/Cries/KRABBY.ogg b/Audio/SE/Cries/KRABBY.ogg
deleted file mode 100644
index 72377d8cc..000000000
Binary files a/Audio/SE/Cries/KRABBY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KRICKETOT.ogg b/Audio/SE/Cries/KRICKETOT.ogg
deleted file mode 100644
index bfe8b77d1..000000000
Binary files a/Audio/SE/Cries/KRICKETOT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KRICKETUNE.ogg b/Audio/SE/Cries/KRICKETUNE.ogg
deleted file mode 100644
index b4f869428..000000000
Binary files a/Audio/SE/Cries/KRICKETUNE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KROKOROK.mp3 b/Audio/SE/Cries/KROKOROK.mp3
new file mode 100644
index 000000000..955cd8df9
Binary files /dev/null and b/Audio/SE/Cries/KROKOROK.mp3 differ
diff --git a/Audio/SE/Cries/KROKOROK.ogg b/Audio/SE/Cries/KROKOROK.ogg
deleted file mode 100644
index 30a1775fd..000000000
Binary files a/Audio/SE/Cries/KROKOROK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KROOKODILE.mp3 b/Audio/SE/Cries/KROOKODILE.mp3
new file mode 100644
index 000000000..1f167c530
Binary files /dev/null and b/Audio/SE/Cries/KROOKODILE.mp3 differ
diff --git a/Audio/SE/Cries/KROOKODILE.ogg b/Audio/SE/Cries/KROOKODILE.ogg
deleted file mode 100644
index 268804976..000000000
Binary files a/Audio/SE/Cries/KROOKODILE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KUBFU.ogg b/Audio/SE/Cries/KUBFU.ogg
deleted file mode 100644
index 538094cc3..000000000
Binary files a/Audio/SE/Cries/KUBFU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KYOGRE.mp3 b/Audio/SE/Cries/KYOGRE.mp3
new file mode 100644
index 000000000..d8749d6ff
Binary files /dev/null and b/Audio/SE/Cries/KYOGRE.mp3 differ
diff --git a/Audio/SE/Cries/KYOGRE.ogg b/Audio/SE/Cries/KYOGRE.ogg
deleted file mode 100644
index 0d7e638f0..000000000
Binary files a/Audio/SE/Cries/KYOGRE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KYOGRE_1.ogg b/Audio/SE/Cries/KYOGRE_1.ogg
deleted file mode 100644
index c0a174996..000000000
Binary files a/Audio/SE/Cries/KYOGRE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KYUREM.mp3 b/Audio/SE/Cries/KYUREM.mp3
new file mode 100644
index 000000000..9964bfd4f
Binary files /dev/null and b/Audio/SE/Cries/KYUREM.mp3 differ
diff --git a/Audio/SE/Cries/KYUREM.ogg b/Audio/SE/Cries/KYUREM.ogg
deleted file mode 100644
index 4053c717d..000000000
Binary files a/Audio/SE/Cries/KYUREM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KYUREM_1.ogg b/Audio/SE/Cries/KYUREM_1.ogg
deleted file mode 100644
index cc5ec80d4..000000000
Binary files a/Audio/SE/Cries/KYUREM_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/KYUREM_2.ogg b/Audio/SE/Cries/KYUREM_2.ogg
deleted file mode 100644
index c27031c60..000000000
Binary files a/Audio/SE/Cries/KYUREM_2.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LAIRON.mp3 b/Audio/SE/Cries/LAIRON.mp3
new file mode 100644
index 000000000..ec3db3b2f
Binary files /dev/null and b/Audio/SE/Cries/LAIRON.mp3 differ
diff --git a/Audio/SE/Cries/LAIRON.ogg b/Audio/SE/Cries/LAIRON.ogg
deleted file mode 100644
index f10a0d2d6..000000000
Binary files a/Audio/SE/Cries/LAIRON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LAMPENT.mp3 b/Audio/SE/Cries/LAMPENT.mp3
new file mode 100644
index 000000000..4fa0733c0
Binary files /dev/null and b/Audio/SE/Cries/LAMPENT.mp3 differ
diff --git a/Audio/SE/Cries/LAMPENT.ogg b/Audio/SE/Cries/LAMPENT.ogg
deleted file mode 100644
index 0da7f92ac..000000000
Binary files a/Audio/SE/Cries/LAMPENT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LANDORUS.ogg b/Audio/SE/Cries/LANDORUS.ogg
deleted file mode 100644
index c04b4cb5d..000000000
Binary files a/Audio/SE/Cries/LANDORUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LANDORUS_1.ogg b/Audio/SE/Cries/LANDORUS_1.ogg
deleted file mode 100644
index cce3f2aac..000000000
Binary files a/Audio/SE/Cries/LANDORUS_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LANTURN.mp3 b/Audio/SE/Cries/LANTURN.mp3
new file mode 100644
index 000000000..77bc509d9
Binary files /dev/null and b/Audio/SE/Cries/LANTURN.mp3 differ
diff --git a/Audio/SE/Cries/LANTURN.ogg b/Audio/SE/Cries/LANTURN.ogg
deleted file mode 100644
index 4ec19d5c8..000000000
Binary files a/Audio/SE/Cries/LANTURN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LAPRAS.mp3 b/Audio/SE/Cries/LAPRAS.mp3
new file mode 100644
index 000000000..cf49da2d2
Binary files /dev/null and b/Audio/SE/Cries/LAPRAS.mp3 differ
diff --git a/Audio/SE/Cries/LAPRAS.ogg b/Audio/SE/Cries/LAPRAS.ogg
deleted file mode 100644
index 4fe4684ff..000000000
Binary files a/Audio/SE/Cries/LAPRAS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LARVESTA.mp3 b/Audio/SE/Cries/LARVESTA.mp3
new file mode 100644
index 000000000..59cf9a15f
Binary files /dev/null and b/Audio/SE/Cries/LARVESTA.mp3 differ
diff --git a/Audio/SE/Cries/LARVESTA.ogg b/Audio/SE/Cries/LARVESTA.ogg
deleted file mode 100644
index 24db83923..000000000
Binary files a/Audio/SE/Cries/LARVESTA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LARVITAR.mp3 b/Audio/SE/Cries/LARVITAR.mp3
new file mode 100644
index 000000000..81390a70e
Binary files /dev/null and b/Audio/SE/Cries/LARVITAR.mp3 differ
diff --git a/Audio/SE/Cries/LARVITAR.ogg b/Audio/SE/Cries/LARVITAR.ogg
deleted file mode 100644
index f4fab62ea..000000000
Binary files a/Audio/SE/Cries/LARVITAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LATIAS.mp3 b/Audio/SE/Cries/LATIAS.mp3
new file mode 100644
index 000000000..c1d78863e
Binary files /dev/null and b/Audio/SE/Cries/LATIAS.mp3 differ
diff --git a/Audio/SE/Cries/LATIAS.ogg b/Audio/SE/Cries/LATIAS.ogg
deleted file mode 100644
index 0dd8fd8ad..000000000
Binary files a/Audio/SE/Cries/LATIAS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LATIAS_1.ogg b/Audio/SE/Cries/LATIAS_1.ogg
deleted file mode 100644
index e181ae188..000000000
Binary files a/Audio/SE/Cries/LATIAS_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LATIOS.mp3 b/Audio/SE/Cries/LATIOS.mp3
new file mode 100644
index 000000000..9bede7d0f
Binary files /dev/null and b/Audio/SE/Cries/LATIOS.mp3 differ
diff --git a/Audio/SE/Cries/LATIOS.ogg b/Audio/SE/Cries/LATIOS.ogg
deleted file mode 100644
index 24d0bd000..000000000
Binary files a/Audio/SE/Cries/LATIOS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LATIOS_1.ogg b/Audio/SE/Cries/LATIOS_1.ogg
deleted file mode 100644
index 57a40bef5..000000000
Binary files a/Audio/SE/Cries/LATIOS_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LEAFEON.mp3 b/Audio/SE/Cries/LEAFEON.mp3
new file mode 100644
index 000000000..533d8288c
Binary files /dev/null and b/Audio/SE/Cries/LEAFEON.mp3 differ
diff --git a/Audio/SE/Cries/LEAFEON.ogg b/Audio/SE/Cries/LEAFEON.ogg
deleted file mode 100644
index 425447ca4..000000000
Binary files a/Audio/SE/Cries/LEAFEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LEAVANNY.ogg b/Audio/SE/Cries/LEAVANNY.ogg
deleted file mode 100644
index 043fea20d..000000000
Binary files a/Audio/SE/Cries/LEAVANNY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LEDIAN.mp3 b/Audio/SE/Cries/LEDIAN.mp3
new file mode 100644
index 000000000..2189f4e3c
Binary files /dev/null and b/Audio/SE/Cries/LEDIAN.mp3 differ
diff --git a/Audio/SE/Cries/LEDIAN.ogg b/Audio/SE/Cries/LEDIAN.ogg
deleted file mode 100644
index 93bc1f6d0..000000000
Binary files a/Audio/SE/Cries/LEDIAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LEDYBA.mp3 b/Audio/SE/Cries/LEDYBA.mp3
new file mode 100644
index 000000000..b4a21418a
Binary files /dev/null and b/Audio/SE/Cries/LEDYBA.mp3 differ
diff --git a/Audio/SE/Cries/LEDYBA.ogg b/Audio/SE/Cries/LEDYBA.ogg
deleted file mode 100644
index 2dac00a5d..000000000
Binary files a/Audio/SE/Cries/LEDYBA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LICKILICKY.mp3 b/Audio/SE/Cries/LICKILICKY.mp3
new file mode 100644
index 000000000..8ed819826
Binary files /dev/null and b/Audio/SE/Cries/LICKILICKY.mp3 differ
diff --git a/Audio/SE/Cries/LICKILICKY.ogg b/Audio/SE/Cries/LICKILICKY.ogg
deleted file mode 100644
index 2a2ceab20..000000000
Binary files a/Audio/SE/Cries/LICKILICKY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LICKITUNG.mp3 b/Audio/SE/Cries/LICKITUNG.mp3
new file mode 100644
index 000000000..c5ba3db9c
Binary files /dev/null and b/Audio/SE/Cries/LICKITUNG.mp3 differ
diff --git a/Audio/SE/Cries/LICKITUNG.ogg b/Audio/SE/Cries/LICKITUNG.ogg
deleted file mode 100644
index 96439c275..000000000
Binary files a/Audio/SE/Cries/LICKITUNG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LIEPARD.ogg b/Audio/SE/Cries/LIEPARD.ogg
deleted file mode 100644
index 35a0b01a3..000000000
Binary files a/Audio/SE/Cries/LIEPARD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LILEEP.mp3 b/Audio/SE/Cries/LILEEP.mp3
new file mode 100644
index 000000000..89a5f980b
Binary files /dev/null and b/Audio/SE/Cries/LILEEP.mp3 differ
diff --git a/Audio/SE/Cries/LILEEP.ogg b/Audio/SE/Cries/LILEEP.ogg
deleted file mode 100644
index 15379324f..000000000
Binary files a/Audio/SE/Cries/LILEEP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LILLIGANT.ogg b/Audio/SE/Cries/LILLIGANT.ogg
deleted file mode 100644
index 0ea397e57..000000000
Binary files a/Audio/SE/Cries/LILLIGANT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LILLIPUP.ogg b/Audio/SE/Cries/LILLIPUP.ogg
deleted file mode 100644
index 860a3bf97..000000000
Binary files a/Audio/SE/Cries/LILLIPUP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LINOONE.ogg b/Audio/SE/Cries/LINOONE.ogg
deleted file mode 100644
index 2b142e434..000000000
Binary files a/Audio/SE/Cries/LINOONE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LITLEO.ogg b/Audio/SE/Cries/LITLEO.ogg
deleted file mode 100644
index bef922e02..000000000
Binary files a/Audio/SE/Cries/LITLEO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LITTEN.ogg b/Audio/SE/Cries/LITTEN.ogg
deleted file mode 100644
index bcbfc2b72..000000000
Binary files a/Audio/SE/Cries/LITTEN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LITWICK.mp3 b/Audio/SE/Cries/LITWICK.mp3
new file mode 100644
index 000000000..c1ce47ae1
Binary files /dev/null and b/Audio/SE/Cries/LITWICK.mp3 differ
diff --git a/Audio/SE/Cries/LITWICK.ogg b/Audio/SE/Cries/LITWICK.ogg
deleted file mode 100644
index 9a489cabf..000000000
Binary files a/Audio/SE/Cries/LITWICK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LOMBRE.mp3 b/Audio/SE/Cries/LOMBRE.mp3
new file mode 100644
index 000000000..309bd8b8f
Binary files /dev/null and b/Audio/SE/Cries/LOMBRE.mp3 differ
diff --git a/Audio/SE/Cries/LOMBRE.ogg b/Audio/SE/Cries/LOMBRE.ogg
deleted file mode 100644
index 5cb11224b..000000000
Binary files a/Audio/SE/Cries/LOMBRE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LOPUNNY.mp3 b/Audio/SE/Cries/LOPUNNY.mp3
new file mode 100644
index 000000000..1379fd62e
Binary files /dev/null and b/Audio/SE/Cries/LOPUNNY.mp3 differ
diff --git a/Audio/SE/Cries/LOPUNNY.ogg b/Audio/SE/Cries/LOPUNNY.ogg
deleted file mode 100644
index 920691b91..000000000
Binary files a/Audio/SE/Cries/LOPUNNY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LOPUNNY_1.ogg b/Audio/SE/Cries/LOPUNNY_1.ogg
deleted file mode 100644
index 12d8465e1..000000000
Binary files a/Audio/SE/Cries/LOPUNNY_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LOTAD.mp3 b/Audio/SE/Cries/LOTAD.mp3
new file mode 100644
index 000000000..38f2cc84e
Binary files /dev/null and b/Audio/SE/Cries/LOTAD.mp3 differ
diff --git a/Audio/SE/Cries/LOTAD.ogg b/Audio/SE/Cries/LOTAD.ogg
deleted file mode 100644
index 37f016898..000000000
Binary files a/Audio/SE/Cries/LOTAD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LOUDRED.ogg b/Audio/SE/Cries/LOUDRED.ogg
deleted file mode 100644
index f9028ffa3..000000000
Binary files a/Audio/SE/Cries/LOUDRED.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUCARIO.mp3 b/Audio/SE/Cries/LUCARIO.mp3
new file mode 100644
index 000000000..62edd08a2
Binary files /dev/null and b/Audio/SE/Cries/LUCARIO.mp3 differ
diff --git a/Audio/SE/Cries/LUCARIO.ogg b/Audio/SE/Cries/LUCARIO.ogg
deleted file mode 100644
index 7d17925f7..000000000
Binary files a/Audio/SE/Cries/LUCARIO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUCARIO_1.ogg b/Audio/SE/Cries/LUCARIO_1.ogg
deleted file mode 100644
index f57c6f446..000000000
Binary files a/Audio/SE/Cries/LUCARIO_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUDICOLO.mp3 b/Audio/SE/Cries/LUDICOLO.mp3
new file mode 100644
index 000000000..2e25441b5
Binary files /dev/null and b/Audio/SE/Cries/LUDICOLO.mp3 differ
diff --git a/Audio/SE/Cries/LUDICOLO.ogg b/Audio/SE/Cries/LUDICOLO.ogg
deleted file mode 100644
index 5098fb739..000000000
Binary files a/Audio/SE/Cries/LUDICOLO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUGIA.mp3 b/Audio/SE/Cries/LUGIA.mp3
new file mode 100644
index 000000000..d8b88188f
Binary files /dev/null and b/Audio/SE/Cries/LUGIA.mp3 differ
diff --git a/Audio/SE/Cries/LUGIA.ogg b/Audio/SE/Cries/LUGIA.ogg
deleted file mode 100644
index 32b6de80e..000000000
Binary files a/Audio/SE/Cries/LUGIA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUMINEON.ogg b/Audio/SE/Cries/LUMINEON.ogg
deleted file mode 100644
index acc202466..000000000
Binary files a/Audio/SE/Cries/LUMINEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUNALA.ogg b/Audio/SE/Cries/LUNALA.ogg
deleted file mode 100644
index ab587c3d2..000000000
Binary files a/Audio/SE/Cries/LUNALA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUNATONE.ogg b/Audio/SE/Cries/LUNATONE.ogg
deleted file mode 100644
index 74b68407f..000000000
Binary files a/Audio/SE/Cries/LUNATONE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LURANTIS.mp3 b/Audio/SE/Cries/LURANTIS.mp3
new file mode 100644
index 000000000..72ac54509
Binary files /dev/null and b/Audio/SE/Cries/LURANTIS.mp3 differ
diff --git a/Audio/SE/Cries/LURANTIS.ogg b/Audio/SE/Cries/LURANTIS.ogg
deleted file mode 100644
index 77f6aa43a..000000000
Binary files a/Audio/SE/Cries/LURANTIS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUVDISC.mp3 b/Audio/SE/Cries/LUVDISC.mp3
new file mode 100644
index 000000000..d9bd5c9b4
Binary files /dev/null and b/Audio/SE/Cries/LUVDISC.mp3 differ
diff --git a/Audio/SE/Cries/LUVDISC.ogg b/Audio/SE/Cries/LUVDISC.ogg
deleted file mode 100644
index 39e745cdc..000000000
Binary files a/Audio/SE/Cries/LUVDISC.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUXIO.mp3 b/Audio/SE/Cries/LUXIO.mp3
new file mode 100644
index 000000000..52f3ed744
Binary files /dev/null and b/Audio/SE/Cries/LUXIO.mp3 differ
diff --git a/Audio/SE/Cries/LUXIO.ogg b/Audio/SE/Cries/LUXIO.ogg
deleted file mode 100644
index 4f6f8fe67..000000000
Binary files a/Audio/SE/Cries/LUXIO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LUXRAY.mp3 b/Audio/SE/Cries/LUXRAY.mp3
new file mode 100644
index 000000000..179137b1c
Binary files /dev/null and b/Audio/SE/Cries/LUXRAY.mp3 differ
diff --git a/Audio/SE/Cries/LUXRAY.ogg b/Audio/SE/Cries/LUXRAY.ogg
deleted file mode 100644
index 0a31ab752..000000000
Binary files a/Audio/SE/Cries/LUXRAY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LYCANROC.ogg b/Audio/SE/Cries/LYCANROC.ogg
deleted file mode 100644
index 01f2ce54a..000000000
Binary files a/Audio/SE/Cries/LYCANROC.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LYCANROC_D.mp3 b/Audio/SE/Cries/LYCANROC_D.mp3
new file mode 100644
index 000000000..a8450c315
Binary files /dev/null and b/Audio/SE/Cries/LYCANROC_D.mp3 differ
diff --git a/Audio/SE/Cries/LYCANROC_D.ogg b/Audio/SE/Cries/LYCANROC_D.ogg
deleted file mode 100644
index 88697266a..000000000
Binary files a/Audio/SE/Cries/LYCANROC_D.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/LYCANROC_N.mp3 b/Audio/SE/Cries/LYCANROC_N.mp3
new file mode 100644
index 000000000..064b91cb4
Binary files /dev/null and b/Audio/SE/Cries/LYCANROC_N.mp3 differ
diff --git a/Audio/SE/Cries/LYCANROC_N.ogg b/Audio/SE/Cries/LYCANROC_N.ogg
deleted file mode 100644
index 1913168a3..000000000
Binary files a/Audio/SE/Cries/LYCANROC_N.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MACHAMP.mp3 b/Audio/SE/Cries/MACHAMP.mp3
new file mode 100644
index 000000000..8ab2df835
Binary files /dev/null and b/Audio/SE/Cries/MACHAMP.mp3 differ
diff --git a/Audio/SE/Cries/MACHAMP.ogg b/Audio/SE/Cries/MACHAMP.ogg
deleted file mode 100644
index ca1cb5105..000000000
Binary files a/Audio/SE/Cries/MACHAMP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MACHOKE.mp3 b/Audio/SE/Cries/MACHOKE.mp3
new file mode 100644
index 000000000..6e5e948ab
Binary files /dev/null and b/Audio/SE/Cries/MACHOKE.mp3 differ
diff --git a/Audio/SE/Cries/MACHOKE.ogg b/Audio/SE/Cries/MACHOKE.ogg
deleted file mode 100644
index 71e408c62..000000000
Binary files a/Audio/SE/Cries/MACHOKE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MACHOP.mp3 b/Audio/SE/Cries/MACHOP.mp3
new file mode 100644
index 000000000..e8db1f011
Binary files /dev/null and b/Audio/SE/Cries/MACHOP.mp3 differ
diff --git a/Audio/SE/Cries/MACHOP.ogg b/Audio/SE/Cries/MACHOP.ogg
deleted file mode 100644
index f045618f2..000000000
Binary files a/Audio/SE/Cries/MACHOP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAGBY.mp3 b/Audio/SE/Cries/MAGBY.mp3
new file mode 100644
index 000000000..6643608c3
Binary files /dev/null and b/Audio/SE/Cries/MAGBY.mp3 differ
diff --git a/Audio/SE/Cries/MAGBY.ogg b/Audio/SE/Cries/MAGBY.ogg
deleted file mode 100644
index 5685525b5..000000000
Binary files a/Audio/SE/Cries/MAGBY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAGCARGO.mp3 b/Audio/SE/Cries/MAGCARGO.mp3
new file mode 100644
index 000000000..4c18096b9
Binary files /dev/null and b/Audio/SE/Cries/MAGCARGO.mp3 differ
diff --git a/Audio/SE/Cries/MAGCARGO.ogg b/Audio/SE/Cries/MAGCARGO.ogg
deleted file mode 100644
index ec9adf743..000000000
Binary files a/Audio/SE/Cries/MAGCARGO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAGEARNA.ogg b/Audio/SE/Cries/MAGEARNA.ogg
deleted file mode 100644
index bb94bfcec..000000000
Binary files a/Audio/SE/Cries/MAGEARNA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAGIKARP.mp3 b/Audio/SE/Cries/MAGIKARP.mp3
new file mode 100644
index 000000000..96cebbf49
Binary files /dev/null and b/Audio/SE/Cries/MAGIKARP.mp3 differ
diff --git a/Audio/SE/Cries/MAGIKARP.ogg b/Audio/SE/Cries/MAGIKARP.ogg
deleted file mode 100644
index d60c59c1d..000000000
Binary files a/Audio/SE/Cries/MAGIKARP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAGMAR.mp3 b/Audio/SE/Cries/MAGMAR.mp3
new file mode 100644
index 000000000..a3ee5fe44
Binary files /dev/null and b/Audio/SE/Cries/MAGMAR.mp3 differ
diff --git a/Audio/SE/Cries/MAGMAR.ogg b/Audio/SE/Cries/MAGMAR.ogg
deleted file mode 100644
index 84505fc2f..000000000
Binary files a/Audio/SE/Cries/MAGMAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAGMORTAR.mp3 b/Audio/SE/Cries/MAGMORTAR.mp3
new file mode 100644
index 000000000..23315737b
Binary files /dev/null and b/Audio/SE/Cries/MAGMORTAR.mp3 differ
diff --git a/Audio/SE/Cries/MAGMORTAR.ogg b/Audio/SE/Cries/MAGMORTAR.ogg
deleted file mode 100644
index b5865cedf..000000000
Binary files a/Audio/SE/Cries/MAGMORTAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAGNEMITE.mp3 b/Audio/SE/Cries/MAGNEMITE.mp3
new file mode 100644
index 000000000..b02c5fb80
Binary files /dev/null and b/Audio/SE/Cries/MAGNEMITE.mp3 differ
diff --git a/Audio/SE/Cries/MAGNEMITE.ogg b/Audio/SE/Cries/MAGNEMITE.ogg
deleted file mode 100644
index 8671d574d..000000000
Binary files a/Audio/SE/Cries/MAGNEMITE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAGNETON.mp3 b/Audio/SE/Cries/MAGNETON.mp3
new file mode 100644
index 000000000..a70b43448
Binary files /dev/null and b/Audio/SE/Cries/MAGNETON.mp3 differ
diff --git a/Audio/SE/Cries/MAGNETON.ogg b/Audio/SE/Cries/MAGNETON.ogg
deleted file mode 100644
index a7ca13122..000000000
Binary files a/Audio/SE/Cries/MAGNETON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAGNEZONE.mp3 b/Audio/SE/Cries/MAGNEZONE.mp3
new file mode 100644
index 000000000..b1f5e31dd
Binary files /dev/null and b/Audio/SE/Cries/MAGNEZONE.mp3 differ
diff --git a/Audio/SE/Cries/MAGNEZONE.ogg b/Audio/SE/Cries/MAGNEZONE.ogg
deleted file mode 100644
index ee8433fb4..000000000
Binary files a/Audio/SE/Cries/MAGNEZONE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAKUHITA.ogg b/Audio/SE/Cries/MAKUHITA.ogg
deleted file mode 100644
index 00aefe16d..000000000
Binary files a/Audio/SE/Cries/MAKUHITA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MALAMAR.ogg b/Audio/SE/Cries/MALAMAR.ogg
deleted file mode 100644
index 2c609e643..000000000
Binary files a/Audio/SE/Cries/MALAMAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAMOSWINE.mp3 b/Audio/SE/Cries/MAMOSWINE.mp3
new file mode 100644
index 000000000..8ca39806c
Binary files /dev/null and b/Audio/SE/Cries/MAMOSWINE.mp3 differ
diff --git a/Audio/SE/Cries/MAMOSWINE.ogg b/Audio/SE/Cries/MAMOSWINE.ogg
deleted file mode 100644
index 744ae761e..000000000
Binary files a/Audio/SE/Cries/MAMOSWINE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MANAPHY.ogg b/Audio/SE/Cries/MANAPHY.ogg
deleted file mode 100644
index 78bd40c60..000000000
Binary files a/Audio/SE/Cries/MANAPHY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MANDIBUZZ.ogg b/Audio/SE/Cries/MANDIBUZZ.ogg
deleted file mode 100644
index 167086096..000000000
Binary files a/Audio/SE/Cries/MANDIBUZZ.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MANECTRIC.ogg b/Audio/SE/Cries/MANECTRIC.ogg
deleted file mode 100644
index 063088de2..000000000
Binary files a/Audio/SE/Cries/MANECTRIC.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MANECTRIC_1.ogg b/Audio/SE/Cries/MANECTRIC_1.ogg
deleted file mode 100644
index 2e1075e92..000000000
Binary files a/Audio/SE/Cries/MANECTRIC_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MANKEY.mp3 b/Audio/SE/Cries/MANKEY.mp3
new file mode 100644
index 000000000..602006252
Binary files /dev/null and b/Audio/SE/Cries/MANKEY.mp3 differ
diff --git a/Audio/SE/Cries/MANKEY.ogg b/Audio/SE/Cries/MANKEY.ogg
deleted file mode 100644
index c16f30d1e..000000000
Binary files a/Audio/SE/Cries/MANKEY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MANTINE.mp3 b/Audio/SE/Cries/MANTINE.mp3
new file mode 100644
index 000000000..f032e7720
Binary files /dev/null and b/Audio/SE/Cries/MANTINE.mp3 differ
diff --git a/Audio/SE/Cries/MANTINE.ogg b/Audio/SE/Cries/MANTINE.ogg
deleted file mode 100644
index 9f9e01d5c..000000000
Binary files a/Audio/SE/Cries/MANTINE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MANTYKE.mp3 b/Audio/SE/Cries/MANTYKE.mp3
new file mode 100644
index 000000000..0c13b8dce
Binary files /dev/null and b/Audio/SE/Cries/MANTYKE.mp3 differ
diff --git a/Audio/SE/Cries/MANTYKE.ogg b/Audio/SE/Cries/MANTYKE.ogg
deleted file mode 100644
index 225e72fe1..000000000
Binary files a/Audio/SE/Cries/MANTYKE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MARACTUS.ogg b/Audio/SE/Cries/MARACTUS.ogg
deleted file mode 100644
index ec66aee73..000000000
Binary files a/Audio/SE/Cries/MARACTUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAREANIE.mp3 b/Audio/SE/Cries/MAREANIE.mp3
new file mode 100644
index 000000000..2a6e20ec4
Binary files /dev/null and b/Audio/SE/Cries/MAREANIE.mp3 differ
diff --git a/Audio/SE/Cries/MAREANIE.ogg b/Audio/SE/Cries/MAREANIE.ogg
deleted file mode 100644
index 38fa993e5..000000000
Binary files a/Audio/SE/Cries/MAREANIE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAREEP.mp3 b/Audio/SE/Cries/MAREEP.mp3
new file mode 100644
index 000000000..22094b90f
Binary files /dev/null and b/Audio/SE/Cries/MAREEP.mp3 differ
diff --git a/Audio/SE/Cries/MAREEP.ogg b/Audio/SE/Cries/MAREEP.ogg
deleted file mode 100644
index 6406d3ebe..000000000
Binary files a/Audio/SE/Cries/MAREEP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MARILL.mp3 b/Audio/SE/Cries/MARILL.mp3
new file mode 100644
index 000000000..8ec43fae7
Binary files /dev/null and b/Audio/SE/Cries/MARILL.mp3 differ
diff --git a/Audio/SE/Cries/MARILL.ogg b/Audio/SE/Cries/MARILL.ogg
deleted file mode 100644
index 61cc91fe5..000000000
Binary files a/Audio/SE/Cries/MARILL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAROWAK.mp3 b/Audio/SE/Cries/MAROWAK.mp3
new file mode 100644
index 000000000..293515db3
Binary files /dev/null and b/Audio/SE/Cries/MAROWAK.mp3 differ
diff --git a/Audio/SE/Cries/MAROWAK.ogg b/Audio/SE/Cries/MAROWAK.ogg
deleted file mode 100644
index 199c4477a..000000000
Binary files a/Audio/SE/Cries/MAROWAK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MARSHADOW.ogg b/Audio/SE/Cries/MARSHADOW.ogg
deleted file mode 100644
index 912bd0490..000000000
Binary files a/Audio/SE/Cries/MARSHADOW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MARSHTOMP.mp3 b/Audio/SE/Cries/MARSHTOMP.mp3
new file mode 100644
index 000000000..785da6e3b
Binary files /dev/null and b/Audio/SE/Cries/MARSHTOMP.mp3 differ
diff --git a/Audio/SE/Cries/MARSHTOMP.ogg b/Audio/SE/Cries/MARSHTOMP.ogg
deleted file mode 100644
index c78a37947..000000000
Binary files a/Audio/SE/Cries/MARSHTOMP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MASQUERAIN.ogg b/Audio/SE/Cries/MASQUERAIN.ogg
deleted file mode 100644
index bb184cf51..000000000
Binary files a/Audio/SE/Cries/MASQUERAIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAWILE.mp3 b/Audio/SE/Cries/MAWILE.mp3
new file mode 100644
index 000000000..9932a8142
Binary files /dev/null and b/Audio/SE/Cries/MAWILE.mp3 differ
diff --git a/Audio/SE/Cries/MAWILE.ogg b/Audio/SE/Cries/MAWILE.ogg
deleted file mode 100644
index d593dd8ee..000000000
Binary files a/Audio/SE/Cries/MAWILE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MAWILE_1.ogg b/Audio/SE/Cries/MAWILE_1.ogg
deleted file mode 100644
index e7ed0237f..000000000
Binary files a/Audio/SE/Cries/MAWILE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEDICHAM.ogg b/Audio/SE/Cries/MEDICHAM.ogg
deleted file mode 100644
index 9741835a2..000000000
Binary files a/Audio/SE/Cries/MEDICHAM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEDICHAM_1.ogg b/Audio/SE/Cries/MEDICHAM_1.ogg
deleted file mode 100644
index dc4c114d6..000000000
Binary files a/Audio/SE/Cries/MEDICHAM_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEDITITE.ogg b/Audio/SE/Cries/MEDITITE.ogg
deleted file mode 100644
index 67a741d7d..000000000
Binary files a/Audio/SE/Cries/MEDITITE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEGANIUM.mp3 b/Audio/SE/Cries/MEGANIUM.mp3
new file mode 100644
index 000000000..10398b86b
Binary files /dev/null and b/Audio/SE/Cries/MEGANIUM.mp3 differ
diff --git a/Audio/SE/Cries/MEGANIUM.ogg b/Audio/SE/Cries/MEGANIUM.ogg
deleted file mode 100644
index fa2bd5d64..000000000
Binary files a/Audio/SE/Cries/MEGANIUM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MELMETAL.ogg b/Audio/SE/Cries/MELMETAL.ogg
deleted file mode 100644
index f8a4e0873..000000000
Binary files a/Audio/SE/Cries/MELMETAL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MELOETTA_A.mp3 b/Audio/SE/Cries/MELOETTA_A.mp3
new file mode 100644
index 000000000..ca72449d7
Binary files /dev/null and b/Audio/SE/Cries/MELOETTA_A.mp3 differ
diff --git a/Audio/SE/Cries/MELOETTA_A.ogg b/Audio/SE/Cries/MELOETTA_A.ogg
deleted file mode 100644
index 3ed202c87..000000000
Binary files a/Audio/SE/Cries/MELOETTA_A.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MELOETTA_P.mp3 b/Audio/SE/Cries/MELOETTA_P.mp3
new file mode 100644
index 000000000..ca89efd4a
Binary files /dev/null and b/Audio/SE/Cries/MELOETTA_P.mp3 differ
diff --git a/Audio/SE/Cries/MELOETTA_P.ogg b/Audio/SE/Cries/MELOETTA_P.ogg
deleted file mode 100644
index 3ed202c87..000000000
Binary files a/Audio/SE/Cries/MELOETTA_P.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MELTAN.ogg b/Audio/SE/Cries/MELTAN.ogg
deleted file mode 100644
index 9f5a1440a..000000000
Binary files a/Audio/SE/Cries/MELTAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEOWSTIC.ogg b/Audio/SE/Cries/MEOWSTIC.ogg
deleted file mode 100644
index 934ace305..000000000
Binary files a/Audio/SE/Cries/MEOWSTIC.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEOWTH.mp3 b/Audio/SE/Cries/MEOWTH.mp3
new file mode 100644
index 000000000..76b780a13
Binary files /dev/null and b/Audio/SE/Cries/MEOWTH.mp3 differ
diff --git a/Audio/SE/Cries/MEOWTH.ogg b/Audio/SE/Cries/MEOWTH.ogg
deleted file mode 100644
index 605947bdc..000000000
Binary files a/Audio/SE/Cries/MEOWTH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MESPRIT.ogg b/Audio/SE/Cries/MESPRIT.ogg
deleted file mode 100644
index b095f8f78..000000000
Binary files a/Audio/SE/Cries/MESPRIT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/METAGROSS.mp3 b/Audio/SE/Cries/METAGROSS.mp3
new file mode 100644
index 000000000..bdd5f5283
Binary files /dev/null and b/Audio/SE/Cries/METAGROSS.mp3 differ
diff --git a/Audio/SE/Cries/METAGROSS.ogg b/Audio/SE/Cries/METAGROSS.ogg
deleted file mode 100644
index ff2befb81..000000000
Binary files a/Audio/SE/Cries/METAGROSS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/METAGROSS_1.ogg b/Audio/SE/Cries/METAGROSS_1.ogg
deleted file mode 100644
index 67c9c4ba0..000000000
Binary files a/Audio/SE/Cries/METAGROSS_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/METANG.mp3 b/Audio/SE/Cries/METANG.mp3
new file mode 100644
index 000000000..a585017c4
Binary files /dev/null and b/Audio/SE/Cries/METANG.mp3 differ
diff --git a/Audio/SE/Cries/METANG.ogg b/Audio/SE/Cries/METANG.ogg
deleted file mode 100644
index c3efac838..000000000
Binary files a/Audio/SE/Cries/METANG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/METAPOD.mp3 b/Audio/SE/Cries/METAPOD.mp3
new file mode 100644
index 000000000..694e3d1c1
Binary files /dev/null and b/Audio/SE/Cries/METAPOD.mp3 differ
diff --git a/Audio/SE/Cries/METAPOD.ogg b/Audio/SE/Cries/METAPOD.ogg
deleted file mode 100644
index e05efef16..000000000
Binary files a/Audio/SE/Cries/METAPOD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEW.mp3 b/Audio/SE/Cries/MEW.mp3
new file mode 100644
index 000000000..16891cd28
Binary files /dev/null and b/Audio/SE/Cries/MEW.mp3 differ
diff --git a/Audio/SE/Cries/MEW.ogg b/Audio/SE/Cries/MEW.ogg
deleted file mode 100644
index b4613f3d9..000000000
Binary files a/Audio/SE/Cries/MEW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEWTWO.mp3 b/Audio/SE/Cries/MEWTWO.mp3
new file mode 100644
index 000000000..77977b9e5
Binary files /dev/null and b/Audio/SE/Cries/MEWTWO.mp3 differ
diff --git a/Audio/SE/Cries/MEWTWO.ogg b/Audio/SE/Cries/MEWTWO.ogg
deleted file mode 100644
index df2eba62c..000000000
Binary files a/Audio/SE/Cries/MEWTWO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEWTWO.wav b/Audio/SE/Cries/MEWTWO.wav
new file mode 100644
index 000000000..06df38a6f
Binary files /dev/null and b/Audio/SE/Cries/MEWTWO.wav differ
diff --git a/Audio/SE/Cries/MEWTWO_1.ogg b/Audio/SE/Cries/MEWTWO_1.ogg
deleted file mode 100644
index 9fa7739c4..000000000
Binary files a/Audio/SE/Cries/MEWTWO_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MEWTWO_2.ogg b/Audio/SE/Cries/MEWTWO_2.ogg
deleted file mode 100644
index 17c178c6a..000000000
Binary files a/Audio/SE/Cries/MEWTWO_2.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MIENFOO.ogg b/Audio/SE/Cries/MIENFOO.ogg
deleted file mode 100644
index 75a1efb4d..000000000
Binary files a/Audio/SE/Cries/MIENFOO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MIENSHAO.ogg b/Audio/SE/Cries/MIENSHAO.ogg
deleted file mode 100644
index fe66a14ee..000000000
Binary files a/Audio/SE/Cries/MIENSHAO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MIGHTYENA.ogg b/Audio/SE/Cries/MIGHTYENA.ogg
deleted file mode 100644
index a927f4b10..000000000
Binary files a/Audio/SE/Cries/MIGHTYENA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MILCERY.ogg b/Audio/SE/Cries/MILCERY.ogg
deleted file mode 100644
index 599f1f500..000000000
Binary files a/Audio/SE/Cries/MILCERY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MILOTIC.mp3 b/Audio/SE/Cries/MILOTIC.mp3
new file mode 100644
index 000000000..79f246bf4
Binary files /dev/null and b/Audio/SE/Cries/MILOTIC.mp3 differ
diff --git a/Audio/SE/Cries/MILOTIC.ogg b/Audio/SE/Cries/MILOTIC.ogg
deleted file mode 100644
index ad317abce..000000000
Binary files a/Audio/SE/Cries/MILOTIC.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MILTANK.mp3 b/Audio/SE/Cries/MILTANK.mp3
new file mode 100644
index 000000000..bb2e96895
Binary files /dev/null and b/Audio/SE/Cries/MILTANK.mp3 differ
diff --git a/Audio/SE/Cries/MILTANK.ogg b/Audio/SE/Cries/MILTANK.ogg
deleted file mode 100644
index ed482ef44..000000000
Binary files a/Audio/SE/Cries/MILTANK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MIMEJR.mp3 b/Audio/SE/Cries/MIMEJR.mp3
new file mode 100644
index 000000000..4c485a3f9
Binary files /dev/null and b/Audio/SE/Cries/MIMEJR.mp3 differ
diff --git a/Audio/SE/Cries/MIMEJR.ogg b/Audio/SE/Cries/MIMEJR.ogg
deleted file mode 100644
index 834faea70..000000000
Binary files a/Audio/SE/Cries/MIMEJR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MIMIKYU.mp3 b/Audio/SE/Cries/MIMIKYU.mp3
new file mode 100644
index 000000000..3c9f496ec
Binary files /dev/null and b/Audio/SE/Cries/MIMIKYU.mp3 differ
diff --git a/Audio/SE/Cries/MIMIKYU.ogg b/Audio/SE/Cries/MIMIKYU.ogg
deleted file mode 100644
index 7edcc199f..000000000
Binary files a/Audio/SE/Cries/MIMIKYU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MINCCINO.ogg b/Audio/SE/Cries/MINCCINO.ogg
deleted file mode 100644
index f3649df6f..000000000
Binary files a/Audio/SE/Cries/MINCCINO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MINIOR_C.mp3 b/Audio/SE/Cries/MINIOR_C.mp3
new file mode 100644
index 000000000..4851062f6
Binary files /dev/null and b/Audio/SE/Cries/MINIOR_C.mp3 differ
diff --git a/Audio/SE/Cries/MINIOR_C.ogg b/Audio/SE/Cries/MINIOR_C.ogg
deleted file mode 100644
index 3951c1ff5..000000000
Binary files a/Audio/SE/Cries/MINIOR_C.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MINIOR_M.mp3 b/Audio/SE/Cries/MINIOR_M.mp3
new file mode 100644
index 000000000..10e50f1b8
Binary files /dev/null and b/Audio/SE/Cries/MINIOR_M.mp3 differ
diff --git a/Audio/SE/Cries/MINIOR_M.ogg b/Audio/SE/Cries/MINIOR_M.ogg
deleted file mode 100644
index 3951c1ff5..000000000
Binary files a/Audio/SE/Cries/MINIOR_M.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MINUN.ogg b/Audio/SE/Cries/MINUN.ogg
deleted file mode 100644
index 5b49bd268..000000000
Binary files a/Audio/SE/Cries/MINUN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MISDREAVUS.mp3 b/Audio/SE/Cries/MISDREAVUS.mp3
new file mode 100644
index 000000000..ada6a1932
Binary files /dev/null and b/Audio/SE/Cries/MISDREAVUS.mp3 differ
diff --git a/Audio/SE/Cries/MISDREAVUS.ogg b/Audio/SE/Cries/MISDREAVUS.ogg
deleted file mode 100644
index a50e5627b..000000000
Binary files a/Audio/SE/Cries/MISDREAVUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MISMAGIUS.mp3 b/Audio/SE/Cries/MISMAGIUS.mp3
new file mode 100644
index 000000000..99bc7874c
Binary files /dev/null and b/Audio/SE/Cries/MISMAGIUS.mp3 differ
diff --git a/Audio/SE/Cries/MISMAGIUS.ogg b/Audio/SE/Cries/MISMAGIUS.ogg
deleted file mode 100644
index 47c053816..000000000
Binary files a/Audio/SE/Cries/MISMAGIUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MOLTRES.mp3 b/Audio/SE/Cries/MOLTRES.mp3
new file mode 100644
index 000000000..458996f63
Binary files /dev/null and b/Audio/SE/Cries/MOLTRES.mp3 differ
diff --git a/Audio/SE/Cries/MOLTRES.ogg b/Audio/SE/Cries/MOLTRES.ogg
deleted file mode 100644
index 39349eeee..000000000
Binary files a/Audio/SE/Cries/MOLTRES.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MONFERNO.mp3 b/Audio/SE/Cries/MONFERNO.mp3
new file mode 100644
index 000000000..bc9b2296a
Binary files /dev/null and b/Audio/SE/Cries/MONFERNO.mp3 differ
diff --git a/Audio/SE/Cries/MONFERNO.ogg b/Audio/SE/Cries/MONFERNO.ogg
deleted file mode 100644
index e4e16f628..000000000
Binary files a/Audio/SE/Cries/MONFERNO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MORELULL.ogg b/Audio/SE/Cries/MORELULL.ogg
deleted file mode 100644
index 34e8af381..000000000
Binary files a/Audio/SE/Cries/MORELULL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MORGREM.ogg b/Audio/SE/Cries/MORGREM.ogg
deleted file mode 100644
index 3c8f88547..000000000
Binary files a/Audio/SE/Cries/MORGREM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MORPEKO.ogg b/Audio/SE/Cries/MORPEKO.ogg
deleted file mode 100644
index ecbe6b3ed..000000000
Binary files a/Audio/SE/Cries/MORPEKO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MORPEKO_1.ogg b/Audio/SE/Cries/MORPEKO_1.ogg
deleted file mode 100644
index a3c32ba1a..000000000
Binary files a/Audio/SE/Cries/MORPEKO_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MOTHIM.ogg b/Audio/SE/Cries/MOTHIM.ogg
deleted file mode 100644
index 28b331d5c..000000000
Binary files a/Audio/SE/Cries/MOTHIM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MRMIME.mp3 b/Audio/SE/Cries/MRMIME.mp3
new file mode 100644
index 000000000..0927ded5c
Binary files /dev/null and b/Audio/SE/Cries/MRMIME.mp3 differ
diff --git a/Audio/SE/Cries/MRMIME.ogg b/Audio/SE/Cries/MRMIME.ogg
index 02e6a26d8..46682c2e2 100644
Binary files a/Audio/SE/Cries/MRMIME.ogg and b/Audio/SE/Cries/MRMIME.ogg differ
diff --git a/Audio/SE/Cries/MRRIME.ogg b/Audio/SE/Cries/MRRIME.ogg
deleted file mode 100644
index fbd502743..000000000
Binary files a/Audio/SE/Cries/MRRIME.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MUDBRAY.ogg b/Audio/SE/Cries/MUDBRAY.ogg
deleted file mode 100644
index 05d48ed24..000000000
Binary files a/Audio/SE/Cries/MUDBRAY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MUDKIP.mp3 b/Audio/SE/Cries/MUDKIP.mp3
new file mode 100644
index 000000000..d3425e691
Binary files /dev/null and b/Audio/SE/Cries/MUDKIP.mp3 differ
diff --git a/Audio/SE/Cries/MUDKIP.ogg b/Audio/SE/Cries/MUDKIP.ogg
deleted file mode 100644
index 34b8ee8a0..000000000
Binary files a/Audio/SE/Cries/MUDKIP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MUDSDALE.ogg b/Audio/SE/Cries/MUDSDALE.ogg
deleted file mode 100644
index e4763ab99..000000000
Binary files a/Audio/SE/Cries/MUDSDALE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MUK.mp3 b/Audio/SE/Cries/MUK.mp3
new file mode 100644
index 000000000..10095cb02
Binary files /dev/null and b/Audio/SE/Cries/MUK.mp3 differ
diff --git a/Audio/SE/Cries/MUK.ogg b/Audio/SE/Cries/MUK.ogg
deleted file mode 100644
index 0b734026c..000000000
Binary files a/Audio/SE/Cries/MUK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MUNCHLAX.mp3 b/Audio/SE/Cries/MUNCHLAX.mp3
new file mode 100644
index 000000000..c1a958a1a
Binary files /dev/null and b/Audio/SE/Cries/MUNCHLAX.mp3 differ
diff --git a/Audio/SE/Cries/MUNCHLAX.ogg b/Audio/SE/Cries/MUNCHLAX.ogg
deleted file mode 100644
index 4e61b1e9b..000000000
Binary files a/Audio/SE/Cries/MUNCHLAX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MUNNA.ogg b/Audio/SE/Cries/MUNNA.ogg
deleted file mode 100644
index ff5c4efd5..000000000
Binary files a/Audio/SE/Cries/MUNNA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MURKROW.mp3 b/Audio/SE/Cries/MURKROW.mp3
new file mode 100644
index 000000000..b03ad746f
Binary files /dev/null and b/Audio/SE/Cries/MURKROW.mp3 differ
diff --git a/Audio/SE/Cries/MURKROW.ogg b/Audio/SE/Cries/MURKROW.ogg
deleted file mode 100644
index 346dae3f1..000000000
Binary files a/Audio/SE/Cries/MURKROW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/MUSHARNA.ogg b/Audio/SE/Cries/MUSHARNA.ogg
deleted file mode 100644
index 185211b12..000000000
Binary files a/Audio/SE/Cries/MUSHARNA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NAGANADEL.ogg b/Audio/SE/Cries/NAGANADEL.ogg
deleted file mode 100644
index 51f549787..000000000
Binary files a/Audio/SE/Cries/NAGANADEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NATU.mp3 b/Audio/SE/Cries/NATU.mp3
new file mode 100644
index 000000000..440bbc4b0
Binary files /dev/null and b/Audio/SE/Cries/NATU.mp3 differ
diff --git a/Audio/SE/Cries/NATU.ogg b/Audio/SE/Cries/NATU.ogg
deleted file mode 100644
index b357d82c3..000000000
Binary files a/Audio/SE/Cries/NATU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NECROZMA.mp3 b/Audio/SE/Cries/NECROZMA.mp3
new file mode 100644
index 000000000..23a387c65
Binary files /dev/null and b/Audio/SE/Cries/NECROZMA.mp3 differ
diff --git a/Audio/SE/Cries/NECROZMA.ogg b/Audio/SE/Cries/NECROZMA.ogg
deleted file mode 100644
index 150c194fe..000000000
Binary files a/Audio/SE/Cries/NECROZMA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NECROZMA_1.ogg b/Audio/SE/Cries/NECROZMA_1.ogg
deleted file mode 100644
index cfb00194f..000000000
Binary files a/Audio/SE/Cries/NECROZMA_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NECROZMA_2.ogg b/Audio/SE/Cries/NECROZMA_2.ogg
deleted file mode 100644
index e414e8fa9..000000000
Binary files a/Audio/SE/Cries/NECROZMA_2.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NECROZMA_4.ogg b/Audio/SE/Cries/NECROZMA_4.ogg
deleted file mode 100644
index 96bee1565..000000000
Binary files a/Audio/SE/Cries/NECROZMA_4.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NICKIT.ogg b/Audio/SE/Cries/NICKIT.ogg
deleted file mode 100644
index adefef530..000000000
Binary files a/Audio/SE/Cries/NICKIT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NIDOKING.mp3 b/Audio/SE/Cries/NIDOKING.mp3
new file mode 100644
index 000000000..2ab94ccca
Binary files /dev/null and b/Audio/SE/Cries/NIDOKING.mp3 differ
diff --git a/Audio/SE/Cries/NIDOKING.ogg b/Audio/SE/Cries/NIDOKING.ogg
deleted file mode 100644
index ab9bf7299..000000000
Binary files a/Audio/SE/Cries/NIDOKING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NIDOQUEEN.mp3 b/Audio/SE/Cries/NIDOQUEEN.mp3
new file mode 100644
index 000000000..e2428754c
Binary files /dev/null and b/Audio/SE/Cries/NIDOQUEEN.mp3 differ
diff --git a/Audio/SE/Cries/NIDOQUEEN.ogg b/Audio/SE/Cries/NIDOQUEEN.ogg
deleted file mode 100644
index 0f8bf2ffb..000000000
Binary files a/Audio/SE/Cries/NIDOQUEEN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NIDORANfE.mp3 b/Audio/SE/Cries/NIDORANfE.mp3
new file mode 100644
index 000000000..bcf69f2fe
Binary files /dev/null and b/Audio/SE/Cries/NIDORANfE.mp3 differ
diff --git a/Audio/SE/Cries/NIDORANfE.ogg b/Audio/SE/Cries/NIDORANfE.ogg
deleted file mode 100644
index a1a93ee53..000000000
Binary files a/Audio/SE/Cries/NIDORANfE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NIDORANmA.mp3 b/Audio/SE/Cries/NIDORANmA.mp3
new file mode 100644
index 000000000..126e1d2e3
Binary files /dev/null and b/Audio/SE/Cries/NIDORANmA.mp3 differ
diff --git a/Audio/SE/Cries/NIDORANmA.ogg b/Audio/SE/Cries/NIDORANmA.ogg
deleted file mode 100644
index 5cbcec525..000000000
Binary files a/Audio/SE/Cries/NIDORANmA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NIDORINA.mp3 b/Audio/SE/Cries/NIDORINA.mp3
new file mode 100644
index 000000000..bc3cdfec1
Binary files /dev/null and b/Audio/SE/Cries/NIDORINA.mp3 differ
diff --git a/Audio/SE/Cries/NIDORINA.ogg b/Audio/SE/Cries/NIDORINA.ogg
deleted file mode 100644
index 9ef8334b6..000000000
Binary files a/Audio/SE/Cries/NIDORINA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NIDORINO.ogg b/Audio/SE/Cries/NIDORINO.ogg
deleted file mode 100644
index 44f4e1103..000000000
Binary files a/Audio/SE/Cries/NIDORINO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NIHILEGO.ogg b/Audio/SE/Cries/NIHILEGO.ogg
deleted file mode 100644
index f32dee332..000000000
Binary files a/Audio/SE/Cries/NIHILEGO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NINCADA.mp3 b/Audio/SE/Cries/NINCADA.mp3
new file mode 100644
index 000000000..233862ffb
Binary files /dev/null and b/Audio/SE/Cries/NINCADA.mp3 differ
diff --git a/Audio/SE/Cries/NINCADA.ogg b/Audio/SE/Cries/NINCADA.ogg
deleted file mode 100644
index 2de8a9dc7..000000000
Binary files a/Audio/SE/Cries/NINCADA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NINETALES.mp3 b/Audio/SE/Cries/NINETALES.mp3
new file mode 100644
index 000000000..d9f37c5b8
Binary files /dev/null and b/Audio/SE/Cries/NINETALES.mp3 differ
diff --git a/Audio/SE/Cries/NINETALES.ogg b/Audio/SE/Cries/NINETALES.ogg
deleted file mode 100644
index 427762398..000000000
Binary files a/Audio/SE/Cries/NINETALES.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NINJASK.mp3 b/Audio/SE/Cries/NINJASK.mp3
new file mode 100644
index 000000000..fb58974f4
Binary files /dev/null and b/Audio/SE/Cries/NINJASK.mp3 differ
diff --git a/Audio/SE/Cries/NINJASK.ogg b/Audio/SE/Cries/NINJASK.ogg
deleted file mode 100644
index 8d07c6841..000000000
Binary files a/Audio/SE/Cries/NINJASK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NOCTOWL.mp3 b/Audio/SE/Cries/NOCTOWL.mp3
new file mode 100644
index 000000000..cb1b048f3
Binary files /dev/null and b/Audio/SE/Cries/NOCTOWL.mp3 differ
diff --git a/Audio/SE/Cries/NOCTOWL.ogg b/Audio/SE/Cries/NOCTOWL.ogg
deleted file mode 100644
index 8e2ced9e7..000000000
Binary files a/Audio/SE/Cries/NOCTOWL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NOIBAT.mp3 b/Audio/SE/Cries/NOIBAT.mp3
new file mode 100644
index 000000000..b1fab80d2
Binary files /dev/null and b/Audio/SE/Cries/NOIBAT.mp3 differ
diff --git a/Audio/SE/Cries/NOIBAT.ogg b/Audio/SE/Cries/NOIBAT.ogg
deleted file mode 100644
index 7bbd3d9e1..000000000
Binary files a/Audio/SE/Cries/NOIBAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NOIVERN.mp3 b/Audio/SE/Cries/NOIVERN.mp3
new file mode 100644
index 000000000..6fed55c22
Binary files /dev/null and b/Audio/SE/Cries/NOIVERN.mp3 differ
diff --git a/Audio/SE/Cries/NOIVERN.ogg b/Audio/SE/Cries/NOIVERN.ogg
deleted file mode 100644
index 199aa758d..000000000
Binary files a/Audio/SE/Cries/NOIVERN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NOSEPASS.mp3 b/Audio/SE/Cries/NOSEPASS.mp3
new file mode 100644
index 000000000..35b9bcf99
Binary files /dev/null and b/Audio/SE/Cries/NOSEPASS.mp3 differ
diff --git a/Audio/SE/Cries/NOSEPASS.ogg b/Audio/SE/Cries/NOSEPASS.ogg
deleted file mode 100644
index 9afe923d2..000000000
Binary files a/Audio/SE/Cries/NOSEPASS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NUMEL.ogg b/Audio/SE/Cries/NUMEL.ogg
deleted file mode 100644
index 486273145..000000000
Binary files a/Audio/SE/Cries/NUMEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/NUZLEAF.ogg b/Audio/SE/Cries/NUZLEAF.ogg
deleted file mode 100644
index 41509bf04..000000000
Binary files a/Audio/SE/Cries/NUZLEAF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/OBSTAGOON.ogg b/Audio/SE/Cries/OBSTAGOON.ogg
deleted file mode 100644
index 030a613e0..000000000
Binary files a/Audio/SE/Cries/OBSTAGOON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/OCTILLERY.mp3 b/Audio/SE/Cries/OCTILLERY.mp3
new file mode 100644
index 000000000..a811e69ad
Binary files /dev/null and b/Audio/SE/Cries/OCTILLERY.mp3 differ
diff --git a/Audio/SE/Cries/OCTILLERY.ogg b/Audio/SE/Cries/OCTILLERY.ogg
deleted file mode 100644
index 6803db49a..000000000
Binary files a/Audio/SE/Cries/OCTILLERY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ODDISH.mp3 b/Audio/SE/Cries/ODDISH.mp3
new file mode 100644
index 000000000..bb51ac928
Binary files /dev/null and b/Audio/SE/Cries/ODDISH.mp3 differ
diff --git a/Audio/SE/Cries/ODDISH.ogg b/Audio/SE/Cries/ODDISH.ogg
deleted file mode 100644
index 6e564135c..000000000
Binary files a/Audio/SE/Cries/ODDISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/OMANYTE.mp3 b/Audio/SE/Cries/OMANYTE.mp3
new file mode 100644
index 000000000..8de453d7d
Binary files /dev/null and b/Audio/SE/Cries/OMANYTE.mp3 differ
diff --git a/Audio/SE/Cries/OMANYTE.ogg b/Audio/SE/Cries/OMANYTE.ogg
deleted file mode 100644
index 51efd2164..000000000
Binary files a/Audio/SE/Cries/OMANYTE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/OMANYTE.wav b/Audio/SE/Cries/OMANYTE.wav
new file mode 100644
index 000000000..2caef281e
Binary files /dev/null and b/Audio/SE/Cries/OMANYTE.wav differ
diff --git a/Audio/SE/Cries/OMASTAR.mp3 b/Audio/SE/Cries/OMASTAR.mp3
new file mode 100644
index 000000000..e7716d011
Binary files /dev/null and b/Audio/SE/Cries/OMASTAR.mp3 differ
diff --git a/Audio/SE/Cries/OMASTAR.ogg b/Audio/SE/Cries/OMASTAR.ogg
deleted file mode 100644
index 8d8c2a1b7..000000000
Binary files a/Audio/SE/Cries/OMASTAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/OMASTAR.wav b/Audio/SE/Cries/OMASTAR.wav
new file mode 100644
index 000000000..db4f2ce2f
Binary files /dev/null and b/Audio/SE/Cries/OMASTAR.wav differ
diff --git a/Audio/SE/Cries/ONIX.mp3 b/Audio/SE/Cries/ONIX.mp3
new file mode 100644
index 000000000..80a82b188
Binary files /dev/null and b/Audio/SE/Cries/ONIX.mp3 differ
diff --git a/Audio/SE/Cries/ONIX.ogg b/Audio/SE/Cries/ONIX.ogg
deleted file mode 100644
index 8a7c64472..000000000
Binary files a/Audio/SE/Cries/ONIX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ORANGURU.ogg b/Audio/SE/Cries/ORANGURU.ogg
deleted file mode 100644
index adb646a31..000000000
Binary files a/Audio/SE/Cries/ORANGURU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ORBEETLE.ogg b/Audio/SE/Cries/ORBEETLE.ogg
deleted file mode 100644
index 2b408dc9c..000000000
Binary files a/Audio/SE/Cries/ORBEETLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ORICORIO_1.mp3 b/Audio/SE/Cries/ORICORIO_1.mp3
new file mode 100644
index 000000000..20b389421
Binary files /dev/null and b/Audio/SE/Cries/ORICORIO_1.mp3 differ
diff --git a/Audio/SE/Cries/ORICORIO_1.ogg b/Audio/SE/Cries/ORICORIO_1.ogg
deleted file mode 100644
index 865cd28c6..000000000
Binary files a/Audio/SE/Cries/ORICORIO_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ORICORIO_2.mp3 b/Audio/SE/Cries/ORICORIO_2.mp3
new file mode 100644
index 000000000..0b6e1f3dc
Binary files /dev/null and b/Audio/SE/Cries/ORICORIO_2.mp3 differ
diff --git a/Audio/SE/Cries/ORICORIO_2.ogg b/Audio/SE/Cries/ORICORIO_2.ogg
deleted file mode 100644
index 951ea7242..000000000
Binary files a/Audio/SE/Cries/ORICORIO_2.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ORICORIO_3.mp3 b/Audio/SE/Cries/ORICORIO_3.mp3
new file mode 100644
index 000000000..4bd5acd0c
Binary files /dev/null and b/Audio/SE/Cries/ORICORIO_3.mp3 differ
diff --git a/Audio/SE/Cries/ORICORIO_3.ogg b/Audio/SE/Cries/ORICORIO_3.ogg
deleted file mode 100644
index c20e43f9a..000000000
Binary files a/Audio/SE/Cries/ORICORIO_3.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ORICORIO_4.mp3 b/Audio/SE/Cries/ORICORIO_4.mp3
new file mode 100644
index 000000000..8281492f8
Binary files /dev/null and b/Audio/SE/Cries/ORICORIO_4.mp3 differ
diff --git a/Audio/SE/Cries/ORICORIO_4.ogg b/Audio/SE/Cries/ORICORIO_4.ogg
deleted file mode 100644
index c20e43f9a..000000000
Binary files a/Audio/SE/Cries/ORICORIO_4.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/OSHAWOTT.ogg b/Audio/SE/Cries/OSHAWOTT.ogg
deleted file mode 100644
index 54e331aa6..000000000
Binary files a/Audio/SE/Cries/OSHAWOTT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PACHIRISU.ogg b/Audio/SE/Cries/PACHIRISU.ogg
deleted file mode 100644
index 976829e42..000000000
Binary files a/Audio/SE/Cries/PACHIRISU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PALKIA.mp3 b/Audio/SE/Cries/PALKIA.mp3
new file mode 100644
index 000000000..08180ea23
Binary files /dev/null and b/Audio/SE/Cries/PALKIA.mp3 differ
diff --git a/Audio/SE/Cries/PALKIA.ogg b/Audio/SE/Cries/PALKIA.ogg
deleted file mode 100644
index 34b944274..000000000
Binary files a/Audio/SE/Cries/PALKIA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PALOSSAND.mp3 b/Audio/SE/Cries/PALOSSAND.mp3
new file mode 100644
index 000000000..b2f589f20
Binary files /dev/null and b/Audio/SE/Cries/PALOSSAND.mp3 differ
diff --git a/Audio/SE/Cries/PALOSSAND.ogg b/Audio/SE/Cries/PALOSSAND.ogg
deleted file mode 100644
index 094a2988f..000000000
Binary files a/Audio/SE/Cries/PALOSSAND.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PALPITOAD.ogg b/Audio/SE/Cries/PALPITOAD.ogg
deleted file mode 100644
index c2609d1e4..000000000
Binary files a/Audio/SE/Cries/PALPITOAD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PANCHAM.ogg b/Audio/SE/Cries/PANCHAM.ogg
deleted file mode 100644
index 9482d7017..000000000
Binary files a/Audio/SE/Cries/PANCHAM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PANGORO.ogg b/Audio/SE/Cries/PANGORO.ogg
deleted file mode 100644
index 8544f19e4..000000000
Binary files a/Audio/SE/Cries/PANGORO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PANPOUR.ogg b/Audio/SE/Cries/PANPOUR.ogg
deleted file mode 100644
index a324d3550..000000000
Binary files a/Audio/SE/Cries/PANPOUR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PANSAGE.ogg b/Audio/SE/Cries/PANSAGE.ogg
deleted file mode 100644
index c8296a180..000000000
Binary files a/Audio/SE/Cries/PANSAGE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PANSEAR.ogg b/Audio/SE/Cries/PANSEAR.ogg
deleted file mode 100644
index db4566956..000000000
Binary files a/Audio/SE/Cries/PANSEAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PARAS.mp3 b/Audio/SE/Cries/PARAS.mp3
new file mode 100644
index 000000000..e456e321c
Binary files /dev/null and b/Audio/SE/Cries/PARAS.mp3 differ
diff --git a/Audio/SE/Cries/PARAS.ogg b/Audio/SE/Cries/PARAS.ogg
deleted file mode 100644
index 1051bac2d..000000000
Binary files a/Audio/SE/Cries/PARAS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PARASECT.mp3 b/Audio/SE/Cries/PARASECT.mp3
new file mode 100644
index 000000000..aeabe2a6e
Binary files /dev/null and b/Audio/SE/Cries/PARASECT.mp3 differ
diff --git a/Audio/SE/Cries/PARASECT.ogg b/Audio/SE/Cries/PARASECT.ogg
deleted file mode 100644
index a5031dc95..000000000
Binary files a/Audio/SE/Cries/PARASECT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PASSIMIAN.ogg b/Audio/SE/Cries/PASSIMIAN.ogg
deleted file mode 100644
index 4ed384c84..000000000
Binary files a/Audio/SE/Cries/PASSIMIAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PATRAT.ogg b/Audio/SE/Cries/PATRAT.ogg
deleted file mode 100644
index 261fbeffb..000000000
Binary files a/Audio/SE/Cries/PATRAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PAWNIARD.mp3 b/Audio/SE/Cries/PAWNIARD.mp3
new file mode 100644
index 000000000..26e383acb
Binary files /dev/null and b/Audio/SE/Cries/PAWNIARD.mp3 differ
diff --git a/Audio/SE/Cries/PAWNIARD.ogg b/Audio/SE/Cries/PAWNIARD.ogg
deleted file mode 100644
index aa6a88cd7..000000000
Binary files a/Audio/SE/Cries/PAWNIARD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PELIPPER.ogg b/Audio/SE/Cries/PELIPPER.ogg
deleted file mode 100644
index c35404d37..000000000
Binary files a/Audio/SE/Cries/PELIPPER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PERRSERKER.ogg b/Audio/SE/Cries/PERRSERKER.ogg
deleted file mode 100644
index 274b2d8bc..000000000
Binary files a/Audio/SE/Cries/PERRSERKER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PERSIAN.mp3 b/Audio/SE/Cries/PERSIAN.mp3
new file mode 100644
index 000000000..8f2be73c5
Binary files /dev/null and b/Audio/SE/Cries/PERSIAN.mp3 differ
diff --git a/Audio/SE/Cries/PERSIAN.ogg b/Audio/SE/Cries/PERSIAN.ogg
deleted file mode 100644
index 2006fafbe..000000000
Binary files a/Audio/SE/Cries/PERSIAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PETILIL.ogg b/Audio/SE/Cries/PETILIL.ogg
deleted file mode 100644
index a00df7a74..000000000
Binary files a/Audio/SE/Cries/PETILIL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PHANPY.mp3 b/Audio/SE/Cries/PHANPY.mp3
new file mode 100644
index 000000000..f06c64764
Binary files /dev/null and b/Audio/SE/Cries/PHANPY.mp3 differ
diff --git a/Audio/SE/Cries/PHANPY.ogg b/Audio/SE/Cries/PHANPY.ogg
deleted file mode 100644
index 5a9c418ca..000000000
Binary files a/Audio/SE/Cries/PHANPY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PHANTUMP.mp3 b/Audio/SE/Cries/PHANTUMP.mp3
new file mode 100644
index 000000000..670a3b245
Binary files /dev/null and b/Audio/SE/Cries/PHANTUMP.mp3 differ
diff --git a/Audio/SE/Cries/PHANTUMP.ogg b/Audio/SE/Cries/PHANTUMP.ogg
deleted file mode 100644
index dd3d8fd30..000000000
Binary files a/Audio/SE/Cries/PHANTUMP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PHEROMOSA.ogg b/Audio/SE/Cries/PHEROMOSA.ogg
deleted file mode 100644
index 708342b21..000000000
Binary files a/Audio/SE/Cries/PHEROMOSA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PHIONE.ogg b/Audio/SE/Cries/PHIONE.ogg
deleted file mode 100644
index 41b66606c..000000000
Binary files a/Audio/SE/Cries/PHIONE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PICHU.mp3 b/Audio/SE/Cries/PICHU.mp3
new file mode 100644
index 000000000..848c488b1
Binary files /dev/null and b/Audio/SE/Cries/PICHU.mp3 differ
diff --git a/Audio/SE/Cries/PICHU.ogg b/Audio/SE/Cries/PICHU.ogg
deleted file mode 100644
index 3c91de29a..000000000
Binary files a/Audio/SE/Cries/PICHU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIDGEOT.ogg b/Audio/SE/Cries/PIDGEOT.ogg
deleted file mode 100644
index 68582b691..000000000
Binary files a/Audio/SE/Cries/PIDGEOT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIDGEOTTO.mp3 b/Audio/SE/Cries/PIDGEOTTO.mp3
new file mode 100644
index 000000000..5fdbdfc75
Binary files /dev/null and b/Audio/SE/Cries/PIDGEOTTO.mp3 differ
diff --git a/Audio/SE/Cries/PIDGEOTTO.ogg b/Audio/SE/Cries/PIDGEOTTO.ogg
deleted file mode 100644
index 4e2574cf7..000000000
Binary files a/Audio/SE/Cries/PIDGEOTTO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIDGEOTTO.wav b/Audio/SE/Cries/PIDGEOTTO.wav
new file mode 100644
index 000000000..272abda7a
Binary files /dev/null and b/Audio/SE/Cries/PIDGEOTTO.wav differ
diff --git a/Audio/SE/Cries/PIDGEOT_1.ogg b/Audio/SE/Cries/PIDGEOT_1.ogg
deleted file mode 100644
index ed5f0bb6a..000000000
Binary files a/Audio/SE/Cries/PIDGEOT_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIDGEY.mp3 b/Audio/SE/Cries/PIDGEY.mp3
new file mode 100644
index 000000000..8f26ea9e2
Binary files /dev/null and b/Audio/SE/Cries/PIDGEY.mp3 differ
diff --git a/Audio/SE/Cries/PIDGEY.ogg b/Audio/SE/Cries/PIDGEY.ogg
deleted file mode 100644
index 5c8973503..000000000
Binary files a/Audio/SE/Cries/PIDGEY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIDGEY.wav b/Audio/SE/Cries/PIDGEY.wav
new file mode 100644
index 000000000..8e3486113
Binary files /dev/null and b/Audio/SE/Cries/PIDGEY.wav differ
diff --git a/Audio/SE/Cries/PIDOVE.ogg b/Audio/SE/Cries/PIDOVE.ogg
deleted file mode 100644
index 15de4b71c..000000000
Binary files a/Audio/SE/Cries/PIDOVE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIGNITE.ogg b/Audio/SE/Cries/PIGNITE.ogg
deleted file mode 100644
index 409cc2314..000000000
Binary files a/Audio/SE/Cries/PIGNITE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIKACHU.mp3 b/Audio/SE/Cries/PIKACHU.mp3
new file mode 100644
index 000000000..ce2b7709d
Binary files /dev/null and b/Audio/SE/Cries/PIKACHU.mp3 differ
diff --git a/Audio/SE/Cries/PIKACHU.ogg b/Audio/SE/Cries/PIKACHU.ogg
deleted file mode 100644
index f6238f3a8..000000000
Binary files a/Audio/SE/Cries/PIKACHU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIKIPEK.ogg b/Audio/SE/Cries/PIKIPEK.ogg
deleted file mode 100644
index ffdca65c8..000000000
Binary files a/Audio/SE/Cries/PIKIPEK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PILOSWINE.mp3 b/Audio/SE/Cries/PILOSWINE.mp3
new file mode 100644
index 000000000..98666e405
Binary files /dev/null and b/Audio/SE/Cries/PILOSWINE.mp3 differ
diff --git a/Audio/SE/Cries/PILOSWINE.ogg b/Audio/SE/Cries/PILOSWINE.ogg
deleted file mode 100644
index 71e70a58f..000000000
Binary files a/Audio/SE/Cries/PILOSWINE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PINCURCHIN.ogg b/Audio/SE/Cries/PINCURCHIN.ogg
deleted file mode 100644
index dae24e7dc..000000000
Binary files a/Audio/SE/Cries/PINCURCHIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PINECO.mp3 b/Audio/SE/Cries/PINECO.mp3
new file mode 100644
index 000000000..c7a2eb406
Binary files /dev/null and b/Audio/SE/Cries/PINECO.mp3 differ
diff --git a/Audio/SE/Cries/PINECO.ogg b/Audio/SE/Cries/PINECO.ogg
deleted file mode 100644
index 485264781..000000000
Binary files a/Audio/SE/Cries/PINECO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PINSIR.mp3 b/Audio/SE/Cries/PINSIR.mp3
new file mode 100644
index 000000000..90d4fda3a
Binary files /dev/null and b/Audio/SE/Cries/PINSIR.mp3 differ
diff --git a/Audio/SE/Cries/PINSIR.ogg b/Audio/SE/Cries/PINSIR.ogg
deleted file mode 100644
index 2cd4e0ddf..000000000
Binary files a/Audio/SE/Cries/PINSIR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PINSIR_1.ogg b/Audio/SE/Cries/PINSIR_1.ogg
deleted file mode 100644
index 7ef0321ad..000000000
Binary files a/Audio/SE/Cries/PINSIR_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIPLUP.mp3 b/Audio/SE/Cries/PIPLUP.mp3
new file mode 100644
index 000000000..182fa377d
Binary files /dev/null and b/Audio/SE/Cries/PIPLUP.mp3 differ
diff --git a/Audio/SE/Cries/PIPLUP.ogg b/Audio/SE/Cries/PIPLUP.ogg
deleted file mode 100644
index 19d17fee5..000000000
Binary files a/Audio/SE/Cries/PIPLUP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PIPLUP.wav b/Audio/SE/Cries/PIPLUP.wav
new file mode 100644
index 000000000..b3842e19e
Binary files /dev/null and b/Audio/SE/Cries/PIPLUP.wav differ
diff --git a/Audio/SE/Cries/PLUSLE.ogg b/Audio/SE/Cries/PLUSLE.ogg
deleted file mode 100644
index d0be7ecb1..000000000
Binary files a/Audio/SE/Cries/PLUSLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/POIPOLE.ogg b/Audio/SE/Cries/POIPOLE.ogg
deleted file mode 100644
index 6f3192d30..000000000
Binary files a/Audio/SE/Cries/POIPOLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/POLITOED.mp3 b/Audio/SE/Cries/POLITOED.mp3
new file mode 100644
index 000000000..28b0fbac3
Binary files /dev/null and b/Audio/SE/Cries/POLITOED.mp3 differ
diff --git a/Audio/SE/Cries/POLITOED.ogg b/Audio/SE/Cries/POLITOED.ogg
deleted file mode 100644
index 306325580..000000000
Binary files a/Audio/SE/Cries/POLITOED.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/POLIWAG.mp3 b/Audio/SE/Cries/POLIWAG.mp3
new file mode 100644
index 000000000..bddd1a0d0
Binary files /dev/null and b/Audio/SE/Cries/POLIWAG.mp3 differ
diff --git a/Audio/SE/Cries/POLIWAG.ogg b/Audio/SE/Cries/POLIWAG.ogg
deleted file mode 100644
index bf41a2d06..000000000
Binary files a/Audio/SE/Cries/POLIWAG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/POLIWHIRL.mp3 b/Audio/SE/Cries/POLIWHIRL.mp3
new file mode 100644
index 000000000..dc8f23bf4
Binary files /dev/null and b/Audio/SE/Cries/POLIWHIRL.mp3 differ
diff --git a/Audio/SE/Cries/POLIWHIRL.ogg b/Audio/SE/Cries/POLIWHIRL.ogg
deleted file mode 100644
index c86427cbf..000000000
Binary files a/Audio/SE/Cries/POLIWHIRL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/POLIWRATH.mp3 b/Audio/SE/Cries/POLIWRATH.mp3
new file mode 100644
index 000000000..dce51bf2d
Binary files /dev/null and b/Audio/SE/Cries/POLIWRATH.mp3 differ
diff --git a/Audio/SE/Cries/POLIWRATH.ogg b/Audio/SE/Cries/POLIWRATH.ogg
deleted file mode 100644
index 029ac9f3b..000000000
Binary files a/Audio/SE/Cries/POLIWRATH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/POLTEAGEIST.ogg b/Audio/SE/Cries/POLTEAGEIST.ogg
deleted file mode 100644
index 3d61cbd9d..000000000
Binary files a/Audio/SE/Cries/POLTEAGEIST.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PONYTA.mp3 b/Audio/SE/Cries/PONYTA.mp3
new file mode 100644
index 000000000..a92e1b40f
Binary files /dev/null and b/Audio/SE/Cries/PONYTA.mp3 differ
diff --git a/Audio/SE/Cries/PONYTA.ogg b/Audio/SE/Cries/PONYTA.ogg
deleted file mode 100644
index 84978d04b..000000000
Binary files a/Audio/SE/Cries/PONYTA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PONYTA.wav b/Audio/SE/Cries/PONYTA.wav
new file mode 100644
index 000000000..4bd3de58e
Binary files /dev/null and b/Audio/SE/Cries/PONYTA.wav differ
diff --git a/Audio/SE/Cries/POOCHYENA.ogg b/Audio/SE/Cries/POOCHYENA.ogg
deleted file mode 100644
index 6f04edd96..000000000
Binary files a/Audio/SE/Cries/POOCHYENA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/POPPLIO.ogg b/Audio/SE/Cries/POPPLIO.ogg
deleted file mode 100644
index 7bf136f69..000000000
Binary files a/Audio/SE/Cries/POPPLIO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PORYGON.mp3 b/Audio/SE/Cries/PORYGON.mp3
new file mode 100644
index 000000000..627f1f873
Binary files /dev/null and b/Audio/SE/Cries/PORYGON.mp3 differ
diff --git a/Audio/SE/Cries/PORYGON.ogg b/Audio/SE/Cries/PORYGON.ogg
deleted file mode 100644
index 993251ea1..000000000
Binary files a/Audio/SE/Cries/PORYGON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PORYGON2.mp3 b/Audio/SE/Cries/PORYGON2.mp3
new file mode 100644
index 000000000..b81d66010
Binary files /dev/null and b/Audio/SE/Cries/PORYGON2.mp3 differ
diff --git a/Audio/SE/Cries/PORYGON2.ogg b/Audio/SE/Cries/PORYGON2.ogg
deleted file mode 100644
index c339f79fb..000000000
Binary files a/Audio/SE/Cries/PORYGON2.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PORYGONZ.mp3 b/Audio/SE/Cries/PORYGONZ.mp3
new file mode 100644
index 000000000..848444aa7
Binary files /dev/null and b/Audio/SE/Cries/PORYGONZ.mp3 differ
diff --git a/Audio/SE/Cries/PORYGONZ.ogg b/Audio/SE/Cries/PORYGONZ.ogg
deleted file mode 100644
index c72f9f538..000000000
Binary files a/Audio/SE/Cries/PORYGONZ.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PRIMARINA.ogg b/Audio/SE/Cries/PRIMARINA.ogg
deleted file mode 100644
index 23b72707a..000000000
Binary files a/Audio/SE/Cries/PRIMARINA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PRIMEAPE.mp3 b/Audio/SE/Cries/PRIMEAPE.mp3
new file mode 100644
index 000000000..182b3f022
Binary files /dev/null and b/Audio/SE/Cries/PRIMEAPE.mp3 differ
diff --git a/Audio/SE/Cries/PRIMEAPE.ogg b/Audio/SE/Cries/PRIMEAPE.ogg
deleted file mode 100644
index 8d1477ca6..000000000
Binary files a/Audio/SE/Cries/PRIMEAPE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PRINPLUP.mp3 b/Audio/SE/Cries/PRINPLUP.mp3
new file mode 100644
index 000000000..ab9019b19
Binary files /dev/null and b/Audio/SE/Cries/PRINPLUP.mp3 differ
diff --git a/Audio/SE/Cries/PRINPLUP.ogg b/Audio/SE/Cries/PRINPLUP.ogg
deleted file mode 100644
index cfa66fcb2..000000000
Binary files a/Audio/SE/Cries/PRINPLUP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PROBOPASS.mp3 b/Audio/SE/Cries/PROBOPASS.mp3
new file mode 100644
index 000000000..72e4c730d
Binary files /dev/null and b/Audio/SE/Cries/PROBOPASS.mp3 differ
diff --git a/Audio/SE/Cries/PROBOPASS.ogg b/Audio/SE/Cries/PROBOPASS.ogg
deleted file mode 100644
index 3832c9e65..000000000
Binary files a/Audio/SE/Cries/PROBOPASS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PSYDUCK.mp3 b/Audio/SE/Cries/PSYDUCK.mp3
new file mode 100644
index 000000000..8f91ed9f5
Binary files /dev/null and b/Audio/SE/Cries/PSYDUCK.mp3 differ
diff --git a/Audio/SE/Cries/PSYDUCK.ogg b/Audio/SE/Cries/PSYDUCK.ogg
deleted file mode 100644
index cc324f0a1..000000000
Binary files a/Audio/SE/Cries/PSYDUCK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PUMPKABOO.mp3 b/Audio/SE/Cries/PUMPKABOO.mp3
new file mode 100644
index 000000000..577cc247d
Binary files /dev/null and b/Audio/SE/Cries/PUMPKABOO.mp3 differ
diff --git a/Audio/SE/Cries/PUMPKABOO.ogg b/Audio/SE/Cries/PUMPKABOO.ogg
deleted file mode 100644
index 26291700c..000000000
Binary files a/Audio/SE/Cries/PUMPKABOO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PUMPKABOO_3.ogg b/Audio/SE/Cries/PUMPKABOO_3.ogg
deleted file mode 100644
index b36371315..000000000
Binary files a/Audio/SE/Cries/PUMPKABOO_3.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PUPITAR.mp3 b/Audio/SE/Cries/PUPITAR.mp3
new file mode 100644
index 000000000..409ec083c
Binary files /dev/null and b/Audio/SE/Cries/PUPITAR.mp3 differ
diff --git a/Audio/SE/Cries/PUPITAR.ogg b/Audio/SE/Cries/PUPITAR.ogg
deleted file mode 100644
index 26f669ee0..000000000
Binary files a/Audio/SE/Cries/PUPITAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PURRLOIN.ogg b/Audio/SE/Cries/PURRLOIN.ogg
deleted file mode 100644
index a281149eb..000000000
Binary files a/Audio/SE/Cries/PURRLOIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PURUGLY.ogg b/Audio/SE/Cries/PURUGLY.ogg
deleted file mode 100644
index 160e21a8f..000000000
Binary files a/Audio/SE/Cries/PURUGLY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PYROAR.ogg b/Audio/SE/Cries/PYROAR.ogg
deleted file mode 100644
index 00e289f16..000000000
Binary files a/Audio/SE/Cries/PYROAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/PYUKUMUKU.mp3 b/Audio/SE/Cries/PYUKUMUKU.mp3
new file mode 100644
index 000000000..7c977f545
Binary files /dev/null and b/Audio/SE/Cries/PYUKUMUKU.mp3 differ
diff --git a/Audio/SE/Cries/PYUKUMUKU.ogg b/Audio/SE/Cries/PYUKUMUKU.ogg
deleted file mode 100644
index 8c4ac5985..000000000
Binary files a/Audio/SE/Cries/PYUKUMUKU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/QUAGSIRE.mp3 b/Audio/SE/Cries/QUAGSIRE.mp3
new file mode 100644
index 000000000..2663461e4
Binary files /dev/null and b/Audio/SE/Cries/QUAGSIRE.mp3 differ
diff --git a/Audio/SE/Cries/QUAGSIRE.ogg b/Audio/SE/Cries/QUAGSIRE.ogg
deleted file mode 100644
index 767a96b09..000000000
Binary files a/Audio/SE/Cries/QUAGSIRE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/QUILAVA.mp3 b/Audio/SE/Cries/QUILAVA.mp3
new file mode 100644
index 000000000..5dca9b9c4
Binary files /dev/null and b/Audio/SE/Cries/QUILAVA.mp3 differ
diff --git a/Audio/SE/Cries/QUILAVA.ogg b/Audio/SE/Cries/QUILAVA.ogg
deleted file mode 100644
index acb4c653d..000000000
Binary files a/Audio/SE/Cries/QUILAVA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/QUILLADIN.mp3 b/Audio/SE/Cries/QUILLADIN.mp3
new file mode 100644
index 000000000..ce62c4da1
Binary files /dev/null and b/Audio/SE/Cries/QUILLADIN.mp3 differ
diff --git a/Audio/SE/Cries/QUILLADIN.ogg b/Audio/SE/Cries/QUILLADIN.ogg
deleted file mode 100644
index 30678084a..000000000
Binary files a/Audio/SE/Cries/QUILLADIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/QWILFISH.mp3 b/Audio/SE/Cries/QWILFISH.mp3
new file mode 100644
index 000000000..35b6cebb1
Binary files /dev/null and b/Audio/SE/Cries/QWILFISH.mp3 differ
diff --git a/Audio/SE/Cries/QWILFISH.ogg b/Audio/SE/Cries/QWILFISH.ogg
deleted file mode 100644
index 3a478a7ab..000000000
Binary files a/Audio/SE/Cries/QWILFISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RABOOT.ogg b/Audio/SE/Cries/RABOOT.ogg
deleted file mode 100644
index 0a9ca80f1..000000000
Binary files a/Audio/SE/Cries/RABOOT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RAICHU.mp3 b/Audio/SE/Cries/RAICHU.mp3
new file mode 100644
index 000000000..9f298a345
Binary files /dev/null and b/Audio/SE/Cries/RAICHU.mp3 differ
diff --git a/Audio/SE/Cries/RAICHU.ogg b/Audio/SE/Cries/RAICHU.ogg
deleted file mode 100644
index fab198233..000000000
Binary files a/Audio/SE/Cries/RAICHU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RAIKOU.mp3 b/Audio/SE/Cries/RAIKOU.mp3
new file mode 100644
index 000000000..788e44bb2
Binary files /dev/null and b/Audio/SE/Cries/RAIKOU.mp3 differ
diff --git a/Audio/SE/Cries/RAIKOU.ogg b/Audio/SE/Cries/RAIKOU.ogg
deleted file mode 100644
index cb34da316..000000000
Binary files a/Audio/SE/Cries/RAIKOU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RALTS.mp3 b/Audio/SE/Cries/RALTS.mp3
new file mode 100644
index 000000000..2bcb673ad
Binary files /dev/null and b/Audio/SE/Cries/RALTS.mp3 differ
diff --git a/Audio/SE/Cries/RALTS.ogg b/Audio/SE/Cries/RALTS.ogg
deleted file mode 100644
index 6cecb31c9..000000000
Binary files a/Audio/SE/Cries/RALTS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RAMPARDOS.mp3 b/Audio/SE/Cries/RAMPARDOS.mp3
new file mode 100644
index 000000000..a1027ddd2
Binary files /dev/null and b/Audio/SE/Cries/RAMPARDOS.mp3 differ
diff --git a/Audio/SE/Cries/RAMPARDOS.ogg b/Audio/SE/Cries/RAMPARDOS.ogg
deleted file mode 100644
index adee8bc85..000000000
Binary files a/Audio/SE/Cries/RAMPARDOS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RAPIDASH.mp3 b/Audio/SE/Cries/RAPIDASH.mp3
new file mode 100644
index 000000000..1ac6dc854
Binary files /dev/null and b/Audio/SE/Cries/RAPIDASH.mp3 differ
diff --git a/Audio/SE/Cries/RAPIDASH.ogg b/Audio/SE/Cries/RAPIDASH.ogg
deleted file mode 100644
index 3afdad160..000000000
Binary files a/Audio/SE/Cries/RAPIDASH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RATICATE.mp3 b/Audio/SE/Cries/RATICATE.mp3
new file mode 100644
index 000000000..344fd0b5b
Binary files /dev/null and b/Audio/SE/Cries/RATICATE.mp3 differ
diff --git a/Audio/SE/Cries/RATICATE.ogg b/Audio/SE/Cries/RATICATE.ogg
deleted file mode 100644
index 50ad054c0..000000000
Binary files a/Audio/SE/Cries/RATICATE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RATTATA.mp3 b/Audio/SE/Cries/RATTATA.mp3
new file mode 100644
index 000000000..65a8464b9
Binary files /dev/null and b/Audio/SE/Cries/RATTATA.mp3 differ
diff --git a/Audio/SE/Cries/RATTATA.ogg b/Audio/SE/Cries/RATTATA.ogg
deleted file mode 100644
index fb8c70949..000000000
Binary files a/Audio/SE/Cries/RATTATA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RAYQUAZA.mp3 b/Audio/SE/Cries/RAYQUAZA.mp3
new file mode 100644
index 000000000..d54b829ec
Binary files /dev/null and b/Audio/SE/Cries/RAYQUAZA.mp3 differ
diff --git a/Audio/SE/Cries/RAYQUAZA.ogg b/Audio/SE/Cries/RAYQUAZA.ogg
deleted file mode 100644
index 6c6c4ec53..000000000
Binary files a/Audio/SE/Cries/RAYQUAZA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RAYQUAZA_1.ogg b/Audio/SE/Cries/RAYQUAZA_1.ogg
deleted file mode 100644
index 97f1ccae6..000000000
Binary files a/Audio/SE/Cries/RAYQUAZA_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/REGICE.mp3 b/Audio/SE/Cries/REGICE.mp3
new file mode 100644
index 000000000..76a8765c5
Binary files /dev/null and b/Audio/SE/Cries/REGICE.mp3 differ
diff --git a/Audio/SE/Cries/REGICE.ogg b/Audio/SE/Cries/REGICE.ogg
deleted file mode 100644
index 5f26afe28..000000000
Binary files a/Audio/SE/Cries/REGICE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/REGIDRAGO.ogg b/Audio/SE/Cries/REGIDRAGO.ogg
deleted file mode 100644
index ca93a017e..000000000
Binary files a/Audio/SE/Cries/REGIDRAGO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/REGIELEKI.ogg b/Audio/SE/Cries/REGIELEKI.ogg
deleted file mode 100644
index 2fe40447b..000000000
Binary files a/Audio/SE/Cries/REGIELEKI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/REGIGIGAS.mp3 b/Audio/SE/Cries/REGIGIGAS.mp3
new file mode 100644
index 000000000..5581fef66
Binary files /dev/null and b/Audio/SE/Cries/REGIGIGAS.mp3 differ
diff --git a/Audio/SE/Cries/REGIGIGAS.ogg b/Audio/SE/Cries/REGIGIGAS.ogg
deleted file mode 100644
index e76b027aa..000000000
Binary files a/Audio/SE/Cries/REGIGIGAS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/REGIROCK.mp3 b/Audio/SE/Cries/REGIROCK.mp3
new file mode 100644
index 000000000..7e0897712
Binary files /dev/null and b/Audio/SE/Cries/REGIROCK.mp3 differ
diff --git a/Audio/SE/Cries/REGIROCK.ogg b/Audio/SE/Cries/REGIROCK.ogg
deleted file mode 100644
index d160ffccc..000000000
Binary files a/Audio/SE/Cries/REGIROCK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/REGISTEEL.mp3 b/Audio/SE/Cries/REGISTEEL.mp3
new file mode 100644
index 000000000..04da77629
Binary files /dev/null and b/Audio/SE/Cries/REGISTEEL.mp3 differ
diff --git a/Audio/SE/Cries/REGISTEEL.ogg b/Audio/SE/Cries/REGISTEEL.ogg
deleted file mode 100644
index 47607cf95..000000000
Binary files a/Audio/SE/Cries/REGISTEEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/REGISTEEL.wav b/Audio/SE/Cries/REGISTEEL.wav
new file mode 100644
index 000000000..943da72ab
Binary files /dev/null and b/Audio/SE/Cries/REGISTEEL.wav differ
diff --git a/Audio/SE/Cries/RELICANTH.ogg b/Audio/SE/Cries/RELICANTH.ogg
deleted file mode 100644
index e03ef5c10..000000000
Binary files a/Audio/SE/Cries/RELICANTH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/REMORAID.mp3 b/Audio/SE/Cries/REMORAID.mp3
new file mode 100644
index 000000000..f1ebd37c5
Binary files /dev/null and b/Audio/SE/Cries/REMORAID.mp3 differ
diff --git a/Audio/SE/Cries/REMORAID.ogg b/Audio/SE/Cries/REMORAID.ogg
deleted file mode 100644
index 0bd21048c..000000000
Binary files a/Audio/SE/Cries/REMORAID.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RESHIRAM.mp3 b/Audio/SE/Cries/RESHIRAM.mp3
new file mode 100644
index 000000000..2f8a5bfc8
Binary files /dev/null and b/Audio/SE/Cries/RESHIRAM.mp3 differ
diff --git a/Audio/SE/Cries/RESHIRAM.ogg b/Audio/SE/Cries/RESHIRAM.ogg
deleted file mode 100644
index 5800e7ca3..000000000
Binary files a/Audio/SE/Cries/RESHIRAM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/REUNICLUS.mp3 b/Audio/SE/Cries/REUNICLUS.mp3
new file mode 100644
index 000000000..acc5bc232
Binary files /dev/null and b/Audio/SE/Cries/REUNICLUS.mp3 differ
diff --git a/Audio/SE/Cries/REUNICLUS.ogg b/Audio/SE/Cries/REUNICLUS.ogg
deleted file mode 100644
index 2bc80db34..000000000
Binary files a/Audio/SE/Cries/REUNICLUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RHYDON.mp3 b/Audio/SE/Cries/RHYDON.mp3
new file mode 100644
index 000000000..1745ccae4
Binary files /dev/null and b/Audio/SE/Cries/RHYDON.mp3 differ
diff --git a/Audio/SE/Cries/RHYDON.ogg b/Audio/SE/Cries/RHYDON.ogg
deleted file mode 100644
index 9154a2a8b..000000000
Binary files a/Audio/SE/Cries/RHYDON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RHYHORN.mp3 b/Audio/SE/Cries/RHYHORN.mp3
new file mode 100644
index 000000000..9a2814e33
Binary files /dev/null and b/Audio/SE/Cries/RHYHORN.mp3 differ
diff --git a/Audio/SE/Cries/RHYHORN.ogg b/Audio/SE/Cries/RHYHORN.ogg
deleted file mode 100644
index 4eeb4d2ef..000000000
Binary files a/Audio/SE/Cries/RHYHORN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RHYPERIOR.mp3 b/Audio/SE/Cries/RHYPERIOR.mp3
new file mode 100644
index 000000000..997aaef17
Binary files /dev/null and b/Audio/SE/Cries/RHYPERIOR.mp3 differ
diff --git a/Audio/SE/Cries/RHYPERIOR.ogg b/Audio/SE/Cries/RHYPERIOR.ogg
deleted file mode 100644
index 77686ee03..000000000
Binary files a/Audio/SE/Cries/RHYPERIOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RIBOMBEE.ogg b/Audio/SE/Cries/RIBOMBEE.ogg
deleted file mode 100644
index ddfe50bdc..000000000
Binary files a/Audio/SE/Cries/RIBOMBEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RILLABOOM.ogg b/Audio/SE/Cries/RILLABOOM.ogg
deleted file mode 100644
index c37fc883b..000000000
Binary files a/Audio/SE/Cries/RILLABOOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RIOLU.mp3 b/Audio/SE/Cries/RIOLU.mp3
new file mode 100644
index 000000000..1e4620914
Binary files /dev/null and b/Audio/SE/Cries/RIOLU.mp3 differ
diff --git a/Audio/SE/Cries/RIOLU.ogg b/Audio/SE/Cries/RIOLU.ogg
deleted file mode 100644
index 219ca261d..000000000
Binary files a/Audio/SE/Cries/RIOLU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ROCKRUFF.mp3 b/Audio/SE/Cries/ROCKRUFF.mp3
new file mode 100644
index 000000000..90f82c010
Binary files /dev/null and b/Audio/SE/Cries/ROCKRUFF.mp3 differ
diff --git a/Audio/SE/Cries/ROCKRUFF.ogg b/Audio/SE/Cries/ROCKRUFF.ogg
deleted file mode 100644
index e2f3b5522..000000000
Binary files a/Audio/SE/Cries/ROCKRUFF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ROGGENROLA.ogg b/Audio/SE/Cries/ROGGENROLA.ogg
deleted file mode 100644
index fc6a73c13..000000000
Binary files a/Audio/SE/Cries/ROGGENROLA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ROLYCOLY.ogg b/Audio/SE/Cries/ROLYCOLY.ogg
deleted file mode 100644
index d89a9e761..000000000
Binary files a/Audio/SE/Cries/ROLYCOLY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ROOKIDEE.ogg b/Audio/SE/Cries/ROOKIDEE.ogg
deleted file mode 100644
index b1394081b..000000000
Binary files a/Audio/SE/Cries/ROOKIDEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ROSELIA.mp3 b/Audio/SE/Cries/ROSELIA.mp3
new file mode 100644
index 000000000..af5ef9eda
Binary files /dev/null and b/Audio/SE/Cries/ROSELIA.mp3 differ
diff --git a/Audio/SE/Cries/ROSELIA.ogg b/Audio/SE/Cries/ROSELIA.ogg
deleted file mode 100644
index d20ccffef..000000000
Binary files a/Audio/SE/Cries/ROSELIA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ROSERADE.mp3 b/Audio/SE/Cries/ROSERADE.mp3
new file mode 100644
index 000000000..494532e3c
Binary files /dev/null and b/Audio/SE/Cries/ROSERADE.mp3 differ
diff --git a/Audio/SE/Cries/ROSERADE.ogg b/Audio/SE/Cries/ROSERADE.ogg
deleted file mode 100644
index 7ce68df78..000000000
Binary files a/Audio/SE/Cries/ROSERADE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ROTOM.mp3 b/Audio/SE/Cries/ROTOM.mp3
new file mode 100644
index 000000000..5d1300342
Binary files /dev/null and b/Audio/SE/Cries/ROTOM.mp3 differ
diff --git a/Audio/SE/Cries/ROTOM.ogg b/Audio/SE/Cries/ROTOM.ogg
deleted file mode 100644
index 0d025b15a..000000000
Binary files a/Audio/SE/Cries/ROTOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ROWLET.ogg b/Audio/SE/Cries/ROWLET.ogg
deleted file mode 100644
index 2c914b18f..000000000
Binary files a/Audio/SE/Cries/ROWLET.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RUFFLET.ogg b/Audio/SE/Cries/RUFFLET.ogg
deleted file mode 100644
index 3a5100973..000000000
Binary files a/Audio/SE/Cries/RUFFLET.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/RUNERIGUS.ogg b/Audio/SE/Cries/RUNERIGUS.ogg
deleted file mode 100644
index d86a4aa80..000000000
Binary files a/Audio/SE/Cries/RUNERIGUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SABLEYE.mp3 b/Audio/SE/Cries/SABLEYE.mp3
new file mode 100644
index 000000000..ddaa0a369
Binary files /dev/null and b/Audio/SE/Cries/SABLEYE.mp3 differ
diff --git a/Audio/SE/Cries/SABLEYE.ogg b/Audio/SE/Cries/SABLEYE.ogg
deleted file mode 100644
index 5cd40e114..000000000
Binary files a/Audio/SE/Cries/SABLEYE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SABLEYE_1.ogg b/Audio/SE/Cries/SABLEYE_1.ogg
deleted file mode 100644
index a39068d5b..000000000
Binary files a/Audio/SE/Cries/SABLEYE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SALAMENCE.mp3 b/Audio/SE/Cries/SALAMENCE.mp3
new file mode 100644
index 000000000..a56d288f3
Binary files /dev/null and b/Audio/SE/Cries/SALAMENCE.mp3 differ
diff --git a/Audio/SE/Cries/SALAMENCE.ogg b/Audio/SE/Cries/SALAMENCE.ogg
deleted file mode 100644
index bd0aa61a5..000000000
Binary files a/Audio/SE/Cries/SALAMENCE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SALAMENCE_1.ogg b/Audio/SE/Cries/SALAMENCE_1.ogg
deleted file mode 100644
index cd4e09904..000000000
Binary files a/Audio/SE/Cries/SALAMENCE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SALANDIT.ogg b/Audio/SE/Cries/SALANDIT.ogg
deleted file mode 100644
index bc1af1a50..000000000
Binary files a/Audio/SE/Cries/SALANDIT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SALAZZLE.ogg b/Audio/SE/Cries/SALAZZLE.ogg
deleted file mode 100644
index 0b35ea1cb..000000000
Binary files a/Audio/SE/Cries/SALAZZLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SAMUROTT.ogg b/Audio/SE/Cries/SAMUROTT.ogg
deleted file mode 100644
index b348eded2..000000000
Binary files a/Audio/SE/Cries/SAMUROTT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SANDACONDA.ogg b/Audio/SE/Cries/SANDACONDA.ogg
deleted file mode 100644
index c73e93533..000000000
Binary files a/Audio/SE/Cries/SANDACONDA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SANDILE.mp3 b/Audio/SE/Cries/SANDILE.mp3
new file mode 100644
index 000000000..4de9b3be9
Binary files /dev/null and b/Audio/SE/Cries/SANDILE.mp3 differ
diff --git a/Audio/SE/Cries/SANDILE.ogg b/Audio/SE/Cries/SANDILE.ogg
deleted file mode 100644
index c96cf6e4f..000000000
Binary files a/Audio/SE/Cries/SANDILE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SANDSHREW.mp3 b/Audio/SE/Cries/SANDSHREW.mp3
new file mode 100644
index 000000000..681a099dc
Binary files /dev/null and b/Audio/SE/Cries/SANDSHREW.mp3 differ
diff --git a/Audio/SE/Cries/SANDSHREW.ogg b/Audio/SE/Cries/SANDSHREW.ogg
deleted file mode 100644
index d827ad85f..000000000
Binary files a/Audio/SE/Cries/SANDSHREW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SANDSLASH.mp3 b/Audio/SE/Cries/SANDSLASH.mp3
new file mode 100644
index 000000000..1eaa63748
Binary files /dev/null and b/Audio/SE/Cries/SANDSLASH.mp3 differ
diff --git a/Audio/SE/Cries/SANDSLASH.ogg b/Audio/SE/Cries/SANDSLASH.ogg
deleted file mode 100644
index d03f0772c..000000000
Binary files a/Audio/SE/Cries/SANDSLASH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SANDYGAST.mp3 b/Audio/SE/Cries/SANDYGAST.mp3
new file mode 100644
index 000000000..16d6c23b0
Binary files /dev/null and b/Audio/SE/Cries/SANDYGAST.mp3 differ
diff --git a/Audio/SE/Cries/SANDYGAST.ogg b/Audio/SE/Cries/SANDYGAST.ogg
deleted file mode 100644
index 3f3202244..000000000
Binary files a/Audio/SE/Cries/SANDYGAST.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SAWK.ogg b/Audio/SE/Cries/SAWK.ogg
deleted file mode 100644
index ffa77eeb7..000000000
Binary files a/Audio/SE/Cries/SAWK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SAWSBUCK.ogg b/Audio/SE/Cries/SAWSBUCK.ogg
deleted file mode 100644
index 9126af035..000000000
Binary files a/Audio/SE/Cries/SAWSBUCK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCATTERBUG.ogg b/Audio/SE/Cries/SCATTERBUG.ogg
deleted file mode 100644
index 4f38c88e7..000000000
Binary files a/Audio/SE/Cries/SCATTERBUG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCEPTILE.mp3 b/Audio/SE/Cries/SCEPTILE.mp3
new file mode 100644
index 000000000..c0a914e4e
Binary files /dev/null and b/Audio/SE/Cries/SCEPTILE.mp3 differ
diff --git a/Audio/SE/Cries/SCEPTILE.ogg b/Audio/SE/Cries/SCEPTILE.ogg
deleted file mode 100644
index 7ba86638f..000000000
Binary files a/Audio/SE/Cries/SCEPTILE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCEPTILE_1.ogg b/Audio/SE/Cries/SCEPTILE_1.ogg
deleted file mode 100644
index 9619e32e0..000000000
Binary files a/Audio/SE/Cries/SCEPTILE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCIZOR.mp3 b/Audio/SE/Cries/SCIZOR.mp3
new file mode 100644
index 000000000..43413e17a
Binary files /dev/null and b/Audio/SE/Cries/SCIZOR.mp3 differ
diff --git a/Audio/SE/Cries/SCIZOR.ogg b/Audio/SE/Cries/SCIZOR.ogg
deleted file mode 100644
index 465ae9a7f..000000000
Binary files a/Audio/SE/Cries/SCIZOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCIZOR_1.ogg b/Audio/SE/Cries/SCIZOR_1.ogg
deleted file mode 100644
index e4eab3696..000000000
Binary files a/Audio/SE/Cries/SCIZOR_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCOLIPEDE.mp3 b/Audio/SE/Cries/SCOLIPEDE.mp3
new file mode 100644
index 000000000..e5a5e0e4f
Binary files /dev/null and b/Audio/SE/Cries/SCOLIPEDE.mp3 differ
diff --git a/Audio/SE/Cries/SCOLIPEDE.ogg b/Audio/SE/Cries/SCOLIPEDE.ogg
deleted file mode 100644
index 77325f950..000000000
Binary files a/Audio/SE/Cries/SCOLIPEDE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCOLIPEDE.wav b/Audio/SE/Cries/SCOLIPEDE.wav
new file mode 100644
index 000000000..39820184c
Binary files /dev/null and b/Audio/SE/Cries/SCOLIPEDE.wav differ
diff --git a/Audio/SE/Cries/SCORBUNNY.ogg b/Audio/SE/Cries/SCORBUNNY.ogg
deleted file mode 100644
index e601c7bf7..000000000
Binary files a/Audio/SE/Cries/SCORBUNNY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCRAFTY.mp3 b/Audio/SE/Cries/SCRAFTY.mp3
new file mode 100644
index 000000000..29a8fa00d
Binary files /dev/null and b/Audio/SE/Cries/SCRAFTY.mp3 differ
diff --git a/Audio/SE/Cries/SCRAFTY.ogg b/Audio/SE/Cries/SCRAFTY.ogg
deleted file mode 100644
index 39521efcd..000000000
Binary files a/Audio/SE/Cries/SCRAFTY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCRAGGY.mp3 b/Audio/SE/Cries/SCRAGGY.mp3
new file mode 100644
index 000000000..9f31b713b
Binary files /dev/null and b/Audio/SE/Cries/SCRAGGY.mp3 differ
diff --git a/Audio/SE/Cries/SCRAGGY.ogg b/Audio/SE/Cries/SCRAGGY.ogg
deleted file mode 100644
index c1b5e24eb..000000000
Binary files a/Audio/SE/Cries/SCRAGGY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SCYTHER.mp3 b/Audio/SE/Cries/SCYTHER.mp3
new file mode 100644
index 000000000..b6d3b8e41
Binary files /dev/null and b/Audio/SE/Cries/SCYTHER.mp3 differ
diff --git a/Audio/SE/Cries/SCYTHER.ogg b/Audio/SE/Cries/SCYTHER.ogg
deleted file mode 100644
index eec166813..000000000
Binary files a/Audio/SE/Cries/SCYTHER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SEADRA.mp3 b/Audio/SE/Cries/SEADRA.mp3
new file mode 100644
index 000000000..2e3f041b9
Binary files /dev/null and b/Audio/SE/Cries/SEADRA.mp3 differ
diff --git a/Audio/SE/Cries/SEADRA.ogg b/Audio/SE/Cries/SEADRA.ogg
deleted file mode 100644
index 5e676b20f..000000000
Binary files a/Audio/SE/Cries/SEADRA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SEAKING.mp3 b/Audio/SE/Cries/SEAKING.mp3
new file mode 100644
index 000000000..2a3cc3bec
Binary files /dev/null and b/Audio/SE/Cries/SEAKING.mp3 differ
diff --git a/Audio/SE/Cries/SEAKING.ogg b/Audio/SE/Cries/SEAKING.ogg
deleted file mode 100644
index 70dbc049d..000000000
Binary files a/Audio/SE/Cries/SEAKING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SEALEO.ogg b/Audio/SE/Cries/SEALEO.ogg
deleted file mode 100644
index 19c04a7ad..000000000
Binary files a/Audio/SE/Cries/SEALEO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SEEDOT.ogg b/Audio/SE/Cries/SEEDOT.ogg
deleted file mode 100644
index d127aa591..000000000
Binary files a/Audio/SE/Cries/SEEDOT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SEEL.mp3 b/Audio/SE/Cries/SEEL.mp3
new file mode 100644
index 000000000..0f4c0a594
Binary files /dev/null and b/Audio/SE/Cries/SEEL.mp3 differ
diff --git a/Audio/SE/Cries/SEEL.ogg b/Audio/SE/Cries/SEEL.ogg
deleted file mode 100644
index 5f72678cb..000000000
Binary files a/Audio/SE/Cries/SEEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SEISMITOAD.ogg b/Audio/SE/Cries/SEISMITOAD.ogg
deleted file mode 100644
index 6744ce6a4..000000000
Binary files a/Audio/SE/Cries/SEISMITOAD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SENTRET.mp3 b/Audio/SE/Cries/SENTRET.mp3
new file mode 100644
index 000000000..52bcece90
Binary files /dev/null and b/Audio/SE/Cries/SENTRET.mp3 differ
diff --git a/Audio/SE/Cries/SENTRET.ogg b/Audio/SE/Cries/SENTRET.ogg
deleted file mode 100644
index 7f6b1f7ff..000000000
Binary files a/Audio/SE/Cries/SENTRET.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SERPERIOR.ogg b/Audio/SE/Cries/SERPERIOR.ogg
deleted file mode 100644
index fcf7a6bc1..000000000
Binary files a/Audio/SE/Cries/SERPERIOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SERVINE.ogg b/Audio/SE/Cries/SERVINE.ogg
deleted file mode 100644
index ac1324d13..000000000
Binary files a/Audio/SE/Cries/SERVINE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SEVIPER.ogg b/Audio/SE/Cries/SEVIPER.ogg
deleted file mode 100644
index b4b3a4bdd..000000000
Binary files a/Audio/SE/Cries/SEVIPER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SEWADDLE.ogg b/Audio/SE/Cries/SEWADDLE.ogg
deleted file mode 100644
index 58e1a4b8b..000000000
Binary files a/Audio/SE/Cries/SEWADDLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHARPEDO.mp3 b/Audio/SE/Cries/SHARPEDO.mp3
new file mode 100644
index 000000000..a6af1be9b
Binary files /dev/null and b/Audio/SE/Cries/SHARPEDO.mp3 differ
diff --git a/Audio/SE/Cries/SHARPEDO.ogg b/Audio/SE/Cries/SHARPEDO.ogg
deleted file mode 100644
index c615c1dcb..000000000
Binary files a/Audio/SE/Cries/SHARPEDO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHARPEDO_1.ogg b/Audio/SE/Cries/SHARPEDO_1.ogg
deleted file mode 100644
index c68b6cff4..000000000
Binary files a/Audio/SE/Cries/SHARPEDO_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHAYMIN.ogg b/Audio/SE/Cries/SHAYMIN.ogg
deleted file mode 100644
index 89a2da67e..000000000
Binary files a/Audio/SE/Cries/SHAYMIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHAYMIN_1.ogg b/Audio/SE/Cries/SHAYMIN_1.ogg
deleted file mode 100644
index 6fa3d5b0e..000000000
Binary files a/Audio/SE/Cries/SHAYMIN_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHEDINJA.mp3 b/Audio/SE/Cries/SHEDINJA.mp3
new file mode 100644
index 000000000..f83548780
Binary files /dev/null and b/Audio/SE/Cries/SHEDINJA.mp3 differ
diff --git a/Audio/SE/Cries/SHEDINJA.ogg b/Audio/SE/Cries/SHEDINJA.ogg
deleted file mode 100644
index f4d31b0dc..000000000
Binary files a/Audio/SE/Cries/SHEDINJA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHELGON.mp3 b/Audio/SE/Cries/SHELGON.mp3
new file mode 100644
index 000000000..999687d38
Binary files /dev/null and b/Audio/SE/Cries/SHELGON.mp3 differ
diff --git a/Audio/SE/Cries/SHELGON.ogg b/Audio/SE/Cries/SHELGON.ogg
deleted file mode 100644
index 0fb495cb9..000000000
Binary files a/Audio/SE/Cries/SHELGON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHELLDER.mp3 b/Audio/SE/Cries/SHELLDER.mp3
new file mode 100644
index 000000000..cade1c83b
Binary files /dev/null and b/Audio/SE/Cries/SHELLDER.mp3 differ
diff --git a/Audio/SE/Cries/SHELLDER.ogg b/Audio/SE/Cries/SHELLDER.ogg
deleted file mode 100644
index 9d62b5a99..000000000
Binary files a/Audio/SE/Cries/SHELLDER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHELLOS.ogg b/Audio/SE/Cries/SHELLOS.ogg
deleted file mode 100644
index cfd2ab412..000000000
Binary files a/Audio/SE/Cries/SHELLOS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHELMET.ogg b/Audio/SE/Cries/SHELMET.ogg
deleted file mode 100644
index eb1153e6a..000000000
Binary files a/Audio/SE/Cries/SHELMET.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHIELDON.mp3 b/Audio/SE/Cries/SHIELDON.mp3
new file mode 100644
index 000000000..3521e2ebe
Binary files /dev/null and b/Audio/SE/Cries/SHIELDON.mp3 differ
diff --git a/Audio/SE/Cries/SHIELDON.ogg b/Audio/SE/Cries/SHIELDON.ogg
deleted file mode 100644
index aec74ab2a..000000000
Binary files a/Audio/SE/Cries/SHIELDON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHIFTRY.ogg b/Audio/SE/Cries/SHIFTRY.ogg
deleted file mode 100644
index f6f6c538a..000000000
Binary files a/Audio/SE/Cries/SHIFTRY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHIINOTIC.ogg b/Audio/SE/Cries/SHIINOTIC.ogg
deleted file mode 100644
index f1a310210..000000000
Binary files a/Audio/SE/Cries/SHIINOTIC.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHINX.mp3 b/Audio/SE/Cries/SHINX.mp3
new file mode 100644
index 000000000..00be4676a
Binary files /dev/null and b/Audio/SE/Cries/SHINX.mp3 differ
diff --git a/Audio/SE/Cries/SHINX.ogg b/Audio/SE/Cries/SHINX.ogg
deleted file mode 100644
index 584a44856..000000000
Binary files a/Audio/SE/Cries/SHINX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHROOMISH.mp3 b/Audio/SE/Cries/SHROOMISH.mp3
new file mode 100644
index 000000000..ac84598bb
Binary files /dev/null and b/Audio/SE/Cries/SHROOMISH.mp3 differ
diff --git a/Audio/SE/Cries/SHROOMISH.ogg b/Audio/SE/Cries/SHROOMISH.ogg
deleted file mode 100644
index c98dea258..000000000
Binary files a/Audio/SE/Cries/SHROOMISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHUCKLE.mp3 b/Audio/SE/Cries/SHUCKLE.mp3
new file mode 100644
index 000000000..99c49d494
Binary files /dev/null and b/Audio/SE/Cries/SHUCKLE.mp3 differ
diff --git a/Audio/SE/Cries/SHUCKLE.ogg b/Audio/SE/Cries/SHUCKLE.ogg
deleted file mode 100644
index 187c2009b..000000000
Binary files a/Audio/SE/Cries/SHUCKLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SHUPPET.mp3 b/Audio/SE/Cries/SHUPPET.mp3
new file mode 100644
index 000000000..60832e8c2
Binary files /dev/null and b/Audio/SE/Cries/SHUPPET.mp3 differ
diff --git a/Audio/SE/Cries/SHUPPET.ogg b/Audio/SE/Cries/SHUPPET.ogg
deleted file mode 100644
index c757c21d8..000000000
Binary files a/Audio/SE/Cries/SHUPPET.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SIGILYPH.ogg b/Audio/SE/Cries/SIGILYPH.ogg
deleted file mode 100644
index e008ace4f..000000000
Binary files a/Audio/SE/Cries/SIGILYPH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SILCOON.ogg b/Audio/SE/Cries/SILCOON.ogg
deleted file mode 100644
index a9effe4f8..000000000
Binary files a/Audio/SE/Cries/SILCOON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SILICOBRA.ogg b/Audio/SE/Cries/SILICOBRA.ogg
deleted file mode 100644
index 09177e52e..000000000
Binary files a/Audio/SE/Cries/SILICOBRA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SILVALLY.ogg b/Audio/SE/Cries/SILVALLY.ogg
deleted file mode 100644
index 8605e41bb..000000000
Binary files a/Audio/SE/Cries/SILVALLY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SIMIPOUR.ogg b/Audio/SE/Cries/SIMIPOUR.ogg
deleted file mode 100644
index 78f2fe95c..000000000
Binary files a/Audio/SE/Cries/SIMIPOUR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SIMISAGE.ogg b/Audio/SE/Cries/SIMISAGE.ogg
deleted file mode 100644
index a17bfd832..000000000
Binary files a/Audio/SE/Cries/SIMISAGE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SIMISEAR.ogg b/Audio/SE/Cries/SIMISEAR.ogg
deleted file mode 100644
index c936f6a3c..000000000
Binary files a/Audio/SE/Cries/SIMISEAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SINISTEA.ogg b/Audio/SE/Cries/SINISTEA.ogg
deleted file mode 100644
index f31028d96..000000000
Binary files a/Audio/SE/Cries/SINISTEA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SIRFETCHD.ogg b/Audio/SE/Cries/SIRFETCHD.ogg
deleted file mode 100644
index 2382f150d..000000000
Binary files a/Audio/SE/Cries/SIRFETCHD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SIZZLIPEDE.ogg b/Audio/SE/Cries/SIZZLIPEDE.ogg
deleted file mode 100644
index ed5d7fcb6..000000000
Binary files a/Audio/SE/Cries/SIZZLIPEDE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SKARMORY.mp3 b/Audio/SE/Cries/SKARMORY.mp3
new file mode 100644
index 000000000..3694536c4
Binary files /dev/null and b/Audio/SE/Cries/SKARMORY.mp3 differ
diff --git a/Audio/SE/Cries/SKARMORY.ogg b/Audio/SE/Cries/SKARMORY.ogg
deleted file mode 100644
index 926a492f5..000000000
Binary files a/Audio/SE/Cries/SKARMORY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SKIDDO.ogg b/Audio/SE/Cries/SKIDDO.ogg
deleted file mode 100644
index 191b1417c..000000000
Binary files a/Audio/SE/Cries/SKIDDO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SKIPLOOM.mp3 b/Audio/SE/Cries/SKIPLOOM.mp3
new file mode 100644
index 000000000..cca0e16d1
Binary files /dev/null and b/Audio/SE/Cries/SKIPLOOM.mp3 differ
diff --git a/Audio/SE/Cries/SKIPLOOM.ogg b/Audio/SE/Cries/SKIPLOOM.ogg
deleted file mode 100644
index cd3f8e7d0..000000000
Binary files a/Audio/SE/Cries/SKIPLOOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SKITTY.ogg b/Audio/SE/Cries/SKITTY.ogg
deleted file mode 100644
index 5a5dac061..000000000
Binary files a/Audio/SE/Cries/SKITTY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SKORUPI.ogg b/Audio/SE/Cries/SKORUPI.ogg
deleted file mode 100644
index 6732a856a..000000000
Binary files a/Audio/SE/Cries/SKORUPI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SKRELP.ogg b/Audio/SE/Cries/SKRELP.ogg
deleted file mode 100644
index c7da81dd8..000000000
Binary files a/Audio/SE/Cries/SKRELP.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SKUNTANK.ogg b/Audio/SE/Cries/SKUNTANK.ogg
deleted file mode 100644
index 5d9842f81..000000000
Binary files a/Audio/SE/Cries/SKUNTANK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SKWOVET.ogg b/Audio/SE/Cries/SKWOVET.ogg
deleted file mode 100644
index f28735101..000000000
Binary files a/Audio/SE/Cries/SKWOVET.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SLAKING.mp3 b/Audio/SE/Cries/SLAKING.mp3
new file mode 100644
index 000000000..ad3563a87
Binary files /dev/null and b/Audio/SE/Cries/SLAKING.mp3 differ
diff --git a/Audio/SE/Cries/SLAKING.ogg b/Audio/SE/Cries/SLAKING.ogg
deleted file mode 100644
index fa9fa2bf4..000000000
Binary files a/Audio/SE/Cries/SLAKING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SLAKOTH.mp3 b/Audio/SE/Cries/SLAKOTH.mp3
new file mode 100644
index 000000000..6b41f727b
Binary files /dev/null and b/Audio/SE/Cries/SLAKOTH.mp3 differ
diff --git a/Audio/SE/Cries/SLAKOTH.ogg b/Audio/SE/Cries/SLAKOTH.ogg
deleted file mode 100644
index 37dc6d588..000000000
Binary files a/Audio/SE/Cries/SLAKOTH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SLIGGOO.mp3 b/Audio/SE/Cries/SLIGGOO.mp3
new file mode 100644
index 000000000..a42d217d9
Binary files /dev/null and b/Audio/SE/Cries/SLIGGOO.mp3 differ
diff --git a/Audio/SE/Cries/SLIGGOO.ogg b/Audio/SE/Cries/SLIGGOO.ogg
deleted file mode 100644
index d8b4bec3a..000000000
Binary files a/Audio/SE/Cries/SLIGGOO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SLOWBRO.mp3 b/Audio/SE/Cries/SLOWBRO.mp3
new file mode 100644
index 000000000..e90d9ebdb
Binary files /dev/null and b/Audio/SE/Cries/SLOWBRO.mp3 differ
diff --git a/Audio/SE/Cries/SLOWBRO.ogg b/Audio/SE/Cries/SLOWBRO.ogg
deleted file mode 100644
index 2e7a4bfcb..000000000
Binary files a/Audio/SE/Cries/SLOWBRO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SLOWBRO_1.ogg b/Audio/SE/Cries/SLOWBRO_1.ogg
deleted file mode 100644
index df732724c..000000000
Binary files a/Audio/SE/Cries/SLOWBRO_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SLOWKING.mp3 b/Audio/SE/Cries/SLOWKING.mp3
new file mode 100644
index 000000000..5df3e3813
Binary files /dev/null and b/Audio/SE/Cries/SLOWKING.mp3 differ
diff --git a/Audio/SE/Cries/SLOWKING.ogg b/Audio/SE/Cries/SLOWKING.ogg
deleted file mode 100644
index 32e960aff..000000000
Binary files a/Audio/SE/Cries/SLOWKING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SLOWPOKE.mp3 b/Audio/SE/Cries/SLOWPOKE.mp3
new file mode 100644
index 000000000..fcca9f09e
Binary files /dev/null and b/Audio/SE/Cries/SLOWPOKE.mp3 differ
diff --git a/Audio/SE/Cries/SLOWPOKE.ogg b/Audio/SE/Cries/SLOWPOKE.ogg
deleted file mode 100644
index a2c1ae3be..000000000
Binary files a/Audio/SE/Cries/SLOWPOKE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SLUGMA.mp3 b/Audio/SE/Cries/SLUGMA.mp3
new file mode 100644
index 000000000..57193acf7
Binary files /dev/null and b/Audio/SE/Cries/SLUGMA.mp3 differ
diff --git a/Audio/SE/Cries/SLUGMA.ogg b/Audio/SE/Cries/SLUGMA.ogg
deleted file mode 100644
index a9504d595..000000000
Binary files a/Audio/SE/Cries/SLUGMA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SLURPUFF.mp3 b/Audio/SE/Cries/SLURPUFF.mp3
new file mode 100644
index 000000000..51d79f8ba
Binary files /dev/null and b/Audio/SE/Cries/SLURPUFF.mp3 differ
diff --git a/Audio/SE/Cries/SLURPUFF.ogg b/Audio/SE/Cries/SLURPUFF.ogg
deleted file mode 100644
index 22e17b713..000000000
Binary files a/Audio/SE/Cries/SLURPUFF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SMEARGLE.mp3 b/Audio/SE/Cries/SMEARGLE.mp3
new file mode 100644
index 000000000..fc81c718c
Binary files /dev/null and b/Audio/SE/Cries/SMEARGLE.mp3 differ
diff --git a/Audio/SE/Cries/SMEARGLE.ogg b/Audio/SE/Cries/SMEARGLE.ogg
deleted file mode 100644
index fdbb5088e..000000000
Binary files a/Audio/SE/Cries/SMEARGLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SMOOCHUM.mp3 b/Audio/SE/Cries/SMOOCHUM.mp3
new file mode 100644
index 000000000..d4058e932
Binary files /dev/null and b/Audio/SE/Cries/SMOOCHUM.mp3 differ
diff --git a/Audio/SE/Cries/SMOOCHUM.ogg b/Audio/SE/Cries/SMOOCHUM.ogg
deleted file mode 100644
index cb9497084..000000000
Binary files a/Audio/SE/Cries/SMOOCHUM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SNEASEL.mp3 b/Audio/SE/Cries/SNEASEL.mp3
new file mode 100644
index 000000000..d4f13e51c
Binary files /dev/null and b/Audio/SE/Cries/SNEASEL.mp3 differ
diff --git a/Audio/SE/Cries/SNEASEL.ogg b/Audio/SE/Cries/SNEASEL.ogg
deleted file mode 100644
index 81d4fc604..000000000
Binary files a/Audio/SE/Cries/SNEASEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SNIVY.ogg b/Audio/SE/Cries/SNIVY.ogg
deleted file mode 100644
index b58bb2735..000000000
Binary files a/Audio/SE/Cries/SNIVY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SNOM.ogg b/Audio/SE/Cries/SNOM.ogg
deleted file mode 100644
index aae2cb811..000000000
Binary files a/Audio/SE/Cries/SNOM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SNORLAX.mp3 b/Audio/SE/Cries/SNORLAX.mp3
new file mode 100644
index 000000000..d1a7040b9
Binary files /dev/null and b/Audio/SE/Cries/SNORLAX.mp3 differ
diff --git a/Audio/SE/Cries/SNORLAX.ogg b/Audio/SE/Cries/SNORLAX.ogg
deleted file mode 100644
index 180c2f6c1..000000000
Binary files a/Audio/SE/Cries/SNORLAX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SNORUNT.mp3 b/Audio/SE/Cries/SNORUNT.mp3
new file mode 100644
index 000000000..171234582
Binary files /dev/null and b/Audio/SE/Cries/SNORUNT.mp3 differ
diff --git a/Audio/SE/Cries/SNORUNT.ogg b/Audio/SE/Cries/SNORUNT.ogg
deleted file mode 100644
index 44eb0b64d..000000000
Binary files a/Audio/SE/Cries/SNORUNT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SNOVER.ogg b/Audio/SE/Cries/SNOVER.ogg
deleted file mode 100644
index 95abb9500..000000000
Binary files a/Audio/SE/Cries/SNOVER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SNUBBULL.mp3 b/Audio/SE/Cries/SNUBBULL.mp3
new file mode 100644
index 000000000..7fb1592b0
Binary files /dev/null and b/Audio/SE/Cries/SNUBBULL.mp3 differ
diff --git a/Audio/SE/Cries/SNUBBULL.ogg b/Audio/SE/Cries/SNUBBULL.ogg
deleted file mode 100644
index 445735117..000000000
Binary files a/Audio/SE/Cries/SNUBBULL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SOBBLE.ogg b/Audio/SE/Cries/SOBBLE.ogg
deleted file mode 100644
index 0b6b47794..000000000
Binary files a/Audio/SE/Cries/SOBBLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SOLGALEO.ogg b/Audio/SE/Cries/SOLGALEO.ogg
deleted file mode 100644
index 445d7dfc7..000000000
Binary files a/Audio/SE/Cries/SOLGALEO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SOLOSIS.mp3 b/Audio/SE/Cries/SOLOSIS.mp3
new file mode 100644
index 000000000..88dd224f3
Binary files /dev/null and b/Audio/SE/Cries/SOLOSIS.mp3 differ
diff --git a/Audio/SE/Cries/SOLOSIS.ogg b/Audio/SE/Cries/SOLOSIS.ogg
deleted file mode 100644
index 360878a7d..000000000
Binary files a/Audio/SE/Cries/SOLOSIS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SOLROCK.ogg b/Audio/SE/Cries/SOLROCK.ogg
deleted file mode 100644
index 3dcc645fc..000000000
Binary files a/Audio/SE/Cries/SOLROCK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SPEAROW.mp3 b/Audio/SE/Cries/SPEAROW.mp3
new file mode 100644
index 000000000..f7c9737ed
Binary files /dev/null and b/Audio/SE/Cries/SPEAROW.mp3 differ
diff --git a/Audio/SE/Cries/SPEAROW.ogg b/Audio/SE/Cries/SPEAROW.ogg
deleted file mode 100644
index aa61de25a..000000000
Binary files a/Audio/SE/Cries/SPEAROW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SPECTRIER.ogg b/Audio/SE/Cries/SPECTRIER.ogg
deleted file mode 100644
index 0d8ae135f..000000000
Binary files a/Audio/SE/Cries/SPECTRIER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SPEWPA.ogg b/Audio/SE/Cries/SPEWPA.ogg
deleted file mode 100644
index efb671181..000000000
Binary files a/Audio/SE/Cries/SPEWPA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SPHEAL.ogg b/Audio/SE/Cries/SPHEAL.ogg
deleted file mode 100644
index 0f9d1a41e..000000000
Binary files a/Audio/SE/Cries/SPHEAL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SPINARAK.mp3 b/Audio/SE/Cries/SPINARAK.mp3
new file mode 100644
index 000000000..d1d1792c4
Binary files /dev/null and b/Audio/SE/Cries/SPINARAK.mp3 differ
diff --git a/Audio/SE/Cries/SPINARAK.ogg b/Audio/SE/Cries/SPINARAK.ogg
deleted file mode 100644
index a4c407251..000000000
Binary files a/Audio/SE/Cries/SPINARAK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SPINARAK.wav b/Audio/SE/Cries/SPINARAK.wav
new file mode 100644
index 000000000..3e05f2b2c
Binary files /dev/null and b/Audio/SE/Cries/SPINARAK.wav differ
diff --git a/Audio/SE/Cries/SPINDA.ogg b/Audio/SE/Cries/SPINDA.ogg
deleted file mode 100644
index 2b4c22ed3..000000000
Binary files a/Audio/SE/Cries/SPINDA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SPIRITOMB.mp3 b/Audio/SE/Cries/SPIRITOMB.mp3
new file mode 100644
index 000000000..811613b97
Binary files /dev/null and b/Audio/SE/Cries/SPIRITOMB.mp3 differ
diff --git a/Audio/SE/Cries/SPIRITOMB.ogg b/Audio/SE/Cries/SPIRITOMB.ogg
deleted file mode 100644
index 619e83ca4..000000000
Binary files a/Audio/SE/Cries/SPIRITOMB.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SPOINK.ogg b/Audio/SE/Cries/SPOINK.ogg
deleted file mode 100644
index 7ddc37bfe..000000000
Binary files a/Audio/SE/Cries/SPOINK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SPRITZEE.ogg b/Audio/SE/Cries/SPRITZEE.ogg
deleted file mode 100644
index 9c1631c1b..000000000
Binary files a/Audio/SE/Cries/SPRITZEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SQUIRTLE.mp3 b/Audio/SE/Cries/SQUIRTLE.mp3
new file mode 100644
index 000000000..955d2b423
Binary files /dev/null and b/Audio/SE/Cries/SQUIRTLE.mp3 differ
diff --git a/Audio/SE/Cries/SQUIRTLE.ogg b/Audio/SE/Cries/SQUIRTLE.ogg
deleted file mode 100644
index faddda1cc..000000000
Binary files a/Audio/SE/Cries/SQUIRTLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STAKATAKA.ogg b/Audio/SE/Cries/STAKATAKA.ogg
deleted file mode 100644
index 873457bbe..000000000
Binary files a/Audio/SE/Cries/STAKATAKA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STANTLER.mp3 b/Audio/SE/Cries/STANTLER.mp3
new file mode 100644
index 000000000..34b33a581
Binary files /dev/null and b/Audio/SE/Cries/STANTLER.mp3 differ
diff --git a/Audio/SE/Cries/STANTLER.ogg b/Audio/SE/Cries/STANTLER.ogg
deleted file mode 100644
index 8c51c66a6..000000000
Binary files a/Audio/SE/Cries/STANTLER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STARAPTOR.ogg b/Audio/SE/Cries/STARAPTOR.ogg
deleted file mode 100644
index db347d6ee..000000000
Binary files a/Audio/SE/Cries/STARAPTOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STARAVIA.ogg b/Audio/SE/Cries/STARAVIA.ogg
deleted file mode 100644
index 23758009b..000000000
Binary files a/Audio/SE/Cries/STARAVIA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STARLY.ogg b/Audio/SE/Cries/STARLY.ogg
deleted file mode 100644
index 767bcd32d..000000000
Binary files a/Audio/SE/Cries/STARLY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STARMIE.mp3 b/Audio/SE/Cries/STARMIE.mp3
new file mode 100644
index 000000000..9e3e8ccd3
Binary files /dev/null and b/Audio/SE/Cries/STARMIE.mp3 differ
diff --git a/Audio/SE/Cries/STARMIE.ogg b/Audio/SE/Cries/STARMIE.ogg
deleted file mode 100644
index 9cb1f7b86..000000000
Binary files a/Audio/SE/Cries/STARMIE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STARMIE.wav b/Audio/SE/Cries/STARMIE.wav
new file mode 100644
index 000000000..d34b9defc
Binary files /dev/null and b/Audio/SE/Cries/STARMIE.wav differ
diff --git a/Audio/SE/Cries/STARYU.mp3 b/Audio/SE/Cries/STARYU.mp3
new file mode 100644
index 000000000..c016cb1d8
Binary files /dev/null and b/Audio/SE/Cries/STARYU.mp3 differ
diff --git a/Audio/SE/Cries/STARYU.ogg b/Audio/SE/Cries/STARYU.ogg
deleted file mode 100644
index 162aca5e4..000000000
Binary files a/Audio/SE/Cries/STARYU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STEELIX.ogg b/Audio/SE/Cries/STEELIX.ogg
deleted file mode 100644
index d00f73f0c..000000000
Binary files a/Audio/SE/Cries/STEELIX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STEELIX_1.ogg b/Audio/SE/Cries/STEELIX_1.ogg
deleted file mode 100644
index 5b04fc38e..000000000
Binary files a/Audio/SE/Cries/STEELIX_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STEENEE.ogg b/Audio/SE/Cries/STEENEE.ogg
deleted file mode 100644
index 6e06e20cb..000000000
Binary files a/Audio/SE/Cries/STEENEE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STONJOURNER.ogg b/Audio/SE/Cries/STONJOURNER.ogg
deleted file mode 100644
index 001ebee04..000000000
Binary files a/Audio/SE/Cries/STONJOURNER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STOUTLAND.ogg b/Audio/SE/Cries/STOUTLAND.ogg
deleted file mode 100644
index e3df65d67..000000000
Binary files a/Audio/SE/Cries/STOUTLAND.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STUFFUL.mp3 b/Audio/SE/Cries/STUFFUL.mp3
new file mode 100644
index 000000000..9e4df1e4f
Binary files /dev/null and b/Audio/SE/Cries/STUFFUL.mp3 differ
diff --git a/Audio/SE/Cries/STUFFUL.ogg b/Audio/SE/Cries/STUFFUL.ogg
deleted file mode 100644
index ab196b815..000000000
Binary files a/Audio/SE/Cries/STUFFUL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STUNFISK.mp3 b/Audio/SE/Cries/STUNFISK.mp3
new file mode 100644
index 000000000..7e648334b
Binary files /dev/null and b/Audio/SE/Cries/STUNFISK.mp3 differ
diff --git a/Audio/SE/Cries/STUNFISK.ogg b/Audio/SE/Cries/STUNFISK.ogg
deleted file mode 100644
index 246f91a70..000000000
Binary files a/Audio/SE/Cries/STUNFISK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/STUNKY.ogg b/Audio/SE/Cries/STUNKY.ogg
deleted file mode 100644
index f89677d5f..000000000
Binary files a/Audio/SE/Cries/STUNKY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SUDOWOODO.mp3 b/Audio/SE/Cries/SUDOWOODO.mp3
new file mode 100644
index 000000000..f02d5d0a2
Binary files /dev/null and b/Audio/SE/Cries/SUDOWOODO.mp3 differ
diff --git a/Audio/SE/Cries/SUDOWOODO.ogg b/Audio/SE/Cries/SUDOWOODO.ogg
deleted file mode 100644
index 20553a4cf..000000000
Binary files a/Audio/SE/Cries/SUDOWOODO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SUICUNE.mp3 b/Audio/SE/Cries/SUICUNE.mp3
new file mode 100644
index 000000000..c69dda937
Binary files /dev/null and b/Audio/SE/Cries/SUICUNE.mp3 differ
diff --git a/Audio/SE/Cries/SUICUNE.ogg b/Audio/SE/Cries/SUICUNE.ogg
deleted file mode 100644
index 2868dffc1..000000000
Binary files a/Audio/SE/Cries/SUICUNE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SUICUNE.wav b/Audio/SE/Cries/SUICUNE.wav
new file mode 100644
index 000000000..940bfe172
Binary files /dev/null and b/Audio/SE/Cries/SUICUNE.wav differ
diff --git a/Audio/SE/Cries/SUNFLORA.mp3 b/Audio/SE/Cries/SUNFLORA.mp3
new file mode 100644
index 000000000..78fd33cce
Binary files /dev/null and b/Audio/SE/Cries/SUNFLORA.mp3 differ
diff --git a/Audio/SE/Cries/SUNFLORA.ogg b/Audio/SE/Cries/SUNFLORA.ogg
deleted file mode 100644
index c40509ad1..000000000
Binary files a/Audio/SE/Cries/SUNFLORA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SUNKERN.mp3 b/Audio/SE/Cries/SUNKERN.mp3
new file mode 100644
index 000000000..acdd3c242
Binary files /dev/null and b/Audio/SE/Cries/SUNKERN.mp3 differ
diff --git a/Audio/SE/Cries/SUNKERN.ogg b/Audio/SE/Cries/SUNKERN.ogg
deleted file mode 100644
index 944226da2..000000000
Binary files a/Audio/SE/Cries/SUNKERN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SURSKIT.ogg b/Audio/SE/Cries/SURSKIT.ogg
deleted file mode 100644
index 9532dd946..000000000
Binary files a/Audio/SE/Cries/SURSKIT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWABLU.mp3 b/Audio/SE/Cries/SWABLU.mp3
new file mode 100644
index 000000000..b06ca9e11
Binary files /dev/null and b/Audio/SE/Cries/SWABLU.mp3 differ
diff --git a/Audio/SE/Cries/SWABLU.ogg b/Audio/SE/Cries/SWABLU.ogg
deleted file mode 100644
index 15c582944..000000000
Binary files a/Audio/SE/Cries/SWABLU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWADLOON.ogg b/Audio/SE/Cries/SWADLOON.ogg
deleted file mode 100644
index e32d527ce..000000000
Binary files a/Audio/SE/Cries/SWADLOON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWALOT.ogg b/Audio/SE/Cries/SWALOT.ogg
deleted file mode 100644
index 96601872d..000000000
Binary files a/Audio/SE/Cries/SWALOT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWAMPERT.ogg b/Audio/SE/Cries/SWAMPERT.ogg
deleted file mode 100644
index 0d7548743..000000000
Binary files a/Audio/SE/Cries/SWAMPERT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWAMPERT_1.ogg b/Audio/SE/Cries/SWAMPERT_1.ogg
deleted file mode 100644
index 5d173bd6d..000000000
Binary files a/Audio/SE/Cries/SWAMPERT_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWANNA.ogg b/Audio/SE/Cries/SWANNA.ogg
deleted file mode 100644
index 60f963812..000000000
Binary files a/Audio/SE/Cries/SWANNA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWELLOW.ogg b/Audio/SE/Cries/SWELLOW.ogg
deleted file mode 100644
index bc81ff9d3..000000000
Binary files a/Audio/SE/Cries/SWELLOW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWINUB.mp3 b/Audio/SE/Cries/SWINUB.mp3
new file mode 100644
index 000000000..f75438b0f
Binary files /dev/null and b/Audio/SE/Cries/SWINUB.mp3 differ
diff --git a/Audio/SE/Cries/SWINUB.ogg b/Audio/SE/Cries/SWINUB.ogg
deleted file mode 100644
index 8c505f925..000000000
Binary files a/Audio/SE/Cries/SWINUB.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWIRLIX.mp3 b/Audio/SE/Cries/SWIRLIX.mp3
new file mode 100644
index 000000000..df503b170
Binary files /dev/null and b/Audio/SE/Cries/SWIRLIX.mp3 differ
diff --git a/Audio/SE/Cries/SWIRLIX.ogg b/Audio/SE/Cries/SWIRLIX.ogg
deleted file mode 100644
index 396abc7a9..000000000
Binary files a/Audio/SE/Cries/SWIRLIX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SWOOBAT.ogg b/Audio/SE/Cries/SWOOBAT.ogg
deleted file mode 100644
index 1b4e8a75f..000000000
Binary files a/Audio/SE/Cries/SWOOBAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/SYLVEON.mp3 b/Audio/SE/Cries/SYLVEON.mp3
new file mode 100644
index 000000000..61acef801
Binary files /dev/null and b/Audio/SE/Cries/SYLVEON.mp3 differ
diff --git a/Audio/SE/Cries/SYLVEON.ogg b/Audio/SE/Cries/SYLVEON.ogg
deleted file mode 100644
index 8ac48bf1e..000000000
Binary files a/Audio/SE/Cries/SYLVEON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TAILLOW.ogg b/Audio/SE/Cries/TAILLOW.ogg
deleted file mode 100644
index 79262abac..000000000
Binary files a/Audio/SE/Cries/TAILLOW.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TALONFLAME.mp3 b/Audio/SE/Cries/TALONFLAME.mp3
new file mode 100644
index 000000000..a94ac0075
Binary files /dev/null and b/Audio/SE/Cries/TALONFLAME.mp3 differ
diff --git a/Audio/SE/Cries/TALONFLAME.ogg b/Audio/SE/Cries/TALONFLAME.ogg
deleted file mode 100644
index 950f7244a..000000000
Binary files a/Audio/SE/Cries/TALONFLAME.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TANGELA.mp3 b/Audio/SE/Cries/TANGELA.mp3
new file mode 100644
index 000000000..cd54ec85e
Binary files /dev/null and b/Audio/SE/Cries/TANGELA.mp3 differ
diff --git a/Audio/SE/Cries/TANGELA.ogg b/Audio/SE/Cries/TANGELA.ogg
deleted file mode 100644
index 6e9e6c203..000000000
Binary files a/Audio/SE/Cries/TANGELA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TANGROWTH.mp3 b/Audio/SE/Cries/TANGROWTH.mp3
new file mode 100644
index 000000000..e02edaf05
Binary files /dev/null and b/Audio/SE/Cries/TANGROWTH.mp3 differ
diff --git a/Audio/SE/Cries/TANGROWTH.ogg b/Audio/SE/Cries/TANGROWTH.ogg
deleted file mode 100644
index 712a7eabd..000000000
Binary files a/Audio/SE/Cries/TANGROWTH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TAPUBULU.ogg b/Audio/SE/Cries/TAPUBULU.ogg
deleted file mode 100644
index a15dfabad..000000000
Binary files a/Audio/SE/Cries/TAPUBULU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TAPUFINI.ogg b/Audio/SE/Cries/TAPUFINI.ogg
deleted file mode 100644
index 8c8ba745e..000000000
Binary files a/Audio/SE/Cries/TAPUFINI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TAPUKOKO.ogg b/Audio/SE/Cries/TAPUKOKO.ogg
deleted file mode 100644
index 01e3da2e5..000000000
Binary files a/Audio/SE/Cries/TAPUKOKO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TAPULELE.ogg b/Audio/SE/Cries/TAPULELE.ogg
deleted file mode 100644
index 562bfd4db..000000000
Binary files a/Audio/SE/Cries/TAPULELE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TAUROS.mp3 b/Audio/SE/Cries/TAUROS.mp3
new file mode 100644
index 000000000..a8a225347
Binary files /dev/null and b/Audio/SE/Cries/TAUROS.mp3 differ
diff --git a/Audio/SE/Cries/TAUROS.ogg b/Audio/SE/Cries/TAUROS.ogg
deleted file mode 100644
index 18e1eef11..000000000
Binary files a/Audio/SE/Cries/TAUROS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TEDDIURSA.mp3 b/Audio/SE/Cries/TEDDIURSA.mp3
new file mode 100644
index 000000000..f9766aa17
Binary files /dev/null and b/Audio/SE/Cries/TEDDIURSA.mp3 differ
diff --git a/Audio/SE/Cries/TEDDIURSA.ogg b/Audio/SE/Cries/TEDDIURSA.ogg
deleted file mode 100644
index b2c363b4d..000000000
Binary files a/Audio/SE/Cries/TEDDIURSA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TENTACOOL.mp3 b/Audio/SE/Cries/TENTACOOL.mp3
new file mode 100644
index 000000000..80b42e907
Binary files /dev/null and b/Audio/SE/Cries/TENTACOOL.mp3 differ
diff --git a/Audio/SE/Cries/TENTACOOL.ogg b/Audio/SE/Cries/TENTACOOL.ogg
deleted file mode 100644
index 41fa1de32..000000000
Binary files a/Audio/SE/Cries/TENTACOOL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TENTACRUEL.mp3 b/Audio/SE/Cries/TENTACRUEL.mp3
new file mode 100644
index 000000000..76d3099e1
Binary files /dev/null and b/Audio/SE/Cries/TENTACRUEL.mp3 differ
diff --git a/Audio/SE/Cries/TENTACRUEL.ogg b/Audio/SE/Cries/TENTACRUEL.ogg
deleted file mode 100644
index 9fc621ca5..000000000
Binary files a/Audio/SE/Cries/TENTACRUEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TEPIG.ogg b/Audio/SE/Cries/TEPIG.ogg
deleted file mode 100644
index b16445f19..000000000
Binary files a/Audio/SE/Cries/TEPIG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TERRAKION.ogg b/Audio/SE/Cries/TERRAKION.ogg
deleted file mode 100644
index 140809023..000000000
Binary files a/Audio/SE/Cries/TERRAKION.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/THIEVUL.ogg b/Audio/SE/Cries/THIEVUL.ogg
deleted file mode 100644
index 02d5b456e..000000000
Binary files a/Audio/SE/Cries/THIEVUL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/THROH.ogg b/Audio/SE/Cries/THROH.ogg
deleted file mode 100644
index 0a9f526c0..000000000
Binary files a/Audio/SE/Cries/THROH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/THUNDURUS.ogg b/Audio/SE/Cries/THUNDURUS.ogg
deleted file mode 100644
index 2f24cae66..000000000
Binary files a/Audio/SE/Cries/THUNDURUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/THUNDURUS_1.ogg b/Audio/SE/Cries/THUNDURUS_1.ogg
deleted file mode 100644
index d631bc225..000000000
Binary files a/Audio/SE/Cries/THUNDURUS_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/THWACKEY.ogg b/Audio/SE/Cries/THWACKEY.ogg
deleted file mode 100644
index 1ec670a93..000000000
Binary files a/Audio/SE/Cries/THWACKEY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TIMBURR.ogg b/Audio/SE/Cries/TIMBURR.ogg
deleted file mode 100644
index 3e0194c2c..000000000
Binary files a/Audio/SE/Cries/TIMBURR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TIRTOUGA.ogg b/Audio/SE/Cries/TIRTOUGA.ogg
deleted file mode 100644
index 7639326fc..000000000
Binary files a/Audio/SE/Cries/TIRTOUGA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOGEDEMARU.ogg b/Audio/SE/Cries/TOGEDEMARU.ogg
deleted file mode 100644
index 751b77ddc..000000000
Binary files a/Audio/SE/Cries/TOGEDEMARU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOGEKISS.mp3 b/Audio/SE/Cries/TOGEKISS.mp3
new file mode 100644
index 000000000..fb1695f3a
Binary files /dev/null and b/Audio/SE/Cries/TOGEKISS.mp3 differ
diff --git a/Audio/SE/Cries/TOGEKISS.ogg b/Audio/SE/Cries/TOGEKISS.ogg
deleted file mode 100644
index 061988010..000000000
Binary files a/Audio/SE/Cries/TOGEKISS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOGEPI.mp3 b/Audio/SE/Cries/TOGEPI.mp3
new file mode 100644
index 000000000..59afdc99a
Binary files /dev/null and b/Audio/SE/Cries/TOGEPI.mp3 differ
diff --git a/Audio/SE/Cries/TOGEPI.ogg b/Audio/SE/Cries/TOGEPI.ogg
deleted file mode 100644
index ec12f3b61..000000000
Binary files a/Audio/SE/Cries/TOGEPI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOGETIC.mp3 b/Audio/SE/Cries/TOGETIC.mp3
new file mode 100644
index 000000000..eabd82947
Binary files /dev/null and b/Audio/SE/Cries/TOGETIC.mp3 differ
diff --git a/Audio/SE/Cries/TOGETIC.ogg b/Audio/SE/Cries/TOGETIC.ogg
deleted file mode 100644
index 5b2d17248..000000000
Binary files a/Audio/SE/Cries/TOGETIC.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TORCHIC.mp3 b/Audio/SE/Cries/TORCHIC.mp3
new file mode 100644
index 000000000..56eb236a0
Binary files /dev/null and b/Audio/SE/Cries/TORCHIC.mp3 differ
diff --git a/Audio/SE/Cries/TORCHIC.ogg b/Audio/SE/Cries/TORCHIC.ogg
deleted file mode 100644
index a53c5fbcc..000000000
Binary files a/Audio/SE/Cries/TORCHIC.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TORCHIC.wav b/Audio/SE/Cries/TORCHIC.wav
new file mode 100644
index 000000000..04eb0e765
Binary files /dev/null and b/Audio/SE/Cries/TORCHIC.wav differ
diff --git a/Audio/SE/Cries/TORKOAL.mp3 b/Audio/SE/Cries/TORKOAL.mp3
new file mode 100644
index 000000000..f1832d761
Binary files /dev/null and b/Audio/SE/Cries/TORKOAL.mp3 differ
diff --git a/Audio/SE/Cries/TORKOAL.ogg b/Audio/SE/Cries/TORKOAL.ogg
deleted file mode 100644
index 8c187eeee..000000000
Binary files a/Audio/SE/Cries/TORKOAL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TORNADUS.ogg b/Audio/SE/Cries/TORNADUS.ogg
deleted file mode 100644
index 5a9c15299..000000000
Binary files a/Audio/SE/Cries/TORNADUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TORNADUS_1.ogg b/Audio/SE/Cries/TORNADUS_1.ogg
deleted file mode 100644
index 24a0913bc..000000000
Binary files a/Audio/SE/Cries/TORNADUS_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TORRACAT.ogg b/Audio/SE/Cries/TORRACAT.ogg
deleted file mode 100644
index b822a7303..000000000
Binary files a/Audio/SE/Cries/TORRACAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TORTERRA.mp3 b/Audio/SE/Cries/TORTERRA.mp3
new file mode 100644
index 000000000..27cbd0adf
Binary files /dev/null and b/Audio/SE/Cries/TORTERRA.mp3 differ
diff --git a/Audio/SE/Cries/TORTERRA.ogg b/Audio/SE/Cries/TORTERRA.ogg
deleted file mode 100644
index 8f42ba640..000000000
Binary files a/Audio/SE/Cries/TORTERRA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOTODILE.mp3 b/Audio/SE/Cries/TOTODILE.mp3
new file mode 100644
index 000000000..4ad980fe2
Binary files /dev/null and b/Audio/SE/Cries/TOTODILE.mp3 differ
diff --git a/Audio/SE/Cries/TOTODILE.ogg b/Audio/SE/Cries/TOTODILE.ogg
deleted file mode 100644
index 2af270f38..000000000
Binary files a/Audio/SE/Cries/TOTODILE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOUCANNON.ogg b/Audio/SE/Cries/TOUCANNON.ogg
deleted file mode 100644
index 789d8d9de..000000000
Binary files a/Audio/SE/Cries/TOUCANNON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOXAPEX.mp3 b/Audio/SE/Cries/TOXAPEX.mp3
new file mode 100644
index 000000000..3a3498835
Binary files /dev/null and b/Audio/SE/Cries/TOXAPEX.mp3 differ
diff --git a/Audio/SE/Cries/TOXAPEX.ogg b/Audio/SE/Cries/TOXAPEX.ogg
deleted file mode 100644
index 1320cfad6..000000000
Binary files a/Audio/SE/Cries/TOXAPEX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOXEL.ogg b/Audio/SE/Cries/TOXEL.ogg
deleted file mode 100644
index ab129c510..000000000
Binary files a/Audio/SE/Cries/TOXEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOXICROAK.ogg b/Audio/SE/Cries/TOXICROAK.ogg
deleted file mode 100644
index 5c2c811fd..000000000
Binary files a/Audio/SE/Cries/TOXICROAK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOXTRICITY.ogg b/Audio/SE/Cries/TOXTRICITY.ogg
deleted file mode 100644
index c839b0489..000000000
Binary files a/Audio/SE/Cries/TOXTRICITY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TOXTRICITY_1.ogg b/Audio/SE/Cries/TOXTRICITY_1.ogg
deleted file mode 100644
index 38ae44af8..000000000
Binary files a/Audio/SE/Cries/TOXTRICITY_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TRANQUILL.ogg b/Audio/SE/Cries/TRANQUILL.ogg
deleted file mode 100644
index 9946c61bb..000000000
Binary files a/Audio/SE/Cries/TRANQUILL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TRAPINCH.mp3 b/Audio/SE/Cries/TRAPINCH.mp3
new file mode 100644
index 000000000..1060d595d
Binary files /dev/null and b/Audio/SE/Cries/TRAPINCH.mp3 differ
diff --git a/Audio/SE/Cries/TRAPINCH.ogg b/Audio/SE/Cries/TRAPINCH.ogg
deleted file mode 100644
index 18d4b5fdd..000000000
Binary files a/Audio/SE/Cries/TRAPINCH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TREECKO.mp3 b/Audio/SE/Cries/TREECKO.mp3
new file mode 100644
index 000000000..3bc055ed0
Binary files /dev/null and b/Audio/SE/Cries/TREECKO.mp3 differ
diff --git a/Audio/SE/Cries/TREECKO.ogg b/Audio/SE/Cries/TREECKO.ogg
deleted file mode 100644
index d8d6c8ce7..000000000
Binary files a/Audio/SE/Cries/TREECKO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TREVENANT.mp3 b/Audio/SE/Cries/TREVENANT.mp3
new file mode 100644
index 000000000..d18bf932a
Binary files /dev/null and b/Audio/SE/Cries/TREVENANT.mp3 differ
diff --git a/Audio/SE/Cries/TREVENANT.ogg b/Audio/SE/Cries/TREVENANT.ogg
deleted file mode 100644
index 3724c6165..000000000
Binary files a/Audio/SE/Cries/TREVENANT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TROPIUS.ogg b/Audio/SE/Cries/TROPIUS.ogg
deleted file mode 100644
index 19258a954..000000000
Binary files a/Audio/SE/Cries/TROPIUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TRUBBISH.mp3 b/Audio/SE/Cries/TRUBBISH.mp3
new file mode 100644
index 000000000..19999b727
Binary files /dev/null and b/Audio/SE/Cries/TRUBBISH.mp3 differ
diff --git a/Audio/SE/Cries/TRUBBISH.ogg b/Audio/SE/Cries/TRUBBISH.ogg
deleted file mode 100644
index 246573917..000000000
Binary files a/Audio/SE/Cries/TRUBBISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TRUMBEAK.ogg b/Audio/SE/Cries/TRUMBEAK.ogg
deleted file mode 100644
index 53af278af..000000000
Binary files a/Audio/SE/Cries/TRUMBEAK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TSAREENA.ogg b/Audio/SE/Cries/TSAREENA.ogg
deleted file mode 100644
index da5d79747..000000000
Binary files a/Audio/SE/Cries/TSAREENA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TURTONATOR.ogg b/Audio/SE/Cries/TURTONATOR.ogg
deleted file mode 100644
index 1254dbaf7..000000000
Binary files a/Audio/SE/Cries/TURTONATOR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TURTWIG.mp3 b/Audio/SE/Cries/TURTWIG.mp3
new file mode 100644
index 000000000..7cb3d7d9e
Binary files /dev/null and b/Audio/SE/Cries/TURTWIG.mp3 differ
diff --git a/Audio/SE/Cries/TURTWIG.ogg b/Audio/SE/Cries/TURTWIG.ogg
deleted file mode 100644
index aa1e90a4b..000000000
Binary files a/Audio/SE/Cries/TURTWIG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TYMPOLE.ogg b/Audio/SE/Cries/TYMPOLE.ogg
deleted file mode 100644
index 878e4bc57..000000000
Binary files a/Audio/SE/Cries/TYMPOLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TYNAMO.ogg b/Audio/SE/Cries/TYNAMO.ogg
deleted file mode 100644
index 22ec19032..000000000
Binary files a/Audio/SE/Cries/TYNAMO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TYPENULL.ogg b/Audio/SE/Cries/TYPENULL.ogg
deleted file mode 100644
index b89aabbaa..000000000
Binary files a/Audio/SE/Cries/TYPENULL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TYPHLOSION.mp3 b/Audio/SE/Cries/TYPHLOSION.mp3
new file mode 100644
index 000000000..6295d89ee
Binary files /dev/null and b/Audio/SE/Cries/TYPHLOSION.mp3 differ
diff --git a/Audio/SE/Cries/TYPHLOSION.ogg b/Audio/SE/Cries/TYPHLOSION.ogg
deleted file mode 100644
index e5cd9d41f..000000000
Binary files a/Audio/SE/Cries/TYPHLOSION.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TYRANITAR.mp3 b/Audio/SE/Cries/TYRANITAR.mp3
new file mode 100644
index 000000000..c37b335dd
Binary files /dev/null and b/Audio/SE/Cries/TYRANITAR.mp3 differ
diff --git a/Audio/SE/Cries/TYRANITAR.ogg b/Audio/SE/Cries/TYRANITAR.ogg
deleted file mode 100644
index 20e7bc72b..000000000
Binary files a/Audio/SE/Cries/TYRANITAR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TYRANITAR_1.ogg b/Audio/SE/Cries/TYRANITAR_1.ogg
deleted file mode 100644
index ad1d5dc84..000000000
Binary files a/Audio/SE/Cries/TYRANITAR_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TYRANTRUM.mp3 b/Audio/SE/Cries/TYRANTRUM.mp3
new file mode 100644
index 000000000..d65b671e4
Binary files /dev/null and b/Audio/SE/Cries/TYRANTRUM.mp3 differ
diff --git a/Audio/SE/Cries/TYRANTRUM.ogg b/Audio/SE/Cries/TYRANTRUM.ogg
deleted file mode 100644
index ff0222d37..000000000
Binary files a/Audio/SE/Cries/TYRANTRUM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TYROGUE.mp3 b/Audio/SE/Cries/TYROGUE.mp3
new file mode 100644
index 000000000..e0cf0dedc
Binary files /dev/null and b/Audio/SE/Cries/TYROGUE.mp3 differ
diff --git a/Audio/SE/Cries/TYROGUE.ogg b/Audio/SE/Cries/TYROGUE.ogg
deleted file mode 100644
index 7d614aa3e..000000000
Binary files a/Audio/SE/Cries/TYROGUE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/TYRUNT.mp3 b/Audio/SE/Cries/TYRUNT.mp3
new file mode 100644
index 000000000..116381065
Binary files /dev/null and b/Audio/SE/Cries/TYRUNT.mp3 differ
diff --git a/Audio/SE/Cries/TYRUNT.ogg b/Audio/SE/Cries/TYRUNT.ogg
deleted file mode 100644
index b5ccf7ded..000000000
Binary files a/Audio/SE/Cries/TYRUNT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/UMBREON.mp3 b/Audio/SE/Cries/UMBREON.mp3
new file mode 100644
index 000000000..bbc474f18
Binary files /dev/null and b/Audio/SE/Cries/UMBREON.mp3 differ
diff --git a/Audio/SE/Cries/UMBREON.ogg b/Audio/SE/Cries/UMBREON.ogg
deleted file mode 100644
index 917bd558f..000000000
Binary files a/Audio/SE/Cries/UMBREON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/UNFEZANT.ogg b/Audio/SE/Cries/UNFEZANT.ogg
deleted file mode 100644
index 89d92a722..000000000
Binary files a/Audio/SE/Cries/UNFEZANT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/UNOWN.mp3 b/Audio/SE/Cries/UNOWN.mp3
new file mode 100644
index 000000000..56fa44de8
Binary files /dev/null and b/Audio/SE/Cries/UNOWN.mp3 differ
diff --git a/Audio/SE/Cries/UNOWN.ogg b/Audio/SE/Cries/UNOWN.ogg
deleted file mode 100644
index 3a4330411..000000000
Binary files a/Audio/SE/Cries/UNOWN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/URSARING.mp3 b/Audio/SE/Cries/URSARING.mp3
new file mode 100644
index 000000000..7054bf60f
Binary files /dev/null and b/Audio/SE/Cries/URSARING.mp3 differ
diff --git a/Audio/SE/Cries/URSARING.ogg b/Audio/SE/Cries/URSARING.ogg
deleted file mode 100644
index 213bccced..000000000
Binary files a/Audio/SE/Cries/URSARING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/URSHIFU.ogg b/Audio/SE/Cries/URSHIFU.ogg
deleted file mode 100644
index cad5fc977..000000000
Binary files a/Audio/SE/Cries/URSHIFU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/URSHIFU_1.ogg b/Audio/SE/Cries/URSHIFU_1.ogg
deleted file mode 100644
index 20ded7977..000000000
Binary files a/Audio/SE/Cries/URSHIFU_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/UXIE.ogg b/Audio/SE/Cries/UXIE.ogg
deleted file mode 100644
index 2d35f8143..000000000
Binary files a/Audio/SE/Cries/UXIE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/U_NECROZMA.mp3 b/Audio/SE/Cries/U_NECROZMA.mp3
new file mode 100644
index 000000000..9bc37160e
Binary files /dev/null and b/Audio/SE/Cries/U_NECROZMA.mp3 differ
diff --git a/Audio/SE/Cries/U_NECROZMA.ogg b/Audio/SE/Cries/U_NECROZMA.ogg
deleted file mode 100644
index 0814b717e..000000000
Binary files a/Audio/SE/Cries/U_NECROZMA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VANILLISH.ogg b/Audio/SE/Cries/VANILLISH.ogg
deleted file mode 100644
index 1c0ca3a52..000000000
Binary files a/Audio/SE/Cries/VANILLISH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VANILLITE.ogg b/Audio/SE/Cries/VANILLITE.ogg
deleted file mode 100644
index e100326bf..000000000
Binary files a/Audio/SE/Cries/VANILLITE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VANILLUXE.ogg b/Audio/SE/Cries/VANILLUXE.ogg
deleted file mode 100644
index 097b9af0f..000000000
Binary files a/Audio/SE/Cries/VANILLUXE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VAPOREON.mp3 b/Audio/SE/Cries/VAPOREON.mp3
new file mode 100644
index 000000000..3b303826a
Binary files /dev/null and b/Audio/SE/Cries/VAPOREON.mp3 differ
diff --git a/Audio/SE/Cries/VAPOREON.ogg b/Audio/SE/Cries/VAPOREON.ogg
deleted file mode 100644
index 693f778d1..000000000
Binary files a/Audio/SE/Cries/VAPOREON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VENIPEDE.mp3 b/Audio/SE/Cries/VENIPEDE.mp3
new file mode 100644
index 000000000..a2bb30b3d
Binary files /dev/null and b/Audio/SE/Cries/VENIPEDE.mp3 differ
diff --git a/Audio/SE/Cries/VENIPEDE.ogg b/Audio/SE/Cries/VENIPEDE.ogg
deleted file mode 100644
index 1dae30aa6..000000000
Binary files a/Audio/SE/Cries/VENIPEDE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VENOMOTH.mp3 b/Audio/SE/Cries/VENOMOTH.mp3
new file mode 100644
index 000000000..f312dbbc6
Binary files /dev/null and b/Audio/SE/Cries/VENOMOTH.mp3 differ
diff --git a/Audio/SE/Cries/VENOMOTH.ogg b/Audio/SE/Cries/VENOMOTH.ogg
deleted file mode 100644
index f596b8b86..000000000
Binary files a/Audio/SE/Cries/VENOMOTH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VENONAT.mp3 b/Audio/SE/Cries/VENONAT.mp3
new file mode 100644
index 000000000..4a2282cf1
Binary files /dev/null and b/Audio/SE/Cries/VENONAT.mp3 differ
diff --git a/Audio/SE/Cries/VENONAT.ogg b/Audio/SE/Cries/VENONAT.ogg
deleted file mode 100644
index 47b3abd2e..000000000
Binary files a/Audio/SE/Cries/VENONAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VENUSAUR.mp3 b/Audio/SE/Cries/VENUSAUR.mp3
new file mode 100644
index 000000000..9e28adec5
Binary files /dev/null and b/Audio/SE/Cries/VENUSAUR.mp3 differ
diff --git a/Audio/SE/Cries/VENUSAUR.ogg b/Audio/SE/Cries/VENUSAUR.ogg
deleted file mode 100644
index ea71045bf..000000000
Binary files a/Audio/SE/Cries/VENUSAUR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VENUSAUR_1.ogg b/Audio/SE/Cries/VENUSAUR_1.ogg
deleted file mode 100644
index ccba46b5e..000000000
Binary files a/Audio/SE/Cries/VENUSAUR_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VESPIQUEN.ogg b/Audio/SE/Cries/VESPIQUEN.ogg
deleted file mode 100644
index 40ccf3f28..000000000
Binary files a/Audio/SE/Cries/VESPIQUEN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VIBRAVA.mp3 b/Audio/SE/Cries/VIBRAVA.mp3
new file mode 100644
index 000000000..c524911ca
Binary files /dev/null and b/Audio/SE/Cries/VIBRAVA.mp3 differ
diff --git a/Audio/SE/Cries/VIBRAVA.ogg b/Audio/SE/Cries/VIBRAVA.ogg
deleted file mode 100644
index 415312e77..000000000
Binary files a/Audio/SE/Cries/VIBRAVA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VICTINI.ogg b/Audio/SE/Cries/VICTINI.ogg
deleted file mode 100644
index e9750b3c8..000000000
Binary files a/Audio/SE/Cries/VICTINI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VICTREEBEL.ogg b/Audio/SE/Cries/VICTREEBEL.ogg
deleted file mode 100644
index a2d196f50..000000000
Binary files a/Audio/SE/Cries/VICTREEBEL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VIGOROTH.mp3 b/Audio/SE/Cries/VIGOROTH.mp3
new file mode 100644
index 000000000..c9f5beed2
Binary files /dev/null and b/Audio/SE/Cries/VIGOROTH.mp3 differ
diff --git a/Audio/SE/Cries/VIGOROTH.ogg b/Audio/SE/Cries/VIGOROTH.ogg
deleted file mode 100644
index 783dc78e7..000000000
Binary files a/Audio/SE/Cries/VIGOROTH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VIKAVOLT.ogg b/Audio/SE/Cries/VIKAVOLT.ogg
deleted file mode 100644
index 822cb530b..000000000
Binary files a/Audio/SE/Cries/VIKAVOLT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VILEPLUME.mp3 b/Audio/SE/Cries/VILEPLUME.mp3
new file mode 100644
index 000000000..0d95fad2a
Binary files /dev/null and b/Audio/SE/Cries/VILEPLUME.mp3 differ
diff --git a/Audio/SE/Cries/VILEPLUME.ogg b/Audio/SE/Cries/VILEPLUME.ogg
deleted file mode 100644
index 9106c8868..000000000
Binary files a/Audio/SE/Cries/VILEPLUME.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VIRIZION.ogg b/Audio/SE/Cries/VIRIZION.ogg
deleted file mode 100644
index 472ae3b6a..000000000
Binary files a/Audio/SE/Cries/VIRIZION.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VIVILLON.ogg b/Audio/SE/Cries/VIVILLON.ogg
deleted file mode 100644
index 40dcd632d..000000000
Binary files a/Audio/SE/Cries/VIVILLON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VOLBEAT.ogg b/Audio/SE/Cries/VOLBEAT.ogg
deleted file mode 100644
index aae4e9a07..000000000
Binary files a/Audio/SE/Cries/VOLBEAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VOLCANION.ogg b/Audio/SE/Cries/VOLCANION.ogg
deleted file mode 100644
index f742f67dd..000000000
Binary files a/Audio/SE/Cries/VOLCANION.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VOLCARONA.mp3 b/Audio/SE/Cries/VOLCARONA.mp3
new file mode 100644
index 000000000..b5c382874
Binary files /dev/null and b/Audio/SE/Cries/VOLCARONA.mp3 differ
diff --git a/Audio/SE/Cries/VOLCARONA.ogg b/Audio/SE/Cries/VOLCARONA.ogg
deleted file mode 100644
index ea1bf9126..000000000
Binary files a/Audio/SE/Cries/VOLCARONA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VOLTORB.mp3 b/Audio/SE/Cries/VOLTORB.mp3
new file mode 100644
index 000000000..ce2f3304f
Binary files /dev/null and b/Audio/SE/Cries/VOLTORB.mp3 differ
diff --git a/Audio/SE/Cries/VOLTORB.ogg b/Audio/SE/Cries/VOLTORB.ogg
deleted file mode 100644
index 94c0dc16e..000000000
Binary files a/Audio/SE/Cries/VOLTORB.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VULLABY.ogg b/Audio/SE/Cries/VULLABY.ogg
deleted file mode 100644
index 63b24c67f..000000000
Binary files a/Audio/SE/Cries/VULLABY.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/VULPIX.ogg b/Audio/SE/Cries/VULPIX.ogg
deleted file mode 100644
index 3096e2c74..000000000
Binary files a/Audio/SE/Cries/VULPIX.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WAILMER.mp3 b/Audio/SE/Cries/WAILMER.mp3
new file mode 100644
index 000000000..2022a9140
Binary files /dev/null and b/Audio/SE/Cries/WAILMER.mp3 differ
diff --git a/Audio/SE/Cries/WAILMER.ogg b/Audio/SE/Cries/WAILMER.ogg
deleted file mode 100644
index 464d06961..000000000
Binary files a/Audio/SE/Cries/WAILMER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WAILORD.mp3 b/Audio/SE/Cries/WAILORD.mp3
new file mode 100644
index 000000000..fcf88ca0e
Binary files /dev/null and b/Audio/SE/Cries/WAILORD.mp3 differ
diff --git a/Audio/SE/Cries/WAILORD.ogg b/Audio/SE/Cries/WAILORD.ogg
deleted file mode 100644
index 5e0195281..000000000
Binary files a/Audio/SE/Cries/WAILORD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WALREIN.ogg b/Audio/SE/Cries/WALREIN.ogg
deleted file mode 100644
index a5d360ef8..000000000
Binary files a/Audio/SE/Cries/WALREIN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WARTORTLE.mp3 b/Audio/SE/Cries/WARTORTLE.mp3
new file mode 100644
index 000000000..0e27f6a72
Binary files /dev/null and b/Audio/SE/Cries/WARTORTLE.mp3 differ
diff --git a/Audio/SE/Cries/WARTORTLE.ogg b/Audio/SE/Cries/WARTORTLE.ogg
deleted file mode 100644
index 643c099bc..000000000
Binary files a/Audio/SE/Cries/WARTORTLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WATCHOG.ogg b/Audio/SE/Cries/WATCHOG.ogg
deleted file mode 100644
index d8347af28..000000000
Binary files a/Audio/SE/Cries/WATCHOG.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WEAVILE.mp3 b/Audio/SE/Cries/WEAVILE.mp3
new file mode 100644
index 000000000..fd0058eeb
Binary files /dev/null and b/Audio/SE/Cries/WEAVILE.mp3 differ
diff --git a/Audio/SE/Cries/WEAVILE.ogg b/Audio/SE/Cries/WEAVILE.ogg
deleted file mode 100644
index 48ee744a9..000000000
Binary files a/Audio/SE/Cries/WEAVILE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WEEDLE.mp3 b/Audio/SE/Cries/WEEDLE.mp3
new file mode 100644
index 000000000..4f0442e9f
Binary files /dev/null and b/Audio/SE/Cries/WEEDLE.mp3 differ
diff --git a/Audio/SE/Cries/WEEDLE.ogg b/Audio/SE/Cries/WEEDLE.ogg
deleted file mode 100644
index c67b3f9c2..000000000
Binary files a/Audio/SE/Cries/WEEDLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WEEDLE.wav b/Audio/SE/Cries/WEEDLE.wav
new file mode 100644
index 000000000..97b540fdc
Binary files /dev/null and b/Audio/SE/Cries/WEEDLE.wav differ
diff --git a/Audio/SE/Cries/WEEPINBELL.mp3 b/Audio/SE/Cries/WEEPINBELL.mp3
new file mode 100644
index 000000000..fdc0a857f
Binary files /dev/null and b/Audio/SE/Cries/WEEPINBELL.mp3 differ
diff --git a/Audio/SE/Cries/WEEPINBELL.ogg b/Audio/SE/Cries/WEEPINBELL.ogg
deleted file mode 100644
index a06b35df8..000000000
Binary files a/Audio/SE/Cries/WEEPINBELL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WEEZING.mp3 b/Audio/SE/Cries/WEEZING.mp3
new file mode 100644
index 000000000..b89f6ce35
Binary files /dev/null and b/Audio/SE/Cries/WEEZING.mp3 differ
diff --git a/Audio/SE/Cries/WEEZING.ogg b/Audio/SE/Cries/WEEZING.ogg
deleted file mode 100644
index 3d9d20ffe..000000000
Binary files a/Audio/SE/Cries/WEEZING.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WHIMSICOTT.mp3 b/Audio/SE/Cries/WHIMSICOTT.mp3
new file mode 100644
index 000000000..dbdf0970e
Binary files /dev/null and b/Audio/SE/Cries/WHIMSICOTT.mp3 differ
diff --git a/Audio/SE/Cries/WHIMSICOTT.ogg b/Audio/SE/Cries/WHIMSICOTT.ogg
deleted file mode 100644
index b1362bffd..000000000
Binary files a/Audio/SE/Cries/WHIMSICOTT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WHIRLIPEDE.mp3 b/Audio/SE/Cries/WHIRLIPEDE.mp3
new file mode 100644
index 000000000..8cc7c817b
Binary files /dev/null and b/Audio/SE/Cries/WHIRLIPEDE.mp3 differ
diff --git a/Audio/SE/Cries/WHIRLIPEDE.ogg b/Audio/SE/Cries/WHIRLIPEDE.ogg
deleted file mode 100644
index 3b60785ee..000000000
Binary files a/Audio/SE/Cries/WHIRLIPEDE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WHISCASH.ogg b/Audio/SE/Cries/WHISCASH.ogg
deleted file mode 100644
index d9aa12df3..000000000
Binary files a/Audio/SE/Cries/WHISCASH.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WHISMUR.ogg b/Audio/SE/Cries/WHISMUR.ogg
deleted file mode 100644
index 548ab23de..000000000
Binary files a/Audio/SE/Cries/WHISMUR.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WIGGLYTUFF.mp3 b/Audio/SE/Cries/WIGGLYTUFF.mp3
new file mode 100644
index 000000000..180c92168
Binary files /dev/null and b/Audio/SE/Cries/WIGGLYTUFF.mp3 differ
diff --git a/Audio/SE/Cries/WIGGLYTUFF.ogg b/Audio/SE/Cries/WIGGLYTUFF.ogg
deleted file mode 100644
index d6aa9d8e3..000000000
Binary files a/Audio/SE/Cries/WIGGLYTUFF.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WIMPOD.mp3 b/Audio/SE/Cries/WIMPOD.mp3
new file mode 100644
index 000000000..9a25bf68a
Binary files /dev/null and b/Audio/SE/Cries/WIMPOD.mp3 differ
diff --git a/Audio/SE/Cries/WIMPOD.ogg b/Audio/SE/Cries/WIMPOD.ogg
deleted file mode 100644
index a0c0b116f..000000000
Binary files a/Audio/SE/Cries/WIMPOD.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WINGULL.ogg b/Audio/SE/Cries/WINGULL.ogg
deleted file mode 100644
index 0443b5cd1..000000000
Binary files a/Audio/SE/Cries/WINGULL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WISHIWASHI.ogg b/Audio/SE/Cries/WISHIWASHI.ogg
deleted file mode 100644
index 47a6a0b1b..000000000
Binary files a/Audio/SE/Cries/WISHIWASHI.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WISHIWASHI_1.ogg b/Audio/SE/Cries/WISHIWASHI_1.ogg
deleted file mode 100644
index 6bc44f8c4..000000000
Binary files a/Audio/SE/Cries/WISHIWASHI_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WOBBUFFET.mp3 b/Audio/SE/Cries/WOBBUFFET.mp3
new file mode 100644
index 000000000..5b592ce08
Binary files /dev/null and b/Audio/SE/Cries/WOBBUFFET.mp3 differ
diff --git a/Audio/SE/Cries/WOBBUFFET.ogg b/Audio/SE/Cries/WOBBUFFET.ogg
deleted file mode 100644
index 09fdec376..000000000
Binary files a/Audio/SE/Cries/WOBBUFFET.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WOOBAT.ogg b/Audio/SE/Cries/WOOBAT.ogg
deleted file mode 100644
index c24091e3d..000000000
Binary files a/Audio/SE/Cries/WOOBAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WOOLOO.ogg b/Audio/SE/Cries/WOOLOO.ogg
deleted file mode 100644
index 5f48e70dc..000000000
Binary files a/Audio/SE/Cries/WOOLOO.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WOOPER.mp3 b/Audio/SE/Cries/WOOPER.mp3
new file mode 100644
index 000000000..99c33c44a
Binary files /dev/null and b/Audio/SE/Cries/WOOPER.mp3 differ
diff --git a/Audio/SE/Cries/WOOPER.ogg b/Audio/SE/Cries/WOOPER.ogg
deleted file mode 100644
index a4920235d..000000000
Binary files a/Audio/SE/Cries/WOOPER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WOOPER.wav b/Audio/SE/Cries/WOOPER.wav
new file mode 100644
index 000000000..fd72ed631
Binary files /dev/null and b/Audio/SE/Cries/WOOPER.wav differ
diff --git a/Audio/SE/Cries/WORMADAM.ogg b/Audio/SE/Cries/WORMADAM.ogg
deleted file mode 100644
index 636c592e5..000000000
Binary files a/Audio/SE/Cries/WORMADAM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WURMPLE.ogg b/Audio/SE/Cries/WURMPLE.ogg
deleted file mode 100644
index 5ef78fa0f..000000000
Binary files a/Audio/SE/Cries/WURMPLE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/WYNAUT.mp3 b/Audio/SE/Cries/WYNAUT.mp3
new file mode 100644
index 000000000..529966259
Binary files /dev/null and b/Audio/SE/Cries/WYNAUT.mp3 differ
diff --git a/Audio/SE/Cries/WYNAUT.ogg b/Audio/SE/Cries/WYNAUT.ogg
deleted file mode 100644
index e38a5add7..000000000
Binary files a/Audio/SE/Cries/WYNAUT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/XATU.mp3 b/Audio/SE/Cries/XATU.mp3
new file mode 100644
index 000000000..3ed70f4f8
Binary files /dev/null and b/Audio/SE/Cries/XATU.mp3 differ
diff --git a/Audio/SE/Cries/XATU.ogg b/Audio/SE/Cries/XATU.ogg
deleted file mode 100644
index 0f781634d..000000000
Binary files a/Audio/SE/Cries/XATU.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/XERNEAS.ogg b/Audio/SE/Cries/XERNEAS.ogg
deleted file mode 100644
index 5c018b840..000000000
Binary files a/Audio/SE/Cries/XERNEAS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/XURKITREE.ogg b/Audio/SE/Cries/XURKITREE.ogg
deleted file mode 100644
index 5176289ba..000000000
Binary files a/Audio/SE/Cries/XURKITREE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/YAMASK.mp3 b/Audio/SE/Cries/YAMASK.mp3
new file mode 100644
index 000000000..a947f33ab
Binary files /dev/null and b/Audio/SE/Cries/YAMASK.mp3 differ
diff --git a/Audio/SE/Cries/YAMASK.ogg b/Audio/SE/Cries/YAMASK.ogg
deleted file mode 100644
index 7d8f6237a..000000000
Binary files a/Audio/SE/Cries/YAMASK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/YAMPER.ogg b/Audio/SE/Cries/YAMPER.ogg
deleted file mode 100644
index fda65973d..000000000
Binary files a/Audio/SE/Cries/YAMPER.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/YANMA.mp3 b/Audio/SE/Cries/YANMA.mp3
new file mode 100644
index 000000000..6c51b154d
Binary files /dev/null and b/Audio/SE/Cries/YANMA.mp3 differ
diff --git a/Audio/SE/Cries/YANMA.ogg b/Audio/SE/Cries/YANMA.ogg
deleted file mode 100644
index d7831790e..000000000
Binary files a/Audio/SE/Cries/YANMA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/YANMEGA.mp3 b/Audio/SE/Cries/YANMEGA.mp3
new file mode 100644
index 000000000..8d56b7bad
Binary files /dev/null and b/Audio/SE/Cries/YANMEGA.mp3 differ
diff --git a/Audio/SE/Cries/YANMEGA.ogg b/Audio/SE/Cries/YANMEGA.ogg
deleted file mode 100644
index 91b23733b..000000000
Binary files a/Audio/SE/Cries/YANMEGA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/YUNGOOS.ogg b/Audio/SE/Cries/YUNGOOS.ogg
deleted file mode 100644
index ffc937b91..000000000
Binary files a/Audio/SE/Cries/YUNGOOS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/YVELTAL.ogg b/Audio/SE/Cries/YVELTAL.ogg
deleted file mode 100644
index a07be756c..000000000
Binary files a/Audio/SE/Cries/YVELTAL.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZACIAN.ogg b/Audio/SE/Cries/ZACIAN.ogg
deleted file mode 100644
index d2617b608..000000000
Binary files a/Audio/SE/Cries/ZACIAN.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZACIAN_1.ogg b/Audio/SE/Cries/ZACIAN_1.ogg
deleted file mode 100644
index bac318f6e..000000000
Binary files a/Audio/SE/Cries/ZACIAN_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZAMAZENTA.ogg b/Audio/SE/Cries/ZAMAZENTA.ogg
deleted file mode 100644
index 4748356f1..000000000
Binary files a/Audio/SE/Cries/ZAMAZENTA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZAMAZENTA_1.ogg b/Audio/SE/Cries/ZAMAZENTA_1.ogg
deleted file mode 100644
index 072634d59..000000000
Binary files a/Audio/SE/Cries/ZAMAZENTA_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZANGOOSE.ogg b/Audio/SE/Cries/ZANGOOSE.ogg
deleted file mode 100644
index 03c325759..000000000
Binary files a/Audio/SE/Cries/ZANGOOSE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZAPDOS.mp3 b/Audio/SE/Cries/ZAPDOS.mp3
new file mode 100644
index 000000000..532de7def
Binary files /dev/null and b/Audio/SE/Cries/ZAPDOS.mp3 differ
diff --git a/Audio/SE/Cries/ZAPDOS.ogg b/Audio/SE/Cries/ZAPDOS.ogg
deleted file mode 100644
index 870c5555a..000000000
Binary files a/Audio/SE/Cries/ZAPDOS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZARUDE.ogg b/Audio/SE/Cries/ZARUDE.ogg
deleted file mode 100644
index dd5b454ea..000000000
Binary files a/Audio/SE/Cries/ZARUDE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZEBSTRIKA.ogg b/Audio/SE/Cries/ZEBSTRIKA.ogg
deleted file mode 100644
index 82f77d079..000000000
Binary files a/Audio/SE/Cries/ZEBSTRIKA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZEKROM.mp3 b/Audio/SE/Cries/ZEKROM.mp3
new file mode 100644
index 000000000..58bb6e67d
Binary files /dev/null and b/Audio/SE/Cries/ZEKROM.mp3 differ
diff --git a/Audio/SE/Cries/ZEKROM.ogg b/Audio/SE/Cries/ZEKROM.ogg
deleted file mode 100644
index 22350c8d1..000000000
Binary files a/Audio/SE/Cries/ZEKROM.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZERAORA.ogg b/Audio/SE/Cries/ZERAORA.ogg
deleted file mode 100644
index b6637342e..000000000
Binary files a/Audio/SE/Cries/ZERAORA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZIGZAGOON.ogg b/Audio/SE/Cries/ZIGZAGOON.ogg
deleted file mode 100644
index c539b0e52..000000000
Binary files a/Audio/SE/Cries/ZIGZAGOON.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZOROARK.mp3 b/Audio/SE/Cries/ZOROARK.mp3
new file mode 100644
index 000000000..619ae6060
Binary files /dev/null and b/Audio/SE/Cries/ZOROARK.mp3 differ
diff --git a/Audio/SE/Cries/ZOROARK.ogg b/Audio/SE/Cries/ZOROARK.ogg
deleted file mode 100644
index 052b8ec33..000000000
Binary files a/Audio/SE/Cries/ZOROARK.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZORUA.mp3 b/Audio/SE/Cries/ZORUA.mp3
new file mode 100644
index 000000000..380074df8
Binary files /dev/null and b/Audio/SE/Cries/ZORUA.mp3 differ
diff --git a/Audio/SE/Cries/ZORUA.ogg b/Audio/SE/Cries/ZORUA.ogg
deleted file mode 100644
index 67e1cbfb4..000000000
Binary files a/Audio/SE/Cries/ZORUA.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZUBAT.mp3 b/Audio/SE/Cries/ZUBAT.mp3
new file mode 100644
index 000000000..7d404f2c7
Binary files /dev/null and b/Audio/SE/Cries/ZUBAT.mp3 differ
diff --git a/Audio/SE/Cries/ZUBAT.ogg b/Audio/SE/Cries/ZUBAT.ogg
deleted file mode 100644
index 1636deeb1..000000000
Binary files a/Audio/SE/Cries/ZUBAT.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZWEILOUS.mp3 b/Audio/SE/Cries/ZWEILOUS.mp3
new file mode 100644
index 000000000..ee905059e
Binary files /dev/null and b/Audio/SE/Cries/ZWEILOUS.mp3 differ
diff --git a/Audio/SE/Cries/ZWEILOUS.ogg b/Audio/SE/Cries/ZWEILOUS.ogg
deleted file mode 100644
index 34c8b0453..000000000
Binary files a/Audio/SE/Cries/ZWEILOUS.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZYGARDE.ogg b/Audio/SE/Cries/ZYGARDE.ogg
deleted file mode 100644
index dc0108429..000000000
Binary files a/Audio/SE/Cries/ZYGARDE.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZYGARDE_1.ogg b/Audio/SE/Cries/ZYGARDE_1.ogg
deleted file mode 100644
index 6ba95352e..000000000
Binary files a/Audio/SE/Cries/ZYGARDE_1.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZYGARDE_2.ogg b/Audio/SE/Cries/ZYGARDE_2.ogg
deleted file mode 100644
index 389437d42..000000000
Binary files a/Audio/SE/Cries/ZYGARDE_2.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/ZYGARDE_3.ogg b/Audio/SE/Cries/ZYGARDE_3.ogg
deleted file mode 100644
index 30d9f858d..000000000
Binary files a/Audio/SE/Cries/ZYGARDE_3.ogg and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/AEGISLASH.wav b/Audio/SE/Cries/gen6-7/AEGISLASH.wav
deleted file mode 100644
index 7db5846bd..000000000
Binary files a/Audio/SE/Cries/gen6-7/AEGISLASH.wav and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/DOUBLADE.wav b/Audio/SE/Cries/gen6-7/DOUBLADE.wav
deleted file mode 100644
index 5d13abf37..000000000
Binary files a/Audio/SE/Cries/gen6-7/DOUBLADE.wav and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/FLETCHINDER.wav b/Audio/SE/Cries/gen6-7/FLETCHINDER.wav
deleted file mode 100644
index d611232d7..000000000
Binary files a/Audio/SE/Cries/gen6-7/FLETCHINDER.wav and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/FLETCHLING.wav b/Audio/SE/Cries/gen6-7/FLETCHLING.wav
deleted file mode 100644
index 7f9a0df64..000000000
Binary files a/Audio/SE/Cries/gen6-7/FLETCHLING.wav and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/HONEDGE.wav b/Audio/SE/Cries/gen6-7/HONEDGE.wav
deleted file mode 100644
index 2a1021041..000000000
Binary files a/Audio/SE/Cries/gen6-7/HONEDGE.wav and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/KLEFKI.wav b/Audio/SE/Cries/gen6-7/KLEFKI.wav
deleted file mode 100644
index 7b5aec54b..000000000
Binary files a/Audio/SE/Cries/gen6-7/KLEFKI.wav and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/MIMIKYU.wav b/Audio/SE/Cries/gen6-7/MIMIKYU.wav
deleted file mode 100644
index 1095d98a8..000000000
Binary files a/Audio/SE/Cries/gen6-7/MIMIKYU.wav and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/PYUKUMUKU.wav b/Audio/SE/Cries/gen6-7/PYUKUMUKU.wav
deleted file mode 100644
index 84d8206c0..000000000
Binary files a/Audio/SE/Cries/gen6-7/PYUKUMUKU.wav and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/SYLVEON.wav b/Audio/SE/Cries/gen6-7/SYLVEON.wav
deleted file mode 100644
index dbe638a60..000000000
Binary files a/Audio/SE/Cries/gen6-7/SYLVEON.wav and /dev/null differ
diff --git a/Audio/SE/Cries/gen6-7/TALONFLAME.wav b/Audio/SE/Cries/gen6-7/TALONFLAME.wav
deleted file mode 100644
index 279898658..000000000
Binary files a/Audio/SE/Cries/gen6-7/TALONFLAME.wav and /dev/null differ
diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index a900929a9..71336e1f0 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index c0f66baff..20f29bd25 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index ae9a94366..c42a6c214 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/052_AddOns/IntroScreen.rb b/Data/Scripts/052_AddOns/IntroScreen.rb
index 8b9711098..476d5ff91 100644
--- a/Data/Scripts/052_AddOns/IntroScreen.rb
+++ b/Data/Scripts/052_AddOns/IntroScreen.rb
@@ -226,6 +226,9 @@ class GenOneStyle
     @sprites["2poke"].x = -150
     @sprites["2poke"].y = 100
 
+    @fusion_head = random_fusion_head
+    @fusion_body = random_fusion_body
+
     @sprites["fpoke"] = Sprite.new(@viewport)
 
     fusedPoke = @spriteLoader.load_pif_sprite(random_fusion)
@@ -367,6 +370,7 @@ class GenOneStyle
 
     if @sprites["poke"].x < 175 #150
       makeShineEffect()
+      GameData::Species.play_fusion_cry(@fusion_head,@fusion_body) if @fusion_head && @fusion_body
     end
     #update_selector_position()
     if @sprites["poke"].x > @sprites["2poke"].x
@@ -398,6 +402,9 @@ class GenOneStyle
       random_fusion_body = random_fusion.body_id
       random_fusion_head = random_fusion.head_id
 
+      @fusion_head = random_fusion_head
+      @fusion_body = random_fusion_body
+
       @prevPoke1 = random_fusion_body
       @prevPoke2 = random_fusion_head
 
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 65a57dbd4..6393bbac5 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 56756c2fe..dde357b46 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/Data/abilities.dat b/Data/abilities.dat
index 8530cf065..78b0f961e 100644
Binary files a/Data/abilities.dat and b/Data/abilities.dat differ
diff --git a/Data/messages.dat b/Data/messages.dat
index 70c050bb1..8be452d13 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/Data/species.dat b/Data/species.dat
index 25a7944ee..e21ecec00 100644
Binary files a/Data/species.dat and b/Data/species.dat differ