Cave Story!!! (Cello)

6 files changed, 48 insertions, 53 deletions

diff --git a/album/canwc-sound-test-1.yaml b/album/canwc-sound-test-1.yaml
index 1f1643e1..6bc8dade 100644
--- a/album/canwc-sound-test-1.yaml
+++ b/album/canwc-sound-test-1.yaml
@@ -186,7 +186,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/i-am-caving-inside-a-story-doctor-origins-gone-sexual
 - https://www.youtube.com/watch?v=dzIWfQ4ExeM
 Referenced Tracks:
-- track:plantation-cave-story
+- Cave Story
 Sampled Tracks:
 - Bowman's Credit Score
 ---
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index d19590ea..5dbee08f 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -4962,14 +4962,6 @@ URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/80a7c7b0-7a40-465a-b067-e9192b893fa8
 - https://www.youtube.com/watch?v=fMb-WH2UYi0
 ---
-Track: Hero's End
-# The original Cave Story's soundtrack hasn't been officially released.
-Artists:
-- Cave Story
-- Daisuke Amaya
-URLs:
-- https://www.youtube.com/watch?v=ayMOn4GKKGk
----
 Track: Homicide
 Directory: homicide-danganronpa
 Always Reference By Directory: true
@@ -5532,14 +5524,6 @@ URLs:
 Referenced Tracks:
 - Landscape Under The Ghost -Kaminano
 ---
-Track: Last Battle
-# The original Cave Story's soundtrack hasn't been officially released.
-Artists:
-- Cave Story
-- Daisuke Amaya
-URLs:
-- https://www.youtube.com/watch?v=vMhMck1Uwms
----
 Track: Layton's Theme
 # JP: レイトン教授のテーマ
 # Official release:
@@ -6167,14 +6151,6 @@ Duration: 3:46
 URLs:
 - https://www.youtube.com/watch?v=gUI9lQb_d0o
 ---
-Track: Moonsong
-# The original Cave Story's soundtrack hasn't been officially released.
-Artists:
-- Cave Story
-- Daisuke Amaya
-URLs:
-- https://www.youtube.com/watch?v=q09KoR7g018
----
 Track: Mor Ardain - Roaming the Wastes -
 # Reference:
 #   https://vgmdb.net/album/75751
@@ -6630,19 +6606,6 @@ Duration: 1:22
 URLs:
 - https://www.youtube.com/watch?v=_I34nshlOPk
 ---
-Track: Plantation
-Directory: plantation-cave-story
-Always Reference By Directory: true
-# The original Cave Story's soundtrack hasn't been officially released.
-Artists:
-- Cave Story
-- Daisuke Amaya
-URLs:
-- https://www.youtube.com/watch?v=aHtWKbR_P-c
-Commentary: |-
-    <i>Makin:</i> (wiki editor, 8/13/2023)
-    Also known as Cave Story's Title Theme or Main Theme.
----
 Track: Poké Mart (Pokémon Ruby & Pokémon Sapphire)
 # Reference:
 #   https://vgmdb.net/album/1024
@@ -7269,14 +7232,6 @@ Duration: 0:03
 URLs:
 - https://www.youtube.com/watch?v=1geG058Bpls
 ---
-Track: Running Hell
-# The original Cave Story's soundtrack hasn't been officially released.
-Artists:
-- Cave Story
-- Daisuke Amaya
-URLs:
-- https://www.youtube.com/watch?v=VQPqmS5iGzY
----
 Track: Rusty Bucket Bay
 # Reference:
 #   https://vgmdb.net/album/48423
diff --git a/album/tributary.yaml b/album/tributary.yaml
index f9f895ff..2e312199 100644
--- a/album/tributary.yaml
+++ b/album/tributary.yaml
@@ -237,10 +237,10 @@ Referenced Tracks:
 - Eight Melodies (EarthBound Beginnings)
 - Ohgodwhat
 - Lotus
-- track:plantation-cave-story
+- Cave Story
 - Moonsong
 - Doctor
 Referencing Sources: |-
     <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/memory))
 
-    quotes Eight Melodies by [[artist:keiichi-suzuki]] and [[artist:hirokazu-tanaka]] (both [[track:eight-melodies-earthbound|Earthbound]] and [[track:eight-melodies-earthbound-beginnings|Mother]] versions), [[track:ohgodwhat]] by [[artist:nick-smalley]], [[track:lotus]] by [[artist:seth-peelle]], [[track:plantation-cave-story|Cave Story (Plantation/Main Theme)]] and [[track:moonsong]] by [[artist:daisuke-amaya]], and [[track:doctor]] by [[artist:buzinkai]]
+    quotes Eight Melodies by [[artist:keiichi-suzuki]] and [[artist:hirokazu-tanaka]] (both [[track:eight-melodies-earthbound|Earthbound]] and [[track:eight-melodies-earthbound-beginnings|Mother]] versions), [[track:ohgodwhat]] by [[artist:nick-smalley]], [[track:lotus]] by [[artist:seth-peelle]], [[track:cave-story|Cave Story (Plantation/Main Theme)]] and [[track:moonsong]] by [[artist:studio-pixel]], and [[track:doctor]] by [[artist:buzinkai]]
diff --git a/album/vgm/cave-story.yaml b/album/vgm/cave-story.yaml
new file mode 100644
index 00000000..00816035
--- /dev/null
+++ b/album/vgm/cave-story.yaml
@@ -0,0 +1,36 @@
+Album: Cave Story
+Directory: cave-story
+Style: in-game vgm
+Date: December 20, 2004
+Cover Art File Extension: png
+Color: '#8fa7a0'
+Track Artists:
+- Studio Pixel
+Groups:
+- group:more-vgm
+# Note: all track lengths have been taken from cavestory.one's accurate conversion of the original .org files. - Cello
+---
+Track: Cave Story # Previously listed on the wiki as Plantation and commented by Makin in commentary as being also titled "[Cave Story's] Title Theme or Main Theme"; both official releases (Humble Bundle/Famitracks) of CS's music list it as just "Cave Story"/"Cave Story (Theme Song)." - Cello
+Duration: 4:30
+URLs:
+- https://www.youtube.com/watch?v=aHtWKbR_P-c
+---
+Track: Hero's End
+Duration: 2:08
+URLs:
+- https://www.youtube.com/watch?v=ayMOn4GKKGk
+---
+Track: Last Battle
+Duration: 2:07
+URLs:
+- https://www.youtube.com/watch?v=4zW7Dmx9WYQ
+---
+Track: Moonsong
+Duration: 2:28
+URLs:
+- https://www.youtube.com/watch?v=q09KoR7g018
+---
+Track: Running Hell
+Duration: 2:16
+URLs:
+- https://www.youtube.com/watch?v=VQPqmS5iGzY
diff --git a/artists.yaml b/artists.yaml
index 0c811c26..60599cda 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -3522,8 +3522,6 @@ Aliases:
 - Koichiro Muroya Strings
 - Muroya Strings
 ---
-Artist: Daisuke Amaya
----
 Artist: Daisuke Horikawa
 ---
 Artist: Daisuke Ishiwatari
@@ -14757,6 +14755,10 @@ Aliases:
 ---
 Artist: Studio June
 ---
+Artist: Studio Pixel
+Aliases:
+- Daisuke Amaya
+---
 Artist: STYLE FIVE
 ---
 Artist: subversiveasset
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 69973cd9..670e58e7 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -250,6 +250,7 @@ Content: |-
         - prepared [[album:bastion]] in-game VGM! (thanks, Cello, Coral!)
         - prepared [[album:binding-of-isaac-rebirth]] in-game VGM! (thanks, Cello!)
         - prepared [[group:brandish]] in-game VGM! (thanks, Lan!)
+        - prepared [[group:cave-story]] in-game VGM! (thanks, Cello, Lan!)
         - prepared [[album:celeste]] in-game VGM! (thanks, Lan!)
         - prepared [[album:cuphead]] in-game VGM! (thanks, Cello!)
         - prepared [[album:doom-1993]] in-game VGM! (thanks, Cello, Coral!)
@@ -1174,10 +1175,11 @@ Content: |-
     - changed directory of [[track:battle-frontier-brain-hoenn-version]] from `battle-frontier-brainhoenn-version` to `battle-frontier-brain-hoenn-version`
     - changed directory of [[track:battle-frontier-brain-hoenn-version]] from `battle-frontier-brainsinnoh-version` to `battle-frontier-brain-sinnoh-version`
     - changed directory of [[track:at-dooms-gate]] from `at-dooms-gate-e1m1` to `at-dooms-gate`
+    - changed directory of [[track:cave-story]] from `plantation-cave-story` to `cave-story`
     - changed directory of [[track:eight-melodies-earthbound]] from `eight-melodies` to `eight-melodies-earthbound`
-    - changed directory of [[track:you-higurashi-when-they-cry]] from `you-dai` to `you-higurashi-when-they-cry`
     - chanage directory of [[track:palace-of-twilight]] from `the-twilight-realm-the-twilight-princess` to `palace-of-twilight`
     - changed directory of [[track:silly-billy-fnf-hit-single]] from `silly-billy-hit-single` to `silly-billy-fnf-hit-single`
+    - changed directory of [[track:you-higurashi-when-they-cry]] from `you-dai` to `you-higurashi-when-they-cry`
     - changed directory of [[track:bad-apple-lovelight]] from `bad-apple-feat-nomico` to `bad-apple-lovelight`
     - changed directory of [[artist:akira-series]] from `akira` to `akira-series`
     </details>
@@ -1721,7 +1723,7 @@ Content: |-
     - fixed commentary entries besides the first on each track not being annotated "booklet commentary" across [[album:lofam3]] (thanks, Whisper, Lan!)
     <!-- link fixes -->
     - fixed Bandcamp listening link for [[track:skaian-shrapnel]] (was to a functioning "skiain-shrapnel" URL; thanks, Surge, Lan!)
-    - fixed YouTube listening link for [[track:plantation-cave-story]] (was to a URL for [[track:moonsong]]; thanks, Geese, Lan!)
+    - fixed YouTube listening link for [[track:cave-story]] (was to a URL for [[track:moonsong]]; thanks, Geese, Lan!)
     - fixed YouTube listening link for [[track:stone-tower-temple]] (was dead; thanks, Lilith, Lan!)
     <h3>directory changes</h3>
     <details><summary><b>Toggle Directorylog</b></summary>
@@ -3563,7 +3565,7 @@ Content: |-
         - added <code>-we-are-all-satellites</code> to directories of [[track:harrigan-we-are-all-satellites]], [[track:mischief-we-are-all-satellites]], [[track:miranda-we-are-all-satellites]], [[track:lunatic-we-are-all-satellites]]
         - added <code>-weird-puzzle-tunes</code> to directory of [[track:aggress-weird-puzzle-tunes]]
         - added <code>-xenoplanetarium</code> to directory of [[track:acquiesce-xenoplanetarium]]
-        - added artists or source material to directories across [[group:additional-tracks]]: [[track:calliope-malcolm-brown]], [[track:cats-toby-fox]], [[track:feel-luke-benjamins]], [[track:flow-solatrus]], [[track:haunt-andrew-hussie]], [[track:valor-toby-fox]], [[track:gnade-redditstuck]], [[track:higher-ost]], [[track:rematch-strider-mixtape]], [[track:snowfall-stlap3]], [[track:wanderlust-redditstuck]], [[track:man-deltarune]], [[track:nuclear-james-roach]], [[track:terra-solatrus]], [[track:beginning-castlevania-draculas-curse]], [[track:dissonance-quincy-pringle]], [[track:focus-super-hexagon]], [[track:harmony-runescape]], [[track:homicide-danganronpa]], [[track:infinite-sonic-forces]], [[track:otherworld-final-fantasy-ix]], [[track:plantation-cave-story]], [[track:power-mother]], [[track:redial-bomberman-hero]], [[track:slider-super-mario-64]], [[track:synchrony-brandish-the-planet-buster]], [[track:you-higurashi-when-they-cry]], [[track:chase-jjba]], [[track:courage-jjba]], [[track:mailtime-blues-clues]], [[track:smack-khonjin-house]], [[track:chopsticks-euphemia-allen]], [[track:badgers-mrweebl]], [[track:bodies-drowning-pool]], [[track:bonfire-childish-gambino]], [[track:carnival-gorillaz]], [[track:casin-glue70]], [[track:crawling-linkin-park]], [[track:discordant-cecily-renns]], [[track:divinity-porter-robinson]], [[track:dust-moon]], [[track:earth-smile]], [[track:faint-linkin-park]], [[track:fever-little-willie-john]], [[track:fireflies-owl-city]], [[track:flicker-porter-robinson]], [[track:friday-rebecca-black]], [[track:gentleman-psy]], [[track:hoverboard-dirtyphonics]], [[track:hydrogen-moon]], [[track:if-placeboing]], [[track:killers-cboyardee]], [[track:lawnmower-neil-cicierega]], [[track:linger-the-cranberries]], [[track:parade-justice]], [[track:piss-neil-cicierega]], [[track:risen-terry-a-davis]], [[track:darude-sandstorm]], [[track:separator-radiohead]], [[track:september-earth-wind-fire]], [[track:shelter-porter-robinson]], [[track:smooth-santana]], [[track:spleen-ruth-white]], [[track:teardrop-massive-attack]], [[track:teenagers-my-chemical-romance]], [[track:ultimate-denzel-curry]], [[track:verified-your-favorite-martian]], [[track:whales-hail-mary-mallons]], [[track:hackers-iain-softley]], [[track:howl-allen-ginsberg]]
+        - added artists or source material to directories across [[group:additional-tracks]]: [[track:calliope-malcolm-brown]], [[track:cats-toby-fox]], [[track:feel-luke-benjamins]], [[track:flow-solatrus]], [[track:haunt-andrew-hussie]], [[track:valor-toby-fox]], [[track:gnade-redditstuck]], [[track:higher-ost]], [[track:rematch-strider-mixtape]], [[track:snowfall-stlap3]], [[track:wanderlust-redditstuck]], [[track:man-deltarune]], [[track:nuclear-james-roach]], [[track:terra-solatrus]], [[track:beginning-castlevania-draculas-curse]], [[track:dissonance-quincy-pringle]], [[track:focus-super-hexagon]], [[track:harmony-runescape]], [[track:homicide-danganronpa]], [[track:infinite-sonic-forces]], [[track:otherworld-final-fantasy-ix]], [[track:cave-story]], [[track:power-mother]], [[track:redial-bomberman-hero]], [[track:slider-super-mario-64]], [[track:synchrony-brandish-the-planet-buster]], [[track:you-higurashi-when-they-cry]], [[track:chase-jjba]], [[track:courage-jjba]], [[track:mailtime-blues-clues]], [[track:smack-khonjin-house]], [[track:chopsticks-euphemia-allen]], [[track:badgers-mrweebl]], [[track:bodies-drowning-pool]], [[track:bonfire-childish-gambino]], [[track:carnival-gorillaz]], [[track:casin-glue70]], [[track:crawling-linkin-park]], [[track:discordant-cecily-renns]], [[track:divinity-porter-robinson]], [[track:dust-moon]], [[track:earth-smile]], [[track:faint-linkin-park]], [[track:fever-little-willie-john]], [[track:fireflies-owl-city]], [[track:flicker-porter-robinson]], [[track:friday-rebecca-black]], [[track:gentleman-psy]], [[track:hoverboard-dirtyphonics]], [[track:hydrogen-moon]], [[track:if-placeboing]], [[track:killers-cboyardee]], [[track:lawnmower-neil-cicierega]], [[track:linger-the-cranberries]], [[track:parade-justice]], [[track:piss-neil-cicierega]], [[track:risen-terry-a-davis]], [[track:darude-sandstorm]], [[track:separator-radiohead]], [[track:september-earth-wind-fire]], [[track:shelter-porter-robinson]], [[track:smooth-santana]], [[track:spleen-ruth-white]], [[track:teardrop-massive-attack]], [[track:teenagers-my-chemical-romance]], [[track:ultimate-denzel-curry]], [[track:verified-your-favorite-martian]], [[track:whales-hail-mary-mallons]], [[track:hackers-iain-softley]], [[track:howl-allen-ginsberg]]
     </details>
     <h3>data fixes</h3>
     - fixed [[track:dance-stab-dance]] not referencing [[track:sburban-jungle]] (thanks, Sgeo!)