more fixes & shenanigans

15 files changed, 128 insertions, 19 deletions

diff --git a/album/cherubim.yaml b/album/cherubim.yaml
index c598c7b..82d1d3a 100644
--- a/album/cherubim.yaml
+++ b/album/cherubim.yaml
@@ -261,6 +261,8 @@ Referenced Tracks:
 - Flowey's Laugh
 ---
 Track: Eternity Served Cold
+Additional Names:
+- Eternity's Shylock (earlier MSPA credit, see also [[track:eternity-served-cold#artist-commentary|commentary]])
 Artists:
 - Malcolm Brown
 Duration: '8:20'
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index e611f2a..1808182 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -136,6 +136,9 @@ URLs:
 - https://youtu.be/Yi7Wf-BTpMs
 ---
 Track: John Sleeps / Skaian Magicant
+Additional Names:
+- Can't Sleep, Harlequins Will Eat Me (earlier MSPA credit)
+- Skaian Magicant (earlier MSPA credit)
 Artists:
 - Toby Fox
 Art Tags:
diff --git a/album/homestuck-vol-1.yaml b/album/homestuck-vol-1.yaml
index 5e02c6c..bf7d9f4 100644
--- a/album/homestuck-vol-1.yaml
+++ b/album/homestuck-vol-1.yaml
@@ -195,6 +195,9 @@ Commentary: |-
     This was actually the first Homestuck-related thing I made, when Andrew asked us all to come up with some battle themes. Originally I titled it "Aggress" as a Problem Sleuth homage, but changed the name to "Aggrieve" once the attack command in John's first strife was revealed. Out of all my songs, this one holds a special place for me since it was the first one I did for Homestuck.
 ---
 Track: Showtime (Imp Strife Mix)
+Additional Names:
+- Name: Showtime ("16 bit" version)
+  Annotation: earlier MSPA credit
 Artists:
 - Buzinkai
 - Curt Blakeslee (fanfare)
diff --git a/album/homestuck-vol-2.yaml b/album/homestuck-vol-2.yaml
index c4832c3..ca30470 100644
--- a/album/homestuck-vol-2.yaml
+++ b/album/homestuck-vol-2.yaml
@@ -34,6 +34,9 @@ Commentary: |-
     The rock version of "Harlequin" sure made a scene, blasting through people's speakers as the background music for the Green Slime Ghost pogo game. Joseph nails the tough bits along with some sweet harmonics on the chorus.
 ---
 Track: Skaian Dreams (Remix)
+Additional Names:
+- Showtime - Sleep/dream sequence (earlier MSPA credit)
+- Skaian Dreams (earlier MSPA credit)
 Artists:
 - Bill Bolin
 Art Tags:
@@ -47,8 +50,12 @@ Referenced Tracks:
 - Skies of Skaia
 ---
 Track: Upward Movement (Dave Owns)
+Additional Names:
+- Upward Movement (earlier MSPA credit)
 Artists:
 - Kalibration
+Contributors:
+- Andrew Huo (edits)
 Art Tags:
 - Dave
 - Lil Cal
@@ -72,6 +79,9 @@ MIDI Project Files:
 - Title: MIDI by Unknown
   Files:
   - 'Upward Movement (Dave Owns) - Unknown B.mid'
+Commentary: |-
+    <i>Quasar Nebula:</i>
+    Andrew Huo's edits aren't described more specifically, nor credited on Bandcamp; this credit is pulled from [the original MSPA sound credits](https://web.archive.org/web/20100210001701/http://www.mspaintadventures.com/soundcredits.html). It was removed sometime between [June 12, 2012](https://web.archive.org/web/20120621202058/http://www.mspaintadventures.com/soundcredits.html) and [August 5, 2012](https://web.archive.org/web/20120805031705/http://www.mspaintadventures.com/soundcredits.html), when the sound credits were updated with proper links back to Bandcamp.
 ---
 Track: Vagabounce
 Artists:
diff --git a/album/homestuck-vol-3.yaml b/album/homestuck-vol-3.yaml
index 8be2d23..d237db7 100644
--- a/album/homestuck-vol-3.yaml
+++ b/album/homestuck-vol-3.yaml
@@ -15,6 +15,8 @@ Wallpaper Artists:
 - Homestuck
 ---
 Track: Beatdown (Strider Style)
+Additional Names:
+- Beatdown (earlier MSPA credit)
 Artists:
 - Curt Blakeslee
 Art Tags:
@@ -75,6 +77,8 @@ Sheet Music Files:
   - 'Beatdown (Strider Style) - Gamehunter.pdf'
 ---
 Track: Dissension (Original)
+Additional Names:
+- Dissension (earlier MSPA credit)
 Artists:
 - David Ko
 Art Tags:
diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index 0fe632c..948621d 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -673,6 +673,8 @@ Referenced Tracks:
 - Penumbra Phantasm
 ---
 Track: Bed of Rose's / Dreams of Derse
+Additional Names:
+- Bed of Rose's (earlier MSPA credit)
 Artists:
 - Mark J. Hadley
 Duration: '1:43'
@@ -707,6 +709,8 @@ Referenced Tracks:
 - Skaian Ride
 ---
 Track: How Do I Live (Bunny Back in the Box Version)
+Additional Names:
+- How Do I Live - Bunny Back in the Box Version (earlier MSPA credit)
 Artists:
 - Michael Guy Bowman
 Contributors:
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index 4c37571..a49cc68 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -519,6 +519,9 @@ Commentary: |-
     It's extremely subtle, but the cello tremolos are playing a very slow version of the theme from the beginning of Liquid Negrocity (and Black). I wrote this just after Jack Noir retreated from John and the rabbit. I didn't know what he'd be doing at the time, nor what his motivation would be, so I imagined him retreating to some castle and brooding as he contemplated his next move. Later on, Blackest Heart would be applied (rather effectively) to Gamzee instead.
 ---
 Track: Nic Cage Song
+Additional Names:
+- Name: two shitty nic cage songs
+  Annotation: earlier MSPA credit, see also [[Nic Cage Romance]]
 Artists:
 - Toby Fox
 Art Tags:
diff --git a/album/homestuck-vol-7.yaml b/album/homestuck-vol-7.yaml
index f9e175f..8e544f0 100644
--- a/album/homestuck-vol-7.yaml
+++ b/album/homestuck-vol-7.yaml
@@ -39,6 +39,8 @@ Commentary: |-
 Section: Main album
 ---
 Track: Black Rose / Green Sun
+Additional Names:
+- Black Rose, Green Sun (earlier MSPA credit)
 Artists:
 - Malcolm Brown
 Duration: '3:18'
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index a931d7f..d2c4fea 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -139,6 +139,8 @@ Cover Artists:
 - Richard Gung
 Art Tags:
 - Green Sun
+Referenced Tracks:
+- Flare (Cascade Cut)
 Sheet Music Files:
 - Title: Sheet music by Geekthras
   Files:
@@ -864,7 +866,12 @@ URLs:
 - https://youtu.be/Ckr6KyZoS58
 Referenced Tracks:
 - Cascade (Beta)
-- Flare (Cascade)
+- Flare (Cascade Cut)
+- Savior of the Dreaming Dead (Cascade Cut)
+- Black Hole / Green Sun
+Sampled Tracks:
+- Cascade (Beta)
+- Flare (Cascade Cut)
 - Savior of the Dreaming Dead (Cascade Cut)
 - Black Hole / Green Sun
 Sheet Music Files:
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 4d2b326..12eb5aa 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -294,6 +294,31 @@ Duration: '1:22'
 URLs:
 - https://www.newgrounds.com/audio/listen/242553
 ---
+Track: Flare (Cascade)
+Artists:
+- Clark Powell
+Duration: '3:26'
+URLs:
+- https://plazmataz.tumblr.com/post/19774190658/download-flare-cascade-i-have-recut-and
+- https://www.youtube.com/watch?v=hT0ijIKJkbE
+Referenced Tracks:
+- Flare (Cascade Cut)
+- Cascade (Beta)
+MIDI Project Files:
+- Title: MIDI by Unknown
+  Files:
+  - 'Flare (Cascade) - Unknown.mid'
+Commentary: |-
+    <i>Clark Powell:</i> (<a href="https://plazmataz.tumblr.com/post/19774190658/download-flare-cascade-i-have-recut-and">Tumblr</a>)
+
+    I have recut and remastered my track Flare, as it was presented to you in the Cascade flash (rather than the calmed-down [[Flare|album version]]). I get asked a lot for this, so I decided to give it some extra love and attention.
+
+    I have attempted a number of times to put together a mix of Flare that utilized the distinctive crescendo that is recognizable [[track:flare-cascade-cut|from Cascade]], but it never seems to work well without the cinematic context. The buildup sort of leads to nothing, and then the track either ends awkwardly or fades out, and I have something personal against fade-outs. Maybe I'll talk about that someday. But not now.
+
+    I gave it another go, this time trying a decrescendo to bring the song back down from all the energy it riles up, then ending it on kind of a creepy note. I had more success here than I ever have in past attempts to cut the song together in this way.
+
+    Flare was a pretty big hit in its own right, so there's always the pressure coming from the responsibility to handle this properly. I hope you enjoy it!
+---
 Track: Flare (Green Sun Remix)
 Artists:
 - Clark Powell
diff --git a/album/one-year-older.yaml b/album/one-year-older.yaml
index 7e0b2a0..7c00049 100644
--- a/album/one-year-older.yaml
+++ b/album/one-year-older.yaml
@@ -251,6 +251,8 @@ Commentary: |-
     At any rate, the music I went for was to just go along with that, a peaceful song for his demise before he came back. It feels kind of morbid, but since the concept of death has kind of gone out the window and back again in Homestuck, it's hardly as morbid as it could be.
 ---
 Track: Unlabeled
+Additional Names:
+- Unlabeled Record (earlier MSPA credit)
 Duration: '2:36'
 URLs:
 - https://erikscheele.bandcamp.com/track/unlabeled
diff --git a/album/squiddles.yaml b/album/squiddles.yaml
index 082f213..5aa5c87 100644
--- a/album/squiddles.yaml
+++ b/album/squiddles.yaml
@@ -441,6 +441,8 @@ Commentary: |-
     Everyone writing songs for the Squiddles album opted for happy-go-lucky and crazy-sounding things, but in an effort to make a variety, I aimed instead for something more calm and serene, picturing a calm ocean at night lit only by the full moon and stars. Admittedly, it's just 12 bars that repeat over and over, each time adding in an additional instrument track. Still, it's one of the most relaxing things I've ever written.
 ---
 Track: Let the Squiddles Sleep (End Theme)
+Additional Names:
+- Let the Squiddles Sleep (earlier MSPA credit)
 Artists:
 - Robert J! Lake
 Duration: '5:06'
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index ca9667e..f71f494 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -18,6 +18,9 @@ Commentary: |-
     Unofficial name. The MSPA newspost that discusses it calls it a "theme for Problem Sleuth". The actual filename itself was simply "ProblemSleuth.mp3". It's also sometimes known as "Problem Sleuth Title Theme".
 ---
 Track: Windchime Foley
+Additional Names:
+- Sound effects (earlier MSPA credit)
+- Foley (earlier MSPA credit)
 Artists:
 - Clark Powell
 Duration: '1:00'
@@ -31,6 +34,8 @@ Track: '01'
 Directory: phat1
 Artists:
 - Andrew Hussie
+Contributors:
+- Bill Bolin (mastering, syncing)
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=6
@@ -39,6 +44,8 @@ Track: '02'
 Directory: phat2
 Artists:
 - Andrew Hussie
+Contributors:
+- Bill Bolin (mastering, syncing)
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=16
@@ -47,6 +54,8 @@ Track: '03'
 Directory: phat3
 Artists:
 - Gabe Nezovic
+Contributors:
+- Bill Bolin (mastering, syncing)
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=29
@@ -55,6 +64,8 @@ Track: '04'
 Directory: phat4
 Artists:
 - Gabe Nezovic
+Contributors:
+- Bill Bolin (mastering, syncing)
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=40
@@ -63,6 +74,8 @@ Track: '05'
 Directory: phat5
 Artists:
 - Gabe Nezovic
+Contributors:
+- Bill Bolin (mastering, syncing)
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=50
@@ -87,6 +100,8 @@ Track: '08'
 Directory: phat8
 Artists:
 - artist:ian-taylor
+Contributors:
+- Bill Bolin (mastering, syncing)
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=81
@@ -95,6 +110,8 @@ Track: '09'
 Directory: phat9
 Artists:
 - artist:ian-taylor
+Contributors:
+- Bill Bolin (mastering, syncing)
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=90
@@ -103,6 +120,8 @@ Track: '10'
 Directory: phat10
 Artists:
 - Kalibration
+Contributors:
+- Bill Bolin (mastering, syncing)
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=103
@@ -111,6 +130,8 @@ Track: '11'
 Directory: phat11
 Artists:
 - Gabe Nezovic
+Contributors:
+- Bill Bolin (mastering, syncing)
 Duration: 0:28
 URLs:
 - https://youtu.be/S4x2-mkXgGI?t=116
@@ -201,6 +222,9 @@ Referenced Tracks:
 - Eight Melodies
 ---
 Track: Nic Cage Romance
+Additional Names:
+- Name: two shitty nic cage songs
+  Annotation: earlier MSPA credit, see also [[Nic Cage Song]]
 Artists:
 - Toby Fox
 Duration: '1:19'
@@ -256,26 +280,24 @@ URLs:
 Referenced Tracks:
 - Secret ROM
 ---
-Track: Flare (Cascade)
+Track: Flare (Cascade Cut)
+Duration: 3:12
 Artists:
 - Clark Powell
-Duration: '3:26'
-URLs:
-- https://plazmataz.tumblr.com/post/19774190658/download-flare-cascade-i-have-recut-and
-- https://www.youtube.com/watch?v=hT0ijIKJkbE
 Referenced Tracks:
-- Flare
 - Cascade (Beta)
-MIDI Project Files:
-- Title: MIDI by Unknown
-  Files:
-  - 'Flare (Cascade) - Unknown.mid'
+URLs:
+- https://www.youtube.com/watch?v=VYPMzHAYSRc
 Commentary: |-
-    <i>Clark Powell:</i>
-    I have recut and remastered my track Flare, as it was presented to you in the Cascade flash (rather than the calmed-down album version). I get asked a lot for this, so I decided to give it some extra love and attention.
-    I have attempted a number of times to put together a mix of Flare that utilized the distinctive crescendo that is recognizable from Cascade, but it never seems to work well without the cinematic context. The buildup sort of leads to nothing, and then the track either ends awkwardly or fades out, and I have something personal against fade-outs. Maybe I'll talk about that someday. But not now.
-    I gave it another go, this time trying a decrescendo to bring the song back down from all the energy it riles up, then ending it on kind of a creepy note. I had more success here than I ever have in past attempts to cut the song together in this way.
-    Flare was a pretty big hit in its own right, so there's always the pressure coming from the responsibility to handle this properly. I hope you enjoy it!
+    <i>Quasar Nebula:</i> (wiki editor)
+
+    Track name is as released <a href="https://web.archive.org/web/20180503070606/http://tindeck.com/users/Plasma">on Tindeck</a>.
+
+    There are three prominent early versions of Cascade. This track, "Cascade Cut", is possibly the first one produced, and is exactly the version featured in [[flash:4109]]; it fades out at the end, transitioning into [[Savior of the Dreaming Dead (Cascade Cut)]].
+
+    The second version is [[Flare]], the third track on [[album:homestuck-vol-8]], and it has an alternate ending without the dramatic confrontation between Snowman and Spades Slick, settling more calmly.
+
+    Finally, [[Flare (Cascade)]], a remaster - also by Clark Powell - which sought to turn the original into a full track of its own right. (This one got around sixteen thousand notes on Tumblr!)
 ---
 Track: Savior of the Dreaming Dead (Cascade Cut)
 Artists:
@@ -285,10 +307,15 @@ URLs:
 - https://www.youtube.com/watch?v=h9dF20s8SYo
 Referenced Tracks:
 - Savior of the Dreaming Dead
+- Penumbra Phantasm
 - Cascade (Beta)
+- Black Rose / Green Sun
+Sampled Tracks:
+- Black Rose / Green Sun
 Commentary: |-
     <i>Niklink:</i> (wiki editor)
-    Unofficial name. You see, originally [[track:flare-cascade]] was released as 'Flare (Cascade Cut)', so the same was appended by fans to the edited form of [[track:savior-of-the-dreaming-dead]] seen in [[track:cascade]]. Later on when 'Flare (Cascade Cut)' was revamped and release under simply 'Flare (Cascade)' the name for this one had already stuck, and remained that way since.
+
+    Unofficial name. You see, originally [[track:flare-cascade]] was released as [[track:flare-cascade-cut]], so the same was appended by fans to the edited form of [[track:savior-of-the-dreaming-dead]] seen in [[track:cascade]]. Later on when 'Flare (Cascade Cut)' was revamped and released under simply 'Flare (Cascade)' the name for this one had already stuck, and remained that way since.
 ---
 Track: Sick Bleats
 Artists:
@@ -471,6 +498,8 @@ Referenced Tracks:
 - Bronze Rebel
 ---
 Track: Trickster Mode (Engage)
+Additional Names:
+- Trickster Mode (earlier MSPA credit, see also [[Trickster Mode (Blast Off)]])
 Artists:
 - Toby Fox
 Duration: 0:10
@@ -483,6 +512,8 @@ Commentary: |-
     Unofficial name. Labeled simply as 'Trickster Mode' on the MSPA sound credits, albeit in conjunction with [[track:trickster-mode-blast-off|the other Trickster Mode track]].
 ---
 Track: Trickster Mode (Blast Off)
+Additional Names:
+- Trickster Mode (earlier MSPA credit, see also [[Trickster Mode (Engage)]])
 Artists:
 - Toby Fox
 Duration: 0:16
@@ -593,7 +624,7 @@ Referenced Tracks:
 Sampled Tracks:
 - them meows
 ---
-Track: not a creature was stirring
+Track: Not a creature was stirring
 Artists:
 - Alex Rosetti
 Duration: 0:59
diff --git a/artists.yaml b/artists.yaml
index 45833d4..5ce3fe6 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -4158,6 +4158,8 @@ Dead URLs:
 - https://www.youtube.com/user/kaviar101/
 ---
 Artist: Kevin Regamey
+Alias: 
+- afterthought
 ---
 Artist: Kezinox
 Aliases:
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index ed92b29..3921c69 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -35,6 +35,7 @@ Content: |-
     - added originally contest-entered names across [[album:coloUrs-and-mayhem-universe-a]] and [[album:coloUrs-and-mayhem-universe-b|Universe B]]
     - added variations on Bandcamp and before album release to [[track:skaian-overdrive]] (thanks, Lilith!)
     - added in-game names across [[album:hiveswap-friendsim]]
+    - added MSPA credit names for [[track:windchime-foley]], [[track:showtime-imp-strife-mix]], [[track:skaian-dreams-remix]], [[track:upward-movement-dave-owns]], [[track:beatdown-strider-style]], [[track:dissension-original]], [[track:john-sleeps-skaian-magicant]], [[track:bed-of-roses-dreams-of-derse]], [[track:how-do-i-live-bunny-back-in-the-box-version]], [[track:nic-cage-romance]], [[track:nic-cage-song]], [[track:let-the-squiddles-sleep-end-theme]], [[track:black-rose-green-sun]], [[track:unlabeled]], [[track:eternity-served-cold]], [[track:trickster-mode-engage]], [[track:trickster-mode-blast-off]], [[track:not-a-creature-sturring]] (thanks, Niklink!)
     - added original names across tracks by [[artist:jebb]] (mostly [[album:lofam5a2]]), plus some more in [[album:sunday-night-strifin-act-1-plus-2-ost]] (thanks, Jebb!)
     - added original and alternate names for [[track:woman-i-never-met]], [[track:puzzle-i-never-solved]], [[track:apexhalation]], [[track:the-new-crew]] (thanks, Lilith!)
     - added English-localized names to [[track:letat-de-lambivalence]], [[track:ira-quod-angelus]], [[track:ave-dei-novi]], [[track:confinis]], [[track:bagarre-unfinished]], [[track:yo-quiero-la-homestuck]], [[track:wieczna-wiedza]]
@@ -57,8 +58,16 @@ Content: |-
     - fixed typos and minor tweaks in commentary for more tracks: [[track:stab-stab-stab-lofam5]], [[track:furthest-ringside]] (thanks, Jebb!)
     - fixed [[track:trollcops-radio-play]] referencing [[track:trollcops]], now the other way around
     - fixed [[track:woman-i-never-met]] not referencing [[track:serenade-vol8]]
+    - fixed [[track:psych0ruins]] not referencing [[track:judgment-day]] (thanks, Lilith!)
+    - fixed [[track:not-a-creature-was-stirring]] being named "not a creature was stirring" (different capitalization)
+    - fixed [[track:phat1]], [[track:phat2]], [[track:phat3]], [[track:phat4]], [[track:phat5]], [[track:phat8]], [[track:phat9]], [[track:phat10]], and [[track:phat11]] not crediting [[artist:bill-bolin]] (for mastering and syncing)
     - fixed duration of [[track:song-of-storms]] (thanks, Geese!)
-    - added [[track:psych0ruins]] to references for [[track:judgment-day]] (thanks, Lilith!)
+    - various fixes for tracks featured in [[track:cascade]]:
+        - fixed [[track:savior-of-the-dreaming-dead-cascade-cut]] not referencing [[track:penumbra-phantasm]] and [[track:black-rose-green-sun]] (thanks, Grace!)
+        - added [[track:flare-cascade-cut]] as a new unreleased track
+        - added [[track:flare-cascade-cut]] to reference lists of [[track:flare]], and [[track:flare-cascade]] (replacing [[track:flare]]), and [[track:cascade]] (replacing [[track:flare-cascade]])
+        - moved [[track:flare-cascade]] out of [[album:unreleased-tracks]] and into [[album:more-homestuck-fandom]]
+        - listed referenced tracks in [[track:cascade]] also as sampled tracks
     - added [[artist:fruitytee]] to credits for [[track:nothing-special]] and [[track:twelve-by-twelve]]
     - changed [[artist:toby-fox]]'s credit on [[track:fiduspawn-go]] from contributor to co-artist
     - changed [[artist:nick-smalley]]'s credit on [[track:trollcops-radio-play]] from contributor to (lyrical) co-artist