video games beyond homestuck improvements

mainly lyrics and replacing dead yt links

5 files changed, 630 insertions, 49 deletions

diff --git a/album/desynced-vol-2.yaml b/album/desynced-vol-2.yaml
index 36da3a54..f3aa76b4 100644
--- a/album/desynced-vol-2.yaml
+++ b/album/desynced-vol-2.yaml
@@ -468,4 +468,4 @@ Referenced Tracks:
 - Lee's Theme
 - Daughter
 - Desynced Anthem
-- Battle! (Elite Four)
+- track:battle-elite-four-pokemon-black-and-white-versions
diff --git a/album/entertaining-sound.yaml b/album/entertaining-sound.yaml
index 4a59f515..b4875e6a 100644
--- a/album/entertaining-sound.yaml
+++ b/album/entertaining-sound.yaml
@@ -92,7 +92,7 @@ URLs:
 - https://conlangcritic.bandcamp.com/track/krespo2012
 - https://www.youtube.com/watch?v=l1_49gKZiOE
 Referenced Tracks:
-- File Select (SM64)
+- File Select (Super Mario 64)
 Commentary: |-
     <i>jan Misali:</i>
     remember when this was a meme
diff --git a/album/oceanfalls-vol-2.yaml b/album/oceanfalls-vol-2.yaml
index 479f9286..862183e0 100644
--- a/album/oceanfalls-vol-2.yaml
+++ b/album/oceanfalls-vol-2.yaml
@@ -32,7 +32,7 @@ URLs:
 - https://nightslights.bandcamp.com/track/a-wild-monster-appeared
 Has Cover Art: false
 Referenced Tracks:
-- Wild Battle
+- track:battle-wild-pokemon-pokemon-red-and-blue-versions
 ---
 Track: Moongaze
 Artists:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index edf36716..0bc1af04 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -40,13 +40,6 @@ URLs:
 Lyrics: |-
     (I'm thinking of a number between my buttocks. Do you know what it is? It's my credit score, and it happens to be seven hundred and twenty. The higher my credit score, the better chance I have of saving a lot of money. I'm thinking of a number; between four hundred and fifty and eight fifty. Do you know what it is? It happens to be seven hundred and twenty, which is my free credit score. This number is between my buttocks. This number, I am thinking, is between four hundred and fifty and eight fifty. The higher this number it is, the better chance I have at saving a lot of money. But the number is between my buttocks! Do you know what number it is? It happens to be between four fifty and eight fifty, and the number is between my buttocks. The number is seven hundred and twenty. But do you know what number I’m thinking of? I’m thinking of a number between my buttocks. It happens to be between four fifty and eight fifty, and it could save me a lot of money the higher it is. Fortunately that number is seven hundred and twenty, which is a number between four fifty and eight fifty. This number between four fifty and eight fifty happens to be between my buttocks. The higher the number is between my buttocks, the better chance I have at saving a lot of money. This number happens to be between my buttocks, which means I will save a lot of money. But do you know what number I’m thinking of? The number I’m thinking of is seven hundred and twenty, and it happens to be between my buttocks. It’s between four fifty and eight fifty. And it still happens to be between my buttocks. The higher this number is that’s between my buttocks, the better chance I have at saving a lot of money. Do you know what this number is? It’s my free credit score, and it happens to be seven hundred and twenty, and between my buttocks. The higher this number that is seven hundred and twenty is, that is between four fifty and eight fifty is, the better my chances at saving a lot of money. Between my buttocks. Won’t you reach in and grab it for me? I’m thinking that it’s seven hundred and twenty, and that it’s between my buttocks. Won’t you reach in and grab it? It’s a number between seven hundred and twenty and seven hundred and twenty, and it happens to be also between four fifty and eight fifty, and between my buttocks. Won’t you reach in and get it? I’m thinking that you can reach in and get it, because it is between my buttocks. Won’t you reach and and get this free credit report, that is between my buttocks. The number is between four fifty and eight fifty, and it happens to be seven hundred and twenty. The higher this number is that is seven hundred and twenty, the better chance I have at saving a lot of money between my buttocks. Won’t you reach in between my buttocks and grab this number? That is greater than four fifty, and less than eight fifty. This number is seven twenty, and you can grab it because it’s between my buttocks. It happens to be seven hundred and twenty, but do you know what number I’m thinking of? I’m thinking of a number that could save you a lot of money. It’s between my buttocks. It happens to be seven hundred and twenty, and it is between the numbers four fifty and eight fifty. It could save you a lot of money. A lot of money between my buttocks! But I’m thinking that this number is between four fifty and eight fifty. The higher this number is, although the highest can be eight hundred and fifty, the better chance you have of saving a lot of money. This number is between my buttocks. You can reach in between my buttocks and get a number. Hopefully this number is greater than four fifty and less than eight fifty. Otherwise it might not be your credit score! My credit score happens to be seven hundred and twenty, which as you all have noticed, is between four fifty and eight fifty. But do you know what number I’m thinking of? I’m thinking of a number between four fifty and eight fifty. Fortunately, seven hundred and twenty is this number, because it is between four hundred and fifty and eight hundred and fifty. But I’m thinking of a number between four fifty and eight fifty. Do you know what it is? It happens to be between my buttocks, and it could save you a lot of money. The higher this number between my buttocks is, the more money it could save you! I’m thinking of a number though, that is between my buttocks. It is still seven hundred and twenty. Won’t you reach in and grab seven hundred and twenty for me? Don’t grab four fifty or eight fifty, as these are the two extremes. These are not my free credit score. My free credit score happens to be seven hundred and twenty, but I’m thinking that you can reach in and grab it because it is between my buttocks. The number between my buttocks happens to be, well, I’m thinking that it’s seven hundred and twenty. But I could be wrong. Because your number could be anywhere between four fifty and eight fifty. I’m thinking that the number is probably seven hundred and twenty. Won’t you reach in and grab it for me? But I’m thinking of a number that is between my buttocks. Won’t you reach in and grab a number that’s between my buttocks? The number between four fifty and eight fifty is between my buttocks! The number seven hundred and twenty is between my buttocks! If you can reach in and grab this number that is between my buttocks, you can save a lot of money! The higher the number is between my buttocks, the more money you could save between my buttocks. I’m thinking of a number between my buttocks. This number is the aforementioned number between four fifty and eight fifty, and it happens to be between my buttocks. The higher the number is, the better chance you have of saving a lot of buttocks on your credit report. I’m thinking of buttocks between my numbers. The numbers happen to be four fifty and eight fifty, and they are between my buttocks. My buttocks happen to be between the numbers of four fifty and eight fifty. This number is seven hundred and twenty. I’m thinking that the number seven hundred and twenty could save you a lot of money. Do you know why? It’s between four fifty and eight fifty, and it’s also within my buttocks. You can reach in and grab a free credit report, that could save you a lot of money. I’m thinking that it’s between four fifty and eight fifty, and could save you a lot of money. Do you know what it is? It’s my buttocks! That you can reach in between! And get a number! That is seven hundred and twenty! That I am thinking of right now. The number is seven hundred and twenty, and you can reach in between my buttocks and get it. You can reach in between my buttocks and get a number. I’m thinking you can reach in between my buttocks for a number that’s between four fifty and eight fifty and my buttocks. Do you know what you can reach in between my buttocks to get? It’s your free credit report, and it happens for me to be seven hundred and twenty, and between my buttocks. You can reach in between my buttocks if you so choose, to retrieve this number, which is seven hundred and twenty, which happens to be between my buttocks. Why don’t you reach in between my buttocks? The higher that the number you reach in and grab in between my buttocks, the better chance you have at saving a lot of money, after you have reached in and grabbed a number, between my buttocks. I’m thinking though, that you might want to reach in and grab between my buttocks, in order to get a number that is between four fifty and eight fifty. The number that is between four fifty and eight fifty is less that eight fifty and greater than four fifty. And between my buttocks! The number happens to also be seven hundred and twenty, a number that is between four fifty and eight fifty, and between my buttocks. But I’m thinking that this number is greater than four fifty. But is it less than eight fifty? It’s seven hundred and twenty, and it happens to be your free credit score. The higher the number, the greater chance you have at saving a lot of money between my buttocks, if you reach in and grab it between my buttocks. I’m thinking you can reach in and grab between my buttocks a number that is seven hundred and twenty, which just so happens to be my credit score. Or, you could grab a number that is between four fifty and eight fifty. Do you know what it is? For me, it happens to be between my buttocks, and the number is seven hundred and twenty. Between my buttocks! You can reach in and grab a number between four fifty and eight fifty that happens so to be between my buttocks. If you grab this number that is between my buttocks, you can get a lot of money. Four fifty and eight fifty. These are the numbers that is has to be between. If you reach in and grab between my buttocks, you could save a lot of money. Your credit score could be saved a lot of. This could save you a lot of money, if you reach between my buttocks. I’m thinking this could save you a lot of money. If you reach in between my buttocks, you could save a lot of buttocks. Save a lot of buttocks in between my buttocks. Reach in between my buttocks and grab the number seven hundred and twenty. Save a lot of money if you grab in between my buttocks and grab a sember that it happens to be seven hundred and twenty. It’s a number between four fifty and eight fifty, and it happens to be a number between four fifty and eight fifty. This number between four fifty and eight fifty happens to be between my buttocks, and you can reach in and grab your free credit score which is between four fifty and eight fifty it happens to be in between my buttocks. The number is seven hundred and twenty, and it happens to be between four fifty and eight fifty, which is also between my buttocks. The numbers four fifty and eight fifty happen to be outside of seven hundred and twenty, which is in between the numbers four fifty and eight fifty. Which happens to have the numbers four fifty and eight fifty as the boundaries of seven hundred and twenty. Seven hundred and twenty is a number between my buttocks. You can reach in between my buttocks and grab a number. This number is your free credit report, and it happens to be- OH GOD NO! NO! NOO! HELP ME! IT’S EVERYWHERE! YOU CAN REACH IN BETWEEN MY BUTTOCKS! HELP! EIGHT FIFTY! FOUR FIFTY!)
 ---
-Track: Bowman Remix
-Artists:
-- Michael Guy Bowman
-Duration: '2:23'
-URLs:
-- https://www.youtube.com/watch?v=VukaD23AIfE
----
 Track: Celestial Fantasia
 Artists:
 - Seth Peelle
@@ -204,6 +197,10 @@ URLs:
 - https://soundcloud.com/plazmataz/pencil-holder-demo-version
 Referenced Tracks:
 - track:lori-and-erich-baker
+Lyrics: |-
+    (Countless bodies remain identified, some ending up in unmarked graves in small border town cemeteries.)
+
+    (I went out on a forensic case and the sheriff had a skull on his office desk. It was the skull of a younger person. And he was using it as a pencil holder. He had pens and pencils in the eye socket of this person. So that's when I decided something had to be done.)
 ---
 Track: radiation is now on youtube
 Artists:
@@ -284,7 +281,7 @@ Artists:
 - Hiroki Kikuta
 Duration: '1:33'
 URLs:
-- https://www.youtube.com/watch?v=4DCriOkhxqA
+- https://www.youtube.com/watch?v=jRYZI0ZpPGs
 ---
 Track: Bad Apple!!
 Artists:
@@ -302,8 +299,25 @@ Artists:
 Duration: '5:00'
 URLs:
 - https://www.youtube.com/watch?v=NvQBpb6eqp8
+Referenced Tracks:
+- Colress's Theme
+Lyrics: |-
+    Five
+    Four
+    Three
+    Two
+    One
+
+    Five four three two one
+    Two one
+    Two one
+
+    Five two
+    Five
+    Three
 ---
-Track: Battle! (Elite Four)
+Track: Battle! (Elite Four) (Pokémon Black & White Versions)
+Directory: battle-elite-four-pokemon-black-and-white-versions
 Artists:
 - Pokémon
 - Junichi Masuda
@@ -312,6 +326,15 @@ Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=llnXhrCn9Yo
 ---
+Track: Battle! Wild Pokémon (Pokémon Red & Blue Versions)
+Directory: battle-wild-pokemon-pokemon-red-and-blue-versions
+Artists:
+- Pokémon
+- Junichi Masuda
+Duration: '1:15'
+URLs:
+- https://www.youtube.com/watch?v=eBNcjvxLfFc
+---
 Track: Beginning
 Artists:
 - Castlevania
@@ -326,7 +349,7 @@ Artists:
 - Kenichi Matsubara
 Duration: '3:25'
 URLs:
-- https://www.youtube.com/watch?v=AxQGB7a-6xQ
+- https://www.youtube.com/watch?v=e2oZtvjg5oA
 ---
 Track: Bon Voyage, Amigo
 Artists:
@@ -374,6 +397,48 @@ Artists:
 Duration: '3:18'
 URLs:
 - https://www.youtube.com/watch?v=k4k1NdUEUP4
+Lyrics: |-
+    Ya weni marei mirekyarahire
+    Juri yu mirekerason
+    Kire hyari yoriherahe nyurahera
+    Nunnyura unera yurawera nyimerani
+
+    Chopperipo shurashurafe
+    Nannyuruni renifaferahi
+    Nannyuruni weranira shuraharahi
+    Nyurunirehara fe fe fe
+
+    Ya weni marei mirekyarahire
+    Juri yu mirekerason
+    Kire hyari yoriherahe nyurahera
+    Nunnyura unera yurawera fimera
+
+    Na nire jute mirekyaraherya
+    Nire yu mirekerason
+    Kire hyari nuriherahe nyurahera
+    Nunnyura unera yurawera fimerani
+
+    Ya weni marei mirekyarahire
+    Juri yu mirekerason
+    Ya weni marei mirekyarahire
+    Juri yu mirekerason
+    Ya weni marei mirekyarahire
+    Juri yu mirekerason
+    Ya weni marei mirekyarahire
+    Juri yu mirekerason-son-son-son-son-son-sonsonsonsonson—
+
+    Ya weni marei mirekyarahire
+    Juri yu mirekerason
+    Ha ha ha ha
+    Ha ha ha ha
+---
+Track: Colress's Theme
+Artists:
+- Pokémon
+- Hitomi Sato
+Duration: '0:30'
+URLs:
+- https://www.youtube.com/watch?v=UHZY3R5j12o
 ---
 Track: Corridors of Time
 Artists:
@@ -389,7 +454,7 @@ Artists:
 - Yasunori Mitsuda
 Duration: '2:00'
 URLs:
-- https://www.youtube.com/watch?v=g-s-VQBoUdc
+- https://www.youtube.com/watch?v=6uuHwOJF6Wo
 ---
 Track: DK Rap
 Artists:
@@ -401,6 +466,78 @@ Contributors:
 Duration: '3:28'
 URLs:
 - https://www.youtube.com/watch?v=q-yZ7_enlWA
+Lyrics: |-
+    Here, here, here we go!
+
+    So they're finally here, performing for you,
+    If you know the words, you can join in too,
+    Put your hands together, if you want to clap,
+    As we take you through, this monkey rap!
+
+    Huh!
+    D.K., Donkey Kong!
+
+    He's the leader of the bunch, you know him well,
+    He's finally back to kick some tail,
+    His Coconut Gun can fire in spurts,
+    If he shoots ya, it's gonna hurt,
+    He's bigger, faster, and stronger too,
+    He's the first member of the D.K. crew!
+
+    Huh!
+    D.K., Donkey Kong!
+    D.K., Donkey Kong is here!
+
+    This Kong's got style, so listen up dudes,
+    She can shrink in size, to suit her mood,
+    She's quick and nimble when she needs to be,
+    She can float through the air and climb up trees!
+    If you choose her, you'll not choose wrong,
+    With a skip and a hop, she's one cool Kong!
+
+    Huh!
+    D.K., Donkey Kong!
+
+    He has no style, he has no grace,
+    Th-th-th-this Kong has a funny face,
+    He can handstand when he needs to,
+    And stretch his arms out, just for you,
+    Inflate himself just like a balloon,
+    This crazy Kong just digs this tune!
+
+    Huh!
+    D.K., Donkey Kong!
+    D.K., Donkey Kong is here!
+
+    He's back again and about time too,
+    And this time he's in the mood,
+    He can fly real high with his jetpack on,
+    With his pistols out, he's one tough Kong!
+    He'll make you smile when he plays his tune,
+    But Kremlings beware 'cause he's after you!
+
+    Huh!
+    D.K., Donkey Kong!
+    Huh!
+
+    Finally, he's here for you,
+    It's the last member of the D.K. crew!
+    This Kong's so strong, it isn't funny,
+    Can make a Kremling cry out for mummy,
+    Can pick up a boulder with relative ease,
+    Makes crushing rocks seem such a breeze,
+    He may move slow, he can't jump high,
+    But this Kong's one hell of a guy!
+
+    Huh!
+    C'mon Cranky, take it to the fridge!
+
+    W-w-w-walnuts. peanuts. pineapple smells.
+    Grapes. melons. oranges and coconut shells!
+    Ahh yeah!
+    Walnuts, peanuts, pineapple smells,
+    Grapes, melons, oranges and coconut shells!
+    Ahh yeah!
 ---
 Track: Dragon Roost Island
 Artists:
@@ -437,7 +574,7 @@ Artists:
 - Hiroki Kikuta
 Duration: '2:12'
 URLs:
-- https://www.youtube.com/watch?v=w4Kv3ZlvQLw
+- https://www.youtube.com/watch?v=70Di1JbvdDI
 ---
 Track: Fall of Fall ~ Autumnal Waterfall
 Artists:
@@ -455,7 +592,7 @@ Duration: '1:42'
 URLs:
 - https://www.youtube.com/watch?v=dGna-qHdg-k
 ---
-Track: File Select (SM64)
+Track: File Select (Super Mario 64)
 Directory: file-select-sm64
 Artists:
 - Super Mario
@@ -470,7 +607,7 @@ Artists:
 - Yasunori Mitsuda
 Duration: '1:49'
 URLs:
-- https://www.youtube.com/watch?v=9YsAyO9oW00
+- https://www.youtube.com/watch?v=-URzvnaZpbE
 ---
 Track: Game Over
 Directory: game-over-bootleg
@@ -497,6 +634,47 @@ Artists:
 Duration: '2:09'
 URLs:
 - https://www.youtube.com/watch?v=iYcRQBrUbd0
+Lyrics: |-
+    GO MY WAY!! Go mae e! (<i>GO MY WAY!! Go in front!</i>)
+    Ganbatte yukimashou (<i>Let's go forward with our best</i>)
+    Ichiban daisuki na (<i>I want to become the me</i>)
+    Watashi ni naritai (<i>That I like the most</i>)
+
+    Non-stop de ittemimashou (<i>Let's go forward non-stop</i>)
+    Tte omottara mata akashingou (<i>That's what I thought, but there was another red light</i>)
+    Sonna toki wa hekomanaide (<i>At times like that, don't be down</i>)
+    Highway ga aru, fight! (<i>There's the highway, fight!</i>)
+
+    Full throttle, tobashite mimashou (<i>Let's go flying at full throttle</i>)
+    Tte omottara speed seigen (<i>That's what I thought, but there was a speed limit</i>)
+    Konna toki wa nayamanaide (<i>At times like this, don't worry about about it</i>)
+    Jet ga aru, flight! (<i>There are jet planes, flight!</i>)
+
+    Mirai wa dare ni mo mienai mono (<i>No one can predict the future</i>)
+    Dakara dare mo ga yume o miteru (<i>That's why everyone has dreams</i>)
+    Donna chizu ni mo nottenai kedo (<i>You can't find them on any map, but</i>)
+    Donna toki demo kanaete kitayo (<i>No matter the era, they've been fulfilled</i>)
+    Saa yukou! (<i>Now, let's go!</i>)
+
+    GO MY WAY!! Go my ue e!! (<i>GO MY WAY!! Go my way up!</i>)
+    Egao mo namida demo (<i>With smiling faces and even tears</i>)
+    Kono sekaijuu ga (<i>This whole world is a</i>)
+    Wonderland na Neverland (<i>Wonderland-like Neverland</i>)
+
+    GO MY WAY!! Go mae e!! (<i>GO MY WAY!! Go in front!</i>)
+    Ganbatte yukimashou (<i>Let's go forward with our best</i>)
+    Ichiban daisuki na (<i>I want to become the me</i>)
+    Watashi ni naritai (<i>That I like the most</i>)
+
+    GO MY WAY!! Go my ue e!! (<i>GO MY WAY!! Go my way up!</i>)
+    Hora hitori hitori ga (<i>Each and every one of us</i>)
+    Kono sekaijuu de (<i>Throughout the world are the</i>)
+    One and only demo not lonely (<i>One and only but not lonely</i>)
+
+    GO MY WAY!! Go mae e!! (<i>GO MY WAY!! Go in front!</i>)
+    Harikitte yukimashou (<i>Let's move forward enthusiastically</i>)
+    Subete no kagayaki (<i>All of the shining things</i>)
+    Kono yubi ni tomare (<i>Come rest on this finger</i>)
 ---
 Track: Ground Theme (Super Mario Bros.)
 Artists:
@@ -509,9 +687,10 @@ URLs:
 Track: Guile's Theme
 Artists:
 - Street Fighter
+- Yoko Shimomura
 Duration: '4:05'
 URLs:
-- https://www.youtube.com/watch?v=Iof5pRAIZmw
+- https://www.youtube.com/watch?v=nSsggxGdFpM
 ---
 Track: Haltmann Works Co. HQ
 Artists:
@@ -539,7 +718,29 @@ Artists:
 - Mitsuto Suzuki
 Duration: '4:28'
 URLs:
-- https://www.youtube.com/watch?v=4CTjzAL3XT8
+- https://www.youtube.com/watch?v=W50atec80dM
+Lyrics: |-
+    Stars shine in the deep sky
+    Endless stories of the distant yesterdays
+
+    Take me in your arms
+    Keep me in your heart
+    Take me in your arms
+    Keep me in your heart
+
+    Time is flying by
+    The only moment is now
+    The only moment is now
+    Feel that everything is real
+    Everything is real in dream
+
+    Going on a trip to somewhere
+    Never been across time and space
+
+    Time and space
+    Time and space
+    Time and space
+    Time and space
 ---
 Track: Hotel Mario
 Artists:
@@ -575,14 +776,170 @@ Contributors:
 Duration: '4:09'
 URLs:
 - https://www.youtube.com/watch?v=e9r5hx47kxM
+Sampled Tracks:
+- super mario bros jump and coin collect sfx
+Lyrics: |-
+    Here we go, off the rails
+    Don't you know it's time to raise our sails?
+    It's freedom like you never knew
+
+    Don't need bags, or a pass
+    Say the word, I'll be there in a flash
+    You could say my hat is off to you
+
+    Oh, we can zoom all the way to the moon
+    From this great wide wacky world
+    Jump with me, grab coins with me
+    Oh, yeah!
+
+    It's time to jump up in the air (Jump up in the air)
+    Jump up, don't be scared (Jump up, don't be scared)
+    Jump up and your cares will soar away
+
+    And if the dark clouds start to swirl (Dark clouds start to swirl)
+    Don't fear, don't shed a tear, 'cause
+    I'll be your 1-UP girl
+
+    So let's all jump up super high (Jump up super high)
+    High up in the sky (High up in the sky)
+    There's no power-up like dancing
+
+    You know that you're my superstar (You're my superstar)
+    No one else can take me this far
+    I'm flipping the switch
+    Get ready for this
+    Oh, let's do the odyssey
+
+    Odyssey, ya see!
+    Odyssey, ya see!
+    Odyssey, ya see!
+    Odyssey, ya see!
+    Odyssey, ya see!
+    Odyssey, ya see!
+    Odyssey, ya see!
+    Odyssey, odyssey!
+
+    Spin the wheel, take a chance
+    Every journey starts a new romance
+    A new world's calling out to you
+
+    Take a turn, off the path
+    Find a new addition to the cast
+    You know that any captain needs a crew
+
+    Take it in stride as you move side-to-side
+    They're just different points of view
+    Jump with me, grab coins with me
+    Oh, yeah!
+
+    Come on and jump up in the air (Jump up in the air)
+    Jump without a care (Jump without a care)
+    Jump up 'cause you know that I'll be there
+
+    And if you find you're short on joy (Find you're short on joy)
+    Don't fret, just don't forget that
+    You're still our 1-UP boy
+
+    So go on, straighten up your cap (Straighten up your cap)
+    Let your toes begin to tap (Toes begin to tap)
+    This rhythm is a power shroom
+
+    Don't forget you're the superstar (You're the superstar)
+    No one else could make it this far
+    Put a comb through that 'stache
+    Now you've got panache
+    Oh, let's do the odyssey
+
+    It's time to jump up in the air (Jump up in the air)
+    Jump up, don't be scared (Jump up, don't be scared)
+    Jump up and your cares will soar away
+
+    And if the dark clouds start to swirl (Dark clouds start to swirl)
+    Don't fear, don't shed a tear, 'cause
+    I'll be your 1-UP girl
+
+    Now listen, all you boys and girls (All you boys and girls)
+    All around the world (All around the world)
+    Don't be afraid to get up and move
+
+    You know that we're all superstars (We're all superstars)
+    We're the ones who made it this far
+    Put a smile on that face
+    There's no time to waste
+    So, let's do the odyssey
+---
+Track: Katamari on the Rocks
+Artists:
+- Katamari Damacy
+- Yuu Miyake
+- Keita Takahashi (lyrics)
+Contributors:
+- Masayuki Tanaka (vocals)
+- Tomomi Suzuki (vocals)
+Duration: '5:57'
+URLs:
+- https://www.youtube.com/watch?v=iMH49ieL4es
+Lyrics: |-
+    Nana nananananana na nana na nanana
+    Nana nananananana na nana na nanana
+    Nana nananananana na nana na nanana
+    Nana nananananana na nana na nanana na na na na
+
+    Don't worry do your best! (Wow!)
+    Picnic kibun feel so good! (Huh!) (<i>This picnic feeling feels so good!</i>)
+    Suteki na afternoon! (<i>A wonderful afternoon!</i>)
+    Furachi na midnight yeah! (<i>An audacious midnight, yeah!</i>)
+
+    Katamete korogasu I love you itsudemo smile for you (<i>Clumping and rolling, I love you and I'll always smile for you</i>)
+    Kimi dake ni love moon hey so ganbaranakucha (<i>This love moon is just for you, hey so you gotta do your best</i>)
+    Compression, compression
+
+    Osoroi no t-shirt! (Hey!) (<i>Matching t-shirts!</i>)
+    Teami no mafira tou! (Oh yeah!) (<i>And hand knit scarves and such!</i>)
+    Heartwarming mejiro-oshi! (Go, go, go!) (<i>They're packed with heartwarmingness!</i>)
+    Hitare etsu say goodbye! (Bye-bye!) (<i>Soak up the jooy, say goodbye!</i>)
+
+    Minna katamete shimaimashou funpatsu shichaimasu (<i>Let's all roll together, I'm really working up a sweat</i>)
+    Konna hi wa utatte odorou shuyaku wa boku dakedo (<i>On a day like this we should dance and sing, though I'm the star of the show</i>)
+    It's my way, it's my way
+
+    Nana nananananana na na Katamari Damacy
+    Nana nananananana na na Katamari Damacy
+    Nana nananananana na na Katamari Damacy
+    Nana nananananana na na Katamari Damacy
+
+    (Go, go, go!)
+    (Wow!)
+    (Yeah yeah yeah!)
+
+    Katamari Damacy
+
+    Peace na kibun yoishirete! (Go!) (<i>Get drunk on a peaceful feeling!</i>)
+    Kagayaki heaven akogarete! (<i>Long for the twinkling heavens!</i>)
+    Suteki sa sono atama! (Go!) (<i>Your mind is wonderful!</i>)
+    Mou o-matsuri sawagi sa! (Yeah!) (<i>We're already making merry!</i>)
+
+    Sou suru koto ga maru de Big Bang anata-iro ni somemasu (<i>This is just like the Big Bang, I'm painting it your color</i>)
+    Nanika to riyuu wo mitsukete wa party ga shitai no desu (<i>If you're looking for a reason, it's because I wanna party</i>)
+    Katamate katamate (<i>Rolling on, rolling on</i>)
+
+    Nana nananananana na na Katamari Damacy
+    Nana nananananana na na Katamari Damacy
+    Nana nananananana na na Katamari Damacy
+    Nana nananananana na na Katamari Damacy
+
+    Nana nananananana na na Katamari Damacy
+    Nana nananananana na na Katamari Damacy
+    Nana nananananana na na Katamari Damacy
+    Nana nananananana na na Katamari Damacy
 ---
 Track: Layton's Theme
 Artists:
-- Professor Layton and the Curious Village
+- Professor Layton
 - Tomohito Nishiura
 Duration: '2:10'
 URLs:
-- https://www.youtube.com/watch?v=dFBKHSitIjo
+- https://www.youtube.com/watch?v=lL6on-bOybk
 ---
 Track: Left-Hand Remix
 Artists:
@@ -595,6 +952,14 @@ Artists:
 Duration: '2:55'
 URLs:
 - https://www.youtube.com/watch?v=2xNDTPbdO80
+Lyrics: |-
+    And pose!
+    Let's sit down!
+    P-p-p-punch!
+
+    Wubbadubbadubba 'zat true? (Yes.)
+    Whoa, you go big guy!
+    Pose for the fans!
 ---
 Track: Lonely Rolling Star
 Artists:
@@ -605,6 +970,66 @@ Contributors:
 Duration: '5:44'
 URLs:
 - https://www.youtube.com/watch?v=7_QydNXI_ok
+Referenced Tracks:
+- Katamari on the Rocks
+Lyrics: |-
+    Hidamari sansan (<i>Laying in the sun, brilliantly bright</i>)
+    Kokoro wa haremoyou (<i>My heart will swell and grow sunny</i>)
+    Futatsu no hitomi wa (<i>Those two eyes, right down to the pupils</i>)
+    Himawari no tane no you (<i>Are like sunflowers and their seeds</i>)
+
+    Katarai kasanari (<i>Chatting, piling up</i>)
+    Katamari karamari (<i>Katamari entangling</i>)
+    Issho ni iru koto (<i>Being together</i>)
+    Zettai hitsuzen (<i>Is absolutely necessary</i>)
+
+    Demo anata daiji na yume wo egaku (<i>Except you are drawing out your important dream</i>)
+    Owaru made wa zutto sou koko de matteiru (<i>Until you’re finished, throughout it all, I’ll be here waiting for you </i>)
+
+    Your lonely rolling star
+    Tachidomaranaide nee (<i>Come on, never stand still!</i>)
+    Your lonely rolling star
+    Saa mae wo muite yukou (<i>So, face forward and keep going!</i>)
+
+    Hoshizora kira kira (<i>A sky of stars sparkling and glittering</i>)
+    Konpei tou no you (<i>Like confetti waiting to congratulate you </i>)
+    Amakute setsunai (<i>It invites sweet</i>)
+    Omoi ga tsunoru no (<i>And painful thoughts</i>)
+
+    Dakishimeta omoi wa yozora wo mai (<i>The thoughts that I’ve embraced and dance in the night sky</i>)
+    Kyuukouka shite anata no moto e todoku kara (<i>All of a sudden I want to lend a hand, to deliver myself by your side</i>)
+
+    Your lonely rolling star
+    Akiramenaide yo nee (<i>Don’t ever give up!</i>)
+    Your lonely rolling star
+    Tama ni wa denwa shite (<i>Don’t forget to call sometimes!</i>)
+    Your lonely rolling star
+    Aitai yo ima sugu (<i>I want to come to you, right now!</i>)
+    Your lonely rolling star
+    Haa tameiki ga hitotsu koboreru (<i>Haa, a single sigh escapes</i>)
+
+    Lonely, lonely, lonely roller
+    Lonely, lonely, lonely roller
+    Lonely, lonely, lonely roller
+    Lonely, lonely, lonely roller
+    Roller
+
+    Lonely, lonely, lonely roller
+    Lonely, lonely, lonely roller
+    Lonely, lonely, lonely roller
+    Lonely, lonely, lonely roller
+    Roller
+
+    Raigetsu mata ano basho de machiawase shiyou ka (<i>Next month, shall we meet at that place? </i>)
+
+    Your lonely rolling star
+    Tachidomaranaide nee (<i>Come on, never stand still!</i>)
+    Your lonely rolling star
+    Omoidashite yo nee (<i>Remember me, okay?</i>)
+    Your lonely rolling star
+    Matterarenai no nee (<i>I can’t keep on waiting!</i>)
+    Your lonely rolling star
+    Saa mae wo muite yukou (<i>So face forward and keep going!</i>)
 ---
 Track: Megalovania
 Directory: megalovania-halloween
@@ -617,11 +1042,10 @@ URLs:
 Track: 'Milky Way Wishes: Shooting'
 Artists:
 - Kirby
-- Shogo Sakai
-- Megumi Ohara
-Duration: '2:17'
+- Jun Ishikawa
+Duration: '0:50'
 URLs:
-- https://www.youtube.com/watch?v=DuVGZdzEGF8
+- https://www.youtube.com/watch?v=hPT77G3LGwA
 ---
 Track: Moon Over the Castle
 Artists:
@@ -651,9 +1075,9 @@ Track: Neos City (Night)
 Artists:
 - Pokémon
 - Hiroki Hashimoto
-Duration: '4:27'
+Duration: '2:15'
 URLs:
-- https://www.youtube.com/watch?v=nXipo_gVMCs
+- https://www.youtube.com/watch?v=PTQBFoM_cVw
 ---
 Track: Nuclear Fusion
 Artists:
@@ -729,6 +1153,32 @@ Artists:
 Duration: '2:27'
 URLs:
 - https://www.youtube.com/watch?v=I81rQxSXz-s
+Lyrics: |-
+    If only I could just conjure a spell
+    Kapow! Hocus hocus hocus!
+
+    Peck your beak
+    Peck your beak
+    Stretch out your neck!
+
+    Ready!
+    Three, go!
+
+    Two flipper rolls, one, two!
+
+    One! Two! Three!
+    One! Two! Three!
+    OK, it's on!
+    It's up to you!
+
+    Hey baby
+    How's it going?
+    This beat
+    Is non-stop!
+
+    Jab, jab, jab, jab
+    Go go go!
+    One two
 ---
 Track: RollerCoaster Tycoon Theme
 Artists:
@@ -769,6 +1219,106 @@ Artists:
 Duration: '4:34'
 URLs:
 - https://www.youtube.com/watch?v=AOaT98I-dRo
+Lyrics: |-
+    Say "Alright!" (Alright!)
+    Say "Oh yeah!" (Oh yeah!)
+    Whatcha gonna do?  (Whatcha gonna do!)
+    (I gotta believe!) I gotta believe!
+
+    If you thought your dreams were fulfilled before
+    You need to come on back, Jack
+    Look who walked in the door
+    It's Parappa The Rapper, and my name is Pos
+    I'm known to emcee for free or a cost
+    If you be at the mosque, synagogue, or church
+    Drop to your knees and pray for Parappa The Rapper
+    To save the day and make you scream hooray!
+    Just clap on time, 'cause it's time to play
+
+    I know you're slick and smooth, cool with an attitude
+    On the right track, leader of the pack
+    Kickin' back, never looking back
+    You know my words won't satisfy
+    What I have now, deep inside of me (Inside of me)
+    And all I need is much security
+
+    When you're needed for a mission, he got your back
+    Sure to have a cool time, man, that's a fact
+    Yo, he's a good friend, never ever a foe
+    So come on and let's go
+
+    We are the concentrated Vitamin D, with the title
+    Hookin' it up, speedy quick, like noodles to cup
+    It ain't nothin' for the one man
+    Buttin' to move somethin'
+    Runnin' par rappin' through laps
+    Hurdlin' raps
+    And just when you thought your game was dead
+    Well, we got you cookin' up rhymes all in your think kettle
+    Proceed and click the next level for fun, player (Oh, oh yeah)
+    Play ya game, player number one 
+
+    True love that speaks the truth
+    You know it'll help me through
+    In the cold night
+    In the morning, all night
+    Or even in a fight
+    You know you should come home to me
+    We can have fun until the early morning light
+
+    Aw yeah
+    Aw yeah, oh
+    Oh, oh
+    Oh
+
+    Here to serve up a dish like Sunny Chan
+    You know I'm the man
+    Here to have fun
+    Wanna have a taste?
+    Here, have some
+    Servin' up O's by the oodles
+    Oh, I forgot
+    Parappa The Rapper, he don't like noodles
+    We like eating snapper that's red
+    Freestyle from the top of the head
+    Yo, Parappa got skill
+    Why don't you give it try, see what you can build
+    Tasty like fruit that's peeled
+    Watch your heels, you might slip and fall
+    And if you do, you know who to call (Who?)
+    It's Parappa the Rapper and De La, y'all
+
+    You and me can walk together
+    And down the road forever
+    And smell and touch the treasures of life
+    Every day
+    Love and hate are face to face
+    And good and bad are back to back
+    Every day, uh huh
+    Uh huh, uh huh, oh yeah, yay
+
+    Switch on your 36 inches
+    You in the boob tube, trapped deep
+    'Til the game watch you sleep
+    Overdosed on moves taught by the sensei
+    Your timing's all off, tiger
+    You in the little leagues
+    Striking out a De La joint
+    Book a session for the Plugs and PJ
+    To come train the camp, y'all
+    Mooselini, graffiti tag and plug dose (Dose, dose, dose)
+    Game over, I'm ghost (Ghost, ghost)
+
+    When you're needed for a mission, he got your back
+    Sure to have a cool time, man, that's a fact
+    Yo, he's a good friend, never ever a foe
+    Come on, everybody, saddle up and let's go
+
+    All my people say "Alright!" (Alright!)
+    Yeah, that was good, now let me hear you say "Oh yeah!" (Oh yeah!) (Oh yeah)
+    Now let me hear you say "Whatcha gonna do?" (Whatcha gonna do?)
+    Come on, y'all, let me hear you say "I gotta believe!" (I gotta believe!) (Believe...)
+    Oh yeah, oh yeah, oh yeah, oh yeah, yay
 ---
 Track: Schala's Theme
 Artists:
@@ -776,7 +1326,7 @@ Artists:
 - Yasunori Mitsuda
 Duration: '2:48'
 URLs:
-- https://www.youtube.com/watch?v=rIJxrAHuk7Q
+- https://www.youtube.com/watch?v=-iPLxszqpW4
 ---
 Track: September Pumpkin
 Artists:
@@ -810,6 +1360,16 @@ Duration: '5:49'
 URLs:
 - https://www.youtube.com/watch?v=vkAmD8A3CRk
 ---
+Track: Soul 0 System
+Artists:
+- Kirby
+- Hirokazu Ando
+Duration: '1:20'
+URLs:
+- https://www.youtube.com/watch?v=QMXmQkfNpGs
+Referenced Tracks:
+- 'Milky Way Wishes: Shooting'
+---
 Track: Splatoon "Squid Kid" TV Commercial
 Artists:
 - Splatoon
@@ -839,7 +1399,7 @@ Contributors:
 - The Super Mario Players (performance)
 Duration: '3:25'
 URLs:
-- https://www.youtube.com/watch?v=s8Mx18uR1dY
+- https://www.youtube.com/watch?v=-rfoYSmx0rk
 ---
 Track: Stone Tower Temple
 Artists:
@@ -847,7 +1407,7 @@ Artists:
 - Koji Kondo
 Duration: '2:00'
 URLs:
-- https://www.youtube.com/watch?v=wz_NK5HgR6Q
+- https://www.youtube.com/watch?v=oMSCjGJp8Gk
 ---
 Track: Super Dry Dance
 Artists:
@@ -866,13 +1426,13 @@ Duration: '3:50'
 URLs:
 - https://www.youtube.com/watch?v=PiI7rDqv9FQ
 ---
-Track: The Decisive Battle
+Track: The Decisive Battle (Final Fantasy VI)
 Artists:
 - Final Fantasy
 - Nobuo Uematsu
-Duration: '2:00'
+Duration: '0:53'
 URLs:
-- https://www.youtube.com/watch?v=6SB4_iQWwoQ
+- https://www.youtube.com/watch?v=bMOa3rjtHkE
 ---
 Track: 'The Flintstones: The Rescue of Dino & Hoppy - Title Theme/Ending'
 Artists:
@@ -889,9 +1449,9 @@ Track: The Little Sprite
 Artists:
 - Secret of Mana
 - Hiroki Kikuta
-Duration: 0:51
+Duration: 0:40
 URLs:
-- https://www.youtube.com/watch?v=WCVqfgc2730
+- https://www.youtube.com/watch?v=1ycSii9sQ_0
 ---
 Track: The Primal Scene of Japan the Girl Saw
 Artists:
@@ -970,7 +1530,7 @@ Artists:
 - Super Mario
 Duration: '2:50'
 URLs:
-- https://www.youtube.com/watch?v=J6YwX03nFQM
+- https://www.youtube.com/watch?v=Bv9ou1vzVXE
 ---
 Track: Vagrant Counting Song of Retrospection
 Artists:
@@ -982,7 +1542,7 @@ URLs:
 - https://open.spotify.com/track/1NQNE28NAB4PFmF6NVwQzV
 Referenced Tracks:
 - Bright Spinning Planet
-- 'Milky Way Wishes: Shooting'
+- Soul 0 System
 - Haltmann Works Co. HQ
 ---
 Track: Vela-Nova
@@ -992,6 +1552,35 @@ Artists:
 Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=-7WQn-SXYZ4
+Lyrics: |-
+    Step by step
+    Step by step
+
+    Step by step
+
+    Step by step
+
+    Step by step
+
+    Step by step
+    Step by step
+
+    Step
+    By
+    Step
+
+    Step by step
+    Step by step
+    Step by step
+    Step by step
+
+    Step by step
+
+    Step by step
+
+    Step by step
+
+    (Ah, let's do it.)
 ---
 Track: Waluigi Pinball / Wario Stadium
 Artists:
@@ -999,7 +1588,7 @@ Artists:
 - Shinobu Tanaka
 Duration: '2:11'
 URLs:
-- https://www.youtube.com/watch?v=FT6PZUTdd04
+- https://www.youtube.com/watch?v=psIuCn2jVNk
 ---
 Track: Where the Guns at
 Artists:
@@ -1010,21 +1599,13 @@ Duration: '2:20'
 URLs:
 - https://www.youtube.com/watch?v=fe359yiaPi8
 ---
-Track: Wild Battle
-Artists:
-- Pokémon
-- Junichi Masuda
-Duration: '1:15'
-URLs:
-- https://www.youtube.com/watch?v=eBNcjvxLfFc
----
 Track: Wind Scene
 Artists:
 - Chrono Trigger
 - Yasunori Mitsuda
-Duration: '3:23'
+Duration: '1:33'
 URLs:
-- https://www.youtube.com/watch?v=5ejTIgXexyg
+- https://www.youtube.com/watch?v=zDhy7TBqJ0E
 ---
 Track: You Gained a Level!
 Artists:
diff --git a/album/strife.yaml b/album/strife.yaml
index 3ffbe5f9..d90a5c6b 100644
--- a/album/strife.yaml
+++ b/album/strife.yaml
@@ -100,7 +100,7 @@ URLs:
 Referenced Tracks:
 - The Raising Fighting Spirit
 - Reverse Situation
-- The Decisive Battle
+- The Decisive Battle (Final Fantasy VI)
 ---
 Track: Knife's Edge
 Art Tags: