song of storms / windmill hut fixes

3 files changed, 33 insertions, 6 deletions

diff --git a/album/canwc-for-the-holidays.yaml b/album/canwc-for-the-holidays.yaml
index 0a7e73f1..56b4dc02 100644
--- a/album/canwc-for-the-holidays.yaml
+++ b/album/canwc-for-the-holidays.yaml
@@ -106,7 +106,7 @@ Referenced Tracks:
 - Meet the Flintstones
 - Snow halation
 - It's Beginning to Look a Lot Like Christmas
-- Song of Storms
+- Windmill Hut
 ---
 Track: Blaze (Cascarol cut of the Bells)
 Artists:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 75857250..26a4a015 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -7275,12 +7275,18 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=Xy_-7OXophY
 ---
-Track: Song of Storms
-# Sometimes named 'Ocarina "Song of Storms"'
-# From THE LEGEND OF ZELDA ORIGINAL SOUND TRACK
+Track: Ocarina "Song of Storms"
 # JP: オカリナ「嵐の歌」
 # Official release:
 #   ゼルダの伝説 時のオカリナ オリジナルサウンドトラック
+#   The Legend of Zelda: Ocarina of Time Original Sound Track
+# Note:
+#   This track shouldn't be confused with Windmill Hut. The internet has
+#   generally taken "Song of Storms" to be the canonical name for the full
+#   song, but on the soundtrack the only instance of "Song of Storms" is
+#   for this eight second track featuring just the partial motif played
+#   on the ocarina. Windmill Hut is the full song usually referred to as
+#   "Song of Storm" online.
 # Reference:
 #   https://vgmdb.net/album/293
 Artists:
@@ -7288,7 +7294,7 @@ Artists:
 - Koji Kondo
 Duration: '0:08'
 URLs:
-- https://www.youtube.com/watch?v=UtgHZaq0EGs
+- https://www.youtube.com/watch?v=m86VCw2JqOE
 ---
 Track: Sonic Electronic
 # This is from officially licensed album of Sonic-themed music from Germany, none of which is related to actual in-game music in any way.
@@ -8826,6 +8832,26 @@ Duration: '3:23'
 URLs:
 - https://youtu.be/psMnbEmvx7w
 ---
+Track: Windmill Hut
+# JP: 風車小屋
+# Official release:
+#   ゼルダの伝説 時のオカリナ オリジナルサウンドトラック
+#   The Legend of Zelda: Ocarina of Time Original Sound Track
+# Note:
+#   Generally referred to as "Song of Storms" online, this track is the
+#   full song which is typically remixed or referenced. Not to be confused
+#   with the partial motif played on ocarina, track:ocarina-song-of-storms.
+# Reference:
+#   https://vgmdb.net/album/293
+Artists:
+- The Legend of Zelda
+- Koji Kondo
+Duration: '0:53'
+URLs:
+- https://www.youtube.com/watch?v=mQLBEJ-Nj3A
+Referenced Tracks:
+- Ocarina "Song of Storms"
+---
 Track: Women Village
 # Reference:
 #   none
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 55fe713f..498d8ce1 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -344,6 +344,7 @@ Content: |-
     - fixed [[track:harlecoaster-lame-and-old]] sampling [[track:harlecoaster]] instead of the other way around, and moved references [[track:harlequin]] and [[track:rollercoaster-tycoon-theme]] from [[track:harlecoaster]] to [[track:harlecoaster-lame-and-old]] (thanks, Rosetta Leijonde!)
     - fixed [[track:tycoontime-lame-and-old]] samplign [[track:tycoontime]] instead of the other way around, and moved references [[track:rollercoaster-tycoon-theme]] and [[track:showtime-piano-refrain]] from [[track:tycoontime]] to [[track:tycoontime-lame-and-old]] (thanks, Rosetta Leijonde!)
     - fixed [[track:its-megaman-except-the-song-is-homestuck-too]] not referencing [[track:title-mega-man-3]], [[track:doctor]], and [[track:explore]], and not sampling [[track:title-mega-man-3]] (thanks, Rosetta Leijonde, FF!)
+    - fixed [[track:yule-and-new]] referencing [[track:ocarina-song-of-storms]] instead of [[track:windmill-hut]]
     - fixed [[track:fighting-spirit-double-ascended-form]] referencing itself instead of [[track:fighting-spirit-second-form]] (thanks, Pyryte!)
     - fixed [[track:multi-track-drifting-last-stop]] referencing tracks it only samples (thanks, Rosetta Leijonde!)
     - fixed [[track:24x-showdown-combo]] not sampling [[track:phat2]] (thanks, Rosetta Leijonde!)
@@ -428,11 +429,11 @@ Content: |-
     - fixed [[track:hydro-city-zone-act-2]] being named "Hydrocity Zone (Act 2)" (thanks, Morris!)
     - fixed [[track:lights-camera-action-studiopolis-zone-act-1]] being named "Lights, Camera, Action! (Studiopolis Zone Act 1)" (thanks, Morris!)
     - fixed [[track:main-theme-the-legend-of-zelda-breath-of-the-wild]] being named "Breath of the Wild Theme" (thanks, Morris!)
+    - fixed [[track:windmill-hut]] being named "Song of Storms", and not referencing [[track:ocarina-song-of-storms]]
     - fixed [[track:westminster-quarters]] being named "Westminister Quarters" (thanks, Circlejourney, Jebb!)
     - fixed [[artist:siivagunner]] being named "SilvaGunner" (thanks, Rosetta Leijonde!)
     - fixed [[track:phat1]], [[track:phat2]], [[track:phat3]], [[track:phat4]], [[track:phat5]], [[track:phat8]], [[track:phat9]], [[track:phat10]], and [[track:phat11]] not crediting [[artist:bill-bolin]] (for mastering and syncing)
     - fixed artworks by [[artist:fueledbyanimation]] being credited to separate aliases between [[album:lofam2]] and [[album:lofam3]]
-    - fixed duration of [[track:song-of-storms]] (thanks, Geese!)
     - added durations to [[track:baby-face-morgan]], [[track:the-pay-off]], and [[track:vinesauce-joel-insane-mario-bootleg-games-part-1]] (thanks, FF!)
     - added release dates to [[album:undertale-soundtrack]] bonus tracks: [[track:mysterious-shrine]], [[track:absolutely-overfamiliar-shrine]], [[track:mad-mew-mew]], [[track:dating-start-fm-version]], [[track:bereavement]], [[track:bonetrousle-trailer-version]], [[track:before-the-story]], and [[track:dog-dating]] (thanks, Morris, vriska/leo!)
     - fixed [[track:savior-of-the-dreaming-dead]] not being tagged with content warnings (thanks, Lilith, vriska/leo!)