diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp
index 6847b4e44a..339abab619 100644
--- a/Source/Core/DiscIO/Enums.cpp
+++ b/Source/Core/DiscIO/Enums.cpp
@@ -411,6 +411,7 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"02", "Nintendo"},
       {"08", "Capcom"},
       {"0A", "Jaleco Entertainment"},
+      {"0L", "Warashi"},
       {"0M", "Entertainment Software Publishing"},
       {"0Q", "IE Institute"},
       {"13", "Electronic Arts / EA Sports"},
@@ -465,6 +466,7 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"7J", "Zushi Games / ZOO Digital Publishing"},
       {"7K", "Kiddinx Entertainment"},
       {"7L", "Simon & Schuster Interactive"},
+      {"7M", "Le Cortex"},
       {"7N", "Empire Interactive / Xplosiv"},
       {"7S", "Rockstar Games"},
       {"7T", "Scholastic"},
@@ -479,14 +481,18 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"99", "Marvelous Entertainment / Victor Entertainment / Pack-In-Video / Rising Star Games"},
       {"9B", "Tecmo"},
       {"9G", "Take-Two Interactive / Gotham Games / Gathering of Developers"},
+      {"9S", "Brother International"},
+      {"9Z", "Crunchyroll"},
       {"A4", "Konami"},
       {"A7", "Takara / Takara Tomy"},
       {"AF", "Namco Bandai Games"},
       {"AU", "Alternative Software"},
+      {"AX", "Vivendi"},
       {"B0", "Acclaim Entertainment"},
       {"B2", "Bandai Games"},
       {"BB", "Gaijinworks"},
       {"BL", "MTO"},
+      {"BM", "XING"},
       {"BN", "Sunrise Interactive"},
       {"BP", "Global A Entertainment"},
       {"C0", "Taito"},
@@ -497,6 +503,7 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"DA", "Takara Tomy"},
       {"DQ", "Compile Heart / Idea Factory"},
       {"E5", "Epoch"},
+      {"E6", "Game Arts"},
       {"E7", "Athena"},
       {"E8", "Asmik Ace Entertainment"},
       {"E9", "Natsume"},
@@ -514,12 +521,14 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"FS", "XS Games"},
       {"G0", "Alpha Unit"},
       {"G2", "Yuke's"},
+      {"G6", "SIMS"},
       {"G9", "D3 Publisher"},
       {"GA", "PIN Change"},
       {"GD", "Square Enix"},
       {"GE", "Kids Station"},
       {"GG", "O3 Entertainment"},
       {"GJ", "Detn8"},
+      {"GK", "Genki"},
       {"GL", "Gameloft / Ubisoft"},
       {"GM", "Gamecock Media Group"},
       {"GN", "Oxygen Games"},
@@ -531,15 +540,18 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"H3", "Zen United"},
       {"H4", "SNK Playmore"},
       {"HA", "Nobilis"},
+      {"HE", "Gust"},
       {"HF", "Level-5"},
       {"HG", "Graffiti Entertainment"},
       {"HH", "Focus Home Interactive"},
       {"HJ", "Genius Products"},
+      {"HK", "D2C Games"},
       {"HL", "Frontier Developments"},
       {"HM", "HMH Interactive"},
       {"HN", "High Voltage Software"},
       {"HQ", "Abstraction Games"},
       {"HS", "Tru Blu"},
+      {"HT", "Big Blue Bubble"},
       {"HU", "Ghostfire Games"},
       {"HW", "Incredible Technologies"},
       {"HY", "Reef Entertainment"},
@@ -552,142 +564,228 @@ const std::string& GetCompanyFromID(const std::string& company_id)
       {"JG", "The Games Company"},
       {"JH", "City Interactive"},
       {"JJ", "Deep Silver"},
+      {"JP", "redspotgames"},
       {"JR", "Engine Software"},
       {"JS", "Digital Leisure"},
       {"JT", "Empty Clip Studios"},
+      {"JU", "Riverman Media"},
+      {"JV", "JV Games"},
       {"JW", "BigBen Interactive"},
       {"JX", "Shin'en Multimedia"},
+      {"JY", "Steel Penny Games"},
       {"JZ", "505 Games"},
+      {"K2", "Coca-Cola (Japan) Company"},
       {"K3", "Yudo"},
       {"K6", "Nihon System"},
       {"KB", "Nippon Ichi Software America"},
       {"KG", "Kando Games"},
+      {"KH", "Joju Games"},
       {"KJ", "Studio Zan"},
+      {"KK", "DK Games"},
       {"KL", "Abylight"},
       {"KM", "Deep Silver"},
+      {"KN", "Gameshastra"},
       {"KP", "Purple Hills"},
       {"KQ", "Over the Top Games"},
       {"KR", "KREA Medie"},
+      {"KT", "The Code Monkeys"},
       {"KW", "Semnat Studios"},
+      {"KY", "Medaverse Studios"},
       {"L3", "G-Mode"},
+      {"L8", "FujiSoft"},
+      {"LB", "Tryfirst"},
+      {"LD", "Studio Zan"},
+      {"LF", "Kemco"},
       {"LG", "Black Bean Games"},
       {"LJ", "Legendo Entertainment"},
       {"LL", "HB Studios"},
+      {"LN", "GameOn"},
       {"LP", "Left Field Productions"},
       {"LR", "Koch Media"},
       {"LT", "Legacy Interactive"},
+      {"LU", "Lexis Num\xc3\xa9rique"},  // We can't use a u8 prefix due to C++20's u8string
+      {"LW", "Grendel Games"},
       {"LY", "Icon Games"},
+      {"M0", "Studio Zan"},
+      {"M1", "Grand Prix Games"},
+      {"M2", "HomeMedia"},
+      {"M4", "Cybird"},
+      {"M6", "Perpetuum"},
+      {"MB", "Agenda"},
       {"MD", "Ateam"},
+      {"ME", "SilverStar"},
+      {"MF", "Yamasa"},
       {"MH", "Mentor Interactive"},
       {"MJ", "Mumbo Jumbo"},
       {"ML", "DTP Young Entertainment"},
       {"MM", "Big John Games"},
+      {"MN", "Mindscape"},
       {"MR", "Mindscape"},
       {"MS", "Milestone / UFO Interactive Games"},
       {"MT", "Blast! Entertainment"},
       {"MV", "Marvelous Entertainment"},
       {"MZ", "Mad Catz"},
+      {"N0", "Exkee"},
+      {"N4", "Zoom"},
+      {"N7", "T&S"},
       {"N9", "Tera Box"},
+      {"NA", "Tom Create"},
+      {"NB", "HI Games & Publishing"},
+      {"NE", "Kosaido"},
+      {"NF", "Peakvox"},
       {"NG", "Nordic Games"},
       {"NH", "Gevo Entertainment"},
       {"NJ", "Enjoy Gaming"},
       {"NK", "Neko Entertainment"},
       {"NL", "Nordic Softsales"},
+      {"NN", "Nnooo"},
       {"NP", "Nobilis"},
       {"NQ", "Namco Bandai Partners"},
       {"NR", "Bold Games / Destineer Games"},
       {"NS", "Nippon Ichi Software"},
+      {"NT", "Nocturnal Entertainment"},
       {"NV", "Nicalis"},
       {"NW", "Deep Fried Entertainment"},
       {"NX", "Barnstorm Games"},
       {"NY", "Nicalis"},
+      {"P1", "Poisoft"},
       {"PH", "Playful Entertainment"},
       {"PK", "Knowledge Adventure"},
       {"PL", "Playlogic Entertainment"},
       {"PM", "Warner Bros. Interactive Entertainment"},
       {"PN", "P2 Games"},
       {"PQ", "PopCap Games"},
+      {"PS", "Bplus"},
+      {"PT", "Firemint"},
+      {"PU", "Pub Company"},
+      {"PV", "Pan Vision"},
+      {"PY", "Playstos Entertainment"},
       {"PZ", "GameMill Publishing"},
+      {"Q2", "Santa Entertainment"},
+      {"Q3", "Asterizm"},
       {"Q4", "Hamster"},
+      {"Q5", "Recom"},
+      {"QA", "Miracle Kidz"},
       {"QC", "Kadokawa Shoten / Enterbrain"},
       {"QH", "Virtual Play Games"},
       {"QK", "MACHINE Studios"},
       {"QM", "Object Vision Software"},
+      {"QQ", "Gamelion"},
+      {"QR", "Lapland Studio"},
       {"QT", "CALARIS"},
       {"QU", "QubicGames"},
+      {"QV", "Ludia"},
+      {"QW", "Kaasa Solution"},
       {"QX", "Press Play"},
+      {"QZ", "Hands-On Mobile"},
       {"RA", "Office Create"},
       {"RG", "Ronimo Games"},
+      {"RH", "h2f Games"},
       {"RM", "Rondomedia"},
       {"RN", "Mastiff / N3V Games"},
+      {"RQ", "GolemLabs & Zoozen"},
       {"RS", "Brash Entertainment"},
       {"RT", "RTL Enterprises"},
       {"RV", "bitComposer Games"},
       {"RW", "RealArcade"},
+      {"RX", "Reflexive Entertainment"},
       {"RZ", "Akaoni Studio"},
       {"S5", "SouthPeak Games"},
+      {"SH", "Sabarasa"},
       {"SJ", "Cosmonaut Games"},
       {"SP", "Blade Interactive Studios"},
       {"SQ", "Sonalysts"},
+      {"SR", "SnapDragon Games"},
+      {"SS", "Sanuk Games"},
+      {"ST", "Stickmen Studios"},
       {"SU", "Slitherine"},
       {"SV", "7G//AMES"},
       {"SZ", "Storm City Games"},
+      {"TH", "Kolkom"},
       {"TJ", "Broken Rules"},
       {"TL", "Telltale Games"},
       {"TR", "Tetris Online"},
+      {"TS", "Triangle Studios"},
       {"TV", "Tivola"},
       {"TW", "Two Tribes"},
       {"TY", "Teyon"},
       {"UG", "Data Design Interactive / Popcorn Arcade / Metro 3D"},
       {"UH", "Intenium Console"},
       {"UJ", "Ghostlight"},
+      {"UK", "iFun4all"},
       {"UN", "Chillingo"},
       {"UP", "EnjoyUp Games"},
       {"UR", "Sudden Games"},
+      {"US", "USM"},
       {"UU", "Onteca"},
+      {"UV", "Fugazo"},
       {"UW", "Coresoft"},
+      {"VG", "Vogster Entertainment"},
+      {"VK", "Sandlot Games"},
       {"VL", "Eko Software"},
       {"VN", "Valcon Games"},
       {"VP", "Virgin Play"},
       {"VS", "Korner Entertainment"},
       {"VT", "Microforum Games"},
+      {"VU", "Double Jungle"},
       {"VV", "Pixonauts"},
+      {"VX", "Frontline Studios"},
       {"VZ", "Little Orbit"},
+      {"WD", "Amazon"},
       {"WG", "2D Boy"},
       {"WH", "NinjaBee"},
       {"WJ", "Studio Walljump"},
+      {"WL", "Wired Productions"},
       {"WN", "tons of bits"},
+      {"WP", "White Park Bay Software"},
+      {"WQ", "Revistronic"},
       {"WR", "Warner Bros. Interactive Entertainment"},
       {"WS", "MonkeyPaw Games"},
       {"WW", "Slang Publishing"},
       {"WY", "WayForward Technologies"},
       {"WZ", "Wizarbox"},
+      {"X0", "SDP Games"},
       {"X3", "CK Games"},
       {"X4", "Easy Interactive"},
+      {"XB", "Hulu"},
       {"XG", "XGen Studios"},
       {"XJ", "XSEED Games"},
       {"XK", "Exkee"},
       {"XM", "DreamBox Games"},
+      {"XN", "Netflix"},
       {"XS", "Aksys Games"},
       {"XT", "Funbox Media"},
+      {"XU", "Shanblue Interactive"},
       {"XV", "Keystone Game Studio"},
       {"XW", "Lemon Games"},
+      {"XY", "Gaijin Games"},
       {"Y1", "Tubby Games"},
       {"Y5", "Easy Interactive"},
       {"Y6", "Motiviti"},
+      {"Y7", "The Learning Company"},
+      {"Y9", "RadiationBurn"},
       {"YC", "NECA"},
       {"YD", "Infinite Dreams"},
       {"YF", "Oxygene"},
       {"YG", "Maximum Family Games"},
+      {"YJ", "Frozen Codebase"},
+      {"YK", "MAD Multimedia"},
+      {"YN", "Game Factory"},
+      {"YS", "Yullaby"},
       {"YT", "Valcon Games"},
+      {"YV", "KnapNok Games"},
+      {"YX", "Selectsoft"},
       {"YY", "FDG Entertainment"},
       {"Z4", "Ntreev Soft"},
+      {"Z5", "Shinsegae I&C"},
       {"ZA", "WBA Interactive"},
       {"ZG", "Zallag"},
       {"ZH", "Internal Engine"},
       {"ZJ", "Performance Designed Products"},
       {"ZK", "Anima Game Studio"},
+      {"ZP", "Fishing Cactus"},
       {"ZS", "Zinkia Entertainment"},
+      {"ZV", "RedLynx"},
       {"ZW", "Judo Baby"},
       {"ZX", "TopWare Interactive"}};