moved various fixes from official-album-capitalizations

fixes formatting of Touchtone Telephone to Touch-Tone Telephone
adds Boy Meets Girl to references and samples in MEGALOVANIA FUSION COLLAB
transfers Chronic Infection (now classified as a rerelease)'s references to Infection 2, with SoundCloud commentary also added to Infection 2, and Hankage Fantazumu 2
adds cookiefonster's Chronic Jungle (Redone), replaces chronic jungle as reference for Infection 2
added Difarem as artist for Hankage Fantazumu 2
added alternative title for In the Beginning (basement tale) from bandcamp commentary (Proto-CONTACT)
added missing vocal dialogue in vs bros (How much further can he go at this?) and added character names to it and "He's gonna run out of words sometime!", based on Toby's voices for those lines

7 files changed, 79 insertions, 134 deletions

diff --git a/album/_.yaml b/album/_.yaml
index c60dd781..31bdb904 100644
--- a/album/_.yaml
+++ b/album/_.yaml
@@ -650,8 +650,7 @@ Sampled Tracks:
 - Windows SFX
 ---
 Track: Chronic Infection
-Artists:
-- Difarem
+Originally Released As: Infection 2
 Cover Artists:
 - Makin
 Art Tags:
@@ -667,9 +666,6 @@ Duration: '03:08'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/chronic-infection
 - https://youtu.be/tvwQwsK7_1o
-Referenced Tracks:
-- track:infection-canmt
-- Chronic Jungle
 ---
 Track: Obana Never Gives Up
 Artists:
diff --git a/album/anthology-i.yaml b/album/anthology-i.yaml
index fe8bc4fa..486a1154 100644
--- a/album/anthology-i.yaml
+++ b/album/anthology-i.yaml
@@ -339,7 +339,7 @@ Referenced Tracks:
 - track:escapade-desynced
 Sampled Tracks:
 - Hotline Bling
-- Touchtone Telephone
+- Touch-Tone Telephone
 URLs:
 - https://desynced.bandcamp.com/track/wrong-number
 - https://www.youtube.com/watch?v=AwCv-AkW26g
diff --git a/album/basement-tale.yaml b/album/basement-tale.yaml
index 27204d6a..3d5e2585 100644
--- a/album/basement-tale.yaml
+++ b/album/basement-tale.yaml
@@ -25,6 +25,8 @@ Commentary: |-
 ---
 Track: In the Beginning
 Directory: in-the-beginning-basement-tale
+Additional Names:
+- Proto-CONTACT (alternative name)
 Cover Artists:
 - olkiswerve
 Art Tags:
diff --git a/album/megalovania-fusion-collab.yaml b/album/megalovania-fusion-collab.yaml
index 9b7548c4..4d09b0d6 100644
--- a/album/megalovania-fusion-collab.yaml
+++ b/album/megalovania-fusion-collab.yaml
@@ -52,6 +52,7 @@ Referenced Tracks:
 - I absolutely loathe this Drummer.
 - Techno Boss Battle
 - Watch Me (Whip / Nae Nae)
+- Boy Meets Girl
 - How Do I Live (Bunny Back in the Box Version)
 - Flare
 - Gold Pilot
@@ -89,6 +90,7 @@ Sampled Tracks:
 - mm2wood
 - I absolutely loathe this Drummer.
 - Watch Me (Whip / Nae Nae)
+- Boy Meets Girl
 - How Do I Live (Bunny Back in the Box Version)
 - Gold Pilot
 - AAAAAAAAAAAAAA
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 4f17cb83..09abc52c 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -184,38 +184,12 @@ Duration: '2:27'
 URLs:
 - https://youtu.be/gbiS4WkCOVo?t=19078
 ---
-Track: Cheer up, Crabface, it's Hallowe'en
-Additional Names:
-- Cheer up, crabface, it's Halloween! (unofficial formatting, see commentary)
+Track: Cheer up, crabface, it's Halloween!
 Artists:
 - Malcolm Brown
 Duration: '2:07'
 URLs:
-- https://dragonxvi.tumblr.com/post/101437602443/another-music-doodle-today-is-there-a-word-for
 - https://www.youtube.com/watch?v=9nQIPA5KcNI
-Referenced Tracks:
-- Crustacean
-- Rex Duodecim Angelus
-Commentary: |-
-   <i>Malcolm Brown:</i> ([Tumblr](https://dragonxvi.tumblr.com/post/101437602443/another-music-doodle-today-is-there-a-word-for), 10/31/2014)
-
-   Another music doodle today. Is there a word for those? A Moodle? Muudle? Y'know what sod it it's a Musicoodle.
-
-   Figured I hadn't done any Halloweeny music on 'ere so whipped up another quick. 45 minutes! Although this one's cheating because it's full of [[track:crustacean|borrowed]] [[track:rex-duodecim-angelus|Homestuck]] stuff. It was goin' to be some kind of Underwater Level music originally but then I remembered "Oh yeah, Halloween" so here we are.
-
-   Also hey! That [[track:sound-judgement|Terezi track WIP]] I posted up a while back has had quite a bit of interest. Should have some good news for your guys come the inevitable [[album:homestuck-vol-10|VOLUME 10]] since I've been workin' on it since then, although at this point it's kind've in "Alternate Universe"-ville given the current state of affairs and whatnot.
-
-   Right it's the weekend. Expect another Musicoodle over the weekend of some form. Might even hook up a keyboard and actually compose stuff live which is something I almost never do and really should.
-
-   Good weekend ya'll!
-
-   <i>Quasar Nebula:</i> (wiki editor)
-
-   Also unofficially called "Cheer up, crabface, it's Halloween!", which appears to originate from [this YouTube upload](https://www.youtube.com/watch?v=9nQIPA5KcNI) by Cri. Based on [this comment](https://www.youtube.com/watch?v=9nQIPA5KcNI&lc=UgyjeNL5FuLWeRBJt0p4AaABAg.8ZPBmlPLzXh8ZPO2ANyfw6)...
-
-   > I **WAS** going to add the source but I forgot, sorry. I got the entire Homestuck soundtrack from a download link I found from a thread on the wiki, and I don't know how to find it again due to not knowing exactly what I had searched for to find it. My fault all the way, sorry.
-
-   ...it seems Cri obtained this track from the sound test, or a similar source, rather than directly from the composer's Tumblr. This version of the name certainly *doesn't* originate from the sound test, where the track is instead called "Cheer up, Crabface, it's Halloween".
 ---
 Track: Clockwork Apocalypse
 Artists:
@@ -444,20 +418,6 @@ Referenced Tracks:
 - Rex Duodecim Angelus
 - Cascade (Beta)
 - Dissension (Original)
-Commentary: |-
-   <i>Malcolm Brown:</i> ([Tumblr](https://dragonxvi.tumblr.com/post/40423027190/canned-corner-flight-of-the-white-wolf-ahh), 1/13/2013)
-
-   <b>Canned Corner: Flight of the White Wolf</b>
-
-   Ahh, Flight of the White Wolf. This guy was in development for ages and basically supposed to be a kind of background track for PM vs Jack in their crazy god/wolf forms.
-
-   The reason it never got anywhere is for a few reasons: a) I never quite got the bit that begins at 0:42 right (That whole section went through dozens of iterations, some with live guitar, some without the [[track:rex-duodecim-angelus|RDA]] reference etc.) and b) [[track:a-taste-for-adventure|A Taste Of Adventure]] was <b>infinitely</b> better as both an orchestral piece and a remix of [[track:dissension-original|Dissension]], so I binned it.
-
-   The only bit of this track I still really like (and may save for a future project ;) ) is 0:00 to 0:42 (Which returns right at the end). The rest of it I reckon's a bit meh (Although some of the percussion I like).
-
-   Also since there's no reference to [[track:black]] or anything Jack-esque then it's even less suitable for the original goal. It's still a "reasonably" ok track, but alas didn't make the cut.
-
-   Hope you guys enjoy it!
 ---
 Track: Flow
 Directory: flow-solatrus
@@ -1093,19 +1053,9 @@ Artists:
 - Toby Fox
 Duration: '2:23'
 URLs:
-- https://fwugradiation.tumblr.com/post/36687851465/valor-a-combination-of-the-original-showtime-and
 - https://www.youtube.com/watch?v=hWuL95g9kzs
 Referenced Tracks:
-- Showtime (Original Mix)
 - Dissension (Original)
-Commentary: |-
-   <i>Toby Fox:</i> ([Tumblr](https://fwugradiation.tumblr.com/post/36687851465/valor-a-combination-of-the-original-showtime-and), 11/27/2012)
-
-   "Valor"
-
-   A combination of the [[track:showtime-original-mix|original Showtime]] and [[track:dissension-original|Dissension]] I made to serve as a strife theme for Jake English a year ago. I was actually going to make strife tunes for all of the alpha kids, but I was worried that Valor might be feel repetitive with [[track:assault|Assault]] on the same album. Then Bowman made [[Elephant Gun]] and I just stopped working on it.
-
-   Interestingly this file was last modified on 11/5/11.
 ---
 Track: Where making this hapen
 Artists:
@@ -1974,6 +1924,29 @@ Commentary: |-
     <i>Mathias Ramalho:</i> (Composer)
     Made for a MSPA-styled, DnD Session, named "Colored Castles"
 ---
+Track: Thunderhead
+Directory: thunderhead-loftlocked
+Always Reference By Directory: true
+Artists:
+- Veritas Unae
+Duration: '3:21'
+URLs:
+- https://loftlocked.bandcamp.com/track/thunderhead
+Commentary: |-
+    <i>Veritas Unae:</i> ([SoundCloud description](https://soundcloud.com/veritasunae/thunderhead))
+
+    I made a song at the request of [[artist:patmandx|Pat]] for his fan adventure, Loftlocked. The song is very chaotic, representing a world dominated by an [REDACTED] thunderstorm. I tried to bring a balance between tranquility and complete rage, counterbalancing the world of the player with the player [REDACTED].
+
+    I used Sibelius and Pro Tools SE for this.
+
+    <i>Kevin Grant:</i> ([SoundCloud comment](https://soundcloud.com/veritasunae/thunderhead))
+
+    Whoa, people still make HS fanmusic? Is it 2011? Where am I what's going on who are these nice men in the suits taking me away
+
+    <i>Veritas Unae:</i> ([SoundCloud comment](https://soundcloud.com/veritasunae/thunderhead))
+
+    considering people still make HS fanventures... yeah, I guess so. oh wait where are you going oh goodbye friend i hope you enjoy your trip!!
+---
 Track: Vacuum Spark
 Artists:
 - Monckat
@@ -2143,12 +2116,25 @@ Section: From the Cool and New Music Team
 ---
 Track: 半影の復帰
 Directory: hankage-fantazumu-2
+Additional Names:
+- Name: >-
+    半影の復帰 (Vol. 11 Cut (kinda))
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/difarem/vol-11-cut)
+Artists:
+- Difarem
 Duration: '1:55'
 URLs:
 - https://soundcloud.com/difarem/vol-11-cut
 Referenced Tracks:
 - Penumbra Phantasm
 Commentary: |-
+    <i>Difarem:</i> ([SoundCloud](https://soundcloud.com/difarem/vol-11-cut), 7/20/2018)
+    https://coolandnewwebcomic.bandcamp.com/track/penumbra-phantasm-extended
+    Track art by [[artist:nights]]
+
+    will i ever finish this? find out never
+
     <i>Makin:</i>
     This is an unfinished version of the song known as "Hankage Fantazumu 2", which was never finished.
 ---
@@ -2176,6 +2162,28 @@ Duration: '1:46'
 URLs:
 - https://hsmusic.wiki/media/misc/archive/cannon%20in%20d%20bad%20edition.mp3
 ---
+Track: Chronic Jungle (Redone)
+Additional Names:
+- Name: >-
+    call and new 2 - Chronic Jungle (Redone)
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/cookie-fonster/call-and-new-2-chronic-jungle-redone)
+Artists:
+- cookiefonster
+Duration: '1:30'
+URLs:
+- https://soundcloud.com/cookie-fonster/call-and-new-2-chronic-jungle-redone
+Referenced Tracks:
+- Chronic Jungle
+Commentary: |-
+    <i>cookiefonster:</i> ([SoundCloud](https://soundcloud.com/cookie-fonster/call-and-new-2-chronic-jungle-redone), 5/29/2017)
+
+    [[artist:discfortune|crypt]] said chronic jungle from [[album:call-and-new-2-locomotif|call and new 2]] sounded exactly like all my other music from that time (i made that thing in fucking november) so i redid it by remixing the same songs but with actual thought into it so its really a completely different song. i still made it in about an hour total but i like to think im good at music now.
+
+    im not redoing my other song [[track:bolins-cereal-journey|(bolin's cereal journey)]] because even though i dont like that song either i dont see much "couldve been better/more interesting" in it either. i mean its already hard enough to make [[artist:splitsuns|splitsuns]] better and i failed in that but at least made a maybe more interesting rack. its still a minute long track i made in an hour but my mind tells me this time the track isnt complete shit.
+    
+    in any case this is the first actual song i made and finished in just over two months so yay for that. it was a good musical exercise
+---
 Track: concherto for jhon (in K majer)
 Artists:
 - CogentInvalid
@@ -2257,6 +2265,17 @@ Artists:
 Duration: '3:09'
 URLs:
 - https://soundcloud.com/difarem/infection-2
+Referenced Tracks:
+- track:infection-canmt
+- Chronic Jungle (Redone)
+Commentary: |-
+    <i>Difarem:</i> ([SoundCloud](https://soundcloud.com/difarem/infection-2), 8/15/2017)
+
+    In the same vein as cookie's chronic jungle remake ([Cookie-fonster - Call-and-new-2-chronic-jungle-redone](https://soundcloud.com/cookie-fonster/call-and-new-2-chronic-jungle-redone)), here is [[track:infection-canmt]] (one of my three call and new 2 tracks) as I would have done it today (also incorporating elements from cookie's new track). I've been actually working on this for a couple months! Well, except the part from 1:57, that's last week's work.
+
+    For comparison, here's the original: [Difarem - Infection](https://soundcloud.com/difarem/infection)
+
+    Art by [[artist:hadron|HadronKalido]]
 ---
 Track: Monody
 Artists:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 951aad71..35a97378 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -3677,16 +3677,6 @@ Duration: '2:05'
 URLs:
 - https://www.youtube.com/watch?v=6cuDFYZXw0c
 ---
-Track: Dark Mountain Forest
-# Reference:
-#   https://vgmdb.net/album/885
-Artists:
-- The Legend of Zelda
-- Koji Kondo
-Duration: '1:52'
-URLs:
-- https://www.youtube.com/watch?v=jGbhi5U4Qb0
----
 Track: 'Chapter 20: Destroyed Skyworld'
 # Reference:
 #   https://vgmdb.net/album/33508
@@ -3712,16 +3702,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=TNfItV62gD8
 ---
-Track: 'Dark World (The Legend of Zelda: A Link to the Past)'
-# Reference:
-#   https://vgmdb.net/album/885
-Artists:
-- The Legend of Zelda
-- Koji Kondo
-Duration: '2:23'
-URLs:
-- https://www.youtube.com/watch?v=sslj06K-Nlw
----
 Track: Death Mountain (The Legend of Zelda)
 # Reference:
 #   https://vgmdb.net/album/1430
@@ -4089,16 +4069,6 @@ Duration: '1:44'
 URLs:
 - https://www.youtube.com/watch?v=Tud96HogGbo
 ---
-Track: Dr. Wily Stage 1
-# Reference:
-#   https://vgmdb.net/album/33749
-Artists:
-- Mega Man
-- Takashi Tateishi
-Duration: '2:45'
-URLs:
-- https://www.youtube.com/watch?v=aTbfpkByIM8
----
 Track: Duck Get! (Duck Hunt)
 # Reference:
 #   https://vgmdb.net/album/1424
@@ -13504,50 +13474,6 @@ Duration: '4:01'
 URLs:
 - https://www.youtube.com/watch?v=Sv93yQE8bRo
 ---
-Track: Ride on the Magic School Bus
-Artists:
-- Magic School Bus
-- Peter Lurye (composition)
-Contributors:
-- Little Richard (performance)
-Duration: '1:02'
-URLs:
-- https://www.youtube.com/watch?v=v53mhRXXT2g
-Lyrics: |-
-   (Seatbelts, everyone!)
-   (Please let this be a normal field trip...)
-   (With the Friz?)
-   (No way!)
-   (Aw...)
-
-   Cruising on that main street
-   You're relaxed, and feeling good (Yeah!)
-   Next thing that you know
-   You're seeing (Wah-ha-ha-ha-hoo!)
-   An octopus in the neighborhood?
-
-   Surfing on a sound wave
-   Swinging through the stars (Yeehaw!)
-   Take a left at your intestine
-   Take your second right past Mars
-   On the Magic School Bus
-   Navigate a nostril (Achoo!)
-
-   Climb on the Magic School Bus
-   Spank a plankton too (Take that!)
-   On our Magic School Bus
-   Raft a river of lava
-   On the Magic School Bus
-   It's such a fine thing to do (Woahhh!)
-
-   So strap your bones right to your seat
-   Come on, lean in, don't be shy (Come on!)
-   Just to make your day complete
-   You might get baked into a pie
-   On the Magic School Bus
-   Step inside, it's a wilder ride
-   Come on, ride on the Magic School Bus
----
 Track: Rose's Death
 Artists:
 - Cocoon
@@ -42204,7 +42130,7 @@ Lyrics: |-
     明くる日も明くるくる日も確かめ進め！
     うおりゃー！
 ---
-Track: Touchtone Telephone
+Track: Touch-Tone Telephone
 Artists:
 - Neil Cicierega
 Duration: '4:42'
diff --git a/album/the-baby-is-you.yaml b/album/the-baby-is-you.yaml
index a22cf93e..e6242a02 100644
--- a/album/the-baby-is-you.yaml
+++ b/album/the-baby-is-you.yaml
@@ -311,9 +311,9 @@ Lyrics: |-
     (BRO: How does it feel to be shut down by my superior rapping techniques? I will show you the power of the forbidden rhyme... words that rhyme with THEMSELVES!)
 
     Hat, hat
-    Cat, cat
+    Cat, cat (JOHN: How much further can he go at this?)
     Bat, bat
-    Bat, bat (He's gonna run out of words sometime!)
+    Bat, bat (DAVE: He's gonna run out of words sometime!)
     Oops, I said something wrong 'cuz I'm stupid
     Uh, uh, uh, uh
     I don't, I didn't even write anything for this part