11 files changed, 329 insertions, 15 deletions
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index cd61f2d7..37cdf549 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -843,8 +843,7 @@ Commentary: |-
 Track: Waveform
 Suffix Directory: true
 Always Reference By Directory: true
-Artists:
-- keyboard cait
+Main Release: album:tributary
 Duration: 3:07
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/waveform
@@ -854,11 +853,6 @@ Cover Artists:
 Art Tags:
 - Squarewave
 - Sawtooth
-Referenced Tracks:
-- Trepidation
-- Upward Movement (Dave Owns)
-- Negative Aperture
-- Miasmajesty
 Commentary: |-
     <i>keyboard cait:</i> (booklet commentary)
 
@@ -2097,11 +2091,12 @@ Commentary: |-
     That heavenscape is certainly sunsoaked. Neat!
 ---
 Track: Explore [Keygen Mix]
+Suffix Directory: true
+Always Reference By Directory: true
+Main Release: album:tributary
 Additional Names:
 - Name: Explore (Keygen Mix)
   Annotation: name in booklet
-Artists:
-- keyboard cait
 Duration: 2:37
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/explore-keygen-mix
@@ -2114,8 +2109,6 @@ Art Tags:
 - AR
 - Serenity
 - Ruined Earth
-Referenced Tracks:
-- Explore
 Commentary: |-
     <i>keyboard cait:</i> (booklet commentary)
 
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index b0449615..3faa1f6b 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -2303,8 +2303,9 @@ Commentary: |-
     During his time as a musician for Homestuck, Thomas Ferkol touched on a wide range of styles, from metal to neoclassical to krautrock, and everywhere in between. One he hadn't done, though, was disco... Until now! Conceived as one of three land themes for the alpha session (LOPAN in particular), this track sadly never saw an official release, but it's here, now, for your listening pleasure.
 ---
 Track: Quest Crypt
-Artists:
-- keyboard cait
+Suffix Directory: true
+Always Reference By Directory: true
+Main Release: album:tributary
 Duration: 1:19
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/quest-crypt
@@ -2314,8 +2315,6 @@ Cover Artists:
 Art Tags:
 - Jane
 - Prospit
-Referenced Tracks:
-- Sburban Jungle
 Commentary: |-
     <i>keyboard cait:</i> (booklet commentary)
 
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 4325a930..6906d850 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -10159,6 +10159,16 @@ Duration: 2:55
 URLs:
 - https://www.youtube.com/watch?v=CL_3mlOPnGI
 ---
+Track: Conturbatio
+# Reference:
+#   https://vgmdb.net/album/24725
+Artists:
+- Puella Magi Madoka✩Magica
+- Yuki Kajiura
+Duration: 1:28
+URLs:
+- https://www.youtube.com/watch?v=PPa6ouVRTtc
+---
 Track: Cory in the House (Theme Song)
 Artists:
 - Cory in the House
diff --git a/album/tributary.yaml b/album/tributary.yaml
new file mode 100644
index 00000000..432cbf4d
--- /dev/null
+++ b/album/tributary.yaml
@@ -0,0 +1,240 @@
+Album: Tributary
+Date: August 15, 2013
+Artists:
+- keyboard cait
+Color: '#4ce44c'
+URLs:
+- https://ndividedbyzero.bandcamp.com/album/tributary
+Cover Artists:
+- keyboard cait
+Cover Art File Extension: png
+Art Tags:
+- Sburb
+Groups:
+- Fandom
+Commentary: |-
+    <i>keyboard cait:</i> ([Bandcamp about blurb](https://ndividedbyzero.bandcamp.com/album/tributary))
+
+    this is a collection of rearranges i've made and also tracks that just quote other songs for like 2 seconds, Phase 2 in my plan of releasing everything i've ever made on bandcamp. enjoy!
+---
+Section: Main album
+---
+Track: Quest Crypt
+Duration: 1:22
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/quest-crypt
+Referenced Tracks:
+- Sburban Jungle
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/quest-crypt))
+
+    (loosely based on [[track:sburban-jungle]] by [[artist:michael-guy-bowman]])
+---
+Track: Diversis Puella Magica
+Duration: 2:20
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/diversis-puella-magica
+Referenced Tracks:
+- Conturbatio
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/diversis-puella-magica))
+
+    quotes [[track:conturbatio]] by [[artist:yuki-kajiura]]
+---
+Track: Explore (Keygen Mix)
+Duration: 2:37
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/explore-keygen-mix
+Referenced Tracks:
+- Explore
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/explore-keygen-mix))
+
+    rearrange of [[track:explore]] by [[artist:michael-guy-bowman]] and [[artist:buzinkai|[Buzinkai\]]]
+---
+Track: Clockwork Upheaval
+Duration: 1:06
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/clockwork-upheaval
+Referenced Tracks:
+- Endless Climb
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/clockwork-upheaval))
+
+    reaaaaally old rearrange of [[track:endless-climb]] by [[artist:buzinkai|[Buzinkai\]]]
+---
+Track: Feeder
+Suffix Directory: true
+Duration: 1:09
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/feeder
+Referenced Tracks:
+- track:evolution-pokemon-red-blue
+Commentary: |-
+    <i>keyboard cait:</i> ([Bandcamp about blurb](https://ndividedbyzero.bandcamp.com/track/feeder))
+
+    a song for sunkern
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/feeder))
+
+    quotes [[track:evolution-pokemon-red-blue|Evolution]] by [[artist:junichi-masuda]]
+---
+Track: Foundation
+Suffix Directory: true
+Always Reference By Directory: true
+Duration: 1:38
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/foundation
+Referenced Tracks:
+- track:pokegear-radio-unown-pokemon-gold-silver
+Commentary: |-
+    <i>keyboard cait:</i> ([Bandcamp about blurb](https://ndividedbyzero.bandcamp.com/track/foundation))
+
+    |̶̿ ̶̿ ̶̿ ̶̿| ͇ ͇\\̿ ̿ |͇̿ ͇̿ ͇̿||̿\\͇||͇̿ ͇̿ ͇̿ ̶͇̿ι |̶̿ ̶̿ ̶̿ ̶̿ |͇̿ ͇̿ ͇̿||̿ ̿ ̿\\ |͇ ͇ ͇ ͇ ͇||̿\\͇||͇̿ ͇̿ ͇̿||͇ Λ ͇||̿\\͇|
+
+    listen with headphones on max volume for "da full experience" ;)
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/foundation))
+
+    quotes the [[track:pokegear-radio-unown-pokemon-gold-silver|Unown Radio Tune]] by [[artist:junichi-masuda]] (i think that's who it's by)
+---
+Track: Illusion
+Suffix Directory: true
+Always Reference By Directory: true
+Duration: 1:03
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/illusion
+Referenced Tracks:
+- Battle! (Reshiram/Zekrom)
+- track:battle-suicune-pokemon-crystal
+- track:battle-dialga-palkia-pokemon-diamond-pearl
+- track:battle-super-ancient-pokemon-pokemon-ruby-sapphire
+Commentary: |-
+    <i>keyboard cait:</i> ([Bandcamp about blurb](https://ndividedbyzero.bandcamp.com/track/illusion))
+
+    song for zoroark
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/illusion))
+
+    quotes [[track:battle-reshiram-zekrom|Battle! Zekrom & Reshiram]], the [[track:battle-suicune-pokemon-crystal|Legendary Beasts battle theme]], [[track:battle-dialga-palkia-pokemon-diamond-pearl|Battle! Dialga & Palkia]], and [[track:battle-super-ancient-pokemon-pokemon-ruby-sapphire|Battle! Super-Ancient Pokémon]] by [[artist:junichi-masuda]]/[[artist:go-ichinose]]/[[artist:morikazu-aoki]]/[[artist:hitomi-sato]]/etc. (dang that's a long list)
+---
+Track: Nuklear Ebonpyre
+Duration: 2:03
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/nuklear-ebonpyre
+Referenced Tracks:
+- Atomyk Ebonpyre
+Commentary: |-
+    <i>keyboard cait:</i> ([Bandcamp about blurb](https://ndividedbyzero.bandcamp.com/track/nuklear-ebonpyre))
+
+    this is the oldest song here
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/nuklear-ebonpyre))
+
+    ancient rearrange of [[track:atomyk-ebonpyre]] by [[artist:toby-fox|Toby "Radiation" Fox]]
+---
+Track: Evolution
+Suffix Directory: true
+Always Reference By Directory: true
+Duration: 1:12
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/evolution
+Referenced Tracks:
+- track:evolution-pokemon-red-blue
+- track:victory-wild-pokemon-pokemon-red-blue
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/evolution))
+
+    quotes [[track:evolution-pokemon-red-blue|Evolution]] and [[track:victory-wild-pokemon-pokemon-red-blue|Victory (VS Wild Pokemon)]] by [[artist:junichi-masuda]]
+---
+Track: Virus
+Suffix Directory: true
+Duration: 1:26
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/virus
+Referenced Tracks:
+- Battle! (Deoxys)
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/virus))
+
+    quotes [[track:battle-deoxys|Battle (VS Deoxys)]] by [[artist:junichi-masuda]]/[[artist:go-ichinose]]/[[artist:morikazu-aoki]]
+---
+Track: The Rooftop
+Duration: 0:51
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/the-rooftop
+Referenced Tracks:
+- Three in the Morning
+- The Obsidian Towers
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/the-rooftop))
+
+    rearrange of [[track:three-in-the-morning|Three In The Morning]] by [[artist:clark-powell]] and also i think it quotes [[track:the-golden-towers]]/[[track:the-obsidian-towers]] by [[artist:solatrus|Jeremy "Solatrus" Iamurri]] i'm pretty sure
+---
+Track: Courtyard Demolitions (Subdued Version)
+Duration: 3:58
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/courtyard-demolitions-subdued-version
+Referenced Tracks:
+- Liquid Negrocity
+Commentary: |-
+    <i>keyboard cait:</i> ([Bandcamp about blurb](https://ndividedbyzero.bandcamp.com/track/courtyard-demolitions-subdued-version))
+
+    fun facts: this is the longest song i've made so far. it's also pretty boring, so apologies for that
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/courtyard-demolitions-subdued-version))
+
+    quotes [[track:liquid-negrocity]] by [[artist:toby-fox|Toby "Radiation" Fox]] for like 5 seconds
+---
+Track: Void
+Suffix Directory: true
+Always Reference By Directory: true
+Duration: 1:18
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/void
+Referenced Tracks:
+- track:opening-pokemon-black2-white2
+- The Frozen City
+Commentary: |-
+    <i>keyboard cait:</i> ([Bandcamp about blurb](https://ndividedbyzero.bandcamp.com/track/void))
+
+    a song for kyurem
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/void))
+
+    rearrange of [[track:opening-pokemon-black2-white2|Opening]] and [[track:the-frozen-city|Frozen City]] by [[artist:go-ichinose]]/[[artist:hitomi-sato]]
+---
+Track: Waveform
+Suffix Directory: true
+Always Reference By Directory: true
+Duration: 3:10
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/waveform
+Referenced Tracks:
+- Trepidation
+- Upward Movement (Dave Owns)
+- Negative Aperture
+- Miasmajesty
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/waveform))
+
+    rearrange of [[track:trepidation]] and [[track:negative-aperture]] by [[artist:svix]], quotes [[Upward Movement (Dave Owns)|Upward Movement]] by [[artist:kalibration|[Kalibration\]]] and [[track:miasmajesty]] by [[artist:solatrus|Jeremy "Solatrus" Iamurri]]
+---
+Track: Memory
+Suffix Directory: true
+Always Reference By Directory: true
+Duration: 2:42
+URLs:
+- https://ndividedbyzero.bandcamp.com/track/memory
+Referenced Tracks:
+- Eight Melodies (EarthBound)
+- Eight Melodies (EarthBound Beginnings)
+- Ohgodwhat
+- Lotus
+- track:plantation-cave-story
+- Moonsong
+- Doctor
+Referencing Sources: |-
+    <i>keyboard cait:</i> ([Bandcamp credits blurb](https://ndividedbyzero.bandcamp.com/track/memory))
+
+    quotes Eight Melodies by [[artist:keiichi-suzuki]] and [[artist:hirokazu-tanaka]] (both [[track:eight-melodies-earthbound|Earthbound]] and [[track:eight-melodies-earthbound-beginnings|Mother]] versions), [[track:ohgodwhat]] by [[artist:nick-smalley|Nick "OMGTSN" Smalley]], [[track:lotus]] by [[artist:seth-peelle|Seth "Beatfox" Peele]], [[track:plantation-cave-story|Cave Story (Plantation/Main Theme)]] and [[track:moonsong]] by [[artist:daisuke-amaya|Daisuke "Pixel" Amaya]], and [[track:doctor]] by [[artist:buzinkai|[Buzinkai\]]]
diff --git a/album/vgm/pokemon-black-white.yaml b/album/vgm/pokemon-black-white.yaml
index 7e9d15cc..49b1c367 100644
--- a/album/vgm/pokemon-black-white.yaml
+++ b/album/vgm/pokemon-black-white.yaml
@@ -24,6 +24,16 @@ URLs:
 Referenced Tracks:
 - Battle! (Elite Four) (Pokémon Ruby & Pokémon Sapphire)
 ---
+Track: Battle! (Reshiram/Zekrom)
+# Reference:
+#   https://vgmdb.net/album/20831
+Artists:
+- Junichi Masuda (composition)
+- Go Ichinose (arrangement)
+Duration: 4:29
+URLs:
+- https://www.youtube.com/watch?v=6PvpqAnobOQ
+---
 Track: Battle! (Strong Wild Pokémon)
 Name Detail: album
 # Reference:
diff --git a/album/vgm/pokemon-black2-white2.yaml b/album/vgm/pokemon-black2-white2.yaml
index bf22920a..1bd62784 100644
--- a/album/vgm/pokemon-black2-white2.yaml
+++ b/album/vgm/pokemon-black2-white2.yaml
@@ -91,6 +91,29 @@ Duration: 1:06
 URLs:
 - https://www.youtube.com/watch?v=LgO0WKqIQ3c
 ---
+Track: The Frozen City
+# Reference:
+#   https://vgmdb.net/album/33367
+Artists:
+- Hitomi Sato
+Duration: 2:02
+URLs:
+- https://www.youtube.com/watch?v=e5a3MVyX-ts
+Referenced Tracks:
+- track:opening-pokemon-black2-white2
+---
+Track: Opening
+Name Detail: album
+# Reference:
+#   https://vgmdb.net/album/33367
+Artists:
+- Go Ichinose
+Duration: 0:43
+Referenced Tracks:
+- track:title-screen-pokemon-red-blue
+URLs:
+- https://www.youtube.com/watch?v=BshaypuJZPw
+---
 Track: Pokémon World Tournament (PWT)
 # Reference:
 #   https://vgmdb.net/album/33367
diff --git a/album/vgm/pokemon-crystal.yaml b/album/vgm/pokemon-crystal.yaml
index 8f3e3a02..8ac9f8e7 100644
--- a/album/vgm/pokemon-crystal.yaml
+++ b/album/vgm/pokemon-crystal.yaml
@@ -7,6 +7,14 @@ Cover Art File Extension: png
 Groups:
 - Pokémon
 ---
+Track: Battle! (Suicune)
+Name Detail: album
+# no official release of original (not GB Sounds. those are not the same i swear) track
+Artists:
+- Junichi Masuda
+URLs:
+- https://www.youtube.com/watch?v=5AUv4uJLfqY
+---
 Track: Battle Tower (Johto)
 Name Detail: album
 # Reference:
diff --git a/album/vgm/pokemon-diamond-pearl.yaml b/album/vgm/pokemon-diamond-pearl.yaml
index 58132773..d5931223 100644
--- a/album/vgm/pokemon-diamond-pearl.yaml
+++ b/album/vgm/pokemon-diamond-pearl.yaml
@@ -7,6 +7,16 @@ Cover Art File Extension: png
 Groups:
 - Pokémon
 ---
+Track: Battle! (Dialga/Palkia)
+Name Detail: album
+# Reference:
+#   https://vgmdb.net/album/3945
+Artists:
+- Junichi Masuda
+Duration: 2:40
+URLs:
+- https://www.youtube.com/watch?v=Jc8UkrDIML8
+---
 Track: Battle! (Gym Leader)
 Name Detail: album
 # Reference:
diff --git a/album/vgm/pokemon-gold-silver.yaml b/album/vgm/pokemon-gold-silver.yaml
index f78b8853..8abf4667 100644
--- a/album/vgm/pokemon-gold-silver.yaml
+++ b/album/vgm/pokemon-gold-silver.yaml
@@ -65,6 +65,14 @@ Duration: 1:14
 URLs:
 - https://www.youtube.com/watch?v=7Wmk58-o_r8
 ---
+Track: 'Pokégear Radio: Unown'
+Name Detail: album
+# No official release.
+Artists:
+- Junichi Masuda
+URLs:
+- https://www.youtube.com/watch?v=9ObPMS21vJk
+---
 Track: Received a Pokémon Egg!
 Name Detail: album
 Artists:
diff --git a/album/vgm/pokemon-ruby-sapphire.yaml b/album/vgm/pokemon-ruby-sapphire.yaml
index 7817be46..9383a0a8 100644
--- a/album/vgm/pokemon-ruby-sapphire.yaml
+++ b/album/vgm/pokemon-ruby-sapphire.yaml
@@ -35,6 +35,16 @@ Duration: 1:51
 URLs:
 - https://www.youtube.com/watch?v=LaAGsbtETIg
 ---
+Track: Battle! (Super-Ancient Pokémon)
+Name Detail: album
+# Reference:
+#   https://vgmdb.net/album/1024
+Artists:
+- Junichi Masuda
+Duration: 1:29
+URLs:
+- https://www.youtube.com/watch?v=r2BWx32tXXo
+---
 Track: The Hall of Fame
 Name Detail: album
 # https://vgmdb.net/album/1024
diff --git a/artists.yaml b/artists.yaml
index 4778aedb..6e5bee28 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -12117,6 +12117,9 @@ Artist: Psychymify
 URLs:
 - https://www.tumblr.com/psychymify
 ---
+Artist: Puella Magi Madoka✩Magica
+Directory: puella-magi-madoka-magica
+---
 Artist: punkadorks
 URLs:
 - https://www.instagram.com/punkadorks/