Merge branch 'staging' into release

12 files changed, 102 insertions, 36 deletions

diff --git a/album/cool-and-new-volume-2.yaml b/album/cool-and-new-volume-2.yaml
index 2dbb6a1b..44a53761 100644
--- a/album/cool-and-new-volume-2.yaml
+++ b/album/cool-and-new-volume-2.yaml
@@ -1034,7 +1034,7 @@ Track: Saltish
 Artists:
 - Hadron
 Cover Artists:
-- Makin
+- Hadron
 Duration: '04:13'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/saltish
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index 26a6762a..64d080e1 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -297,7 +297,7 @@ URLs:
 Referenced Tracks:
 - Liquid Negrocity
 - Oppa Toby Style
-- track:game-over-bootleg
+- 'Title (Uwol: Quest for Money)'
 Art Tags:
 - Jack Noir
 - Dacronian Dignity
diff --git a/album/genesis-frog.yaml b/album/genesis-frog.yaml
index 02ab2b46..3bbfa3ce 100644
--- a/album/genesis-frog.yaml
+++ b/album/genesis-frog.yaml
@@ -436,6 +436,8 @@ Commentary: |-
 Group: Bonus tracks
 ---
 Track: Pondsquatter (Live Chamber Version)
+Contributors:
+- Talea Ensemble (performance)
 Duration: '6:02'
 URLs:
 - https://youtu.be/l07w1i-C7hs
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index d6900d3a..ca72f258 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -2056,7 +2056,7 @@ Commentary: |-
     <i>Hadron:</i>
     Rise of the Conductor's baton is probably my most ambitious song I've made; I pulled all the stops for this song for [S] Finale of CANH. I knew from the start that I wanted to do an upbeat EDM-styled track, and I thought a remix of Beatfox's original Creata would be spectacular.
     <i><b>Makin:</b></i>
-    This track was amde way back in November for the [S] Finale animation, a culmination of [[group:canmt|Cool and New Web Comic]] lore Hadron had been working on for a long time. The track features a bunch of obscure little refefernces like Skaian Voyages and Celestial Fantasia, both amazing Beatfox songs you should probably look up, and Formation, the Hadron song you've already listened to. Beatfox is a music god, and Hadron knew just how to combine all the good leitmotifs in order to make the song feel as grand and epic as humanly possible. I actually named this track, as I feel cool Homestuck quotes like "Raise of the Conductor's Baton" ought to be used when they fit the content (and indeed, Rose raises her wand... conductorly... in the animation mentioned above. Seriously, <a href="https://www.youtube.com/watch?v=Vgw1yxGLStI">go watch</a> [S] Finale when you're done with this album).
+    This track was made way back in November for the [S] Finale animation, a culmination of [[group:canmt|Cool and New Web Comic]] lore Hadron had been working on for a long time. The track features a bunch of obscure little refefernces like Skaian Voyages and Celestial Fantasia, both amazing Beatfox songs you should probably look up, and Formation, the Hadron song you've already listened to. Beatfox is a music god, and Hadron knew just how to combine all the good leitmotifs in order to make the song feel as grand and epic as humanly possible. I actually named this track, as I feel cool Homestuck quotes like "Raise of the Conductor's Baton" ought to be used when they fit the content (and indeed, Rose raises her wand... conductorly... in the animation mentioned above. Seriously, <a href="https://www.youtube.com/watch?v=Vgw1yxGLStI">go watch</a> [S] Finale when you're done with this album).
 ---
 Track: Radness from Concentrate
 Artists:
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index 497e6209..a0215d4a 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -273,7 +273,7 @@ Commentary: |-
 ---
 Track: Cut the Chain
 Artists:
-- Sylvarn
+- sylvarn
 Duration: '4:07'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/cut-the-chain
@@ -289,7 +289,7 @@ Referenced Tracks:
 - Cascade (Beta)
 - Midnight
 Commentary: |-
-    <i>Sylvarn:</i>
+    <i>sylvarn:</i>
     believe me, if I didn’t know what I was doing nearly 2 years ago when I made this, I sure don’t when I’m writing this commentary. I liked the melody so I made a song, duh
     <i>Monckat:</i>
     Jack Noir decides Prospit didn’t need its moon anyway. I tried my best to convey Noir’s speed, as well as the scale and chonk of those massive golden chains. And yes the chains really are that long in canon please don’t go check
@@ -625,7 +625,7 @@ Commentary: "<i>Shwan:</i>\nI made this during a recent re-reading of Homestuck
 ---
 Track: Upon Whom Sacrifice Calls
 Artists:
-- Sylvarn
+- sylvarn
 Duration: '4:25'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/upon-whom-sacrifice-calls
@@ -636,7 +636,7 @@ Art Tags:
 - The Psiioniic
 - 'cw: body horror'
 Commentary: |-
-    <i>Sylvarn:</i>
+    <i>sylvarn:</i>
     Okay so I was like what if I could get the same vibe as [[Gold Pilot]] but not be an exact remix, then I zoned out for 30 hours and this was on my computer.
 ---
 Track: Sun and Setter
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index ef0ffe4c..57f44e80 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -39,6 +39,19 @@ Commentary: |-
     <i>Niklink:</i>
     Unofficial name. If I recall correctly, I gave it that name for the Homestuck Sound Test because when [[group:toby-fox]] shared the track on his Tumblr, he shared it alongside a picture of Aradia (and nothing else to identify the song with), almost certainly the [[media:misc/aradias-theme-pre-death.png|same picture I used as track art for the song]] in the first versions of the Sound Test.
 ---
+Track: Bane
+Directory: bane-old
+Artists:
+- Mark Hadley
+Duration: '5:48'
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Bane.mp3
+Commentary: |-
+    <i>Mark Hadley:</i>
+    Whew… this is a really, REALLY old one of mine. I wrote the first version of “Bane” in 2001, and this version (the ‘latest’ one) was written in 2005. It’s been a long time since I did anything with this theme, but I still really like it. I’ve been thinking about making a [[track:bane|newer version]] of it (since surely I’ve gotten better over the past decade, right?).
+
+    I kind of regret not slipping this theme into Homestuck somewhere; I feel like this could have easily been a recurring signature theme for projects I work on (like [[group:toby-fox|Toby Fox]] does with '[[track:megalovania-halloween|Megalovania]]’).
+---
 Track: Before Before the Beginning
 Artists:
 - Robert J! Lake
@@ -566,8 +579,14 @@ URLs:
 Referenced Tracks:
 - licord nacrasty
 - The Sock Ruse
+- The Light's Rebellion
 Sampled Tracks:
 - The Sock Ruse
+Commentary: |-
+    <i>Circlejourney:</i>
+    so I just had a memory hit me out of nowhere - me and [[artist:serialsymphony|serialsymphony]] discussed quoting each other's tracks reciprocally back when Dave Strider's Cool Mixtape was meant to be on [[album:cosmic-caretakers]]. i.e. this track does reference [[track:the-lights-rebellion|The Light's Rebellion]] at 2:56
+    we both made the front half of our tracks, and then traded motifs in the back half, so it really is a reciprocal reference
+    sorry for your ears @ anyone who listens through this to confirm its existence
 ---
 Track: '[S] Dirk: Unite Synchronization (WITH LYRICS)'
 Artists:
diff --git a/album/p-s.yaml b/album/p-s.yaml
index a39c7565..3e5179cb 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -237,6 +237,8 @@ Artists:
 Duration: '6:06'
 URLs:
 - https://casualsunday.bandcamp.com/track/bane
+Referenced Tracks:
+- track:bane-old
 ---
 Track: Interstellar
 Artists:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 422249b2..bf48a91b 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -510,9 +510,8 @@ Track: Bon Voyage, Amigo
 #   https://en.wikipedia.org/wiki/Music_of_the_Mother_series
 #   http://starmen.net/merchandise/music/m3cd.php
 Artists:
-- EarthBound
-- Keiichi Suzuki
-- Hirokazu Tanaka
+- Mother
+- Shogo Sakai
 URLs:
 - https://www.youtube.com/watch?v=5OtDm2qgpWw
 ---
@@ -775,7 +774,7 @@ URLs:
 Track: Eight Melodies
 # From Mother (EarthBound Beginnings), which doesn't seem to have received an official soundtrack release (besides several arrangements)
 Artists:
-- EarthBound
+- Mother
 - Keiichi Suzuki
 - Hirokazu Tanaka
 URLs:
@@ -851,15 +850,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=hPT77G3LGwA
 ---
-Track: Game Over
-Directory: game-over-bootleg
-# This... obviously never had an official release... duh...
-Artists:
-- Felix the Cat
-- Unknown Artist
-URLs:
-- https://www.youtube.com/watch?v=e17PCwAFIA4
----
 Track: Gaster's Theme
 # No official release, duration is from the in-game audio loop.
 Artists:
@@ -1020,8 +1010,10 @@ Track: Jump Up, Super Star!
 Artists:
 - Super Mario
 - Naoto Kubo
-Contributors:
+- Nobuyoshi Suzuki (Japanese lyrics)
 - Rob Tunstall (English lyrics)
+Contributors:
+- Aimi Mukohara (Japanese vocals)
 - Kate Higgins (English vocals)
 Duration: '4:09'
 URLs:
@@ -1117,6 +1109,10 @@ Lyrics: |-
     Put a smile on that face
     There's no time to waste
     So, let's do the odyssey
+Commentary:
+    <i>Niklink:</i>
+
+    While the lyrics here are from the (probably known to you) English version of the song, the Japanese version was the first version to be created (although both launched simultaneously).
 ---
 Track: Katamari on the Rocks
 # JP: 塊オンザロック～メインテーマ
@@ -1371,7 +1367,7 @@ URLs:
 Track: One Fateful Night
 # (See Eight Melodies, no official soundtrack release)
 Artists:
-- EarthBound
+- Mother
 - Keiichi Suzuki
 - Hirokazu Tanaka
 URLs:
@@ -1380,7 +1376,7 @@ URLs:
 Track: Onett Theme
 # (See Eight Melodies, no official soundtrack release)
 Artists:
-- EarthBound
+- Mother
 - Keiichi Suzuki
 - Hirokazu Tanaka
 URLs:
@@ -1673,11 +1669,16 @@ URLs:
 Track: Smiles and Tears
 # (See Eight Melodies, no official soundtrack release)
 Artists:
-- EarthBound
+- Mother
 - Keiichi Suzuki
 - Hirokazu Tanaka
 URLs:
 - https://www.youtube.com/watch?v=vkAmD8A3CRk
+Lyrics: |-
+    I miss you...
+Commentary: |-
+    <i>Mother:</i>
+    (<a href="https://earthboundcentral.com/2009/01/smiles-tears-lyrics/">Full lyrics!</a>)
 ---
 Track: Solar Sect of Mystic Wisdom ~ Nuclear Fusion
 # No official release of the in-game track
@@ -1757,7 +1758,7 @@ URLs:
 Track: Super Dry Dance
 # (See Eight Melodies, no official soundtrack release)
 Artists:
-- EarthBound
+- Mother
 - Keiichi Suzuki
 - Hirokazu Tanaka
 URLs:
@@ -1829,7 +1830,7 @@ Artists:
 - Metal Gear
 - Logan Mader
 - Jamie Christopherson
-- Maniac Agenda
+- The Maniac Agenda (arrangement)
 Contributors:
 - Kit Walters (vocals)
 Duration: '2:10'
@@ -1889,6 +1890,7 @@ Track: Title (Mega Man 3)
 #   https://vgmdb.net/album/255
 Artists:
 - Mega Man
+- Yasuaki Fujita
 Duration: '1:23'
 URLs:
 - https://youtu.be/krRaLoxdhrE
@@ -1907,6 +1909,18 @@ Duration: '1:20'
 URLs:
 - https://youtu.be/-CPrdomMoA4
 ---
+Track: 'Title (Uwol: Quest for Money)'
+# This... obviously never had an official release... duh...
+Artists:
+- Uwol
+- Augusto Ruiz
+URLs:
+- https://www.youtube.com/watch?v=xYp0NHNnLR4
+Commentary: |-
+    <i>Niklink:</i>
+
+    While you may recognize this song as the Game Over theme from that one Russian Felix the Cat game (a bootleg Genesis port of the NES game), the music is actually plagiarized from the Genesis port of Uwol: Quest for Money, an original homebrew game first released for the ZX Spectrum. While you may remember the track being faster, it in fact was always this same speed but often mangled by running a PAL region game at NTSC speed (resulting in a 20% speedup).
+---
 Track: To Make the End of Battle
 # JP: TO MAKE THE END OF BATTLE (タイトル)
 # Official release:
@@ -2093,7 +2107,7 @@ URLs:
 Track: You Gained a Level!
 # (See Eight Melodies, no official soundtrack release)
 Artists:
-- EarthBound
+- Mother
 - Keiichi Suzuki
 - Hirokazu Tanaka
 URLs:
diff --git a/album/team-paradox.yaml b/album/team-paradox.yaml
index f4a45e63..12c1b8a0 100644
--- a/album/team-paradox.yaml
+++ b/album/team-paradox.yaml
@@ -343,6 +343,8 @@ URLs:
 - https://teamparadox.bandcamp.com/track/diskhordance
 Cover Artists:
 - Team Paradox
+Referenced Tracks:
+- Alterkate
 ---
 Track: Team Paradox
 Artists:
diff --git a/artists.yaml b/artists.yaml
index 459ecc7a..97409377 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -90,6 +90,8 @@ Artist: Aiden Griffin Hanks
 ---
 Artist: Aimee Mann
 ---
+Artist: Aimi Mukohara
+---
 Artist: Ainsil
 URLs:
 - https://ainsil.tumblr.com/
@@ -427,6 +429,8 @@ Artist: audren
 Dead URLs:
 - https://audren-deactivated20130301.tumblr.com/
 ---
+Artist: Augusto Ruiz
+---
 Artist: Aurum
 URLs:
 - https://geolu.tumblr.com/
@@ -1261,8 +1265,6 @@ Artist: Dzu
 ---
 Artist: E.N.
 ---
-Artist: EarthBound
----
 Artist: Eddie Cooley
 ---
 Artist: Eddie Morton
@@ -1445,8 +1447,6 @@ URLs:
 Dead URLs:
 - http://confusedthaumaturge.tumblr.com/
 ---
-Artist: Felix the Cat
----
 Artist: Fellow Traveller
 URLs:
 - https://twitter.com/FellowTravellr
@@ -3075,6 +3075,8 @@ Artist: Morgan
 ---
 Artist: Mort Garson
 ---
+Artist: Mother
+---
 Artist: MrCheeze
 URLs:
 - https://www.youtube.com/c/mrcheeze
@@ -3263,6 +3265,8 @@ Artist: Noah Noble
 ---
 Artist: Nobuo Uematsu
 ---
+Artist: Nobuyoshi Suzuki
+---
 Artist: Noël Coward
 Directory: noel-coward
 ---
@@ -4407,7 +4411,7 @@ URLs:
 - https://twitter.com/Sylladexter
 - https://www.deviantart.com/sylladexter
 ---
-Artist: Sylvarn
+Artist: sylvarn
 URLs:
 - https://sylvarn.com
 ---
@@ -4419,6 +4423,8 @@ Artist: Takako Hirasawa
 ---
 Artist: Takatomo Kurosawa
 ---
+Artist: Talea Ensemble
+---
 Artist: Talhaiarn
 ---
 Artist: Tamara Fritz
@@ -4566,6 +4572,8 @@ Artist: The Lion King
 ---
 Artist: The Lovable Tramp
 ---
+Artist: The Maniac Agenda
+---
 Artist: The Monkees
 ---
 Artist: The Mountain Goats
@@ -4765,6 +4773,8 @@ Artist: Unknown Artist
 Context Notes: >-
     Sometimes, information on who is specifically responsible for a piece of music or art is not known. This is a catchall artist entry to list them in one place. If you have any information on who any of the artists listed here may be, please get in touch with us!
 ---
+Artist: Uwol
+---
 Artist: V
 ---
 Artist: V-6
@@ -4969,6 +4979,8 @@ URLs:
 ---
 Artist: Yapoos
 ---
+Artist: Yasuaki Fujita
+---
 Artist: Yasuaki Iwata
 ---
 Artist: Yasuko Yamada
@@ -5510,8 +5522,6 @@ URLs:
 Artist: Máni Svavarsson
 Directory: mani-svavarsson
 ---
-Artist: Maniac Agenda
----
 Artist: mediokreKarapase
 URLs:
 - https://mediokrek.tumblr.com/
diff --git a/homepage.yaml b/homepage.yaml
index 446bb220..89e56243 100644
--- a/homepage.yaml
+++ b/homepage.yaml
@@ -50,7 +50,7 @@ Albums:
 - album:ophiuchus-full-suite
 - album:homestuck-for-orchestra-ep
 
-- album:tumblrstuck-bent-ost-volume-1
-- album:team-paradox
+- album:tumblrstuck-bent-ost-volume-0
+- album:portalstuck-vol-1
 - album:bee-forus-seatbelt-safebee
 - album:sburb-ost-bonus-dlc
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 3c00d30c..dd631f01 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -23,7 +23,24 @@ Style: |-
         margin-bottom: 0.6em;
     }
 Content: |-
+    <h2 id="05-jan-2023"><a href="#05-jan-2023">[[date:05 January 2023]] - picking up the ball</a></h2>
+    <h3>site changes</h3>
+    - slightly tweaked the homepage album selection
+    <h3>data fixes</h3>
+    - fixed [[track:pondsquatter-live-chamber-version]] not attributing [[artist:talea-ensemble]] (thanks, Makin!)
+    - fixed [[track:saltish]] attributing [[artist:makin]] instead of [[artist:hadron]] for the track artwork (thanks, Makin!)
+    - fixed typo in commentary for [[track:raise-of-the-conductors-baton]] (thanks, Makin!)
+    - fixed [[track:bane]] not referencing... [[track:bane-old]]
+    - fixed [[track:diskhordance]] not referencing [[track:alterkate]] (thanks, Sgeo!)
+    - fixed [[track:dave-striders-cool-mixtape]] not referencing [[track:the-lights-rebellion]] (thanks, Circlejourney!)
+    - fixed [[track:bon-voyage-amigo]] attributing the composers from EarthBound instead of [[artist:shogo-sakai]] (thanks, FF!)
+    - fixed [[track:jump-up-super-star]] not attributing [[artist:nobuyoshi-suzuki]] or [[artist:aimi-mukohara]] and listing [[artist:rob-tunstall]] as a contributor instead of artist (thanks, FF!)
+    - fixed [[track:smiles-and-tears]] missing lyrics
+    - fixed [[track:the-stains-of-time]] not specifying [[artist:the-maniac-agenda]]'s role in makin the song (and calling them 'Maniac Agenda') (thanks, FF!)
+    - fixed [[track:title-mega-man-3]] not listing [[artist:yasuaki-fujita]] as an artist (thanks, FF!)
+    - fixed [[track:title-uwol-quest-for-money]] being named 'Game Over', being listed as being from Felix the Cat instead of from [[artist:uwol]], and not attributing [[artist:augusto-ruiz]] (thanks, FF!)
     <h2 id="1-jan-2023" class="major-release"><a href="#1-jan-2023">[[date:1 January 2023]] - Ball Drop '23</a></h2>
+    (news entry: [[news-entry:ball-drop-23]])
     <h3>site changes</h3>
     - major restructure of all internal data structures as well as data file format, laying foundations for all following changes and additions to wiki features and lending much better to interoperability with outside code and internal data validation and error reporting
         - improved automatic data error reporting lead to many dozens of diverse data issues that had previously slipped by getting fixed this update, much improving overall wiki quality and raising the baseline level of data consistency