diff --git a/.gitignore b/.gitignore index 55b77d7a..8eb60bbc 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,10 @@ CodeDB *.suo *.old +### NetBeans ### +nbproject* + + ### VSLinux ### VSLinux/obj VSLinux/bin diff --git a/src/include/options.h b/src/include/options.h index 40e3892d..e680b8b6 100644 --- a/src/include/options.h +++ b/src/include/options.h @@ -101,7 +101,15 @@ struct joypad_map_layout { int dpad_up_action = 0; int dpad_down_action = 0; int lstick_select_action = 0; + int lstick_left_action = 0; + int lstick_right_action = 0; + int lstick_up_action = 0; + int lstick_down_action = 0; int rstick_select_action = 0; + int rstick_left_action = 0; + int rstick_right_action = 0; + int rstick_up_action = 0; + int rstick_down_action = 0; }; #endif @@ -853,6 +861,9 @@ struct uae_prefs { bool use_retroarch_menu; bool use_retroarch_reset; bool use_retroarch_statebuttons; + + TCHAR whdload_path[MAX_DPATH]; + TCHAR whdload_file[MAX_DPATH]; #endif /* ANDROID */ @@ -980,6 +991,8 @@ extern void cfgfile_compatibility_rtg(struct uae_prefs *p); extern void whdload_auto_prefs (struct uae_prefs *p, char* filename); +extern void cd_auto_prefs (struct uae_prefs *p, char* filename); +extern void symlink_roms(struct uae_prefs *p); extern void check_prefs_changed_custom (void); diff --git a/src/main.cpp b/src/main.cpp index f02d44fa..e0c39fab 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -523,6 +523,7 @@ static void parse_cmdline(int argc, TCHAR **argv) xfree(txt); loaded = true; } + // for backwards compatibility only - WHDLoading else if (_tcsncmp(argv[i], _T("-autowhdload="), 13) == 0) { const auto txt = parsetextpath(argv[i] + 13); whdload_auto_prefs(&currprefs, txt); @@ -530,6 +531,37 @@ static void parse_cmdline(int argc, TCHAR **argv) firstconfig = false; loaded = true; } + // for backwards compatibility only - CDLoading + else if (_tcsncmp(argv[i], _T("-autocd="), 8) == 0) { + const auto txt = parsetextpath(argv[i] + 8); + cd_auto_prefs(&currprefs, txt); + xfree(txt); + firstconfig = false; + loaded = true; + } + + // autoload .... .cue / .lha + else if ((_tcsncmp(argv[i], _T("-autoload="), 10) == 0)) + { + const auto txt = parsetextpath(argv[i] + 10); + + //const auto txt2 = *GetExtension (txt); // Extract the extension from the string (incl '.') + +// if (_tcsncmp(_T(txt2), _T("lha"),3) == 0) +// { +// printf("WHDLOAD... %s\n", txt); +// whdload_auto_prefs(&currprefs, txt); +// } +// else if (_tcsncmp(txt2, _T(".cue"),3) == 0) +// { +// printf("CDTV/CD32... %s\n", txt); + cd_auto_prefs(&currprefs, txt); +// } +// else +// { +// printf("Cant find extension ... %s\n", txt); +// } + } else if (_tcscmp(argv[i], _T("-f")) == 0) { /* Check for new-style "-f xxx" argument, where xxx is config-file */ if (i + 1 == argc) { diff --git a/src/osdep/amiberry_gui.cpp b/src/osdep/amiberry_gui.cpp index f1a95093..7cc3860a 100644 --- a/src/osdep/amiberry_gui.cpp +++ b/src/osdep/amiberry_gui.cpp @@ -252,6 +252,10 @@ static void scan_rom(char *path) zfile_zopen(path, scan_rom_2, 0); } +void SymlinkROMs() +{ + symlink_roms(&changed_prefs); +} void RescanROMs() { diff --git a/src/osdep/amiberry_whdbooter.cpp b/src/osdep/amiberry_whdbooter.cpp index b6bfd091..45085d63 100644 --- a/src/osdep/amiberry_whdbooter.cpp +++ b/src/osdep/amiberry_whdbooter.cpp @@ -34,6 +34,7 @@ extern char currentDir[MAX_DPATH]; extern char last_loaded_config[MAX_DPATH]; #include /// Horace added +#include struct game_options { @@ -78,6 +79,7 @@ struct host_options TCHAR frameskip[256] = "nul\0"; TCHAR aspect_ratio[256] = "nul\0"; TCHAR line_double[256] = "nul\0"; + TCHAR fixed_height[256] = "nul\0"; }; static xmlNode* get_node(xmlNode* node, const char* name) @@ -181,6 +183,9 @@ struct membuf : std::streambuf } }; + + + std::string find_whdload_game_option(const TCHAR* find_setting, char* whd_options) { char temp_options[4096]; @@ -190,16 +195,40 @@ std::string find_whdload_game_option(const TCHAR* find_setting, char* whd_option auto output = "nul"; auto full_line = strtok(temp_options, "\n"); + + while (full_line != nullptr) { - std::string t = full_line; + + // remove leading tabs + if (full_line[0] == '\t' && full_line[1] == '\t') + { + memmove(full_line, full_line + 2, (sizeof(full_line[0]) - 2) / sizeof(full_line[0])); + } + + + // remove leading tabs +// for (auto i = 1; i < 5; ++i) +// { +// if (full_line[0] == '\t') +// { +// memmove(full_line, full_line + 1, (sizeof(full_line[0]) - 1) / sizeof(full_line[0])); +// } +// else +// break; +// } +// + std::string t = full_line; + + // t.erase(std::remove(t.begin(), t.end(), '\t'), t.end()); // remove tabs strcpy(temp_setting, find_setting); strcat(temp_setting, "="); - + if (strlen(full_line) >= strlen(temp_setting)) { - // check that the beginging of the full line - if (strncmp(temp_setting, full_line, strlen(find_setting)) == 0) + // check that the beginging of the full line + // if (strncmp(temp_setting, full_line, strlen(find_setting)) == 0) + if (strncmp(temp_setting, full_line, strlen(temp_setting)) == 0) { t.erase(t.begin(), t.begin() + strlen(temp_setting)); return t; @@ -257,7 +286,7 @@ struct host_options get_host_settings(char* HW) strcpy(output_detail.aspect_ratio, find_whdload_game_option("ASPECT_RATIO_FIX", HW).c_str()); strcpy(output_detail.frameskip, find_whdload_game_option("FRAMESKIP", HW).c_str()); strcpy(output_detail.line_double, find_whdload_game_option("LINE_DOUBLING", HW).c_str()); - + strcpy(output_detail.fixed_height, find_whdload_game_option("FIXED_HEIGHT", HW).c_str()); return output_detail; } @@ -269,12 +298,18 @@ void make_rom_symlink(const char* kick_short, char* kick_path, int kick_numb, st // do the checks... snprintf(kick_long, MAX_DPATH, "%s/%s", kick_path, kick_short); + + // this should sort any broken links + my_unlink(kick_long); + if (!zfile_exists(kick_long)) { roms[0] = kick_numb; // kickstart 1.2 A500 const auto rom_test = configure_rom(p, roms, 0); // returns 0 or 1 if found or not found if (rom_test == 1) - symlink(p->romfile, kick_long); + { symlink(p->romfile, kick_long); + write_log("Making SymLink for Kickstart ROM: %s\n",kick_long); + } } } @@ -287,6 +322,9 @@ void symlink_roms(struct uae_prefs* p) char tmp[MAX_DPATH]; char tmp2[MAX_DPATH]; + + write_log("SymLink Kickstart ROMs for Booter\n"); + // here we can do some checks for Kickstarts we might need to make symlinks for strncpy(currentDir, start_path_data, MAX_DPATH); @@ -334,10 +372,10 @@ void symlink_roms(struct uae_prefs* p) symlink(tmp, tmp2); } - -void whdload_auto_prefs(struct uae_prefs* p, char* filepath) +void cd_auto_prefs(struct uae_prefs* p, char* filepath) { + // setup variables etc TCHAR game_name[MAX_DPATH]; TCHAR* txt2 = nullptr; @@ -346,28 +384,16 @@ void whdload_auto_prefs(struct uae_prefs* p, char* filepath) char boot_path[MAX_DPATH]; char save_path[MAX_DPATH]; char config_path[MAX_DPATH]; - // char GameTypePath[MAX_DPATH]; char whd_config[255]; char hardware_settings[4096]; - char custom_settings[4096]; + //char custom_settings[4096]; fetch_configurationpath(config_path,MAX_DPATH); - - // - // *** KICKSTARTS *** - - symlink_roms(p); - - // this allows A600HD to be used to slow games down - int roms[2]; - roms[0] = 15; // kickstart 2.05 A600HD .. 10 - const auto rom_test = configure_rom(p, roms, 0); // returns 0 or 1 if found or not found - const auto a600_available = rom_test; - - // + // *** GAME DETECTION *** - + printf("\nCD Autoload: %s \n\n",filepath); + // REMOVE THE FILE PATH AND EXTENSION const auto filename = my_getfilepart(filepath); // SOMEWHERE HERE WE NEED TO SET THE GAME 'NAME' FOR SAVESTATE ETC PURPOSES @@ -392,11 +418,15 @@ void whdload_auto_prefs(struct uae_prefs* p, char* filepath) return; } - // LOAD HOST OPTIONS - char whd_path[MAX_DPATH]; - struct host_options host_detail; - snprintf(whd_path, MAX_DPATH, "%s/whdboot/", start_path_data); + + // LOAD HOST OPTIONS + char whd_path[MAX_DPATH]; + snprintf(whd_path, MAX_DPATH, "%s/whdboot/", start_path_data); + + // this should be made into it's own routine!! 1 (see repeat, below) + + struct host_options host_detail; strcpy(whd_config, whd_path); strcat(whd_config, "hostprefs.conf"); @@ -409,6 +439,226 @@ void whdload_auto_prefs(struct uae_prefs* p, char* filepath) _stprintf(hardware_settings, "%s", contents.c_str()); + host_detail = get_host_settings(hardware_settings); + } + + + // + // *** EMULATED HARDWARE *** + // + + p->start_gui = false; + + const int is_cdtv = (strstr(filepath, "CD32") != nullptr || strstr(filepath, "cdtv") != nullptr); + const int is_cd32 = (strstr(filepath, "CD32") != nullptr || strstr(filepath, "cd32") != nullptr); + + // CD32 + if (static_cast(is_cd32)) + { + _tcscpy(p->description, _T("AutoBoot Configuration [CD32]")); + // SET THE BASE AMIGA (CD32) + built_in_prefs(&currprefs, 8, 0, 0, 0); + } + else if (static_cast(is_cd32)) + { + _tcscpy(p->description, _T("AutoBoot Configuration [CDTV]")); + // SET THE BASE AMIGA (CDTV) + built_in_prefs(&currprefs, 9, 0, 0, 0); + } + else + { + _tcscpy(p->description, _T("AutoBoot Configuration [A1200CD]")); + // SET THE BASE AMIGA (Expanded A1200) + built_in_prefs(&currprefs, 4, 1, 0, 0); + + } + + + // enable CD + _stprintf(tmp, "cd32cd=1"); + txt2 = parsetextpath(_T(tmp)); + cfgfile_parse_line(p, txt2, 0); + + // mount the image + _stprintf(tmp, "cdimage0=%s,image", filepath); + txt2 = parsetextpath(_T(tmp)); + cfgfile_parse_line(p, txt2, 0); + + //cfgfile_parse_option(&currprefs, _T("cdimage0"), filepath, 0); + + + + //APPLY THE SETTINGS FOR MOUSE/JOYSTICK ETC + // CD32 + if (static_cast(is_cd32)) + { p->jports[0].mode = 7; + p->jports[1].mode = 7; + } + else + { + // JOY + p->jports[1].mode = 3; + // MOUSE + p->jports[0].mode = 2; + } + + // APPLY SPECIAL CONFIG E.G. MOUSE OR ALT. JOYSTICK SETTINGS + for (auto& jport : p->jports) + { + jport.id = JPORT_NONE; + jport.idc.configname[0] = 0; + jport.idc.name[0] = 0; + jport.idc.shortid[0] = 0; + } + + // WHAT IS THE MAIN CONTROL? + // PORT 0 - MOUSE + if (static_cast(is_cd32) && !strcmpi(host_detail.controller2, "nul") == 0) + { + _stprintf(txt2, "%s=%s", _T("joyport0"), _T(host_detail.controller2)); + cfgfile_parse_line(p, txt2, 0); + } + else if (!strcmpi(host_detail.mouse1, "nul") == 0) + { + _stprintf(txt2, "%s=%s", _T("joyport0"), _T(host_detail.mouse1)); + cfgfile_parse_line(p, txt2, 0); + } + else + { + _stprintf(txt2, "%s=mouse", _T("joyport0")); + cfgfile_parse_line(p, txt2, 0); + } + + + // PORT 1 - JOYSTICK + if (!strcmpi(host_detail.controller1, "nul") == 0) + { + _stprintf(txt2, "%s=%s", _T("joyport1"), _T(host_detail.controller1)); + cfgfile_parse_line(p, txt2, 0); + } + else + { + _stprintf(txt2, "%s=joy1", _T("joyport1")); + cfgfile_parse_line(p, txt2, 0); + } + +} + + +void whdload_auto_prefs(struct uae_prefs* p, char* filepath) + +{ + // setup variables etc + TCHAR game_name[MAX_DPATH]; + TCHAR* txt2 = nullptr; + TCHAR tmp[MAX_DPATH]; + + char boot_path[MAX_DPATH]; + char save_path[MAX_DPATH]; + char config_path[MAX_DPATH]; + char whd_path[MAX_DPATH]; + char kick_path[MAX_DPATH]; + + // char GameTypePath[MAX_DPATH]; + char whd_config[255]; + char whd_startup[255]; + + char whd_bootscript[4096]; + + char hardware_settings[4096]; + char custom_settings[4096]; + + char selected_slave[4096]; // note!! this should be global later on, and only collected from the XML if set to 'nothing' + char subpath[4096]; + + + + strcpy(selected_slave, ""); + + fetch_configurationpath(config_path,MAX_DPATH); + + // + // *** KICKSTARTS *** + + symlink_roms(p); + + // this allows A600HD to be used to slow games down + int roms[2]; + roms[0] = 15; // kickstart 2.05 A600HD .. 10 + const auto rom_test = configure_rom(p, roms, 0); // returns 0 or 1 if found or not found + const auto a600_available = rom_test; + + if (a600_available == true) + { + write_log("WHDBooter - Host: A600 ROM Available \n"); + } + + // + // *** GAME DETECTION *** + + // REMOVE THE FILE PATH AND EXTENSION + const auto filename = my_getfilepart(filepath); + // SOMEWHERE HERE WE NEED TO SET THE GAME 'NAME' FOR SAVESTATE ETC PURPOSES + extractFileName(filepath, last_loaded_config); + extractFileName(filepath, game_name); + removeFileExtension(game_name); + + auto filesize = get_file_size(filepath); + // const TCHAR* filesha = get_sha1_txt (input, filesize); <<< ??! FIX ME + + + // LOAD GAME SPECIFICS FOR EXISTING .UAE - USE SHA1 IF AVAILABLE + // CONFIG LOAD IF .UAE IS IN CONFIG PATH + strcpy(whd_config, config_path); + strcat(whd_config, game_name); + strcat(whd_config, ".uae"); + + snprintf(whd_path, MAX_DPATH, "%s/whdboot/save-data/Autoboots/", start_path_data); + strcpy(whd_startup, whd_path); + strcat(whd_startup, game_name); + strcat(whd_startup, ".auto-startup"); + + my_mkdir("/tmp/s"); + my_mkdir("/tmp/c"); + my_mkdir("/tmp/devs"); + + remove("/tmp/s/startup-sequence"); + my_unlink("/tmp/s/startup-sequence"); + + // LOAD HOST OPTIONS + snprintf(whd_path, MAX_DPATH, "%s/whdboot/WHDLoad", start_path_data); + + // are we using save-data/ ? + snprintf(kick_path, MAX_DPATH, "%s/whdboot/save-data/Kickstarts", start_path_data); + + // boot with existing .UAE if possible, but for this the auto-startup must exist + if (zfile_exists(whd_config) && zfile_exists(whd_startup)) + { + symlink(whd_startup, "/tmp/s/startup-sequence"); + symlink(whd_path, "/tmp/c/WHDLoad"); + symlink(kick_path, "/tmp/devs/Kickstarts"); + target_cfgfile_load(&currprefs, whd_config, CONFIG_TYPE_ALL, 0); + return; + } + + + + // this should be made into it's own routine!! 1 (see repeat, above) + snprintf(whd_path, MAX_DPATH, "%s/whdboot/", start_path_data); + + struct host_options host_detail; + strcpy(whd_config, whd_path); + strcat(whd_config, "hostprefs.conf"); + + if (zfile_exists(whd_config)) // use hostprefs + { + ifstream read_file(whd_config); + std::ifstream in(whd_config); + std::string contents((std::istreambuf_iterator(in)), + std::istreambuf_iterator()); + + _stprintf(hardware_settings, "%s", contents.c_str()); + host_detail = get_host_settings(hardware_settings); } @@ -419,117 +669,173 @@ void whdload_auto_prefs(struct uae_prefs* p, char* filepath) // EDIT THE FILE NAME TO USE HERE - strcpy(whd_config, whd_path); - strcat(whd_config, game_name); - strcat(whd_config, ".whd"); + + strcpy(whd_config, whd_path); + strcat(whd_config, "whdload_db.xml"); + + if (zfile_exists(whd_config)) // use XML database + { + //printf("XML exists %s\n",game_name); + + const auto doc = xmlParseFile(whd_config); + const auto root_element = xmlDocGetRootElement(doc); + auto game_node = get_node(root_element, "whdbooter"); + + while (game_node != nullptr) + { + const auto attr = xmlGetProp(game_node, reinterpret_cast("filename")); + if (attr != nullptr) + { + if (strcmpi(reinterpret_cast(attr),game_name) == 0) + { + // now get the and items + // get hardware + auto temp_node = game_node->xmlChildrenNode; + temp_node = get_node(temp_node, "hardware"); + if (xmlNodeGetContent(temp_node) != nullptr) + { + _stprintf(hardware_settings, "%s", + reinterpret_cast(xmlNodeGetContent(temp_node))); + game_detail = get_game_settings(hardware_settings); + + write_log("WHDBooter - Game H/W Settings: \n%s\n",hardware_settings); + + } + + // get custom controls + temp_node = game_node->xmlChildrenNode; + temp_node = get_node(temp_node, "custom_controls"); + if (xmlNodeGetContent(temp_node) != nullptr) + { + _stprintf(custom_settings, "%s", + reinterpret_cast(xmlNodeGetContent(temp_node))); + // process these later + } + + // if selected_slave = "" then use the default from the XML.... + + if (strlen(selected_slave) == 0) + { + temp_node = game_node->xmlChildrenNode; + temp_node = get_node(temp_node, "slave_default"); + if (xmlNodeGetContent(temp_node) != nullptr) + { + _stprintf(selected_slave, "%s", + reinterpret_cast(xmlNodeGetContent(temp_node))); + // process these later + write_log("WHDBooter - Default Slave: %s\n",selected_slave); + } + + temp_node = game_node->xmlChildrenNode; + temp_node = get_node(temp_node, "subpath"); + + if (xmlNodeGetContent(temp_node) != nullptr) + { + _stprintf(subpath, "%s", + reinterpret_cast(xmlNodeGetContent(temp_node))); + // process these later + write_log("WHDBooter - SubPath: %s\n",subpath); + } + + temp_node = game_node->xmlChildrenNode; + printf("temp node: %s\n",temp_node); + + } + break; + } + } + xmlFree(attr); + game_node = game_node->next; + } + xmlCleanupParser(); + } - if (zfile_exists(whd_config)) // use direct .whd file - { - ifstream readFile(whd_config); - std::ifstream in(whd_config); - std::string contents((std::istreambuf_iterator(in)), - std::istreambuf_iterator()); + //printf("selected_slave: %s\n",selected_slave); + + // then here, we will write a startup-sequence file (formerly autoboot file) + if (strlen(selected_slave) != 0 && !zfile_exists(whd_startup)) + { + // _stprintf(whd_bootscript, "DH3:C/Assign C: DH3:C/ ADD\n"); + // _stprintf(whd_bootscript, "DH3:C/Assign LIBS: DH3:LIBS/ ADD\n"); + _stprintf(whd_bootscript, "CD \"Games:%s\"\n",subpath); + _stprintf(whd_bootscript, "%sWHDLoad SLAVE=\"games:%s/%s\"",whd_bootscript,subpath,selected_slave); + _stprintf(whd_bootscript, "%s PRELOAD NOWRITECACHE NOREQ SPLASHDELAY=0",whd_bootscript); + _stprintf(whd_bootscript, "%s SAVEPATH=Saves:Savegames/ SAVEDIR=\"%s\"",whd_bootscript,subpath); + _stprintf(whd_bootscript, "%s\n",whd_bootscript,subpath); + + write_log("WHDBooter - Created Startup-Sequence \n\n%s\n",whd_bootscript); + + // create a file with save-data/Autoboots/ game name .auto-startup - _stprintf(hardware_settings, "%s", contents.c_str()); - game_detail = get_game_settings(hardware_settings); - } - else - { - strcpy(whd_config, whd_path); - strcat(whd_config, "whdload_db.xml"); + write_log("WHDBooter - Saved Auto-Startup to %s\n",whd_startup); + + ofstream myfile (whd_startup); + if (myfile.is_open()) + { + myfile << whd_bootscript; + myfile.close(); + } + } + + // now we should have a startup-file (if we dont, we are going to use the orignal booter) + if (zfile_exists(whd_startup)) + { + write_log("WHDBooter - Found Auto-Startup to SymLink\n"); + + // create a symlink to this as startup-sequence in /tmp/ + symlink(whd_startup, "/tmp/s/startup-sequence"); - if (zfile_exists(whd_config)) // use XML database - { - //printf("XML exists %s\n",game_name); + // create a symlink to WHDLoad in /tmp/ + snprintf(whd_path, MAX_DPATH, "%s/whdboot/WHDLoad", start_path_data); + symlink(whd_path, "/tmp/c/WHDLoad"); - const auto doc = xmlParseFile(whd_config); - const auto root_element = xmlDocGetRootElement(doc); - auto game_node = get_node(root_element, "whdbooter"); + // create a symlink for DEVS in /tmp/ + symlink(kick_path, "/tmp/devs/Kickstarts"); + } + - while (game_node != nullptr) - { - const auto attr = xmlGetProp(game_node, reinterpret_cast("filename")); - if (attr != nullptr) - { - // printf ("%s\n",attr); - if (strcmpi(reinterpret_cast(attr),game_name) == 0) - { - // now get the and items - - //printf("found game in XML\n"); - auto temp_node = game_node->xmlChildrenNode; - temp_node = get_node(temp_node, "hardware"); - if (xmlNodeGetContent(temp_node) != nullptr) - { - _stprintf(hardware_settings, "%s", - reinterpret_cast(xmlNodeGetContent(temp_node))); - // printf("%s\n",hardware_settings); - game_detail = get_game_settings(hardware_settings); - } - - temp_node = game_node->xmlChildrenNode; - temp_node = get_node(temp_node, "custom_controls"); - if (xmlNodeGetContent(temp_node) != nullptr) - { - _stprintf(custom_settings, "%s", - reinterpret_cast(xmlNodeGetContent(temp_node))); - // process these later - //printf("%s\n",custom_settings); - } - break; - } - } - xmlFree(attr); - game_node = game_node->next; - } - - xmlCleanupParser(); - } - } + + // debugging code! + write_log("WHDBooter - Game: Port 0 : %s \n",game_detail.port0); + write_log("WHDBooter - Game: Port 1 : %s \n",game_detail.port1); + write_log("WHDBooter - Game: Control : %s \n",game_detail.control); + write_log("WHDBooter - Game: Fast Copper: %s \n",game_detail.fastcopper); + write_log("WHDBooter - Game: CPU : %s \n",game_detail.cpu); + write_log("WHDBooter - Game: Blitter : %s \n",game_detail.blitter); + write_log("WHDBooter - Game: CPU Clock : %s \n",game_detail.clock); + write_log("WHDBooter - Game: Chipset : %s \n",game_detail.chipset); + write_log("WHDBooter - Game: JIT : %s \n",game_detail.jit); + write_log("WHDBooter - Game: CPU Compat : %s \n",game_detail.cpu_comp); + write_log("WHDBooter - Game: Scr Height : %s \n",game_detail.scr_height); + write_log("WHDBooter - Game: Scr YOffset: %s \n",game_detail.y_offset); + write_log("WHDBooter - Game: NTSC : %s \n",game_detail.ntsc); + write_log("WHDBooter - Game: Fast Ram : %s \n",game_detail.fast); + write_log("WHDBooter - Game: Z3 Ram : %s \n",game_detail.z3); // debugging code! - write_log("WHDBooter - Game: Port 0: %s \n",game_detail.port0); - write_log("WHDBooter - Game: Port 1: %s \n",game_detail.port1); - write_log("WHDBooter - Game: Control: %s \n",game_detail.control); - // printf("fstcpr: %s \n",game_detail.fastcopper); - // printf("cpu : %s \n",game_detail.cpu); - // printf("blitta: %s \n",game_detail.blitter); - // printf("clock : %s \n",game_detail.clock); - // printf("chipst: %s \n",game_detail.chipset); - // printf("jit : %s \n",game_detail.jit); - // printf("cpcomp: %s \n",game_detail.cpu_comp); - // printf("scrhei: %s \n",game_detail.scr_height); - // printf("scr y : %s \n",game_detail.y_offset); - // printf("ntsc : %s \n",game_detail.ntsc); - // printf("fast : %s \n",game_detail.fast); - // printf("z3 : %s \n",game_detail.z3); - - // debugging code! - write_log("WHDBooter - Host: Controller 1: %s \n", host_detail.controller1); - write_log("WHDBooter - Host: Controller 2: %s \n", host_detail.controller2); - write_log("WHDBooter - Host: Controller 3: %s \n", host_detail.controller3); - write_log("WHDBooter - Host: Controller 4: %s \n", host_detail.controller4); - write_log("WHDBooter - Host: Mouse 1: %s \n", host_detail.mouse1); - write_log("WHDBooter - Host: Mouse 2: %s \n", host_detail.mouse2); + write_log("WHDBooter - Host: Controller 1 : %s \n", host_detail.controller1); + write_log("WHDBooter - Host: Controller 2 : %s \n", host_detail.controller2); + write_log("WHDBooter - Host: Controller 3 : %s \n", host_detail.controller3); + write_log("WHDBooter - Host: Controller 4 : %s \n", host_detail.controller4); + write_log("WHDBooter - Host: Mouse 1 : %s \n", host_detail.mouse1); + write_log("WHDBooter - Host: Mouse 2 : %s \n", host_detail.mouse2); //printf("ra_qui: %s \n", host_detail.ra_quit); //printf("ra_men: %s \n", host_detail.ra_menu); //printf("ra_rst: %s \n", host_detail.ra_reset); //printf("ky_qut: %s \n", host_detail.key_quit); //printf("ky_gui: %s \n", host_detail.key_gui); //printf("deadzn: %s \n", host_detail.stereo_split); - //printf("stereo: %s \n", host_detail.stereo_split); - //printf("snd_on: %s \n", host_detail.sound_on); - //printf("snd_md: %s \n", host_detail.sound_mode); + write_log("WHDBooter - Host: Sound On : %s \n", host_detail.sound_on); + write_log("WHDBooter - Host: Sound Mode : %s \n", host_detail.sound_mode); + write_log("WHDBooter - Host: Stereo Split : %s \n", host_detail.stereo_split); //printf("aspect: %s \n", host_detail.aspect_ratio); //printf("frames: %s \n", host_detail.frameskip); - - + write_log("WHDBooter - Host: Fixed Height : %s \n", host_detail.fixed_height); // // *** EMULATED HARDWARE *** // - - // SET UNIVERSAL DEFAULTS + // SET UNIVERSAL DEFAULTS p->start_gui = false; if ((strcmpi(game_detail.cpu,"68000") == 0 || strcmpi(game_detail.cpu,"68010") == 0) && a600_available != 0) @@ -552,7 +858,7 @@ void whdload_auto_prefs(struct uae_prefs* p, char* filepath) // A1200 no AGA if (!static_cast(is_aga) && !static_cast(is_cd32)) { - _tcscpy(p->description, _T("WHDLoad AutoBoot Configuration")); + _tcscpy(p->description, _T("AutoBoot Configuration [WHDLoad]")); p->cs_compatible = CP_A600; built_in_chipset_prefs(p); @@ -561,49 +867,81 @@ void whdload_auto_prefs(struct uae_prefs* p, char* filepath) } // A1200 else - _tcscpy(p->description, _T("WHDLoad AutoBoot Configuration [AGA]")); + _tcscpy(p->description, _T("AutoBoot Configuration [WHDLoad] [AGA]")); - //SET THE WHD BOOTER AND GAME DATA - snprintf(boot_path, MAX_DPATH, "%s/whdboot/boot-data.zip", start_path_data); + + + //SET THE WHD BOOTER AND GAME DATA + if (strlen(selected_slave) != 0) // new booter solution + { + snprintf(boot_path, MAX_DPATH, "/tmp/"); - if (!zfile_exists(boot_path)) - snprintf(boot_path, MAX_DPATH, "%s/whdboot/boot-data/", start_path_data); + _stprintf(tmp,_T("filesystem2=rw,DH0:DH0:%s,10"), boot_path); + txt2 = parsetextpath(_T(tmp)); + cfgfile_parse_line(p, txt2, 0); + _stprintf(tmp,_T("uaehf0=dir,rw,DH0:DH0::%s,10"), boot_path); + txt2 = parsetextpath(_T(tmp)); + cfgfile_parse_line(p, txt2, 0); + + + snprintf(boot_path, MAX_DPATH, "%s/whdboot/boot-data.zip", start_path_data); + if (!zfile_exists(boot_path)) + snprintf(boot_path, MAX_DPATH, "%s/whdboot/boot-data/", start_path_data); - // set the first (whdboot) Drive - _stprintf(tmp,_T("filesystem2=rw,DH0:DH0:%s,10"), boot_path); - txt2 = parsetextpath(_T(tmp)); - cfgfile_parse_line(p, txt2, 0); + _stprintf(tmp,_T("filesystem2=rw,DH3:DH3:%s,-10"), boot_path); + txt2 = parsetextpath(_T(tmp)); + cfgfile_parse_line(p, txt2, 0); - _stprintf(tmp,_T("uaehf0=dir,rw,DH0:DH0::%s,10"), boot_path); - txt2 = parsetextpath(_T(tmp)); - cfgfile_parse_line(p, txt2, 0); + _stprintf(tmp,_T("uaehf0=dir,rw,DH3:DH3::%s,-10"), boot_path); + txt2 = parsetextpath(_T(tmp)); + cfgfile_parse_line(p, txt2, 0); + + } + + else // revert to original booter is no slave was set + { + snprintf(boot_path, MAX_DPATH, "%s/whdboot/boot-data.zip", start_path_data); + if (!zfile_exists(boot_path)) + snprintf(boot_path, MAX_DPATH, "%s/whdboot/boot-data/", start_path_data); + + _stprintf(tmp,_T("filesystem2=rw,DH0:DH0:%s,10"), boot_path); + txt2 = parsetextpath(_T(tmp)); + cfgfile_parse_line(p, txt2, 0); + _stprintf(tmp,_T("uaehf0=dir,rw,DH0:DH0::%s,10"), boot_path); + txt2 = parsetextpath(_T(tmp)); + cfgfile_parse_line(p, txt2, 0); + + } + //set the Second (game data) drive - _stprintf(tmp, "filesystem2=rw,DH1:games:%s,0", filepath); + _stprintf(tmp, "filesystem2=rw,DH1:Games:%s,0", filepath); txt2 = parsetextpath(_T(tmp)); cfgfile_parse_line(p, txt2, 0); - _stprintf(tmp, "uaehf1=dir,rw,DH1:games:%s,0", filepath); + _stprintf(tmp, "uaehf1=dir,rw,DH1:Games:%s,0", filepath); txt2 = parsetextpath(_T(tmp)); cfgfile_parse_line(p, txt2, 0); + //set the third (save data) drive snprintf(save_path, MAX_DPATH, "%s/whdboot/save-data/", start_path_data); if (my_existsdir(save_path)) { - _stprintf(tmp, "filesystem2=rw,DH2:saves:%s,0", save_path); + _stprintf(tmp, "filesystem2=rw,DH2:Saves:%s,0", save_path); txt2 = parsetextpath(_T(tmp)); cfgfile_parse_line(p, txt2, 0); - _stprintf(tmp, "uaehf2=dir,rw,DH2:saves:%s,0", save_path); + _stprintf(tmp, "uaehf2=dir,rw,DH2:Saves:%s,0", save_path); txt2 = parsetextpath(_T(tmp)); cfgfile_parse_line(p, txt2, 0); } - //APPLY THE SETTINGS FOR MOUSE/JOYSTICK ETC - // CD32 + + // APPLY THE SETTINGS FOR MOUSE/JOYSTICK ETC + // CD32 if ((static_cast(is_cd32) && strcmpi(game_detail.port0, "nul") == 0) || strcmpi(game_detail.port0, "cd32") == 0) p->jports[0].mode = 7; @@ -913,15 +1251,19 @@ void whdload_auto_prefs(struct uae_prefs* p, char* filepath) cfgfile_parse_line(p, txt2, 0); } - // NTSC - if (strcmpi(game_detail.ntsc,"true") == 0) - { - _stprintf(txt2, "ntsc=true"); - cfgfile_parse_line(p, txt2, 0); - } - // SCREEN HEIGHT - if (strcmpi(game_detail.scr_height,"nul") != 0) + + + if (strcmpi(host_detail.fixed_height,"nul") != 0) + { + _stprintf(txt2, "gfx_height=%s", host_detail.fixed_height); + cfgfile_parse_line(p, txt2, 0); + _stprintf(txt2, "gfx_height_windowed=%s", host_detail.fixed_height); + cfgfile_parse_line(p, txt2, 0); + _stprintf(txt2, "gfx_height_fullscreen=%s", host_detail.fixed_height); + cfgfile_parse_line(p, txt2, 0); + } + else if (strcmpi(game_detail.scr_height,"nul") != 0) { _stprintf(txt2, "gfx_height=%s", game_detail.scr_height); cfgfile_parse_line(p, txt2, 0); diff --git a/src/osdep/gui/PanelPaths.cpp b/src/osdep/gui/PanelPaths.cpp index 5b4ebf97..41db55d8 100644 --- a/src/osdep/gui/PanelPaths.cpp +++ b/src/osdep/gui/PanelPaths.cpp @@ -100,6 +100,8 @@ public: void action(const gcn::ActionEvent& actionEvent) override { RescanROMs(); + SymlinkROMs(); + import_joysticks(); RefreshPanelInput(); RefreshPanelCustom(); diff --git a/src/osdep/target.h b/src/osdep/target.h index 0162b9e7..15495ad7 100644 --- a/src/osdep/target.h +++ b/src/osdep/target.h @@ -68,6 +68,7 @@ extern void extractPath(char *str, char *buffer); extern void removeFileExtension(char *filename); extern void ReadConfigFileList(void); extern void RescanROMs(void); +extern void SymlinkROMs(void); extern void ClearAvailableROMList(void); #include diff --git a/whdboot/boot-data.zip b/whdboot/boot-data.zip old mode 100644 new mode 100755 index 462e0a24..6180eabd Binary files a/whdboot/boot-data.zip and b/whdboot/boot-data.zip differ diff --git a/whdboot/game-data/whdload_db.xml b/whdboot/game-data/whdload_db.xml index e4b6fb34..90abce90 100644 --- a/whdboot/game-data/whdload_db.xml +++ b/whdboot/game-data/whdload_db.xml @@ -1,5 +1,5 @@ - + 1001 Stolen Ideas 1001StolenIdeas @@ -327,6 +327,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -452,6 +453,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -580,6 +582,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -614,6 +617,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -971,6 +975,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -1233,6 +1238,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -1250,6 +1256,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -1517,6 +1524,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -1713,6 +1721,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -1767,6 +1776,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -1858,6 +1868,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -1949,6 +1960,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -2080,6 +2092,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -2168,6 +2181,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -2676,6 +2690,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -2767,6 +2782,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -3081,6 +3097,23 @@ + + Dark Hell BBSTrackmo + DarkHellBBSTrackmo + f060b6e7-ff5c-59f0-a1a8-614d54947e24 + 1 + DarkHellBBSTrackmo.Slave + + DarkHellBBSTrackmo.Slave + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Darkroom Darkroom @@ -3115,6 +3148,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -3543,6 +3577,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -3705,6 +3740,26 @@ + + Epilepsia + Epilepsia + b3cd53d6-0d5e-51dd-b9fd-cbdbb8e57741 + 1 + Epilepsia.Slave + + Epilepsia.Slave + + + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Eargasm Tunes EargasmTunes @@ -3845,6 +3900,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -3899,6 +3955,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA FAST_RAM=8 @@ -3957,26 +4014,6 @@ - - Epilepsia - Epilepsia - b3cd53d6-0d5e-51dd-b9fd-cbdbb8e57741 - 1 - Epilepsia.Slave - - Epilepsia.Slave - - - - - - - PRIMARY_CONTROL=JOYSTICK - PORT0=JOY - PORT1=JOY - - - Erazorhead Erazorhead @@ -4055,6 +4092,23 @@ + + Evolution Desire + EvolutionDesire + a41a2a98-58c4-5d53-88b4-7e15e0d659bb + 1 + EvolutionDesire.Slave + + EvolutionDesire.Slave + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Exage Exage @@ -4089,6 +4143,26 @@ + + Exile + Exile + 1a704791-b5da-563e-984f-22fada474d1b + 1 + Exile.Slave + + Exile.Slave + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + JIT=FALSE + SCREEN_HEIGHT=256 + SCREEN_Y_OFFSET=0 + + + Experiment Experiment @@ -4123,6 +4197,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -4208,6 +4283,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -4435,6 +4511,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -4452,6 +4529,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -4648,6 +4726,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -4665,6 +4744,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -4913,6 +4993,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -5280,6 +5361,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -5297,6 +5379,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -5545,6 +5628,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -5647,6 +5731,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA FAST_RAM=8 @@ -5685,6 +5770,23 @@ + + JOESlideshow 2 + JOESlideshow2 + 07ddca5a-8e01-5de3-80ec-2a2b68e577bd + 1 + JOESlideshow2.Slave + + JOESlideshow2.Slave + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Joyride Joyride @@ -5976,6 +6078,28 @@ + + Legalize It 2 + LegalizeIt2 + 40aab6db-05ef-5553-9b82-fb428813decb + 1 + LegalizeIt2.slave + + LegalizeIt2.slave + data + + C1:B:Skip Intro + C2:B:Run Hidden Part 1 + C3:B:Run Hidden Part 2 + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Legoland Legoland @@ -6173,6 +6297,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -6319,6 +6444,40 @@ + + Music Thingy + MusicThingy + 44fbe310-66a3-506a-ae77-2d84a92b83c7 + 1 + MusicThingy.slave + + MusicThingy.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Music Thingy + MusicThingy + 54e3220f-a3e3-5ad7-8931-496534f14d4b + 1 + MusicThingy.Slave + + MusicThingy.Slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Music With A Message MusicWithAMessage @@ -6651,6 +6810,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -8334,6 +8494,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -8647,6 +8808,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -8664,6 +8826,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -9689,6 +9852,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -9752,6 +9916,26 @@ + + Noises Of Pansy + NoisesOfPansy + 2003e841-1a2b-5f30-94c5-2df37ec9c92c + 1 + NoisesOfPansy.Slave + + NoisesOfPansy.Slave + + + C1:B:Skip Intro + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Non Stop Music NonStopMusic @@ -9803,6 +9987,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -9871,6 +10056,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -9952,6 +10138,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -10185,6 +10372,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -10316,6 +10504,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -10333,6 +10522,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -10441,6 +10631,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -10549,6 +10740,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -10796,6 +10988,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -10813,6 +11006,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -10887,6 +11081,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -10921,6 +11116,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11102,6 +11298,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11323,6 +11520,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11340,6 +11538,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11568,6 +11767,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11591,6 +11791,27 @@ + + Sun Tracker 2 + SunTracker2 + 8fccd311-66e0-5c65-a753-2439717bdcb5 + 1 + SunTracker2.Slave + + SunTracker2.Slave + + + C1:B:Skip Intro + C2:B:Disable Blitter Waits + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Sun [AGA] SunAGA @@ -11608,6 +11829,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11676,6 +11898,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11693,6 +11916,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11781,6 +12005,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11863,6 +12088,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -11917,6 +12143,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA FAST_RAM=8 @@ -12023,6 +12250,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -12040,6 +12268,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -12091,6 +12320,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -12188,6 +12418,24 @@ + + Soho [AGA] + SohoAGA + d342a19b-ecee-5e0b-a046-4620aab7dc9a + 1 + SohoAGA.Slave + + SohoAGA.Slave + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + CHIPSET=AGA + + + Songs Of Infinity SongsOfInfinity @@ -12222,6 +12470,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -12273,6 +12522,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -13450,6 +13700,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -13467,6 +13718,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -13518,6 +13770,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -13535,6 +13788,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -13791,6 +14045,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -13842,6 +14097,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -14061,6 +14317,23 @@ + + Unbelievable + Unbelievable + e32f0533-140f-558e-bb20-9161c33e0cab + 1 + Unbelievable.Slave + + Unbelievable.Slave + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Universal Intensity UniversalIntensity @@ -14504,6 +14777,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -14578,6 +14852,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -14629,6 +14904,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -14680,6 +14956,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -14891,6 +15168,7 @@ PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -14947,6 +15225,7 @@ PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -16188,6 +16467,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -16727,6 +17007,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -16976,6 +17257,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -17130,6 +17412,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=240 @@ -17293,6 +17576,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -17313,6 +17597,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -17333,6 +17618,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -17386,6 +17672,7 @@ PORT1=JOY CPU=68040 CLOCK=MAX + CHIPSET=AGA SCREEN_HEIGHT=216 SCREEN_Y_OFFSET=3 @@ -17433,6 +17720,7 @@ PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -17592,6 +17880,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=262 SCREEN_Y_OFFSET=-2 @@ -18226,6 +18515,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=216 SCREEN_Y_OFFSET=-6 @@ -18324,6 +18614,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=240 @@ -18342,6 +18633,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=240 @@ -19530,6 +19822,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA FAST_RAM=8 @@ -20133,6 +20426,8 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=256 SCREEN_Y_OFFSET=3 @@ -20152,6 +20447,8 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=256 SCREEN_Y_OFFSET=3 @@ -20543,6 +20840,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=256 @@ -20561,6 +20859,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -20578,6 +20877,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -20767,6 +21067,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -21127,6 +21428,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -21382,6 +21684,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -21676,6 +21979,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=24 @@ -21804,6 +22108,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=256 SCREEN_Y_OFFSET=3 @@ -22378,6 +22683,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=JOY PORT1=JOY CLOCK=28 + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -22402,6 +22708,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=JOY PORT1=JOY CLOCK=28 + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -22556,6 +22863,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -23015,6 +23323,46 @@ joyport1_amiberry_custom_none_west=Space + + Bomb Jack Beer Edition + BombJackBeerEdition + 88f1c0e4-3649-5a0d-a06d-07889f86cbe6 + 1 + BombJackBeerEdition.slave + + BombJackBeerEdition.slave + data + + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Bomb Jack Beer Edition + BombJackBeerEdition + 1e263a57-4b29-5de1-b95c-0344232e7deb + 1 + BombJackBeerEdition.slave + + BombJackBeerEdition.slave + data + + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Bomb Jack BombJack @@ -23048,6 +23396,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=256 SCREEN_Y_OFFSET=3 @@ -23417,6 +23766,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -23625,6 +23975,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -23662,6 +24013,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -23699,6 +24051,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -23768,6 +24121,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -23832,6 +24186,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -24162,6 +24517,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -24679,6 +25035,29 @@ joyport1_amiberry_custom_none_west=Space + + Cadaver & The Payoff + Cadaver&ThePayoff + 563733d4-1ba0-5145-a28f-11b3f0c29f0e + 1 + Cadaver&ThePayoff.slave + + Cadaver&ThePayoff.slave + + + C2:L:Level set:Original Game,The Payoff + C4:X:Trainer - free savegames:0 + C5:X:Trainer - in game keys:0 + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Cadaver (Demos) CadaverDemos @@ -24984,6 +25363,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=240 SCREEN_Y_OFFSET=0 @@ -26027,6 +26407,23 @@ joyport1_amiberry_custom_none_west=Space + + Castle Of Dr Brain De MT 32 + CastleOfDrBrainDeMT32 + a3255b19-3c77-57be-a6ad-b18e4d9760b4 + 1 + CastleOfDrBrainDeMT32.Slave + + CastleOfDrBrainDeMT32.Slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Castle Of Dr Brain (NTSC) CastleOfDrBrainNTSC @@ -26044,6 +26441,23 @@ joyport1_amiberry_custom_none_west=Space + + Castle Of Dr Brain (NTSC)MT 32 + CastleOfDrBrainNTSCMT32 + 4af6a25b-050c-545d-96b9-a658f68038bd + 1 + CastleOfDrBrainNTSCMT32.Slave + + CastleOfDrBrainNTSCMT32.Slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Castles 2 [CD32] Castles2CD32 @@ -26058,6 +26472,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -26237,6 +26652,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -26600,6 +27016,7 @@ joyport1_amiberry_custom_none_west=Space PORT1=JOY JIT=FALSE CLOCK=28 + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=8 @@ -26727,6 +27144,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=256 SCREEN_Y_OFFSET=3 @@ -27195,6 +27613,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -27217,6 +27636,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -27620,6 +28040,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=256 SCREEN_Y_OFFSET=3 @@ -27795,6 +28216,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -28313,6 +28735,78 @@ joyport1_amiberry_custom_none_west=Space + + Conquests Of The Longbow + ConquestsOfTheLongbow + 6be3afdf-a5b5-592b-adfa-ba5cb3dcc87c + 1 + ConquestsOfTheLongbow.slave + + ConquestsOfTheLongbow.slave + data + + + PRIMARY_CONTROL=MOUSE + PORT0=MOUSE + PORT1=JOY + SCREEN_HEIGHT=200 + SCREEN_Y_OFFSET=3 + + + + + Conquests Of The Longbow MT 32 + ConquestsOfTheLongbowMT32 + 4d025474-758a-5fd9-bf53-5426ce7b5d6c + 1 + ConquestsOfTheLongbowMT32.slave + + ConquestsOfTheLongbowMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Conquests Of The Longbow + ConquestsOfTheLongbow + 05a33a86-c5d4-5a8b-bba0-0c74e1317a97 + 1 + ConquestsOfTheLongbow.slave + + ConquestsOfTheLongbow.slave + data + + + PRIMARY_CONTROL=MOUSE + PORT0=MOUSE + PORT1=JOY + SCREEN_HEIGHT=200 + SCREEN_Y_OFFSET=3 + + + + + Conquests Of The Longbow MT 32 + ConquestsOfTheLongbowMT32 + 744559a4-e9d1-5c9b-b5d8-79a67f508c31 + 1 + ConquestsOfTheLongbowMT32.slave + + ConquestsOfTheLongbowMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Continental Circus ContinentalCircus @@ -29869,6 +30363,32 @@ joyport1_amiberry_custom_none_west=Space + + Dyna Blaster + DynaBlaster + 0744ff2f-5f56-552a-becb-99fdb8e443b1 + 1 + DynaBlaster.slave + + DynaBlaster.slave + + + C1:B:Enable PAL screen + C2:L:Players Max.:3,5 (4-joy alt.),5 (4-joy default) + C3:B:Enable Cheat Mode + C4:B:12/6 pixels down screen + C5:X:Remove flicking text:0 + C5:X:Fast blinking text:1 + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + SCREEN_HEIGHT=262 + + + Dynamite Dux DynamiteDux @@ -30282,6 +30802,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=30 @@ -30811,6 +31332,7 @@ joyport1_amiberry_custom_none_west=Space PORT1=JOY BLITTER=IMMEDIATE JIT=FALSE + CHIPSET=AGA SCREEN_Y_OFFSET=-3 @@ -30900,6 +31422,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -31045,6 +31568,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -31391,6 +31915,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=MOUSE PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=270 SCREEN_Y_OFFSET=0 @@ -31427,6 +31952,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -31587,6 +32113,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=240 SCREEN_Y_OFFSET=0 @@ -31624,6 +32151,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -31731,6 +32259,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -31857,6 +32386,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -31966,6 +32496,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_Y_OFFSET=3 @@ -32144,6 +32675,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -33021,6 +33553,7 @@ joyport1_amiberry_custom_none_west=Space PORT0=MOUSE PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=240 SCREEN_Y_OFFSET=8 @@ -33135,6 +33668,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=256 SCREEN_Y_OFFSET=4 @@ -34203,6 +34737,27 @@ joyport1_amiberry_custom_none_west=Space + + Enchanted Land + EnchantedLand + 61e52df5-6f50-5396-be40-f8a9a032c0b3 + 1 + EnchantedLand.Slave + + EnchantedLand.Slave + + + C1:X:Infinite energy:0 + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Amiga Encounter Encounter @@ -34890,6 +35445,7 @@ joyport1_amiberry_custom_none_west=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -35672,6 +36228,50 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 + + Fantastic Dizzy + FantasticDizzy + 97e90d3d-e8e3-57b2-8543-a5b4d619e20a + 1 + FantasticDizzy.slave + + FantasticDizzy.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + JIT=FALSE + SCREEN_HEIGHT=240 + SCREEN_Y_OFFSET=0 + + + + + Fantastic Dizzy [AGA] + FantasticDizzyAGA + a0a88c35-70e5-51da-85a0-f09716ab115c + 1 + FantasticDizzyAGA.slave + + FantasticDizzyAGA.slave + data + + C1:X:Infinite lives:0 + C2:L:Start with lives:2,3,4,5 + C3:X:Blue button jumps:0 + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + CHIPSET=AGA + + + Fantastic Voyage FantasticVoyage @@ -35737,6 +36337,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -36113,6 +36714,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PORT0=MOUSE PORT1=JOY CLOCK=28 + CHIPSET=AGA SCREEN_HEIGHT=262 @@ -36134,6 +36736,26 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 + + Femme Fatale & Data Disks + FemmeFatale&DataDisks + 311ecce9-fed6-5424-8be3-4d908093ee56 + 1 + FemmeFatale&DataDisks.Slave + + FemmeFatale&DataDisks.Slave + data + + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Femme Fatale (& Data Disk) FemmeFatale&DataDisk @@ -36665,6 +37287,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -36686,6 +37309,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -36897,6 +37521,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=216 SCREEN_Y_OFFSET=3 @@ -36957,6 +37582,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_Y_OFFSET=3 @@ -37904,6 +38530,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -38067,6 +38694,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -38633,6 +39261,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 BLITTER=IMMEDIATE CPU=68040 CLOCK=MAX + CHIPSET=AGA SCREEN_HEIGHT=216 SCREEN_Y_OFFSET=3 @@ -38887,6 +39516,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=216 SCREEN_Y_OFFSET=-8 @@ -39072,6 +39702,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PORT1=JOY CPU=68040 CLOCK=MAX + CHIPSET=AGA SCREEN_Y_OFFSET=3 @@ -39141,6 +39772,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -39218,6 +39850,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PORT1=JOY CPU=68040 CLOCK=MAX + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -40329,6 +40962,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -40349,6 +40983,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -40396,6 +41031,7 @@ joyport0_amiberry_custom_none_right_shoulder=Numpad 9 PORT1=JOY CPU=68040 CLOCK=MAX + CHIPSET=AGA @@ -42299,6 +42935,7 @@ joyport1_amiberry_custom_none_right_shoulder=F2 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -43589,6 +44226,7 @@ joyport1_amiberry_custom_none_right_shoulder=F2 PORT0=JOY PORT1=JOY FAST_COPPER=FALSE + CHIPSET=AGA @@ -43831,6 +44469,7 @@ joyport1_amiberry_custom_none_right_shoulder=F2 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -45389,6 +46028,7 @@ joyport2_amiberry_custom_none_south=Right Shift PORT0=MOUSE PORT1=JOY CLOCK=28 + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=20 @@ -45985,6 +46625,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -46068,6 +46709,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -46321,6 +46963,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -46374,6 +47017,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=216 @@ -47813,6 +48457,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -48203,6 +48848,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -48342,6 +48988,23 @@ joyport2_amiberry_custom_none_south=Right Shift + + Kings Quest 5 De MT 32 + KingsQuest5DeMT32 + 38f2a3b3-89a3-56e2-b89b-b914286b4fc1 + 1 + KingsQuest5DeMT32.slave + + KingsQuest5DeMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Kings Quest 5 (Italiano) KingsQuest5It @@ -48359,6 +49022,40 @@ joyport2_amiberry_custom_none_south=Right Shift + + Kings Quest 5 It MT 32 + KingsQuest5ItMT32 + 5b93ab93-6423-575e-8271-64cc09ad7741 + 1 + KingsQuest5ItMT32.slave + + KingsQuest5ItMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Kings Quest 5 MT 32 + KingsQuest5MT32 + 86e1f6e2-5b07-5e4a-9cb2-7f71a6e12dce + 1 + KingsQuest5MT32.slave + + KingsQuest5MT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + King's Quest VI - Heir Today, Gone Tomorrow KingsQuest6 @@ -48431,6 +49128,23 @@ joyport2_amiberry_custom_none_south=Right Shift + + Kings Quest Enhanced MT 32 + KingsQuestEnhancedMT32 + 00d43e13-85cb-531f-be5f-1c73707104fb + 1 + KingsQuestEnhancedMT32.slave + + KingsQuestEnhancedMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + King's Quest - Quest for the Crown KingsQuest @@ -48589,6 +49303,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -48722,6 +49437,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -48739,6 +49455,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -49270,6 +49987,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -49357,6 +50075,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=256 SCREEN_Y_OFFSET=3 @@ -49871,6 +50590,7 @@ joyport2_amiberry_custom_none_south=Right Shift PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -50213,6 +50933,40 @@ joyport0_amiberry_custom_none_right_stick=F7 + + Leisure Suit Larry 5 De MT 32 + LeisureSuitLarry5DeMT32 + 567036e0-4711-54d7-9b9b-ca2f956768fa + 1 + LeisureSuitLarry5DeMT32.Slave + + LeisureSuitLarry5DeMT32.Slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Leisure Suit Larry 5 MT 32 + LeisureSuitLarry5MT32 + c84fb17b-1087-5fdd-92c8-2e4bfe973eb9 + 1 + LeisureSuitLarry5MT32.Slave + + LeisureSuitLarry5MT32.Slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Leisure Suit Larry In The Land Of The Lounge Lizards (Enhanced) LeisureSuitLarryEnhanced @@ -50232,6 +50986,23 @@ joyport0_amiberry_custom_none_right_stick=F7 + + Leisure Suit Larry Enhnd MT 32 + LeisureSuitLarryEnhndMT32 + 5d3c0173-0110-5963-b315-d3e3aeaf4aea + 1 + LeisureSuitLarryEnhndMT32.slave + + LeisureSuitLarryEnhndMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Leisure Suit Larry In The Land Of The Lounge Lizards LeisureSuitLarry @@ -51692,6 +52463,7 @@ joyport0_amiberry_custom_none_right_shoulder=Return PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=0 @@ -52103,6 +52875,7 @@ joyport0_amiberry_custom_none_right_shoulder=Return PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -52854,6 +53627,76 @@ joyport0_amiberry_custom_none_right_shoulder=Return + + Maniac Mansion + ManiacMansion + 82858d7a-7791-50be-a417-1cecbdeffae0 + 1 + ManiacMansion.slave + + ManiacMansion.slave + data + + + PRIMARY_CONTROL=MOUSE + PORT0=MOUSE + PORT1=JOY + SCREEN_HEIGHT=200 + SCREEN_Y_OFFSET=3 + + + + + Maniac Mansion (Deutsch) + ManiacMansionDe + d5aab2f5-f5ea-5c4c-a8ea-29ec14c9555d + 1 + ManiacMansionDe.slave + + ManiacMansionDe.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Maniac Mansion (Espanol) + ManiacMansionEs + 83a672d8-2e8c-5776-b927-e0f5581d465f + 1 + ManiacMansionEs.slave + + ManiacMansionEs.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Maniac Mansion (Francais) + ManiacMansionFr + e542da04-b1d8-5776-8fd3-09b59768cd7a + 1 + ManiacMansionFr.slave + + ManiacMansionFr.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Maniax Maniax @@ -53045,6 +53888,7 @@ joyport0_amiberry_custom_none_right_shoulder=Return PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -53668,6 +54512,7 @@ joyport0_amiberry_custom_none_right_shoulder=Return PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -53816,6 +54661,7 @@ joyport0_amiberry_custom_none_right_shoulder=Return PORT0=MOUSE PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -54327,6 +55173,7 @@ joyport0_amiberry_custom_none_right_shoulder=Return PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -54443,6 +55290,7 @@ joyport0_amiberry_custom_none_right_shoulder=Return PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=240 SCREEN_Y_OFFSET=0 @@ -55255,6 +56103,7 @@ joyport0_amiberry_custom_none_right_shoulder=Return PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -56061,6 +56910,90 @@ joyport0_amiberry_custom_none_start=Space + + North And South (Files) + NorthAndSouthFiles + 02073feb-0364-5979-b7ba-72520c580a85 + 1 + NorthAndSouthFiles.Slave + + NorthAndSouthFiles.Slave + data + + C1:B:Forces Joystick or CD32Pad for PL2 (mouse port) + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + North And South (Files) (NTSC) + NorthAndSouthFilesNTSC + e30b13cc-ced8-5288-bc0a-9a9d7b5b3e2f + 1 + NorthAndSouthFilesNTSC.Slave + + NorthAndSouthFilesNTSC.Slave + data + + C1:B:Forces Joystick or CD32Pad for PL2 (mouse port) + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + North & South (Image) + NorthAndSouthImage + 86939f88-3713-5d08-af37-a8624de5375a + 1 + NorthAndSouthImage.Slave + + NorthAndSouthImage.Slave + data + + C1:B:Forces Joystick or CD32Pad for PL2 (mouse port) + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + North And South (Image) (NTSC) + NorthAndSouthImageNTSC + 5d7c4b85-62a9-58e2-800e-897efb777807 + 1 + NorthAndSouthImageNTSC.Slave + + NorthAndSouthImageNTSC.Slave + data + + C1:B:Forces Joystick or CD32Pad for PL2 (mouse port) + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + North Sea Inferno NorthSeaInferno @@ -56331,6 +57264,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -56645,6 +57579,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -56754,6 +57689,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -57203,6 +58139,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -57534,6 +58471,7 @@ joyport0_amiberry_custom_none_start=Space PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -58571,6 +59509,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -58628,6 +59567,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -58650,6 +59590,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=240 SCREEN_Y_OFFSET=12 @@ -59406,6 +60347,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -59628,6 +60570,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -59723,6 +60666,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -59863,6 +60807,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -60000,6 +60945,7 @@ joyport0_amiberry_custom_none_start=Space PORT0=MOUSE PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=262 SCREEN_Y_OFFSET=-1 @@ -60137,6 +61083,7 @@ joyport0_amiberry_custom_none_start=Space PORT0=MOUSE PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=262 SCREEN_Y_OFFSET=-1 @@ -60176,6 +61123,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -60215,6 +61163,7 @@ joyport0_amiberry_custom_none_start=Space PORT0=MOUSE PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=262 SCREEN_Y_OFFSET=-1 @@ -60466,6 +61415,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=23 @@ -60626,6 +61576,7 @@ joyport0_amiberry_custom_none_start=Space PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -60908,6 +61859,74 @@ joyport0_amiberry_custom_none_start=Space + + Police Quest 3 (Deutsch) + PoliceQuest3De + 1a111cd9-99cc-53a2-9f46-436beefd2fb2 + 1 + PoliceQuest3De.slave + + PoliceQuest3De.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Police Quest 3 De MT 32 + PoliceQuest3DeMT32 + aa21b7d0-dee6-53a8-be5f-7fb63fded97a + 1 + PoliceQuest3DeMT32.slave + + PoliceQuest3DeMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Police Quest 3 (NTSC) + PoliceQuest3NTSC + aaf6b70c-9893-55ce-b0a6-3feda3d97789 + 1 + PoliceQuest3NTSC.slave + + PoliceQuest3NTSC.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Police Quest 3 (NTSC)MT 32 + PoliceQuest3NTSCMT32 + 8aaaa5c9-146e-50e9-8fbe-15fa747daaaf + 1 + PoliceQuest3NTSCMT32.slave + + PoliceQuest3NTSCMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Police Quest - In Pursuit of the Death Angel PoliceQuest @@ -61654,6 +62673,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -62003,6 +63023,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=270 SCREEN_Y_OFFSET=-3 @@ -62317,6 +63338,42 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right + + Quest For Glory II - Trial by Fire + QuestForGlory2 + c6b0445d-459c-58dd-8e08-fa14246ea63b + 1 + QuestForGlory2.Slave + + QuestForGlory2.Slave + data + + + PRIMARY_CONTROL=MOUSE + PORT0=MOUSE + PORT1=JOY + SCREEN_HEIGHT=200 + SCREEN_Y_OFFSET=3 + + + + + Quest For Glory 2 MT 32 + QuestForGlory2MT32 + 773e86e8-3fa8-55b0-a03a-17141ea6a2aa + 1 + QuestForGlory2MT32.Slave + + QuestForGlory2MT32.Slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Quest For Glory - So You Want To Be A Hero QuestForGlory @@ -62520,6 +63577,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -62543,6 +63601,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -62580,6 +63639,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -62617,6 +63677,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -63320,6 +64381,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -63916,6 +64978,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -64393,6 +65456,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -64428,6 +65492,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -64546,6 +65611,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -65448,6 +66514,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=CD32 PORT1=CD32 + CHIPSET=AGA @@ -65521,6 +66588,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -66320,6 +67388,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -66806,6 +67875,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -66823,6 +67893,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -67081,6 +68152,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -68567,6 +69639,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -68809,6 +69882,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -69240,6 +70314,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -69297,6 +70372,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -69862,6 +70938,29 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right + + Spaceport + Spaceport + 30fe5e14-6566-5ae0-bc6a-d37c28f2cf59 + 1 + Spaceport.Slave + + Spaceport.Slave + data + + C1:X:Trainer Infinite Lives:0 + C2:X:Trainer Infinite Fuel:0 + C3:X:Turn off all speed throttling:0 + + + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Space Quest II - Vohaul's Revenge SpaceQuest2 @@ -69913,6 +71012,23 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right + + Space Quest 3 De MT 32 + SpaceQuest3DeMT32 + 15666dca-abba-5c3b-9f1c-52f86c08d740 + 1 + SpaceQuest3DeMT32.slave + + SpaceQuest3DeMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Space Quest IV - Roger Wilco and the Time Rippers SpaceQuest4 @@ -69947,6 +71063,23 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right + + Space Quest 4 De MT 32 + SpaceQuest4DeMT32 + e1adf2ef-9cac-5158-aa39-992ed8c2409c + 1 + SpaceQuest4DeMT32.slave + + SpaceQuest4DeMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Space Quest 4 (NTSC) SpaceQuest4NTSC @@ -69964,6 +71097,23 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right + + Space Quest 4 (NTSC)MT 32 + SpaceQuest4NTSCMT32 + 9ea9dee4-6faa-57c7-886d-64da3863cbdf + 1 + SpaceQuest4NTSCMT32.slave + + SpaceQuest4NTSCMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Space Quest I - Roger Wilco in the Sarien Encounter (Enhanced) SpaceQuestEnhanced @@ -69981,6 +71131,40 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right + + Space Quest I - Roger Wilco in the Sarien Encounter (Enhanced) + SpaceQuestEnhanced + de890543-3d92-57a4-9b2d-e03916e1c0f8 + 1 + SpaceQuestEnhanced.slave + + SpaceQuestEnhanced.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + + + Space Quest Enhanced MT 32 + SpaceQuestEnhancedMT32 + 936f77ba-805a-5054-b70f-b5ecee1754ed + 1 + SpaceQuestEnhancedMT32.slave + + SpaceQuestEnhancedMT32.slave + data + + + PRIMARY_CONTROL=JOYSTICK + PORT0=JOY + PORT1=JOY + + + Space Quest (NTSC) SpaceQuestNTSC @@ -70174,6 +71358,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -70191,6 +71376,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -70352,6 +71538,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -71510,6 +72697,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -71755,6 +72943,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -71772,6 +72961,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -71979,6 +73169,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -72278,6 +73469,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=256 @@ -72381,6 +73573,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -72536,6 +73729,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -72604,6 +73798,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -72850,6 +74045,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -73030,6 +74226,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -73073,6 +74270,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -73107,6 +74305,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -74349,6 +75548,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -74557,6 +75757,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -75758,6 +76959,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -76135,6 +77337,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -76205,6 +77408,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -76605,6 +77809,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -76724,6 +77929,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -77026,6 +78232,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -77043,6 +78250,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -77094,6 +78302,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -77644,6 +78853,7 @@ joyport2_amiberry_custom_none_west=Cursor Up CPU=68040 JIT=TRUE CLOCK=MAX + CHIPSET=AGA SCREEN_HEIGHT=262 SCREEN_Y_OFFSET=-3 Z3_RAM=32 @@ -77664,6 +78874,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -77917,6 +79128,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PORT0=JOY PORT1=JOY JIT=FALSE + CHIPSET=AGA SCREEN_HEIGHT=216 SCREEN_Y_OFFSET=16 @@ -78212,6 +79424,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PORT0=MOUSE PORT1=JOY CLOCK=28 + CHIPSET=AGA @@ -78255,6 +79468,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PORT0=MOUSE PORT1=JOY CLOCK=28 + CHIPSET=AGA @@ -78407,6 +79621,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -78968,6 +80183,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -78985,6 +80201,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -79020,6 +80237,7 @@ joyport2_amiberry_custom_none_west=Cursor Up PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -80385,6 +81603,7 @@ joyport0_amiberry_custom_none_right_stick=F7 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -81021,6 +82240,7 @@ joyport0_amiberry_custom_none_right_stick=F7 PORT1=JOY CPU=68040 CLOCK=MAX + CHIPSET=AGA SCREEN_HEIGHT=216 SCREEN_Y_OFFSET=16 @@ -82227,6 +83447,7 @@ joyport0_amiberry_custom_none_right_stick=F7 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -82461,6 +83682,7 @@ joyport0_amiberry_custom_none_right_stick=F7 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -82478,6 +83700,7 @@ joyport0_amiberry_custom_none_right_stick=F7 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -82630,6 +83853,7 @@ joyport0_amiberry_custom_none_right_stick=F7 PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -83274,6 +84498,7 @@ joyport0_amiberry_custom_none_right_stick=F7 PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -83293,6 +84518,7 @@ joyport0_amiberry_custom_none_right_stick=F7 PRIMARY_CONTROL=MOUSE PORT0=MOUSE PORT1=JOY + CHIPSET=AGA SCREEN_HEIGHT=200 SCREEN_Y_OFFSET=3 @@ -84109,6 +85335,7 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PRIMARY_CONTROL=JOYSTICK PORT0=JOY PORT1=JOY + CHIPSET=AGA @@ -85996,116 +87223,6 @@ joyport0_amiberry_custom_none_dpad_right=Cursor Right PORT0=JOY PORT1=JOY - - - - Bomb Jack Beer Edition - BombJackBeerEdition - 1e263a57-4b29-5de1-b95c-0344232e7deb - 1 - BombJackBeerEdition.slave - - BombJackBeerEdition.slave - data - - - - - - PRIMARY_CONTROL=JOYSTICK - PORT0=JOY - PORT1=JOY - - - - - Femme Fatale & Data Disks - FemmeFatale&DataDisks - 311ecce9-fed6-5424-8be3-4d908093ee56 - 1 - FemmeFatale&DataDisks.Slave - - FemmeFatale&DataDisks.Slave - data - - - - - - PRIMARY_CONTROL=JOYSTICK - PORT0=JOY - PORT1=JOY - - - - - Maniac Mansion - ManiacMansion - 82858d7a-7791-50be-a417-1cecbdeffae0 - 1 - ManiacMansion.slave - - ManiacMansion.slave - data - - - PRIMARY_CONTROL=MOUSE - PORT0=MOUSE - PORT1=JOY - SCREEN_HEIGHT=200 - SCREEN_Y_OFFSET=3 - - - - - Maniac Mansion (Deutsch) - ManiacMansionDe - d5aab2f5-f5ea-5c4c-a8ea-29ec14c9555d - 1 - ManiacMansionDe.slave - - ManiacMansionDe.slave - data - - - PRIMARY_CONTROL=JOYSTICK - PORT0=JOY - PORT1=JOY - - - - - Maniac Mansion (Espanol) - ManiacMansionEs - 83a672d8-2e8c-5776-b927-e0f5581d465f - 1 - ManiacMansionEs.slave - - ManiacMansionEs.slave - data - - - PRIMARY_CONTROL=JOYSTICK - PORT0=JOY - PORT1=JOY - - - - - Maniac Mansion (Francais) - ManiacMansionFr - e542da04-b1d8-5776-8fd3-09b59768cd7a - 1 - ManiacMansionFr.slave - - ManiacMansionFr.slave - data - - - PRIMARY_CONTROL=JOYSTICK - PORT0=JOY - PORT1=JOY - diff --git a/whdboot/save-data/Kickstarts/kick33180.A500.RTB b/whdboot/save-data/Kickstarts/kick33180.A500.RTB new file mode 100755 index 00000000..89fba0b7 Binary files /dev/null and b/whdboot/save-data/Kickstarts/kick33180.A500.RTB differ diff --git a/whdboot/save-data/Kickstarts/kick33192.A500.RTB b/whdboot/save-data/Kickstarts/kick33192.A500.RTB new file mode 100755 index 00000000..89fba0b7 Binary files /dev/null and b/whdboot/save-data/Kickstarts/kick33192.A500.RTB differ diff --git a/whdboot/save-data/Kickstarts/kick34005.A500.RTB b/whdboot/save-data/Kickstarts/kick34005.A500.RTB new file mode 100755 index 00000000..2407ca0b Binary files /dev/null and b/whdboot/save-data/Kickstarts/kick34005.A500.RTB differ diff --git a/whdboot/save-data/Kickstarts/kick40063.A600.RTB b/whdboot/save-data/Kickstarts/kick40063.A600.RTB new file mode 100755 index 00000000..bf69abda Binary files /dev/null and b/whdboot/save-data/Kickstarts/kick40063.A600.RTB differ diff --git a/whdboot/save-data/Kickstarts/kick40068.A1200.RTB b/whdboot/save-data/Kickstarts/kick40068.A1200.RTB new file mode 100755 index 00000000..0b33bd12 Binary files /dev/null and b/whdboot/save-data/Kickstarts/kick40068.A1200.RTB differ diff --git a/whdboot/save-data/Kickstarts/kick40068.A4000.RTB b/whdboot/save-data/Kickstarts/kick40068.A4000.RTB new file mode 100755 index 00000000..b8c64be1 Binary files /dev/null and b/whdboot/save-data/Kickstarts/kick40068.A4000.RTB differ