Compare commits
8 Commits
Canary-1.2
...
49ed30fa2a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
49ed30fa2a | ||
|
|
d96f89ec37 | ||
|
|
e0acefeeef | ||
|
|
b5604311cb | ||
|
|
2c53242b31 | ||
|
|
2874c40ee9 | ||
|
|
91518acf30 | ||
|
|
2af9a33979 |
@@ -19,7 +19,7 @@
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright © 2018 - 2025 Ryujinx Team and Contributors.</string>
|
||||
<string>Copyright © 2018 - 2023 Ryujinx Team and Contributors.</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.games</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
01006C40086EA000,"AeternoBlade",nvdec,playable,2020-12-14 20:06:48
|
||||
0100B1C00949A000,"AeternoBlade Demo",nvdec,playable,2021-02-09 14:39:26
|
||||
01009D100EA28000,"AeternoBlade II",online-broken;UE4;vulkan-backend-bug,playable,2022-09-12 21:11:18
|
||||
0100B1C00949A000,"AeternoBlade II Demo Version",gpu;nvdec,ingame,2021-02-09 15:10:19
|
||||
,"AeternoBlade II Demo Version",gpu;nvdec,ingame,2021-02-09 15:10:19
|
||||
01001B400D334000,"AFL Evolution 2",slow;online-broken;UE4,playable,2022-12-07 12:45:56
|
||||
0100DB100BBCE000,"Afterparty",,playable,2022-09-22 12:23:19
|
||||
010087C011C4E000,"Agatha Christie - The ABC Murders",,playable,2020-10-27 17:08:23
|
||||
@@ -477,7 +477,7 @@
|
||||
010020700DE04000,"Bear With Me: The Lost Robots",nvdec,playable,2021-02-27 14:20:10
|
||||
010024200E97E800,"Bear With Me: The Lost Robots Demo",nvdec,playable,2021-02-12 22:38:12
|
||||
0100C0E014A4E000,"Bear's Restaurant",,playable,2024-08-11 21:26:59
|
||||
010045F00BF64000,"BEAST Darling! ~Kemomimi Danshi to Himitsu no Ryou~",crash,menus,2020-10-04 06:12:08
|
||||
,"BEAST Darling! ~Kemomimi Danshi to Himitsu no Ryou~",crash,menus,2020-10-04 06:12:08
|
||||
01009C300BB4C000,"Beat Cop",,playable,2021-01-06 19:26:48
|
||||
01002D20129FC000,"Beat Me!",online-broken,playable,2022-10-16 21:59:26
|
||||
01006B0014590000,"BEAUTIFUL DESOLATION",gpu;nvdec,ingame,2022-10-26 10:34:38
|
||||
@@ -703,7 +703,7 @@
|
||||
01006A30124CA000,"Chocobo GP",gpu;crash,ingame,2022-06-04 14:52:18
|
||||
0100BF600BF26000,"Chocobo's Mystery Dungeon EVERY BUDDY!",slow,playable,2020-05-26 13:53:13
|
||||
01000BA0132EA000,"Choices That Matter: And The Sun Went Out",,playable,2020-12-17 15:44:08
|
||||
0100A1200CA3C000,"Chou no Doku Hana no Kusari: Taishou Irokoi Ibun",gpu;nvdec,ingame,2020-09-28 17:58:04
|
||||
,"Chou no Doku Hana no Kusari: Taishou Irokoi Ibun",gpu;nvdec,ingame,2020-09-28 17:58:04
|
||||
010039A008E76000,"ChromaGun",,playable,2020-05-26 12:56:42
|
||||
010006800E13A000,"Chronos: Before the Ashes",UE4;gpu;nvdec,ingame,2020-12-11 22:16:35
|
||||
010039700BA7E000,"Circle of Sumo",,playable,2020-05-22 12:45:21
|
||||
@@ -769,7 +769,7 @@
|
||||
0100CCB01B1A0000,"COSMIC FANTASY COLLECTION",,ingame,2024-05-21 17:56:37
|
||||
010067C00A776000,"Cosmic Star Heroine",,playable,2021-02-20 14:30:47
|
||||
01003DD00F94A000,"COTTOn Reboot! [ コットン リブート! ]",,playable,2022-05-24 16:29:24
|
||||
010077001526E000,"Cotton/Guardian Saturn Tribute Games",gpu,boots,2022-11-27 21:00:51
|
||||
,"Cotton/Guardian Saturn Tribute Games",gpu,boots,2022-11-27 21:00:51
|
||||
01000E301107A000,"Couch Co-Op Bundle Vol. 2",nvdec,playable,2022-10-02 12:04:21
|
||||
0100C1E012A42000,"Country Tales",,playable,2021-06-17 16:45:39
|
||||
01003370136EA000,"Cozy Grove",gpu,ingame,2023-07-30 22:22:19
|
||||
@@ -830,7 +830,7 @@
|
||||
01003ED0099B0000,"Danger Mouse: The Danger Games",crash;online,boots,2022-07-22 15:49:45
|
||||
0100EFA013E7C000,"Danger Scavenger",nvdec,playable,2021-04-17 15:53:04
|
||||
0100417007F78000,"Danmaku Unlimited 3",,playable,2020-11-15 00:48:35
|
||||
01000330105BE000,"Darius Cozmic Collection",,playable,2021-02-19 20:59:06
|
||||
,"Darius Cozmic Collection",,playable,2021-02-19 20:59:06
|
||||
010059C00BED4000,"Darius Cozmic Collection Special Edition",,playable,2022-07-22 16:26:50
|
||||
010015800F93C000,"Dariusburst - Another Chronicle EX+",online,playable,2021-04-05 14:21:43
|
||||
01003D301357A000,"Dark Arcana: The Carnival",gpu;slow,ingame,2022-02-19 08:52:28
|
||||
@@ -859,7 +859,7 @@
|
||||
010095A011A14000,"Deadly Days",,playable,2020-11-27 13:38:55
|
||||
0100BAC011928000,"Deadly Premonition 2: A Blessing In Disguise",,playable,2021-06-15 14:12:36
|
||||
0100EBE00F22E000,"Deadly Premonition Origins",32-bit;nvdec,playable,2024-03-25 12:47:46
|
||||
010015600D814000,"Dear Magi - Mahou Shounen Gakka -",,playable,2020-11-22 16:45:16
|
||||
,"Dear Magi - Mahou Shounen Gakka -",,playable,2020-11-22 16:45:16
|
||||
01000D60126B6000,"Death and Taxes",,playable,2020-12-15 20:27:49
|
||||
010012B011AB2000,"Death Come True",nvdec,playable,2021-06-10 22:30:49
|
||||
0100F3B00CF32000,"Death Coming",crash,nothing,2022-02-06 07:43:03
|
||||
@@ -902,13 +902,13 @@
|
||||
010023600C704000,"Deponia",nvdec,playable,2021-01-26 17:17:19
|
||||
0100ED700469A000,"Deru - The Art of Cooperation",,playable,2021-01-07 16:59:59
|
||||
0100D4600D0E4000,"Descenders",gpu,ingame,2020-12-10 15:22:36
|
||||
0100D870102BC000,"Desire remaster ver.",crash,boots,2021-01-17 02:34:37
|
||||
,"Desire remaster ver.",crash,boots,2021-01-17 02:34:37
|
||||
010069500DD86000,"Destiny Connect: Tick-Tock Travelers",UE4;gpu;nvdec,ingame,2020-12-16 12:20:36
|
||||
01008BB011ED6000,"Destrobots",,playable,2021-03-06 14:37:05
|
||||
01009E701356A000,"Destroy All Humans!",gpu;nvdec;UE4,ingame,2023-01-14 22:23:53
|
||||
010030600E65A000,"Detective Dolittle",,playable,2021-03-02 14:03:59
|
||||
01009C0009842000,"Detective Gallo",nvdec,playable,2022-07-24 11:51:04
|
||||
01002D400B0F6000,"Detective Jinguji Saburo Prism of Eyes",,playable,2020-10-02 21:54:41
|
||||
,"Detective Jinguji Saburo Prism of Eyes",,playable,2020-10-02 21:54:41
|
||||
010007500F27C000,"Detective Pikachu™ Returns",,playable,2023-10-07 10:24:59
|
||||
010031B00CF66000,"Devil Engine",,playable,2021-06-04 11:54:30
|
||||
01002F000E8F2000,"Devil Kingdom",,playable,2023-01-31 08:58:44
|
||||
@@ -1057,7 +1057,7 @@
|
||||
01004F000B716000,"Edna & Harvey: The Breakout – Anniversary Edition",crash;nvdec,ingame,2022-08-01 16:59:56
|
||||
01002550129F0000,"Effie",,playable,2022-10-27 14:36:39
|
||||
0100CC0010A46000,"Ego Protocol: Remastered",nvdec,playable,2020-12-16 20:16:35
|
||||
01004CC00B352000,"Eiga Sumikko Gurashi Tobidasu Ehon to Himitsu no Ko Game de Asobo Ehon no Sekai",,playable,2020-11-12 00:11:50
|
||||
,"Eiga Sumikko Gurashi Tobidasu Ehon to Himitsu no Ko Game de Asobo Ehon no Sekai",,playable,2020-11-12 00:11:50
|
||||
01003AD013BD2000,"Eight Dragons",nvdec,playable,2022-10-27 14:47:28
|
||||
010020A01209C000,"El Hijo - A Wild West Tale",nvdec,playable,2021-04-19 17:44:08
|
||||
0100B5B00EF38000,"Elden: Path of the Forgotten",,playable,2020-12-15 00:33:19
|
||||
@@ -1123,7 +1123,7 @@
|
||||
01005C10136CA000,"Fantasy Tavern Sextet -Vol.2 Adventurer's Days-",gpu;slow;crash,ingame,2021-11-06 02:57:29
|
||||
010022700E7D6000,"FAR: Lone Sails",,playable,2022-09-06 16:33:05
|
||||
0100C9E00FD62000,"Farabel",,playable,2020-08-03 17:47:28
|
||||
0100ECD00C806000,"Farm Expert 2019 for Nintendo Switch",,playable,2020-07-09 21:42:57
|
||||
,"Farm Expert 2019 for Nintendo Switch",,playable,2020-07-09 21:42:57
|
||||
01000E400ED98000,"Farm Mystery",nvdec,playable,2022-09-06 16:46:47
|
||||
010086B00BB50000,"Farm Together",,playable,2021-01-19 20:01:19
|
||||
0100EB600E914000,"Farming Simulator 20",nvdec,playable,2021-06-13 10:52:44
|
||||
@@ -1246,12 +1246,12 @@
|
||||
0100ECE00C0C4000,"Fury Unleashed",crash;services,ingame,2020-10-18 11:52:40
|
||||
010070000ED9E000,"Fury Unleashed Demo",,playable,2020-10-08 20:09:21
|
||||
0100E1F013674000,"FUSER™",nvdec;UE4,playable,2022-10-17 20:58:32
|
||||
0100A7A015E4C000,"Fushigi no Gensokyo Lotus Labyrinth",Needs Update;audio;gpu;nvdec,ingame,2021-01-20 15:30:02
|
||||
,"Fushigi no Gensokyo Lotus Labyrinth",Needs Update;audio;gpu;nvdec,ingame,2021-01-20 15:30:02
|
||||
01003C300B274000,"Futari de! Nyanko Daisensou",,playable,2024-01-05 22:26:52
|
||||
010055801134E000,"FUZE Player",online-broken;vulkan-backend-bug,ingame,2022-10-18 12:23:53
|
||||
0100EAD007E98000,"FUZE4 Nintendo Switch",vulkan-backend-bug,playable,2022-09-06 19:25:01
|
||||
010067600F1A0000,"FuzzBall",crash,nothing,2021-03-29 20:13:21
|
||||
0100275011e54000,"G-MODE Archives 06 The strongest ever Julia Miyamoto",,playable,2020-10-15 13:06:26
|
||||
,"G-MODE Archives 06 The strongest ever Julia Miyamoto",,playable,2020-10-15 13:06:26
|
||||
0100EB10108EA000,"G.I. Joe: Operation Blackout",UE4;crash,boots,2020-11-21 12:37:44
|
||||
010048600B14E000,"Gal Metal",,playable,2022-07-27 20:57:48
|
||||
010024700901A000,"Gal*Gun 2",nvdec;UE4,playable,2022-07-27 12:45:37
|
||||
@@ -1370,7 +1370,7 @@
|
||||
01006F80082E4000,"GUILTY GEAR XX ACCENT CORE PLUS R",nvdec,playable,2021-01-13 09:28:33
|
||||
01003C6008940000,"GUNBIRD for Nintendo Switch",32-bit,playable,2021-06-04 19:16:01
|
||||
0100BCB00AE98000,"GUNBIRD2 for Nintendo Switch",,playable,2020-10-10 14:41:16
|
||||
01003FF010312000,"Gunka o haita neko",gpu;nvdec,ingame,2020-08-25 12:37:56
|
||||
,"Gunka o haita neko",gpu;nvdec,ingame,2020-08-25 12:37:56
|
||||
010061000D318000,"Gunman Clive HD Collection",,playable,2020-10-09 12:17:35
|
||||
01006D4003BCE000,"Guns, Gore and Cannoli 2",online,playable,2021-01-06 18:43:59
|
||||
01008C800E654000,"Gunvolt Chronicles Luminous Avenger iX - Retail Version",,playable,2020-06-16 22:47:07
|
||||
@@ -1564,7 +1564,7 @@
|
||||
0100BDC00A664000,"KAMEN RIDER CLIMAX SCRAMBLE",nvdec;ldn-untested,playable,2024-07-03 08:51:11
|
||||
0100A9801180E000,"KAMEN RIDER memory of heroez / Premium Sound Edition",,playable,2022-12-06 03:14:26
|
||||
010085300314E000,"KAMIKO",,playable,2020-05-13 12:48:57
|
||||
010042C011736000,"Kangokuto Mary Skelter Finale",audio;crash,ingame,2021-01-09 22:39:28
|
||||
,"Kangokuto Mary Skelter Finale",audio;crash,ingame,2021-01-09 22:39:28
|
||||
01007FD00DB20000,"Katakoi Contrast - collection of branch -",nvdec,playable,2022-12-09 09:41:26
|
||||
0100D7000C2C6000,"Katamari Damacy REROLL",,playable,2022-08-02 21:35:05
|
||||
0100F9800EDFA000,"KATANA KAMI: A Way of the Samurai Story",slow,playable,2022-04-09 10:40:16
|
||||
@@ -1581,7 +1581,7 @@
|
||||
0100FB400D832000,"KILL la KILL -IF",,playable,2020-06-09 14:47:08
|
||||
010011B00910C000,"Kill The Bad Guy",,playable,2020-05-12 22:16:10
|
||||
0100F2900B3E2000,"Killer Queen Black",ldn-untested;online,playable,2021-04-08 12:46:18
|
||||
010014A00C5E0000,"Kin'iro no Corda Octave",,playable,2020-09-22 13:23:12
|
||||
,"Kin'iro no Corda Octave",,playable,2020-09-22 13:23:12
|
||||
010089000F0E8000,"Kine",UE4,playable,2022-09-14 14:28:37
|
||||
0100E6B00FFBA000,"King Lucas",,playable,2022-09-21 19:43:23
|
||||
0100B1300783E000,"King Oddball",,playable,2020-05-13 13:47:57
|
||||
@@ -1612,7 +1612,7 @@
|
||||
01009EF00DDB4000,"Knockout City™",services;online-broken,boots,2022-12-09 09:48:58
|
||||
0100C57019BA2000,"Koa and the Five Pirates of Mara",gpu,ingame,2024-07-11 16:14:44
|
||||
01001E500401C000,"Koi DX",,playable,2020-05-11 21:37:51
|
||||
010052300F612000,"Koi no Hanasaku Hyakkaen",32-bit;gpu;nvdec,ingame,2020-10-03 14:17:10
|
||||
,"Koi no Hanasaku Hyakkaen",32-bit;gpu;nvdec,ingame,2020-10-03 14:17:10
|
||||
01005D200C9AA000,"Koloro",,playable,2022-08-03 12:34:02
|
||||
0100464009294000,"Kona",,playable,2022-08-03 12:48:19
|
||||
010016C011AAA000,"Kono Subarashii Sekai ni Shukufuku o Kono Yokubo no Isho ni Choai o",,playable,2023-04-26 09:51:08
|
||||
@@ -1779,8 +1779,8 @@
|
||||
0100EC000CE24000,"Mech Rage",,playable,2020-11-18 12:30:16
|
||||
0100C4F005EB4000,"Mecho Tales",,playable,2022-08-04 17:03:19
|
||||
0100E4600D31A000,"Mechstermination Force",,playable,2024-07-04 05:39:15
|
||||
01007580124C0000,"Medarot Classics Plus Kabuto Ver",,playable,2020-11-21 11:31:18
|
||||
0100228012682000,"Medarot Classics Plus Kuwagata Ver",,playable,2020-11-21 11:30:40
|
||||
,"Medarot Classics Plus Kabuto Ver",,playable,2020-11-21 11:31:18
|
||||
,"Medarot Classics Plus Kuwagata Ver",,playable,2020-11-21 11:30:40
|
||||
0100BBC00CB9A000,"Mega Mall Story",slow,playable,2022-08-04 17:10:58
|
||||
0100B0C0086B0000,"Mega Man 11",,playable,2021-04-26 12:07:53
|
||||
010038E016264000,"Mega Man Battle Network Legacy Collection Vol. 1",,playable,2023-04-25 03:55:57
|
||||
@@ -1797,7 +1797,7 @@
|
||||
0100B360068B2000,"Mekorama",gpu,boots,2021-06-17 16:37:21
|
||||
01000FA010340000,"Melbits World",nvdec;online,menus,2021-11-26 13:51:22
|
||||
0100F68019636000,"Melon Journey",,playable,2023-04-23 21:20:01
|
||||
010079C012896000,"Memories Off -Innocent Fille- for Dearest",,playable,2020-08-04 07:31:22
|
||||
,"Memories Off -Innocent Fille- for Dearest",,playable,2020-08-04 07:31:22
|
||||
010062F011E7C000,"Memory Lane",UE4,playable,2022-10-05 14:31:03
|
||||
0100EBE00D5B0000,"Meow Motors",UE4;gpu,ingame,2020-12-18 00:24:01
|
||||
0100273008FBC000,"Mercenaries Saga Chronicles",,playable,2021-01-10 12:48:19
|
||||
@@ -1873,7 +1873,7 @@
|
||||
010093A01305C000,"Monster Hunter Rise Demo",online-broken;ldn-works;demo,playable,2022-10-18 23:04:17
|
||||
0100E21011446000,"Monster Hunter Stories 2: Wings of Ruin",services,ingame,2022-07-10 19:27:30
|
||||
010042501329E000,"MONSTER HUNTER STORIES 2: WINGS OF RUIN Trial Version",demo,playable,2022-11-13 22:20:26
|
||||
0100C51003B46000,"Monster Hunter XX Demo",32-bit;cpu,nothing,2020-03-22 10:12:28
|
||||
,"Monster Hunter XX Demo",32-bit;cpu,nothing,2020-03-22 10:12:28
|
||||
0100C3800049C000,"Monster Hunter XX Nintendo Switch Ver ( Double Cross )",,playable,2024-07-21 14:08:09
|
||||
010088400366E000,"Monster Jam Crush It!",UE4;nvdec;online,playable,2021-04-08 19:29:27
|
||||
010095C00F354000,"Monster Jam Steel Titans",crash;nvdec;UE4,menus,2021-11-14 09:45:38
|
||||
@@ -1917,7 +1917,7 @@
|
||||
010035901046C000,"Mushroom Quest",,playable,2020-05-17 13:07:08
|
||||
0100700006EF6000,"Mushroom Wars 2",nvdec,playable,2020-09-28 15:26:08
|
||||
010046400F310000,"Music Racer",,playable,2020-08-10 08:51:23
|
||||
0100153006300000,"Musou Orochi 2 Ultimate",crash;nvdec,boots,2021-04-09 19:39:16
|
||||
,"Musou Orochi 2 Ultimate",crash;nvdec,boots,2021-04-09 19:39:16
|
||||
0100F6000EAA8000,"Must Dash Amigos",,playable,2022-09-20 16:45:56
|
||||
01007B6006092000,"MUSYNX",,playable,2020-05-08 14:24:43
|
||||
0100C3E00ACAA000,"Mutant Football League: Dynasty Edition",online-broken,playable,2022-08-05 17:01:51
|
||||
@@ -1948,7 +1948,7 @@
|
||||
0100A6F00AC70000,"NAIRI: Tower of Shirin",nvdec,playable,2020-08-09 19:49:12
|
||||
010002F001220000,"NAMCO MUSEUM",ldn-untested,playable,2024-08-13 07:52:21
|
||||
0100DAA00AEE6000,"NAMCO MUSEUM™ ARCADE PAC™",,playable,2021-06-07 21:44:50
|
||||
010039F010E14000,"NAMCOT COLLECTION",audio,playable,2020-06-25 13:35:22
|
||||
,"NAMCOT COLLECTION",audio,playable,2020-06-25 13:35:22
|
||||
010072B00BDDE000,"Narcos: Rise of the Cartels",UE4;crash;nvdec,boots,2021-03-22 13:18:47
|
||||
01006BB00800A000,"NARUTO SHIPPUDEN: Ultimate Ninja STORM 3 Full Burst",nvdec,playable,2024-06-16 14:58:05
|
||||
010084D00CF5E000,"NARUTO SHIPPUDEN™: Ultimate Ninja® STORM 4 ROAD TO BORUTO",,playable,2024-06-29 13:04:22
|
||||
@@ -2089,11 +2089,11 @@
|
||||
0100F9D00C186000,"Olympia Soiree",,playable,2022-12-04 21:07:12
|
||||
0100A8B00E14A000,"Olympic Games Tokyo 2020 – The Official Video Game™",ldn-untested;nvdec;online,playable,2021-01-06 01:20:24
|
||||
01001D600E51A000,"Omega Labyrinth Life",,playable,2021-02-23 21:03:03
|
||||
01005DE00CA34000,"Omega Vampire",nvdec,playable,2020-10-17 19:15:35
|
||||
,"Omega Vampire",nvdec,playable,2020-10-17 19:15:35
|
||||
0100CDC00C40A000,"Omensight: Definitive Edition",UE4;crash;nvdec,ingame,2020-07-26 01:45:14
|
||||
01006DB00D970000,"OMG Zombies!",32-bit,playable,2021-04-12 18:04:45
|
||||
010014E017B14000,"OMORI",,playable,2023-01-07 20:21:02
|
||||
0100A5F011800000,"Once Upon A Coma",nvdec,playable,2020-08-01 12:09:39
|
||||
,"Once Upon A Coma",nvdec,playable,2020-08-01 12:09:39
|
||||
0100BD3006A02000,"One More Dungeon",,playable,2021-01-06 09:10:58
|
||||
010076600FD64000,"One Person Story",,playable,2020-07-14 11:51:02
|
||||
0100774009CF6000,"ONE PIECE Pirate Warriors 3 Deluxe Edition",nvdec,playable,2020-05-10 06:23:52
|
||||
@@ -2184,7 +2184,7 @@
|
||||
010062B01525C000,"Persona 4 Golden",,playable,2024-08-07 17:48:07
|
||||
01005CA01580E000,"Persona 5 Royal",gpu,ingame,2024-08-17 21:45:15
|
||||
010087701B092000,"Persona 5 Tactica",,playable,2024-04-01 22:21:03
|
||||
0100E4F010D92000,"Persona 5: Scramble",deadlock,boots,2020-10-04 03:22:29
|
||||
,"Persona 5: Scramble",deadlock,boots,2020-10-04 03:22:29
|
||||
0100801011C3E000,"Persona® 5 Strikers",nvdec;mac-bug,playable,2023-09-26 09:36:01
|
||||
010044400EEAE000,"Petoons Party",nvdec,playable,2021-03-02 21:07:58
|
||||
010053401147C000,"PGA TOUR 2K21",deadlock;nvdec,ingame,2022-10-05 21:53:50
|
||||
@@ -2273,7 +2273,7 @@
|
||||
0100D1C01C194000,"Powerful Pro Baseball 2024-2025",gpu,ingame,2024-08-25 06:40:48
|
||||
01008E100E416000,"PowerSlave Exhumed",gpu,ingame,2023-07-31 23:19:10
|
||||
010054F01266C000,"Prehistoric Dude",gpu,ingame,2020-10-12 12:38:48
|
||||
0100DB200D3E4000,"Pretty Princess Magical Coordinate",,playable,2020-10-15 11:43:41
|
||||
,"Pretty Princess Magical Coordinate",,playable,2020-10-15 11:43:41
|
||||
01007F00128CC000,"Pretty Princess Party",,playable,2022-10-19 17:23:58
|
||||
010009300D278000,"Preventive Strike",nvdec,playable,2022-10-06 10:55:51
|
||||
0100210019428000,"Prince of Persia The Lost Crown",crash,ingame,2024-06-08 21:31:58
|
||||
@@ -2294,13 +2294,13 @@
|
||||
0100ACE00DAB6000,"Project Nimbus: Complete Edition",nvdec;UE4;vulkan-backend-bug,playable,2022-08-10 17:35:43
|
||||
01002980140F6000,"Project TRIANGLE STRATEGY™ Debut Demo",UE4;demo,playable,2022-10-24 21:40:27
|
||||
0100BDB01150E000,"Project Warlock",,playable,2020-06-16 10:50:41
|
||||
01009F100BC52000,"Psikyo Collection Vol 1",32-bit,playable,2020-10-11 13:18:47
|
||||
,"Psikyo Collection Vol 1",32-bit,playable,2020-10-11 13:18:47
|
||||
0100A2300DB78000,"Psikyo Collection Vol. 3",,ingame,2021-06-07 02:46:23
|
||||
01009D400C4A8000,"Psikyo Collection Vol.2",32-bit,playable,2021-06-07 03:22:07
|
||||
01007A200F2E2000,"Psikyo Shooting Stars Alpha",32-bit,playable,2021-04-13 12:03:43
|
||||
0100D7400F2E4000,"Psikyo Shooting Stars Bravo",32-bit,playable,2021-06-14 12:09:07
|
||||
0100EC100A790000,"PSYVARIAR DELTA",nvdec,playable,2021-01-20 13:01:46
|
||||
0100AE700F184000,"Puchitto kurasutā",Need-Update;crash;services,menus,2020-07-04 16:44:28
|
||||
,"Puchitto kurasutā",Need-Update;crash;services,menus,2020-07-04 16:44:28
|
||||
0100D61010526000,"Pulstario",,playable,2022-10-06 11:02:01
|
||||
01009AE00B788000,"Pumped BMX Pro",nvdec;online-broken,playable,2022-09-20 17:40:50
|
||||
01006C10131F6000,"Pumpkin Jack",nvdec;UE4,playable,2022-10-13 12:52:32
|
||||
@@ -2325,7 +2325,7 @@
|
||||
0100DCF00F13A000,"Queen's Quest 4: Sacred Truce",nvdec,playable,2022-10-13 12:59:21
|
||||
0100492012378000,"Quell",gpu,ingame,2021-06-11 15:59:53
|
||||
01001DE005012000,"Quest of Dungeons",,playable,2021-06-07 10:29:22
|
||||
010067D011E68000,"QuietMansion2",,playable,2020-09-03 14:59:35
|
||||
,"QuietMansion2",,playable,2020-09-03 14:59:35
|
||||
0100AF100EE76000,"Quiplash 2 InterLASHional: The Say Anything Party Game!",online-working,playable,2022-10-19 17:43:45
|
||||
0100E5400BE64000,"R-Type Dimensions EX",,playable,2020-10-09 12:04:43
|
||||
0100F930136B6000,"R-Type® Final 2",slow;nvdec;UE4,ingame,2022-10-30 21:46:29
|
||||
@@ -2383,7 +2383,7 @@
|
||||
01007A800D520000,"Refunct",UE4,playable,2020-12-15 22:46:21
|
||||
0100FDF0083A6000,"Regalia: Of Men and Monarchs - Royal Edition",,playable,2022-08-11 12:24:01
|
||||
01005FD00F15A000,"Regions of Ruin",,playable,2020-08-05 11:38:58
|
||||
0100B5800C0E4000,"Reine des Fleurs",cpu;crash,boots,2020-09-27 18:50:39
|
||||
,"Reine des Fleurs",cpu;crash,boots,2020-09-27 18:50:39
|
||||
0100F1900B144000,"REKT! High Octane Stunts",online,playable,2020-09-28 12:33:56
|
||||
01002AD013C52000,"Relicta",nvdec;UE4,playable,2022-10-31 12:48:33
|
||||
010095900B436000,"RemiLore",,playable,2021-06-03 18:58:15
|
||||
@@ -2495,7 +2495,7 @@
|
||||
01002DF00F76C000,"SAMURAI SHODOWN",UE4;crash;nvdec,menus,2020-09-06 02:17:00
|
||||
0100F6800F48E000,"SAMURAI SHODOWN NEOGEO COLLECTION",nvdec,playable,2021-06-14 17:12:56
|
||||
0100B6501A360000,"Samurai Warrior",,playable,2023-02-27 18:42:38
|
||||
01000EA00B23C000,"Sangoku Rensenki ~Otome no Heihou!~",gpu;nvdec,ingame,2020-10-17 19:13:14
|
||||
,"Sangoku Rensenki ~Otome no Heihou!~",gpu;nvdec,ingame,2020-10-17 19:13:14
|
||||
0100A4700BC98000,"Satsujin Tantei Jack the Ripper",,playable,2021-06-21 16:32:54
|
||||
0100F0000869C000,"Saturday Morning RPG",nvdec,playable,2022-08-12 12:41:50
|
||||
01006EE00380C000,"Sausage Sports Club",gpu,ingame,2021-01-10 05:37:17
|
||||
@@ -2532,7 +2532,7 @@
|
||||
010054400D2E6000,"SEGA AGES Virtua Racing",online-broken,playable,2023-01-29 17:08:39
|
||||
01001E700AC60000,"SEGA AGES Wonder Boy: Monster Land",online,playable,2021-05-05 16:28:25
|
||||
0100B3C014BDA000,"SEGA Genesis™ – Nintendo Switch Online",crash;regression,nothing,2022-04-11 07:27:21
|
||||
0100F7300B24E000,"SEGA Mega Drive Classics",online,playable,2021-01-05 11:08:00
|
||||
,"SEGA Mega Drive Classics",online,playable,2021-01-05 11:08:00
|
||||
01009840046BC000,"Semispheres",,playable,2021-01-06 23:08:31
|
||||
0100D1800D902000,"SENRAN KAGURA Peach Ball",,playable,2021-06-03 15:12:10
|
||||
0100E0C00ADAC000,"SENRAN KAGURA Reflexions",,playable,2020-03-23 19:15:23
|
||||
@@ -2585,7 +2585,7 @@
|
||||
0100B2E00F13E000,"Shipped",,playable,2020-11-21 14:22:32
|
||||
01000E800FCB4000,"Ships",,playable,2021-06-11 16:14:37
|
||||
01007430122D0000,"Shiren the Wanderer: The Tower of Fortune and the Dice of Fate",nvdec,playable,2022-10-20 11:44:36
|
||||
010027300A660000,"Shiritsu Berubara Gakuen ~Versailles no Bara Re*imagination~",cpu;crash,boots,2020-09-27 19:01:25
|
||||
,"Shiritsu Berubara Gakuen ~Versailles no Bara Re*imagination~",cpu;crash,boots,2020-09-27 19:01:25
|
||||
01000244016BAE00,"Shiro0",gpu,ingame,2024-01-13 08:54:39
|
||||
0100CCE00DDB6000,"Shoot 1UP DX",,playable,2020-12-13 12:32:47
|
||||
01001180021FA000,"Shovel Knight: Specter of Torment",,playable,2020-05-30 08:34:17
|
||||
@@ -2626,7 +2626,7 @@
|
||||
0100C52011460000,"Sky: Children of the Light",cpu;online-broken,nothing,2023-02-23 10:57:10
|
||||
010041C01014E000,"Skybolt Zack",,playable,2021-04-12 18:28:00
|
||||
0100A0A00D1AA000,"SKYHILL",,playable,2021-03-05 15:19:11
|
||||
0100CCC0002E6000,"Skylanders Imaginators",crash;services,boots,2020-05-30 18:49:18
|
||||
,"Skylanders Imaginators",crash;services,boots,2020-05-30 18:49:18
|
||||
010021A00ABEE000,"SKYPEACE",,playable,2020-05-29 14:14:30
|
||||
0100EA400BF44000,"SkyScrappers",,playable,2020-05-28 22:11:25
|
||||
0100F3C00C400000,"SkyTime",slow,ingame,2020-05-30 09:24:51
|
||||
@@ -2797,7 +2797,7 @@
|
||||
0100681011B56000,"Struggling",,playable,2020-10-15 20:37:03
|
||||
0100AF000B4AE000,"Stunt Kite Party",nvdec,playable,2021-01-25 17:16:56
|
||||
0100C5500E7AE000,"STURMWIND EX",audio;32-bit,playable,2022-09-16 12:01:39
|
||||
01001C1009892000,"Subarashiki Kono Sekai -Final Remix-",services;slow,ingame,2020-02-10 16:21:51
|
||||
,"Subarashiki Kono Sekai -Final Remix-",services;slow,ingame,2020-02-10 16:21:51
|
||||
010001400E474000,"Subdivision Infinity DX",UE4;crash,boots,2021-03-03 14:26:46
|
||||
0100E6400BCE8000,"Sublevel Zero Redux",,playable,2022-09-16 12:30:03
|
||||
0100EDA00D866000,"Submerged",nvdec;UE4;vulkan-backend-bug,playable,2022-08-16 15:17:01
|
||||
@@ -2846,9 +2846,9 @@
|
||||
0100284007D6C000,"Super One More Jump",,playable,2022-08-17 16:47:47
|
||||
01001F90122B2000,"Super Punch Patrol",,playable,2024-07-12 19:49:02
|
||||
0100331005E8E000,"Super Putty Squad",gpu;32-bit,ingame,2024-04-29 15:51:54
|
||||
01006C900CC60000,"SUPER ROBOT WARS T",online,playable,2021-03-25 11:00:40
|
||||
0100CA400E300000,"SUPER ROBOT WARS V",online,playable,2020-06-23 12:56:37
|
||||
010026800E304000,"SUPER ROBOT WARS X",online,playable,2020-08-05 19:18:51
|
||||
,"SUPER ROBOT WARS T",online,playable,2021-03-25 11:00:40
|
||||
,"SUPER ROBOT WARS V",online,playable,2020-06-23 12:56:37
|
||||
,"SUPER ROBOT WARS X",online,playable,2020-08-05 19:18:51
|
||||
01004CF00A60E000,"Super Saurio Fly",nvdec,playable,2020-08-06 13:12:14
|
||||
010039700D200000,"Super Skelemania",,playable,2020-06-07 22:59:50
|
||||
01006A800016E000,"Super Smash Bros.™ Ultimate",gpu;crash;nvdec;ldn-works;intel-vendor-bug,ingame,2024-09-14 23:05:21
|
||||
@@ -3014,7 +3014,7 @@
|
||||
010085A00C5E8000,"The Lord of the Rings: Adventure Card Game - Definitive Edition",online-broken,menus,2022-09-16 15:19:32
|
||||
01008A000A404000,"The Lost Child",nvdec,playable,2021-02-23 15:44:20
|
||||
0100BAB00A116000,"The Low Road",,playable,2021-02-26 13:23:22
|
||||
01005F3006AFE000,"The Mahjong",Needs Update;crash;services,nothing,2021-04-01 22:06:22
|
||||
,"The Mahjong",Needs Update;crash;services,nothing,2021-04-01 22:06:22
|
||||
0100DC300AC78000,"The Messenger",,playable,2020-03-22 13:51:37
|
||||
0100DEC00B2BC000,"The Midnight Sanctuary",nvdec;UE4;vulkan-backend-bug,playable,2022-10-03 17:17:32
|
||||
0100F1B00B456000,"The MISSING: J.J. Macfield and the Island of Memories",,playable,2022-08-22 19:36:18
|
||||
@@ -3060,7 +3060,7 @@
|
||||
010064E00ECBC000,"The Unicorn Princess",,playable,2022-09-16 16:20:56
|
||||
0100BCF00E970000,"The Vanishing of Ethan Carter",UE4,playable,2021-06-09 17:14:47
|
||||
0100D0500B0A6000,"The VideoKid",nvdec,playable,2021-01-06 09:28:24
|
||||
01008CF00BA38000,"The Voice",services,menus,2020-07-28 20:48:49
|
||||
,"The Voice",services,menus,2020-07-28 20:48:49
|
||||
010056E00B4F4000,"The Walking Dead: A New Frontier",,playable,2022-09-21 13:40:48
|
||||
010099100B6AC000,"The Walking Dead: Season Two",,playable,2020-08-09 12:57:06
|
||||
010029200B6AA000,"The Walking Dead: The Complete First Season",,playable,2021-06-04 13:10:56
|
||||
@@ -3376,7 +3376,7 @@
|
||||
010022F00DA66000,"Yooka-Laylee and the Impossible Lair",,playable,2021-03-05 17:32:21
|
||||
01006000040C2000,"Yoshi’s Crafted World™",gpu;audout,ingame,2021-08-30 13:25:51
|
||||
0100AE800C9C6000,"Yoshi’s Crafted World™ Demo",gpu,boots,2020-12-16 14:57:40
|
||||
0100BBA00B23E000,"Yoshiwara Higanbana Kuon no Chigiri",nvdec,playable,2020-10-17 19:14:46
|
||||
,"Yoshiwara Higanbana Kuon no Chigiri",nvdec,playable,2020-10-17 19:14:46
|
||||
01003A400C3DA800,"YouTube",,playable,2024-06-08 05:24:10
|
||||
00100A7700CCAA40,"Youtubers Life00",nvdec,playable,2022-09-03 14:56:19
|
||||
0100E390124D8000,"Ys IX: Monstrum Nox",,playable,2022-06-12 04:14:42
|
||||
@@ -3386,7 +3386,7 @@
|
||||
01002D60188DE000,"Yu-Gi-Oh! Rush Duel: Dawn of the Battle Royale!! Let's Go! Go Rush!!",crash,ingame,2023-03-17 01:54:01
|
||||
010037D00DBDC000,"YU-NO: A girl who chants love at the bound of this world.",nvdec,playable,2021-01-26 17:03:52
|
||||
0100B56011502000,"Yumeutsutsu Re:After",,playable,2022-11-20 16:09:06
|
||||
0100DE200C0DA000,"Yunohana Spring! - Mellow Times -",audio;crash,menus,2020-09-27 19:27:40
|
||||
,"Yunohana Spring! - Mellow Times -",audio;crash,menus,2020-09-27 19:27:40
|
||||
0100307011C44000,"Yuppie Psycho: Executive Edition",crash,ingame,2020-12-11 10:37:06
|
||||
0100FC900963E000,"Yuri",,playable,2021-06-11 13:08:50
|
||||
010092400A678000,"Zaccaria Pinball",online-broken,playable,2022-09-03 15:44:28
|
||||
@@ -3397,7 +3397,7 @@
|
||||
0100AAC00E692000,"Zenith",,playable,2022-09-17 09:57:02
|
||||
0100A6A00894C000,"ZERO GUNNER 2- for Nintendo Switch",,playable,2021-01-04 20:17:14
|
||||
01004B001058C000,"Zero Strain",services;UE4,menus,2021-11-10 07:48:32
|
||||
010021300F69E000,"Zettai kaikyu gakuen",gpu;nvdec,ingame,2020-08-25 15:15:54
|
||||
,"Zettai kaikyu gakuen",gpu;nvdec,ingame,2020-08-25 15:15:54
|
||||
0100D7B013DD0000,"Ziggy the Chaser",,playable,2021-02-04 20:34:27
|
||||
010086700EF16000,"ZikSquare",gpu,ingame,2021-11-06 02:02:48
|
||||
010069C0123D8000,"Zoids Wild Blast Unleashed",nvdec,playable,2022-10-15 11:26:59
|
||||
@@ -3409,7 +3409,7 @@
|
||||
0100CD300A1BA000,"Zombillie",,playable,2020-07-23 17:42:23
|
||||
01001EE00A6B0000,"Zotrix: Solar Division",,playable,2021-06-07 20:34:05
|
||||
0100B9B00C6A4000,"この世の果てで恋を唄う少女YU-NO",audio,ingame,2021-01-22 07:00:16
|
||||
0100E8600C504000,"スーパーファミコン Nintendo Switch Online",slow,ingame,2020-03-14 05:48:38
|
||||
,"スーパーファミコン Nintendo Switch Online",slow,ingame,2020-03-14 05:48:38
|
||||
01000BB01CB8A000,"トラブル・マギア ~訳アリ少女は未来を勝ち取るために異国の魔法学校へ留学します~(Trouble Magia ~Wakeari Shoujo wa Mirai o Kachitoru Tame ni Ikoku no Mahou Gakkou e Ryuugaku Shimasu~)",,nothing,2024-09-28 07:03:14
|
||||
010065500B218000,"メモリーズオフ - Innocent Fille",,playable,2022-12-02 17:36:48
|
||||
010032400E700000,"二ノ国 白き聖灰の女王",services;32-bit,menus,2023-04-16 17:11:06
|
||||
|
||||
|
@@ -3,6 +3,7 @@ using ARMeilleure.CodeGen.Linking;
|
||||
using ARMeilleure.CodeGen.Unwinding;
|
||||
using ARMeilleure.Common;
|
||||
using ARMeilleure.Memory;
|
||||
using ARMeilleure.State;
|
||||
using Ryujinx.Common;
|
||||
using Ryujinx.Common.Configuration;
|
||||
using Ryujinx.Common.Logging;
|
||||
@@ -29,8 +30,8 @@ namespace ARMeilleure.Translation.PTC
|
||||
{
|
||||
private const string OuterHeaderMagicString = "PTCohd\0\0";
|
||||
private const string InnerHeaderMagicString = "PTCihd\0\0";
|
||||
|
||||
private const uint InternalVersion = 6998; //! To be incremented manually for each change to the ARMeilleure project.
|
||||
|
||||
private const uint InternalVersion = 7007; //! To be incremented manually for each change to the ARMeilleure project.
|
||||
|
||||
private const string ActualDir = "0";
|
||||
private const string BackupDir = "1";
|
||||
@@ -183,6 +184,36 @@ namespace ARMeilleure.Translation.PTC
|
||||
InitializeCarriers();
|
||||
}
|
||||
|
||||
private bool ContainsBlacklistedFunctions()
|
||||
{
|
||||
List<ulong> blacklist = Profiler.GetBlacklistedFunctions();
|
||||
bool containsBlacklistedFunctions = false;
|
||||
_infosStream.Seek(0L, SeekOrigin.Begin);
|
||||
bool foundBadFunction = false;
|
||||
|
||||
for (int index = 0; index < GetEntriesCount(); index++)
|
||||
{
|
||||
InfoEntry infoEntry = DeserializeStructure<InfoEntry>(_infosStream);
|
||||
foreach (ulong address in blacklist)
|
||||
{
|
||||
if (infoEntry.Address == address)
|
||||
{
|
||||
containsBlacklistedFunctions = true;
|
||||
Logger.Warning?.Print(LogClass.Ptc, "PPTC cache invalidated: Found blacklisted functions in PPTC cache");
|
||||
foundBadFunction = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (foundBadFunction)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return containsBlacklistedFunctions;
|
||||
}
|
||||
|
||||
private void PreLoad()
|
||||
{
|
||||
string fileNameActual = $"{CachePathActual}.cache";
|
||||
@@ -531,7 +562,7 @@ namespace ARMeilleure.Translation.PTC
|
||||
|
||||
public void LoadTranslations(Translator translator)
|
||||
{
|
||||
if (AreCarriersEmpty())
|
||||
if (AreCarriersEmpty() || ContainsBlacklistedFunctions())
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -834,10 +865,18 @@ namespace ARMeilleure.Translation.PTC
|
||||
while (profiledFuncsToTranslate.TryDequeue(out var item))
|
||||
{
|
||||
ulong address = item.address;
|
||||
ExecutionMode executionMode = item.funcProfile.Mode;
|
||||
bool highCq = item.funcProfile.HighCq;
|
||||
|
||||
Debug.Assert(Profiler.IsAddressInStaticCodeRange(address));
|
||||
|
||||
TranslatedFunction func = translator.Translate(address, item.funcProfile.Mode, item.funcProfile.HighCq);
|
||||
TranslatedFunction func = translator.Translate(address, executionMode, highCq);
|
||||
|
||||
if (func == null)
|
||||
{
|
||||
Profiler.UpdateEntry(address, executionMode, true, true);
|
||||
continue;
|
||||
}
|
||||
|
||||
bool isAddressUnique = translator.Functions.TryAdd(address, func.GuestSize, func);
|
||||
|
||||
@@ -884,7 +923,14 @@ namespace ARMeilleure.Translation.PTC
|
||||
|
||||
PtcStateChanged?.Invoke(PtcLoadingState.Loaded, _translateCount, _translateTotalCount);
|
||||
|
||||
Logger.Info?.Print(LogClass.Ptc, $"{_translateCount} of {_translateTotalCount} functions translated | Thread count: {degreeOfParallelism} in {sw.Elapsed.TotalSeconds} s");
|
||||
if (_translateCount == _translateTotalCount)
|
||||
{
|
||||
Logger.Info?.Print(LogClass.Ptc, $"{_translateCount} of {_translateTotalCount} functions translated | Thread count: {degreeOfParallelism} in {sw.Elapsed.TotalSeconds} s");
|
||||
}
|
||||
else
|
||||
{
|
||||
Logger.Info?.Print(LogClass.Ptc, $"{_translateCount} of {_translateTotalCount} functions translated | {_translateTotalCount - _translateCount} function{(_translateTotalCount - _translateCount != 1 ? "s" : "")} blacklisted | Thread count: {degreeOfParallelism} in {sw.Elapsed.TotalSeconds} s");
|
||||
}
|
||||
|
||||
Thread preSaveThread = new(PreSave)
|
||||
{
|
||||
|
||||
@@ -24,10 +24,11 @@ namespace ARMeilleure.Translation.PTC
|
||||
{
|
||||
private const string OuterHeaderMagicString = "Pohd\0\0\0\0";
|
||||
|
||||
private const uint InternalVersion = 5518; //! Not to be incremented manually for each change to the ARMeilleure project.
|
||||
private const uint InternalVersion = 7007; //! Not to be incremented manually for each change to the ARMeilleure project.
|
||||
|
||||
private static readonly uint[] _migrateInternalVersions = {
|
||||
1866,
|
||||
5518,
|
||||
};
|
||||
|
||||
private const int SaveInterval = 30; // Seconds.
|
||||
@@ -76,20 +77,30 @@ namespace ARMeilleure.Translation.PTC
|
||||
private void TimerElapsed(object _, ElapsedEventArgs __)
|
||||
=> new Thread(PreSave) { Name = "Ptc.DiskWriter" }.Start();
|
||||
|
||||
public void AddEntry(ulong address, ExecutionMode mode, bool highCq)
|
||||
public void AddEntry(ulong address, ExecutionMode mode, bool highCq, bool blacklist = false)
|
||||
{
|
||||
if (IsAddressInStaticCodeRange(address))
|
||||
{
|
||||
Debug.Assert(!highCq);
|
||||
|
||||
lock (_lock)
|
||||
if (blacklist)
|
||||
{
|
||||
ProfiledFuncs.TryAdd(address, new FuncProfile(mode, highCq: false));
|
||||
lock (_lock)
|
||||
{
|
||||
ProfiledFuncs[address] = new FuncProfile(mode, highCq: false, true);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
ProfiledFuncs.TryAdd(address, new FuncProfile(mode, highCq: false, false));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateEntry(ulong address, ExecutionMode mode, bool highCq)
|
||||
public void UpdateEntry(ulong address, ExecutionMode mode, bool highCq, bool? blacklist = null)
|
||||
{
|
||||
if (IsAddressInStaticCodeRange(address))
|
||||
{
|
||||
@@ -99,7 +110,7 @@ namespace ARMeilleure.Translation.PTC
|
||||
{
|
||||
Debug.Assert(ProfiledFuncs.ContainsKey(address));
|
||||
|
||||
ProfiledFuncs[address] = new FuncProfile(mode, highCq: true);
|
||||
ProfiledFuncs[address] = new FuncProfile(mode, highCq: true, blacklist ?? ProfiledFuncs[address].Blacklist);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -115,7 +126,7 @@ namespace ARMeilleure.Translation.PTC
|
||||
|
||||
foreach (var profiledFunc in ProfiledFuncs)
|
||||
{
|
||||
if (!funcs.ContainsKey(profiledFunc.Key))
|
||||
if (!funcs.ContainsKey(profiledFunc.Key) && !profiledFunc.Value.Blacklist)
|
||||
{
|
||||
profiledFuncsToTranslate.Enqueue((profiledFunc.Key, profiledFunc.Value));
|
||||
}
|
||||
@@ -130,6 +141,24 @@ namespace ARMeilleure.Translation.PTC
|
||||
ProfiledFuncs.TrimExcess();
|
||||
}
|
||||
|
||||
public List<ulong> GetBlacklistedFunctions()
|
||||
{
|
||||
List<ulong> funcs = new List<ulong>();
|
||||
|
||||
foreach (var profiledFunc in ProfiledFuncs)
|
||||
{
|
||||
if (profiledFunc.Value.Blacklist)
|
||||
{
|
||||
if (!funcs.Contains(profiledFunc.Key))
|
||||
{
|
||||
funcs.Add(profiledFunc.Key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return funcs;
|
||||
}
|
||||
|
||||
public void PreLoad()
|
||||
{
|
||||
_lastHash = default;
|
||||
@@ -220,13 +249,18 @@ namespace ARMeilleure.Translation.PTC
|
||||
return false;
|
||||
}
|
||||
|
||||
Func<ulong, FuncProfile, (ulong, FuncProfile)> migrateEntryFunc = null;
|
||||
|
||||
switch (outerHeader.InfoFileVersion)
|
||||
{
|
||||
case InternalVersion:
|
||||
ProfiledFuncs = Deserialize(stream);
|
||||
break;
|
||||
case 1866:
|
||||
ProfiledFuncs = Deserialize(stream, (address, profile) => (address + 0x500000UL, profile));
|
||||
migrateEntryFunc = (address, profile) => (address + 0x500000UL, profile);
|
||||
goto case 5518;
|
||||
case 5518:
|
||||
ProfiledFuncs = DeserializeAddBlacklist(stream, migrateEntryFunc);
|
||||
break;
|
||||
default:
|
||||
Logger.Error?.Print(LogClass.Ptc, $"No migration path for {nameof(outerHeader.InfoFileVersion)} '{outerHeader.InfoFileVersion}'. Discarding cache.");
|
||||
@@ -256,6 +290,16 @@ namespace ARMeilleure.Translation.PTC
|
||||
return DeserializeDictionary<ulong, FuncProfile>(stream, DeserializeStructure<FuncProfile>);
|
||||
}
|
||||
|
||||
private static Dictionary<ulong, FuncProfile> DeserializeAddBlacklist(Stream stream, Func<ulong, FuncProfile, (ulong, FuncProfile)> migrateEntryFunc = null)
|
||||
{
|
||||
if (migrateEntryFunc != null)
|
||||
{
|
||||
return DeserializeAndUpdateDictionary(stream, (Stream stream) => { return new FuncProfile(DeserializeStructure<FuncProfilePreBlacklist>(stream)); }, migrateEntryFunc);
|
||||
}
|
||||
|
||||
return DeserializeDictionary<ulong, FuncProfile>(stream, (Stream stream) => { return new FuncProfile(DeserializeStructure<FuncProfilePreBlacklist>(stream)); });
|
||||
}
|
||||
|
||||
private static ReadOnlySpan<byte> GetReadOnlySpan(MemoryStream memoryStream)
|
||||
{
|
||||
return new(memoryStream.GetBuffer(), (int)memoryStream.Position, (int)memoryStream.Length - (int)memoryStream.Position);
|
||||
@@ -387,13 +431,35 @@ namespace ARMeilleure.Translation.PTC
|
||||
}
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 1/*, Size = 5*/)]
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 1/*, Size = 6*/)]
|
||||
public struct FuncProfile
|
||||
{
|
||||
public ExecutionMode Mode;
|
||||
public bool HighCq;
|
||||
public bool Blacklist;
|
||||
|
||||
public FuncProfile(ExecutionMode mode, bool highCq)
|
||||
public FuncProfile(ExecutionMode mode, bool highCq, bool blacklist)
|
||||
{
|
||||
Mode = mode;
|
||||
HighCq = highCq;
|
||||
Blacklist = blacklist;
|
||||
}
|
||||
|
||||
public FuncProfile(FuncProfilePreBlacklist fp)
|
||||
{
|
||||
Mode = fp.Mode;
|
||||
HighCq = fp.HighCq;
|
||||
Blacklist = false;
|
||||
}
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 1/*, Size = 5*/)]
|
||||
public struct FuncProfilePreBlacklist
|
||||
{
|
||||
public ExecutionMode Mode;
|
||||
public bool HighCq;
|
||||
|
||||
public FuncProfilePreBlacklist(ExecutionMode mode, bool highCq)
|
||||
{
|
||||
Mode = mode;
|
||||
HighCq = highCq;
|
||||
|
||||
@@ -249,6 +249,11 @@ namespace ARMeilleure.Translation
|
||||
|
||||
ControlFlowGraph cfg = EmitAndGetCFG(context, blocks, out Range funcRange, out Counter<uint> counter);
|
||||
|
||||
if (cfg == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
ulong funcSize = funcRange.End - funcRange.Start;
|
||||
|
||||
Logger.EndPass(PassName.Translation, cfg);
|
||||
@@ -407,6 +412,11 @@ namespace ARMeilleure.Translation
|
||||
if (opCode.Instruction.Emitter != null)
|
||||
{
|
||||
opCode.Instruction.Emitter(context);
|
||||
if (opCode.Instruction.Name == InstName.Und && blkIndex == 0)
|
||||
{
|
||||
range = new Range(rangeStart, rangeEnd);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -20,6 +20,7 @@ namespace Ryujinx.HLE.HOS
|
||||
private readonly string _titleIdText;
|
||||
private readonly string _displayVersion;
|
||||
private readonly bool _diskCacheEnabled;
|
||||
private readonly string _diskCacheSelector;
|
||||
private readonly ulong _codeAddress;
|
||||
private readonly ulong _codeSize;
|
||||
|
||||
@@ -31,6 +32,7 @@ namespace Ryujinx.HLE.HOS
|
||||
string titleIdText,
|
||||
string displayVersion,
|
||||
bool diskCacheEnabled,
|
||||
string diskCacheSelector,
|
||||
ulong codeAddress,
|
||||
ulong codeSize)
|
||||
{
|
||||
@@ -39,6 +41,7 @@ namespace Ryujinx.HLE.HOS
|
||||
_titleIdText = titleIdText;
|
||||
_displayVersion = displayVersion;
|
||||
_diskCacheEnabled = diskCacheEnabled;
|
||||
_diskCacheSelector = diskCacheSelector;
|
||||
_codeAddress = codeAddress;
|
||||
_codeSize = codeSize;
|
||||
}
|
||||
@@ -114,7 +117,7 @@ namespace Ryujinx.HLE.HOS
|
||||
}
|
||||
}
|
||||
|
||||
DiskCacheLoadState = processContext.Initialize(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize, "default"); //Ready for exefs profiles
|
||||
DiskCacheLoadState = processContext.Initialize(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize, _diskCacheSelector ?? "default");
|
||||
|
||||
return processContext;
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ using LibHac.FsSystem;
|
||||
using LibHac.Loader;
|
||||
using LibHac.Tools.FsSystem;
|
||||
using LibHac.Tools.FsSystem.RomFs;
|
||||
using LibHac.Util;
|
||||
using Ryujinx.Common.Configuration;
|
||||
using Ryujinx.Common.Logging;
|
||||
using Ryujinx.Common.Utilities;
|
||||
@@ -18,6 +19,7 @@ using System.Collections.Specialized;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using LazyFile = Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy.LazyFile;
|
||||
using Path = System.IO.Path;
|
||||
|
||||
@@ -580,6 +582,7 @@ namespace Ryujinx.HLE.HOS
|
||||
public BitVector32 Stubs;
|
||||
public BitVector32 Replaces;
|
||||
public MetaLoader Npdm;
|
||||
public string Hash;
|
||||
|
||||
public bool Modified => (Stubs.Data | Replaces.Data) != 0;
|
||||
}
|
||||
@@ -590,8 +593,11 @@ namespace Ryujinx.HLE.HOS
|
||||
{
|
||||
Stubs = new BitVector32(),
|
||||
Replaces = new BitVector32(),
|
||||
Hash = null,
|
||||
};
|
||||
|
||||
string tempHash = string.Empty;
|
||||
|
||||
if (!_appMods.TryGetValue(applicationId, out ModCache mods) || mods.ExefsDirs.Count == 0)
|
||||
{
|
||||
return modLoadResult;
|
||||
@@ -627,8 +633,16 @@ namespace Ryujinx.HLE.HOS
|
||||
|
||||
modLoadResult.Replaces[1 << i] = true;
|
||||
|
||||
nsos[i] = new NsoExecutable(nsoFile.OpenRead().AsStorage(), nsoName);
|
||||
Logger.Info?.Print(LogClass.ModLoader, $"NSO '{nsoName}' replaced");
|
||||
using (FileStream stream = nsoFile.OpenRead())
|
||||
{
|
||||
nsos[i] = new NsoExecutable(stream.AsStorage(), nsoName);
|
||||
Logger.Info?.Print(LogClass.ModLoader, $"NSO '{nsoName}' replaced");
|
||||
using (MD5 md5 = MD5.Create())
|
||||
{
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
tempHash += BitConverter.ToString(md5.ComputeHash(stream)).Replace("-", "").ToLowerInvariant();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
modLoadResult.Stubs[1 << i] |= File.Exists(Path.Combine(mod.Path.FullName, nsoName + StubExtension));
|
||||
@@ -660,6 +674,14 @@ namespace Ryujinx.HLE.HOS
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(tempHash))
|
||||
{
|
||||
using (MD5 md5 = MD5.Create())
|
||||
{
|
||||
modLoadResult.Hash += BitConverter.ToString(md5.ComputeHash(tempHash.ToBytes())).Replace("-", "").ToLowerInvariant();
|
||||
}
|
||||
}
|
||||
|
||||
return modLoadResult;
|
||||
}
|
||||
|
||||
|
||||
@@ -84,13 +84,6 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
|
||||
// Apply Nsos patches.
|
||||
device.Configuration.VirtualFileSystem.ModLoader.ApplyNsoPatches(programId, nsoExecutables);
|
||||
|
||||
// Don't use PTC if ExeFS files have been replaced.
|
||||
bool enablePtc = device.System.EnablePtc && !modLoadResult.Modified;
|
||||
if (!enablePtc)
|
||||
{
|
||||
Logger.Warning?.Print(LogClass.Ptc, "Detected unsupported ExeFs modifications. PTC disabled.");
|
||||
}
|
||||
|
||||
string programName = string.Empty;
|
||||
|
||||
if (!isHomebrew && programId > 0x010000000000FFFF)
|
||||
@@ -117,7 +110,8 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
|
||||
device.System.KernelContext,
|
||||
metaLoader,
|
||||
nacpData,
|
||||
enablePtc,
|
||||
device.System.EnablePtc,
|
||||
modLoadResult.Hash,
|
||||
true,
|
||||
programName,
|
||||
metaLoader.GetProgramId(),
|
||||
|
||||
@@ -235,6 +235,7 @@ namespace Ryujinx.HLE.Loaders.Processes
|
||||
dummyExeFs.GetNpdm(),
|
||||
nacpData,
|
||||
diskCacheEnabled: false,
|
||||
diskCacheSelector: null,
|
||||
allowCodeMemoryForJit: true,
|
||||
programName,
|
||||
programId,
|
||||
|
||||
@@ -186,6 +186,7 @@ namespace Ryujinx.HLE.Loaders.Processes
|
||||
string.Empty,
|
||||
string.Empty,
|
||||
false,
|
||||
null,
|
||||
codeAddress,
|
||||
codeSize);
|
||||
|
||||
@@ -226,6 +227,7 @@ namespace Ryujinx.HLE.Loaders.Processes
|
||||
MetaLoader metaLoader,
|
||||
BlitStruct<ApplicationControlProperty> applicationControlProperties,
|
||||
bool diskCacheEnabled,
|
||||
string diskCacheSelector,
|
||||
bool allowCodeMemoryForJit,
|
||||
string name,
|
||||
ulong programId,
|
||||
@@ -379,6 +381,7 @@ namespace Ryujinx.HLE.Loaders.Processes
|
||||
$"{programId:x16}",
|
||||
displayVersion,
|
||||
diskCacheEnabled,
|
||||
diskCacheSelector,
|
||||
codeStart,
|
||||
codeSize);
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -295,143 +295,6 @@ namespace Ryujinx.Ava.Common
|
||||
};
|
||||
extractorThread.Start();
|
||||
}
|
||||
|
||||
public static void ExtractAoc(string destination, NcaSectionType ncaSectionType, string updateFilePath, string updateName)
|
||||
{
|
||||
var cancellationToken = new CancellationTokenSource();
|
||||
|
||||
UpdateWaitWindow waitingDialog = new(
|
||||
RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
|
||||
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogNcaExtractionMessage, ncaSectionType, Path.GetFileName(updateFilePath)),
|
||||
cancellationToken);
|
||||
|
||||
Thread extractorThread = new(() =>
|
||||
{
|
||||
Dispatcher.UIThread.Post(waitingDialog.Show);
|
||||
|
||||
using FileStream file = new(updateFilePath, FileMode.Open, FileAccess.Read);
|
||||
|
||||
Nca publicDataNca = null;
|
||||
|
||||
string extension = Path.GetExtension(updateFilePath).ToLower();
|
||||
if (extension is ".nsp")
|
||||
{
|
||||
var pfsTemp = new PartitionFileSystem();
|
||||
pfsTemp.Initialize(file.AsStorage()).ThrowIfFailure();
|
||||
IFileSystem pfs = pfsTemp;
|
||||
|
||||
foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
|
||||
{
|
||||
using var ncaFile = new UniqueRef<IFile>();
|
||||
|
||||
pfs.OpenFile(ref ncaFile.Ref, fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
|
||||
|
||||
Nca nca = new(_virtualFileSystem.KeySet, ncaFile.Get.AsStorage());
|
||||
if (nca.Header.ContentType is NcaContentType.PublicData && nca.SectionExists(NcaSectionType.Data))
|
||||
{
|
||||
publicDataNca = nca;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (publicDataNca is null)
|
||||
{
|
||||
Logger.Error?.Print(LogClass.Application, "Extraction failure. The NCA was not present in the selected file");
|
||||
|
||||
Dispatcher.UIThread.InvokeAsync(async () =>
|
||||
{
|
||||
waitingDialog.Close();
|
||||
|
||||
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogNcaExtractionMainNcaNotFoundErrorMessage]);
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
|
||||
? IntegrityCheckLevel.ErrorOnInvalid
|
||||
: IntegrityCheckLevel.None;
|
||||
|
||||
int index = Nca.GetSectionIndexFromType(ncaSectionType, publicDataNca.Header.ContentType);
|
||||
|
||||
try
|
||||
{
|
||||
IFileSystem ncaFileSystem = publicDataNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
|
||||
|
||||
FileSystemClient fsClient = _horizonClient.Fs;
|
||||
|
||||
string source = DateTime.Now.ToFileTime().ToString()[10..];
|
||||
string output = DateTime.Now.ToFileTime().ToString()[10..];
|
||||
|
||||
using var uniqueSourceFs = new UniqueRef<IFileSystem>(ncaFileSystem);
|
||||
using var uniqueOutputFs = new UniqueRef<IFileSystem>(new LocalFileSystem(destination));
|
||||
|
||||
fsClient.Register(source.ToU8Span(), ref uniqueSourceFs.Ref);
|
||||
fsClient.Register(output.ToU8Span(), ref uniqueOutputFs.Ref);
|
||||
|
||||
(Result? resultCode, bool canceled) = CopyDirectory(fsClient, $"{source}:/", $"{output}:/", cancellationToken.Token);
|
||||
|
||||
if (!canceled)
|
||||
{
|
||||
if (resultCode.Value.IsFailure())
|
||||
{
|
||||
Logger.Error?.Print(LogClass.Application, $"LibHac returned error code: {resultCode.Value.ErrorCode}");
|
||||
|
||||
Dispatcher.UIThread.InvokeAsync(async () =>
|
||||
{
|
||||
waitingDialog.Close();
|
||||
|
||||
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogNcaExtractionCheckLogErrorMessage]);
|
||||
});
|
||||
}
|
||||
else if (resultCode.Value.IsSuccess())
|
||||
{
|
||||
Dispatcher.UIThread.Post(waitingDialog.Close);
|
||||
|
||||
NotificationHelper.ShowInformation(
|
||||
RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
|
||||
$"{updateName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}");
|
||||
}
|
||||
}
|
||||
|
||||
fsClient.Unmount(source.ToU8Span());
|
||||
fsClient.Unmount(output.ToU8Span());
|
||||
}
|
||||
catch (ArgumentException ex)
|
||||
{
|
||||
Logger.Error?.Print(LogClass.Application, $"{ex.Message}");
|
||||
|
||||
Dispatcher.UIThread.InvokeAsync(async () =>
|
||||
{
|
||||
waitingDialog.Close();
|
||||
|
||||
await ContentDialogHelper.CreateErrorDialog(ex.Message);
|
||||
});
|
||||
}
|
||||
})
|
||||
{
|
||||
Name = "GUI.NcaSectionExtractorThread",
|
||||
IsBackground = true,
|
||||
};
|
||||
extractorThread.Start();
|
||||
}
|
||||
|
||||
public static async Task ExtractAoc(IStorageProvider storageProvider, NcaSectionType ncaSectionType,
|
||||
string updateFilePath, string updateName)
|
||||
{
|
||||
var result = await storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
|
||||
{
|
||||
Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
|
||||
AllowMultiple = false,
|
||||
});
|
||||
|
||||
if (result.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
ExtractAoc(result[0].Path.LocalPath, ncaSectionType, updateFilePath, updateName);
|
||||
}
|
||||
|
||||
|
||||
public static async Task ExtractSection(IStorageProvider storageProvider, NcaSectionType ncaSectionType, string titleFilePath, string titleName, int programIndex = 0)
|
||||
|
||||
@@ -81,6 +81,11 @@
|
||||
Header="{ext:Locale GameListContextMenuCacheManagementPurgePptc}"
|
||||
Icon="{ext:Icon mdi-refresh}"
|
||||
ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
|
||||
<MenuItem
|
||||
Click="NukePtcCache_Click"
|
||||
Header="{ext:Locale GameListContextMenuCacheManagementNukePptc}"
|
||||
Icon="{ext:Icon mdi-delete-alert}"
|
||||
ToolTip.Tip="{ext:Locale GameListContextMenuCacheManagementNukePptcToolTip}" />
|
||||
<MenuItem
|
||||
Click="PurgeShaderCache_Click"
|
||||
Header="{ext:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
|
||||
|
||||
@@ -171,6 +171,52 @@ namespace Ryujinx.Ava.UI.Controls
|
||||
}
|
||||
}
|
||||
|
||||
public async void NukePtcCache_Click(object sender, RoutedEventArgs args)
|
||||
{
|
||||
if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
|
||||
return;
|
||||
|
||||
UserResult result = await ContentDialogHelper.CreateLocalizedConfirmationDialog(
|
||||
LocaleManager.Instance[LocaleKeys.DialogWarning],
|
||||
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCNukeMessage, viewModel.SelectedApplication.Name)
|
||||
);
|
||||
|
||||
if (result == UserResult.Yes)
|
||||
{
|
||||
DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "0"));
|
||||
DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "cpu", "1"));
|
||||
|
||||
List<FileInfo> cacheFiles = new();
|
||||
|
||||
if (mainDir.Exists)
|
||||
{
|
||||
cacheFiles.AddRange(mainDir.EnumerateFiles("*.cache"));
|
||||
cacheFiles.AddRange(mainDir.EnumerateFiles("*.info"));
|
||||
}
|
||||
|
||||
if (backupDir.Exists)
|
||||
{
|
||||
cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
|
||||
cacheFiles.AddRange(mainDir.EnumerateFiles("*.info"));
|
||||
}
|
||||
|
||||
if (cacheFiles.Count > 0)
|
||||
{
|
||||
foreach (FileInfo file in cacheFiles)
|
||||
{
|
||||
try
|
||||
{
|
||||
file.Delete();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogPPTCDeletionErrorMessage, file.Name, ex));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public async void PurgeShaderCache_Click(object sender, RoutedEventArgs args)
|
||||
{
|
||||
if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
|
||||
|
||||
@@ -38,6 +38,7 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
|
||||
using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
|
||||
using Ryujinx.HLE.UI;
|
||||
using Ryujinx.Input.HLE;
|
||||
using Silk.NET.Vulkan;
|
||||
using SkiaSharp;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -144,14 +144,14 @@ namespace Ryujinx.Ava.UI.Views.Main
|
||||
ViewModel.LoadConfigurableHotKeys();
|
||||
}
|
||||
|
||||
public AppletMetadata MiiApplet => new(ViewModel.ContentManager, "miiEdit", 0x0100000000001009);
|
||||
|
||||
public static readonly AppletMetadata MiiApplet = new("miiEdit", 0x0100000000001009);
|
||||
|
||||
public async Task OpenMiiApplet()
|
||||
{
|
||||
if (!MiiApplet.CanStart(out var appData, out var nacpData))
|
||||
return;
|
||||
|
||||
await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
|
||||
if (MiiApplet.CanStart(ViewModel.ContentManager, out var appData, out var nacpData))
|
||||
{
|
||||
await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task OpenCheatManagerForCurrentApp()
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||
xmlns:pi="using:Projektanker.Icons.Avalonia"
|
||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||
xmlns:models="clr-namespace:Ryujinx.Ava.Common.Models"
|
||||
Width="500"
|
||||
@@ -90,12 +89,7 @@
|
||||
<ListBox.DataTemplates>
|
||||
<DataTemplate
|
||||
DataType="models:DownloadableContentModel">
|
||||
<Panel Margin="10" Background="Transparent">
|
||||
<Panel.ContextFlyout>
|
||||
<Flyout ShowMode="TransientWithDismissOnPointerMoveAway">
|
||||
|
||||
</Flyout>
|
||||
</Panel.ContextFlyout>
|
||||
<Panel Margin="10">
|
||||
<Grid ColumnDefinitions="*,Auto">
|
||||
<Grid
|
||||
Grid.Column="0" ColumnDefinitions="*,Auto">
|
||||
@@ -125,15 +119,6 @@
|
||||
Spacing="10"
|
||||
Orientation="Horizontal"
|
||||
HorizontalAlignment="Right">
|
||||
<Button
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Right"
|
||||
Padding="10"
|
||||
MinWidth="0"
|
||||
MinHeight="0"
|
||||
Click="DlcItem_DumpRomfs">
|
||||
<ui:SymbolIcon Symbol="MoveToFolder"/>
|
||||
</Button>
|
||||
<Button
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Right"
|
||||
|
||||
@@ -2,8 +2,6 @@ using Avalonia.Controls;
|
||||
using Avalonia.Interactivity;
|
||||
using Avalonia.Styling;
|
||||
using FluentAvalonia.UI.Controls;
|
||||
using LibHac.Tools.FsSystem.NcaUtils;
|
||||
using Ryujinx.Ava.Common;
|
||||
using Ryujinx.Ava.Common.Locale;
|
||||
using Ryujinx.Ava.Common.Models;
|
||||
using Ryujinx.Ava.UI.ViewModels;
|
||||
@@ -95,18 +93,5 @@ namespace Ryujinx.Ava.UI.Windows
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async void DlcItem_DumpRomfs(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (sender is not Button { DataContext: DownloadableContentModel dlc }) return;
|
||||
if (RyujinxApp.MainWindow.ViewModel is not { } viewModel)
|
||||
return;
|
||||
|
||||
await ApplicationHelper.ExtractAoc(
|
||||
viewModel.StorageProvider,
|
||||
NcaSectionType.Data,
|
||||
dlc.ContainerPath,
|
||||
dlc.FileName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,9 +54,5 @@ namespace Ryujinx.Ava.Utilities
|
||||
appControl = new BlitStruct<ApplicationControlProperty>(0);
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool CanStart(out ApplicationData appData,
|
||||
out BlitStruct<ApplicationControlProperty> appControl)
|
||||
=> CanStart(null, out appData, out appControl);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user