scarlet violet commit to be safe, first 2 discs as good as done

some references subject to analysis

5 files changed, 889 insertions, 7 deletions

diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index 7c23315b..16d0fb48 100644
--- a/album/gotta-hatch-em-all.yaml
+++ b/album/gotta-hatch-em-all.yaml
@@ -28,7 +28,7 @@ URLs:
 - https://sahcon.bandcamp.com/track/title-theme
 Referenced Tracks:
 - FIDUSPAWN, GO!
-- track:title-screen-pokemon-red-and-blue-versions
+- 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
new file mode 100644
index 00000000..24cac31d
--- /dev/null
+++ b/album/pokemon-scarlet-violet-super-music-collection.yaml
@@ -0,0 +1,764 @@
+Album: 'Pokémon Scarlet & Pokémon Violet + The Hidden Treasure of Area Zero: Super Music Collection'
+Directory: pokemon-scarlet-violet-super-music-collection
+Artists:
+- GAME FREAK
+Date: February 27, 2021
+## https://vgmdb.net/album/134816
+Date Added: 
+URLs:
+- https://tobyfox.bandcamp.com/album/deltarune-chapter-2-ost
+- https://www.youtube.com/watch?v=u9YheqFuyng
+- https://www.youtube.com/playlist?list=OLAK5uy_kADMv-61zFDA5jOl2rTBQpqaa8celjh54
+- https://open.spotify.com/album/7DAiPXN3HdbktwwFzQXqrZ
+Cover Artists:
+- Toshiyuki Takahashi
+- Hiromi Yasuda
+- Momoko Fukuda
+- 上野愛恵 ##can't find who this is lol
+Cover Art File Extension: png
+Color: '#fef105'
+Groups:
+- Toby Fox
+- Beyond
+##Wallpaper Artists:
+##- Toby Fox
+Wallpaper Style: |-
+    image-rendering: pixelated;
+    image-rendering: crisp-edges;
+Wallpaper File Extension: png
+---
+Section: Disc 1
+Color: '#d5101e'
+---
+Track: Welcome to the Paldea region!
+Duration: '2:13'
+Artists:
+- Minako Adachi
+##URLs:
+##- 
+Referenced Tracks:
+- The Academy
+---
+Track: Soar Through the Paldea Skies
+Duration: '1:15'
+Artists:
+- Go Ichinose
+Referenced Tracks:
+- The Academy
+---
+Track: Home
+Directory: home-pokemon-scarlet-violet
+Duration: '2:11'
+Artists:
+- Minako Adachi (arranger)
+Contributors:
+- Junichi Masuda (composer)
+---
+Track: Cabo Poco
+Duration: '1:56'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- track:home-pokemon-scarlet-violet
+---
+Track: Meetings
+Duration: '1:05'
+Artists:
+- Hiromitsu Maeba
+Referenced Tracks:
+- The Academy
+---
+Track: Let's Try to Get Stronger!
+Duration: '1:25'
+Artists:
+- Hitomi Sato
+---
+Track: Battle! (Nemona)
+Duration: '2:12'
+Artists:
+- Hitomi Sato
+---
+Track: Obtained a Key Item!
+Duration: '0:04'
+Artists:
+- Hitomi Sato
+---
+Track: Poco Path
+Duration: '2:19'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Cabo Poco
+---
+Track: Battle! (Wild Pokémon)
+Duration: '2:50'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Poco Path
+---
+Track: Victory! (Wild Pokémon)
+Duration: '0:05'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Battle! (Wild Pokémon)
+---
+Track: Obtained a Berry!
+Duration: '0:04'
+Artists:
+- Hitomi Sato (arranger)
+Contributors:
+- Morikazu Aoki (composer)
+---
+Track: Obtained an Item!
+Duration: '0:04'
+Artists:
+- Hitomi Sato (arranger)
+Contributors:
+- Junichi Masuda (composer)
+---
+Track: On the Beach
+Duration: '0:31'
+Artists:
+- Hiromitsu Maeba
+---
+Track: Go Through the Cave in the Cove
+Duration: '2:36'
+Artists:
+- Hiromitsu Maeba
+---
+Track: Battle in the Cave
+Duration: '2:36'
+Artists:
+- Hiromitsu Maeba
+Referenced Tracks:
+- Go Through the Cave in the Cove
+---
+Track: Escape from the Cave!
+Duration: '1:26'
+Artists:
+- Hiromitsu Maeba
+Referenced Tracks:
+- Go Through the Cave in the Cove
+- South Province
+---
+Track: It's a Test of Strength!
+Duration: '1:21'
+Artists:
+- Hiromitsu Maeba
+---
+Track: Battle! (Arven)
+Duration: '3:22'
+Artists:
+- Go Ichinose
+---
+Track: South Province
+Duration: '3:13'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- The Academy
+---
+Track: Battle! (Wild Pokémon in the South)
+Duration: '2:47'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- South Province
+---
+Track: You Caught a Pokémon!
+Duration: '0:04'
+Artists:
+- Hitomi Sato
+---
+Track: Pokémon Center
+Directory: pokemon-center-pokemon-scarlet-violet
+Duration: '2:43'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Pokémon Center (Pokémon Red / Pokémon Blue)
+---
+Track: Recovery
+Directory: recovery-pokemon-scarlet-violet
+Duration: '0:06'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Recovery (Pokémon Red / Pokémon Blue)
+---
+Track: Happy Birthday!
+Duration: '0:11'
+Artists:
+- Hitomi Sato
+---
+Track: Los Platos
+Duration: '2:54'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- South Province
+---
+Track: Walk Through the South Province
+Duration: '2:54'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- South Province
+---
+Track: Mesagoza
+Duration: '2:30'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- The Academy
+---
+Track: One Song in Mesagoza, If You Please
+Duration: '2:30'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- The Academy
+---
+Track: Team Star!
+Duration: '1:48'
+Artists:
+- Teruo Taniguchi
+---
+Track: Battle! (Team Star)
+Duration: '3:55'
+Artists:
+- Teruo Taniguchi
+Referenced Tracks:
+- Team Star!
+---
+Track: The Academy
+Duration: '2:30'
+Artists:
+- Minako Adachi (arranger)
+Contributors:
+- Toby Fox (composer)
+Commentary: |-
+    <i>Toby Fox:</i> (UNDERTALE / DELTARUNE NEWSLETTER - ISSUE 1 (Winter Season), excerpt)
+    I also composed a majestic theme melody for the song "Academy". Surprisingly, this ended up used as a field theme for the whole game! Though, all songs using the melody were made by other amazing composers. (I love [[track:one-song-in-mesagoza-if-you-please|the soft piano version]] that plays at night.) Anyhow, that's all I did!
+---
+Track: Phone Call from Cassiopeia
+Duration: '1:28'
+Artists:
+- Hiromitsu Maeba
+---
+Track: Professor Sada / Professor Turo
+Duration: '1:27'
+Artists:
+- Minako Adachi
+---
+Track: The Academy - Your Room
+Duration: '2:30'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- The Academy
+---
+Track: Start the Treasure Hunt!
+Duration: '0:06'
+Artists:
+- Hitomi Sato
+---
+Track: Take a Break
+Duration: '0:09'
+Artists:
+- Hitomi Sato
+---
+Track: Trainers' Eyes Meet (Trainer)
+Duration: '0:17'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- track:battle-trainer-battle-pokemon-scarlet-violet
+---
+Track: Battle! (Trainer Battle)
+Directory: battle-trainer-battle-pokemon-scarlet-violet
+Duration: '2:56'
+Artists:
+- Minako Adachi (arranger)
+Contributors:
+- Junichi Masuda (composer)
+---
+Track: Victory! (Trainer Battle)
+Directory: victory-trainer-battle-pokemon-scarlet-violet
+Duration: '0:31'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- track:victory-trainer-battle-pokemon-red-blue
+---
+Track: Level Up!
+Directory: level-up-pokemon-scarlet-violet
+Duration: '0:04'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- track:obtained-an-item-pokemon-red-blue
+---
+Track: Let's Make a Sandwich!
+Duration: '1:45'
+Artists:
+- Hitomi Sato
+---
+Track: Let's Eat!
+Duration: '1:45'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Let's Make a Sandwich!
+---
+Track: Meal - It's Really Tasty!
+Duration: '0:05'
+Artists:
+- Hitomi Sato
+---
+Track: Meal - It's Pretty Tasty!
+Duration: '0:04'
+Artists:
+- Hitomi Sato
+---
+Track: Meal - Not Bad
+Duration: '0:04'
+Artists:
+- Hitomi Sato
+---
+Track: Meal - It's Maybe... Not So Great
+Duration: '0:04'
+Artists:
+- Hitomi Sato
+---
+Track: Obtained an Egg!
+Duration: '0:04'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Received a Pokémon Egg! (Pokémon Gold / Pokémon Silver)
+---
+Track: Evolution
+Duration: '0:33'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Evolution (Pokémon Red / Pokémon Blue)
+---
+Track: Congratulations! Your Pokémon Evolved!
+Duration: '0:05'
+Artists:
+- Hitomi Sato (arranger)
+Contributors:
+- Junichi Masuda (composer)
+---
+Section: Disc 2
+Color: '#bc4cb4'
+---
+Track: Gym Lobby
+Duration: '1:20'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Gym Test
+---
+Track: Gym Test
+Duration: '1:20'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Pokémon Gym (Pokémon Red / Pokémon Blue)
+---
+Track: You've Passed the Gym Test!
+Duration: '0:06'
+Artists:
+- Hiromitsu Maeba
+Referenced Tracks:
+- Battle! (Gym Leader) / Victory! (Gym Leader)
+---
+Track: Battle! (Gym Leader) / Victory! (Gym Leader)
+Duration: '4:29'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Gym Test
+---
+Track: Obtained a Gym Badge!
+Duration: '0:09'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Obtained a Gym Badge (Pokémon Red / Pokémon Blue)
+---
+Track: Obtained a TM!
+Duration: '0:04'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Received a TM! (Pokémon Gold / Pokémon Silver)
+---
+Track: West Province
+Duration: '2:16'
+Artists:
+- Minako Adachi
+---
+Track: Battle! (Wild Pokémon in the West)
+Duration: '2:01'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Asado Desert
+---
+Track: Asado Desert
+Duration: '2:01'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- West Province
+---
+Track: Tera Raid Battle!
+Duration: '4:06'
+Artists:
+- Toby Fox
+Referenced Tracks:
+- Battle! (Zero Lab)
+---
+Track: Victory! (Tera Raid Battle)
+Duration: '0:42'
+Artists:
+- Hiromitsu Maeba
+Referenced Tracks:
+- Tera Raid Battle!
+---
+Track: Walk Through the Asado Desert
+Duration: '2:00'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Asado Desert
+---
+Track: Cascarrafa
+Duration: '3:01'
+Artists:
+- Hitomi Sato
+---
+Track: The Gym Test's Not Over!
+Duration: '0:59'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Guide (Pokémon Red / Pokémon Blue)
+---
+Track: Battle! (Titan)
+Duration: '2:38'
+Artists:
+- Go Ichinose
+Referenced Tracks:
+- The Academy
+---
+Track: Confront the Titan Again
+Duration: '0:32'
+Artists:
+- Go Ichinose
+Referenced Tracks:
+- Battle! (Titan)
+---
+Track: Victory! (Titan)
+Duration: '0:08'
+Artists:
+- Go Ichinose
+Referenced Tracks:
+- Battle! (Titan)
+---
+Track: Just a Moment
+Duration: '1:54'
+Artists:
+- Hiromitsu Maeba
+---
+Track: Your Ride Ability Went Up!
+Duration: '0:05'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- The Academy
+---
+Track: Walk Through the West Province
+Duration: '2:00'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- West Province
+---
+Track: Medali
+Duration: '2:01'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- West Province
+---
+Track: Heartwarming Time
+Duration: '1:04'
+Artists:
+- Minako Adachi
+---
+Track: East Province
+Duration: '2:59'
+Artists:
+- Minako Adachi
+---
+Track: Battle! (Wild Pokémon in the East)
+Duration: '2:41'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- East Province
+---
+Track: Artazon
+Duration: '2:41'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- East Province
+---
+Track: Levincia
+Duration: '2:55'
+Artists:
+- Hitomi Sato
+---
+Track: Iono Zone!
+Duration: '0:07'
+Artists:
+- Hitomi Sato
+---
+Track: "'Ello, 'ello, hola! Ciao and bonjour!"
+Duration: '1:19'
+Artists:
+- Hiromitsu Maeba
+---
+Track: East Province (Area Three)
+Duration: '2:41'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- East Province
+---
+Track: Walk Through the East Province
+Duration: '2:41'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- East Province
+---
+Track: Tagtree Thicket
+Duration: '2:41'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- East Province
+---
+Track: Right Now I'm Clive
+Duration: '0:38'
+Artists:
+- Hiromitsu Maeba
+---
+Track: C'mon, Let's Raid the Place!
+Duration: '0:33'
+Artists:
+- Teruo Taniguchi
+Referenced Tracks:
+- Team Star!
+---
+Track: Star Barrage
+Duration: '4:46'
+Artists:
+- Teruo Taniguchi
+Referenced Tracks:
+- Battle! (Team Star)
+---
+Track: Star Barrage Completed!
+Duration: '0:07'
+Artists:
+- Teruo Taniguchi
+Referenced Tracks:
+- Star Barrage
+---
+Track: Team Star Boss Appears!
+Duration: '0:52'
+Artists:
+- Teruo Taniguchi
+Referenced Tracks:
+- Team Star!
+---
+Track: Battle! (Team Star Boss)
+Duration: '5:57'
+Artists:
+- Teruo Taniguchi
+Referenced Tracks:
+- Battle! (Team Star)
+---
+Track: Victory! (Team Star Boss)
+Duration: '0:52'
+Artists:
+- Teruo Taniguchi
+Referenced Tracks:
+- Battle! (Team Star Boss)
+---
+Track: Treasure of the Stars
+Duration: '3:13'
+Artists:
+- Teruo Taniguchi
+Referenced Tracks:
+- Team Star!
+---
+Section: Disc 3
+Color: '#d5101e'
+---
+Track: North Province
+Duration: '4:33'
+Artists:
+- Minako Adachi
+---
+Track: Battle! (Wild Pokémon in the North)
+Duration: '4:33'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- North Province
+---
+Track: Montenevera
+Duration: '4:33'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- North Province
+---
+Track: Opening Act!
+Duration: '4:03'
+Artists:
+- Hiromitsu Maeba
+Referenced Tracks:
+- Pokémon Gym (Pokémon Red / Pokémon Blue)
+---
+Track: Soulful Beat!
+Duration: '1:34'
+Artists:
+- Hiromitsu Maeba
+Referenced Tracks:
+- Opening Act!
+---
+Track: Walk Through the North Province
+Duration: '4:33'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- North Province
+---
+Track: Casseroya Lake
+Duration: '4:33'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- North Province
+---
+Track: Snow Slope Run
+Duration: '2:10'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- North Province
+---
+Track: North Province (Area Two)
+Duration: '4:33'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- North Province
+---
+Track: Alfornada
+Duration: '2:52'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- North Province
+- The Academy
+---
+Track: Emotional Spectrum Practice
+Duration: '1:01'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Pokémon Gym (Pokémon Red / Pokémon Blue)
+---
+Track: Pokémon League - Interview Phase
+Duration: '2:44'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- The Final Road (Pokémon Red / Pokémon Blue)
+---
+Track: You Passed the Interview Phase!
+Duration: '0:07'
+Artists:
+- Hitomi Sato
+---
+Track: Pokémon League
+Duration: '2:21'
+Artists:
+- Hitomi Sato
+---
+Track: Battle! (Elite Four)
+Duration: '3:23'
+Artists:
+- Minako Adachi
+---
+Track: Battle! (Top Champion)
+Duration: '3:18'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Title Screen (Pokémon Red / Pokémon Blue)
+---
+Track: Victory! (Top Champion)
+Duration: '1:09'
+Artists:
+- Minako Adachi
+Referenced Tracks:
+- Battle! (Top Champion)
+---
+Track: With Nemona
+Duration: '1:59'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Battle! (Nemona)
+---
+Track: Battle! (Champion Nemona)
+Duration: '3:07'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Battle! (Nemona)
+---
+Track: The Only Rival
+Duration: '1:07'
+Artists:
+- Hitomi Sato
+Referenced Tracks:
+- Battle! (Nemona)
+---
+Section: Disc 4
+Color: '#bc4cb4'
+---
+Track: Disc 4
+---
+Section: Disc 5
+Color: '#01b5ac'
+---
+Track: Disc 5
+---
+Section: Disc 6
+Color: '#0e5f87'
+---
+Track: Disc 6
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 15b4f7b5..dc4132d7 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -3641,6 +3641,15 @@ URLs:
 Lyrics: |-
     Dei, quod reliquum est, nolite metuere, et ossa tua liberabit, exspectans
 ---
+Track: Evolution (Pokémon Red / Pokémon Blue)
+Directory: evolution-pokemon-red-blue
+Artists:
+- Pokémon
+- Junichi Masuda
+Duration: '0:35'
+URLs:
+- https://www.youtube.com/watch?v=oVIpkXSN_o0
+---
 Track: Extend Music (Mappy)
 # Reference:
 #   https://vgmdb.net/album/16431
@@ -4451,6 +4460,16 @@ Duration: '4:03'
 URLs:
 - https://www.youtube.com/watch?v=lO78gtoZDF4
 ---
+Track: Guide (Pokémon Red / Pokémon Blue)
+# https://vgmdb.net/album/141
+Directory: guide-pokemon-red-blue
+Artists:
+- Pokémon
+- Junichi Masuda
+Duration: '0:38'
+URLs:
+- https://www.youtube.com/watch?v=hisJvtF8qu0
+---
 Track: Guile's Theme
 # From Street Fighter II, which was released in several different versions but... carried the same soundtrack... I think?
 # Original release:
@@ -6389,7 +6408,7 @@ Commentary: |-
     <i>Makin:</i> (wiki editor)
     Also known as Cave Story's Title Theme or Main Theme.
 ---
-Track: Pokémon Center (Pokémon Red & Blue Versions)
+Track: Pokémon Center (Pokémon Red / Pokémon Blue)
 # JP: ポケモンセンター
 # Official release:
 #   ポケモン 赤・緑 スーパーミュージック・コレクション
@@ -6403,6 +6422,17 @@ Duration: '1:14'
 URLs:
 - https://www.youtube.com/watch?v=MjZIjHu0OfY
 ---
+Track: Pokémon Gym (Pokémon Red / Pokémon Blue)
+# Reference:
+#   https://vgmdb.net/album/141
+Directory: pokemon-gym-pokemon-red-and-blue-versions
+Artists:
+- Pokémon
+- Junichi Masuda
+Duration: '1:15'
+URLs:
+- https://www.youtube.com/watch?v=A3IQFA-we6I
+---
 Track: Power
 Directory: power-mother
 Always Reference By Directory: true
@@ -6644,6 +6674,23 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=Rq7PkSBaUG8
 ---
+Track: Received a Pokémon Egg! (Pokémon Gold / Pokémon Silver)
+Directory: received-a-pokemon-egg-pokemon-gold-silver
+Artists:
+- Pokémon
+- Morikazu Aoki
+Duration: '0:04'
+URLs:
+- https://www.youtube.com/watch?v=_xycGmmgbF4
+---
+Track: Received a TM! (Pokémon Gold / Pokémon Silver)
+#cant find standalone upload xd
+Directory: received-a-tm-pokemon-gold-silver
+Artists:
+- Pokémon
+- Junichi Masuda
+Duration: ''
+---
 Track: Reconstructing More Science
 # Official release in a lovely free download
 # Reference:
@@ -6655,6 +6702,19 @@ Duration: '2:37'
 URLs:
 - https://www.youtube.com/watch?v=WAeiqxNH3W0
 ---
+Track: Recovery (Pokémon Red / Pokémon Blue)
+# JP: ポケモンセンター
+# Official release:
+#   ポケモン 赤・緑 スーパーミュージック・コレクション
+# Reference:
+#   https://vgmdb.net/album/141
+Artists:
+- Pokémon
+- Junichi Masuda
+Duration: '0:07'
+URLs:
+- https://www.youtube.com/watch?v=cI7a0d4u9SA
+---
 Track: Recruitment Theme
 # Official release has this track as a medley of other in-game BGM at the end of an album mostly comprising arrangements; duration is from timestamps 41:33 to 42:07 on the album as a whole.
 # Official release:
@@ -7683,11 +7743,12 @@ Track: The Battle at the Summit!
 #   https://vgmdb.net/album/61193
 Artists:
 - artist:pokemon
-- Go Ichinose (composer & arranger)
-- Junichi Masuda (composer)
+- Go Ichinose
 Duration: '3:46'
 URLs:
 - https://www.youtube.com/watch?v=-dkK9r57BNk
+Referenced Tracks:
+- Title Screen (Pokémon Red / Pokémon Blue)
 ---
 Track: The Butcher's Circus Lobby
 # Official release: Darkest Dungeon - The Butcher's Circus DLC EP
@@ -7856,6 +7917,18 @@ URLs:
 Referenced Tracks:
 - Meet the Flintstones
 ---
+Track: The Final Road (Pokémon Red / Pokémon Blue)
+# https://vgmdb.net/album/141
+Directory: the-final-road-pokemon-red-blue
+Artists:
+- Pokémon
+- Junichi Masuda
+Duration: '1:14'
+URLs:
+- https://www.youtube.com/watch?v=kM1b7xUi3gI
+Referenced Tracks:
+- Title Screen (Pokémon Red / Pokémon Blue)
+---
 Track: The Little Sprite
 # JP: 妖精族のこども
 # Official release:
@@ -8196,13 +8269,13 @@ URLs:
 Referenced Tracks:
 - Main Theme (Luigi's Mansion)
 ---
-Track: Title Screen (Pokémon Red & Blue Versions)
+Track: Title Screen (Pokémon Red / Pokémon Blue)
 # JP: 〜オープニング〜
 # Official release:
 #   ポケモン 赤・緑 スーパーミュージック・コレクション
 # Reference:
 #   https://vgmdb.net/album/141
-Directory: title-screen-pokemon-red-and-blue-versions
+Directory: title-screen-pokemon-red-blue
 Artists:
 - artist:pokemon
 - Junichi Masuda
@@ -8677,6 +8750,17 @@ Duration: '0:39'
 URLs:
 - https://youtu.be/ZSdNARyfaZY
 ---
+Track: Victory! (Trainer Battle) (Pokémon Red / Pokémon Blue)
+# Reference:
+#   https://vgmdb.net/album/141
+Directory: victory-trainer-battle-pokemon-red-blue
+Artists:
+- artist:pokemon
+- Junichi Masuda
+Duration: '0:31'
+URLs:
+- https://www.youtube.com/watch?v=NFch6XO5I_c
+---
 Track: Vortal Combat
 # Official release:
 #   Half-Life 2: Episode Two Soundtrack
@@ -32505,6 +32589,23 @@ Lyrics: |-
     Uh huh, it’s obsession
     It's obsession
 ---
+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:
+- Pokémon
+- Junichi Masuda
+Duration: ''
+---
+Track: Obtained an Item! (Pokémon Red / Pokémon Blue)
+Directory: obtained-an-item-pokemon-red-blue
+Artists:
+- Pokémon
+- Junichi Masuda
+Duration: '0:02'
+URLs:
+- https://www.youtube.com/watch?v=1yTPevyGoKk
+---
 Track: OK
 Directory: ok-madeon
 Always Reference By Directory: true
diff --git a/album/super-smash-bros-ultimate.yaml b/album/super-smash-bros-ultimate.yaml
index 79cb6b9c..cda35727 100644
--- a/album/super-smash-bros-ultimate.yaml
+++ b/album/super-smash-bros-ultimate.yaml
@@ -866,7 +866,7 @@ URLs:
 - https://www.youtube.com/watch?v=U1w7E4y7jNM
 Referenced Tracks:
 - 'Battle! (Wild Pokémon) (Pokémon Sun / Pokémon Moon)'
-- Title Screen (Pokémon Red & Blue Versions)
+- Title Screen (Pokémon Red / Pokémon Blue)
 ---
 Track: Battle! (Trainer) - Pokémon Sun / Pokémon Moon
 Artists:
diff --git a/artists.yaml b/artists.yaml
index 050bcf84..eba20645 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -3721,6 +3721,8 @@ URLs:
 Dead URLs:
 - http://zli-studios.info
 ---
+Artist: GAME FREAK
+---
 Artist: garbageGothic
 URLs:
 - https://www.youtube.com/@garbageGothic
@@ -6832,6 +6834,8 @@ Aliases:
 ---
 Artist: Morgan
 ---
+Artist: Morikazu Aoki
+---
 Artist: M0R0S
 ---
 Artist: Morris
@@ -9974,6 +9978,8 @@ Artist: Terry A. Davis
 ---
 Artist: Terry Shaddick
 ---
+Artist: Teruo Taniguchi
+---
 Artist: Tess Snider
 URLs:
 - https://twitter.com/malkyne
@@ -10324,6 +10330,8 @@ Artist: Toshiyuki Kusakihara
 Artist: Toshiyuki Ōmori
 Directory: toshiyuki-omori
 ---
+Artist: Toshiyuki Takahashi
+---
 Artist: Toshiyuki Ueno
 ---
 Artist: Toto
@@ -11727,6 +11735,10 @@ Artist: Hiroki Kikuta
 ---
 Artist: Hiroki Morishita
 ---
+Artist: Hiromi Yasuda
+---
+Artist: Hiromitsu Maeba
+---
 Artist: Hiroshi Yamaguchi
 ---
 Artist: Hirotsugu Homma
@@ -11967,6 +11979,8 @@ URLs:
 ---
 Artist: MIZ
 ---
+Artist: Momoko Fukuda
+---
 Artist: Momomomo
 Aliases:
 - もももも
@@ -12550,3 +12564,6 @@ Artist: ZUN
 Artist: zzzealousy
 URLs:
 - https://twitter.com/zzzealousy
+---
+Artist: 上野愛恵
+Directory: ai-ueno