Skip to content

Commit

Permalink
Merge branch 'font-fix' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
slotthhy committed Mar 13, 2024
2 parents b4ee345 + 3c82512 commit a570624
Show file tree
Hide file tree
Showing 13 changed files with 1,570 additions and 127 deletions.
121 changes: 97 additions & 24 deletions Orchestrion/Data/xiv_bgm_de.csv
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
"393","Teardrops in the Rain","","Torrent","Weeping City of Mhach",""
"394","A Thousand Faces","","","Weeping City of Mhach (Ozma add phase)",""
"395","Freefall","","","The Minstrel's Ballad: Nidhogg's Rage (Nidhogg) mount / Dark Lanner",""
"396","Good King Moggle Mog XXII","","","Fat Moogle Mount",""
"396","Good King Moggle Mog XII","","","Fat Moogle Mount",""
"397","Locus","","","Gobwalker Mount",""
"398","Night in the Brume","","","Heavensward cutscenes","Variant of 278"
"399","The Merry Wanderer Waltz","","","Palace of the Dead inter-floor theme",""
Expand Down Expand Up @@ -731,16 +731,16 @@
"729","A Fierce Air Forceth","","","Construct VII mount",""
"730","Starved","","","Epimetheus, Menoetius mounts",""
"731","Imperium","","","Morbol mount",""
"732","Significance (Nothing)","","","The Copied Factory solo exploration",""
"733","City Ruins - Rays of Light","","","The Copied Factory - Nier Automata OST",""
"734","Vague Hope","","","The Copied Factory - (Quest Area)",""
"732","Significance (Nothing)","","","The Copied Factory solo exploration","FFXIV x NieR crossover"
"733","City Ruins - Rays of Light","","","The Copied Factory","FFXIV x NieR crossover"
"734","Vague Hope","","","The Copied Factory - (Quest Area)","FFXIV x NieR crossover"
"735","","","","",""
"736","Voice of no Return (Guitar)","","","Need location","From FFXIV x NieR crossover"
"737","Alien Manifestation","","","The Copied Factory","From FFXIV x NieR crossover"
"738","Song of the Ancients - Atonement","","","The Copied Factory boss 1 (Serial-jointed Command Model), The Copied Factory boss 2 (Hobbes), The Tower at Paradigm's Breach boss 2 (Hansel & Gretel)","From FFXIV x NieR crossover"
"739","Bipolar Nightmare","","","The Copied Factory boss 3 (Engels), The Puppet's Bunker boss 2 (767P-operated Superior Flight Unit(s))","From FFXIV x NieR crossover"
"740","Weight of the World - Prelude Version","","","The Copied Factory boss 4 (9S-operated Walking Fortress)","From FFXIV x NieR crossover"
"741","Crumbling Lies (Front)","","","Shadowbringers cutscenes (FFXIV x NieR crossover)","From FFXIV x NieR crossover"
"736","Voice of no Return (Guitar)","","","Need location","FFXIV x NieR crossover"
"737","Alien Manifestation","","","The Copied Factory","FFXIV x NieR crossover"
"738","Song of the Ancients - Atonement","","","The Copied Factory boss 1 (Serial-jointed Command Model), The Copied Factory boss 2 (Hobbes), The Tower at Paradigm's Breach boss 2 (Hansel & Gretel)","FFXIV x NieR crossover"
"739","Bipolar Nightmare","","","The Copied Factory boss 3 (Engels), The Puppet's Bunker boss 2 (767P-operated Superior Flight Unit(s))","FFXIV x NieR crossover"
"740","Weight of the World - Prelude Version","","","The Copied Factory boss 4 (9S-operated Walking Fortress)","FFXIV x NieR crossover"
"741","Crumbling Lies (Front)","","","Shadowbringers cutscenes (FFXIV x NieR crossover)","FFXIV x NieR crossover"
"742","Ami","","","Eden cutscenes / The Empty (finished)","FFVIII"
"743","Hopl's Dropple","","","Rak'tika Greatwood (Friendly Qitari area)",""
"744","Gangos","","","Gangos",""
Expand Down Expand Up @@ -779,9 +779,9 @@
"777","Where All Roads Lead","","","The Heroes Gauntlet",""
"778","To The Edge","","","The Seat of Sacrifice (Extreme) mount / Gwiber of Light",""
"779","Discord: Imperial (Zodiac Age Version)","","","The Bozjan Southern Front lockbox mount / Gabriel α",""
"780","Broken Heart","","","Needs location","From FFXIV x NieR crossover"
"781","City Ruins (Rays of Light) (Instrumental)","","","Needs location","From FFXIV x NieR crossover"
"782","Amusement Park","","","Needs location","From FFXIV x NieR crossover"
"780","Broken Heart","","","YoRHa: Dark Apocalypse cutscenes","From FFXIV x NieR crossover"
"781","City Ruins (Rays of Light) (Instrumental)","","","YoRHa: Dark Apocalypse cutscenes","From FFXIV x NieR crossover"
"782","Amusement Park","","","Temporarily plays in Komra during the YoRHa: Dark Apocalypse questline, after unlocking The Puppet's Bunker","From FFXIV x NieR crossover"
"783","Fortress of Lies","","","The Puppet's Bunker","From FFXIV x NieR crossover"
"784","Grandma (Destruction)","","","The Puppet's Bunker boss 1 (813P-operated Aegis Unit), The Puppet's Bunker final boss (The Compound) phase 1","From FFXIV x NieR crossover"
"785","End of the Unknown","","","The Puppet's Bunker boss 3 (905P-operated Heavy Artillery Unit)","From FFXIV x NieR crossover"
Expand Down Expand Up @@ -911,7 +911,7 @@
"909","Festival of the Hunt (Endwalker)","","","Crystalline Conflict","During match"
"910","Run! (Endwalker)","","","Crystalline Conflict","Overtime"
"911","The Map Unfolds","","","Alzadaal's Legacy",""
"912","???","","","The Omphalos",""
"912","One Among Wonders","","","The Omphalos",""
"913","Pilgrimage","","","Aglaia",""
"914","Radiance","","","Aglaia Boss 1 (Byregot) / Aglaia Boss 2 (Rhalgr) / Aglaia Boss 3 (Azeyma)",""
"915","In the Balance","","","Aglaia Final Boss (Nald'thal)",""
Expand Down Expand Up @@ -964,14 +964,87 @@
"962","Deltascape","","","The Omega Protocol (Ultimate) Phase 1 (Omega)",""
"963","Heartless","","","The Omega Protocol (Ultimate) Phase 2 (Omega M + Omega F)",""
"964","eScape","","","The Omega Protocol (Ultimate) Phase 5 (Omega M + Omega F)",""
"965","Another Moon","","","",""
"966","Voidcast Savior","","","",""
"965","Another Moon","","","Endwalker Thirteenth's Moon theme",""
"966","Voidcast Savior","","","The Voidcast Dais (Golbez)",""
"967","Battle 2 from FINAL FANTASY III","","","",""
"968","Subterranean Sanctuary","","","",""
"971","Starsbreath","","","",""
"975","One Amongst the Weary","","","",""
"976","Fleeting Moment","","","",""
"977","Athena, the Tireless One","","","",""
"978","Ultima's Perfection (Endwalker)","","","",""
"979","Voidcast Savior","","","",""
"980","Athena, the Tireless One","","","",""
"985","Dreams Aloft","","","",""
"969","The Land Reborn","","","",""
"970","Pom from the Heavens","","","",""
"971","Starsbreath","","","The Aetherfont",""
"972","Crimson Sunset","","","Mount Rokkon",""
"973","Storm of Blood","","","Mount Rokkon final boss ()",""
"974","Crimson Rise","","","Another Mount Rokkon",""
"975","One Amongst the Weary","","","Anabaseios: The Ninth Circle / Anabaseios: The Ninth Circle: Savage (Kokytos) / Anabaseios: The Tenth Circle / Anabaseios: The Tenth Circle: Savage (Pandæmonium)",""
"976","Fleeting Moment","","","Anabaseios: The Eleventh Circle / Anabaseios: The Eleventh Circle: Savage (Themis)",""
"977","Athena, the Tireless One","","","Anabaseios: The Twelfth Circle / Anabaseios: The Twelfth Circle: Savage (Athena)",""
"978","Ultima's Perfection (Endwalker)","","","Anabaseios: The Twelfth Circle / Anabaseios: The Twelfth Circle: Savage Phase 2 (Athena)",""
"979","Voidcast Savior","","","Lynx of Fallen Shadow mount / The Voidcast Dais (Golbez) mount",""
"980","Athena, the Tireless One","","","Axolotl mount / Anabaseios: The Twelfth Circle / Anabaseios: The Twelfth Circle: Savage Phase 2 (Athena) mount",""
"981","Crimson Sunset","","","Burabura Chochin / Mount Rokkon mount",""
"982","Crimson Rise","","","Shishioji / Another Mount Rokkon mount",""
"983","The Land Reborn","","","Kupo Kupo Adventure - Title Screen",""
"984","Pom from the Heavens","","","Kupo Kupo Adventure - Gameplay",""
"985","Dreams Aloft","","","Garlond GL-IS mount",""
"986","","","","",""
"987","FINAL FANTASY IV: The Final Battle (Endwalker)","","","The Abyssal Fracture (Zeromus) phase 1",""
"988","The Red Wings (Endwalker)","","","The Abyssal Fracture (Zeromus) phase 2",""
"989","Kingdom of Baron (Endwalker)","","","The Lunar Subterrane",""
"990","O Speaker, Slumber","","","",""
"991","O Hunter, Rejoice","","","",""
"992","Fair Winds to Guide","","","Thaleia between bosses",""
"993","Course Uncharted","","","Thaleia Boss 1 (Thaliak), Boss 2 (Llymlaen), Boss 3 (Oschon)",""
"994","Myths of the Realm","","","Thaleia final boss (Eulogia)",""
"995","FINAL FANTASY IV: The Final Battle (Endwalker)","","","Lynx of Abyssal Grief mount / The Abyssal Fracture (Zeromus) mount",""
"996","O Speaker, Slumber","","","",""
"997","O Hunter, Rejoice","","","",""
"998","Prelude - Tales","","","Apocryphal Bahamut / all Lynx mount",""
"999","","","","",""
"1000","","","","",""
"20000","","","","",""
"20001","","","","",""
"20002","","","","",""
"20003","","","","",""
"20004","","","","",""
"20005","","","","",""
"20006","","","","",""
"20007","","","","",""
"20008","","","","",""
"20009","","","","",""
"20010","","","","",""
"20011","","","","",""
"20012","Everybody Falls (Fall Guys Theme)","","","",""
"20013","Sir Falls-A-Lot (William Fell)","","","",""
"20014","Fall 'N' Roll","","","",""
"20015","Clumsy Shuffle","","","",""
"20016","Fall for the Queen Bean","","","",""
"20017","Final Fall","","","",""
"20018","???","","","",""
"20019","???","","","",""
"20020","Didn't Fall! (You Win)","","","",""
"20021","Everybody Falls (Fall Guys Theme)","","","",""
"20022","","","","",""
"20023","","","","",""
"20024","","","","",""
"20025","","","","",""
"20026","","","","",""
"20027","","","","",""
"20028","","","","",""
"20029","","","","",""
"20030","","","","",""
"20031","","","","",""
"20032","","","","",""
"20033","","","","",""
"20034","","","","",""
"20035","","","","",""
"20036","","","","",""
"20037","","","","",""
"20038","","","","",""
"20039","","","","",""
"20040","","","","",""
"20041","","","","",""
"20042","","","","",""
"20043","","","","",""
"20044","","","","",""
"20045","","","","",""
"20046","","","","",""
"20047","","","","",""
121 changes: 97 additions & 24 deletions Orchestrion/Data/xiv_bgm_en.csv
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
"393","Teardrops in the Rain","","Torrent","Weeping City of Mhach",""
"394","A Thousand Faces","","","Weeping City of Mhach (Ozma add phase)",""
"395","Freefall","","","The Minstrel's Ballad: Nidhogg's Rage (Nidhogg) mount / Dark Lanner",""
"396","Good King Moggle Mog XXII","","","Fat Moogle Mount",""
"396","Good King Moggle Mog XII","","","Fat Moogle Mount",""
"397","Locus","","","Gobwalker Mount",""
"398","Night in the Brume","","","Heavensward cutscenes","Variant of 278"
"399","The Merry Wanderer Waltz","","","Palace of the Dead inter-floor theme",""
Expand Down Expand Up @@ -731,16 +731,16 @@
"729","A Fierce Air Forceth","","","Construct VII mount",""
"730","Starved","","","Epimetheus, Menoetius mounts",""
"731","Imperium","","","Morbol mount",""
"732","Significance (Nothing)","","","The Copied Factory solo exploration",""
"733","City Ruins - Rays of Light","","","The Copied Factory - Nier Automata OST",""
"734","Vague Hope","","","The Copied Factory - (Quest Area)",""
"732","Significance (Nothing)","","","The Copied Factory solo exploration","FFXIV x NieR crossover"
"733","City Ruins - Rays of Light","","","The Copied Factory","FFXIV x NieR crossover"
"734","Vague Hope","","","The Copied Factory - (Quest Area)","FFXIV x NieR crossover"
"735","","","","",""
"736","Voice of no Return (Guitar)","","","Need location","From FFXIV x NieR crossover"
"737","Alien Manifestation","","","The Copied Factory","From FFXIV x NieR crossover"
"738","Song of the Ancients - Atonement","","","The Copied Factory boss 1 (Serial-jointed Command Model), The Copied Factory boss 2 (Hobbes), The Tower at Paradigm's Breach boss 2 (Hansel & Gretel)","From FFXIV x NieR crossover"
"739","Bipolar Nightmare","","","The Copied Factory boss 3 (Engels), The Puppet's Bunker boss 2 (767P-operated Superior Flight Unit(s))","From FFXIV x NieR crossover"
"740","Weight of the World - Prelude Version","","","The Copied Factory boss 4 (9S-operated Walking Fortress)","From FFXIV x NieR crossover"
"741","Crumbling Lies (Front)","","","Shadowbringers cutscenes (FFXIV x NieR crossover)","From FFXIV x NieR crossover"
"736","Voice of no Return (Guitar)","","","Need location","FFXIV x NieR crossover"
"737","Alien Manifestation","","","The Copied Factory","FFXIV x NieR crossover"
"738","Song of the Ancients - Atonement","","","The Copied Factory boss 1 (Serial-jointed Command Model), The Copied Factory boss 2 (Hobbes), The Tower at Paradigm's Breach boss 2 (Hansel & Gretel)","FFXIV x NieR crossover"
"739","Bipolar Nightmare","","","The Copied Factory boss 3 (Engels), The Puppet's Bunker boss 2 (767P-operated Superior Flight Unit(s))","FFXIV x NieR crossover"
"740","Weight of the World - Prelude Version","","","The Copied Factory boss 4 (9S-operated Walking Fortress)","FFXIV x NieR crossover"
"741","Crumbling Lies (Front)","","","Shadowbringers cutscenes (FFXIV x NieR crossover)","FFXIV x NieR crossover"
"742","Ami","","","Eden cutscenes / The Empty (finished)","FFVIII"
"743","Hopl's Dropple","","","Rak'tika Greatwood (Friendly Qitari area)",""
"744","Gangos","","","Gangos",""
Expand Down Expand Up @@ -779,9 +779,9 @@
"777","Where All Roads Lead","","","The Heroes Gauntlet",""
"778","To The Edge","","","The Seat of Sacrifice (Extreme) mount / Gwiber of Light",""
"779","Discord: Imperial (Zodiac Age Version)","","","The Bozjan Southern Front lockbox mount / Gabriel α",""
"780","Broken Heart","","","Needs location","From FFXIV x NieR crossover"
"781","City Ruins (Rays of Light) (Instrumental)","","","Needs location","From FFXIV x NieR crossover"
"782","Amusement Park","","","Needs location","From FFXIV x NieR crossover"
"780","Broken Heart","","","YoRHa: Dark Apocalypse cutscenes","From FFXIV x NieR crossover"
"781","City Ruins (Rays of Light) (Instrumental)","","","YoRHa: Dark Apocalypse cutscenes","From FFXIV x NieR crossover"
"782","Amusement Park","","","Temporarily plays in Komra during the YoRHa: Dark Apocalypse questline, after unlocking The Puppet's Bunker","From FFXIV x NieR crossover"
"783","Fortress of Lies","","","The Puppet's Bunker","From FFXIV x NieR crossover"
"784","Grandma (Destruction)","","","The Puppet's Bunker boss 1 (813P-operated Aegis Unit), The Puppet's Bunker final boss (The Compound) phase 1","From FFXIV x NieR crossover"
"785","End of the Unknown","","","The Puppet's Bunker boss 3 (905P-operated Heavy Artillery Unit)","From FFXIV x NieR crossover"
Expand Down Expand Up @@ -911,7 +911,7 @@
"909","Festival of the Hunt (Endwalker)","","","Crystalline Conflict","During match"
"910","Run! (Endwalker)","","","Crystalline Conflict","Overtime"
"911","The Map Unfolds","","","Alzadaal's Legacy",""
"912","???","","","The Omphalos",""
"912","One Among Wonders","","","The Omphalos",""
"913","Pilgrimage","","","Aglaia",""
"914","Radiance","","","Aglaia Boss 1 (Byregot) / Aglaia Boss 2 (Rhalgr) / Aglaia Boss 3 (Azeyma)",""
"915","In the Balance","","","Aglaia Final Boss (Nald'thal)",""
Expand Down Expand Up @@ -964,14 +964,87 @@
"962","Deltascape","","","The Omega Protocol (Ultimate) Phase 1 (Omega)",""
"963","Heartless","","","The Omega Protocol (Ultimate) Phase 2 (Omega M + Omega F)",""
"964","eScape","","","The Omega Protocol (Ultimate) Phase 5 (Omega M + Omega F)",""
"965","Another Moon","","","",""
"966","Voidcast Savior","","","",""
"965","Another Moon","","","Endwalker Thirteenth's Moon theme",""
"966","Voidcast Savior","","","The Voidcast Dais (Golbez)",""
"967","Battle 2 from FINAL FANTASY III","","","",""
"968","Subterranean Sanctuary","","","",""
"971","Starsbreath","","","",""
"975","One Amongst the Weary","","","",""
"976","Fleeting Moment","","","",""
"977","Athena, the Tireless One","","","",""
"978","Ultima's Perfection (Endwalker)","","","",""
"979","Voidcast Savior","","","",""
"980","Athena, the Tireless One","","","",""
"985","Dreams Aloft","","","",""
"969","The Land Reborn","","","",""
"970","Pom from the Heavens","","","",""
"971","Starsbreath","","","The Aetherfont",""
"972","Crimson Sunset","","","Mount Rokkon",""
"973","Storm of Blood","","","Mount Rokkon final boss ()",""
"974","Crimson Rise","","","Another Mount Rokkon",""
"975","One Amongst the Weary","","","Anabaseios: The Ninth Circle / Anabaseios: The Ninth Circle: Savage (Kokytos) / Anabaseios: The Tenth Circle / Anabaseios: The Tenth Circle: Savage (Pandæmonium)",""
"976","Fleeting Moment","","","Anabaseios: The Eleventh Circle / Anabaseios: The Eleventh Circle: Savage (Themis)",""
"977","Athena, the Tireless One","","","Anabaseios: The Twelfth Circle / Anabaseios: The Twelfth Circle: Savage (Athena)",""
"978","Ultima's Perfection (Endwalker)","","","Anabaseios: The Twelfth Circle / Anabaseios: The Twelfth Circle: Savage Phase 2 (Athena)",""
"979","Voidcast Savior","","","Lynx of Fallen Shadow mount / The Voidcast Dais (Golbez) mount",""
"980","Athena, the Tireless One","","","Axolotl mount / Anabaseios: The Twelfth Circle / Anabaseios: The Twelfth Circle: Savage Phase 2 (Athena) mount",""
"981","Crimson Sunset","","","Burabura Chochin / Mount Rokkon mount",""
"982","Crimson Rise","","","Shishioji / Another Mount Rokkon mount",""
"983","The Land Reborn","","","Kupo Kupo Adventure - Title Screen",""
"984","Pom from the Heavens","","","Kupo Kupo Adventure - Gameplay",""
"985","Dreams Aloft","","","Garlond GL-IS mount",""
"986","","","","",""
"987","FINAL FANTASY IV: The Final Battle (Endwalker)","","","The Abyssal Fracture (Zeromus) phase 1",""
"988","The Red Wings (Endwalker)","","","The Abyssal Fracture (Zeromus) phase 2",""
"989","Kingdom of Baron (Endwalker)","","","The Lunar Subterrane",""
"990","O Speaker, Slumber","","","",""
"991","O Hunter, Rejoice","","","",""
"992","Fair Winds to Guide","","","Thaleia between bosses",""
"993","Course Uncharted","","","Thaleia Boss 1 (Thaliak), Boss 2 (Llymlaen), Boss 3 (Oschon)",""
"994","Myths of the Realm","","","Thaleia final boss (Eulogia)",""
"995","FINAL FANTASY IV: The Final Battle (Endwalker)","","","Lynx of Abyssal Grief mount / The Abyssal Fracture (Zeromus) mount",""
"996","O Speaker, Slumber","","","",""
"997","O Hunter, Rejoice","","","",""
"998","Prelude - Tales","","","Apocryphal Bahamut / all Lynx mount",""
"999","","","","",""
"1000","","","","",""
"20000","","","","",""
"20001","","","","",""
"20002","","","","",""
"20003","","","","",""
"20004","","","","",""
"20005","","","","",""
"20006","","","","",""
"20007","","","","",""
"20008","","","","",""
"20009","","","","",""
"20010","","","","",""
"20011","","","","",""
"20012","Everybody Falls (Fall Guys Theme)","","","",""
"20013","Sir Falls-A-Lot (William Fell)","","","",""
"20014","Fall 'N' Roll","","","",""
"20015","Clumsy Shuffle","","","",""
"20016","Fall for the Queen Bean","","","",""
"20017","Final Fall","","","",""
"20018","???","","","Commonly called 'Loading'",""
"20019","???","","","Commonly called 'Round Introduction'",""
"20020","Didn't Fall! (You Win)","","","",""
"20021","Everybody Falls (Fall Guys Theme)","","","",""
"20022","","","","",""
"20023","","","","",""
"20024","","","","",""
"20025","","","","",""
"20026","","","","",""
"20027","","","","",""
"20028","","","","",""
"20029","","","","",""
"20030","","","","",""
"20031","","","","",""
"20032","","","","",""
"20033","","","","",""
"20034","","","","",""
"20035","","","","",""
"20036","","","","",""
"20037","","","","",""
"20038","","","","",""
"20039","","","","",""
"20040","","","","",""
"20041","","","","",""
"20042","","","","",""
"20043","","","","",""
"20044","","","","",""
"20045","","","","",""
"20046","","","","",""
"20047","","","","",""
Loading

0 comments on commit a570624

Please sign in to comment.