meulanie fixes mostly!

6 files changed, 52 insertions, 28 deletions

diff --git a/album/coloUrs-and-mayhem-universe-a.yaml b/album/coloUrs-and-mayhem-universe-a.yaml
index f71082e9..152374aa 100644
--- a/album/coloUrs-and-mayhem-universe-a.yaml
+++ b/album/coloUrs-and-mayhem-universe-a.yaml
@@ -782,7 +782,6 @@ Color: '#a1a100'
 URLs:
 - https://homestuck.bandcamp.com/track/gold-mage
 - https://youtu.be/IY9mF06ZVFI
-- https://soundcloud.com/103_records/repeatedscales-gold-mage-2011
 Cover Artists:
 - Prassio
 Cover Art File Extension: png
@@ -790,7 +789,7 @@ Art Tags:
 - Sollux
 - 'cw: body horror'
 Commentary: |-
-    <i>Decon Theed, repeatedScales|[[artist:repeatedscales]]:</i> ([SoundCloud description](https://soundcloud.com/103_records/repeatedscales-gold-mage-2011), 6/27/2017)
+    <i>Decon Theed, repeatedScales|[[artist:repeatedscales]]:</i> (SoundCloud description - [dead link](https://soundcloud.com/103_records/repeatedscales-gold-mage-2011), 6/27/2017)
 
     Yes, I'm still amused by the fact that the comments on the most popular YouTube upload of this song essentially consist of nothing but "THIS REMINDS ME OF X GAME".
 
diff --git a/album/hiveswap-act-2-ost.yaml b/album/hiveswap-act-2-ost.yaml
index cf1528c9..9f37633a 100644
--- a/album/hiveswap-act-2-ost.yaml
+++ b/album/hiveswap-act-2-ost.yaml
@@ -196,6 +196,7 @@ Artists:
 - Clark Powell
 Duration: 3:28
 URLs:
+- https://homestuck.bandcamp.com/track/objection
 - https://youtu.be/a2NMBLlE7aw
 ---
 Track: Cross Examination
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index 7e9d656b..5b9cc249 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -927,7 +927,7 @@ Commentary: |-
 
     ¯\\\_(ツ)_/¯
 
-    <i>cookiefonster, Marcy Nabors|[[artist:marcy-nabors]]:</i> ([YouTube comments](https://www.youtube.com/watch?v=BiYdzIFLdcs, 10/11/2016 - 12/15/2016)
+    <i>cookiefonster, Marcy Nabors|[[artist:marcy-nabors]]:</i> ([YouTube comments](https://www.youtube.com/watch?v=BiYdzIFLdcs), 10/11/2016 - 12/15/2016)
 
     > *[[artist:cookiefonster]]:* so where exactly are the vocals in this song
 
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 9a777450..432d0e6d 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -1,3 +1,4 @@
+
 Album: References Beyond Homestuck
 Has Track Numbers: false
 Groups:
@@ -5184,7 +5185,7 @@ Artists:
 Duration: 2:50
 URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/ddbd8a8d-5e88-47fb-94fb-788b39bb587a
-- https://youtu.be/vJIjtjGUR9Q?t=2447
+- https://www.youtube.com/watch?v=SCrCmlrmHqg
 Referenced Tracks:
 - Toccata and Fugue in D minor
 ---
@@ -9442,7 +9443,7 @@ Artists:
 - Takako Hirasawa
 Duration: 4:16
 URLs:
-- https://www.youtube.com/watch?v=o9y6oGe8V-g
+- https://www.youtube.com/watch?v=vi8wcm6miHg
 Lyrics: |-
     Say "Alright!" (Alright!)
     Say "Oh yeah!" (Oh yeah!)
@@ -9741,7 +9742,7 @@ Artists:
 Duration: 2:48
 URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/7e1af7a5-cca1-4f71-85cf-08d7da1a356f
-- https://youtu.be/vJIjtjGUR9Q?t=401
+- https://www.youtube.com/watch?v=lc9B5GkWw94
 ---
 Track: Slinger's Song
 # Official release:
@@ -10780,6 +10781,23 @@ URLs:
 Referenced Tracks:
 - Korobeiniki
 ---
+Track: The Ultimate Show
+# Very few tracks from Super Paper Mario received an official release,
+# but this one did! Name seems to be an unofficial localization.
+# JP: サイコーのショー
+# Official release:
+#   THE YEAR OF LUIGI SOUND SELECTION
+#   ザ・イヤー・オブ・ルイージ サウンドセレクション
+# Reference:
+#   https://vgmdb.net/album/40433
+Duration: 2:56
+Artists:
+- Super Mario
+- Naoko Mitome
+- Chika Sekigawa
+URLs:
+- https://youtu.be/fWN3SwGqs5s?t=1349
+---
 Track: U.N. Owen Was Her?
 # Also known as Death Waltz
 # JP: U.N.オーエンは彼女なのか？
@@ -13573,7 +13591,7 @@ Contributors:
 - Aerosmith (performance in Armageddon)
 Duration: 4:59
 URLs:
-- https://www.youtube.com/watch?v=Us3cGQs0Q8A
+- https://www.youtube.com/watch?v=YZSGRv02THg
 Lyrics: |-
     I could stay awake just to hear you breathin'
     Watch you smile while you are sleeping
@@ -18621,7 +18639,7 @@ Track: La Cucaracha
 Artists:
 - Traditional
 URLs:
-- https://www.youtube.com/watch?v=cQLCJsIof8s
+- https://www.youtube.com/watch?v=PFha6F4M3Xw
 Lyrics: |-
     La cucaracha, la cucaracha (<i>The cockroach, the cockroach</i>)
     Ya no puede caminar (<i>Can no longer walk</i>)
@@ -34348,6 +34366,7 @@ Artists:
 Duration: 2:29
 URLs:
 - https://www.youtube.com/watch?v=sPD59NTahc0
+- https://www.youtube.com/watch?v=pLPEVxZvRDg # leggo my bootleggo
 # Sampled Tracks:
 # - check whosampled
 ---
@@ -46387,23 +46406,6 @@ Lyrics: |-
     The yellow tape surrounds the fate
     Don't have a face, so now you late, open the gates
 ---
-Track: The Ultimate Show
-# Very few tracks from Super Paper Mario received an official release,
-# but this one did! Name seems to be an unofficial localization.
-# JP: サイコーのショー
-# Official release:
-#   THE YEAR OF LUIGI SOUND SELECTION
-#   ザ・イヤー・オブ・ルイージ サウンドセレクション
-# Reference:
-#   https://vgmdb.net/album/40433
-Duration: 2:56
-Artists:
-- Super Mario
-- Naoko Mitome
-- Chika Sekigawa
-URLs:
-- https://youtu.be/fWN3SwGqs5s?t=1349
----
 Track: The Ultimate Showdown of Ultimate Destiny
 Artists:
 - Neil Cicierega
@@ -47110,7 +47112,7 @@ Artists:
 - Rik Simpson (production)
 Duration: 4:02
 URLs:
-- https://www.youtube.com/watch?v=zOQ4ld6NsXE
+- https://www.youtube.com/watch?v=ALsvdSA9tOU
 Lyrics: |-
     I used to rule the world
     Seas would rise when I gave the word
diff --git a/flashes.yaml b/flashes.yaml
index d7181923..ab4cec0b 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -1603,6 +1603,18 @@ URLs:
 Featured Tracks:
 - track:carne-vale
 ---
+Act: Act 6 Act 6 Act 4 - DARK NIGHT OF THE FEELINGS
+Directory: a6a6a4
+Color: '#2ed73a'
+---
+Flash: '[S] BYE FOREVER, ALMOST.'
+Page: '6943'
+Date: November 1, 2014
+# Not in [S] 'Homestuck - All flashes' list
+Cover Art File Extension: png
+Featured Tracks:
+- Warhammer of Zillyhoo
+---
 Act: 'Act 6 Act 6 Intermission 4 - <span style="color: #008b8b">F1X TH1S</span>'
 Directory: a6a6i4
 Color: '#4466ff'
@@ -1988,7 +2000,7 @@ Date: April 13, 2018
 Featured Tracks:
 - Breeding Duties
 - Moonshine
-Flash: Of Bloodthurst and Bratwurst
+Flash: Of Bloodthirst and Bratwurst
 ---
 Directory: fs-vol2
 Contributors:
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 740e6bd5..31c509ef 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -172,6 +172,7 @@ Content: |-
     - added [[album:solitary-confinement-in-nothing]] by [[artist:jmaa]]! (thanks, Jebb!)
     <h3>other additions</h3>
     <!-- flash additions -->
+    - added [[flash:6943]] (thanks, Meulanie, Lavender!)
     - added [[flash:darkcage]] and [[flash:darkcage2]] secret pages (thanks, Tangle!)
     - added [[flash:combustion]] and [[flash:body-mind-soul]] flashes from [[group:desynced]] (thanks, Jebb!)
     - added [[flash:sweet-rave-party2]] art collab (thanks, Lan!)
@@ -193,7 +194,7 @@ Content: |-
     - added Tumblr WIP commentary for [[track:dord-waltz]] (thanks, Lilith!)
     - added missing paragraphs and structure to Tumblr commentary for [[track:dord-waltz]] (thanks, Lilith!)
     - added Tumblr commentary ([[date:7/15/2012]]) to [[track:ugly-betty]] (thanks, Lilith, Lan!)
-    - added YouTube commentary to [[track:solar-voyage]] (thanks, wertercatt, Lan!)
+    - added YouTube commentary to [[track:solar-voyage]] (thanks, wertercatt, Meulanie, Lan, Lavender!)
     - added SoundCloud commentary to [[track:heir-seer-knight-witch]] (thanks, Lan!)
     - added missing paragraphs to Tumblr album commentary for [[album:7th-gate-project]] (thanks, Lilith!)
     - added missing paragraph to Tumblr commentary for [[track:through-the-seventh-gate-land-of-heat-and-clockwork]] (thanks, Lilith!)
@@ -236,6 +237,7 @@ Content: |-
     - added official Bandcamp listening links for solo albums [[album:mobius-trip-and-hadron-kaleido]], [[album:sburb]], [[album:prospit-and-derse]], [[album:song-of-skaia]], [[album:one-year-older]], and [[album:genesis-frog]] (thanks, Lan!)
     - added SoundCloud listening link to [[track:squiddle-march]] (thanks, Lilith, Lan!)
     - added SoundCloud listening link to [[track:dord-waltz]] (thanks, Lilith!)
+    - added Bandcamp listening link to [[track:objection]] (thanks, Meulanie, Lavender!)
     - added SoundCloud listening link to [[track:heir-seer-knight-witch]] (thanks, Lilith, Lan!)
     - added YouTube and SoundCloud listening links to [[track:two-sweeps-older]], [[track:purple-hot-mess]], [[track:a-narrative-force]], [[track:idle-playthings-mimis-music]], [[track:corruptedcultist]], [[track:perfection-vast-error]], [[track:two-spooks-greater]], [[track:spawn-of-scribes-shadow]], [[track:the-hotel-california-lounge]], [[track:kheparia]], and across [[album:faux-dramatica]] (thanks, Lilith!)
     - added Apple Music listening links to [[album:agents-of-reality]] (thanks, Lan!)
@@ -326,6 +328,7 @@ Content: |-
     - removed "(…) - Single" additional names automatically enforced on Apple Music and iTunes platforms, affecting [[track:black-richaadeb]], [[track:heir-of-grief-richaadeb]], [[track:dance-of-thorns-richaadeb]], [[track:oppa-toby-style]] (all [[artist:richaadeb]]), and [[album:dreamers-diarchy]] (thanks, Whisper, ruby!)
     - removed dead link in commentary for [[track:threxecute]] (thanks, Lilith!)
     - removed dead Bandcamp listening links across [[album:the-strider-mixtape]] (thanks, Geese, Lilith!)
+    - removed dead SoundCloud listening link for [[track:gold-mage]] (thanks, Meulanie, Lavender!)
     - removed dead Bandcamp listening links for [[track:ascending-strife]], [[track:avarice-paradox-music-team]], [[track:candlelit-contemplation-beta]], [[track:deception-paradox-music-team]], [[track:proletariat-paradox-music-team]], [[track:spritely-gardener-beta]], [[track:vexation-paradox-music-team]], and [[track:wilyesp-remix-attempt-wip]] (thanks, Lilith!)
     - removed dead SoundCloud listening link for [[track:bloodsucker-brawl]] (thanks, Lan!)
     - removed Deezer listening links for [[track:pale-rain]] and [[track:celestial]], and reordered links for [[track:pale-rain]] to fit wiki standard (thanks, Lan!)
@@ -408,6 +411,8 @@ Content: |-
     - fixed [[track:never-gonna-give-you-up]] crediting [[artist:stock-aitken-waterman]] as artist and [[artist:rick-astley]] as contributor, instead of the reverse (thanks, Lan!)
     <!-- merged artists -->
     - fixed [[artist:domble]] having some credits under another name (thanks, Makin, Lan!)
+    <!-- track section fixes -->
+    - fixed [[track:the-ultimate-show]] being placed in [[album:references-beyond-homestuck]] under "Other music originating outside Homestuck", instead of under "Music from video games" (thanks, Lilith, Lavender!)
     <!-- name fixes (subsections) -->
     - fixed some tracks' names not aligning with the Nintendo Music app: (thanks, ruby!)
         - fixed [[track:time-for-a-breather]] being named "Take a Break"
@@ -482,6 +487,7 @@ Content: |-
     - fixed [[track:danger-on-the-dance-floor-mid-boss]] being named "Danger on the Dance Floor (Mid-Boss)" (to align with soundtrack release; thanks, ruby!)
     - fixed [[track:chasing-it-down]] being named "Chasing It down" (lowercase "Down"; thanks, Lan!)
     - fixed [[track:does-it-look-like-im-here]] being named "Does it Look Like I'm Here?" (lowercase "it"; thanks, Lan!)
+    - fixed [[flash:fs-vol1]] being named "Of Bloodthurst and Bratwurst" ("Bloodthurst" instead of "Bloodthirst"; thanks, Meulanie, Lilith, Lavender!)
     - fixed [[tag:astronomical-bodies-canwc]] being named "Astronomical Bodies (CaNWC)" (uppercase "Bodies"; thanks, Lan!)
     <!-- general data fixes -->
     - fixed duration of various tracks to align with Nintendo Music: (thanks, ruby!)
@@ -570,7 +576,11 @@ Content: |-
     - fixed YouTube listening links linking to tracks with playlist attached, across [[album:oceanfalls-vol-2]], [[album:oceanfalls-vol-4]] and [[album:oceanfalls-vol-five]] (thanks, Lilith!)
     - replaced dead YouTube listening link for [[track:gasters-theme]] and added undertale.wiki link here (thanks to an emailer, wertercatt, ruby, Lan!)
     - replaced dead YouTube listening links for [[track:bad-apple]] ([[artist:zun]]) and [[track:bad-apple-lovelight]] (feat. [[artist:nomico]]; thanks, Lan, bit, Cello!)
+    - replaced dead YouTube listening links for [[track:the-final-battle-super-mario-64]], [[track:say-i-gotta-believe]], [[track:slider-super-mario-64]], and [[track:i-dont-want-to-miss-a-thing-aerosmith]] (thanks, Meulanie, Lavender!)
     - replaced dead YouTube listening links for [[track:game-start-donkey-kong]], [[track:game-start-donkey-kong-jr]], [[track:hammer-bgm-donkey-kong]], [[track:hurry-up-donkey-kong]], [[track:palace-theme]], [[track:round-1-and-2-clear-donkey-kong]], [[track:round-1-bgm-donkey-kong]], [[track:round-1-bgm-donkey-kong-jr]], [[track:round-1-clear-donkey-kong-jr]], [[track:round-3-bgm-donkey-kong]], [[track:round-3-clear-donkey-kong]], [[track:round-4-bgm-donkey-kong-jr]], and [[track:round-4-clear-all-clear-donkey-kong-jr]] (thanks, ruby!)
+    - replaced dead YouTube listening link for [[track:la-cucaracha]] (thanks, Meulanie, Niklink, Lavender!)
+    - replaced limited-availability YouTube listening link for [[track:viva-la-vida]] with better one (thanks, Meulanie, ruby, Lavender!)
+    - supplemented limited-availability YouTube listening link for [[track:life-in-technicolor]] with unofficial one (thanks, Meulanie, ruby, Lavender!)
     - removed dead Bandcamp listening link for [[album:bl1nd-just1c3-1nv3st1g4t1on-soapstone]] (thanks, Lilith, Lan!)
     - removed dead YouTube listening links for [[track:destiny-ablaze]], [[track:id-purpose]], and [[track:prelude-ablaze]] (thanks, Lan!)
     <h3>directory changes</h3>