4 files changed, 39 insertions, 48 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