descend2

4 files changed, 70 insertions, 59 deletions

diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index e98cf184..9f034b05 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -1437,7 +1437,7 @@ Duration: 4:06
 URLs:
 - https://www.youtube.com/watch?v=Svy9DBBZKpk
 Referenced Tracks:
-- Descend2 (11/24)
+- Descend2 (11/24/2010)
 Cover Artists:
 - Max Schwartz
 Cover Art File Extension: gif
diff --git a/album/more-from-the-music-team.yaml b/album/more-from-the-music-team.yaml
index ab6f2e29..9403d6af 100644
--- a/album/more-from-the-music-team.yaml
+++ b/album/more-from-the-music-team.yaml
@@ -1084,9 +1084,9 @@ Artists:
 - rj lake
 Duration: 4:20
 Referenced Tracks:
-- Descend2 (11/24)
+- Descend2 (11/24/2010)
 Sampled Tracks:
-- Descend2 (11/24)
+- Descend2 (11/24/2010)
 - track:frost-vol6
 - Sburban Jungle
 URLs:
@@ -1121,7 +1121,7 @@ Commentary: |-
 
     The MP3 for this track (obtained directly from tumblr) has a date/year field of 2010. As RJ noted in Vol. 10's booklet commentary - this track is older than [[flash:4109]] itself! (There is no track / file name for the MP3 or as part of the original tumblr post.)
 
-    The Descend2 reference in this track, pointing to [[track:descend2-11-24]], is arbitrarily chosen. All versions of Descend2 were posted to Tindeck around the same date ([[date:11/24/2010]]), so we assume the latest, "most complete" version was sampled, but we haven't musically backed this up yet.
+    The Descend2 reference in this track, pointing to [[track:descend2-11-24-2010]], is arbitrarily chosen. All versions of Descend2 were posted to Tindeck around the same date ([[date:11/24/2010]]), so we assume the latest, "most complete" version was sampled, but we haven't musically backed this up yet.
 ---
 Track: HEY MAN VOLUME 10 MAN HEY CHECK IT OUT
 Artists:
@@ -1212,6 +1212,67 @@ Commentary: |-
 
     It was already here...
 ---
+Track: Descend(Original Version)
+Name Detail: 11/23/2010
+Name Style: utility
+Suffix Directory: tensei
+Reference By Directory: always
+Date First Released: November 23, 2010
+Additional Names:
+- Descend (name in MP3 metadata)
+Artists:
+- Tensei
+Duration: 1:48
+URLs:
+- https://media.hsmusic.wiki/misc/archive/Descend(Original%20Version).mp3
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor, 12/14/2023)
+
+    [Details from Tindeck.](https://web.archive.org/web/20110317051823/http://tindeck.com/listen/jkbc) The earliest version of [[Cascade (Beta)]].
+---
+Track: Descend2
+Name Detail: 11/23/2010
+Name Style: utility
+Date First Released: November 23, 2010
+Additional Names:
+- Tensei-San - Descend2 (name on Tindeck)
+Artists:
+- Tensei
+Duration: 2:22
+URLs:
+- https://media.hsmusic.wiki/misc/archive/Tensei-San%20-%20Descend2%20(2010-11-23).mp3
+Referenced Tracks:
+- track:descend-original-version-tensei
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor, 12/14/2023)
+
+    [Details from Tindeck.](https://web.archive.org/web/20110317051823/http://tindeck.com/listen/pycu) This track and [[Descend2 (11/24/2010)]] had the exact same name, though they're spearate uploads.
+---
+Track: Descend2
+Name Detail: 11/24/2010
+Name Style: utility
+Date First Released: November 24, 2010
+Additional Names:
+- Tensei-San - Descend2 (name on Tindeck)
+Artists:
+- Tensei
+Duration: 3:04
+URLs:
+- https://media.hsmusic.wiki/misc/archive/Tensei-San%20-%20Descend2%20(2010-11-24).mp3
+Referenced Tracks:
+- Descend2 (11/23/2010)
+- Descend
+Sampled Tracks:
+- Friendship Aneurysm
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor, 12/14/2023)
+
+    [Details from Tindeck.](https://web.archive.org/web/20110317051823/http://tindeck.com/listen/dvqu) This track and [[Descend2 (11/23/2010)]] had the exact same name, though they're spearate uploads.
+
+    <i>Quasar Nebula:</i> (wiki editor, 1/1/2025)
+
+    The [[Descend]] reference here refers to the way this track cuts (with static) to [[track:friendship-aneurysm]].
+---
 Track: Heel, Girl
 Name Detail: Tumblr
 Main Release: Heel Girl (Beta) # Strife 2
@@ -1610,7 +1671,7 @@ Commentary: |-
 
     <i>ruby:</i> (wiki editor, 4/7/2025)
 
-    As Jebb stated below, there is some uncertainty surrounding this version of Cascade. It is presumably based on a wip version that came anywhere between [[track:cascade-beta|Beta]] and [[track:cascade-directors-cut|Director's Cut]]. As we have no other [[artist:tensei]]-produced versions that came between those two, it is impossible to tell when exactly this one came from. The easiest way to think about it is that this is an edit of what would eventually become Director's Cut. That's why, as of writing this commentary, and unlike as of the writing of Jebb's commentary, this track is listed as referencing Director's Cut. The [[track:sburban-jungle]] and [[track:beatdown-strider-style|Beatdown]] references come from [[artist:tensei]]. It's impossible to tell whether [[artist:toby-fox|Toby]] had access to any stems for the song and was able to make the edits heard in this version himself, or if Tensei provided the base and Toby *only* layered in the additional instruments, but what it comes down to is that Cascade1 isn't in itself relevant to Tensei's "Cascade canon", from [[track:descend-original-version]] to the full [[track:cascade]], which uses a combination of Beta and Director's Cut.
+    As Jebb stated below, there is some uncertainty surrounding this version of Cascade. It is presumably based on a wip version that came anywhere between [[track:cascade-beta|Beta]] and [[track:cascade-directors-cut|Director's Cut]]. As we have no other [[artist:tensei]]-produced versions that came between those two, it is impossible to tell when exactly this one came from. The easiest way to think about it is that this is an edit of what would eventually become Director's Cut. That's why, as of writing this commentary, and unlike as of the writing of Jebb's commentary, this track is listed as referencing Director's Cut. The [[track:sburban-jungle]] and [[track:beatdown-strider-style|Beatdown]] references come from [[artist:tensei]]. It's impossible to tell whether [[artist:toby-fox|Toby]] had access to any stems for the song and was able to make the edits heard in this version himself, or if Tensei provided the base and Toby *only* layered in the additional instruments, but what it comes down to is that Cascade1 isn't in itself relevant to Tensei's "Cascade canon", from [[track:descend-original-version-tensei]] to the full [[track:cascade]], which uses a combination of Beta and Director's Cut.
 
     <i>Jebb:</i> (wiki editor, 12/26/2024)
 
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 9e99db7e..e7b13e64 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -43,59 +43,6 @@ Commentary: |-
 
     However, I love both the harp and flute melodies in this song. It was a blast to play, and I'd definitely think about using them again at some point in the future.
 ---
-Track: Descend2 (11/23)
-Additional Names:
-- Tensei-San - Descend2 (name on Tindeck)
-Date First Released: November 23, 2010
-Duration: 2:22
-Artists:
-- Tensei
-URLs:
-- https://media.hsmusic.wiki/misc/archive/Tensei-San%20-%20Descend2%20(2010-11-23).mp3
-Referenced Tracks:
-- Descend(Original Version)
-Commentary: |-
-    <i>Quasar Nebula:</i> (wiki editor, 12/14/2023)
-
-    [Details from Tindeck.](https://web.archive.org/web/20110317051823/http://tindeck.com/listen/pycu) This track and [[Descend2 (11/24)]] had the exact same name, though they're spearate uploads.
----
-Track: Descend2 (11/24)
-Additional Names:
-- Tensei-San - Descend2 (name on Tindeck)
-Date First Released: November 24, 2010
-Duration: 3:04
-Artists:
-- Tensei
-URLs:
-- https://media.hsmusic.wiki/misc/archive/Tensei-San%20-%20Descend2%20(2010-11-24).mp3
-Referenced Tracks:
-- Descend2 (11/23)
-- Descend
-Sampled Tracks:
-- Friendship Aneurysm
-Commentary: |-
-    <i>Quasar Nebula:</i> (wiki editor, 12/14/2023)
-
-    [Details from Tindeck.](https://web.archive.org/web/20110317051823/http://tindeck.com/listen/dvqu) This track and [[Descend2 (11/23)]] had the exact same name, though they're spearate uploads.
-
-    <i>Quasar Nebula:</i> (wiki editor, 1/1/2025)
-
-    The [[Descend]] reference here refers to the way this track cuts (with static) to [[track:friendship-aneurysm]].
----
-Track: Descend(Original Version)
-Date First Released: November 23, 2010
-Additional Names:
-- Descend (name in MP3 metadata)
-Duration: 1:48
-Artists:
-- Tensei
-URLs:
-- https://media.hsmusic.wiki/misc/archive/Descend(Original%20Version).mp3
-Commentary: |-
-    <i>Quasar Nebula:</i> (wiki editor, 12/14/2023)
-
-    [Details from Tindeck.](https://web.archive.org/web/20110317051823/http://tindeck.com/listen/jkbc) The earliest version of [[Cascade (Beta)]].
----
 Track: Desperado
 Artists:
 - Bill Bolin
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 08695794..e35cc961 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -1123,6 +1123,9 @@ Content: |-
     - changed directory of [[track:sleeping-in-single]] from `sleeping-in` to `sleeping-in-single`
     - changed directory of [[track:do-the-homestuck-demo]] from `do-the-homestuck` to `do-the-homestuck-demo`
     - changed directory of [[track:jane-dargason-5-11-2012]] from `jane-dargason-may-11` to `jane-dargason-5-11-2012`
+    - changed directory of [[track:descend-original-version-tensei]] from `descend-original-version` to `descend-original-version-tensei`
+    - changed directory of [[track:descend2-11-23-2010]] from `descend2-11-23` to `descend2-11-23-2010`
+    - changed directory of [[track:descend2-11-24-2010]] from `descend2-11-24` to `descend2-11-24-2010`
     - changed directories of all tracks across [[album:a-link-to-the-past]] to be suffixed `-a-link-to-the-past`, rather than `-the-legend-of-zelda-a-link-to-the-past`
     - changed directory of [[track:battle-rival-pokemon-black2-white2]] from `battle-rival-b2w2` to `battle-rival-pokemon-black2-white2`
     - changed directory of [[track:battle-frontier-brain-hoenn-version]] from `battle-frontier-brainhoenn-version` to `battle-frontier-brain-hoenn-version`
@@ -2144,7 +2147,7 @@ Content: |-
     <h3>data fixes</h3>
     <!-- reference fixes -->
     - fixed [[track:fiduspawn-go]] not referencing [[track:title-screen-pokemon-red-blue]] (thanks, ruby!)
-    - fixed [[track:cascade-beta]] not referencing [[track:descend2-11-24]] (thanks, Tangle!)
+    - fixed [[track:cascade-beta]] not referencing [[track:descend2-11-24-2010]] (thanks, Tangle!)
     - fixed [[track:skaian-overdrive]] not referencing [[track:skaian-overdrive-original]] (original recording), and moved [[track:skaian-ride]] and [[track:sburban-jungle]] references to that track (thanks, Lilith!)
     - fixed [[track:freefall]] referencing [[track:cascade-beta]] instead of [[track:cascade2]]
     - fixed [[track:feel-alive]] referencing [[track:feel-old-ver]] instead of [[track:feel-luke-benjamins]], and [[track:feel-old-ver]] referencing [[track:feel-luke-benjamins]] instead of the other way around (thanks, Lilith, Whisper, ruby!)