final fantasy vgm

also a pokemon listening link fix

11 files changed, 199 insertions, 201 deletions

diff --git a/album/final-fantasy-ix.yaml b/album/final-fantasy-ix.yaml
new file mode 100644
index 00000000..bda50830
--- /dev/null
+++ b/album/final-fantasy-ix.yaml
@@ -0,0 +1,53 @@
+Album: Final Fantasy IX
+Style: in-game vgm
+Date: July 7, 2000
+Color: '#efc785'
+Track Artists:
+- Nobuo Uematsu
+Groups:
+- Final Fantasy
+---
+Track: Otherworld
+Suffix Directory: true
+Always Reference By Directory: true
+Contributors:
+- Bill Muir
+Duration: 3:15
+URLs:
+- https://www.youtube.com/watch?v=U9dEu29RY44
+Lyrics: |-
+    Go now if you want it An otherworld awaits you
+    Don't you give up on it You bite the hand that feeds you
+
+    All alone cold fields you wander
+    Memories of it cloud your sight
+    Fills your dreams, disturbs your slumber
+    Lost your way a fallen knight
+
+    Hold now aim is steady An otherworld awaits you
+    One thousand years--you ready? The otherworld it takes you
+
+    Go go into the sand and the dust and the sky
+    Go now no better plan than to do or to die
+    Free me pray to the faith in the face of the light
+    Feed me fill me with sin now get ready to fight
+    You know you will
+    You know you will
+    You know you know you know you know that you will
+    You know you know you know you know that you will
+    You know you will
+
+    Fight fight fight
+    Fight fight fight
+    Fight fight fight
+    Fight fight fight
+
+    Hope dies and you wander The otherworld it makes you
+    Dreams they rip asunder The otherworld it hates you
+    Free now ride up on it Up to the heights it takes you
+    Go now if you want it An otherworld awaits you
+---
+Track: Vamo' alla flamenco
+Duration: 1:53
+URLs:
+- https://www.youtube.com/watch?v=gLEZuDkEuDk
diff --git a/album/final-fantasy-legend-iii.yaml b/album/final-fantasy-legend-iii.yaml
new file mode 100644
index 00000000..50b057ae
--- /dev/null
+++ b/album/final-fantasy-legend-iii.yaml
@@ -0,0 +1,26 @@
+Album: Final Fantasy Legend III
+Style: in-game vgm
+Date: December 13, 1991
+Color: '#b773bc'
+Track Artists:
+- Nobuo Uematsu
+Groups:
+- Final Fantasy
+---
+Track: Holding Back Tears
+Additional Names:
+- パワー (Japanese)
+Artists:
+- Ryuji Sasai
+Duration: 1:18
+URLs:
+- https://www.youtube.com/watch?v=5aX4H1tQ3Kc
+---
+Track: Holy Ruins
+Additional Names:
+- オアシス (Japanese)
+Artists:
+- Ryuji Sasai
+Duration: 2:04
+URLs:
+- https://www.youtube.com/watch?v=O0xKAphIF8A
diff --git a/album/final-fantasy-vi.yaml b/album/final-fantasy-vi.yaml
new file mode 100644
index 00000000..68453cb9
--- /dev/null
+++ b/album/final-fantasy-vi.yaml
@@ -0,0 +1,35 @@
+Album: Final Fantasy VI
+Style: in-game vgm
+Date: April 2, 1994
+Color: '#ffff56'
+Cover Art File Extension: gif
+Track Artists:
+- Nobuo Uematsu
+Groups:
+- Final Fantasy
+---
+Track: Aria di Mezzo Carattere
+# https://finalfantasy.fandom.com/wiki/Aria_di_Mezzo_Carattere
+Additional Names:
+- アリア (Japanese)
+Artists:
+- Nobuo Uematsu
+- Yoshinori Kitase
+Duration: 3:57
+URLs:
+- https://www.youtube.com/watch?v=MLHR9ltzuWM
+---
+Track: The Decisive Battle
+Name Detail: album
+Additional Names:
+- 決戦 (Japanese)
+Duration: 2:02
+URLs:
+- https://www.youtube.com/watch?v=WmBPTpvYyIY
+---
+Track: Terra's Theme
+Additional Names:
+- ティナのテーマ (Japanese)
+Duration: 3:53
+URLs:
+- https://www.youtube.com/watch?v=SrDiiVn1VCk
diff --git a/album/final-fantasy-viii.yaml b/album/final-fantasy-viii.yaml
new file mode 100644
index 00000000..8062a70e
--- /dev/null
+++ b/album/final-fantasy-viii.yaml
@@ -0,0 +1,15 @@
+Album: Final Fantasy VIII
+Style: in-game vgm
+Date: February 11, 1999
+Color: '#cdc8e1'
+Track Artists:
+- Nobuo Uematsu
+Groups:
+- Final Fantasy
+---
+Track: Maybe I'm a Lion
+Additional Names:
+- メイビー・アイ・アム・ア・ライオン (Japanese)
+Duration: 5:35
+URLs:
+- https://www.youtube.com/watch?v=vxklJsp6lJ4
diff --git a/album/final-fantasy.yaml b/album/final-fantasy.yaml
new file mode 100644
index 00000000..c0fe2044
--- /dev/null
+++ b/album/final-fantasy.yaml
@@ -0,0 +1,20 @@
+Album: Final Fantasy
+Style: in-game vgm
+Date: December 18, 1987
+Color: '#ef2e6e'
+Track Artists:
+- Nobuo Uematsu
+Groups:
+- Final Fantasy
+---
+Track: Battle
+Name Detail: album
+Duration: 1:36
+URLs:
+- https://www.youtube.com/watch?v=Hrz5HryadIA
+---
+Track: Victory
+Name Detail: album
+Duration: 0:39
+URLs:
+- https://www.youtube.com/watch?v=ZSdNARyfaZY
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 69562cb3..cdb0ed67 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -1826,16 +1826,6 @@ URLs:
 Referenced Tracks:
 - Before the Sequel - Title Screen
 ---
-Track: Aerith's Theme
-# Reference:
-#   https://vgmdb.net/album/3
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 4:18
-URLs:
-- https://www.youtube.com/watch?v=n0H6kTppjP8
----
 Track: Afternoon on the Island (Tomodachi Collection)
 # Reference:
 #   https://vgmdb.net/album/29635
@@ -2155,22 +2145,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=MtrNyKRbGe4
 ---
-Track: Aria di Mezzo Carattere
-# JP: アリア ("Aria")
-# Official release:
-#   FINAL FANTASY VI ORIGINAL SOUND VERSION
-#   ファイナルファンタジーVI オリジナル・サウンド・ヴァージョン
-# Reference:
-#   https://vgmdb.net/album/40
-#   https://finalfantasy.fandom.com/wiki/Aria_di_Mezzo_Carattere
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-- Yoshinori Kitase
-Duration: 3:57
-URLs:
-- https://www.youtube.com/watch?v=MLHR9ltzuWM
----
 Track: Aria of the Soul
 Directory: aria-of-the-soul
 # Reference:
@@ -2371,16 +2345,6 @@ Duration: 1:41
 URLs:
 - https://www.youtube.com/watch?v=pBr0VWbDwpk
 ---
-Track: Battle (Final Fantasy)
-Directory: battle-final-fantasy
-#   Final Fantasy (1987) but i can't find it on vgmdb rn sorry complain to Jebb
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 1:36
-URLs:
-- https://www.youtube.com/watch?v=Hrz5HryadIA
----
 Track: Battle (Golden Sun)
 # Info from Nintendo Music
 Artists:
@@ -3234,16 +3198,6 @@ Duration: 3:01
 URLs:
 - https://www.youtube.com/watch?v=BXo3DrXHY8w
 ---
-Track: Cosmo Canyon
-# Reference:
-#   https://vgmdb.net/album/3
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 3:36
-URLs:
-- https://www.youtube.com/watch?v=3RUtPuO8alo
----
 Track: Counterattack
 # Reference:
 #   https://vgmdb.net/album/75751
@@ -3563,18 +3517,6 @@ URLs:
 - https://m.nintendo.com/shared/en-US/US/tracks/e7e04053-2acb-4963-a0db-adccdf3ba086
 - https://www.youtube.com/watch?v=wi8SLiK_E6s
 ---
-Track: The Decisive Battle (Final Fantasy VI)
-# JP: 決戦
-#   ファイナルファンタジーVI オリジナル・サウンド・ヴァージョン
-# Reference:
-#   https://vgmdb.net/album/40
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 2:02
-URLs:
-- https://www.youtube.com/watch?v=WmBPTpvYyIY
----
 Track: Delfino Plaza
 # JP: ドルピックタウン
 # Official releases:
@@ -5185,32 +5127,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=ayMOn4GKKGk
 ---
-Track: Holding Back Tears
-# JP: パワー
-# Official release:
-#   涙をこらえて
-# Reference:
-#   https://vgmdb.net/album/34136
-Artists:
-- Final Fantasy
-- Ryuji Sasai
-Duration: 1:18
-URLs:
-- https://www.youtube.com/watch?v=5aX4H1tQ3Kc
----
-Track: Holy Ruins
-# JP: オアシス
-# Official release:
-#   時空の覇者 Sa・Ga 3 Original Soundtrack
-# Reference:
-#   https://vgmdb.net/album/34136
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 2:04
-URLs:
-- https://www.youtube.com/watch?v=O0xKAphIF8A
----
 Track: Homicide
 Directory: homicide-danganronpa
 Always Reference By Directory: true
@@ -6148,16 +6064,6 @@ Duration: 4:19
 URLs:
 - https://www.youtube.com/watch?v=0IIfLwcLTgc
 ---
-Track: Main Theme of FINAL FANTASY VII
-# Reference:
-#   https://vgmdb.net/album/3
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 6:30
-URLs:
-- https://www.youtube.com/watch?v=ORpKwkq5z-4
----
 Track: Main Theme (Pikmin)
 # Reference:
 #   https://vgmdb.net/album/2374
@@ -6296,19 +6202,6 @@ Duration: 4:18
 URLs:
 - https://www.youtube.com/watch?v=t0qbmd0rAqI
 ---
-Track: Maybe I'm a Lion
-# JP: メイビー・アイ・アム・ア・ライオン
-# Official release:
-#   FINAL FANTASY VIII Original Soundtrack
-# Reference:
-#   https://vgmdb.net/album/6
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 5:35
-URLs:
-- https://www.youtube.com/watch?v=vxklJsp6lJ4
----
 Track: MEGALOMANIA
 # Official release:
 #   ライブ・ア・ライブ オリジナル・サウンド・ヴァージョン
@@ -6746,16 +6639,6 @@ Duration: 0:05
 URLs:
 - https://www.youtube.com/watch?v=N3odDaLePKk
 ---
-Track: Opening - Bombing Mission
-# Reference:
-#   https://vgmdb.net/album/3
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 3:58
-URLs:
-- https://www.youtube.com/watch?v=NoWU28L_ZmQ
----
 Track: Opening (Mega Man 5)
 # Reference:
 #   https://vgmdb.net/album/33749
@@ -6802,53 +6685,6 @@ Artists:
 #URLs:
 #-
 ---
-Track: Otherworld
-Directory: otherworld-final-fantasy-ix
-Always Reference By Directory: true
-# Official release:
-#   FINAL FANTASY IX Original Soundtrack
-# Reference:
-#   https://vgmdb.net/album/7
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Contributors:
-- Bill Muir
-Duration: 3:15
-URLs:
-- https://www.youtube.com/watch?v=U9dEu29RY44
-Lyrics: |-
-    Go now if you want it An otherworld awaits you
-    Don't you give up on it You bite the hand that feeds you
-
-    All alone cold fields you wander
-    Memories of it cloud your sight
-    Fills your dreams, disturbs your slumber
-    Lost your way a fallen knight
-
-    Hold now aim is steady An otherworld awaits you
-    One thousand years--you ready? The otherworld it takes you
-
-    Go go into the sand and the dust and the sky
-    Go now no better plan than to do or to die
-    Free me pray to the faith in the face of the light
-    Feed me fill me with sin now get ready to fight
-    You know you will
-    You know you will
-    You know you know you know you know that you will
-    You know you know you know you know that you will
-    You know you will
-
-    Fight fight fight
-    Fight fight fight
-    Fight fight fight
-    Fight fight fight
-
-    Hope dies and you wander The otherworld it makes you
-    Dreams they rip asunder The otherworld it hates you
-    Free now ride up on it Up to the heights it takes you
-    Go now if you want it An otherworld awaits you
----
 Track: Out of Time (Clock Tower BGM)
 # Reference:
 #   https://vgmdb.net/album/12153
@@ -8473,19 +8309,6 @@ Referenced Tracks:
 - Sun's Song
 - Overworld Theme (The Legend of Zelda)
 ---
-Track: Terra's Theme
-# JP: ティナのテーマ
-# Official release:
-#   ファイナルファンタジーVI オリジナル・サウンド・ヴァージョン
-# Reference:
-#   https://vgmdb.net/album/40
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 3:53
-URLs:
-- https://www.youtube.com/watch?v=SrDiiVn1VCk
----
 Track: Thanks For Everything
 Artists:
 - OneShot
@@ -8993,19 +8816,6 @@ Referenced Tracks:
 - Soul 0 System
 - Haltmann Works Co. HQ
 ---
-Track: Vamo' alla flamenco
-# JP: Vamo' alla flamenco
-# Official release:
-#   FINAL FANTASY IX Original Soundtrack
-# Reference:
-#   https://vgmdb.net/album/7
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 1:53
-URLs:
-- https://www.youtube.com/watch?v=gLEZuDkEuDk
----
 Track: Vampire Killer (Castle Infiltration BGM)
 # Reference:
 #   overall info: https://vgmdb.net/album/114949
@@ -9065,16 +8875,6 @@ URLs:
 - https://jukiokallio.bandcamp.com/track/venus-mansion-feat-doseone
 - https://www.youtube.com/watch?v=pR6KObOqfXc
 ---
-Track: Victory
-#   Final Fantasy (1987) but i can't find it on vgmdb rn sorry complain to Jebb
-Directory: victory-final-fantasy
-Artists:
-- Final Fantasy
-- Nobuo Uematsu
-Duration: 0:39
-URLs:
-- https://www.youtube.com/watch?v=ZSdNARyfaZY
----
 Track: Vortal Combat
 # Official release:
 #   Half-Life 2: Episode Two Soundtrack
diff --git a/album/vgm/celeste.yaml b/album/vgm/celeste.yaml
new file mode 100644
index 00000000..9614db1f
--- /dev/null
+++ b/album/vgm/celeste.yaml
@@ -0,0 +1,17 @@
+Album: Celeste
+Directory: celeste
+Style: in-game vgm
+Date: January 25, 2018
+Color: '#e26a82'
+Track Artists:
+- Lena Raine
+Groups:
+- Celeste
+---
+Track: Confronting Myself
+Duration: 4:09
+URLs:
+- https://radicaldreamland.bandcamp.com/track/confronting-myself
+- https://www.youtube.com/watch?v=J7qqT5Ot9R0
+- https://open.spotify.com/track/3SfX4Be10aUklySaUTK5JE
+- https://music.apple.com/song/confronting-myself/1544899674
diff --git a/album/vgm/final-fantasy-vii.yaml b/album/vgm/final-fantasy-vii.yaml
new file mode 100644
index 00000000..c8a8de95
--- /dev/null
+++ b/album/vgm/final-fantasy-vii.yaml
@@ -0,0 +1,28 @@
+Album: Final Fantasy VII
+Style: in-game vgm
+Date: January 31, 1997
+Color: '#63a8a6'
+Track Artists:
+- Nobuo Uematsu
+Groups:
+- Final Fantasy
+---
+Track: Aerith's Theme
+Duration: 4:18
+URLs:
+- https://www.youtube.com/watch?v=n0H6kTppjP8
+---
+Track: Cosmo Canyon
+Duration: 3:36
+URLs:
+- https://www.youtube.com/watch?v=3RUtPuO8alo
+---
+Track: Main Theme of FINAL FANTASY VII
+Duration: 6:30
+URLs:
+- https://www.youtube.com/watch?v=ORpKwkq5z-4
+---
+Track: Opening - Bombing Mission
+Duration: 3:58
+URLs:
+- https://www.youtube.com/watch?v=NoWU28L_ZmQ
diff --git a/album/vgm/pokemon-sun-moon.yaml b/album/vgm/pokemon-sun-moon.yaml
index 4ce86369..8b5aaafd 100644
--- a/album/vgm/pokemon-sun-moon.yaml
+++ b/album/vgm/pokemon-sun-moon.yaml
@@ -95,4 +95,4 @@ Artists:
 - Go Ichinose (arranger)
 Duration: 2:04
 URLs:
-- https://www.youtube.com/watch?v=vgBoQUaEKpk
+- https://www.youtube.com/watch?v=Csly8e_D0MQ
diff --git a/groups.yaml b/groups.yaml
index cd1cac69..2d193ac2 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -1339,6 +1339,8 @@ Group: Brandish
 ---
 Group: Celeste
 ---
+Group: Final Fantasy
+---
 Group: The Legend of Zelda
 ---
 Group: Pokémon
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 984ffe98..2fa61fcc 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -797,6 +797,7 @@ Content: |-
     - fixed [[track:shipwreck-time-and-tide]] crediting [[artist:serialsymphony]] as a standard co-artist rather than a featured artist (thanks, Lan!)
     - fixed [[track:button-eyes]] not crediting [[artist:davi]] as a standard co-artist rather than a featured artist, and not crediting [[artist:davi]] specifically for lyrics and vocals (thanks, Lan!)
     - fixed [[track:game-start-donkey-kong]] not crediting [[artist:shigeru-miyamoto]] as composer (thanks, ruby!)
+    - fixed [[track:holy-ruins]] crediting [[artist:nobuo-uematsu]] instead of [[artist:ryuji-sasai]] (thanks, Lan!)
     - fixed [[track:bad-apple-lovelight]] not crediting [[artist:nomico]] as a featured artist, and not crediting [[artist:harukapakapa]] for lyrics (thanks, Lan!)
     - fixed [[track:never-gonna-give-you-up]] crediting [[artist:stock-aitken-waterman]] as artist and [[artist:rick-astley]] as contributor, instead of the reverse (thanks, Lan!)
     <!-- track section fixes -->
@@ -1080,6 +1081,7 @@ Content: |-
     - fixed Bandcamp listening link for [[track:face-yourself-beta]] (was to [[track:side-1-who-you-were-beta]]; thanks, Lilith!)
     - fixed YouTube listening link for [[track:advanced-step]] (was to [CD track](https://www.youtube.com/watch?v=OW-lJdk3CY4) instead of in-game track; thanks, ruby!)
     - fixed YouTube listening link for [[track:rhythm-boxing-expert]] (was to [beginner/advanced track](https://www.youtube.com/watch?v=QdJPe21VBc0); thanks, ruby, Lavender!)
+    - fixed YouTube listening link for [[track:battle-wild-pokemon-pokemon-sun-moon]] (was to [[track:battle-wild-pokemon-pokemon-red-blue]]; thanks, Lan!)
     - fixed YouTube listening link for [[track:invincibility-bgm-smb]] (was to [SMB2 overworld theme](https://www.youtube.com/watch?v=yBISfv-6hfo); thanks, Lilith, Lan!)
     - replaced dead YouTube listening link for [[track:gasters-theme]] and added undertale.wiki link here (thanks to an emailer, wertercatt, ruby, Lan!)
     - replaced dead YouTube listening links for [[track:bad-apple]] ([[artist:zun]]) and [[track:bad-apple-lovelight]] (feat. [[artist:nomico]]; thanks, Lan, bit, Cello!)