The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-11-22 03:09:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Updated default Gamecube Banner URL.

Browse Source 
* Added an URL auto-updater for users with the old 
  GameCube banner URL.

Devolution : 
* Added forced video mode to PAL60Hz 480i when playing 
  NTSC games on a PAL console.
* Added Crop Overscan and Disc Delay settings from 
  Devolution r234 
  - For PlayLog setting, use USBLoaderGX Playlog setting.
  - "MemCard emulation on NAND" feature will not be added.

Nintendont :
* Added support for Nintendont v1.135+
* Added MemCard Emu "Multi" support, named "Enabled" like
  with Devolution (OFF > Individual > Enabled) (v1.135+)
* Added MemCard Blocks size option (v1.135+)
* Added specific game settings (Metal gear Solid)
* Changed to use Argsboot method only if AutoBoot is set.
This commit is contained in:
Cyan 2014-08-18 19:19:20 +00:00
parent d507f866e2
commit 48b3ab3324
35 changed files with 455 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HBC/META.XML
View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>3.0 r1230</version> <version>3.0 r1231</version>
<release_date>20140802163350</release_date> <release_date>20140818182641</release_date>
<!-- // remove this line to enable arguments <!-- // remove this line to enable arguments
<arguments> <arguments>
<arg>--ios=250</arg> <arg>--ios=250</arg>

11
Languages/czech.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n" "Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n"
"Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n" "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
@ -502,6 +502,9 @@ msgstr "Vytvorit"
msgid "Credits" msgid "Credits"
msgstr "Zásluhy" msgstr "Zásluhy"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Puvodní nastavení disku"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Oznacir nové hry"
msgid "May" msgid "May"
msgstr "Kvet" msgstr "Kvet"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/danish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: Fox888[dk]\n" "Last-Translator: Fox888[dk]\n"
"Language-Team: [dk]\n" "Language-Team: [dk]\n"
@ -502,6 +502,9 @@ msgstr "Opret"
msgid "Credits" msgid "Credits"
msgstr "Lavet af:" msgstr "Lavet af:"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Spillets standard"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "Ny Disc opdaget" msgstr "Ny Disc opdaget"
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Maker nye spil"
msgid "May" msgid "May"
msgstr "Maj" msgstr "Maj"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/dutch.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
@ -502,6 +502,9 @@ msgstr "Maak"
msgid "Credits" msgid "Credits"
msgstr "Credits" msgstr "Credits"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "Aangepaste Banners" msgstr "Aangepaste Banners"
@ -610,6 +613,9 @@ msgstr "Disk standaard"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "Disk invoer gedetecteerd" msgstr "Disk invoer gedetecteerd"
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "Disk leesfout." msgstr "Disk leesfout."
@ -1372,6 +1378,9 @@ msgstr "Markeer nieuwe spellen"
msgid "May" msgid "May"
msgstr "Mei" msgstr "Mei"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "Memory Card Emulatie" msgstr "Memory Card Emulatie"

11
Languages/english.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
@ -502,6 +502,9 @@ msgstr ""
msgid "Credits" msgid "Credits"
msgstr "" msgstr ""
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr ""
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "" msgstr ""
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/finnish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: c64rmx\n" "Last-Translator: c64rmx\n"
"Language-Team: \n" "Language-Team: \n"
@ -502,6 +502,9 @@ msgstr "Luo"
msgid "Credits" msgid "Credits"
msgstr "Tekijät" msgstr "Tekijät"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Pelin oletus"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "touko" msgstr "touko"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

13
Languages/french.lang
View File

@ -1,11 +1,11 @@
# USB Loader GX language source file. # USB Loader GX language source file.
# French.lang - r1230 # French.lang - r1231
# don't delete/change this line (é). # don't delete/change this line (é).
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: Cyan\n" "Last-Translator: Cyan\n"
"Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n" "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@ -502,6 +502,9 @@ msgstr "Créer"
msgid "Credits" msgid "Credits"
msgstr "Crédits" msgstr "Crédits"
msgid "Crop Overscan"
msgstr "Réduire l'overscan"
msgid "Custom Banners" msgid "Custom Banners"
msgstr "Bannières persos" msgstr "Bannières persos"
@ -610,6 +613,9 @@ msgstr "Disque par défaut"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "Insertion de disque détectée" msgstr "Insertion de disque détectée"
msgid "Disc Read Delay"
msgstr "Temporiser l'accès disque"
msgid "Disc read error." msgid "Disc read error."
msgstr "Erreur de lecture du disque." msgstr "Erreur de lecture du disque."
@ -1372,6 +1378,9 @@ msgstr "Marquer les nouveaux jeux"
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Memory Card Blocks Size"
msgstr "Taille carte mémoire (Blocs)"
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "Emulation carte mémoire" msgstr "Emulation carte mémoire"

11
Languages/german.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2010-07-03 17:35-0800\n" "PO-Revision-Date: 2010-07-03 17:35-0800\n"
"Last-Translator: TheRealVisitor\n" "Last-Translator: TheRealVisitor\n"
"Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n" "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@ -502,6 +502,9 @@ msgstr "Erstelle GCT"
msgid "Credits" msgid "Credits"
msgstr "Danksagungen" msgstr "Danksagungen"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "Community Banner" msgstr "Community Banner"
@ -610,6 +613,9 @@ msgstr "Diskstandard"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "Disk erkannt" msgstr "Disk erkannt"
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "Disk Lese-Fehler" msgstr "Disk Lese-Fehler"
@ -1372,6 +1378,9 @@ msgstr "Neue Spiele mark."
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/greek.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"Last-Translator: nakata6790\n" "Last-Translator: nakata6790\n"
"Language-Team: nakata6790 (aka0107@gmail.com)\n" "Language-Team: nakata6790 (aka0107@gmail.com)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -501,6 +501,9 @@ msgstr "Äçìéïõñãßá"
msgid "Credits" msgid "Credits"
msgstr "ÓõíôåëåóôÝò" msgstr "ÓõíôåëåóôÝò"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "ÔñïðïðïéçìÝíåò ôáìðÝëåò-åéêïíßäéá" msgstr "ÔñïðïðïéçìÝíåò ôáìðÝëåò-åéêïíßäéá"
@ -609,6 +612,9 @@ msgstr "ÐñïåðéëåãìÝíåò ðáé÷íéäéïý"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "Áíé÷íåýôçêå ïðôéêüò äßóêïò" msgstr "Áíé÷íåýôçêå ïðôéêüò äßóêïò"
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "ÓöÜëìá êáôá ôçí áíÜãíùóç äßóêïõ." msgstr "ÓöÜëìá êáôá ôçí áíÜãíùóç äßóêïõ."
@ -1371,6 +1377,9 @@ msgstr "ÌáñêÜñéóìá íÝùí ðáé÷íéäéþí"
msgid "May" msgid "May"
msgstr "Máúïò" msgstr "Máúïò"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/hungarian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-12-29 11:05+0100\n" "PO-Revision-Date: 2009-12-29 11:05+0100\n"
"Last-Translator: Springdale\n" "Last-Translator: Springdale\n"
"Language-Team: Tusk, Springdale\n" "Language-Team: Tusk, Springdale\n"
@ -502,6 +502,9 @@ msgstr "Létrehozás"
msgid "Credits" msgid "Credits"
msgstr "Készítõk" msgstr "Készítõk"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Lemez Alapértelmezettje"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Új játékok megjelölése"
msgid "May" msgid "May"
msgstr "Máj" msgstr "Máj"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/italian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2011-09-11 12:19+0100\n" "PO-Revision-Date: 2011-09-11 12:19+0100\n"
"Last-Translator: xFede\n" "Last-Translator: xFede\n"
"Language-Team: xFede (fedeanto11@gmail.com)\n" "Language-Team: xFede (fedeanto11@gmail.com)\n"
@ -502,6 +502,9 @@ msgstr "Crea"
msgid "Credits" msgid "Credits"
msgstr "Ringraziamenti" msgstr "Ringraziamenti"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "Banner personalizzati" msgstr "Banner personalizzati"
@ -610,6 +613,9 @@ msgstr "Da disco"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "Rilevato il disco" msgstr "Rilevato il disco"
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "Errore durante la lettura del disco." msgstr "Errore durante la lettura del disco."
@ -1372,6 +1378,9 @@ msgstr "Evidenzia i giochi nuovi"
msgid "May" msgid "May"
msgstr "Maggio" msgstr "Maggio"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/japanese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: hosigumayuugi\n" "Last-Translator: hosigumayuugi\n"
"Language-Team: hosigumayuugi\n" "Language-Team: hosigumayuugi\n"
@ -502,6 +502,9 @@ msgstr "作成"
msgid "Credits" msgid "Credits"
msgstr "提供･協力" msgstr "提供･協力"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "カスタムバナー" msgstr "カスタムバナー"
@ -610,6 +613,9 @@ msgstr "ディスクの初期値"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "ディスクの挿入を検知しました" msgstr "ディスクの挿入を検知しました"
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "読み込みエラー" msgstr "読み込みエラー"
@ -1372,6 +1378,9 @@ msgstr "Newマークの表示機能"
msgid "May" msgid "May"
msgstr "5月" msgstr "5月"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/korean.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: nextos@korea.com\n" "Last-Translator: nextos@korea.com\n"
"Language-Team: \n" "Language-Team: \n"
@ -502,6 +502,9 @@ msgstr "생성"
msgid "Credits" msgid "Credits"
msgstr "Credits" msgstr "Credits"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "디스크 기본값"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "5월" msgstr "5월"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/norwegian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: raschi\n" "Last-Translator: raschi\n"
"Language-Team: raschi\n" "Language-Team: raschi\n"
@ -502,6 +502,9 @@ msgstr "Opprett"
msgid "Credits" msgid "Credits"
msgstr "Medvirkende" msgstr "Medvirkende"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Spill Standard"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Merk nye spill"
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/polish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
"Language-Team: \n" "Language-Team: \n"
@ -502,6 +502,9 @@ msgstr "Utworz"
msgid "Credits" msgid "Credits"
msgstr "" msgstr ""
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Domyslny dysk"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Oznacz nowe gry"
msgid "May" msgid "May"
msgstr "Maj" msgstr "Maj"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/portuguese_br.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-23 18:52+0200\n" "PO-Revision-Date: 2009-10-23 18:52+0200\n"
"Last-Translator: aniemotion\n" "Last-Translator: aniemotion\n"
"Language-Team: boto12, aniemotion\n" "Language-Team: boto12, aniemotion\n"
@ -502,6 +502,9 @@ msgstr "Criar"
msgid "Credits" msgid "Credits"
msgstr "Créditos" msgstr "Créditos"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Disco Padrão"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Marcar games novos"
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/portuguese_pt.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2011-11-03 11:00+0000\n" "PO-Revision-Date: 2011-11-03 11:00+0000\n"
"Last-Translator: pplucky <pplucky@gmail.com>\n" "Last-Translator: pplucky <pplucky@gmail.com>\n"
"Language-Team: Sky8000, pplucky\n" "Language-Team: Sky8000, pplucky\n"
@ -502,6 +502,9 @@ msgstr "Criar"
msgid "Credits" msgid "Credits"
msgstr "Créditos" msgstr "Créditos"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Predefinição Disco"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Marcar jogos novos"
msgid "May" msgid "May"
msgstr "Mai" msgstr "Mai"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/russian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: nikolai_ca\n" "Last-Translator: nikolai_ca\n"
"Language-Team: Kir, alendit, nikolai_ca\n" "Language-Team: Kir, alendit, nikolai_ca\n"
@ -502,6 +502,9 @@ msgstr "Создать"
msgid "Credits" msgid "Credits"
msgstr "Об авторах" msgstr "Об авторах"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "По умолчанию (диск)"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Отметить новые игры"
msgid "May" msgid "May"
msgstr "Май" msgstr "Май"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/schinese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2013-08-13 07:03+0800\n" "PO-Revision-Date: 2013-08-13 07:03+0800\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: oCameLo\n" "Language-Team: oCameLo\n"
@ -502,6 +502,9 @@ msgstr "创建"
msgid "Credits" msgid "Credits"
msgstr "作者信息" msgstr "作者信息"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "自定义频道动画" msgstr "自定义频道动画"
@ -610,6 +613,9 @@ msgstr "游戏默认"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "光盘已插入" msgstr "光盘已插入"
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "光盘读取错误。" msgstr "光盘读取错误。"
@ -1372,6 +1378,9 @@ msgstr "标记新游戏"
msgid "May" msgid "May"
msgstr "五月" msgstr "五月"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "记忆卡模拟" msgstr "记忆卡模拟"

11
Languages/spanish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2011-07-25 16:40+0200\n" "PO-Revision-Date: 2011-07-25 16:40+0200\n"
"Last-Translator: Galen/xFede\n" "Last-Translator: Galen/xFede\n"
"Language-Team: Penn, SirPalax, hvy109\n" "Language-Team: Penn, SirPalax, hvy109\n"
@ -502,6 +502,9 @@ msgstr "Crear"
msgid "Credits" msgid "Credits"
msgstr "Créditos" msgstr "Créditos"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Pred. Disco"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "Detectado Disco Insertado" msgstr "Detectado Disco Insertado"
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "Error de lectura del disco." msgstr "Error de lectura del disco."
@ -1372,6 +1378,9 @@ msgstr "Marcar juegos nuevos"
msgid "May" msgid "May"
msgstr "" msgstr ""
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/swedish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2010-01-19 17:39+0200\n" "PO-Revision-Date: 2010-01-19 17:39+0200\n"
"Last-Translator: Katsurou\n" "Last-Translator: Katsurou\n"
"Language-Team: Katsurou, pirateX\n" "Language-Team: Katsurou, pirateX\n"
@ -502,6 +502,9 @@ msgstr "Skapa"
msgid "Credits" msgid "Credits"
msgstr "Medverkande" msgstr "Medverkande"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Skivans standard"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Markera nya spel"
msgid "May" msgid "May"
msgstr "Maj" msgstr "Maj"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/tchinese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2010-02-15 21:00+0800\n" "PO-Revision-Date: 2010-02-15 21:00+0800\n"
"Last-Translator: Jane.H\n" "Last-Translator: Jane.H\n"
"Language-Team: kyogc, Miller, Mika Li, Jane.H\n" "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@ -502,6 +502,9 @@ msgstr "產生"
msgid "Credits" msgid "Credits"
msgstr "作者信息" msgstr "作者信息"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "自製頻道動畫" msgstr "自製頻道動畫"
@ -610,6 +613,9 @@ msgstr "光碟預設"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "光碟插入檢查" msgstr "光碟插入檢查"
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "光碟讀取錯誤" msgstr "光碟讀取錯誤"
@ -1372,6 +1378,9 @@ msgstr "標示新遊戲"
msgid "May" msgid "May"
msgstr "五月" msgstr "五月"
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/thai.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: Nitro_subzero \n" "Last-Translator: Nitro_subzero \n"
"Language-Team: Nitro_subzero\n" "Language-Team: Nitro_subzero\n"
@ -502,6 +502,9 @@ msgstr "สร้าง"
msgid "Credits" msgid "Credits"
msgstr "เครดิต" msgstr "เครดิต"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "ค่าตั้งต้นแผ่น"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr ""
msgid "May" msgid "May"
msgstr "พค." msgstr "พค."
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

11
Languages/turkish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-02 18:34+0200\n" "POT-Creation-Date: 2014-08-18 20:27+0200\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: omercigingelini\n" "Last-Translator: omercigingelini\n"
"Language-Team: omercigingelini\n" "Language-Team: omercigingelini\n"
@ -502,6 +502,9 @@ msgstr "Oluştur"
msgid "Credits" msgid "Credits"
msgstr "Emekçiler" msgstr "Emekçiler"
msgid "Crop Overscan"
msgstr ""
msgid "Custom Banners" msgid "Custom Banners"
msgstr "" msgstr ""
@ -610,6 +613,9 @@ msgstr "Disk Varsayılanı"
msgid "Disc Insert Detected" msgid "Disc Insert Detected"
msgstr "" msgstr ""
msgid "Disc Read Delay"
msgstr ""
msgid "Disc read error." msgid "Disc read error."
msgstr "" msgstr ""
@ -1372,6 +1378,9 @@ msgstr "Yeni oyunlari imle"
msgid "May" msgid "May"
msgstr "" msgstr ""
msgid "Memory Card Blocks Size"
msgstr ""
msgid "Memory Card Emulation" msgid "Memory Card Emulation"
msgstr "" msgstr ""

9
source/GameCube/DEVO_Config.h
View File

@ -20,7 +20,7 @@
#define LAUNCH_DEVO() ((void(*)(void))loader_bin)() #define LAUNCH_DEVO() ((void(*)(void))loader_bin)()
#define DEVO_SIG 0x3EF9DB23 #define DEVO_SIG 0x3EF9DB23
#define DEVO_CONFIG_VERSION 0x0112 #define DEVO_CONFIG_VERSION 0x0200
enum DEVOConfig enum DEVOConfig
{ {
@ -29,13 +29,16 @@ enum DEVOConfig
DEVO_CFG_NOLED = (1<<2), DEVO_CFG_NOLED = (1<<2),
DEVO_CFG_FZERO_AX = (1<<3), // added in Devo r196, config version x0111 DEVO_CFG_FZERO_AX = (1<<3), // added in Devo r196, config version x0111
DEVO_CFG_TIMER_FIX = (1<<4), DEVO_CFG_TIMER_FIX = (1<<4),
DEVO_CFG_D_BUTTONS = (1<<5) // added in Devo r200, config version 0x0112 DEVO_CFG_D_BUTTONS = (1<<5), // added in Devo r200, config version 0x0112
DEVO_CFG_CROP_OVERSCAN = (1<<6), // added in Devo r234, config version 0x0200
DEVO_CFG_DISC_DELAY = (1<<7),
DEVO_CFG_PLAYLOG = (1<<8),
}; };
typedef struct _DEVO_CFG typedef struct _DEVO_CFG
{ {
u32 signature; //0x3EF9DB23 u32 signature; //0x3EF9DB23
u16 version; //0x00000112 u16 version; //0x00000200
u16 device_signature; u16 device_signature;
u32 memcard_cluster; u32 memcard_cluster;
u32 disc1_cluster; u32 disc1_cluster;

22
source/GameCube/NIN_Config.h
View File

@ -20,19 +20,20 @@
#include <gctypes.h> #include <gctypes.h>
#define NIN_MAGIC 0x01070CF6 #define NIN_MAGIC 0x01070CF6
#define NIN_CFG_VERSION 0x00000002 #define NIN_CFG_VERSION 0x00000003
typedef struct NIN_CFG typedef struct NIN_CFG
{ {
u32 Magicbytes; // 0x01070CF6 u32 Magicbytes; // 0x01070CF6
u32 Version; // 0x00000002 since r42 u32 Version; // 0x00000003 since r42
u32 Config; u32 Config;
u32 VideoMode; u32 VideoMode;
u32 Language; u32 Language;
char GamePath[255]; char GamePath[255];
char CheatPath[255]; char CheatPath[255];
u32 MaxPads; u32 MaxPads; // added in r42 - cfg version 2
u32 GameID; u32 GameID; // added in r83 - cfg version 2
u32 MemCardBlocks; // added in v1.135 - cfg version 3
} NIN_CFG; } NIN_CFG;
enum ninconfig enum ninconfig
@ -50,6 +51,7 @@ enum ninconfig
NIN_CFG_USB = (1<<10), // r40 NIN_CFG_USB = (1<<10), // r40
NIN_CFG_LED = (1<<11), // v1.45 NIN_CFG_LED = (1<<11), // v1.45
NIN_CFG_LOG = (1<<12), // v1.109 NIN_CFG_LOG = (1<<12), // v1.109
NIN_CFG_MC_MULTI = (1<<13), // v1.135
}; };
enum ninvideomode enum ninvideomode
@ -85,5 +87,17 @@ enum ninlanguage
NIN_LAN_AUTO = -1, NIN_LAN_AUTO = -1,
}; };
// blocks = value , internal code , file size/bytes
//Mem0059 = 0, 0x04, 0x0080000
//Mem0123 = 1, 0x08, 0x0100000
//Mem0251 = 2, 0x10, 0x0200000
//Mem0507 = 3, 0x20, 0x0400000
//Mem1019 = 4, 0x40, 0x0800000
//Mem2043 = 5, 0x80, 0x1000000
#define MEM_CARD_MAX (5)
#define MEM_CARD_CODE(x) (1<<(x+2))
#define MEM_CARD_SIZE(x) (1<<(x+19))
#define MEM_CARD_BLOCKS(x) ((1<<(x+6))-5)
#endif #endif

21
source/settings/CGameSettings.cpp
View File

@ -217,6 +217,7 @@ bool CGameSettings::Save()
fprintf(f, "DMLJPNPatch:%d; ", GameList[i].DMLJPNPatch); fprintf(f, "DMLJPNPatch:%d; ", GameList[i].DMLJPNPatch);
fprintf(f, "DMLDebug:%d; ", GameList[i].DMLDebug); fprintf(f, "DMLDebug:%d; ", GameList[i].DMLDebug);
fprintf(f, "NINMCEmulation:%d; ", GameList[i].NINMCEmulation); fprintf(f, "NINMCEmulation:%d; ", GameList[i].NINMCEmulation);
fprintf(f, "NINMCSize:%d; ", GameList[i].NINMCSize);
fprintf(f, "NINUSBHID:%d; ", GameList[i].NINUSBHID); fprintf(f, "NINUSBHID:%d; ", GameList[i].NINUSBHID);
fprintf(f, "NINMaxPads:%d; ", GameList[i].NINMaxPads); fprintf(f, "NINMaxPads:%d; ", GameList[i].NINMaxPads);
fprintf(f, "NINOSReport:%d; ", GameList[i].NINOSReport); fprintf(f, "NINOSReport:%d; ", GameList[i].NINOSReport);
@ -229,6 +230,8 @@ bool CGameSettings::Save()
fprintf(f, "DEVOFZeroAX:%d; ", GameList[i].DEVOFZeroAX); fprintf(f, "DEVOFZeroAX:%d; ", GameList[i].DEVOFZeroAX);
fprintf(f, "DEVOTimerFix:%d; ", GameList[i].DEVOTimerFix); fprintf(f, "DEVOTimerFix:%d; ", GameList[i].DEVOTimerFix);
fprintf(f, "DEVODButtons:%d; ", GameList[i].DEVODButtons); fprintf(f, "DEVODButtons:%d; ", GameList[i].DEVODButtons);
fprintf(f, "DEVOCropOverscan:%d; ", GameList[i].DEVOCropOverscan);
fprintf(f, "DEVODiscDelay:%d; ", GameList[i].DEVODiscDelay);
fprintf(f, "PrivateServer:%d; ", GameList[i].PrivateServer); fprintf(f, "PrivateServer:%d; ", GameList[i].PrivateServer);
fprintf(f, "Locked:%d;\n", GameList[i].Locked); fprintf(f, "Locked:%d;\n", GameList[i].Locked);
} }
@ -400,6 +403,11 @@ bool CGameSettings::SetSetting(GameCFG & game, const char *name, const char *val
game.NINMCEmulation = atoi(value); game.NINMCEmulation = atoi(value);
return true; return true;
} }
else if(strcmp(name, "NINMCSize") == 0)
{
game.NINMCSize = atoi(value);
return true;
}
else if(strcmp(name, "NINUSBHID") == 0) else if(strcmp(name, "NINUSBHID") == 0)
{ {
game.NINUSBHID = atoi(value); game.NINUSBHID = atoi(value);
@ -460,6 +468,16 @@ bool CGameSettings::SetSetting(GameCFG & game, const char *name, const char *val
game.DEVODButtons = atoi(value); game.DEVODButtons = atoi(value);
return true; return true;
} }
else if(strcmp(name, "DEVOCropOverscan") == 0)
{
game.DEVOCropOverscan = atoi(value);
return true;
}
else if(strcmp(name, "DEVODiscDelay") == 0)
{
game.DEVODiscDelay = atoi(value);
return true;
}
else if(strcmp(name, "PrivateServer") == 0) else if(strcmp(name, "PrivateServer") == 0)
{ {
game.PrivateServer = atoi(value); game.PrivateServer = atoi(value);
@ -597,6 +615,7 @@ void CGameSettings::SetDefault(GameCFG &game)
game.DMLJPNPatch = INHERIT; game.DMLJPNPatch = INHERIT;
game.DMLDebug = INHERIT; game.DMLDebug = INHERIT;
game.NINMCEmulation = INHERIT; game.NINMCEmulation = INHERIT;
game.NINMCSize = INHERIT;
game.NINUSBHID = INHERIT; game.NINUSBHID = INHERIT;
game.NINMaxPads = INHERIT; game.NINMaxPads = INHERIT;
game.NINOSReport = INHERIT; game.NINOSReport = INHERIT;
@ -609,6 +628,8 @@ void CGameSettings::SetDefault(GameCFG &game)
game.DEVOFZeroAX = INHERIT; game.DEVOFZeroAX = INHERIT;
game.DEVOTimerFix = INHERIT; game.DEVOTimerFix = INHERIT;
game.DEVODButtons = INHERIT; game.DEVODButtons = INHERIT;
game.DEVOCropOverscan = INHERIT;
game.DEVODiscDelay = INHERIT;
game.PrivateServer = INHERIT; game.PrivateServer = INHERIT;
game.Locked = OFF; game.Locked = OFF;
} }

6
source/settings/CGameSettings.h
View File

@ -41,6 +41,7 @@ typedef struct _GameCFG
short DMLJPNPatch; short DMLJPNPatch;
short DMLDebug; short DMLDebug;
short NINMCEmulation; short NINMCEmulation;
short NINMCSize;
short NINUSBHID; short NINUSBHID;
short NINMaxPads; short NINMaxPads;
short NINOSReport; short NINOSReport;
@ -53,6 +54,8 @@ typedef struct _GameCFG
short DEVOFZeroAX; short DEVOFZeroAX;
short DEVOTimerFix; short DEVOTimerFix;
short DEVODButtons; short DEVODButtons;
short DEVOCropOverscan;
short DEVODiscDelay;
short PrivateServer; short PrivateServer;
short Locked; short Locked;
@ -90,6 +93,7 @@ typedef struct _GameCFG
this->DMLJPNPatch = game.DMLJPNPatch; this->DMLJPNPatch = game.DMLJPNPatch;
this->DMLDebug = game.DMLDebug; this->DMLDebug = game.DMLDebug;
this->NINMCEmulation = game.NINMCEmulation; this->NINMCEmulation = game.NINMCEmulation;
this->NINMCSize = game.NINMCSize;
this->NINUSBHID = game.NINUSBHID; this->NINUSBHID = game.NINUSBHID;
this->NINMaxPads = game.NINMaxPads; this->NINMaxPads = game.NINMaxPads;
this->NINOSReport = game.NINOSReport; this->NINOSReport = game.NINOSReport;
@ -102,6 +106,8 @@ typedef struct _GameCFG
this->DEVOFZeroAX = game.DEVOFZeroAX; this->DEVOFZeroAX = game.DEVOFZeroAX;
this->DEVOTimerFix = game.DEVOTimerFix; this->DEVOTimerFix = game.DEVOTimerFix;
this->DEVODButtons = game.DEVODButtons; this->DEVODButtons = game.DEVODButtons;
this->DEVOCropOverscan = game.DEVOCropOverscan;
this->DEVODiscDelay = game.DEVODiscDelay;
this->PrivateServer = game.PrivateServer; this->PrivateServer = game.PrivateServer;
this->Locked = game.Locked; this->Locked = game.Locked;
} }

29
source/settings/CSettings.cpp
View File

@ -78,7 +78,7 @@ void CSettings::SetDefault()
strlcpy(NandEmuChanPath, NandEmuPath, sizeof(NandEmuChanPath)); strlcpy(NandEmuChanPath, NandEmuPath, sizeof(NandEmuChanPath));
strlcpy(GameCubePath, "usb1:/games/", sizeof(GameCubePath)); strlcpy(GameCubePath, "usb1:/games/", sizeof(GameCubePath));
strlcpy(GameCubeSDPath, "sd:/games/", sizeof(GameCubeSDPath)); strlcpy(GameCubeSDPath, "sd:/games/", sizeof(GameCubeSDPath));
strlcpy(CustomBannersURL, "http://dl.dropboxusercontent.com/u/101209384/", sizeof(CustomBannersURL)); strlcpy(CustomBannersURL, "http://copy.com/vRN3HgFVyk9u7YuB/Public/", sizeof(CustomBannersURL));
theme[0] = 0; theme[0] = 0;
language_path[0] = 0; language_path[0] = 0;
ogg_path[0] = 0; ogg_path[0] = 0;
@ -184,6 +184,7 @@ void CSettings::SetDefault()
DMLJPNPatch = OFF; DMLJPNPatch = OFF;
DMLDebug = OFF; DMLDebug = OFF;
NINMCEmulation = ON; NINMCEmulation = ON;
NINMCSize = 2;
NINAutoboot = ON; NINAutoboot = ON;
NINUSBHID = OFF; NINUSBHID = OFF;
NINMaxPads = 1; NINMaxPads = 1;
@ -196,6 +197,8 @@ void CSettings::SetDefault()
DEVOFZeroAX = OFF; DEVOFZeroAX = OFF;
DEVOTimerFix = OFF; DEVOTimerFix = OFF;
DEVODButtons = OFF; DEVODButtons = OFF;
DEVOCropOverscan = OFF;
DEVODiscDelay = OFF;
GCInstallCompressed = OFF; GCInstallCompressed = OFF;
GCInstallAligned = OFF; GCInstallAligned = OFF;
PrivateServer = OFF; PrivateServer = OFF;
@ -427,6 +430,7 @@ bool CSettings::Save()
fprintf(file, "DMLJPNPatch = %d\n", DMLJPNPatch); fprintf(file, "DMLJPNPatch = %d\n", DMLJPNPatch);
fprintf(file, "DMLDebug = %d\n", DMLDebug); fprintf(file, "DMLDebug = %d\n", DMLDebug);
fprintf(file, "NINMCEmulation = %d\n", NINMCEmulation); fprintf(file, "NINMCEmulation = %d\n", NINMCEmulation);
fprintf(file, "NINMCSize = %d\n", NINMCSize);
fprintf(file, "NINAutoboot = %d\n", NINAutoboot); fprintf(file, "NINAutoboot = %d\n", NINAutoboot);
fprintf(file, "NINUSBHID = %d\n", NINUSBHID); fprintf(file, "NINUSBHID = %d\n", NINUSBHID);
fprintf(file, "NINMaxPads = %d\n", NINMaxPads); fprintf(file, "NINMaxPads = %d\n", NINMaxPads);
@ -439,6 +443,8 @@ bool CSettings::Save()
fprintf(file, "DEVOFZeroAX = %d\n", DEVOFZeroAX); fprintf(file, "DEVOFZeroAX = %d\n", DEVOFZeroAX);
fprintf(file, "DEVOTimerFix = %d\n", DEVOTimerFix); fprintf(file, "DEVOTimerFix = %d\n", DEVOTimerFix);
fprintf(file, "DEVODButtons = %d\n", DEVODButtons); fprintf(file, "DEVODButtons = %d\n", DEVODButtons);
fprintf(file, "DEVOCropOverscan = %d\n", DEVOCropOverscan);
fprintf(file, "DEVODiscDelay = %d\n", DEVODiscDelay);
fprintf(file, "DEVOLoaderPath = %s\n", DEVOLoaderPath); fprintf(file, "DEVOLoaderPath = %s\n", DEVOLoaderPath);
fprintf(file, "NINLoaderPath = %s\n", NINLoaderPath); fprintf(file, "NINLoaderPath = %s\n", NINLoaderPath);
fprintf(file, "GCInstallCompressed = %d\n", GCInstallCompressed); fprintf(file, "GCInstallCompressed = %d\n", GCInstallCompressed);
@ -906,6 +912,11 @@ bool CSettings::SetSetting(char *name, char *value)
NINMCEmulation = atoi(value); NINMCEmulation = atoi(value);
return true; return true;
} }
else if (strcmp(name, "NINMCSize") == 0)
{
NINMCSize = atoi(value);
return true;
}
else if (strcmp(name, "NINAutoboot") == 0) else if (strcmp(name, "NINAutoboot") == 0)
{ {
NINAutoboot = atoi(value); NINAutoboot = atoi(value);
@ -966,6 +977,16 @@ bool CSettings::SetSetting(char *name, char *value)
DEVODButtons = atoi(value); DEVODButtons = atoi(value);
return true; return true;
} }
else if (strcmp(name, "DEVOCropOverscan") == 0)
{
DEVOCropOverscan = atoi(value);
return true;
}
else if (strcmp(name, "DEVODiscDelay") == 0)
{
DEVODiscDelay = atoi(value);
return true;
}
else if (strcmp(name, "DEVOLoaderPath") == 0) else if (strcmp(name, "DEVOLoaderPath") == 0)
{ {
strlcpy(DEVOLoaderPath, value, sizeof(DEVOLoaderPath)); strlcpy(DEVOLoaderPath, value, sizeof(DEVOLoaderPath));
@ -1113,7 +1134,11 @@ bool CSettings::SetSetting(char *name, char *value)
} }
else if (strcmp(name, "CustomBannersURL") == 0) else if (strcmp(name, "CustomBannersURL") == 0)
{ {
strlcpy(CustomBannersURL, value, sizeof(CustomBannersURL)); if( strcmp(value, "http://dl.dropbox.com/u/101209384/") == 0 ||
strcmp(value, "http://dl.dropboxusercontent.com/u/101209384/") == 0)
strlcpy(CustomBannersURL, "http://copy.com/vRN3HgFVyk9u7YuB/Public/", sizeof(CustomBannersURL)); // update banner URL
else
strlcpy(CustomBannersURL, value, sizeof(CustomBannersURL));
return true; return true;
} }
else if(strcmp(name, "PrivateServer") == 0) else if(strcmp(name, "PrivateServer") == 0)

3
source/settings/CSettings.h
View File

@ -188,6 +188,7 @@ class CSettings
short DMLJPNPatch; short DMLJPNPatch;
short DMLDebug; short DMLDebug;
short NINMCEmulation; short NINMCEmulation;
short NINMCSize;
short NINAutoboot; short NINAutoboot;
short NINUSBHID; short NINUSBHID;
short NINMaxPads; short NINMaxPads;
@ -200,6 +201,8 @@ class CSettings
short DEVOFZeroAX; short DEVOFZeroAX;
short DEVOTimerFix; short DEVOTimerFix;
short DEVODButtons; short DEVODButtons;
short DEVOCropOverscan;
short DEVODiscDelay;
short GCInstallCompressed; short GCInstallCompressed;
short GCInstallAligned; short GCInstallAligned;
short PrivateServer; short PrivateServer;

10
source/settings/SettingsEnums.h
View File

@ -306,10 +306,20 @@ enum
DEVO_MC_OFF, DEVO_MC_OFF,
DEVO_MC_ON, DEVO_MC_ON,
DEVO_MC_INDIVIDUAL, DEVO_MC_INDIVIDUAL,
// DEVO_MC_NAND,
DEVO_MC_MAX_CHOICE DEVO_MC_MAX_CHOICE
}; };
enum
{
NIN_MC_OFF,
NIN_MC_ON,
NIN_MC_MULTI,
NIN_MC_MAX_CHOICE
};
enum enum
{ {
DML_VIDEO_AUTO, DML_VIDEO_AUTO,

51
source/settings/menus/GCGameLoadSM.cpp
View File

@ -98,6 +98,13 @@ static const char * DEVOMCText[] =
trNOOP( "Individual" ), trNOOP( "Individual" ),
}; };
static const char * NINMCText[] =
{
trNOOP( "OFF" ),
trNOOP( "Individual" ),
trNOOP( "ON" ),
};
static int currentGCmode = 0; static int currentGCmode = 0;
GCGameLoadSM::GCGameLoadSM(struct discHdr *hdr) GCGameLoadSM::GCGameLoadSM(struct discHdr *hdr)
@ -184,6 +191,7 @@ void GCGameLoadSM::SetOptionNames()
Options->SetName(Idx++, "%s", tr( "Force Widescreen" )); Options->SetName(Idx++, "%s", tr( "Force Widescreen" ));
Options->SetName(Idx++, "%s", tr( "Ocarina" )); Options->SetName(Idx++, "%s", tr( "Ocarina" ));
Options->SetName(Idx++, "%s", tr( "Memory Card Emulation" )); Options->SetName(Idx++, "%s", tr( "Memory Card Emulation" ));
Options->SetName(Idx++, "%s", tr( "Memory Card Blocks Size" ));
Options->SetName(Idx++, "%s", tr( "Debug" )); Options->SetName(Idx++, "%s", tr( "Debug" ));
Options->SetName(Idx++, "%s", tr( "USB-HID Controller" )); Options->SetName(Idx++, "%s", tr( "USB-HID Controller" ));
Options->SetName(Idx++, "%s", tr( "GameCube Controller" )); Options->SetName(Idx++, "%s", tr( "GameCube Controller" ));
@ -201,6 +209,8 @@ void GCGameLoadSM::SetOptionNames()
Options->SetName(Idx++, "%s", tr( "F-Zero AX" )); Options->SetName(Idx++, "%s", tr( "F-Zero AX" ));
Options->SetName(Idx++, "%s", tr( "Timer Fix" )); Options->SetName(Idx++, "%s", tr( "Timer Fix" ));
Options->SetName(Idx++, "%s", tr( "D Buttons" )); Options->SetName(Idx++, "%s", tr( "D Buttons" ));
Options->SetName(Idx++, "%s", tr( "Crop Overscan" ));
Options->SetName(Idx++, "%s", tr( "Disc Read Delay" ));
} }
} }
@ -345,7 +355,13 @@ void GCGameLoadSM::SetOptionValues()
if(GameConfig.NINMCEmulation == INHERIT) if(GameConfig.NINMCEmulation == INHERIT)
Options->SetValue(Idx++, tr("Use global")); Options->SetValue(Idx++, tr("Use global"));
else else
Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.NINMCEmulation])); Options->SetValue(Idx++, "%s", tr(NINMCText[GameConfig.NINMCEmulation]));
//! Settings: NIN Memory Card Blocks Size
if(GameConfig.NINMCSize == INHERIT)
Options->SetValue(Idx++, tr("Use global"));
else
Options->SetValue(Idx++, "%d", MEM_CARD_BLOCKS(GameConfig.NINMCSize));
//! Settings: DML + NIN Debug //! Settings: DML + NIN Debug
if(GameConfig.DMLDebug == INHERIT) if(GameConfig.DMLDebug == INHERIT)
@ -432,6 +448,19 @@ void GCGameLoadSM::SetOptionValues()
Options->SetValue(Idx++, tr("Use global")); Options->SetValue(Idx++, tr("Use global"));
else else
Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DEVODButtons])); Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DEVODButtons]));
//! Settings: DEVO Crop Overscan
if(GameConfig.DEVOCropOverscan == INHERIT)
Options->SetValue(Idx++, tr("Use global"));
else
Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DEVOCropOverscan]));
//! Settings: DEVO Disc Read Delay
if(GameConfig.DEVODiscDelay == INHERIT)
Options->SetValue(Idx++, tr("Use global"));
else
Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DEVODiscDelay]));
} }
} }
@ -605,7 +634,13 @@ int GCGameLoadSM::GetMenuInternal()
//! Settings: NIN Memory Card Emulation //! Settings: NIN Memory Card Emulation
else if (currentGCmode == GC_MODE_NINTENDONT && ret == ++Idx) else if (currentGCmode == GC_MODE_NINTENDONT && ret == ++Idx)
{ {
if (++GameConfig.NINMCEmulation >= MAX_ON_OFF) GameConfig.NINMCEmulation = INHERIT; if (++GameConfig.NINMCEmulation >= NIN_MC_MAX_CHOICE) GameConfig.NINMCEmulation = INHERIT;
}
//! Settings: NIN Memory Card Blocks Size
else if (currentGCmode == GC_MODE_NINTENDONT && ret == ++Idx)
{
if (++GameConfig.NINMCSize >= 6) GameConfig.NINMCSize = INHERIT;
} }
//! Settings: NIN Debug //! Settings: NIN Debug
@ -714,6 +749,18 @@ int GCGameLoadSM::GetMenuInternal()
if (++GameConfig.DEVODButtons >= MAX_ON_OFF) GameConfig.DEVODButtons = INHERIT; if (++GameConfig.DEVODButtons >= MAX_ON_OFF) GameConfig.DEVODButtons = INHERIT;
} }
//!Settings: DEVO Crop Overscan
else if (currentGCmode == GC_MODE_DEVOLUTION && ret == ++Idx)
{
if (++GameConfig.DEVOCropOverscan >= MAX_ON_OFF) GameConfig.DEVOCropOverscan = INHERIT;
}
//!Settings: DEVO Disc Read Delay
else if (currentGCmode == GC_MODE_DEVOLUTION && ret == ++Idx)
{
if (++GameConfig.DEVODiscDelay >= MAX_ON_OFF) GameConfig.DEVODiscDelay = INHERIT;
}
SetOptionValues(); SetOptionValues();
return MENU_NONE; return MENU_NONE;

43
source/settings/menus/LoaderSettings.cpp
View File

@ -163,6 +163,13 @@ static const char * DEVOMCText[] =
trNOOP( "Individual" ), trNOOP( "Individual" ),
}; };
static const char * NINMCText[] =
{
trNOOP( "OFF" ),
trNOOP( "Individual" ),
trNOOP( "ON" ),
};
static const char * PrivServText[] = static const char * PrivServText[] =
{ {
trNOOP( "OFF" ), trNOOP( "OFF" ),
@ -212,6 +219,7 @@ LoaderSettings::LoaderSettings()
Options->SetName(Idx++, "%s", tr( "Japanese Patch" )); Options->SetName(Idx++, "%s", tr( "Japanese Patch" ));
Options->SetName(Idx++, "%s", tr( "--== Nintendont" )); Options->SetName(Idx++, "%s", tr( "--== Nintendont" ));
Options->SetName(Idx++, "%s", tr( "Memory Card Emulation" )); Options->SetName(Idx++, "%s", tr( "Memory Card Emulation" ));
Options->SetName(Idx++, "%s", tr( "Memory Card Blocks Size" ));
Options->SetName(Idx++, "%s", tr( "Auto Boot" )); Options->SetName(Idx++, "%s", tr( "Auto Boot" ));
Options->SetName(Idx++, "%s", tr( "USB-HID Controller" )); Options->SetName(Idx++, "%s", tr( "USB-HID Controller" ));
Options->SetName(Idx++, "%s", tr( "GameCube Controller" )); Options->SetName(Idx++, "%s", tr( "GameCube Controller" ));
@ -225,6 +233,8 @@ LoaderSettings::LoaderSettings()
Options->SetName(Idx++, "%s", tr( "F-Zero AX" )); Options->SetName(Idx++, "%s", tr( "F-Zero AX" ));
Options->SetName(Idx++, "%s", tr( "Timer Fix" )); Options->SetName(Idx++, "%s", tr( "Timer Fix" ));
Options->SetName(Idx++, "%s", tr( "D Buttons" )); Options->SetName(Idx++, "%s", tr( "D Buttons" ));
Options->SetName(Idx++, "%s", tr( "Crop Overscan" ));
Options->SetName(Idx++, "%s", tr( "Disc Read Delay" ));
SetOptionValues(); SetOptionValues();
@ -384,7 +394,10 @@ void LoaderSettings::SetOptionValues()
Options->SetValue(Idx++, "==-- "); Options->SetValue(Idx++, "==-- ");
//! Settings: TITLE - NIN Memory Card Emulation //! Settings: TITLE - NIN Memory Card Emulation
Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINMCEmulation])); Options->SetValue(Idx++, "%s", tr(NINMCText[Settings.NINMCEmulation]));
//! Settings: TITLE - NIN Memory Card Blocks Size
Options->SetValue(Idx++, "%d", MEM_CARD_BLOCKS(Settings.NINMCSize));
//! Settings: TITLE - NIN Auto Boot //! Settings: TITLE - NIN Auto Boot
Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINAutoboot])); Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINAutoboot]));
@ -425,6 +438,12 @@ void LoaderSettings::SetOptionValues()
//! Settings: DEVO Direct Button Mapping //! Settings: DEVO Direct Button Mapping
Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DEVODButtons])); Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DEVODButtons]));
//! Settings: DEVO Crop Overscan
Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DEVOCropOverscan]));
//! Settings: DEVO Disc Read Delay
Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DEVODiscDelay]));
} }
int LoaderSettings::GetMenuInternal() int LoaderSettings::GetMenuInternal()
@ -706,7 +725,13 @@ int LoaderSettings::GetMenuInternal()
//! Settings: NIN Memory Card Emulation //! Settings: NIN Memory Card Emulation
else if (ret == ++Idx) else if (ret == ++Idx)
{ {
if (++Settings.NINMCEmulation >= MAX_ON_OFF) Settings.NINMCEmulation = 0; if (++Settings.NINMCEmulation >= NIN_MC_MAX_CHOICE) Settings.NINMCEmulation = 0;
}
//! Settings: NIN Memory Card Blocks Size
else if (ret == ++Idx)
{
if (++Settings.NINMCSize >= 6) Settings.NINMCSize = 0;
} }
//! Settings: NIN Auto Boot //! Settings: NIN Auto Boot
@ -781,12 +806,24 @@ int LoaderSettings::GetMenuInternal()
if (++Settings.DEVOTimerFix >= MAX_ON_OFF) Settings.DEVOTimerFix = 0; if (++Settings.DEVOTimerFix >= MAX_ON_OFF) Settings.DEVOTimerFix = 0;
} }
//! Settings: DEVO Direct Button Mapping //! Settings: DEVO Direct Button Mapping
else if (ret == ++Idx) else if (ret == ++Idx)
{ {
if (++Settings.DEVODButtons >= MAX_ON_OFF) Settings.DEVODButtons = 0; if (++Settings.DEVODButtons >= MAX_ON_OFF) Settings.DEVODButtons = 0;
} }
//! Settings: DEVO Crop Overscan
else if (ret == ++Idx)
{
if (++Settings.DEVOCropOverscan >= MAX_ON_OFF) Settings.DEVOCropOverscan = 0;
}
//! Settings: DEVO Disc Read Delay
else if (ret == ++Idx)
{
if (++Settings.DEVODiscDelay >= MAX_ON_OFF) Settings.DEVODiscDelay = 0;
}
SetOptionValues(); SetOptionValues();
return MENU_NONE; return MENU_NONE;

33
source/usbloader/GameBooter.cpp
View File

@ -709,6 +709,8 @@ int GameBooter::BootDevolution(struct discHdr *gameHdr)
u8 devoFZeroAXChoice = game_cfg->DEVOFZeroAX == INHERIT ? Settings.DEVOFZeroAX : game_cfg->DEVOFZeroAX; u8 devoFZeroAXChoice = game_cfg->DEVOFZeroAX == INHERIT ? Settings.DEVOFZeroAX : game_cfg->DEVOFZeroAX;
u8 devoTimerFixChoice = game_cfg->DEVOTimerFix == INHERIT ? Settings.DEVOTimerFix : game_cfg->DEVOTimerFix; u8 devoTimerFixChoice = game_cfg->DEVOTimerFix == INHERIT ? Settings.DEVOTimerFix : game_cfg->DEVOTimerFix;
u8 devoDButtonsChoice = game_cfg->DEVODButtons == INHERIT ? Settings.DEVODButtons : game_cfg->DEVODButtons; u8 devoDButtonsChoice = game_cfg->DEVODButtons == INHERIT ? Settings.DEVODButtons : game_cfg->DEVODButtons;
u8 devoCropOverscanChoice = game_cfg->DEVOCropOverscan == INHERIT ? Settings.DEVOCropOverscan : game_cfg->DEVOCropOverscan;
u8 devoDiscDelayChoice = game_cfg->DEVODiscDelay == INHERIT ? Settings.DEVODiscDelay : game_cfg->DEVODiscDelay;
if(gameHdr->type == TYPE_GAME_GC_DISC) if(gameHdr->type == TYPE_GAME_GC_DISC)
{ {
@ -830,6 +832,11 @@ int GameBooter::BootDevolution(struct discHdr *gameHdr)
devo_config->options |= DEVO_CFG_TIMER_FIX; devo_config->options |= DEVO_CFG_TIMER_FIX;
if(devoDButtonsChoice && DEVO_version >= 200) if(devoDButtonsChoice && DEVO_version >= 200)
devo_config->options |= DEVO_CFG_D_BUTTONS; devo_config->options |= DEVO_CFG_D_BUTTONS;
if (devoCropOverscanChoice && DEVO_version >= 234)
devo_config->options |= DEVO_CFG_CROP_OVERSCAN;
if (devoDiscDelayChoice && DEVO_version >= 234)
devo_config->options |= DEVO_CFG_DISC_DELAY;
// devo_config->options |= DEVO_CFG_PLAYLOG; // Playlog setting managed by USBLoaderGX features menu
// check memory card // check memory card
if(devoMCEmulation == DEVO_MC_OFF) if(devoMCEmulation == DEVO_MC_OFF)
@ -928,6 +935,7 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
u8 ninProgressivePatch = game_cfg->DMLProgPatch == INHERIT ? Settings.DMLProgPatch : game_cfg->DMLProgPatch; u8 ninProgressivePatch = game_cfg->DMLProgPatch == INHERIT ? Settings.DMLProgPatch : game_cfg->DMLProgPatch;
u8 ninWidescreenChoice = game_cfg->DMLWidescreen == INHERIT ? Settings.DMLWidescreen : game_cfg->DMLWidescreen; u8 ninWidescreenChoice = game_cfg->DMLWidescreen == INHERIT ? Settings.DMLWidescreen : game_cfg->DMLWidescreen;
u8 ninMCEmulationChoice = game_cfg->NINMCEmulation == INHERIT ? Settings.NINMCEmulation : game_cfg->NINMCEmulation; u8 ninMCEmulationChoice = game_cfg->NINMCEmulation == INHERIT ? Settings.NINMCEmulation : game_cfg->NINMCEmulation;
u8 ninMCSizeChoice = game_cfg->NINMCSize == INHERIT ? Settings.NINMCSize : game_cfg->NINMCSize;
u8 ninDebugChoice = game_cfg->DMLDebug == INHERIT ? Settings.DMLDebug : game_cfg->DMLDebug; u8 ninDebugChoice = game_cfg->DMLDebug == INHERIT ? Settings.DMLDebug : game_cfg->DMLDebug;
u8 ninAutobootChoice = Settings.NINAutoboot; u8 ninAutobootChoice = Settings.NINAutoboot;
u8 ninUSBHIDChoice = game_cfg->NINUSBHID == INHERIT ? Settings.NINUSBHID : game_cfg->NINUSBHID; u8 ninUSBHIDChoice = game_cfg->NINUSBHID == INHERIT ? Settings.NINUSBHID : game_cfg->NINUSBHID;
@ -1052,11 +1060,21 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
return 0; return 0;
} }
} }
// v1.01 - v1.134
strptime("Aug 5 2014 22:38:21", "%b %d %Y %H:%M:%S", &time); // v1.135 - NIN_CFG_VERSION = 3
if(NINLoaderTime < mktime(&time) && NIN_cfg_version != 1)
{
gprintf("Nintendont v1.01 - v1.134 detected. Using CFG version 0x00000002\n");
NIN_cfg_version = 2;
// no need to fake NIN_CFG struct size, the size is checked in nintendont only since v1.143
}
found = true; found = true;
break; break;
} }
} }
if(found) if(found && ninAutobootChoice)
{ {
for(u32 i = 0; i < filesize; i += 0x10) for(u32 i = 0; i < filesize; i += 0x10)
{ {
@ -1257,6 +1275,8 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
nin_config->Config |= NIN_CFG_LED; // r45+ nin_config->Config |= NIN_CFG_LED; // r45+
if(ninLogChoice) if(ninLogChoice)
nin_config->Config |= NIN_CFG_LOG; // v1.109+ nin_config->Config |= NIN_CFG_LOG; // v1.109+
if(ninMCEmulationChoice == NIN_MC_MULTI)
nin_config->Config |= NIN_CFG_MC_MULTI; // v1.135+
// Max Pads - Auto disabled by nintendont on vWii // Max Pads - Auto disabled by nintendont on vWii
nin_config->MaxPads = (!IosLoader::isWiiU() && !ninUSBHIDChoice && ninMaxPadsChoice == 0) ? 4 : ninMaxPadsChoice; // NIN_CFG_VERSION 2 r42 nin_config->MaxPads = (!IosLoader::isWiiU() && !ninUSBHIDChoice && ninMaxPadsChoice == 0) ? 4 : ninMaxPadsChoice; // NIN_CFG_VERSION 2 r42
@ -1268,6 +1288,10 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
memcpy((u8 *)Disc_ID, gameHdr->id, 6); memcpy((u8 *)Disc_ID, gameHdr->id, 6);
DCFlushRange((u8 *)Disc_ID, 6); DCFlushRange((u8 *)Disc_ID, 6);
// Memory Card Emulation Blocks size
nin_config->MemCardBlocks = (ninMCEmulationChoice == NIN_MC_MULTI ? 5 : ninMCSizeChoice); // NIN_CFG_VERSION 3 v1.135 - Set maximum size if using single card for all games
// Setup Video Mode // Setup Video Mode
if(ninVideoChoice == DML_VIDEO_NONE) // No video mode if(ninVideoChoice == DML_VIDEO_NONE) // No video mode
{ {
@ -1311,6 +1335,13 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
} }
gprintf("NIN: Language 0x%08x \n", nin_config->Language); gprintf("NIN: Language 0x%08x \n", nin_config->Language);
// Game specific settings
// Metal Gear Solid: The Twin Snakes
if(memcmp("GGS", gameHdr->id, 3) == 0 && nin_config->MaxPads < 2 && !IosLoader::isWiiU())
nin_config->MaxPads = 2; // 2 controller ports required
// Delete existing nincfg.bin files // Delete existing nincfg.bin files
RemoveFile("sd:/nincfg.bin"); RemoveFile("sd:/nincfg.bin");
RemoveFile("usb1:/nincfg.bin"); RemoveFile("usb1:/nincfg.bin");

12
source/usbloader/disc.c
View File

@ -72,8 +72,16 @@ void Disc_SelectVMode(u8 videoselected, bool devolution, u32 *dml_VideoMode, u32
{ {
if (diskid[3] =='E' || diskid[3] =='J') if (diskid[3] =='E' || diskid[3] =='J')
{ {
rmode_reg = VI_NTSC; if (CONF_GetVideo() == CONF_VIDEO_PAL)
rmode = &TVNtsc480IntDf; {
rmode_reg = VI_EURGB60;
rmode = &TVEurgb60Hz480IntDf;
}
else
{
rmode_reg = VI_NTSC;
rmode = &TVNtsc480IntDf;
}
} }
else else
{ {