diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp index 2abadc62a..a12dba541 100644 --- a/Minecraft Note Block Studio.yyp +++ b/Minecraft Note Block Studio.yyp @@ -374,6 +374,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "142013da-5443-47f3-ad73-a8e011f73159", + "Value": { + "id": "8228c514-0da4-4e5e-8e1f-49c5a530a919", + "resourcePath": "datafiles_yy\\Data\\Sounds\\entity.firework.blast_far.ogg.yy", + "resourceType": "GMIncludedFile" + } + }, { "Key": "1501c0c9-c863-4723-9ccc-f004078dc78d", "Value": { @@ -854,6 +862,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "322e57e3-b1d8-4b15-972f-1d2cedb5ea57", + "Value": { + "id": "cef163f7-8bfb-461c-b903-9f7e1fc913d2", + "resourcePath": "datafiles_yy\\Data\\Sounds\\block.portal.trigger.ogg.yy", + "resourceType": "GMIncludedFile" + } + }, { "Key": "32f26f43-33fd-426c-8f78-8dfae717e5d3", "Value": { @@ -1286,6 +1302,14 @@ "resourceType": "GMScript" } }, + { + "Key": "4cfdb4b3-44ca-4194-bc4c-6990710bd363", + "Value": { + "id": "706f48fa-3dd6-4b46-a5cc-9aa2a883ea1a", + "resourcePath": "datafiles_yy\\Songs\\Megalovania - Super Smash Bros. Ultimate.nbs.yy", + "resourceType": "GMIncludedFile" + } + }, { "Key": "4d41d6a6-f78d-429e-886a-dfe3a8951ba3", "Value": { @@ -1742,6 +1766,14 @@ "resourceType": "GMScript" } }, + { + "Key": "6595b648-fe3f-499c-a913-afef218631a1", + "Value": { + "id": "32926744-bb72-43fe-91f1-96cc46a0391f", + "resourcePath": "datafiles_yy\\Songs\\The Ground's Colour Is Yellow.nbs.yy", + "resourceType": "GMIncludedFile" + } + }, { "Key": "65cb288f-2fc4-4109-85bd-5c1e099e9d38", "Value": { @@ -3254,14 +3286,6 @@ "resourceType": "GMScript" } }, - { - "Key": "c03f3b8b-ba1a-4d32-9051-23b8572bd22b", - "Value": { - "id": "e63bab99-dfa0-45c0-9aa1-826d12440c6f", - "resourcePath": "datafiles_yy\\Songs\\The Grounds Color Is Yellow.nbs.yy", - "resourceType": "GMIncludedFile" - } - }, { "Key": "c1ae4275-cc48-48bb-bc3a-7c638ac064ec", "Value": { @@ -3990,6 +4014,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "ee15ae94-44b2-49f2-839f-1e8c89da5669", + "Value": { + "id": "f20a11a6-8e3c-4bed-a92a-a35d125ed157", + "resourcePath": "datafiles_yy\\Data\\Sounds\\entity.experience_orb.pickup.ogg.yy", + "resourceType": "GMIncludedFile" + } + }, { "Key": "ef866d3b-f6ba-4e6c-8098-44a454d62c87", "Value": { diff --git a/datafiles/Data/Sounds/block.portal.trigger.ogg b/datafiles/Data/Sounds/block.portal.trigger.ogg new file mode 100644 index 000000000..8a4ca4b98 Binary files /dev/null and b/datafiles/Data/Sounds/block.portal.trigger.ogg differ diff --git a/datafiles/Data/Sounds/entity.experience_orb.pickup.ogg b/datafiles/Data/Sounds/entity.experience_orb.pickup.ogg new file mode 100644 index 000000000..a38b2cc5b Binary files /dev/null and b/datafiles/Data/Sounds/entity.experience_orb.pickup.ogg differ diff --git a/datafiles/Data/Sounds/entity.firework.blast_far.ogg b/datafiles/Data/Sounds/entity.firework.blast_far.ogg new file mode 100644 index 000000000..8b0088262 Binary files /dev/null and b/datafiles/Data/Sounds/entity.firework.blast_far.ogg differ diff --git a/datafiles/Data/extranotes.zip b/datafiles/Data/extranotes.zip index 7d0c94cb1..74904183d 100644 Binary files a/datafiles/Data/extranotes.zip and b/datafiles/Data/extranotes.zip differ diff --git a/datafiles/Songs/Megalovania - Super Smash Bros. Ultimate.nbs b/datafiles/Songs/Megalovania - Super Smash Bros. Ultimate.nbs new file mode 100644 index 000000000..c671a1fae Binary files /dev/null and b/datafiles/Songs/Megalovania - Super Smash Bros. Ultimate.nbs differ diff --git a/datafiles/Songs/The Grounds Color Is Yellow.nbs b/datafiles/Songs/The Ground's Colour Is Yellow.nbs similarity index 96% rename from datafiles/Songs/The Grounds Color Is Yellow.nbs rename to datafiles/Songs/The Ground's Colour Is Yellow.nbs index 66473489c..8e29de43e 100644 Binary files a/datafiles/Songs/The Grounds Color Is Yellow.nbs and b/datafiles/Songs/The Ground's Colour Is Yellow.nbs differ diff --git a/datafiles_yy/Data/Sounds/block.portal.trigger.ogg.yy b/datafiles_yy/Data/Sounds/block.portal.trigger.ogg.yy new file mode 100644 index 000000000..7e8d96824 --- /dev/null +++ b/datafiles_yy/Data/Sounds/block.portal.trigger.ogg.yy @@ -0,0 +1,19 @@ +{ + "id": "322e57e3-b1d8-4b15-972f-1d2cedb5ea57", + "modelName": "GMIncludedFile", + "mvc": "1.0", + "name": "block.portal.trigger.ogg", + "CopyToMask": -1, + "exists": false, + "exportAction": 0, + "exportDir": "", + "fileName": "block.portal.trigger.ogg", + "filePath": "datafiles\\Data\\Sounds", + "freeData": false, + "origName": "", + "overwrite": false, + "removeEnd": false, + "size": 0, + "store": false, + "tags": "" +} \ No newline at end of file diff --git a/datafiles_yy/Data/Sounds/entity.experience_orb.pickup.ogg.yy b/datafiles_yy/Data/Sounds/entity.experience_orb.pickup.ogg.yy new file mode 100644 index 000000000..03b555221 --- /dev/null +++ b/datafiles_yy/Data/Sounds/entity.experience_orb.pickup.ogg.yy @@ -0,0 +1,19 @@ +{ + "id": "ee15ae94-44b2-49f2-839f-1e8c89da5669", + "modelName": "GMIncludedFile", + "mvc": "1.0", + "name": "entity.experience_orb.pickup.ogg", + "CopyToMask": -1, + "exists": false, + "exportAction": 0, + "exportDir": "", + "fileName": "entity.experience_orb.pickup.ogg", + "filePath": "datafiles\\Data\\Sounds", + "freeData": false, + "origName": "", + "overwrite": false, + "removeEnd": false, + "size": 0, + "store": false, + "tags": "" +} \ No newline at end of file diff --git a/datafiles_yy/Data/Sounds/entity.firework.blast_far.ogg.yy b/datafiles_yy/Data/Sounds/entity.firework.blast_far.ogg.yy new file mode 100644 index 000000000..eae420ed4 --- /dev/null +++ b/datafiles_yy/Data/Sounds/entity.firework.blast_far.ogg.yy @@ -0,0 +1,19 @@ +{ + "id": "142013da-5443-47f3-ad73-a8e011f73159", + "modelName": "GMIncludedFile", + "mvc": "1.0", + "name": "entity.firework.blast_far.ogg", + "CopyToMask": -1, + "exists": false, + "exportAction": 0, + "exportDir": "", + "fileName": "entity.firework.blast_far.ogg", + "filePath": "datafiles\\Data\\Sounds", + "freeData": false, + "origName": "", + "overwrite": false, + "removeEnd": false, + "size": 0, + "store": false, + "tags": "" +} \ No newline at end of file diff --git a/datafiles_yy/Songs/Megalovania - Super Smash Bros. Ultimate.nbs.yy b/datafiles_yy/Songs/Megalovania - Super Smash Bros. Ultimate.nbs.yy new file mode 100644 index 000000000..ca883af0e --- /dev/null +++ b/datafiles_yy/Songs/Megalovania - Super Smash Bros. Ultimate.nbs.yy @@ -0,0 +1,19 @@ +{ + "id": "4cfdb4b3-44ca-4194-bc4c-6990710bd363", + "modelName": "GMIncludedFile", + "mvc": "1.0", + "name": "Megalovania - Super Smash Bros. Ultimate.nbs", + "CopyToMask": -1, + "exists": false, + "exportAction": 0, + "exportDir": "", + "fileName": "Megalovania - Super Smash Bros. Ultimate.nbs", + "filePath": "datafiles\\Songs", + "freeData": false, + "origName": "", + "overwrite": false, + "removeEnd": false, + "size": 0, + "store": false, + "tags": "" +} \ No newline at end of file diff --git a/datafiles_yy/Songs/The Grounds Color Is Yellow.nbs.yy b/datafiles_yy/Songs/The Ground's Colour Is Yellow.nbs.yy similarity index 67% rename from datafiles_yy/Songs/The Grounds Color Is Yellow.nbs.yy rename to datafiles_yy/Songs/The Ground's Colour Is Yellow.nbs.yy index e804ffaef..502a7d105 100644 --- a/datafiles_yy/Songs/The Grounds Color Is Yellow.nbs.yy +++ b/datafiles_yy/Songs/The Ground's Colour Is Yellow.nbs.yy @@ -1,13 +1,13 @@ { - "id": "c03f3b8b-ba1a-4d32-9051-23b8572bd22b", + "id": "6595b648-fe3f-499c-a913-afef218631a1", "modelName": "GMIncludedFile", "mvc": "1.0", - "name": "The Grounds Color Is Yellow.nbs", + "name": "The Ground's Colour Is Yellow.nbs", "CopyToMask": -1, "exists": false, "exportAction": 0, "exportDir": "", - "fileName": "The Grounds Color Is Yellow.nbs", + "fileName": "The Ground's Colour Is Yellow.nbs", "filePath": "datafiles\\Songs", "freeData": false, "origName": "", diff --git a/views/140aed13-b412-4d1b-bf2b-c78963853e5b.yy b/views/140aed13-b412-4d1b-bf2b-c78963853e5b.yy index 96cd3e621..32036aa41 100644 --- a/views/140aed13-b412-4d1b-bf2b-c78963853e5b.yy +++ b/views/140aed13-b412-4d1b-bf2b-c78963853e5b.yy @@ -4,7 +4,8 @@ "mvc": "1.1", "name": "140aed13-b412-4d1b-bf2b-c78963853e5b", "children": [ - "c03f3b8b-ba1a-4d32-9051-23b8572bd22b" + "6595b648-fe3f-499c-a913-afef218631a1", + "4cfdb4b3-44ca-4194-bc4c-6990710bd363" ], "filterType": "GMIncludedFile", "folderName": "Songs", diff --git a/views/e6cac03a-3679-4b9a-a1e3-6f012f793934.yy b/views/e6cac03a-3679-4b9a-a1e3-6f012f793934.yy index 737194fb8..f214f25ec 100644 --- a/views/e6cac03a-3679-4b9a-a1e3-6f012f793934.yy +++ b/views/e6cac03a-3679-4b9a-a1e3-6f012f793934.yy @@ -19,7 +19,10 @@ "d8651506-5796-430e-883f-f79e489fc92c", "e5dfde89-f0c1-46a3-8b26-1f2e45a48c35", "132dbf39-4ce2-487d-8a3b-03fd1e679fb9", - "be6e08ca-7dae-4763-a711-044af44a7b07" + "be6e08ca-7dae-4763-a711-044af44a7b07", + "142013da-5443-47f3-ad73-a8e011f73159", + "ee15ae94-44b2-49f2-839f-1e8c89da5669", + "322e57e3-b1d8-4b15-972f-1d2cedb5ea57" ], "filterType": "GMIncludedFile", "folderName": "Sounds",