From 5d9cb570cdad35d6b5bd88428f60b587ae3214d0 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sun, 24 May 2026 18:41:26 -0300 Subject: Pokémon X / Pokémon Y -> Pokémon X & Pokémon Y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I mean, ok, I wasn't referring to X&Y specifically, but --- album/_.yaml | 4 +- album/alterniabound.yaml | 2 +- album/call-and-new-ii-emergency-phone-call.yaml | 2 +- ...gba-pokemon-unbound-super-music-collection.yaml | 48 ++++---- album/gotta-hatch-em-all.yaml | 2 +- ...emon-scarlet-violet-super-music-collection.yaml | 58 +++++----- ...okemon-sword-shield-super-music-collection.yaml | 60 +++++----- album/references-beyond-homestuck.yaml | 128 ++++++++++----------- album/super-smash-bros-ultimate.yaml | 8 +- 9 files changed, 156 insertions(+), 156 deletions(-) diff --git a/album/_.yaml b/album/_.yaml index 36f45c0c..7210b98e 100644 --- a/album/_.yaml +++ b/album/_.yaml @@ -67,11 +67,11 @@ URLs: - https://coolandnewwebcomic.bandcamp.com/track/congratulations-on-updating-the-comic - https://www.youtube.com/watch?v=EYg40zl51mg Referenced Tracks: -- Hall of Fame (Pokémon FireRed / Pokémon LeafGreen) +- Hall of Fame (Pokémon FireRed & Pokémon LeafGreen) - Homestuck Anthem - Penumbra Phantasm Sampled Tracks: -- Hall of Fame (Pokémon FireRed / Pokémon LeafGreen) +- Hall of Fame (Pokémon FireRed & Pokémon LeafGreen) --- Track: Calm Before the Storm Artists: diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml index b0320958..a7944501 100644 --- a/album/alterniabound.yaml +++ b/album/alterniabound.yaml @@ -620,7 +620,7 @@ Referenced Tracks: - track:MeGaLoVania - Vagabounce - Beatdown (Strider Style) -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) MIDI Project Files: - Title: MIDI (from Sburbmon) Artists: [Twix Stix] diff --git a/album/call-and-new-ii-emergency-phone-call.yaml b/album/call-and-new-ii-emergency-phone-call.yaml index 3fe765e8..73f85bb0 100644 --- a/album/call-and-new-ii-emergency-phone-call.yaml +++ b/album/call-and-new-ii-emergency-phone-call.yaml @@ -219,7 +219,7 @@ URLs: - https://coolandnewwebcomic.bandcamp.com/track/i-transcribed-a-pokemon-song-but-due-to-time-constraints-i-fucked-up-the-ending Referenced Tracks: - AAAAAAAAAAAA -- Battle Tower (Pokémon Diamond / Pokémon Pearl) +- Battle Tower (Pokémon Diamond & Pokémon Pearl) Sampled Tracks: - AAAAAAAAAAAA --- diff --git a/album/gba-pokemon-unbound-super-music-collection.yaml b/album/gba-pokemon-unbound-super-music-collection.yaml index 0bd70164..c662a93f 100644 --- a/album/gba-pokemon-unbound-super-music-collection.yaml +++ b/album/gba-pokemon-unbound-super-music-collection.yaml @@ -140,8 +140,8 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/title-screen - https://www.youtube.com/watch?v=USz8SvAQ1a0 Referenced Tracks: -- 'Title Screen: Main Theme (Pokémon Ruby / Pokémon Sapphire)' -- Title Screen (Pokémon Black / Pokémon White) +- 'Title Screen: Main Theme (Pokémon Ruby & Pokémon Sapphire)' +- Title Screen (Pokémon Black & Pokémon White) - The Borrius Motif --- Track: Borrian History @@ -160,7 +160,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/a-new-journey-begins - https://www.youtube.com/watch?v=6UActjGb068 Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- Track: Encounter! Hoopa Duration: 0:24 @@ -294,7 +294,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/victory-against-wild-pok-mon - https://www.youtube.com/watch?v=m2nmJZTDalo Referenced Tracks: -- Victory! (Wild Pokémon) (Pokémon Red / Pokémon Blue) +- Victory! (Wild Pokémon) (Pokémon Red & Pokémon Blue) --- Track: Bellin Town (Day) Duration: 0:55 @@ -312,7 +312,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/pok-mon-center-day-2 - https://www.youtube.com/watch?v=0IxYd_9PSTc Referenced Tracks: -- Pokémon Center (Pokémon Red / Pokémon Blue) +- Pokémon Center (Pokémon Red & Pokémon Blue) --- Track: Friendly Shop Duration: 0:46 @@ -322,7 +322,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/friendly-shop - https://www.youtube.com/watch?v=fs5Jq_tcRl0 Referenced Tracks: -- Poké Mart (Pokémon Ruby / Pokémon Sapphire) +- Poké Mart (Pokémon Ruby & Pokémon Sapphire) --- Track: Hurry Along Suffix Directory: true @@ -333,7 +333,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/hurry-along - https://www.youtube.com/watch?v=PVnVYl_9mrI Referenced Tracks: -- Guide (Pokémon Red / Pokémon Blue) +- Guide (Pokémon Red & Pokémon Blue) --- Track: Icicle Cave Duration: 1:05 @@ -443,7 +443,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/dresco-town-gym - https://www.youtube.com/watch?v=2bRMGznrWso Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Battle! Gym Leader Suffix Directory: true @@ -462,7 +462,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/victory-against-gym-leader - https://www.youtube.com/watch?v=e8NCXsJuo9E Referenced Tracks: -- Victory! (Gym Leader Battle) (Pokémon Red / Pokémon Blue) +- Victory! (Gym Leader Battle) (Pokémon Red & Pokémon Blue) --- Track: Evolution Suffix Directory: true @@ -473,7 +473,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/evolution - https://www.youtube.com/watch?v=HNVAhiMKzcw Referenced Tracks: -- Evolution (Pokémon Red / Pokémon Blue) +- Evolution (Pokémon Red & Pokémon Blue) --- Track: Black Ferrothorn Appears! Duration: 1:02 @@ -581,7 +581,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/crater-town-gym - https://www.youtube.com/watch?v=kHAEXahYgpQ Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Encounter! Gentleman Duration: 0:39 @@ -728,7 +728,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/blizzard-city-gym - https://www.youtube.com/watch?v=sLmtV7g8qTU Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Encounter! Birdkeeper Duration: 0:27 @@ -810,7 +810,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/fallshore-city-gym-feat-mel - https://www.youtube.com/watch?v=AFBnMH6tSdI Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) - Beta Gym Theme --- Track: Route 11 @@ -988,7 +988,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/dehara-city-gym - https://www.youtube.com/watch?v=WyQWWkLNlSo Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Surf Suffix Directory: true @@ -1077,7 +1077,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/antisis-city-gym - https://www.youtube.com/watch?v=wlzquh1gtNE Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Seaport City (Day) Duration: 1:13 @@ -1106,7 +1106,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/polder-town-gym - https://www.youtube.com/watch?v=WZz_fNJFBwY Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Cootes Bog Duration: 1:41 @@ -1179,7 +1179,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/redwood-village-gym - https://www.youtube.com/watch?v=Ew4fykWMzMc Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Victory Road Duration: 1:10 @@ -1326,7 +1326,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/battle-gym-leader-sinnoh - https://www.youtube.com/watch?v=LvF0Tomqd2Y Referenced Tracks: -- Battle! (Gym Leader) (Pokémon Diamond / Pokémon Pearl) +- Battle! (Gym Leader) (Pokémon Diamond & Pokémon Pearl) --- Track: Frozen Forest Duration: 1:06 @@ -1355,7 +1355,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/battle-regirock-regice-registeel - https://www.youtube.com/watch?v=3nxK3LQQiOE Referenced Tracks: -- Battle! (Regirock/Regice/Registeel) (Pokémon Ruby / Pokémon Sapphire) +- Battle! (Regirock/Regice/Registeel) (Pokémon Ruby & Pokémon Sapphire) --- Track: Tehl Town (Night) Duration: 0:59 @@ -1776,7 +1776,7 @@ URLs: Referenced Tracks: - Battle! (Frontier Brain—Hoenn Version) - Battle! (Frontier Brain—Sinnoh Version) -- Battle! (Elite Four) (Pokémon Ruby / Pokémon Sapphire) +- Battle! (Elite Four) (Pokémon Ruby & Pokémon Sapphire) - PWT Final Round! --- Track: Challenging the Pokémon League! @@ -1787,7 +1787,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/challenging-the-pok-mon-league - https://www.youtube.com/watch?v=Swpz4mD-3qM Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) - The Borrius Motif --- Track: Elite 4 Appears! @@ -1808,7 +1808,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/battle-elite-4-2 - https://www.youtube.com/watch?v=T-6jZiLxnmk Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) - PWT Final Round! --- Track: Victory Against Elite 4! @@ -1857,7 +1857,7 @@ URLs: - https://pascalpotatovandenbos.bandcamp.com/track/hall-of-fame-2 - https://www.youtube.com/watch?v=3apIZLLAT4M Referenced Tracks: -- Hall of Fame (Pokémon Red / Pokémon Blue) +- Hall of Fame (Pokémon Red & Pokémon Blue) --- Track: Staff Credits Suffix Directory: true @@ -1875,7 +1875,7 @@ Referenced Tracks: - The Borrius Motif - KBT Expressway - Auburn Waterway -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) - Frozen Heights (Day) --- Track: The End diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml index e1b8ac13..00f65ee7 100644 --- a/album/gotta-hatch-em-all.yaml +++ b/album/gotta-hatch-em-all.yaml @@ -33,7 +33,7 @@ URLs: - https://sahcon.bandcamp.com/track/title-theme Referenced Tracks: - FIDUSPAWN, GO! -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- Track: Welcome to the World of Fiduspawn! Duration: 3:17 diff --git a/album/pokemon-scarlet-violet-super-music-collection.yaml b/album/pokemon-scarlet-violet-super-music-collection.yaml index b9367124..90680f30 100644 --- a/album/pokemon-scarlet-violet-super-music-collection.yaml +++ b/album/pokemon-scarlet-violet-super-music-collection.yaml @@ -129,7 +129,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=h3M322QWZC4 Referenced Tracks: -- Obtained a Pokémon (Pokémon Red / Pokémon Blue) +- Obtained a Pokémon (Pokémon Red & Pokémon Blue) --- Track: Poco Path Additional Names: @@ -178,7 +178,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=YzwBuNUVdWE Referenced Tracks: -- Obtained a Berry! (Pokémon Ruby / Pokémon Sapphire) +- Obtained a Berry! (Pokémon Ruby & Pokémon Sapphire) --- Track: Obtained an Item! Additional Names: @@ -294,7 +294,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=Qd8Fce4vGSo Referenced Tracks: -- Pokémon Caught (Pokémon Red / Pokémon Blue) +- Pokémon Caught (Pokémon Red & Pokémon Blue) --- Track: Pokémon Center Additional Names: @@ -307,7 +307,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/aa235d23-71dc-4c4f-902b-413200fbcda6 - https://www.youtube.com/watch?v=WMhh1t4tYpY Referenced Tracks: -- Pokémon Center (Pokémon Red / Pokémon Blue) +- Pokémon Center (Pokémon Red & Pokémon Blue) --- Track: Pokémon Healed Additional Names: @@ -320,7 +320,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/96b57e64-89ee-48c3-9430-86f176d2e45a - https://www.youtube.com/watch?v=6mhdhfG6bTI Referenced Tracks: -- Recovery (Pokémon Red / Pokémon Blue) +- Recovery (Pokémon Red & Pokémon Blue) --- Track: Happy Birthday! Additional Names: @@ -461,7 +461,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/25259a12-3286-4ef7-b804-edb7fe6bcffd - https://www.youtube.com/watch?v=jcXDSddMoC8 Referenced Tracks: -- Pokémon Healed (Pokémon Red / Pokémon Blue) +- Pokémon Healed (Pokémon Red & Pokémon Blue) --- Track: Starting the Treasure Hunt! Additional Names: @@ -596,7 +596,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=34FdX-9rGa8 Referenced Tracks: -- Received a Pokémon Egg! (Pokémon Gold / Pokémon Silver) +- Received a Pokémon Egg! (Pokémon Gold & Pokémon Silver) --- Track: Evolution Additional Names: @@ -609,7 +609,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/c8970e5a-e65f-4ef4-949b-e81644ba5ed7 - https://www.youtube.com/watch?v=EhHlMrD_a8s Referenced Tracks: -- Evolution (Pokémon Red / Pokémon Blue) +- Evolution (Pokémon Red & Pokémon Blue) --- Track: Congratulations! Your Pokémon Evolved! Additional Names: @@ -621,7 +621,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=aYGpvpToJ-s Referenced Tracks: -- 'Fanfare: Evolution (Pokémon Red / Pokémon Blue)' +- 'Fanfare: Evolution (Pokémon Red & Pokémon Blue)' --- Section: Disc 2 Start Counting From: 1 @@ -649,7 +649,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/bb0ac589-f08d-4974-bc25-f752bc820275 - https://www.youtube.com/watch?v=Y4FiuVCib8w Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Passed the Gym Test! Additional Names: @@ -674,7 +674,7 @@ URLs: - https://www.youtube.com/watch?v=ZraHu3IacTo Referenced Tracks: - Gym Test -- Victory! (Gym Leader Battle) (Pokémon Red / Pokémon Blue) +- Victory! (Gym Leader Battle) (Pokémon Red & Pokémon Blue) --- Track: Obtained a Badge! Additional Names: @@ -687,7 +687,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/aec0206d-2313-43bd-8d60-da2b425eb173 - https://www.youtube.com/watch?v=aM9_LFAmptc Referenced Tracks: -- Obtained a Gym Badge (Pokémon Red / Pokémon Blue) +- Obtained a Gym Badge (Pokémon Red & Pokémon Blue) --- Track: Obtained a TM! Additional Names: @@ -699,7 +699,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=0uBhMvnBkXU Referenced Tracks: -- Received a TM! (Pokémon Gold / Pokémon Silver) +- Received a TM! (Pokémon Gold & Pokémon Silver) --- Track: West Province Additional Names: @@ -791,7 +791,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/5aadc182-860a-4ddb-9e87-8dbb420dec32 - https://www.youtube.com/watch?v=CBfeDr1PC98 Referenced Tracks: -- Guide (Pokémon Red / Pokémon Blue) +- Guide (Pokémon Red & Pokémon Blue) --- Track: Battle! (Titan) Additional Names: @@ -1127,7 +1127,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/3334ed47-d29a-497e-a75e-08da63ef2c57 - https://www.youtube.com/watch?v=A0pKXJcgEKE Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: MC of RIP Additional Names: @@ -1212,7 +1212,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/f8ef9f53-0573-4c96-ab04-02647480c089 - https://www.youtube.com/watch?v=CLFXTAlR42o Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: The Pokémon League Interview Additional Names: @@ -1224,7 +1224,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/daf07585-381a-46f6-a8f4-f15205c5106b - https://www.youtube.com/watch?v=8SiKiSWRnjw Referenced Tracks: -- The Final Road (Pokémon Red / Pokémon Blue) +- The Final Road (Pokémon Red & Pokémon Blue) --- Track: Passed the Interview Additional Names: @@ -1269,7 +1269,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/aed52fc1-268d-412d-a6e4-4d2e47a88ba8 - https://www.youtube.com/watch?v=oni7wbcHfhs Referenced Tracks: -- Battle! (Champion) (Pokémon Gold / Pokémon Silver) +- Battle! (Champion) (Pokémon Gold & Pokémon Silver) --- Track: Victory! (Top Champion) Additional Names: @@ -1664,7 +1664,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/d35b4ad0-1ee0-46ae-a210-d00c5c51d409 - https://www.youtube.com/watch?v=PKgYt-l0agA Referenced Tracks: -- Pokédex Evaluation... Complete! (Pokémon Gold / Pokémon Silver) +- Pokédex Evaluation... Complete! (Pokémon Gold & Pokémon Silver) --- Track: Title Screen Additional Names: @@ -1677,8 +1677,8 @@ URLs: - https://m.nintendo.com/shared/US/tracks/432a3561-34c9-46cf-abac-456f543a33ea - https://www.youtube.com/watch?v=cyOUWdwll50 Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) -- 'Title Screen: Main Theme (Pokémon Ruby / Pokémon Sapphire)' +- Title Screen (Pokémon Red & Pokémon Blue) +- 'Title Screen: Main Theme (Pokémon Ruby & Pokémon Sapphire)' --- Section: Disc 5 Start Counting From: 1 @@ -1772,7 +1772,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/d0adc905-d163-4ce5-a5aa-64ce03c2446a - https://www.youtube.com/watch?v=jD_UFbccXfQ Referenced Tracks: -- 'Pokégear Radio: Pokémon March (Pokémon Gold / Pokémon Silver)' +- 'Pokégear Radio: Pokémon March (Pokémon Gold & Pokémon Silver)' --- Track: Photo (Battle) Additional Names: @@ -1784,7 +1784,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/e8ed7230-497e-4a66-abbd-c264bc872b8b - https://www.youtube.com/watch?v=CP378J2Jp3o Referenced Tracks: -- Battle! (Wild Pokémon—Johto Version) (Pokémon Gold / Pokémon Silver) +- Battle! (Wild Pokémon—Johto Version) (Pokémon Gold & Pokémon Silver) --- Track: Photo (Pokémon Lullaby) Additional Names: @@ -1796,7 +1796,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/2f3c80ba-602f-4a0d-a916-1101075ad482 - https://www.youtube.com/watch?v=5HQX5S3MRQw Referenced Tracks: -- 'Pokégear Radio: Pokémon Lullaby (Pokémon Gold / Pokémon Silver)' +- 'Pokégear Radio: Pokémon Lullaby (Pokémon Gold & Pokémon Silver)' --- Track: Perrin's Theme Additional Names: @@ -2071,7 +2071,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/7b24ca89-aba8-4043-b2aa-c59620b2906f - https://www.youtube.com/watch?v=kst-WJrXa5U Referenced Tracks: -- Battle! (Wild Pokémon) (Pokémon Black / Pokémon White) +- Battle! (Wild Pokémon) (Pokémon Black & Pokémon White) --- Track: Terarium (Coastal Biome) Additional Names: @@ -2110,7 +2110,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/7e2cbbd7-d81a-480b-bb49-4cfbbb8c267b - https://www.youtube.com/watch?v=PvAbixv5ETY Referenced Tracks: -- Battle! (Trainer Battle) (Pokémon Black / Pokémon White) +- Battle! (Trainer Battle) (Pokémon Black & Pokémon White) - Blueberry Academy --- Section: Disc 6 @@ -2204,7 +2204,7 @@ URLs: - https://www.youtube.com/watch?v=tcZMd7axt7A Referenced Tracks: - Battle! (Terarium Pokémon) -- Battle! (Strong Wild Pokémon) (Pokémon Black / Pokémon White) +- Battle! (Strong Wild Pokémon) (Pokémon Black & Pokémon White) - Area Zero --- Track: The Flying Time Trial @@ -2448,7 +2448,7 @@ URLs: - https://m.nintendo.com/shared/US/tracks/69a4dd1e-468b-4a75-aab4-4492c21c3ad5 - https://www.youtube.com/watch?v=ypDharbiC-w Referenced Tracks: -- Relic Song (Pokémon Black / Pokémon White) +- Relic Song (Pokémon Black & Pokémon White) --- Track: 'The Hidden Treasure of Area Zero: Epilogue' Additional Names: @@ -2518,4 +2518,4 @@ URLs: - https://m.nintendo.com/shared/US/tracks/bde15e45-af69-48ea-9b57-cc14b5f4211a - https://www.youtube.com/watch?v=ylq89oYTv9A Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) diff --git a/album/pokemon-sword-shield-super-music-collection.yaml b/album/pokemon-sword-shield-super-music-collection.yaml index b4c2c746..82372170 100644 --- a/album/pokemon-sword-shield-super-music-collection.yaml +++ b/album/pokemon-sword-shield-super-music-collection.yaml @@ -40,8 +40,8 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/759f2f39-3ecd-4d76-8fd2-5beafa787298 - https://www.youtube.com/watch?v=BJ3HOz8OWOE Referenced Tracks: -- Hall of Fame (Pokémon Red / Pokémon Blue) -- Title Screen (Pokémon Red / Pokémon Blue) +- Hall of Fame (Pokémon Red & Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- Track: Exhibition Match Additional Names: @@ -114,7 +114,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/32ff3804-24c9-44c7-88da-0497e6c5665f - https://www.youtube.com/watch?v=yMXa_2W6MSU Referenced Tracks: -- Pokémon Healed (Pokémon Red / Pokémon Blue) +- Pokémon Healed (Pokémon Red & Pokémon Blue) --- Track: Battle! (Hop) Additional Names: @@ -158,7 +158,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=0ECOk8W_u_Y Referenced Tracks: -- Level Up! (Pokémon Red / Pokémon Blue) +- Level Up! (Pokémon Red & Pokémon Blue) --- Track: Pokémon Research Lab Additional Names: @@ -190,7 +190,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=CNzQ_NLgpP4 Referenced Tracks: -- Obtained a Pokémon (Pokémon Red / Pokémon Blue) +- Obtained a Pokémon (Pokémon Red & Pokémon Blue) --- Track: Pokémon Center Additional Names: @@ -203,7 +203,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/e402f745-d02f-4d60-96fe-3ddf86c62c3d - https://www.youtube.com/watch?v=AIorxLocNz0 Referenced Tracks: -- Pokémon Center (Pokémon Red / Pokémon Blue) +- Pokémon Center (Pokémon Red & Pokémon Blue) --- Track: Pokémon Healed Additional Names: @@ -216,7 +216,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/92c969ec-54b8-4202-9570-1aa17623c821 - https://www.youtube.com/watch?v=BB4Cy0kkQWg Referenced Tracks: -- Pokémon Healed (Pokémon Red / Pokémon Blue) +- Pokémon Healed (Pokémon Red & Pokémon Blue) --- Track: Battle! (Wild Pokémon) Additional Names: @@ -240,7 +240,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/3823fa8e-717d-4a38-8505-fa852635af28 - https://www.youtube.com/watch?v=Pn59YXZLuBg Referenced Tracks: -- Victory! (Wild Pokémon) (Pokémon Red / Pokémon Blue) +- Victory! (Wild Pokémon) (Pokémon Red & Pokémon Blue) --- Track: Guide Additional Names: @@ -253,7 +253,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/d91eff81-b29c-4332-ae3d-a7418486fe8f - https://www.youtube.com/watch?v=VDdhcuy09n0 Referenced Tracks: -- Guide (Pokémon Red / Pokémon Blue) +- Guide (Pokémon Red & Pokémon Blue) --- Track: At the Train Station Additional Names: @@ -265,7 +265,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/c40b2628-f044-4ddc-a81b-6e2cdaa723ca - https://www.youtube.com/watch?v=1iq50ZJ05Rk Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Wild Area (South) Additional Names: @@ -422,7 +422,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/100e32a2-e699-457f-ae42-1e0015e23534 - https://www.youtube.com/watch?v=cgVnRMjfhL4 Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Budew Drop Inn Additional Names: @@ -474,7 +474,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/a1ead8e2-8cb1-4827-bc72-dd1f4d607126 - https://www.youtube.com/watch?v=WrIniyktAPY Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Chairman Rose Additional Names: @@ -525,7 +525,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/2fc0f3b8-21ff-45e0-acdb-ba8a58775bfe - https://www.youtube.com/watch?v=a3yUcFCVZPc Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- Track: Victory! (Trainer) Additional Names: @@ -538,7 +538,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/93a72d82-20e5-4ac9-951c-5b11c9a5c423 - https://www.youtube.com/watch?v=a3yUcFCVZPc Referenced Tracks: -- Victory! (Trainer Battle) (Pokémon Red / Pokémon Blue) +- Victory! (Trainer Battle) (Pokémon Red & Pokémon Blue) --- Track: Trainers' Eyes Meet (Lass) Additional Names: @@ -551,7 +551,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/5237ff4b-5aeb-4c0e-8000-f24526e966e3 - https://www.youtube.com/watch?v=JbAjbT_YyUc Referenced Tracks: -- A Trainer Appears (Girl Version) (Pokémon Red / Pokémon Blue) +- A Trainer Appears (Girl Version) (Pokémon Red & Pokémon Blue) --- Track: Evolution Additional Names: @@ -564,9 +564,9 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/c3008a4d-ffcb-41dd-a986-6520fca50028 - https://www.youtube.com/watch?v=rOMQT5dVeTY Referenced Tracks: -- Evolution (Pokémon Red / Pokémon Blue) +- Evolution (Pokémon Red & Pokémon Blue) Sampled Tracks: -- Evolution (Pokémon Red / Pokémon Blue) +- Evolution (Pokémon Red & Pokémon Blue) --- Track: Evolution (Galar) Additional Names: @@ -578,9 +578,9 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/fbe941c6-376f-4df0-8a6f-5da4d7072c1b - https://www.youtube.com/watch?v=rdbOxYOcWZI Referenced Tracks: -- Evolution (Pokémon Red / Pokémon Blue) +- Evolution (Pokémon Red & Pokémon Blue) Sampled Tracks: -- Evolution (Pokémon Red / Pokémon Blue) +- Evolution (Pokémon Red & Pokémon Blue) --- Track: Congratulations! Your Pokémon Evolved! Additional Names: @@ -591,7 +591,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=hXgGdaUBDCs Referenced Tracks: -- 'Fanfare: Evolution (Pokémon Red / Pokémon Blue)' +- 'Fanfare: Evolution (Pokémon Red & Pokémon Blue)' --- Track: Galar Mine Additional Names: @@ -665,7 +665,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/a66a8d62-b5bc-4817-8974-de4bb1cabfc7 - https://www.youtube.com/watch?v=xK81WBgcvfQ Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Trainers' Eyes Meet (Gym Trainer) Additional Names: @@ -689,7 +689,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/eef9aaa2-2e9b-4c91-b173-40905c262e1d - https://www.youtube.com/watch?v=Y3hp5XGXG5M Referenced Tracks: -- Victory! (Trainer Battle) (Pokémon Red / Pokémon Blue) +- Victory! (Trainer Battle) (Pokémon Red & Pokémon Blue) --- Track: Gym Mission Cleared! Additional Names: @@ -725,7 +725,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/99ccd4ed-63c4-4395-ae08-d99e93bd6bc3 - https://www.youtube.com/watch?v=etOhpfPI5JE Referenced Tracks: -- Victory! (Gym Leader Battle) (Pokémon Red / Pokémon Blue) +- Victory! (Gym Leader Battle) (Pokémon Red & Pokémon Blue) --- Track: Obtained a Gym Badge! Additional Names: @@ -738,7 +738,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/a342233a-18a7-4ecf-a17c-f2123378d257 - https://www.youtube.com/watch?v=3QS8AzBn6TU Referenced Tracks: -- Obtained a Gym Badge (Pokémon Red / Pokémon Blue) +- Obtained a Gym Badge (Pokémon Red & Pokémon Blue) --- Track: Hulbury Additional Names: @@ -1177,7 +1177,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/b12fd539-b547-46bb-a990-cbe4d3373984 - https://www.youtube.com/watch?v=6xnB5zv5EFk Referenced Tracks: -- 'Fanfare: Evolution (Pokémon Red / Pokémon Blue)' +- 'Fanfare: Evolution (Pokémon Red & Pokémon Blue)' - Decisive Battle! (Eternatus) --- Track: Decisive Battle! (Champion Leon) @@ -1190,7 +1190,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/e3ec78e1-fa1d-4de6-a494-c43da28ab490 - https://www.youtube.com/watch?v=ztf6DFCjk_g Referenced Tracks: -- Hall of Fame (Pokémon Red / Pokémon Blue) +- Hall of Fame (Pokémon Red & Pokémon Blue) - Decisive Battle! (Eternatus) --- Track: Victory! (Champion Leon) @@ -1215,8 +1215,8 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/a6e0634b-7689-4d84-aa85-cf461c6eefb4 - https://www.youtube.com/watch?v=up2cIL5T6Mg Referenced Tracks: -- Hall of Fame (Pokémon Red / Pokémon Blue) -- The Hall of Fame (Pokémon Ruby / Pokémon Sapphire) +- Hall of Fame (Pokémon Red & Pokémon Blue) +- The Hall of Fame (Pokémon Ruby & Pokémon Sapphire) ## lists Adachi as composer next to Masuda so probably referencing something else too, probably from this game --- Track: Battle Tower @@ -1638,7 +1638,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/1fe6a572-0482-4868-a721-dfb8f70f9564 - https://www.youtube.com/watch?v=RTghy7gbvGM Referenced Tracks: -- Battle! (Regirock/Regice/Registeel) (Pokémon Ruby / Pokémon Sapphire) +- Battle! (Regirock/Regice/Registeel) (Pokémon Ruby & Pokémon Sapphire) --- Track: Gathering at the Tree Additional Names: @@ -1673,4 +1673,4 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/f4ba0dcb-a965-4677-b2e4-4991c4685a30 - https://www.youtube.com/watch?v=CcTy34jldas Referenced Tracks: -- Hall of Fame (Pokémon Red / Pokémon Blue) +- Hall of Fame (Pokémon Red & Pokémon Blue) diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml index b8a85412..aa354e3c 100644 --- a/album/references-beyond-homestuck.yaml +++ b/album/references-beyond-homestuck.yaml @@ -340,7 +340,7 @@ Duration: 1:28 URLs: - https://www.youtube.com/watch?v=_PwVgV2IEjI Referenced Tracks: -- Pokémon Gym (Pokémon Red / Pokémon Blue) +- Pokémon Gym (Pokémon Red & Pokémon Blue) --- Track: Bogey Theme Artists: @@ -3052,9 +3052,9 @@ Duration: 3:46 URLs: - https://www.youtube.com/watch?v=-dkK9r57BNk Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- -Track: Battle! (Champion) (Pokémon Gold / Pokémon Silver) +Track: Battle! (Champion) (Pokémon Gold & Pokémon Silver) # JP: 戦闘！チャンピオン # Official release: # Pokémon HeartGold & Pokémon SoulSilver: Super Music Collection @@ -3069,7 +3069,7 @@ Duration: 1:11 URLs: - https://www.youtube.com/watch?v=Jxk9DqdYsJ4 Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- Track: Battle! (Colress) # JP: 戦闘！アクロマ @@ -3126,7 +3126,7 @@ URLs: Referenced Tracks: - Battle! (Solgaleo / Lunala) --- -Track: Battle! (Elite Four) (Pokémon Black / Pokémon White) +Track: Battle! (Elite Four) (Pokémon Black & Pokémon White) # JP: 戦闘！四天王 # Official release: # Pokémon Black & Pokémon White: Super Music Collection @@ -3143,9 +3143,9 @@ Duration: 2:51 URLs: - https://www.youtube.com/watch?v=xTIX7f9wFB8 Referenced Tracks: -- Battle! (Elite Four) (Pokémon Ruby / Pokémon Sapphire) +- Battle! (Elite Four) (Pokémon Ruby & Pokémon Sapphire) --- -Track: Battle! (Elite Four) (Pokémon Ruby / Pokémon Sapphire) +Track: Battle! (Elite Four) (Pokémon Ruby & Pokémon Sapphire) Directory: battle-elite-four-pokemon-ruby-sapphire # Reference # https://vgmdb.net/album/1024 @@ -3154,7 +3154,7 @@ Artists: - Junichi Masuda Duration: 1:47 --- -Track: Battle! (Elite Four) (Pokémon Sun / Pokémon Moon) +Track: Battle! (Elite Four) (Pokémon Sun & Pokémon Moon) Directory: battle-elite-four-pokemon-sun-moon # Reference: # https://vgmdb.net/album/61193 @@ -3185,7 +3185,7 @@ Duration: 3:09 URLs: - https://www.youtube.com/watch?v=Cuf_i3Ivm0c Referenced Tracks: -- Battle! (Champion) (Pokémon Gold / Pokémon Silver) +- Battle! (Champion) (Pokémon Gold & Pokémon Silver) --- Track: Battle! (Frontier Brain—Sinnoh Version) # Reference: @@ -3230,7 +3230,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/42ebcf97-cc31-44be-97bf-1f0a5fd4b7fa - https://www.youtube.com/watch?v=19ZdAZO9FvU --- -Track: Battle! (Gym Leader) (Pokémon Diamond / Pokémon Pearl) +Track: Battle! (Gym Leader) (Pokémon Diamond & Pokémon Pearl) # Reference: # https://vgmdb.net/album/61193 Directory: battle-gym-leader-pokemon-diamond-pearl @@ -3279,7 +3279,7 @@ URLs: Referenced Tracks: - The Heirs to Eternity --- -Track: Battle! (Regirock/Regice/Registeel) (Pokémon Ruby / Pokémon Sapphire) +Track: Battle! (Regirock/Regice/Registeel) (Pokémon Ruby & Pokémon Sapphire) Directory: battle-regirock-regice-registeel-pokemon-ruby-sapphire # Reference: # https://vgmdb.net/album/1024 @@ -3323,9 +3323,9 @@ Duration: 2:13 URLs: - https://www.youtube.com/watch?v=zuW_wIQ7vtc Referenced Tracks: -- Battle! (Steven) (Pokémon Ruby / Pokémon Sapphire) +- Battle! (Steven) (Pokémon Ruby & Pokémon Sapphire) --- -Track: Battle! (Steven) (Pokémon Ruby / Pokémon Sapphire) +Track: Battle! (Steven) (Pokémon Ruby & Pokémon Sapphire) # Reference: # https://vgmdb.net/album/48057 Directory: battle-steven-pokemon-ruby-sapphire @@ -3336,7 +3336,7 @@ Duration: 1:51 URLs: - https://www.youtube.com/watch?v=LaAGsbtETIg --- -Track: Battle! (Strong Wild Pokémon) (Pokémon Black / Pokémon White) +Track: Battle! (Strong Wild Pokémon) (Pokémon Black & Pokémon White) # Reference: # https://vgmdb.net/album/20831 Directory: battle-strong-wild-pokemon-pokemon-black-white @@ -3344,7 +3344,7 @@ Artists: - artist:pokemon - Go Ichinose Referenced Tracks: -- Battle! (Wild Pokémon) (Pokémon Black / Pokémon White) +- Battle! (Wild Pokémon) (Pokémon Black & Pokémon White) Duration: 2:04 URLs: - https://www.youtube.com/watch?v=2jxRBxUSvCo @@ -3371,7 +3371,7 @@ Duration: 0:40 URLs: - https://www.youtube.com/watch?v=klTyL5O03Tw --- -Track: Battle Tower (Pokémon Diamond / Pokémon Pearl) +Track: Battle Tower (Pokémon Diamond & Pokémon Pearl) Directory: battle-tower-pokemon-diamond-pearl # Official release: # Pokémon Diamond & Pokémon Pearl: Super Music Collection @@ -3387,7 +3387,7 @@ URLs: Referenced Tracks: - Battle Tower (Johto) (Pokémon Crystal) --- -Track: Battle! (Trainer Battle) (Pokémon Black / Pokémon White) +Track: Battle! (Trainer Battle) (Pokémon Black & Pokémon White) Directory: battle-trainer-battle-pokemon-black-white # Reference: # https://vgmdb.net/album/20831 @@ -3400,9 +3400,9 @@ Duration: 3:33 URLs: - https://www.youtube.com/watch?v=UFffYnhlWyQ Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- -Track: Battle! (Trainer Battle) (Pokémon Red / Pokémon Blue) +Track: Battle! (Trainer Battle) (Pokémon Red & Pokémon Blue) # JP: 戦い(VSトレーナー) # Official release: # ポケモン 赤・緑 スーパーミュージック・コレクション @@ -3416,7 +3416,7 @@ Duration: 3:17 URLs: - https://www.youtube.com/watch?v=9qbk_pPCxCc --- -Track: Battle! (Trainer) (Pokémon Sun / Pokémon Moon) +Track: Battle! (Trainer) (Pokémon Sun & Pokémon Moon) Directory: battle-trainer-pokemon-sun-moon # Reference: # https://vgmdb.net/album/61193 @@ -3456,7 +3456,7 @@ Duration: 2:00 URLs: - https://www.youtube.com/watch?v=RJKIrqO1Zas --- -Track: Battle! (Wild Pokémon—Johto Version) (Pokémon Gold / Pokémon Silver) +Track: Battle! (Wild Pokémon—Johto Version) (Pokémon Gold & Pokémon Silver) # Official release: # Pokémon HeartGold & Pokémon SoulSilver: Super Music Collection # Reference: @@ -3469,7 +3469,7 @@ Duration: 0:55 URLs: - https://www.youtube.com/watch?v=eQq2v6kBKSM --- -Track: Battle! (Wild Pokémon) (Pokémon Black / Pokémon White) +Track: Battle! (Wild Pokémon) (Pokémon Black & Pokémon White) # Reference: # https://vgmdb.net/album/20831 Directory: battle-wild-pokemon-pokemon-black-white @@ -3482,7 +3482,7 @@ Duration: 2:03 URLs: - https://www.youtube.com/watch?v=iBvj8Qt2ndI --- -Track: Battle! (Wild Pokémon) (Pokémon Red / Pokémon Blue) +Track: Battle! (Wild Pokémon) (Pokémon Red & Pokémon Blue) # JP: 戦い(VS野生ポケモン) # Official release: # ポケモン 赤・緑 スーパーミュージック・コレクション @@ -3496,7 +3496,7 @@ Duration: 1:30 URLs: - https://www.youtube.com/watch?v=vgBoQUaEKpk --- -Track: Battle! (Wild Pokémon) (Pokémon Sun / Pokémon Moon) +Track: Battle! (Wild Pokémon) (Pokémon Sun & Pokémon Moon) Directory: battle-wild-pokemon-pokemon-sun-moon # Reference: # https://vgmdb.net/album/61193 @@ -5450,7 +5450,7 @@ URLs: Lyrics: |- Dei, quod reliquum est, nolite metuere, et ossa tua liberabit, exspectans --- -Track: Evolution (Pokémon Red / Pokémon Blue) +Track: Evolution (Pokémon Red & Pokémon Blue) Directory: evolution-pokemon-red-blue Artists: - Pokémon @@ -5486,7 +5486,7 @@ Duration: 0:10 URLs: - https://www.youtube.com/watch?v=FzmH9nUXCiQ --- -Track: 'Fanfare: Evolution (Pokémon Red / Pokémon Blue)' +Track: 'Fanfare: Evolution (Pokémon Red & Pokémon Blue)' # Reference: # https://vgmdb.net/product/2236 Artists: @@ -5572,7 +5572,7 @@ Duration: 3:42 URLs: - https://www.youtube.com/watch?v=CTocv2h10BM --- -Track: The Final Road (Pokémon Red / Pokémon Blue) +Track: The Final Road (Pokémon Red & Pokémon Blue) # https://vgmdb.net/album/141 Directory: the-final-road-pokemon-red-blue Artists: @@ -5582,7 +5582,7 @@ Duration: 1:14 URLs: - https://www.youtube.com/watch?v=kM1b7xUi3gI Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- Track: Fire Emblem Theme (Heroic Origins) # Reference: @@ -6504,7 +6504,7 @@ Duration: 4:03 URLs: - https://www.youtube.com/watch?v=lO78gtoZDF4 --- -Track: Guide (Pokémon Red / Pokémon Blue) +Track: Guide (Pokémon Red & Pokémon Blue) # https://vgmdb.net/album/141 Directory: guide-pokemon-red-blue Artists: @@ -6550,7 +6550,7 @@ URLs: Referenced Tracks: - track:grip-ridge-racer-2 --- -Track: Hall of Fame (Pokémon FireRed / Pokémon LeafGreen) +Track: Hall of Fame (Pokémon FireRed & Pokémon LeafGreen) # JP: 殿堂入り # Official release: # GBA ポケモン ファイアレッド&リーフグリーン ミュージック・スーパーコンプリート @@ -6565,9 +6565,9 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/daa28fea-30b5-4f58-a88f-57aa928ca9d7 - https://www.youtube.com/watch?v=b9Sp1eRE5o0 Referenced Tracks: -- Hall of Fame (Pokémon Red / Pokémon Blue) +- Hall of Fame (Pokémon Red & Pokémon Blue) --- -Track: Hall of Fame (Pokémon Red / Pokémon Blue) +Track: Hall of Fame (Pokémon Red & Pokémon Blue) # Reference: # https://vgmdb.net/album/57107 Directory: hall-of-fame-pokemon-red-blue @@ -6578,7 +6578,7 @@ Duration: 1:04 URLs: - https://www.youtube.com/watch?v=uq86eIdMNdY --- -Track: The Hall of Fame (Pokémon Ruby / Pokémon Sapphire) +Track: The Hall of Fame (Pokémon Ruby & Pokémon Sapphire) # https://vgmdb.net/album/1024 Directory: the-hall-of-fame-pokemon-ruby-sapphire Artists: @@ -6588,7 +6588,7 @@ Duration: 1:09 URLs: - https://www.youtube.com/watch?v=_aPMZ79_qew Referenced Tracks: -- Hall of Fame (Pokémon Red / Pokémon Blue) +- Hall of Fame (Pokémon Red & Pokémon Blue) --- Track: Halland # Reference: @@ -7577,7 +7577,7 @@ Duration: 2:47 URLs: - https://www.youtube.com/watch?v=vkrKJyXJUZM --- -Track: Level Up! (Pokémon Red / Pokémon Blue) +Track: Level Up! (Pokémon Red & Pokémon Blue) # Reference: # https://vgmdb.net/album/57107 I guess? Artists: @@ -8512,7 +8512,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/3c418c40-b31f-4ccd-8e5d-e145e534aacf - https://www.youtube.com/watch?v=cLJiAWspUw4 --- -Track: Obtained a Berry! (Pokémon Ruby / Pokémon Sapphire) +Track: Obtained a Berry! (Pokémon Ruby & Pokémon Sapphire) # Reference: # https://vgmdb.net/album/1024 Directory: obtained-a-berry-pokemon-ruby-sapphire @@ -8523,7 +8523,7 @@ Duration: 0:04 URLs: - https://www.youtube.com/watch?v=yTNFVf7HBoI --- -Track: Obtained a Gym Badge (Pokémon Red / Pokémon Blue) +Track: Obtained a Gym Badge (Pokémon Red & Pokémon Blue) Directory: obtained-a-gym-badge-pokemon-red-blue ## I can't find any uploads of the original Red / Blue jingle Artists: @@ -8531,7 +8531,7 @@ Artists: - Junichi Masuda Duration: --- -Track: Obtained a Pokémon (Pokémon Red / Pokémon Blue) +Track: Obtained a Pokémon (Pokémon Red & Pokémon Blue) Directory: obtained-a-pokemon-pokemon-red-blue Artists: - Pokémon @@ -8540,7 +8540,7 @@ Duration: 0:03 URLs: - https://www.youtube.com/watch?v=hphjpkEfIW0 --- -Track: Obtained an Item! (Pokémon Red / Pokémon Blue) +Track: Obtained an Item! (Pokémon Red & Pokémon Blue) Directory: obtained-an-item-pokemon-red-blue Artists: - Pokémon @@ -8997,7 +8997,7 @@ URLs: - https://m.nintendo.com/shared/en-US/US/tracks/fad03893-fb53-4f9d-8da7-60ae433f996d - https://www.youtube.com/watch?v=Lahn6mN-hnk --- -Track: Poké Mart (Pokémon Ruby / Pokémon Sapphire) +Track: Poké Mart (Pokémon Ruby & Pokémon Sapphire) # Reference: # https://vgmdb.net/album/1024 Directory: poke-mart-pokemon-ruby-sapphire @@ -9007,7 +9007,7 @@ Duration: 1:16 URLs: - https://www.youtube.com/watch?v=RK0FO-Oe760 --- -Track: Pokédex Evaluation... Complete! (Pokémon Gold / Pokémon Silver) +Track: Pokédex Evaluation... Complete! (Pokémon Gold & Pokémon Silver) # Reference: # none xd Directory: pokedex-evalution-complete-pokemon-gold-silver @@ -9018,7 +9018,7 @@ Duration: 1:14 URLs: - https://www.youtube.com/watch?v=MjZIjHu0OfY --- -Track: 'Pokégear Radio: Pokémon Lullaby (Pokémon Gold / Pokémon Silver)' +Track: 'Pokégear Radio: Pokémon Lullaby (Pokémon Gold & Pokémon Silver)' # Reference: # https://vgmdb.net/album/15237 Directory: pokegear-radio-pokemon-lullaby-pokemon-gold-silver @@ -9029,7 +9029,7 @@ Duration: URLs: - https://www.youtube.com/watch?v=_i3TpsP_NJ0 --- -Track: 'Pokégear Radio: Pokémon March (Pokémon Gold / Pokémon Silver)' +Track: 'Pokégear Radio: Pokémon March (Pokémon Gold & Pokémon Silver)' # Reference: # https://vgmdb.net/album/15237 Directory: pokegear-radio-pokemon-march-pokemon-gold-silver @@ -9040,7 +9040,7 @@ Duration: 1:14 URLs: - https://www.youtube.com/watch?v=7Wmk58-o_r8 --- -Track: Pokémon Caught (Pokémon Red / Pokémon Blue) +Track: Pokémon Caught (Pokémon Red & Pokémon Blue) Directory: pokemon-caught-pokemon-red-blue Artists: - Pokémon @@ -9049,7 +9049,7 @@ Duration: 0:03 URLs: - https://www.youtube.com/watch?v=xgX0zPfAsv0 --- -Track: Pokémon Center (Night) (Pokémon Diamond / Pokémon Pearl) +Track: Pokémon Center (Night) (Pokémon Diamond & Pokémon Pearl) # Reference: # https://vgmdb.net/album/3945 Directory: pokemon-center-night-pokemon-diamond-pearl @@ -9060,9 +9060,9 @@ Duration: 1:29 URLs: - https://www.youtube.com/watch?v=OUqEE6seRdw Referenced Tracks: -- Pokémon Center (Pokémon Red / Pokémon Blue) +- Pokémon Center (Pokémon Red & Pokémon Blue) --- -Track: Pokémon Center (Pokémon Red / Pokémon Blue) +Track: Pokémon Center (Pokémon Red & Pokémon Blue) # JP: ポケモンセンター # Official release: # ポケモン 赤・緑 スーパーミュージック・コレクション @@ -9076,7 +9076,7 @@ Duration: URLs: - https://www.youtube.com/watch?v=voX_Xd-LuZc&t=53 --- -Track: Pokémon Gym (Pokémon Red / Pokémon Blue) +Track: Pokémon Gym (Pokémon Red & Pokémon Blue) # Reference: # https://vgmdb.net/album/141 Directory: pokemon-gym-pokemon-red-and-blue-versions @@ -9087,7 +9087,7 @@ Duration: 1:15 URLs: - https://www.youtube.com/watch?v=A3IQFA-we6I --- -Track: Pokémon Healed (Pokémon Red / Pokémon Blue) +Track: Pokémon Healed (Pokémon Red & Pokémon Blue) # Reference: # https://vgmdb.net/album/57107 Directory: pokemon-healed-pokemon-red-and-blue-versions @@ -9406,7 +9406,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=Rq7PkSBaUG8 --- -Track: Received a Pokémon Egg! (Pokémon Gold / Pokémon Silver) +Track: Received a Pokémon Egg! (Pokémon Gold & Pokémon Silver) Directory: received-a-pokemon-egg-pokemon-gold-silver Artists: - Pokémon @@ -9415,7 +9415,7 @@ Duration: 0:04 URLs: - https://www.youtube.com/watch?v=_xycGmmgbF4 --- -Track: Received a TM! (Pokémon Gold / Pokémon Silver) +Track: Received a TM! (Pokémon Gold & Pokémon Silver) #cant find standalone upload xd Directory: received-a-tm-pokemon-gold-silver Artists: @@ -9434,7 +9434,7 @@ Duration: 2:37 URLs: - https://www.youtube.com/watch?v=WAeiqxNH3W0 --- -Track: Recovery (Pokémon Red / Pokémon Blue) +Track: Recovery (Pokémon Red & Pokémon Blue) Directory: recovery-pokemon-red-blue # JP: ポケモンセンター # Official release: @@ -9503,7 +9503,7 @@ Duration: 6:07 URLs: - https://disasterpeace.bandcamp.com/track/the-refiners-fire --- -Track: Relic Song (Pokémon Black / Pokémon White) +Track: Relic Song (Pokémon Black & Pokémon White) # Reference: # https://vgmdb.net/album/33367 Directory: relic-song-pokemon-black-white @@ -11013,7 +11013,7 @@ Duration: 1:09 URLs: - https://www.youtube.com/watch?v=39FN_LsRMzE --- -Track: 'Title Screen: Main Theme (Pokémon Ruby / Pokémon Sapphire)' +Track: 'Title Screen: Main Theme (Pokémon Ruby & Pokémon Sapphire)' # Reference: # https://vgmdb.net/album/1024 Directory: title-screen-main-theme-pokemon-ruby-sapphire @@ -11024,9 +11024,9 @@ Duration: 1:42 URLs: - https://www.youtube.com/watch?v=4sa_0aCfdCU Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- -Track: Title Screen (Pokémon Black / Pokémon White) +Track: Title Screen (Pokémon Black & Pokémon White) # Reference: # https://vgmdb.net/album/20831 Directory: title-screen-pokemon-black-white @@ -11037,9 +11037,9 @@ Duration: 1:19 URLs: - https://www.youtube.com/watch?v=SVc6sQcQMmA Referenced Tracks: -- Title Screen (Pokémon Red / Pokémon Blue) +- Title Screen (Pokémon Red & Pokémon Blue) --- -Track: Title Screen (Pokémon Red / Pokémon Blue) +Track: Title Screen (Pokémon Red & Pokémon Blue) # JP: 〜オープニング〜 # Official release: # ポケモン 赤・緑 スーパーミュージック・コレクション @@ -11222,7 +11222,7 @@ Duration: 2:30 URLs: - https://www.youtube.com/watch?v=HAMPtw35Gjk --- -Track: A Trainer Appears (Girl Version) (Pokémon Red / Pokémon Blue) +Track: A Trainer Appears (Girl Version) (Pokémon Red & Pokémon Blue) # Reference: # https://vgmdb.net/album/57107 Artists: @@ -11231,7 +11231,7 @@ Artists: URLs: - https://www.youtube.com/watch?v=NIwTJi861IA --- -Track: Trainers' Eyes Meet (Psychic) (Pokémon Ruby / Pokémon Sapphire) +Track: Trainers' Eyes Meet (Psychic) (Pokémon Ruby & Pokémon Sapphire) # Reference: # https://vgmdb.net/album/1024 Directory: trainers-eyes-meet-psychic-pokemon-ruby-sapphire @@ -11697,7 +11697,7 @@ Duration: 0:39 URLs: - https://www.youtube.com/watch?v=ZSdNARyfaZY --- -Track: Victory! (Gym Leader Battle) (Pokémon Red / Pokémon Blue) +Track: Victory! (Gym Leader Battle) (Pokémon Red & Pokémon Blue) # Reference: # https://vgmdb.net/album/57107 Directory: victory-gym-leader-battle-pokemon-red-blue @@ -11708,7 +11708,7 @@ Duration: 0:57 URLs: - https://www.youtube.com/watch?v=EBgSIonPpp0 --- -Track: Victory! (Trainer Battle) (Pokémon Red / Pokémon Blue) +Track: Victory! (Trainer Battle) (Pokémon Red & Pokémon Blue) # Reference: # https://vgmdb.net/album/141 Directory: victory-trainer-battle-pokemon-red-blue @@ -11719,7 +11719,7 @@ Duration: 0:31 URLs: - https://www.youtube.com/watch?v=NFch6XO5I_c --- -Track: Victory! (Trainer Battle) (Pokémon Ruby / Pokémon Sapphire) +Track: Victory! (Trainer Battle) (Pokémon Ruby & Pokémon Sapphire) # Reference: # https://vgmdb.net/album/1024 Directory: victory-trainer-battle-pokemon-ruby-sapphire @@ -11732,7 +11732,7 @@ URLs: Referenced Tracks: - track:victory-trainer-battle-pokemon-red-blue --- -Track: Victory! (Wild Pokémon) (Pokémon Red / Pokémon Blue) +Track: Victory! (Wild Pokémon) (Pokémon Red & Pokémon Blue) # Reference: # https://vgmdb.net/album/57107 Directory: victory-wild-pokemon-pokemon-red-blue diff --git a/album/super-smash-bros-ultimate.yaml b/album/super-smash-bros-ultimate.yaml index 53ee1971..f019b43e 100644 --- a/album/super-smash-bros-ultimate.yaml +++ b/album/super-smash-bros-ultimate.yaml @@ -754,8 +754,8 @@ Artists: - Hiroyuki Kawada Duration: 2:14 Referenced Tracks: -- 'Battle! (Wild Pokémon) (Pokémon Sun / Pokémon Moon)' -- Title Screen (Pokémon Red / Pokémon Blue) +- 'Battle! (Wild Pokémon) (Pokémon Sun & Pokémon Moon)' +- Title Screen (Pokémon Red & Pokémon Blue) --- Track: Battle! (Trainer) - Pokémon Sun / Pokémon Moon Artists: @@ -763,7 +763,7 @@ Artists: - Yasushi Asada Duration: 2:17 Referenced Tracks: -- Battle! (Trainer) (Pokémon Sun / Pokémon Moon) +- Battle! (Trainer) (Pokémon Sun & Pokémon Moon) --- Track: Battle! (Island Kahuna) Artists: @@ -788,7 +788,7 @@ Artists: - Akihiro Honda Duration: 2:52 Referenced Tracks: -- Battle! (Elite Four) (Pokémon Sun / Pokémon Moon) +- Battle! (Elite Four) (Pokémon Sun & Pokémon Moon) - Battle! (Solgaleo / Lunala) --- Track: The Battle at the Summit! -- cgit 1.3.0-6-gf8a5