diff --git a/FMOD Project/Metadata/Bank/{b53bb930-317b-47eb-b4f9-6582c4219d2a}.xml b/FMOD Project/Metadata/Bank/{b53bb930-317b-47eb-b4f9-6582c4219d2a}.xml new file mode 100644 index 00000000..671764b5 --- /dev/null +++ b/FMOD Project/Metadata/Bank/{b53bb930-317b-47eb-b4f9-6582c4219d2a}.xml @@ -0,0 +1,11 @@ + + + + + Music + + + {260d3c23-6191-4d70-ad12-e129474461ec} + + + diff --git a/FMOD Project/Metadata/Event/{1d96931c-2612-40d2-a58b-507ae27a8578}.xml b/FMOD Project/Metadata/Event/{1d96931c-2612-40d2-a58b-507ae27a8578}.xml index 7505ec7a..2981028d 100644 --- a/FMOD Project/Metadata/Event/{1d96931c-2612-40d2-a58b-507ae27a8578}.xml +++ b/FMOD Project/Metadata/Event/{1d96931c-2612-40d2-a58b-507ae27a8578}.xml @@ -32,7 +32,7 @@ {2c7de081-9295-4fee-a507-78a5ac1dc51f} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} {e57de3d0-7136-405f-aab9-f8b3694d7064} diff --git a/FMOD Project/Metadata/Event/{3924de04-b440-4a39-b6aa-164d83034eca}.xml b/FMOD Project/Metadata/Event/{3924de04-b440-4a39-b6aa-164d83034eca}.xml index 881ed869..48a31e3c 100644 --- a/FMOD Project/Metadata/Event/{3924de04-b440-4a39-b6aa-164d83034eca}.xml +++ b/FMOD Project/Metadata/Event/{3924de04-b440-4a39-b6aa-164d83034eca}.xml @@ -35,7 +35,7 @@ {a830a647-15cd-4cbe-9d4b-90b3e2ebb249} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} diff --git a/FMOD Project/Metadata/Event/{540f8548-50e3-41a0-aa0e-24bdb35e8c7e}.xml b/FMOD Project/Metadata/Event/{540f8548-50e3-41a0-aa0e-24bdb35e8c7e}.xml index 3e004838..d7dc9c80 100644 --- a/FMOD Project/Metadata/Event/{540f8548-50e3-41a0-aa0e-24bdb35e8c7e}.xml +++ b/FMOD Project/Metadata/Event/{540f8548-50e3-41a0-aa0e-24bdb35e8c7e}.xml @@ -32,7 +32,7 @@ {a56a35a3-07d3-43df-bf06-00b6872c5836} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} {e57de3d0-7136-405f-aab9-f8b3694d7064} diff --git a/FMOD Project/Metadata/Event/{55f87b0e-9843-4789-ab8a-3689eadde700}.xml b/FMOD Project/Metadata/Event/{55f87b0e-9843-4789-ab8a-3689eadde700}.xml index 8b903d35..af03b37b 100644 --- a/FMOD Project/Metadata/Event/{55f87b0e-9843-4789-ab8a-3689eadde700}.xml +++ b/FMOD Project/Metadata/Event/{55f87b0e-9843-4789-ab8a-3689eadde700}.xml @@ -32,7 +32,7 @@ {6c4cb6d7-bc09-47c0-9a4f-9a10be018978} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} diff --git a/FMOD Project/Metadata/Event/{71f56023-03ab-4ebb-860b-ea46dc09f2f5}.xml b/FMOD Project/Metadata/Event/{71f56023-03ab-4ebb-860b-ea46dc09f2f5}.xml index 6a8dc13d..65d1c251 100644 --- a/FMOD Project/Metadata/Event/{71f56023-03ab-4ebb-860b-ea46dc09f2f5}.xml +++ b/FMOD Project/Metadata/Event/{71f56023-03ab-4ebb-860b-ea46dc09f2f5}.xml @@ -32,7 +32,7 @@ {92f80dc8-a67e-4e39-8841-a0db36954c0e} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} diff --git a/FMOD Project/Metadata/Event/{d401bd90-2cc7-4357-94fd-85ac0b808c72}.xml b/FMOD Project/Metadata/Event/{d401bd90-2cc7-4357-94fd-85ac0b808c72}.xml index 6fbe6141..613f83aa 100644 --- a/FMOD Project/Metadata/Event/{d401bd90-2cc7-4357-94fd-85ac0b808c72}.xml +++ b/FMOD Project/Metadata/Event/{d401bd90-2cc7-4357-94fd-85ac0b808c72}.xml @@ -32,7 +32,7 @@ {0ef0c190-6741-4dca-9cc3-b3165a706f43} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} diff --git a/FMOD Project/Metadata/Event/{dd7ac1b4-8d2f-469f-a953-d6bafb2f270b}.xml b/FMOD Project/Metadata/Event/{dd7ac1b4-8d2f-469f-a953-d6bafb2f270b}.xml index 93ecef48..9e66500e 100644 --- a/FMOD Project/Metadata/Event/{dd7ac1b4-8d2f-469f-a953-d6bafb2f270b}.xml +++ b/FMOD Project/Metadata/Event/{dd7ac1b4-8d2f-469f-a953-d6bafb2f270b}.xml @@ -32,7 +32,7 @@ {311bdcbe-ea7e-424d-bf54-ee40f5acab62} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} diff --git a/FMOD Project/Metadata/Event/{de98ccf3-4207-4c81-b5dc-8dc0a3626b65}.xml b/FMOD Project/Metadata/Event/{de98ccf3-4207-4c81-b5dc-8dc0a3626b65}.xml index 01d57cac..c2237a1c 100644 --- a/FMOD Project/Metadata/Event/{de98ccf3-4207-4c81-b5dc-8dc0a3626b65}.xml +++ b/FMOD Project/Metadata/Event/{de98ccf3-4207-4c81-b5dc-8dc0a3626b65}.xml @@ -32,7 +32,7 @@ {8822be8a-db34-44e9-b1f2-4ebe8bb26395} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} diff --git a/FMOD Project/Metadata/Event/{e037ea74-3060-4261-8fc7-74dd5c6cb342}.xml b/FMOD Project/Metadata/Event/{e037ea74-3060-4261-8fc7-74dd5c6cb342}.xml index eaba7dd3..6f716e99 100644 --- a/FMOD Project/Metadata/Event/{e037ea74-3060-4261-8fc7-74dd5c6cb342}.xml +++ b/FMOD Project/Metadata/Event/{e037ea74-3060-4261-8fc7-74dd5c6cb342}.xml @@ -32,7 +32,7 @@ {0554ca85-e90e-4dd4-aca8-4a45b52befd7} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} diff --git a/FMOD Project/Metadata/Event/{fa06fce6-c725-4cf4-8c52-c52f52be7a4e}.xml b/FMOD Project/Metadata/Event/{fa06fce6-c725-4cf4-8c52-c52f52be7a4e}.xml index 901cbbcc..19fe62a5 100644 --- a/FMOD Project/Metadata/Event/{fa06fce6-c725-4cf4-8c52-c52f52be7a4e}.xml +++ b/FMOD Project/Metadata/Event/{fa06fce6-c725-4cf4-8c52-c52f52be7a4e}.xml @@ -32,7 +32,7 @@ {fda5a527-f4a7-4f21-ba17-cc979c2f501c} - {6f6c823e-9073-439e-9503-3b2b490ddbfb} + {b53bb930-317b-47eb-b4f9-6582c4219d2a} diff --git a/SCHIZO/Plugin.cs b/SCHIZO/Plugin.cs index 608b4e15..bcc1f82d 100644 --- a/SCHIZO/Plugin.cs +++ b/SCHIZO/Plugin.cs @@ -38,7 +38,9 @@ private IEnumerator Start() yield return MaterialHelpers.LoadMaterials(); StaticHelpers.CacheAttribute.CacheAll(); FMODHelpers.LoadMasterBank("SCHIZO"); - + if (IS_BELOWZERO) + FMODHelpers.LoadSubBank("Music"); + Assets.Mod_Registry.InvokeRegister(); Assets.Mod_Registry.InvokePostRegister(); diff --git a/SCHIZO/Resources/AssetBundles/Assets.cs b/SCHIZO/Resources/AssetBundles/Assets.cs index f6bd8b3d..2746ae9d 100644 --- a/SCHIZO/Resources/AssetBundles/Assets.cs +++ b/SCHIZO/Resources/AssetBundles/Assets.cs @@ -12,7 +12,7 @@ namespace SCHIZO.Resources; public static class Assets { - private const int _rnd = 1956607609; + private const int _rnd = 1357310099; private static readonly UnityEngine.AssetBundle _a = ResourceManager.GetAssetBundle("assets"); diff --git a/SCHIZO/Resources/AssetBundles/assets b/SCHIZO/Resources/AssetBundles/assets index 333ad4af..14760dfe 100644 Binary files a/SCHIZO/Resources/AssetBundles/assets and b/SCHIZO/Resources/AssetBundles/assets differ diff --git a/SCHIZO/Resources/FMODBanks/Music.bank b/SCHIZO/Resources/FMODBanks/Music.bank new file mode 100644 index 00000000..cb42b5b5 Binary files /dev/null and b/SCHIZO/Resources/FMODBanks/Music.bank differ diff --git a/SCHIZO/Resources/FMODBanks/SCHIZO.bank b/SCHIZO/Resources/FMODBanks/SCHIZO.bank index 8415e9cc..1caa7637 100644 Binary files a/SCHIZO/Resources/FMODBanks/SCHIZO.bank and b/SCHIZO/Resources/FMODBanks/SCHIZO.bank differ diff --git a/SCHIZO/Resources/FMODBanks/SCHIZO.strings.bank b/SCHIZO/Resources/FMODBanks/SCHIZO.strings.bank index be8799f9..766615f4 100644 Binary files a/SCHIZO/Resources/FMODBanks/SCHIZO.strings.bank and b/SCHIZO/Resources/FMODBanks/SCHIZO.strings.bank differ diff --git a/SCHIZO/SCHIZO.csproj b/SCHIZO/SCHIZO.csproj index f4bc59f5..d69eaaf6 100644 --- a/SCHIZO/SCHIZO.csproj +++ b/SCHIZO/SCHIZO.csproj @@ -45,6 +45,8 @@ + + diff --git a/Unity/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Unity/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index d329a348..4bc59334 100644 --- a/Unity/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Unity/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -374,7 +374,8 @@ MonoBehaviour: Plugins: [] MasterBanks: - SCHIZO - Banks: [] + Banks: + - Music BanksToLoad: [] LiveUpdatePort: 9264 EnableMemoryTracking: 0