diff --git a/audio/gCryAlcremie.wav b/audio/gCryAlcremie.wav index 9b42887..512e66c 100644 Binary files a/audio/gCryAlcremie.wav and b/audio/gCryAlcremie.wav differ diff --git a/audio/gCryAppletun.wav b/audio/gCryAppletun.wav index c858873..42e0fc0 100644 Binary files a/audio/gCryAppletun.wav and b/audio/gCryAppletun.wav differ diff --git a/audio/gCryApplin.wav b/audio/gCryApplin.wav index eef9db5..048d28b 100644 Binary files a/audio/gCryApplin.wav and b/audio/gCryApplin.wav differ diff --git a/audio/gCryArctovish.wav b/audio/gCryArctovish.wav index 95c8756..b4d8791 100644 Binary files a/audio/gCryArctovish.wav and b/audio/gCryArctovish.wav differ diff --git a/audio/gCryArctozolt.wav b/audio/gCryArctozolt.wav index 574e00b..1a6b675 100644 Binary files a/audio/gCryArctozolt.wav and b/audio/gCryArctozolt.wav differ diff --git a/audio/gCryArrokuda.wav b/audio/gCryArrokuda.wav index fb075d3..51c32ef 100644 Binary files a/audio/gCryArrokuda.wav and b/audio/gCryArrokuda.wav differ diff --git a/audio/gCryBarraskewda.wav b/audio/gCryBarraskewda.wav index 41972e0..d3633d6 100644 Binary files a/audio/gCryBarraskewda.wav and b/audio/gCryBarraskewda.wav differ diff --git a/audio/gCryBlipbug.wav b/audio/gCryBlipbug.wav index 99f55ab..3563513 100644 Binary files a/audio/gCryBlipbug.wav and b/audio/gCryBlipbug.wav differ diff --git a/audio/gCryBoltund.wav b/audio/gCryBoltund.wav index eb6930f..447aad4 100644 Binary files a/audio/gCryBoltund.wav and b/audio/gCryBoltund.wav differ diff --git a/audio/gCryCalyrex.wav b/audio/gCryCalyrex.wav new file mode 100644 index 0000000..045bc99 Binary files /dev/null and b/audio/gCryCalyrex.wav differ diff --git a/audio/gCryCalyrexIceRider.wav b/audio/gCryCalyrexIceRider.wav new file mode 100644 index 0000000..c3a5fdd Binary files /dev/null and b/audio/gCryCalyrexIceRider.wav differ diff --git a/audio/gCryCalyrexIceRider_flags.txt b/audio/gCryCalyrexIceRider_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryCalyrexIceRider_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryCalyrexShadowRider.wav b/audio/gCryCalyrexShadowRider.wav new file mode 100644 index 0000000..c4c5051 Binary files /dev/null and b/audio/gCryCalyrexShadowRider.wav differ diff --git a/audio/gCryCalyrexShadowRider_flags.txt b/audio/gCryCalyrexShadowRider_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryCalyrexShadowRider_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryCalyrex_flags.txt b/audio/gCryCalyrex_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryCalyrex_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryCarkol.wav b/audio/gCryCarkol.wav index 86cfc97..12e0d3e 100644 Binary files a/audio/gCryCarkol.wav and b/audio/gCryCarkol.wav differ diff --git a/audio/gCryCentiskorch.wav b/audio/gCryCentiskorch.wav index e3e6f91..5be078b 100644 Binary files a/audio/gCryCentiskorch.wav and b/audio/gCryCentiskorch.wav differ diff --git a/audio/gCryChewtle.wav b/audio/gCryChewtle.wav index 51bd52a..134a065 100644 Binary files a/audio/gCryChewtle.wav and b/audio/gCryChewtle.wav differ diff --git a/audio/gCryCinderace.wav b/audio/gCryCinderace.wav index 83a2060..5f2936e 100644 Binary files a/audio/gCryCinderace.wav and b/audio/gCryCinderace.wav differ diff --git a/audio/gCryClobbopus.wav b/audio/gCryClobbopus.wav index 3f94c9e..1d3205c 100644 Binary files a/audio/gCryClobbopus.wav and b/audio/gCryClobbopus.wav differ diff --git a/audio/gCryCoalossal.wav b/audio/gCryCoalossal.wav index b469261..215d96a 100644 Binary files a/audio/gCryCoalossal.wav and b/audio/gCryCoalossal.wav differ diff --git a/audio/gCryCopperajah.wav b/audio/gCryCopperajah.wav index 2239cb8..80de382 100644 Binary files a/audio/gCryCopperajah.wav and b/audio/gCryCopperajah.wav differ diff --git a/audio/gCryCorviknight.wav b/audio/gCryCorviknight.wav index de8e11c..d45515a 100644 Binary files a/audio/gCryCorviknight.wav and b/audio/gCryCorviknight.wav differ diff --git a/audio/gCryCorvisquire.wav b/audio/gCryCorvisquire.wav index 1761216..821cd76 100644 Binary files a/audio/gCryCorvisquire.wav and b/audio/gCryCorvisquire.wav differ diff --git a/audio/gCryCramorant.wav b/audio/gCryCramorant.wav index 55e44b9..d7d9031 100644 Binary files a/audio/gCryCramorant.wav and b/audio/gCryCramorant.wav differ diff --git a/audio/gCryCufant.wav b/audio/gCryCufant.wav index 155c32a..44d1a3a 100644 Binary files a/audio/gCryCufant.wav and b/audio/gCryCufant.wav differ diff --git a/audio/gCryCursola.wav b/audio/gCryCursola.wav index da1ca4e..df6db9b 100644 Binary files a/audio/gCryCursola.wav and b/audio/gCryCursola.wav differ diff --git a/audio/gCryDottler.wav b/audio/gCryDottler.wav index 4fafb29..9cbbaa9 100644 Binary files a/audio/gCryDottler.wav and b/audio/gCryDottler.wav differ diff --git a/audio/gCryDracovish.wav b/audio/gCryDracovish.wav index 04caa54..6ec036e 100644 Binary files a/audio/gCryDracovish.wav and b/audio/gCryDracovish.wav differ diff --git a/audio/gCryDracozolt.wav b/audio/gCryDracozolt.wav index e7a1683..5a0b7f7 100644 Binary files a/audio/gCryDracozolt.wav and b/audio/gCryDracozolt.wav differ diff --git a/audio/gCryDragapult.wav b/audio/gCryDragapult.wav index 830b931..6f55a8a 100644 Binary files a/audio/gCryDragapult.wav and b/audio/gCryDragapult.wav differ diff --git a/audio/gCryDrakloak.wav b/audio/gCryDrakloak.wav index b169222..aa39ef8 100644 Binary files a/audio/gCryDrakloak.wav and b/audio/gCryDrakloak.wav differ diff --git a/audio/gCryDrednaw.wav b/audio/gCryDrednaw.wav index 5831bee..a6d7852 100644 Binary files a/audio/gCryDrednaw.wav and b/audio/gCryDrednaw.wav differ diff --git a/audio/gCryDreepy.wav b/audio/gCryDreepy.wav index 3b8479d..e19adfa 100644 Binary files a/audio/gCryDreepy.wav and b/audio/gCryDreepy.wav differ diff --git a/audio/gCryDrizzile.wav b/audio/gCryDrizzile.wav index 8f7fd66..469fff7 100644 Binary files a/audio/gCryDrizzile.wav and b/audio/gCryDrizzile.wav differ diff --git a/audio/gCryDubwool.wav b/audio/gCryDubwool.wav index 0803f10..e85747c 100644 Binary files a/audio/gCryDubwool.wav and b/audio/gCryDubwool.wav differ diff --git a/audio/gCryDuraludon.wav b/audio/gCryDuraludon.wav index 659dad7..0cad339 100644 Binary files a/audio/gCryDuraludon.wav and b/audio/gCryDuraludon.wav differ diff --git a/audio/gCryEiscue.wav b/audio/gCryEiscue.wav index 2d83f2d..84cb3af 100644 Binary files a/audio/gCryEiscue.wav and b/audio/gCryEiscue.wav differ diff --git a/audio/gCryEldegoss.wav b/audio/gCryEldegoss.wav index 67b1b01..01012e2 100644 Binary files a/audio/gCryEldegoss.wav and b/audio/gCryEldegoss.wav differ diff --git a/audio/gCryEternatus.wav b/audio/gCryEternatus.wav index 784bb1f..af75bc5 100644 Binary files a/audio/gCryEternatus.wav and b/audio/gCryEternatus.wav differ diff --git a/audio/gCryFalinks.wav b/audio/gCryFalinks.wav index 1708eea..90c40af 100644 Binary files a/audio/gCryFalinks.wav and b/audio/gCryFalinks.wav differ diff --git a/audio/gCryFlapple.wav b/audio/gCryFlapple.wav index 37631ca..5617845 100644 Binary files a/audio/gCryFlapple.wav and b/audio/gCryFlapple.wav differ diff --git a/audio/gCryFrosmoth.wav b/audio/gCryFrosmoth.wav index c16c5fa..3cec351 100644 Binary files a/audio/gCryFrosmoth.wav and b/audio/gCryFrosmoth.wav differ diff --git a/audio/gCryGlastrier.wav b/audio/gCryGlastrier.wav new file mode 100644 index 0000000..75181c1 Binary files /dev/null and b/audio/gCryGlastrier.wav differ diff --git a/audio/gCryGlastrier_flags.txt b/audio/gCryGlastrier_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryGlastrier_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryGossifleur.wav b/audio/gCryGossifleur.wav index 533c749..57c70ff 100644 Binary files a/audio/gCryGossifleur.wav and b/audio/gCryGossifleur.wav differ diff --git a/audio/gCryGrapploct.wav b/audio/gCryGrapploct.wav index 9b6444c..d8c346a 100644 Binary files a/audio/gCryGrapploct.wav and b/audio/gCryGrapploct.wav differ diff --git a/audio/gCryGreedent.wav b/audio/gCryGreedent.wav index 4af8e13..54c9182 100644 Binary files a/audio/gCryGreedent.wav and b/audio/gCryGreedent.wav differ diff --git a/audio/gCryGrimmsnarl.wav b/audio/gCryGrimmsnarl.wav index eba53a4..18abd50 100644 Binary files a/audio/gCryGrimmsnarl.wav and b/audio/gCryGrimmsnarl.wav differ diff --git a/audio/gCryGrookey.wav b/audio/gCryGrookey.wav index 294fcac..1e542de 100644 Binary files a/audio/gCryGrookey.wav and b/audio/gCryGrookey.wav differ diff --git a/audio/gCryHatenna.wav b/audio/gCryHatenna.wav index 0106902..3bc52e5 100644 Binary files a/audio/gCryHatenna.wav and b/audio/gCryHatenna.wav differ diff --git a/audio/gCryHatterene.wav b/audio/gCryHatterene.wav index c046dfe..b2fe70a 100644 Binary files a/audio/gCryHatterene.wav and b/audio/gCryHatterene.wav differ diff --git a/audio/gCryHattrem.wav b/audio/gCryHattrem.wav index a7e3c85..fbdf065 100644 Binary files a/audio/gCryHattrem.wav and b/audio/gCryHattrem.wav differ diff --git a/audio/gCryImpidimp.wav b/audio/gCryImpidimp.wav index 3c25b7b..70c0885 100644 Binary files a/audio/gCryImpidimp.wav and b/audio/gCryImpidimp.wav differ diff --git a/audio/gCryIndeedeeFemale.wav b/audio/gCryIndeedeeFemale.wav index 450a7bd..9ac66f5 100644 Binary files a/audio/gCryIndeedeeFemale.wav and b/audio/gCryIndeedeeFemale.wav differ diff --git a/audio/gCryIndeedeeMale.wav b/audio/gCryIndeedeeMale.wav index a3842b4..2c1a057 100644 Binary files a/audio/gCryIndeedeeMale.wav and b/audio/gCryIndeedeeMale.wav differ diff --git a/audio/gCryInteleon.wav b/audio/gCryInteleon.wav index c91ab63..8d13500 100644 Binary files a/audio/gCryInteleon.wav and b/audio/gCryInteleon.wav differ diff --git a/audio/gCryKubfu.wav b/audio/gCryKubfu.wav new file mode 100644 index 0000000..7c456ae Binary files /dev/null and b/audio/gCryKubfu.wav differ diff --git a/audio/gCryKubfu_flags.txt b/audio/gCryKubfu_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryKubfu_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryMilcery.wav b/audio/gCryMilcery.wav index 76a4632..81b7fb7 100644 Binary files a/audio/gCryMilcery.wav and b/audio/gCryMilcery.wav differ diff --git a/audio/gCryMorgrem.wav b/audio/gCryMorgrem.wav index 3d5e19a..9a7ed15 100644 Binary files a/audio/gCryMorgrem.wav and b/audio/gCryMorgrem.wav differ diff --git a/audio/gCryMorpeko.wav b/audio/gCryMorpeko.wav index 3fd5cfe..49db5d9 100644 Binary files a/audio/gCryMorpeko.wav and b/audio/gCryMorpeko.wav differ diff --git a/audio/gCryMrRime.wav b/audio/gCryMrRime.wav index 4e60c9e..3d776d7 100644 Binary files a/audio/gCryMrRime.wav and b/audio/gCryMrRime.wav differ diff --git a/audio/gCryNickit.wav b/audio/gCryNickit.wav index 26d0642..cae577c 100644 Binary files a/audio/gCryNickit.wav and b/audio/gCryNickit.wav differ diff --git a/audio/gCryObstagoon.wav b/audio/gCryObstagoon.wav index 3fc1fea..13b6eac 100644 Binary files a/audio/gCryObstagoon.wav and b/audio/gCryObstagoon.wav differ diff --git a/audio/gCryOrbeetle.wav b/audio/gCryOrbeetle.wav index 680d4fa..deff179 100644 Binary files a/audio/gCryOrbeetle.wav and b/audio/gCryOrbeetle.wav differ diff --git a/audio/gCryPerrserker.wav b/audio/gCryPerrserker.wav index f015b4c..fd88733 100644 Binary files a/audio/gCryPerrserker.wav and b/audio/gCryPerrserker.wav differ diff --git a/audio/gCryPincurchin.wav b/audio/gCryPincurchin.wav index 6c0a687..6b24a16 100644 Binary files a/audio/gCryPincurchin.wav and b/audio/gCryPincurchin.wav differ diff --git a/audio/gCryPolteageist.wav b/audio/gCryPolteageist.wav index 65efe5d..8bd6f04 100644 Binary files a/audio/gCryPolteageist.wav and b/audio/gCryPolteageist.wav differ diff --git a/audio/gCryRaboot.wav b/audio/gCryRaboot.wav index eb1d502..72c45e1 100644 Binary files a/audio/gCryRaboot.wav and b/audio/gCryRaboot.wav differ diff --git a/audio/gCryRegidrago.wav b/audio/gCryRegidrago.wav new file mode 100644 index 0000000..de2e917 Binary files /dev/null and b/audio/gCryRegidrago.wav differ diff --git a/audio/gCryRegidrago_flags.txt b/audio/gCryRegidrago_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryRegidrago_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryRegieleki.wav b/audio/gCryRegieleki.wav new file mode 100644 index 0000000..03da5e9 Binary files /dev/null and b/audio/gCryRegieleki.wav differ diff --git a/audio/gCryRegieleki_flags.txt b/audio/gCryRegieleki_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryRegieleki_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryRillaboom.wav b/audio/gCryRillaboom.wav index 5b51f6c..2d75be2 100644 Binary files a/audio/gCryRillaboom.wav and b/audio/gCryRillaboom.wav differ diff --git a/audio/gCryRolycoly.wav b/audio/gCryRolycoly.wav index 46713f7..cd51fb8 100644 Binary files a/audio/gCryRolycoly.wav and b/audio/gCryRolycoly.wav differ diff --git a/audio/gCryRookidee.wav b/audio/gCryRookidee.wav index 73ff665..939bea4 100644 Binary files a/audio/gCryRookidee.wav and b/audio/gCryRookidee.wav differ diff --git a/audio/gCryRunerigus.wav b/audio/gCryRunerigus.wav index f229565..9b5c081 100644 Binary files a/audio/gCryRunerigus.wav and b/audio/gCryRunerigus.wav differ diff --git a/audio/gCrySandaconda.wav b/audio/gCrySandaconda.wav index 48e53b8..5000f47 100644 Binary files a/audio/gCrySandaconda.wav and b/audio/gCrySandaconda.wav differ diff --git a/audio/gCryScorbunny.wav b/audio/gCryScorbunny.wav index cc8f3a4..b960615 100644 Binary files a/audio/gCryScorbunny.wav and b/audio/gCryScorbunny.wav differ diff --git a/audio/gCrySilicobra.wav b/audio/gCrySilicobra.wav index 351dbb6..daaab32 100644 Binary files a/audio/gCrySilicobra.wav and b/audio/gCrySilicobra.wav differ diff --git a/audio/gCrySinistea.wav b/audio/gCrySinistea.wav index 8531987..7b90a41 100644 Binary files a/audio/gCrySinistea.wav and b/audio/gCrySinistea.wav differ diff --git a/audio/gCrySirfetchd.wav b/audio/gCrySirfetchd.wav index b144ae3..20468cf 100644 Binary files a/audio/gCrySirfetchd.wav and b/audio/gCrySirfetchd.wav differ diff --git a/audio/gCrySizzlipede.wav b/audio/gCrySizzlipede.wav index 69b36a1..89eff10 100644 Binary files a/audio/gCrySizzlipede.wav and b/audio/gCrySizzlipede.wav differ diff --git a/audio/gCrySkwovet.wav b/audio/gCrySkwovet.wav index add4a9a..6f844f9 100644 Binary files a/audio/gCrySkwovet.wav and b/audio/gCrySkwovet.wav differ diff --git a/audio/gCrySnom.wav b/audio/gCrySnom.wav index fdc92da..c840d22 100644 Binary files a/audio/gCrySnom.wav and b/audio/gCrySnom.wav differ diff --git a/audio/gCrySobble.wav b/audio/gCrySobble.wav index 4db8c9f..812d233 100644 Binary files a/audio/gCrySobble.wav and b/audio/gCrySobble.wav differ diff --git a/audio/gCrySpectrier.wav b/audio/gCrySpectrier.wav new file mode 100644 index 0000000..a1fa001 Binary files /dev/null and b/audio/gCrySpectrier.wav differ diff --git a/audio/gCrySpectrier_flags.txt b/audio/gCrySpectrier_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCrySpectrier_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryStonjourner.wav b/audio/gCryStonjourner.wav index 8176705..845bdff 100644 Binary files a/audio/gCryStonjourner.wav and b/audio/gCryStonjourner.wav differ diff --git a/audio/gCryThievul.wav b/audio/gCryThievul.wav index 4719ca5..4f51be1 100644 Binary files a/audio/gCryThievul.wav and b/audio/gCryThievul.wav differ diff --git a/audio/gCryThwackey.wav b/audio/gCryThwackey.wav index c35a2ce..2d0da1a 100644 Binary files a/audio/gCryThwackey.wav and b/audio/gCryThwackey.wav differ diff --git a/audio/gCryToxel.wav b/audio/gCryToxel.wav index 7ed21fb..decb810 100644 Binary files a/audio/gCryToxel.wav and b/audio/gCryToxel.wav differ diff --git a/audio/gCryToxtricityAmped.wav b/audio/gCryToxtricityAmped.wav index ab0a4c9..74556e7 100644 Binary files a/audio/gCryToxtricityAmped.wav and b/audio/gCryToxtricityAmped.wav differ diff --git a/audio/gCryToxtricityLowKey.wav b/audio/gCryToxtricityLowKey.wav index 029f430..6d1d175 100644 Binary files a/audio/gCryToxtricityLowKey.wav and b/audio/gCryToxtricityLowKey.wav differ diff --git a/audio/gCryUrshifuRapid.wav b/audio/gCryUrshifuRapid.wav new file mode 100644 index 0000000..964469c Binary files /dev/null and b/audio/gCryUrshifuRapid.wav differ diff --git a/audio/gCryUrshifuRapid_flags.txt b/audio/gCryUrshifuRapid_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryUrshifuRapid_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryUrshifuSingle.wav b/audio/gCryUrshifuSingle.wav new file mode 100644 index 0000000..f5cd225 Binary files /dev/null and b/audio/gCryUrshifuSingle.wav differ diff --git a/audio/gCryUrshifuSingle_flags.txt b/audio/gCryUrshifuSingle_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryUrshifuSingle_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryWooloo.wav b/audio/gCryWooloo.wav index e8c7ff4..b6557fc 100644 Binary files a/audio/gCryWooloo.wav and b/audio/gCryWooloo.wav differ diff --git a/audio/gCryYamper.wav b/audio/gCryYamper.wav index 450e6be..fce0f2e 100644 Binary files a/audio/gCryYamper.wav and b/audio/gCryYamper.wav differ diff --git a/audio/gCryZacian.wav b/audio/gCryZacian.wav index d1cec60..d0b4bd0 100644 Binary files a/audio/gCryZacian.wav and b/audio/gCryZacian.wav differ diff --git a/audio/gCryZacianCrowned.wav b/audio/gCryZacianCrowned.wav new file mode 100644 index 0000000..6492ebd Binary files /dev/null and b/audio/gCryZacianCrowned.wav differ diff --git a/audio/gCryZacianCrowned_flags.txt b/audio/gCryZacianCrowned_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryZacianCrowned_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryZamazenta.wav b/audio/gCryZamazenta.wav index 23df98c..0a890ed 100644 Binary files a/audio/gCryZamazenta.wav and b/audio/gCryZamazenta.wav differ diff --git a/audio/gCryZamazentaCrowned.wav b/audio/gCryZamazentaCrowned.wav new file mode 100644 index 0000000..f879ae0 Binary files /dev/null and b/audio/gCryZamazentaCrowned.wav differ diff --git a/audio/gCryZamazentaCrowned_flags.txt b/audio/gCryZamazentaCrowned_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryZamazentaCrowned_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/audio/gCryZarude.wav b/audio/gCryZarude.wav new file mode 100644 index 0000000..6c908f1 Binary files /dev/null and b/audio/gCryZarude.wav differ diff --git a/audio/gCryZarude_flags.txt b/audio/gCryZarude_flags.txt new file mode 100644 index 0000000..01f6552 --- /dev/null +++ b/audio/gCryZarude_flags.txt @@ -0,0 +1 @@ +-c \ No newline at end of file diff --git a/include/cry_data.h b/include/cry_data.h index dcc487e..bb519d5 100644 --- a/include/cry_data.h +++ b/include/cry_data.h @@ -524,13 +524,18 @@ extern u8 gCryDreepy[]; extern u8 gCryDrakloak[]; extern u8 gCryDragapult[]; extern u8 gCryZacian[]; +extern u8 gCryZacianCrowned[]; extern u8 gCryZamazenta[]; +extern u8 gCryZamazentaCrowned[]; extern u8 gCryEternatus[]; -/*extern u8 gCryZarude[]; -extern u8 gCryUnknownMythical[]; extern u8 gCryKubfu[]; -extern u8 gCryUrshifu[]; -extern u8 gCryCalyrex[]; +extern u8 gCryUrshifuSingle[]; +extern u8 gCryUrshifuRapid[]; +extern u8 gCryZarude[]; extern u8 gCryRegieleki[]; extern u8 gCryRegidrago[]; -*/ +extern u8 gCryGlastrier[]; +extern u8 gCrySpectrier[]; +extern u8 gCryCalyrex[]; +extern u8 gCryCalyrexShadowRider[]; +extern u8 gCryCalyrexIceRider[]; diff --git a/src/Cry_Table.c b/src/Cry_Table.c index 24f3b50..f075f48 100644 --- a/src/Cry_Table.c +++ b/src/Cry_Table.c @@ -13890,7 +13890,7 @@ const struct ToneData gCryTable[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, -/* [SPECIES_KUBFU] = + [SPECIES_KUBFU] = { .type = 0x20, .key = 0x3c, @@ -13908,7 +13908,7 @@ const struct ToneData gCryTable[NUM_SPECIES] = .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryUrshifu, + .wav = gCryUrshifuSingle, .attack = 0xff, .decay = 0x0, .sustain = 0xff, @@ -13926,18 +13926,6 @@ const struct ToneData gCryTable[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, - [SPECIES_CALYREX] = - { - .type = 0x20, - .key = 0x3c, - .length = 0x0, - .pan_sweep = 0x0, - .wav = gCryCalyrex, - .attack = 0xff, - .decay = 0x0, - .sustain = 0xff, - .release = 0x0, - }, [SPECIES_REGIELEKI] = { .type = 0x20, @@ -13961,7 +13949,43 @@ const struct ToneData gCryTable[NUM_SPECIES] = .decay = 0x0, .sustain = 0xff, .release = 0x0, - }, */ + }, + [SPECIES_GLASTRIER] = + { + .type = 0x20, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryGlastrier, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, + [SPECIES_SPECTRIER] = + { + .type = 0x20, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCrySpectrier, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, + [SPECIES_CALYREX] = + { + .type = 0x20, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryCalyrex, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, [SPECIES_CRAMORANT_GULPING] = { .type = 0x20, @@ -14136,7 +14160,7 @@ const struct ToneData gCryTable[NUM_SPECIES] = .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryZacian, + .wav = gCryZacianCrowned, .attack = 0xff, .decay = 0x0, .sustain = 0xff, @@ -14148,7 +14172,7 @@ const struct ToneData gCryTable[NUM_SPECIES] = .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryZamazenta, + .wav = gCryZamazentaCrowned, .attack = 0xff, .decay = 0x0, .sustain = 0xff, @@ -14166,18 +14190,54 @@ const struct ToneData gCryTable[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, -/* [SPECIES_URSHIFU_RAPID] = + [SPECIES_URSHIFU_RAPID] = { .type = 0x20, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryUrshifu, + .wav = gCryUrshifuRapid, .attack = 0xff, .decay = 0x0, .sustain = 0xff, .release = 0x0, - }, */ + }, + [SPECIES_ZARUDE_DADA] = + { + .type = 0x20, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryZarude, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, + [SPECIES_CALYREX_ICE_RIDER] = + { + .type = 0x20, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryCalyrexIceRider, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, + [SPECIES_CALYREX_SHADOW_RIDER] = + { + .type = 0x20, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryCalyrexShadowRider, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, [SPECIES_MEOWTH_G] = { .type = 0x20, @@ -14802,13 +14862,13 @@ const struct ToneData gCryTable[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, -/* [SPECIES_URSHIFU_SINGLE_GIGA] = + [SPECIES_URSHIFU_SINGLE_GIGA] = { .type = 0x20, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryUrshifu, + .wav = gCryUrshifuSingle, .attack = 0xff, .decay = 0x0, .sustain = 0xff, @@ -14820,11 +14880,10 @@ const struct ToneData gCryTable[NUM_SPECIES] = .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryUrshifu, + .wav = gCryUrshifuRapid, .attack = 0xff, .decay = 0x0, .sustain = 0xff, .release = 0x0, }, -*/ }; diff --git a/src/Cry_Table_2.c b/src/Cry_Table_2.c index 3249059..f6f47a9 100644 --- a/src/Cry_Table_2.c +++ b/src/Cry_Table_2.c @@ -12920,7 +12920,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_GROOKEY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -12932,7 +12932,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_THWACKEY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -12944,7 +12944,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_RILLABOOM] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -12956,7 +12956,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SCORBUNNY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -12968,7 +12968,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_RABOOT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -12980,7 +12980,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CINDERACE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -12992,7 +12992,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SOBBLE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13004,7 +13004,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DRIZZILE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13016,7 +13016,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_INTELEON] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13028,7 +13028,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SKWOVET] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13040,7 +13040,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_GREEDENT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13052,7 +13052,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ROOKIDEE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13064,7 +13064,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CORVISQUIRE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13076,7 +13076,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CORVIKNIGHT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13088,7 +13088,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_BLIPBUG] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13100,7 +13100,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DOTTLER] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13112,7 +13112,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ORBEETLE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13124,7 +13124,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_NICKIT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13136,7 +13136,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_THIEVUL] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13148,7 +13148,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_GOSSIFLEUR] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13160,7 +13160,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ELDEGOSS] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13172,7 +13172,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_WOOLOO] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13184,7 +13184,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DUBWOOL] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13196,7 +13196,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CHEWTLE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13208,7 +13208,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DREDNAW] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13220,7 +13220,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_YAMPER] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13232,7 +13232,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_BOLTUND] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13244,7 +13244,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ROLYCOLY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13256,7 +13256,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CARKOL] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13268,7 +13268,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_COALOSSAL] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13280,7 +13280,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_APPLIN] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13292,7 +13292,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_FLAPPLE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13304,7 +13304,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_APPLETUN] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13316,7 +13316,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SILICOBRA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13328,7 +13328,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SANDACONDA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13340,7 +13340,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CRAMORANT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13352,7 +13352,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ARROKUDA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13364,7 +13364,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_BARRASKEWDA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13376,7 +13376,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_TOXEL] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13388,7 +13388,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_TOXTRICITY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13400,7 +13400,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SIZZLIPEDE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13412,7 +13412,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CENTISKORCH] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13424,7 +13424,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CLOBBOPUS] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13436,7 +13436,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_GRAPPLOCT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13448,7 +13448,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SINISTEA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13460,7 +13460,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_POLTEAGEIST] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13472,7 +13472,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_HATENNA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13484,7 +13484,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_HATTREM] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13496,7 +13496,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_HATTERENE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13508,7 +13508,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_IMPIDIMP] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13520,7 +13520,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MORGREM] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13532,7 +13532,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_GRIMMSNARL] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13544,7 +13544,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_OBSTAGOON] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13556,7 +13556,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_PERRSERKER] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13568,7 +13568,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CURSOLA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13580,7 +13580,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SIRFETCHD] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13592,7 +13592,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MR_RIME] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13604,7 +13604,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_RUNERIGUS] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13616,7 +13616,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MILCERY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13628,7 +13628,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ALCREMIE_STRAWBERRY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13640,7 +13640,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_FALINKS] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13652,7 +13652,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_PINCURCHIN] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13664,7 +13664,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SNOM] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13676,7 +13676,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_FROSMOTH] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13688,7 +13688,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_STONJOURNER] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13700,7 +13700,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_EISCUE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13712,7 +13712,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_INDEEDEE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13724,7 +13724,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MORPEKO] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13736,7 +13736,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CUFANT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13748,7 +13748,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_COPPERAJAH] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13760,7 +13760,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DRACOZOLT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13772,7 +13772,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ARCTOZOLT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13784,7 +13784,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DRACOVISH] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13796,7 +13796,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ARCTOVISH] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13808,7 +13808,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DURALUDON] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13820,7 +13820,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DREEPY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13832,7 +13832,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DRAKLOAK] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13844,7 +13844,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DRAGAPULT] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13856,7 +13856,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ZACIAN] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13868,7 +13868,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ZAMAZENTA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13880,7 +13880,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ETERNATUS] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13890,9 +13890,9 @@ const struct ToneData gCryTable2[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, -/* [SPECIES_KUBFU] = + [SPECIES_KUBFU] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13904,11 +13904,11 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_URSHIFU_SINGLE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryUrshifu, + .wav = gCryUrshifuSingle, .attack = 0xff, .decay = 0x0, .sustain = 0xff, @@ -13916,7 +13916,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ZARUDE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13926,21 +13926,9 @@ const struct ToneData gCryTable2[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, - [SPECIES_CALYREX] = - { - .type = 0x20, - .key = 0x3c, - .length = 0x0, - .pan_sweep = 0x0, - .wav = gCryCalyrex, - .attack = 0xff, - .decay = 0x0, - .sustain = 0xff, - .release = 0x0, - }, [SPECIES_REGIELEKI] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13952,7 +13940,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_REGIDRAGO] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13961,10 +13949,46 @@ const struct ToneData gCryTable2[NUM_SPECIES] = .decay = 0x0, .sustain = 0xff, .release = 0x0, - }, */ + }, + [SPECIES_GLASTRIER] = + { + .type = 0x30, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryGlastrier, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, + [SPECIES_SPECTRIER] = + { + .type = 0x30, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCrySpectrier, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, + [SPECIES_CALYREX] = + { + .type = 0x30, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryCalyrex, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, [SPECIES_CRAMORANT_GULPING] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13976,7 +14000,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CRAMORANT_GORGING] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -13988,7 +14012,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_TOXTRICITY_LOW_KEY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14000,7 +14024,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SINISTEA_CHIPPED] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14012,7 +14036,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_POLTEAGEIST_CHIPPED] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14024,7 +14048,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ALCREMIE_BERRY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14036,7 +14060,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ALCREMIE_CLOVER] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14048,7 +14072,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ALCREMIE_FLOWER] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14060,8 +14084,8 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ALCREMIE_LOVE] = { - .type = 0x20, - .key = 0x3c, + .type = 0x30, + .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, .wav = gCryAlcremie, @@ -14072,7 +14096,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ALCREMIE_RIBBON] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14084,7 +14108,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ALCREMIE_STAR] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14096,7 +14120,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_EISCUE_NOICE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14108,7 +14132,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_INDEEDEE_FEMALE] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14120,7 +14144,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MORPEKO_HANGRY] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14132,11 +14156,11 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ZACIAN_CROWNED] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryZacian, + .wav = gCryZacianCrowned, .attack = 0xff, .decay = 0x0, .sustain = 0xff, @@ -14144,11 +14168,11 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ZAMAZENTA_CROWNED] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryZamazenta, + .wav = gCryZamazentaCrowned, .attack = 0xff, .decay = 0x0, .sustain = 0xff, @@ -14156,7 +14180,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ETERNATUS_ETERNAMAX] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14166,21 +14190,57 @@ const struct ToneData gCryTable2[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, -/* [SPECIES_URSHIFU_RAPID] = + [SPECIES_URSHIFU_RAPID] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryUrshifu, + .wav = gCryUrshifuRapid, .attack = 0xff, .decay = 0x0, .sustain = 0xff, .release = 0x0, - }, */ + }, + [SPECIES_ZARUDE_DADA] = + { + .type = 0x30, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryZarude, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, + [SPECIES_CALYREX_ICE_RIDER] = + { + .type = 0x30, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryCalyrexIceRider, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, + [SPECIES_CALYREX_SHADOW_RIDER] = + { + .type = 0x30, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryCalyrexShadowRider, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, [SPECIES_MEOWTH_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14192,7 +14252,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_PONYTA_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14204,7 +14264,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_RAPIDASH_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14216,7 +14276,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SLOWPOKE_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14228,7 +14288,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SLOWBRO_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14240,7 +14300,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_FARFETCHD_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14252,7 +14312,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_WEEZING_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14264,7 +14324,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MR_MIME_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14276,7 +14336,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ARTICUNO_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14288,7 +14348,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ZAPDOS_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14300,7 +14360,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MOLTRES_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14312,7 +14372,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SLOWKING_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14324,7 +14384,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CORSOLA_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14336,7 +14396,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ZIGZAGOON_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14348,7 +14408,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_LINOONE_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14360,7 +14420,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DARUMAKA_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14372,7 +14432,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DARMANITAN_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14384,7 +14444,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DARMANITAN_G_ZEN] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14396,7 +14456,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_YAMASK_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14408,7 +14468,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_STUNFISK_G] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14420,7 +14480,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_VENUSAUR_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14432,7 +14492,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CHARIZARD_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14444,7 +14504,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_BLASTOISE_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14456,7 +14516,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_BUTTERFREE_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14468,7 +14528,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_PIKACHU_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14480,7 +14540,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MEOWTH_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14492,7 +14552,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MACHAMP_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14504,7 +14564,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_GENGAR_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14516,7 +14576,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_KINGLER_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14528,7 +14588,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_LAPRAS_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14540,7 +14600,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_EEVEE_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14552,7 +14612,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SNORLAX_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14564,7 +14624,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_GARBODOR_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14576,7 +14636,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_MELMETAL_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14588,7 +14648,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_RILLABOOM_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14600,7 +14660,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CINDERACE_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14612,7 +14672,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_INTELEON_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14624,7 +14684,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CORVIKNIGHT_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14636,7 +14696,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ORBEETLE_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14648,7 +14708,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DREDNAW_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14660,7 +14720,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_COALOSSAL_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14672,7 +14732,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_FLAPPLE_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14684,7 +14744,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_APPLETUN_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14696,7 +14756,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_SANDACONDA_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14708,7 +14768,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_TOXTRICITY_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14720,7 +14780,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_TOXTRICITY_LOW_KEY_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14732,7 +14792,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_CENTISKORCH_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14744,7 +14804,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_HATTERENE_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14756,7 +14816,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_GRIMMSNARL_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14768,7 +14828,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_ALCREMIE_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14780,7 +14840,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_COPPERAJAH_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14792,7 +14852,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_DURALUDON_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, @@ -14802,13 +14862,13 @@ const struct ToneData gCryTable2[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, -/* [SPECIES_URSHIFU_SINGLE_GIGA] = + [SPECIES_URSHIFU_SINGLE_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryUrshifu, + .wav = gCryUrshifuSingle, .attack = 0xff, .decay = 0x0, .sustain = 0xff, @@ -14816,15 +14876,14 @@ const struct ToneData gCryTable2[NUM_SPECIES] = }, [SPECIES_URSHIFU_RAPID_GIGA] = { - .type = 0x20, + .type = 0x30, .key = 0x3c, .length = 0x0, .pan_sweep = 0x0, - .wav = gCryUrshifu, + .wav = gCryUrshifuRapid, .attack = 0xff, .decay = 0x0, .sustain = 0xff, .release = 0x0, }, -*/ };