added a function to auto select the alt dol based on a list. there are only a few on the list right now.

changed the xml url again to allow up to 500 games to be called for.

changed the magic 0x address in the makefile to hopefully fix some alt dol stuff.
This commit is contained in:
giantpune 2009-07-16 06:37:33 +00:00
parent 32fb5f2aaa
commit 9c8243aec2
23 changed files with 269 additions and 55 deletions

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Alle USB Loader GX's funktioner er låst op."
@ -255,6 +258,9 @@ msgstr "Vil du formattere?:"
msgid "Do you want to retry for 30 secs?"
msgstr "Vil du prøve igen?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr ""
msgid "Path of titles.txt changed."
msgstr ""
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr ""

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Alle functies zijn vrijgegeven."
@ -255,6 +258,9 @@ msgstr "Wil je formatteren:"
msgid "Do you want to retry for 30 secs?"
msgstr "Wil je 30 sec. lang opnieuw proberen?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr "Locatie dol"
@ -597,6 +603,9 @@ msgstr "Locatie titles.txt wijzigen"
msgid "Path of titles.txt changed."
msgstr "Locatie titles.txt gewijzigd."
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "Gespeeld"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr ""
@ -255,6 +258,9 @@ msgstr ""
msgid "Do you want to retry for 30 secs?"
msgstr ""
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr ""
msgid "Path of titles.txt changed."
msgstr ""
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr ""

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Kaikki asetukset on nyt käytettävissä."
@ -255,6 +258,9 @@ msgstr "Haluatko formatoida:"
msgid "Do you want to retry for 30 secs?"
msgstr "Haluatko odottaa 30 sekuntia?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr ""
msgid "Path of titles.txt changed."
msgstr ""
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr ""

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Toutes les fonctionnalités sont déverrouillées."
@ -255,6 +258,9 @@ msgstr "Voulez-vous formater ?"
msgid "Do you want to retry for 30 secs?"
msgstr "Réessayer pendant 30 sec. ?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr "Localisation de titles.txt"
msgid "Path of titles.txt changed."
msgstr "Localisation de titles.txt modifié"
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "Utilisation"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Alle Funktionen des USB Loader GX sind freigeschaltet."
@ -255,6 +258,9 @@ msgstr "Möchten sie formatieren:"
msgid "Do you want to retry for 30 secs?"
msgstr "In 30 sek erneut versuchen?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr "Pfad zur titles.txt ändern"
msgid "Path of titles.txt changed."
msgstr "Pfad zur titles.txt geändert."
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "Gespielt"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Tutte le funzioni di USB Loader GX sono sbloccate."
@ -255,6 +258,9 @@ msgstr "Vuoi Formattare:"
msgid "Do you want to retry for 30 secs?"
msgstr "Vuoi Riprovare per 30 sec?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr "Percorso DOL"
@ -597,6 +603,9 @@ msgstr "Modifica percorso per titles.txt"
msgid "Path of titles.txt changed."
msgstr "Percorso per titles.txt modificato."
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "Giocati"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "全ての機能がアンロックされました"
@ -255,6 +258,9 @@ msgstr "フォーマットしますか:"
msgid "Do you want to retry for 30 secs?"
msgstr "再実行しますか?(30秒)"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr "titles.txtのPath変更"
msgid "Path of titles.txt changed."
msgstr "titles.txtのPathを変更しました"
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "プレイ時間"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "USB로더 GX 기능 잠금 해제."
@ -255,6 +258,9 @@ msgstr "포맷하겠습니까:"
msgid "Do you want to retry for 30 secs?"
msgstr "30초간 재시도 할까요?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr ""
msgid "Path of titles.txt changed."
msgstr ""
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr ""

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Alle funksjonene til USB Loader GX er opplåst."
@ -255,6 +258,9 @@ msgstr "Vil du formatere:"
msgid "Do you want to retry for 30 secs?"
msgstr "Vil du fortsette å prøve i 30 sekunder?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr "Endre titles.txt sti"
msgid "Path of titles.txt changed."
msgstr "Titles.txt sti endret."
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "Ganger spilt"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "As configurações do USB Loader GX foram desbloqueadas."
@ -255,6 +258,9 @@ msgstr "Deseja formatar:"
msgid "Do you want to retry for 30 secs?"
msgstr "Deseja tentar novamente em 30s?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr "Alterar local titles.txt"
msgid "Path of titles.txt changed."
msgstr "Local titles.txt alterado"
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "Jogado"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "As configurações estão desbloqueadas."
@ -255,6 +258,9 @@ msgstr "Deseja FORMATAR:"
msgid "Do you want to retry for 30 secs?"
msgstr "Deseja tentar novamente dentro de 30 segs?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr "Pasta DOL"
@ -597,6 +603,9 @@ msgstr "Alterar pasta do titles.txt"
msgid "Path of titles.txt changed."
msgstr "Pasta do ficheiro titles.txt alterada."
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "Vezes jogadas"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Все функции USB Loader GX разблокированы."
@ -255,6 +258,9 @@ msgstr "Вы хотите отформатировать:"
msgid "Do you want to retry for 30 secs?"
msgstr "Хотите попробовать еще раз на 30 секунд?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr "изменить путь к titles.txt"
msgid "Path of titles.txt changed."
msgstr "путь к titles.txt изменён"
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "Воспроизводится"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "USB Loader GX 功能已解锁."
@ -255,6 +258,9 @@ msgstr "是否格式化:"
msgid "Do you want to retry for 30 secs?"
msgstr "是否等待30秒重试?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr "变更 titles.txt 存放路径"
msgid "Path of titles.txt changed."
msgstr "titles.txt 路径已变更"
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr ""

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Todas las características del USB Loader GX desbloqueadas."
@ -255,6 +258,9 @@ msgstr "Quieres formatear:"
msgid "Do you want to retry for 30 secs?"
msgstr "¿Quieres reintentar por 30 segs.?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr "Ruta Dol"
@ -597,6 +603,9 @@ msgstr "Cambio ruta titles.txt"
msgid "Path of titles.txt changed."
msgstr "Ruta a titles.txt cambiada."
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr "Jugado"

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "Alla funktioner i USB Loader GX är upplåsta."
@ -255,6 +258,9 @@ msgstr "Vill du formatera:"
msgid "Do you want to retry for 30 secs?"
msgstr "Vill du försöka igen i 30 sekunder?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr ""
msgid "Path of titles.txt changed."
msgstr ""
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr ""

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "USB Loader GX 功能已解鎖."
@ -255,6 +258,9 @@ msgstr "是否格式化:"
msgid "Do you want to retry for 30 secs?"
msgstr "是否等待30秒重試?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr "變更 Title 檔案路徑"
msgid "Path of titles.txt changed."
msgstr "Title 檔案路徑已變更"
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr ""

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-15 19:18+0200\n"
"POT-Creation-Date: 2009-07-15 23:05-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -48,6 +48,9 @@ msgstr ""
msgid ">> Reading WAD data..."
msgstr ""
msgid "AUTO"
msgstr ""
msgid "All the features of USB Loader GX are unlocked."
msgstr "USB Loader GX'in tüm özellikleri kilitli."
@ -255,6 +258,9 @@ msgstr "Formatlamak istiyor musunuz:"
msgid "Do you want to retry for 30 secs?"
msgstr "30 saniye sonra denemek ister misiniz?"
msgid "Do you want to use the alt dol that is known to be correct?"
msgstr ""
msgid "Dol Path"
msgstr ""
@ -597,6 +603,9 @@ msgstr ""
msgid "Path of titles.txt changed."
msgstr ""
msgid "Pick from a list"
msgstr ""
msgid "Play Count"
msgstr ""

View File

@ -29,7 +29,7 @@ SVNDEV := -D'SVN_REV="$(shell svnversion -n ..)"'
CFLAGS = -g -O2 -save-temps -Wall $(SVNDEV) $(MACHDEP) $(INCLUDE)
CXXFLAGS = -Xassembler -aln=$@.lst $(CFLAGS)
LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80a00100
LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80c00000
#---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project

View File

@ -35,44 +35,48 @@ int DiscBrowse(struct discHdr * header)
int ret, choice;
u64 offset;
ret = Disc_SetUSB(header->id);
if(ret < 0) {
WindowPrompt(tr("ERROR:"), tr("Could not set USB."), tr("OK"));
return ret;
}
ret = Disc_Open();
ret = Disc_Open();
if(ret < 0) {
WindowPrompt(tr("ERROR:"), tr("Could not open disc."), tr("OK"));
return ret;
}
ret = __Disc_FindPartition(&offset);
if (ret < 0) {
WindowPrompt(tr("ERROR:"), tr("Could not find a WBFS partition."), tr("OK"));
return ret;
}
ret = WDVD_OpenPartition(offset);
ret = WDVD_OpenPartition(offset);
if (ret < 0) {
WindowPrompt(tr("ERROR:"), tr("Could not open WBFS partition"), tr("OK"));
return ret;
}
int *buffer = (int*)memalign(32, 0x20);
if (buffer == NULL)
{
WindowPrompt(tr("ERROR:"), tr("Not enough free memory."), tr("OK"));
return -1;
}
ret = WDVD_Read(buffer, 0x20, 0x420);
if (ret < 0) {
WindowPrompt(tr("ERROR:"), tr("Could not read the disc."), tr("OK"));
return ret;
}
void *fstbuffer = memalign(32, buffer[2]*4);
FST_ENTRY *fst = (FST_ENTRY *)fstbuffer;
@ -82,7 +86,7 @@ int DiscBrowse(struct discHdr * header)
free(buffer);
return -1;
}
ret = WDVD_Read(fstbuffer, buffer[2]*4, buffer[1]*4);
if (ret < 0) {
@ -91,19 +95,19 @@ int DiscBrowse(struct discHdr * header)
free(fstbuffer);
return ret;
}
free(buffer);
WDVD_Reset();
//Disc_SetUSB(NULL);
WDVD_ClosePartition();
u32 discfilecount = fst[0].filelen;
u32 dolfilecount = 0;
//int offsetselect[20];
customOptionList options3(discfilecount);
for (u32 i = 0; i < discfilecount; i++) {
//don't add files that aren't .dol to the list
@ -115,10 +119,12 @@ int DiscBrowse(struct discHdr * header)
{
options3.SetName(i, "%i", i);
options3.SetValue(i, fstfiles(fst, i));
//options3.SetName(i, fstfiles(fst, i));
dolfilecount++;
}
dolfilecount++;
}
if(dolfilecount <= 0) {
WindowPrompt(tr("ERROR"), tr("No dol file found on disc."), tr("OK"));
free(fstbuffer);
@ -169,11 +175,11 @@ int DiscBrowse(struct discHdr * header)
if(dolfilecount > 9)
scrollbaron = 1;
GuiCustomOptionBrowser optionBrowser3(396, 280, &options3, CFG.theme_path, "bg_options_gamesettings.png", bg_options_settings_png, scrollbaron, 200);
GuiCustomOptionBrowser optionBrowser3(396, 280, &options3, CFG.theme_path, "bg_options_gamesettings.png", bg_options_settings_png, dolfilecount>9?1:0, 200);
optionBrowser3.SetPosition(0, 90);
optionBrowser3.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
HaltGui();
HaltGui();
GuiWindow w(screenwidth, screenheight);
w.Append(&settingsbackgroundbtn);
w.Append(&titleTxt);
@ -183,7 +189,7 @@ int DiscBrowse(struct discHdr * header)
mainWindow->Append(&w);
ResumeGui();
while(!exit)
{
VIDEO_WaitVSync();
@ -210,8 +216,8 @@ int DiscBrowse(struct discHdr * header)
if (cancelBtn.GetState() == STATE_CLICKED)
{
exit = true;
ret = -1;
break;
ret = 696969;
//break;
}
}
@ -224,3 +230,21 @@ int DiscBrowse(struct discHdr * header)
return ret;
}
int autoSelectDol(const char *id)
{
//these are the game IDs without the 4th character
// if it turns out that the offset is different for different regions
// the 4th char can be added
if (strcmp(id,"RHD8P") == 0) return 149;
if (strcmp(id,"RSX69") == 0) return 337;
if (strcmp(id,"RED41") == 0) return 1957;
if (strcmp(id,"RM269") == 0) return 492;
if (strcmp(id,"RKM5D") == 0) return 290;
if (strcmp(id,"RJ864") == 0) return 8;
//if (strcmp(id,"") == 0) return ; //blank line for more dols
return -1;
}

View File

@ -9,5 +9,6 @@
#define _DISCBROWSER_H_
int DiscBrowse(struct discHdr * headerc);
int autoSelectDol(const char *id);
#endif

View File

@ -1931,6 +1931,9 @@ ProgressDownloadWindow(int choice2)
case CONF_LANG_DUTCH:
sprintf(sysLanguage, "NL");
break;
/* case CONF_LANG_PORTUGUESE:
sprintf(sysLanguage, "PO");
break;*/
case CONF_LANG_SIMP_CHINESE:
sprintf(sysLanguage, "EN"); // default to EN for chinese
break;
@ -1938,7 +1941,7 @@ ProgressDownloadWindow(int choice2)
sprintf(sysLanguage, "EN"); // default to EN for chinese
break;
case CONF_LANG_KOREAN:
sprintf(sysLanguage, "NL");
sprintf(sysLanguage, "KO");
break;
}
@ -2363,17 +2366,18 @@ int ProgressUpdateWindow()
//make the URL to get XML based on our games
char XMLurl[2010];
char XMLurl[2032];
char filename[10];
strncat (XMLurl, "http://wiitdb.com/wiitdb.zip?ID=", 32);
unsigned int i;
for (i = 0; i < gameCnt ; i++)
{
struct discHdr* header = &gameList[i];
if (i<393){
snprintf (filename,sizeof(filename),"%c%c%c%c", header->id[0], header->id[1], header->id[2], header->id[3]);
strncat (XMLurl, filename, 4);
if ((i!=gameCnt-1)&&(i<392))
if (i<500){
snprintf (filename,sizeof(filename),"%c%c%c", header->id[1], header->id[2], header->id[3]);
strncat (XMLurl, filename,3 );
if ((i!=gameCnt-1)&&(i<500))
strncat (XMLurl, ",",1);
}
}
@ -2618,20 +2622,20 @@ int ProgressUpdateWindow()
//make the URL to get XML based on our games
char XMLurl[2010];
char XMLurl[2032];
char filename[10];
strncat (XMLurl, "http://wiitdb.com/wiitdb.zip?ID=", 32);
unsigned int i;
for (i = 0; i < gameCnt ; i++)
{
struct discHdr* header = &gameList[i];
if (i<393){
snprintf (filename,sizeof(filename),"%c%c%c%c", header->id[0], header->id[1], header->id[2], header->id[3]);
strncat (XMLurl, filename, 4);
if ((i!=gameCnt-1)&&(i<392))
if (i<500){
snprintf (filename,sizeof(filename),"%c%c%c", header->id[1], header->id[2], header->id[3]);
strncat (XMLurl, filename,3 );
if ((i!=gameCnt-1)&&(i<500))
strncat (XMLurl, ",",1);
}
}

View File

@ -1976,9 +1976,32 @@ int GameSettings(struct discHdr * header)
break;
case 9:
if(alternatedol == 2) {
int res = DiscBrowse(header);
if(res >= 0)
alternatedoloffset = res;
char filename[10];
snprintf(filename,sizeof(filename),"%c%c%c%c%c",header->id[0], header->id[1], header->id[2],
header->id[4], header->id[5]); //id without 4th character
int dolchoice =0;
//check to see if we already know the offset of the correct dol
int autodol = autoSelectDol(filename);
//if we do know that offset ask if they want to use it
if (autodol>0){
dolchoice = WindowPrompt(0,tr("Do you want to use the alt dol that is known to be correct?"),tr("Yes"),tr("Pick from a list"));
if (dolchoice==1)
{
alternatedoloffset = autodol;
snprintf(alternatedname, sizeof(alternatedname), "%s <%i>", tr("AUTO"),autodol);
}
else {//they want to search for the correct dol themselves
int res = DiscBrowse(header);
if((res >= 0)&&(res !=696969))//if res==6969696 they pressed the back button
alternatedoloffset = res;
}
}
else {
int res = DiscBrowse(header);
if((res >= 0)&&(res !=696969))
alternatedoloffset = res;
}
}
break;
case 10: