under the hat 3

5 files changed, 68 insertions, 14 deletions

diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index cd471db2..eeedac46 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -293,7 +293,7 @@ Commentary: |-
 
     <i>Quasar Nebula:</i> (wiki editor, 8/13/2025)
 
-    On the wiki we used to mark this track as referencing the version [[track:under-the-hat-lofam|from Land of Fans and Music]], probably just because *obviously* that is a fansong and both Trollcops and the later release [[track:under-the-hat|on One Year older]] are not. We've revisited the context and changed both tracks to point to a hypothetical [[track:under-the-hat-original|original version]] we think was publicly released at some point earlier back, but haven't actually found.
+    On the wiki we used to mark this track as referencing the version [[track:under-the-hat-lofam|from Land of Fans and Music]], probably just because *obviously* that is a fansong and both Trollcops and the later release [[track:under-the-hat|on One Year older]] are not. We've revisited the context and changed both tracks to point to a hypothetical [[track:under-the-hat-original|original version]] we think was publicly released at some point earlier back, ~~but haven't actually found.~~
 
     This track and the piano version on One Year Older are quite similar arrangements, so we're confident there's a reference between the two. We aren't so sure what direction the reference goes - we don't know which came first. One Year Older released over a year after AlterniaBound (ha), but the recording included there was first posted [on Tumblr](https://jitmakesstuff.tumblr.com/post/5889719815/and-now-more-piano-recordings-so-i-discovered) in May 2011, just two months following AlterniaBound. And that one might have been recorded some amount of time earlier than it was posted - possibly preceding when this track, Trollcops, was produced for AlterniaBound.
 ---
diff --git a/album/lofam.yaml b/album/lofam.yaml
index 9ba450e5..42428f9c 100644
--- a/album/lofam.yaml
+++ b/album/lofam.yaml
@@ -1128,11 +1128,7 @@ Cover Artists:
 Art Tags:
 - John
 Referenced Tracks:
-- track:under-the-hat-original
-MIDI Project Files:
-- Title: MIDI by Twix Stix (from Sburbmon)
-  Files:
-  - 'Under the Hat - Twix Stix.mid'
+- Under the Hat battle mix
 Commentary: |-
     <i>Erik Scheele:</i> (booklet commentary)
 
@@ -1141,10 +1137,6 @@ Commentary: |-
     <i>TheifofTruth:</i> (booklet commentary)
 
     Well, this is the only one I actually tried on so I guess that's good it's the only one that got chosen. I now realize the pipe is out of proportion or those are really big pictures. I like it though.
-
-    <i>Quasar Nebula:</i> (wiki editor, 8/13/2025)
-
-    Though it's a different recording, this arrangement is also included on the sound test as "Strrife! Under The Hat". (The capitalization and/or punctuation may be editorialized there.) We aren't sure where or when that version of the track was released.
 ---
 Track: Sburban Piano Doctor
 Additional Names:
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 3e6afb1e..add5d11b 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -1570,13 +1570,39 @@ URLs:
 Referenced Tracks:
 - track:three-in-the-morning
 ---
-Track: Under The Hat (original)
+Track: Under the Hat (original)
+Always Reference By Directory: true
+Additional Names:
+- Name: >-
+    Under the Hat
+  Annotation: >-
+    [FurAffinity](https://www.furaffinity.net/view/3088546/)
+Date First Released: November 25, 2009
 Artists:
 - Erik Scheele
+Duration: 1:04
+URLs:
+- https://www.furaffinity.net/view/3088546/
+- https://media.hsmusic.wiki/misc/archive/jit_underthehat.mp3
 Commentary: |-
+    <i>Erik Scheele:</i> ([FurAffinity description](https://www.furaffinity.net/view/3088546/))
+
+    A bit of fan-music for Homestuck. :O
+
+    I was waiting around in the music lounge at like 7:30 in the morning, one day, then I was like "Oh man, I wonder if the guardian figures get their own battle music?" and then I wrote this out.
+
+    Really, it's supposed to be comping piano and something else, sax or something, but I have no sax skills, so sad, so this stays singularly simple. That last bit makes no sense, I'm sorry. I seem to be in a weird mood all of the sudden. I blame the orange juice.
+
+    [[track:under-the-hat-battle-mix|Battle mix type thing]] at: [http://www.furaffinity.net/view/3088590/](https://www.furaffinity.net/view/3088590/)
+    OH OH OH and you should totally go out and check out Homestuck at [http://www.mspaintadventures.com/](https://www.homestuck.com) . JUST SAYING.
+
+    <i>Erik Scheele:</i> ([FurAffinity keywords](https://www.furaffinity.net/view/3088546/))
+
+    homestuck johns dad under the hat thoooooough it is kind of more like a problem sleuth thing but oh well
+
     <i>Quasar Nebula:</i> (wiki editor, 8/13/2025)
 
-    Theoretial common root for the versions of this track released [[track:under-the-hat|on One Year Older]] and [[track:under-the-hat-lofam|on Land of Fans and Music]].
+    ~~Theoretical~~ common root for the versions of this track released [[track:under-the-hat|on One Year Older]] and [[track:under-the-hat-lofam|on Land of Fans and Music]].
 
     The booklet commentary on [[track:trollcops]] makes reference to a "fan music piece" called Under the Hat, and gives the impression that this track was publicly listenable, just unofficially/independently released or posted:
 
@@ -1592,7 +1618,38 @@ Commentary: |-
 
     So this track in particular - "original", which is an unofficial title we've given it - is a recording of the track before it had ever been arranged further, "laid-back" and "chill" and simply "played plain".
 
-    We haven't found this track, but figure it's substantially older than March 2011. (Booklet commentary: "It takes this long to re-use things, sometimes.")
+    ~~We haven't found this track,~~ but figure it's substantially older than March 2011. (Booklet commentary: "It takes this long to re-use things, sometimes.")
+
+    <i>Quasar Nebula:</i> (wiki editor, 8/24/2025)
+
+    We found it! Thanks wertercatt!!
+---
+Track: Under the Hat battle mix
+Date First Released: November 25, 2009
+Artists:
+- Erik Scheele
+Duration: 1:04
+URLs:
+- https://www.furaffinity.net/view/3088590/
+- https://media.hsmusic.wiki/misc/archive/jit_underthehatbattle.mp3
+Referenced Tracks:
+- track:under-the-hat-original
+Commentary: |-
+    <i>Erik Scheele:</i> ([FurAffinity description](https://www.furaffinity.net/view/3088590/))
+
+    And, just because I was thinking of it as a battle type music, I made a semi-battle-type-mix (if you could even call it that) of it. Rather fast-paced and all, not-so-much walking bass and cool jazz.
+
+    <i>Erik Scheele:</i> ([FurAffinity keywords](https://www.furaffinity.net/view/3088590/))
+
+    homestuck fan music johns dad he is a pretty cool guy you know that
+
+    <i>Erik Scheele:</i> ([FurAffinity comment](https://www.furaffinity.net/view/3088590/), 4/20/2010)
+
+    > oh, I like where this is going! perhaps the right reworking of this and it can practically be a homestuck song right now!
+
+    yeah, heh heh
+
+    if that'll ever happen
 ---
 Track: The Undying
 Artists:
diff --git a/album/one-year-older.yaml b/album/one-year-older.yaml
index f3b77de1..1db2ab07 100644
--- a/album/one-year-older.yaml
+++ b/album/one-year-older.yaml
@@ -587,6 +587,9 @@ MIDI Project Files:
 - Title: MIDI by i300
   Files:
   - 'Under the Hat - i300.mid'
+- Title: MIDI by Twix Stix (from Sburbmon)
+  Files:
+  - 'Under the Hat - Twix Stix.mid'
 Commentary: |-
     <i>Erik Scheele:</i> (booklet commentary)
 
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index f6d2e984..15180cf8 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -275,7 +275,7 @@ Content: |-
         - fixed [[track:trollcops]] referencing [[track:under-the-hat]] at all, since that reference is really via [[track:trollcops-radio-play]]
         - fixed [[track:trollcops-radio-play]] referencing [[track:under-the-hat]] ([[album:one-year-older]]) instead of [[track:under-the-hat-original]]
         - fixed [[track:under-the-hat]] ([[album:one-year-older]]) referencing [[track:under-the-hat-lofam]] ([[album:lofam]]) instead of [[track:trollcops]]
-        - fixed [[track:under-the-hat-lofam]] ([[album:lofam]]) not referencing [[track:under-the-hat-original]]
+        - fixed [[track:under-the-hat-lofam]] ([[album:lofam]]) not referencing [[track:under-the-hat-battle-mix]]
         - added contextual wiki commentary across all these tracks
     - fixed [[track:liquid-negrocity]] not referencing [[track:liquid-negrocity-original]] (thanks, Lilith, Jackie!)
     - fixed [[track:black]] referencing [[track:liquid-negrocity]] instead of [[track:plasmatic-blaquaciousness]] (thanks, Lilith, Jackie!)
@@ -370,6 +370,8 @@ Content: |-
     - added [[tag:sbahj]] tag to track artwork for [[track:im-a-member-of-the-midnight-crew-soapstone]] (thanks, Lan!)
     - added [[tag:michael-guy-bowman]] tag to [[album:comfortable-bugs]] and [[album:look-on-my-works-ye-mighty-and-despair]] (thanks, Lan!)
     - added blood warning to [[track:cobalt-corsair]] (thanks, Lan!)
+    <!-- additional file fixes -->
+    - moved Twix Stix MIDI from [[track:under-the-hat-lofam]] ([[album:lofam]]) to [[track:under-the-hat]] ([[album:one-year-older]]; thanks, Lan!)
     <!-- commentary fixes -->
     - fixed broken link formatting in annotation of Tumblr commentary for [[track:skaian-ride]] (thanks, Lan!)
     - fixed misplaced anthology art commentary for [[track:pumpkin-cravings]] (was placed on [[track:welcome-to-the-new-extreme]]; thanks, HunZhen, Amberlina!)