From c333239b8eb524d463bd335885ab64fe757585c1 Mon Sep 17 00:00:00 2001 From: nerdnils Date: Mon, 9 Oct 2017 15:52:23 +0200 Subject: [PATCH 1/4] Zool twice Delete duplicate --- data/snescarts.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/data/snescarts.xml b/data/snescarts.xml index 09296131b..4cc8c953c 100644 --- a/data/snescarts.xml +++ b/data/snescarts.xml @@ -8642,15 +8642,4 @@ http://thegamesdb.net/banners/boxart/original/front/6373-1.jpg 6373 - - Zool - Ninja of the Nth Dimension - 1 - 0 - 3c10daf1 - 1994-01-01 - GameTek - USA - http://thegamesdb.net/banners/boxart/original/front/6373-1.jpg - 6373 - From 258422a1bc4fa2c07a2c32ab6b5e21f31aef2935 Mon Sep 17 00:00:00 2001 From: brian91292 <8050523+brian91292@users.noreply.github.com> Date: Mon, 9 Oct 2017 17:07:06 -0500 Subject: [PATCH 2/4] Fix lag on SNES mini For some reason setting the "enabled" key to false on SNES mini makes it lag like crazy whenever it tries to load the launcher, this fixes the lag while still making all the small thumbnails invisible. --- user_mods/remove_thumbnails.hmod/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_mods/remove_thumbnails.hmod/install b/user_mods/remove_thumbnails.hmod/install index b887093b3..af41f6ac2 100644 --- a/user_mods/remove_thumbnails.hmod/install +++ b/user_mods/remove_thumbnails.hmod/install @@ -18,7 +18,7 @@ echo nesjson: $nesjson restore $nesjson # sed is GNU util to modify file, this command replaces "enabled:true" to "enabled:false" # Please note that we need to edit $rootfs$scnfile (writable file), not a just $scnfile (original read-only file) -sed -i -e 's/"enabled":true/"enabled":false/g' $rootfs$scnfile +sed -i -e 's/color":\[1,1,1,1\]/color":\[1,1,1,0\]/g' $rootfs$scnfile # Same with nes.json file, most simple way is to replace coordinates sprite coords with zeros # For NES Mini sed -i -e 's/\[93,861,12,8\]/\[0,0,0,0\]/g' $rootfs$nesjson From b8420d0ba5925b478cbf2cecb5bff7472fcfeb7e Mon Sep 17 00:00:00 2001 From: Daniel Radtke Date: Mon, 9 Oct 2017 19:51:30 -0500 Subject: [PATCH 3/4] Link SNES games to the squashfs mount instead of copying --- MainForm.cs | 46 +++++++++++++++++++++++----------------------- WorkerForm.cs | 7 ++++++- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/MainForm.cs b/MainForm.cs index 014fd4920..5ecbf8109 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -94,29 +94,29 @@ public enum ConsoleType { NES = 0, Famicom = 1, SNES = 2, SuperFamicom = 3, Unkn new NesDefaultGame { Code = "CLV-P-HACLJ", Name = "ダウンタウン熱血行進曲 それゆけ大運動会", Size = 587083 }, new NesDefaultGame { Code = "CLV-P-HACPJ", Name = "アトランチスの謎", Size = 376213 } }; - static NesDefaultGame[] defaultSnesGames = new NesDefaultGame[] - { - new NesDefaultGame { Code = "CLV-P-SAAAE", Name = "Super Mario World", Size = 2979540 }, - new NesDefaultGame { Code = "CLV-P-SAABE", Name = "F-ZERO", Size = 2770166 }, - new NesDefaultGame { Code = "CLV-P-SAAEE", Name = "The Legend of Zelda: A Link to the Past", Size = 2618796 }, - new NesDefaultGame { Code = "CLV-P-SAAFE", Name = "Super Mario Kart", Size = 2436777 }, - new NesDefaultGame { Code = "CLV-P-SAAHE", Name = "Super Metroid", Size = 6237435 }, - new NesDefaultGame { Code = "CLV-P-SAAJE", Name = "EarthBound", Size = 5954521 }, - new NesDefaultGame { Code = "CLV-P-SAAKE", Name = "Kirby's Dream Course", Size = 3210055 }, - new NesDefaultGame { Code = "CLV-P-SAALE", Name = "Donkey Kong Country", Size = 5899153 }, - new NesDefaultGame { Code = "CLV-P-SAAQE", Name = "Kirby Super Star", Size = 6893805 }, - new NesDefaultGame { Code = "CLV-P-SAAXE", Name = "Super Punch-Out!!", Size = 5085386 }, - new NesDefaultGame { Code = "CLV-P-SABCE", Name = "Mega Man X", Size = 2680591 }, - new NesDefaultGame { Code = "CLV-P-SABDE", Name = "Super Ghouls'n Ghosts", Size = 2157749 }, - new NesDefaultGame { Code = "CLV-P-SABHE", Name = "Street Fighter II Turbo: Hyper Fighting", Size = 9166072 }, - new NesDefaultGame { Code = "CLV-P-SABQE", Name = "Super Mario RPG: Legend of the Seven Stars", Size = 5620137 }, - new NesDefaultGame { Code = "CLV-P-SABRE", Name = "Secret of Mana", Size = 3029013 }, - new NesDefaultGame { Code = "CLV-P-SABTE", Name = "Final Fantasy III", Size = 4336655 }, - new NesDefaultGame { Code = "CLV-P-SACBE", Name = "Super Castlevania IV", Size = 2953337 }, - new NesDefaultGame { Code = "CLV-P-SACCE", Name = "CONTRA III THE ALIEN WARS", Size = 2803555 }, - new NesDefaultGame { Code = "CLV-P-SADGE", Name = "Star Fox", Size = 3339549 }, - new NesDefaultGame { Code = "CLV-P-SADJE", Name = "Yoshi's Island", Size = 4261051 }, - new NesDefaultGame { Code = "CLV-P-SADKE", Name = "Star Fox 2", Size = 2088122 } + static NesDefaultGame[] defaultSnesGames = new NesDefaultGame[] { + + new NesDefaultGame { Code = "CLV-P-SAAAE", Name = "Super Mario World", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SAABE", Name = "F-ZERO", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SAAEE", Name = "The Legend of Zelda: A Link to the Past", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SAAFE", Name = "Super Mario Kart", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SAAHE", Name = "Super Metroid", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SAAJE", Name = "EarthBound", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SAAKE", Name = "Kirby's Dream Course", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SAALE", Name = "Donkey Kong Country", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SAAQE", Name = "Kirby Super Star", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SAAXE", Name = "Super Punch-Out!!", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SABCE", Name = "Mega Man X", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SABDE", Name = "Super Ghouls'n Ghosts", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SABHE", Name = "Street Fighter II Turbo: Hyper Fighting", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SABQE", Name = "Super Mario RPG: Legend of the Seven Stars", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SABRE", Name = "Secret of Mana", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SABTE", Name = "Final Fantasy III", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SACBE", Name = "Super Castlevania IV", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SACCE", Name = "CONTRA III THE ALIEN WARS", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SADGE", Name = "Star Fox", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SADJE", Name = "Yoshi's Island", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-SADKE", Name = "Star Fox 2", Size = 24576 } }; static NesDefaultGame[] defaultSuperFamicomGames = new NesDefaultGame[] { diff --git a/WorkerForm.cs b/WorkerForm.cs index adc832c7f..f72c14d6f 100644 --- a/WorkerForm.cs +++ b/WorkerForm.cs @@ -774,6 +774,7 @@ public void UploadGames() string gamesPath = NesMiniApplication.GamesCloverPath; const string rootFsPath = "/var/lib/hakchi/rootfs"; const string installPath = "/var/lib/hakchi"; + const string squashFsPath = "/var/lib/hakchi/squashfs"; int progress = 0; int maxProgress = 400; if (Games == null || Games.Count == 0) @@ -869,7 +870,11 @@ public void UploadGames() case MainForm.ConsoleType.SNES: case MainForm.ConsoleType.SuperFamicom: originalSyncCode = $"mkdir -p \"{rootFsPath}{gamesPath}/{originalGames[originalCode]}/{originalCode}/\" && " + - $"rsync -ac \"{gamesPath}/{originalCode}/\" \"{rootFsPath}{gamesPath}/{originalGames[originalCode]}/{originalCode}/\" && " + + $"ln -s \"{squashFsPath}{gamesPath}/{originalCode}/{originalCode}.png\" \"{rootFsPath}{gamesPath}/{originalGames[originalCode]}/{originalCode}/{originalCode}.png\" &&" + + $"ln -s \"{squashFsPath}{gamesPath}/{originalCode}/{originalCode}_small.png\" \"{rootFsPath}{gamesPath}/{originalGames[originalCode]}/{originalCode}/{originalCode}_small.png\" &&" + + $"ln -s \"{squashFsPath}{gamesPath}/{originalCode}/{originalCode}.sfrom\" \"{rootFsPath}{gamesPath}/{originalGames[originalCode]}/{originalCode}/{originalCode}.sfrom\" &&" + + $"ln -s \"{squashFsPath}{gamesPath}/{originalCode}/autoplay/\" \"{rootFsPath}{gamesPath}/{originalGames[originalCode]}/{originalCode}/autoplay\" &&" + + $"cp \"{gamesPath}/{originalCode}/{originalCode}.desktop\" \"{rootFsPath}{gamesPath}/{originalGames[originalCode]}/{originalCode}/{originalCode}.desktop\" && " + $"sed -i -e 's/\\/usr\\/bin\\/clover-canoe-shvc/\\/bin\\/clover-canoe-shvc-wr/g' \"{rootFsPath}{gamesPath}/{originalGames[originalCode]}/{originalCode}/{originalCode}.desktop\""; /* // With compression but very slow From 5dd70fdda6f34fc5aee55c2b885dc9accf07f44c Mon Sep 17 00:00:00 2001 From: Daniel Radtke Date: Mon, 9 Oct 2017 22:18:05 -0500 Subject: [PATCH 4/4] Update sizes for Super Famicom --- MainForm.cs | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/MainForm.cs b/MainForm.cs index 5ecbf8109..b6a18ddfb 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -120,27 +120,27 @@ public enum ConsoleType { NES = 0, Famicom = 1, SNES = 2, SuperFamicom = 3, Unkn }; static NesDefaultGame[] defaultSuperFamicomGames = new NesDefaultGame[] { - new NesDefaultGame { Code = "CLV-P-VAAAJ", Name = "スーパーマリオワールド", Size = 2648224 }, - new NesDefaultGame { Code = "CLV-P-VAABJ", Name = "F-ZERO", Size = 2666349 }, - new NesDefaultGame { Code = "CLV-P-VAAEJ", Name = "ゼルダの伝説 神々のトライフォース", Size = 2377849 }, - new NesDefaultGame { Code = "CLV-P-VAAFJ", Name = "スーパーマリオカート", Size = 2295761 }, - new NesDefaultGame { Code = "CLV-P-VAAGJ", Name = "ファイアーエムブレム 紋章の謎", Size = 5272630 }, - new NesDefaultGame { Code = "CLV-P-VAAHJ", Name = "スーパーメトロイド", Size = 6211090 }, - new NesDefaultGame { Code = "CLV-P-VAALJ", Name = "スーパードンキーコング", Size = 5688108 }, - new NesDefaultGame { Code = "CLV-P-VAAQJ", Name = "星のカービィ スーパーデラックス", Size = 7071882 }, - new NesDefaultGame { Code = "CLV-P-VABBJ", Name = "スーパーストリートファイターⅡ ザ ニューチャレンジャーズ", Size = 13481718 }, - new NesDefaultGame { Code = "CLV-P-VABCJ", Name = "ロックマンX", Size = 2666724 }, - new NesDefaultGame { Code = "CLV-P-VABDJ", Name = "超魔界村", Size = 2143395 }, - new NesDefaultGame { Code = "CLV-P-VABQJ", Name = "スーパーマリオRPG", Size = 5659168 }, - new NesDefaultGame { Code = "CLV-P-VABRJ", Name = "聖剣伝説2", Size = 2922201 }, - new NesDefaultGame { Code = "CLV-P-VABTJ", Name = "ファイナルファンタジーVI", Size = 4335899 }, - new NesDefaultGame { Code = "CLV-P-VACCJ", Name = "魂斗羅スピリッツ", Size = 2762661 }, - new NesDefaultGame { Code = "CLV-P-VACDJ", Name = "がんばれゴエモン ゆき姫救出絵巻", Size = 2415384 }, - new NesDefaultGame { Code = "CLV-P-VADFJ", Name = "スーパーフォーメーションサッカー", Size = 1922523 }, - new NesDefaultGame { Code = "CLV-P-VADGJ", Name = "スターフォックス", Size = 3324346 }, - new NesDefaultGame { Code = "CLV-P-VADJJ", Name = "スーパーマリオ ヨッシーアイランド", Size = 3799569 }, - new NesDefaultGame { Code = "CLV-P-VADKJ", Name = "スターフォックス2", Size = 2066174 }, - new NesDefaultGame { Code = "CLV-P-VADZJ", Name = "パネルでポン", Size = 3563159 }, + new NesDefaultGame { Code = "CLV-P-VAAAJ", Name = "スーパーマリオワールド", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VAABJ", Name = "F-ZERO", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VAAEJ", Name = "ゼルダの伝説 神々のトライフォース", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VAAFJ", Name = "スーパーマリオカート", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VAAGJ", Name = "ファイアーエムブレム 紋章の謎", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VAAHJ", Name = "スーパーメトロイド", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VAALJ", Name = "スーパードンキーコング", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VAAQJ", Name = "星のカービィ スーパーデラックス", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VABBJ", Name = "スーパーストリートファイターⅡ ザ ニューチャレンジャーズ", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VABCJ", Name = "ロックマンX", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VABDJ", Name = "超魔界村", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VABQJ", Name = "スーパーマリオRPG", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VABRJ", Name = "聖剣伝説2", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VABTJ", Name = "ファイナルファンタジーVI", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VACCJ", Name = "魂斗羅スピリッツ", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VACDJ", Name = "がんばれゴエモン ゆき姫救出絵巻", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VADFJ", Name = "スーパーフォーメーションサッカー", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VADGJ", Name = "スターフォックス", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VADJJ", Name = "スーパーマリオ ヨッシーアイランド", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VADKJ", Name = "スターフォックス2", Size = 24576 }, + new NesDefaultGame { Code = "CLV-P-VADZJ", Name = "パネルでポン", Size = 24576 }, };