official samples + fixes

mainly bolin fixes + some hsgaiden fixes

19 files changed, 112 insertions, 13 deletions

diff --git a/album/alternia.txt b/album/alternia.txt
index 5811ba5d..e7f8048c 100644
--- a/album/alternia.txt
+++ b/album/alternia.txt
@@ -193,6 +193,8 @@ Commentary:
 Track: Walls Covered in Blood
 Track Art: lime-time
 Duration: 2:00
+Samples:
+- Mario Paint
 Art Tags:
 - Nepeta
 - Nepeta's lusus
diff --git a/album/alterniabound.txt b/album/alterniabound.txt
index f29ea1fa..0789c8a2 100644
--- a/album/alterniabound.txt
+++ b/album/alterniabound.txt
@@ -35,7 +35,11 @@ Track: Arisen Anew
 Artist: Tensei
 Track Art: vorpos
 Duration: 2:55
-References: psych0ruins, My Little Pony Theme
+References:
+- psych0ruins
+- My Little Pony Theme
+Samples:
+- Dr. Who
 Art Tags:
 - Aradia
 URLs:
@@ -701,6 +705,10 @@ References:
 - track:MeGaLoVania
 - Courser
 - Guile's Theme
+Samples:
+- King of the Hill
+- X-Men: Children of the Atom
+- X-Men vs. Street Fighter
 Art Tags:
 - Sollux
 - cw: blood
diff --git a/album/homestuck-vol-1-4.txt b/album/homestuck-vol-1-4.txt
index 865df204..08b2f931 100644
--- a/album/homestuck-vol-1-4.txt
+++ b/album/homestuck-vol-1-4.txt
@@ -179,6 +179,8 @@ Artist: Gabe Nezovic
 Duration: 2:02
 References:
 - track:showtime-piano-refrain
+Samples:
+- track:showtime-piano-refrain
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-remix-3
 - https://youtu.be/ENWA9aNEkXk
@@ -188,7 +190,9 @@ Directory: aggrieve-remix-vol-1-4
 AKA: track:aggrieve-remix
 Artist: Gabe Nezovic
 References:
-- track:aggrieve
+- track:aggrieve-violin-refrain
+Samples:
+- track:aggrieve-violin-refrain
 Duration: 2:11
 URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-remix-3
@@ -208,6 +212,8 @@ Artist: Robert J! Lake
 Duration: 3:25
 References:
 - track:verdancy-bassline
+Samples:
+- track:verdancy-bassline
 URLs:
 - https://homestuck.bandcamp.com/track/potential-verdancy-2
 - https://youtu.be/2W9Dd4RAiHo
@@ -301,6 +307,8 @@ Artist: Gabe Nezovic
 Duration: 2:00
 References:
 - track:explore
+Samples:
+- track:explore
 URLs:
 - https://homestuck.bandcamp.com/track/explore-remix-3
 - https://youtu.be/Zzf5NwkM8Ys
@@ -384,6 +392,8 @@ Artist: Robert J! Lake
 Duration: 6:29
 References:
 - track:three-in-the-morning
+Samples:
+- track:three-in-the-morning
 URLs:
 - https://homestuck.bandcamp.com/track/three-in-the-morning-rjs-i-can-barely-sleep-in-this-casino-remix-3
 - https://youtu.be/NutIhwWDqpc
@@ -425,13 +435,31 @@ Artist: Toby Fox
 Duration: 2:24
 Art Tags: cw: blood
 References:
-- track:im-a-member-of-the-midnight-crew
 - track:liquid-negrocity
+Samples:
+- track:im-a-member-of-the-midnight-crew
 URLs:
 - https://homestuck.bandcamp.com/track/black-3
 - https://youtu.be/dJ7H7MkL1Yk
 Lyrics:
     Make her a member of the Midnight Crew!
+
+    I'm a member of the-
+    I'm a member of the-
+    I'm a member of the Midnight Crew!
+
+    I'm a member of the-
+    I'm a member of the-
+
+    I'm a member of the-
+    I'm a member of the Midnight Crew!
+    I'm a member of the-
+    I'm a member of the Midnight Crew!
+
+    I'm a member of the-
+    I'm a member of the Midnight Crew!
+    I'm a- I'm a- I'm a member of the-
+    I'm a member of the Midnight Crew!
 -------------------------------------------------------------------------------
 Group: Bonus tracks
 -------------------------------------------------------------------------------
diff --git a/album/homestuck-vol-1.txt b/album/homestuck-vol-1.txt
index e026b59e..98882f0b 100644
--- a/album/homestuck-vol-1.txt
+++ b/album/homestuck-vol-1.txt
@@ -52,6 +52,8 @@ Artist: Michael Guy Bowman
 Duration: 1:36
 References:
 - track:sburban-jungle
+Samples:
+- track:sburban-jungle
 URLs:
 - https://youtu.be/DKmXadfEnog
 -------------------------------------------------------------------------------
diff --git a/album/homestuck-vol-2.txt b/album/homestuck-vol-2.txt
index 47d88ca5..0af4f190 100644
--- a/album/homestuck-vol-2.txt
+++ b/album/homestuck-vol-2.txt
@@ -18,7 +18,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/harlequin-rock-version-3
 - https://youtu.be/g5TDTcMEL_c
 -------------------------------------------------------------------------------
-Track: Skaian Dreams Remix
+Track: Skaian Dreams (Remix)
 Artist: Bill Bolin
 Duration: 1:30
 References:
@@ -68,6 +68,8 @@ Artist: Gabe Nezovic
 Duration: 2:02
 References:
 - track:showtime-piano-refrain
+Samples:
+- track:showtime-piano-refrain
 URLs:
 - https://homestuck.bandcamp.com/track/showtime-remix-3
 - https://youtu.be/VliU0X6XVpA
@@ -75,7 +77,9 @@ URLs:
 Track: Aggrieve Remix
 Artist: Gabe Nezovic
 References:
-- track:aggrieve
+- track:aggrieve-violin-refrain
+Samples:
+- track:aggrieve-violin-refrain
 Duration: 2:11
 URLs:
 - https://homestuck.bandcamp.com/track/aggrieve-remix-3
@@ -91,4 +95,6 @@ URLs:
 Track: Kinetic Verdancy
 Artist: Bill Bolin
 Duration: 1:30
+References:
+- track:verdancy-bassline
 Has URLs: no
diff --git a/album/homestuck-vol-3.txt b/album/homestuck-vol-3.txt
index f58da16b..3bc6b46f 100644
--- a/album/homestuck-vol-3.txt
+++ b/album/homestuck-vol-3.txt
@@ -97,6 +97,8 @@ Artist: Gabe Nezovic
 Duration: 2:00
 References:
 - track:explore
+Samples:
+- track:explore
 URLs:
 - https://homestuck.bandcamp.com/track/explore-remix-3
 - https://youtu.be/06qu70cLPaE
diff --git a/album/homestuck-vol-4.txt b/album/homestuck-vol-4.txt
index f9564b70..738e24b6 100644
--- a/album/homestuck-vol-4.txt
+++ b/album/homestuck-vol-4.txt
@@ -53,11 +53,15 @@ Commentary:
 Track: Guardian V2
 Artist: Bill Bolin
 Duration: 1:20
+References:
+- track:guardian
 Has URLs: no
 -------------------------------------------------------------------------------
 Track: Contention
 Directory: contention-vol4
-Artist: Bill Bolin
+Artist:
+- Bill Bolin
+- Toby Fox
 Duration: 2:28
 Has URLs: no
 -------------------------------------------------------------------------------
@@ -86,6 +90,8 @@ Artist: Robert J! Lake
 Duration: 6:29
 References:
 - track:three-in-the-morning
+Samples:
+- track:three-in-the-morning
 Directory: three-in-the-morning-rj
 URLs:
 - https://homestuck.bandcamp.com/track/three-in-the-morning-rjs-i-can-barely-sleep-in-this-casino-remix-3
@@ -129,10 +135,28 @@ Artist: Toby Fox
 Duration: 2:24
 Art Tags: cw: blood
 References:
-- track:im-a-member-of-the-midnight-crew
 - track:liquid-negrocity
+Samples:
+- track:im-a-member-of-the-midnight-crew
 URLs:
 - https://homestuck.bandcamp.com/track/black-3
 - https://youtu.be/5NACWZBDtN8
 Lyrics:
     Make her a member of the Midnight Crew!
+
+    I'm a member of the-
+    I'm a member of the-
+    I'm a member of the Midnight Crew!
+
+    I'm a member of the-
+    I'm a member of the-
+
+    I'm a member of the-
+    I'm a member of the Midnight Crew!
+    I'm a member of the-
+    I'm a member of the Midnight Crew!
+
+    I'm a member of the-
+    I'm a member of the Midnight Crew!
+    I'm a- I'm a- I'm a member of the-
+    I'm a member of the Midnight Crew!
\ No newline at end of file
diff --git a/album/homestuck-vol-5.txt b/album/homestuck-vol-5.txt
index e76a71dd..06594dea 100644
--- a/album/homestuck-vol-5.txt
+++ b/album/homestuck-vol-5.txt
@@ -202,6 +202,7 @@ References:
 - Liquid Negrocity
 - The Ballad of Jack Noir
 - Non Compos Mentis
+Samples:
 - I'm a Member of the Midnight Crew
 Art Tags:
 - Jack Noir
@@ -475,8 +476,9 @@ Track Art: Shoutloaf
 Duration: 2:24
 References:
 - track:atomyk-ebonpyre
-- Drop It Like It's Hot
 - track:beatdown-strider-style
+Samples:
+- Drop It Like It's Hot
 Art Tags:
 - Dave
 URLs:
diff --git a/album/homestuck-vol-7.txt b/album/homestuck-vol-7.txt
index 63b7c4e0..377b32e3 100644
--- a/album/homestuck-vol-7.txt
+++ b/album/homestuck-vol-7.txt
@@ -319,7 +319,7 @@ Track: White Host, Green Room
 Artist: Tensei
 Track Art: Al Neun
 Duration: 3:28
-References:
+Samples:
 - Terezi Owns
 - Cascade (Beta)
 - The King in Red (Beta)
diff --git a/album/homestuck-vol-8.txt b/album/homestuck-vol-8.txt
index 82f0a3d7..4ed70922 100644
--- a/album/homestuck-vol-8.txt
+++ b/album/homestuck-vol-8.txt
@@ -25,6 +25,8 @@ Duration: 3:38
 References:
 - Walk-Stab-Walk (R&E)
 - Warhammer of Zillyhoo
+Samples:
+- Apollo 11 Launch Countdown
 Art Tags:
 - Karkat
 - Gamzee
diff --git a/album/homestuck-vol-9.txt b/album/homestuck-vol-9.txt
index 93e99323..7e8816b5 100644
--- a/album/homestuck-vol-9.txt
+++ b/album/homestuck-vol-9.txt
@@ -919,6 +919,9 @@ Track Art: Homestuck
 Duration: 2:47
 References:
 - track:crustacean
+Samples:
+- Snake Eyes
+- Leaving Las Vegas
 URLs:
 - https://www.youtube.com/watch?v=om3VC6ru4yk
 - https://youtu.be/om3VC6ru4yk
diff --git a/album/jailbreak.txt b/album/jailbreak.txt
index 4a952f5f..2702b3e5 100644
--- a/album/jailbreak.txt
+++ b/album/jailbreak.txt
@@ -176,6 +176,8 @@ Artist: Nick Smalley
 Contributors: Luke Benjamins
 Track Art: Robert J! Lake
 Duration: 2:22
+Samples:
+- Meet the Spy
 Lyrics:
     Your mother
 URLs:
@@ -222,6 +224,10 @@ Artist: Robert J! Lake
 Track Art: none
 Duration: 0:57
 References: Gust of Heir
+Samples:
+- Meet the Spy
+- Drillgorg
+- Your Bed
 URLs:
 - https://youtu.be/tdTjk-HX2rw
 Lyrics:
diff --git a/album/lofam.txt b/album/lofam.txt
index 90fce80d..fd7e0b61 100644
--- a/album/lofam.txt
+++ b/album/lofam.txt
@@ -260,6 +260,8 @@ Track: A Fashionable Escape
 Artist: Yan Rodriguez
 Track Art: melodiousDiscord
 Duration: 3:43
+Samples:
+- Metal Gear Solid
 Art Tags:
 - Kanaya
 URLs:
diff --git a/album/lofam5.txt b/album/lofam5.txt
index 1fe746ca..d0944c6c 100644
--- a/album/lofam5.txt
+++ b/album/lofam5.txt
@@ -56,7 +56,7 @@ References:
 Samples:
 - Bowman's Credit Score
 - RollerCoaster Tycoon 2
-- next-arrow
+- track:next-arrow
 - GameBro (Original 1990 Mix)
 Art Tags:
 - Rose
diff --git a/album/midnight-crew-drawing-dead.txt b/album/midnight-crew-drawing-dead.txt
index d795d06e..31f10d32 100644
--- a/album/midnight-crew-drawing-dead.txt
+++ b/album/midnight-crew-drawing-dead.txt
@@ -100,6 +100,8 @@ URLs:
 Track: Hauntjam
 Artist: Andrew Huo, Michael Guy Bowman
 Duration: 2:16
+References:
+- track:haunt
 Art Tags:
 - cw: blood
 URLs:
@@ -170,8 +172,8 @@ Artist: Andrew Huo, Ian Taylor
 Duration: 2:02
 References:
 - track:hauntjam
-Art Tags:
-- cw: blood (abstract)
+Samples:
+- track:hauntjam
 URLs:
 - https://homestuck.bandcamp.com/track/hauntjelly-2
 - https://youtu.be/MccD13jZSTU
diff --git a/album/squiddles.txt b/album/squiddles.txt
index 12282763..de3801ce 100644
--- a/album/squiddles.txt
+++ b/album/squiddles.txt
@@ -260,6 +260,7 @@ Track: Let the Squiddles Sleep (End Theme)
 Artist: Robert J! Lake
 Duration: 5:06
 References: Squiddles!
+Samples: Squiddles!
 URLs:
 - https://youtu.be/mpn7lahHvEc
 Lyrics:
@@ -280,5 +281,5 @@ Duration: 0:19
 URLs:
 - https://youtu.be/w6RNFIXfiyY
 Lyrics:
-    (I love you, Squiddle Ruby!)<br>(I love you too, Squiddle Sapphire!)<br>(Let's have [???] friendship!)
+    (I love you, Squiddle Ruby!)<br>(I love you too, Squiddle Sapphire!)<br>(Let's have serious friendship!)
     (Oh man, I just had a friendship aneurysm.)
diff --git a/album/the-wanderers.txt b/album/the-wanderers.txt
index ac148508..97f2454d 100644
--- a/album/the-wanderers.txt
+++ b/album/the-wanderers.txt
@@ -99,6 +99,8 @@ Artist: Toby Fox
 Track Art: Shad Andrews
 Duration: 3:20
 References: Mailtime
+Samples:
+- Judge Dredd
 Art Tags:
 - WV
 URLs: https://youtu.be/d9KVN4WfHHc
diff --git a/album/tomb-of-the-ancestors.txt b/album/tomb-of-the-ancestors.txt
index b54c461d..c11fd1d5 100644
--- a/album/tomb-of-the-ancestors.txt
+++ b/album/tomb-of-the-ancestors.txt
@@ -27,6 +27,8 @@ Group: Main album
 Track: ETERNAL SUFFERING
 Track Art: Brianne
 Duration: 2:51
+Samples:
+- Mischief Makers
 Art Tags:
 - The Signless
 - cw: blood
diff --git a/album/unreleased-tracks.txt b/album/unreleased-tracks.txt
index d9cbedf1..a3c6bffa 100644
--- a/album/unreleased-tracks.txt
+++ b/album/unreleased-tracks.txt
@@ -1029,6 +1029,11 @@ URLs:
 - https://www.youtube.com/watch?v=OqT3gaihbPE
 - https://soundcloud.com/dragonxvi/ham-and-steak-unused-homestuck-music
 -------------------------------------------------------------------------------
+Track: haunt
+Artist: Andrew Hussie
+Duration: 2:33
+Has URLs: no
+-------------------------------------------------------------------------------
 Track: Hawkeye
 Artist: Toby Fox
 Duration: 1:05