split off when they cry music from references beyond homestuck into their own vgm data files, make dai all lowercase, move uppercase dai to aliases

9 files changed, 115 insertions, 83 deletions

diff --git a/album/cool-and-new-volume-3.yaml b/album/cool-and-new-volume-3.yaml
index 609eff65..787415b7 100644
--- a/album/cool-and-new-volume-3.yaml
+++ b/album/cool-and-new-volume-3.yaml
@@ -205,7 +205,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/twilight-rhythm
 - https://www.youtube.com/watch?v=WzYOQUAcjcM
 Referenced Tracks:
-- track:you-dai
+- track:you-higurashi-when-they-cry-kai-meakashi
 Commentary: |-
     <i>artist:kobacat:</i> (Composer)
     i've been wanting to make an original composition for a team album for a while and since it's the final album, i figured there's probably no better time than doing it now since it's the final main album
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index ef4ddf9c..aad5f928 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -2557,16 +2557,6 @@ URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/540c9f9d-dcbc-4e56-8e5b-cfbe58c2b335
 - https://www.youtube.com/watch?v=Cur1UayJquw
 ---
-Track: Black Lilliana
-# JP: 黒のリリアナ
-# I don't know if there's an official release??? this is confusing
-# doesn't seem like there is? uh-
-Artists:
-- Umineko When They Cry
-- U2 Akiyama
-URLs:
-- https://www.youtube.com/watch?v=Ci5LwgEqzYI
----
 Track: Bloody Tears (Roads by Day BGM)
 # From Castlevania II: Simon's Quest
 # Released on the same album as Beginning, but it has its own dedicated track vs. Castlevania III's OST.
@@ -4712,20 +4702,6 @@ URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/2ea3f4d2-e86b-48d8-a2d2-07d3469d5b44
 - https://www.youtube.com/watch?v=oKvkRexMTNI
 ---
-Track: goldenslaughterer
-# Official release:
-#   Umineko no Naku Koro ni musicbox Red
-#   うみねこのなく頃に musicbox Red
-# Reference:
-#   https://vgmdb.net/album/14643
-Duration: 6:47
-Artists:
-- Umineko When They Cry
-- zts
-URLs:
-- https://codeztslabel.bandcamp.com/track/goldenslaughterer
-- https://www.youtube.com/watch?v=vYV61Pf-D3M
----
 Track: Gormott
 # Reference:
 #   https://vgmdb.net/album/75751
@@ -7829,19 +7805,6 @@ URLs:
 Referenced Tracks:
 - Galactic Nova
 ---
-Track: Soul Scour
-# Official release:
-#   Higurashi no Naku Koro ni Kai Original Sound Version & Extra Sounds "Thanks/you"
-#   ひぐらしのなく頃に解 Original Sound Version & Extra Sounds ｢Thanks／you｣
-# Reference:
-#   https://vgmdb.net/album/6209
-Duration: 1:42
-Artists:
-- Higurashi When They Cry
-- Dai
-URLs:
-- https://www.youtube.com/watch?v=x14cKhgKi0U
----
 Track: Space Pirates
 Artists:
 - Castle Crashers
@@ -9042,21 +9005,6 @@ URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/e51d34a3-6281-4f95-9436-7cfb5215ba34
 - https://www.youtube.com/watch?v=XA6xrfUb06E
 ---
-Track: you
-Directory: you-dai
-Always Reference By Directory: true
-# Official release:
-#   Higurashi no Naku Koro ni Kai Original Sound Version & Extra Sounds "Thanks/you"
-#   ひぐらしのなく頃に解 Original Sound Version & Extra Sounds ｢Thanks／you｣
-# Reference:
-#   https://vgmdb.net/album/6209
-Artists:
-- Higurashi When They Cry
-- Dai
-Duration: 3:35
-URLs:
-- https://www.youtube.com/watch?v=zWNkD4YWt_c
----
 Track: You Gained a Level!
 # (See Eight Melodies (EarthBound), no official soundtrack release)
 Artists:
@@ -9123,29 +9071,6 @@ URLs:
 Sampled Tracks:
 - Amen, Brother
 ---
-Track: 黄泉津比良坂CORRUPTION
-# uh oh god there's two of them, official releases i mean
-# so it was first released on Enri Edo (厭離穢土), predating its usage in Umineko When They Cry chiru in 2010
-# but the more well-known release is the compilation album, Amrita (アムリタ)
-# i know it probably doesn't make sense to have two official release references on here, but i mean considering these are comments, we might as well
-# Official release A:
-#   Enri Edo
-#   厭離穢土
-# Reference A:
-#   https://vgmdb.net/album/89397
-# Official release B:
-#   Amrita
-#   アムリタ
-# Reference B:
-#   https://vgmdb.net/album/14778
-Directory: yomitsu-hirasaka-corruption
-Artists:
-- Umineko When They Cry
-- '-45'
-Duration: 4:49
-URLs:
-- https://www.youtube.com/watch?v=rKfmGqlp8D4
----
 Section: Music composed for movies, television, and other visual arts
 ---
 Track: $64,000 Question
diff --git a/album/sound-test-ii.yaml b/album/sound-test-ii.yaml
index 6949aee4..c0a6083f 100644
--- a/album/sound-test-ii.yaml
+++ b/album/sound-test-ii.yaml
@@ -832,7 +832,7 @@ URLs:
 Commentary: |-
     <i>Rom M:</i> ([Bandcamp about blurb](https://vasterror.bandcamp.com/track/untitled-edolon-draft-corruptedcultist-original-demo))
 
-    Much more [[artist:danganronpa]] inspired Edolon theme. [[artist:austinado]] requested one for the SBB route, he asked that it would be somewhat [[artist:masafumi-takada]] inspired, in the end though, I couldn't make much of this since it felt wrong for the character, so I went in [[corruptedcultist|a different direction]]. An [[artist:umineko-when-they-cry|Umineko]] [[artist:zts]] direction.
+    Much more [[artist:danganronpa]] inspired Edolon theme. [[artist:austinado]] requested one for the SBB route, he asked that it would be somewhat [[artist:masafumi-takada]] inspired, in the end though, I couldn't make much of this since it felt wrong for the character, so I went in [[corruptedcultist|a different direction]]. An Umineko [[artist:zts]] direction.
 ---
 Track: Perfection [Draft 1]
 Directory: perfection-vast-error-draft-1
@@ -942,7 +942,7 @@ Commentary: |-
 Referencing Sources: |-
     @@ [Bandcamp credits blurb](https://vasterror.bandcamp.com/track/message-from-the-sect)
 
-    Samples: [[Black Lilliana|Black Liliana]] - [[artist:umineko-when-they-cry|Umineko]]
+    Samples: [[Black Lilliana|Black Liliana]] - Umineko
 ---
 Track: Unused Racren Track
 Artists:
diff --git a/album/vgm/higurashi-when-they-cry-kai-meakashi.yaml b/album/vgm/higurashi-when-they-cry-kai-meakashi.yaml
new file mode 100644
index 00000000..61f6bf14
--- /dev/null
+++ b/album/vgm/higurashi-when-they-cry-kai-meakashi.yaml
@@ -0,0 +1,32 @@
+Album: Higurashi When They Cry Kai "Meakashi"
+Style: in-game vgm
+Date: December 30, 2004
+Color: '#39d58d'
+Groups:
+- When They Cry
+---
+Track: Soul Scour
+# Official release:
+#   Higurashi no Naku Koro ni Kai Original Sound Version & Extra Sounds "Thanks/you"
+#   ひぐらしのなく頃に解 Original Sound Version & Extra Sounds ｢Thanks／you｣
+# Reference:
+#   https://vgmdb.net/album/6209
+Duration: 1:42
+Artists:
+- dai
+URLs:
+- https://www.youtube.com/watch?v=x14cKhgKi0U
+---
+Track: you
+Suffix Directory: true
+Always Reference By Directory: true
+# Official release:
+#   Higurashi no Naku Koro ni Kai Original Sound Version & Extra Sounds "Thanks/you"
+#   ひぐらしのなく頃に解 Original Sound Version & Extra Sounds ｢Thanks／you｣
+# Reference:
+#   https://vgmdb.net/album/6209
+Artists:
+- dai
+Duration: 3:35
+URLs:
+- https://www.youtube.com/watch?v=zWNkD4YWt_c
diff --git a/album/vgm/umineko-chiru-ep5-end-of-the-golden-witch.yaml b/album/vgm/umineko-chiru-ep5-end-of-the-golden-witch.yaml
new file mode 100644
index 00000000..caa6aa7d
--- /dev/null
+++ b/album/vgm/umineko-chiru-ep5-end-of-the-golden-witch.yaml
@@ -0,0 +1,30 @@
+Album: 'Umineko When They Cry Chiru Episode 5: End of the golden witch'
+Directory: umineko-chiru-ep5-end-of-the-golden-witch
+Style: in-game vgm
+Date: August 15, 2009
+Color: '#c351ff'
+Cover Art File Extension: png
+Groups:
+- When They Cry
+---
+Track: ����Ô�Ǎ�CORRUPTION
+# uh oh god there's two of them, official releases i mean
+# so it was first released on Enri Edo (�}���q�y), predating its usage in Umineko When They Cry chiru in 2010
+# but the more well-known release is the compilation album, Amrita (�A�����^)
+# i know it probably doesn't make sense to have two official release references on here, but i mean considering these are comments, we might as well
+# Official release A:
+#   Enri Edo
+#   �}���q�y
+# Reference A:
+#   https://vgmdb.net/album/89397
+# Official release B:
+#   Amrita
+#   �A�����^
+# Reference B:
+#   https://vgmdb.net/album/14778
+Directory: yomitsu-hirasaka-corruption
+Artists:
+- '-45'
+Duration: 4:49
+URLs:
+- https://www.youtube.com/watch?v=rKfmGqlp8D4
diff --git a/album/vgm/umineko-ep1-legend-of-the-golden-witch.yaml b/album/vgm/umineko-ep1-legend-of-the-golden-witch.yaml
new file mode 100644
index 00000000..e9780c1b
--- /dev/null
+++ b/album/vgm/umineko-ep1-legend-of-the-golden-witch.yaml
@@ -0,0 +1,20 @@
+Album: 'Umineko When They Cry Episode 1: Legend of the golden witch'
+Directory: umineko-ep1-legend-of-the-golden-witch
+Style: in-game vgm
+Date: August 17, 2007
+Color: '#7979ff'
+Groups:
+- When They Cry
+---
+Track: goldenslaughterer
+# Official release:
+#   Umineko no Naku Koro ni musicbox Red
+#   ���݂˂��̂Ȃ����� musicbox Red
+# Reference:
+#   https://vgmdb.net/album/14643
+Duration: 6:47
+Artists:
+- zts
+URLs:
+- https://codeztslabel.bandcamp.com/track/goldenslaughterer
+- https://www.youtube.com/watch?v=vYV61Pf-D3M
diff --git a/album/vgm/umineko-ep2-turn-of-the-golden-witch.yaml b/album/vgm/umineko-ep2-turn-of-the-golden-witch.yaml
new file mode 100644
index 00000000..09acf1f1
--- /dev/null
+++ b/album/vgm/umineko-ep2-turn-of-the-golden-witch.yaml
@@ -0,0 +1,16 @@
+Album: 'Umineko When They Cry Episode 2: Turn of the golden witch'
+Directory: umineko-ep2-turn-of-the-golden-witch
+Style: in-game vgm
+Date: December 31, 2007
+Color: '#627eff'
+Groups:
+- When They Cry
+---
+Track: Black Lilliana
+# JP: ���̃����A�i
+# I don't know if there's an official release??? this is confusing
+# doesn't seem like there is? uh-
+Artists:
+- U2 Akiyama
+URLs:
+- https://www.youtube.com/watch?v=Ci5LwgEqzYI
diff --git a/artists.yaml b/artists.yaml
index 78848623..0c811c26 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -3511,7 +3511,9 @@ URLs:
 ---
 Artist: DagwoodDeluxe
 ---
-Artist: Dai
+Artist: dai
+Aliases:
+- Dai
 ---
 Artist: Dai Haraguchi
 ---
@@ -6451,8 +6453,6 @@ URLs:
 - https://thehighblood.bandcamp.com/
 - https://vk.com/bleedingpie
 ---
-Artist: Higurashi When They Cry
----
 Artist: Hilaletto
 URLs:
 - https://hilaletto.deviantart.com/
@@ -15976,8 +15976,6 @@ URLs:
 ---
 Artist: umibouzu
 ---
-Artist: Umineko When They Cry
----
 Artist: UNBEATABLE
 Context Notes: |-
     UNBEATABLE is:<br>
diff --git a/groups.yaml b/groups.yaml
index dac5e20e..729530cc 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -1401,3 +1401,14 @@ Series:
 - Name: Other game soundtracks
   Albums:
   - Yougakudan no Rekishi 5 ~ Akyu's Untouched Score vol.5
+---
+Group: When They Cry
+Series:
+- Name: Higurashi When They Cry
+  Albums:
+  - Higurashi When They Cry Kai "Meakashi"
+- Name: Umineko When They Cry
+  Albums:
+  - 'Umineko When They Cry Episode 1: Legend of the golden witch'
+  - 'Umineko When They Cry Episode 2: Turn of the golden witch'
+  - 'Umineko When They Cry Chiru Episode 5: End of the golden witch'