bad apple lovelight

5 files changed, 103 insertions, 93 deletions

diff --git a/album/bowmania.yaml b/album/bowmania.yaml
index 6a737d54..6acb9d8e 100644
--- a/album/bowmania.yaml
+++ b/album/bowmania.yaml
@@ -173,9 +173,9 @@ Art Tags:
 - Michael Guy Bowman
 Duration: 03:38
 Referenced Tracks:
-- Bad Apple!! feat. nomico
+- track:bad-apple-lovelight
 Sampled Tracks:
-- Bad Apple!! feat. nomico
+- track:bad-apple-lovelight
 # - Texas History
 - Bowman's Credit Score
 URLs:
diff --git a/album/le-canrivalry-album-is-mandatory.yaml b/album/le-canrivalry-album-is-mandatory.yaml
index 79c20d68..baee8032 100644
--- a/album/le-canrivalry-album-is-mandatory.yaml
+++ b/album/le-canrivalry-album-is-mandatory.yaml
@@ -109,7 +109,7 @@ Referenced Tracks:
 - The Nutshack Intro
 - Feel Good Inc.
 - Busting Makes Me Feel Good
-- Bad Apple!! feat. nomico
+- track:bad-apple-lovelight
 - Guy Fieri takes you to FLAVORTOWN
 - Moshi Moshi?
 - Thundersnail
@@ -163,7 +163,7 @@ Sampled Tracks:
 - The Nutshack Intro
 - Feel Good Inc.
 - Busting Makes Me Feel Good
-- Bad Apple!! feat. nomico
+- track:bad-apple-lovelight
 - Guy Fieri takes you to FLAVORTOWN
 - Moshi Moshi?
 - Thundersnail
@@ -503,7 +503,7 @@ Referenced Tracks:
 - track:slider-super-mario-64
 - Inspector Gadget Main Theme
 - Moshi Moshi?
-- Bad Apple!! feat. nomico
+- track:bad-apple-lovelight
 - Meet the Flintstones
 - We Are Number One
 ---
@@ -672,7 +672,7 @@ URLs:
 Referenced Tracks:
 - Bad Apple!!
 - le canrival
-- Bad Apple!! feat. nomico
+- track:bad-apple-lovelight
 ---
 Track: HEHEHE I AM THE GREATEST CANRIVAL RIPPING WARRIA IN THE GALAXY
 Additional Names:
@@ -923,7 +923,7 @@ Referenced Tracks:
 - Moshi Moshi?
 - We Are Number One
 - Inspector Gadget Main Theme
-- Bad Apple!! feat. nomico
+- track:bad-apple-lovelight
 - Harlequin
 - Waters of Nazareth
 Sampled Tracks:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 08e97c2c..6ec44bfa 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -2376,90 +2376,6 @@ Duration: 3:13
 URLs:
 - https://youtu.be/S-wnMPOV-5g
 ---
-Track: Bad Apple!! feat. nomico
-Artists:
-- Touhou Project
-- Masayoshi Minoshima
-Contributors:
-- nomico (vocals)
-Duration: 3:13
-URLs:
-- https://youtu.be/i41KoE0iMYU
-Referenced Tracks:
-- Bad Apple!!
-Lyrics: |-
-    Nagareteku toki no naka de demo kedarusa ga hora guruguru mawatte
-    (<i>Even in the midst of flowing time, I feel languid, look, spinning around and around</i>)
-    Watashi kara hanareru kokoro mo mienaiwa sou shiranai?
-    (<i>I can't even see the heart that's leaving me, didn't you know?</i>)
-    Jibun kara ugoku koto mo naku toki no sukima ni nagasare tsuzukete
-    (<i>I can't even get myself to move, I continue to be washed down the cracks of time</i>)
-    Shiranai wa mawari no koto nado watashi wa watashi sore dake
-    (<i>I don't know anything about what's around me, I'm just me and no more</i>)
-
-    Yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
-    (<i>Am I dreaming? Or seeing nothing? My words are useless even if I speak</i>)
-    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
-    (<i>I'm just tired of being sad, I should go on without feeling anything</i>)
-    Tomadou kotoba ataerarete mo jibun no kokoro tada uwa no sora
-    (<i>Even if you give me the words I'm at a loss for, my heart just won't pay attention</i>)
-    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
-    (<i>If I move myself away, if I change everything, I'll turn it all black</i>)
-
-    Konna jibun ni mirai wa aru no? Konna sekai ni watashi wa iru no?
-    (<i>Is there a future for someone like me? Will I still exist in a world like this?</i>)
-    Ima setsunai no? Ima kanashii no? Jibun no koto mo wakaranai mama
-    (<i>Is this painful? Is it sad? Not even knowing myself</i>)
-    Ayumu koto sae tsukareru dake yo hito no koto nado shiri mo shinaiwa
-    (<i>I'm just tired even of walking, I don't even understand people</i>)
-    Konna watashi mo kawareru no nara moshi kawareru no nara shiro ni naru
-    (<i>If someone like me can change, if I can change, will I turn white?</i>)
-
-    Nagareteku toki no naka de demo kedarusa ga hora guruguru mawatte
-    (<i>Even in the midst of flowing time, I feel languid, look, spinning around and around</i>)
-    Watashi kara hanareru kokoro mo mienaiwa sou shiranai?
-    (<i>I can't even see the heart that's leaving me, didn't you know?</i>)
-    Jibun kara ugoku koto mo naku toki no sukima ni nagasare tsuzukete
-    (<i>I can't even get myself to move, I continue to be washed down the cracks of time</i>)
-    Shiranai wa mawari no koto nado watashi wa watashi sore dake
-    (<i>I don't know anything about what's around me, I'm just me and no more</i>)
-
-    Yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
-    (<i>Am I dreaming? Or seeing nothing? My words are useless even if I speak</i>)
-    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
-    (<i>I'm just tired of being sad, I should go on without feeling anything</i>)
-    Tomadou kotoba ataerarete mo jibun no kokoro tada uwa no sora
-    (<i>Even if you give me the words I'm at a loss for, my heart just won't pay attention</i>)
-    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
-    (<i>If I can move, if I change everything, I'll turn it all black</i>)
-
-    Muda na jikan ni mirai wa aru no? Konna tokoro ni watashi wa iru no?
-    (<i>Is there a future to come out of this useless time? Will I exist in a place like this?</i>)
-    Watashi no koto wo iitai naraba kotoba ni suru no nara rokudenashi
-    (<i>If I wanted to tell you what kind of person I am, the words I'd use would be "good for nothing"</i>)
-    Konna tokoro ni watashi wa iru no? Konna jikan ni watashi wa iru no?
-    (<i>Will I exist in a place like this? Will I exist in a time like this?</i>)
-    Konna watashi mo kawareru no nara moshi kawareru no nara shiro ni naru
-    (<i>If someone like me can change, if I can change, will I turn white?</i>)
-
-    Ima yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
-    (<i>Am I dreaming now? Or seeing nothing? My words are useless even if I speak</i>)
-    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
-    (<i>I'm just tired of being sad, I should go on without feeling anything</i>)
-    Tomadou kotoba ataeraretemo jibun no kokoro tada uwa no sora
-    (<i>Even if you give me the words I'm at a loss for, my heart just won't pay attention</i>)
-    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
-    (<i>If I can move, if I change everything, I'll turn it all black</i>)
-
-    Ugoku no naraba ugoku no naraba subete kowasuwa subete kowasuwa
-    (<i>If I move, if I move, I'll destroy everything, I'll destroy everything</i>)
-    Kanashimu naraba kanashimu naraba watashi no kokoro shiroku kawareru?
-    (<i>If I grieve, if I grieve, can my heart turn white?</i>)
-    Anata no koto mo watashi no koto mo subete no koto mo mada shiranai no
-    (<i>I still don't know about you, about myself, about everything</i>)
-    Omoi mabuta wo aketa no naraba subete kowasu no nara kuro ni nare!
-    (<i>If I can open my heavy eyelids, if I break everything, then turn black!</i>)
----
 Track: A Bad Dream
 # From Earthbound, which had an official album release but this track isn't on it.
 # Reference:
@@ -19834,6 +19750,96 @@ Referenced Tracks:
 - Bonetrousle
 - track:megalovania-undertale
 ---
+Track: Bad Apple!!
+Directory: bad-apple-lovelight
+Always Reference By Directory: true
+Artists:
+- Touhou Project
+- Masayoshi Minoshima
+Contributors:
+- nomico (vocals)
+Duration: 5:18
+URLs:
+- https://www.youtube.com/watch?v=9f053Y2IKgk
+Referenced Tracks:
+- Bad Apple!!
+Lyrics: |-
+    Nagareteku toki no naka de demo kedarusa ga hora guruguru mawatte
+    (<i>Even in the midst of flowing time, I feel languid, look, spinning around and around</i>)
+    Watashi kara hanareru kokoro mo mienaiwa sou shiranai?
+    (<i>I can't even see the heart that's leaving me, didn't you know?</i>)
+    Jibun kara ugoku koto mo naku toki no sukima ni nagasare tsuzukete
+    (<i>I can't even get myself to move, I continue to be washed down the cracks of time</i>)
+    Shiranai wa mawari no koto nado watashi wa watashi sore dake
+    (<i>I don't know anything about what's around me, I'm just me and no more</i>)
+
+    Yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
+    (<i>Am I dreaming? Or seeing nothing? My words are useless even if I speak</i>)
+    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
+    (<i>I'm just tired of being sad, I should go on without feeling anything</i>)
+    Tomadou kotoba ataerarete mo jibun no kokoro tada uwa no sora
+    (<i>Even if you give me the words I'm at a loss for, my heart just won't pay attention</i>)
+    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
+    (<i>If I move myself away, if I change everything, I'll turn it all black</i>)
+
+    Konna jibun ni mirai wa aru no? Konna sekai ni watashi wa iru no?
+    (<i>Is there a future for someone like me? Will I still exist in a world like this?</i>)
+    Ima setsunai no? Ima kanashii no? Jibun no koto mo wakaranai mama
+    (<i>Is this painful? Is it sad? Not even knowing myself</i>)
+    Ayumu koto sae tsukareru dake yo hito no koto nado shiri mo shinaiwa
+    (<i>I'm just tired even of walking, I don't even understand people</i>)
+    Konna watashi mo kawareru no nara moshi kawareru no nara shiro ni naru
+    (<i>If someone like me can change, if I can change, will I turn white?</i>)
+
+    Nagareteku toki no naka de demo kedarusa ga hora guruguru mawatte
+    (<i>Even in the midst of flowing time, I feel languid, look, spinning around and around</i>)
+    Watashi kara hanareru kokoro mo mienaiwa sou shiranai?
+    (<i>I can't even see the heart that's leaving me, didn't you know?</i>)
+    Jibun kara ugoku koto mo naku toki no sukima ni nagasare tsuzukete
+    (<i>I can't even get myself to move, I continue to be washed down the cracks of time</i>)
+    Shiranai wa mawari no koto nado watashi wa watashi sore dake
+    (<i>I don't know anything about what's around me, I'm just me and no more</i>)
+
+    Yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
+    (<i>Am I dreaming? Or seeing nothing? My words are useless even if I speak</i>)
+    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
+    (<i>I'm just tired of being sad, I should go on without feeling anything</i>)
+    Tomadou kotoba ataerarete mo jibun no kokoro tada uwa no sora
+    (<i>Even if you give me the words I'm at a loss for, my heart just won't pay attention</i>)
+    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
+    (<i>If I can move, if I change everything, I'll turn it all black</i>)
+
+    Muda na jikan ni mirai wa aru no? Konna tokoro ni watashi wa iru no?
+    (<i>Is there a future to come out of this useless time? Will I exist in a place like this?</i>)
+    Watashi no koto wo iitai naraba kotoba ni suru no nara rokudenashi
+    (<i>If I wanted to tell you what kind of person I am, the words I'd use would be "good for nothing"</i>)
+    Konna tokoro ni watashi wa iru no? Konna jikan ni watashi wa iru no?
+    (<i>Will I exist in a place like this? Will I exist in a time like this?</i>)
+    Konna watashi mo kawareru no nara moshi kawareru no nara shiro ni naru
+    (<i>If someone like me can change, if I can change, will I turn white?</i>)
+
+    Ima yume miteru? Nani mo mitenai? Kataru mo muda na jibun no kotoba
+    (<i>Am I dreaming now? Or seeing nothing? My words are useless even if I speak</i>)
+    Kanashimu nante tsukareru dake yo nani mo kanjizu sugoseba ii no
+    (<i>I'm just tired of being sad, I should go on without feeling anything</i>)
+    Tomadou kotoba ataeraretemo jibun no kokoro tada uwa no sora
+    (<i>Even if you give me the words I'm at a loss for, my heart just won't pay attention</i>)
+    Moshi watashi kara ugoku no naraba subete kaeru no nara kuro ni suru
+    (<i>If I can move, if I change everything, I'll turn it all black</i>)
+
+    Ugoku no naraba ugoku no naraba subete kowasuwa subete kowasuwa
+    (<i>If I move, if I move, I'll destroy everything, I'll destroy everything</i>)
+    Kanashimu naraba kanashimu naraba watashi no kokoro shiroku kawareru?
+    (<i>If I grieve, if I grieve, can my heart turn white?</i>)
+    Anata no koto mo watashi no koto mo subete no koto mo mada shiranai no
+    (<i>I still don't know about you, about myself, about everything</i>)
+    Omoi mabuta wo aketa no naraba subete kowasu no nara kuro ni nare!
+    (<i>If I can open my heavy eyelids, if I break everything, then turn black!</i>)
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor, 6/17/2025)
+
+    Details for this track, including name and duration, are from its release on [Lovelight](https://vgmdb.net/album/5827), but it's most known for backing [【東方】Bad Apple!! ＰＶ【影絵】](https://www.youtube.com/watch?v=FtutLA63Cp8).
+---
 Track: Badgers
 Directory: badgers-mrweebl
 Always Reference By Directory: true
diff --git a/album/some-artifacts-may-occur.yaml b/album/some-artifacts-may-occur.yaml
index 90cd29bb..e0a5635d 100644
--- a/album/some-artifacts-may-occur.yaml
+++ b/album/some-artifacts-may-occur.yaml
@@ -77,7 +77,7 @@ Additional Names:
     ["alt MediaFire download"](https://skaia.net/post/65202358188/its-finally-done-a-complete-collection-of-all) `Track List.txt`
 Duration: 4:37
 Referenced Tracks:
-- Bad Apple!! feat. nomico
+- track:bad-apple-lovelight
 ---
 Track: Adios, Toreador
 Duration: 6:31
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index fa246870..d0a7c23b 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -119,6 +119,8 @@ Content: |-
     - touched up commentary in [[album:7th-gate-project]]
     <!-- tracks newly marked as a secondary release -->
     - marked tracks across [[album:deltarune-ch1-ost]] and [[album:deltarune-ch2-ost]] as secondary releases, with main releases now on [[album:deltarune-soundtrack]] (thanks, ruby!)
+    <!-- tracks moved within an album, etc -->
+    - moved [[track:bad-apple-lovelight]] ([[artist:masayoshi-minoshima]]) from "Music from video games" to "Other music originating outside Homestuck" (thanks, Lan, bit!)
     <!-- general removals -->
     - removed dead link in commentary for [[track:threxecute]] (thanks, Lilith!)
     - removed Bandcamp listening links across [[album:the-strider-mixtape]] (thanks, Geese, Lilith!)
@@ -189,6 +191,7 @@ Content: |-
     - fixed Bandcamp link in booklet commentary for [[track:dwelling-among-the-dream-bubbles]] (was to a functioning, but outdated, "the-divide-ep" URL; thanks, Lilith!)
     <!-- link fixes -->
     - fixed YouTube listening link for [[track:invincibility-bgm-smb]] (was to [SMB2 overworld theme](https://www.youtube.com/watch?v=yBISfv-6hfo); thanks, Lilith, Lan!)
+    - replaced dead YouTube listening links for [[track:bad-apple]] ([[artist:zun]]) and [[track:bad-apple-lovelight]] ([[artist:masayoshi-minoshima]]; thanks, Lan, bit, Cello!)
     - removed dead Bandcamp listening link for [[album:bl1nd-just1c3-1nv3st1g4t1on-soapstone]] (thanks, Lilith, Lan!)
     <!-- general data fixes -->
     - fixed duration of various tracks to align with Nintendo Music: (thanks, ruby!)
@@ -202,6 +205,7 @@ Content: |-
     <h3>directory changes</h3>
     <details><summary><b>Toggle Directorylog</b></summary>
     - changed directories of all tracks across [[album:deltarune-ch1-ost]] and [[album:deltarune-ch2-ost]] to be suffixed `-ch1` and `-ch2` respectively; previous directories now used across [[album:deltarune-soundtrack]]
+    - changed directory of [[track:bad-apple-lovelight]] from `bad-apple-feat-nomico` to `bad-apple-lovelight`
     - changed directory of [[track:death-mountain-theme]] from `death-mountain-the-legend-of-zelda` to `death-mountain-theme`
     - changed directory of [[track:ending-theme-the-legend-of-zelda]] from `ending-the-legend-of-zelda` to `ending-theme-the-legend-of-zelda`
     - changed directory of [[track:ganon-is-defeated]] from `ganon-appear-defeat-fanfare` to `ganon-is-defeated`
@@ -2031,7 +2035,7 @@ Content: |-
     - fixed [[track:fighting-spirit-double-ascended-form]] referencing itself and not [[track:fighting-spirit-second-form]] (thx, 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!)
-    - fixed [[track:the-tacocats-secret-slide]] not referencing [[track:inspector-gadget-main-theme]], [[track:moshi-moshi]], [[track:bad-apple-feat-nomico]], [[track:meet-the-flintstones]], and [[track:we-are-number-one]] (thanks, Rosetta Leijonde, vriska/leo!)
+    - fixed [[track:the-tacocats-secret-slide]] not referencing [[track:inspector-gadget-main-theme]], [[track:moshi-moshi]], [[track:bad-apple-lovelight]], [[track:meet-the-flintstones]], and [[track:we-are-number-one]] (thanks, Rosetta Leijonde, vriska/leo!)
     - fixed [[track:le-psyrival]] not sampling [[track:gentleman-psy]]
     - fixed [[track:hehehe-i-am-the-greatest-canrival-ripping-warria-in-the-galaxy]] not sampling [[track:the-greatest-warrior-in-the-galaxy-ever]] and not referencing [[track:the-greatest-warrior-in-the-galaxy]] (thanks, FF!)
     - fixed [[track:flickwave]] not sampling [[track:flicker-porter-robinson]] (thanks, Rosetta Leijonde!)