From 4e6b8196ebd46ac90474748837d47479ede41737 Mon Sep 17 00:00:00 2001 From: spacy51 Date: Thu, 10 Jan 2008 19:10:28 +0000 Subject: [PATCH] minor cleanup & changes --- res/todo.txt | 2 + src/GBA.cpp | 4 +- src/Util.cpp | 24 +- src/Util.h | 4 +- src/win32/MainWnd.cpp | 6 +- src/win32/VBA.rc | 1002 +++++++++++++---------------------------- 6 files changed, 336 insertions(+), 706 deletions(-) diff --git a/res/todo.txt b/res/todo.txt index 47ba78af..0d8e2fdf 100644 --- a/res/todo.txt +++ b/res/todo.txt @@ -20,6 +20,8 @@ Important: Less important: +- Update 7-Zip code from 4.23 to current (4.57) + - Add documentation for VBA-M (configuration guide) - DDraw, D3D, OGL: Add full screen device & frequency selection diff --git a/src/GBA.cpp b/src/GBA.cpp index 48765cc6..c3a4969f 100644 --- a/src/GBA.cpp +++ b/src/GBA.cpp @@ -1300,9 +1300,7 @@ int CPULoadRom(const char *szFile) return 0; } - u8 *whereToLoad = rom; - if(cpuIsMultiBoot) - whereToLoad = workRAM; + u8 *whereToLoad = cpuIsMultiBoot ? workRAM : rom; if(CPUIsELF(szFile)) { FILE *f = fopen(szFile, "rb"); diff --git a/src/Util.cpp b/src/Util.cpp index 84d70200..4fd06b5b 100644 --- a/src/Util.cpp +++ b/src/Util.cpp @@ -457,20 +457,6 @@ bool utilIsGBImage(const char * file) return false; } -bool utilIsZipFile(const char *file) -{ - if(strlen(file) > 4) { - const char * p = strrchr(file,'.'); - - if(p != NULL) { - if(_stricmp(p, ".zip") == 0) - return true; - } - } - - return false; -} - bool utilIsGzipFile(const char *file) { if(strlen(file) > 3) { @@ -487,7 +473,8 @@ bool utilIsGzipFile(const char *file) return false; } -void utilGetBaseName(const char *file, char *buffer) +// strip .gz or .z off end +void utilStripDoubleExtension(const char *file, char *buffer) { if(buffer != file) // allows conversion in place strcpy(buffer, file); @@ -519,7 +506,7 @@ static File_Extractor* scan_arc(const char *file, bool (*accept)(const char *), strncpy(buffer,fex_name(fe),sizeof buffer); buffer [sizeof buffer-1] = '\0'; - utilGetBaseName(buffer, buffer); // strip .gz or .z off end + utilStripDoubleExtension(buffer, buffer); if(accept(buffer)) { found = true; @@ -578,7 +565,7 @@ u8 *utilLoad(const char *file, { // find image file char buffer [2048]; - File_Extractor* fe = scan_arc(file,accept,buffer); + File_Extractor *fe = scan_arc(file,accept,buffer); if(!fe) return NULL; @@ -590,6 +577,7 @@ u8 *utilLoad(const char *file, u8 *image = data; if(image == NULL) { + // allocate buffer memory if none was passed to the function image = (u8 *)malloc(utilGetSize(size)); if(image == NULL) { fex_close(fe); @@ -601,7 +589,7 @@ u8 *utilLoad(const char *file, } // Read image - int read = fileSize <= size ? fileSize : size; + int read = fileSize <= size ? fileSize : size; // do not read beyond file fex_err_t err = fex_read_once(fe, image, read); fex_close(fe); if(err) { diff --git a/src/Util.h b/src/Util.h index 62ca8ecc..38451c8b 100644 --- a/src/Util.h +++ b/src/Util.h @@ -40,10 +40,8 @@ extern bool utilWriteBMPFile(const char *, int, int, u8 *); extern void utilApplyIPS(const char *ips, u8 **rom, int *size); extern bool utilIsGBAImage(const char *); extern bool utilIsGBImage(const char *); -extern bool utilIsZipFile(const char *); extern bool utilIsGzipFile(const char *); -extern bool utilIsRarFile(const char *); -extern void utilGetBaseName(const char *, char *); +extern void utilStripDoubleExtension(const char *, char *); extern IMAGE_TYPE utilFindType(const char *); extern u8 *utilLoad(const char *, bool (*)(const char*), diff --git a/src/win32/MainWnd.cpp b/src/win32/MainWnd.cpp index c8113e81..c34ea5a4 100644 --- a/src/win32/MainWnd.cpp +++ b/src/win32/MainWnd.cpp @@ -483,9 +483,9 @@ bool MainWnd::FileRun() char tempName[2048]; char file[2048]; - utilGetBaseName(theApp.szFile, tempName); + utilStripDoubleExtension(theApp.szFile, tempName); - _fullpath(file, tempName, 1024); + _fullpath(file, tempName, 2048); theApp.filename = file; int index = theApp.filename.ReverseFind('.'); @@ -569,7 +569,7 @@ bool MainWnd::FileRun() strcat(tempName, "\\vba-over.ini"); UINT i = GetPrivateProfileInt(buffer, - "rtcEnabled", + "rtcEnabled", -1, tempName); if(i != (UINT)-1) diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc index 5af47a60..ba0d489d 100644 --- a/src/win32/VBA.rc +++ b/src/win32/VBA.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -27,38 +27,34 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // IDD_OAL_CONFIG DIALOGEX 0, 0, 167, 114 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "OpenAL configuration" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,66,96,48,12 PUSHBUTTON "Cancel",IDCANCEL,114,96,48,12 - COMBOBOX IDC_DEVICE,6,18,156,36,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DEVICE,6,18,156,36,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Select device:",IDC_STATIC,6,6,156,8 GROUPBOX "Sound Buffer Count",IDC_STATIC,6,36,156,54 - CONTROL "",IDC_SLIDER_BUFFERCOUNT,"msctls_trackbar32", - TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,12,48,144,24 - CTEXT "bufferInfo",IDC_BUFFERINFO,12,72,144,12,0, - WS_EX_DLGMODALFRAME + CONTROL "",IDC_SLIDER_BUFFERCOUNT,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,12,48,144,24 + CTEXT "bufferInfo",IDC_BUFFERINFO,12,72,144,12,0,WS_EX_DLGMODALFRAME END -IDD_SELECT_PLUGIN DIALOG DISCARDABLE 0, 0, 201, 120 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_SELECT_PLUGIN DIALOG 0, 0, 201, 120 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Filter Plugin" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,39,89,50,14 PUSHBUTTON "Cancel",IDCANCEL,103,89,50,14 - COMBOBOX IDC_COMBO_PLUGIN,20,28,163,58,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO_PLUGIN,20,28,163,58,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "Filter Plugin:",IDC_STATIC,18,15,66,8 END 7533 DIALOGEX 0, 0, 254, 203 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Link Options" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "Tab1",IDC_TAB1,"SysTabControl32",0x0,9,7,240,162 PUSHBUTTON "OK",ID_OK,57,180,60,15 @@ -66,120 +62,98 @@ BEGIN END 7532 DIALOGEX 0, 0, 184, 79 -STYLE WS_CHILD | WS_VISIBLE -FONT 8, "MS Sans Serif" +STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "Link timeout (in milliseconds)",IDC_STATIC,17,12,92,16 EDITTEXT IDC_LINKTIMEOUT,116,10,53,14,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "Single Computer",IDC_LINK_SINGLE,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,17,27,71,16 - CONTROL "Network",IDC_LINK_LAN,"Button",BS_AUTORADIOBUTTON,17,43, - 70,16 + CONTROL "Single Computer",IDC_LINK_SINGLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,17,27,71,16 + CONTROL "Network",IDC_LINK_LAN,"Button",BS_AUTORADIOBUTTON,17,43,70,16 END -7534 DIALOG DISCARDABLE 0, 0, 210, 113 -STYLE WS_CHILD +7534 DIALOG 0, 0, 210, 113 +STYLE DS_SETFONT | WS_CHILD FONT 8, "MS Sans Serif" BEGIN - CONTROL "2",IDC_LINK2P,"Button",BS_AUTORADIOBUTTON | WS_GROUP,46, - 16,21,13 + CONTROL "2",IDC_LINK2P,"Button",BS_AUTORADIOBUTTON | WS_GROUP,46,16,21,13 CONTROL "3",IDC_LINK3P,"Button",BS_AUTORADIOBUTTON,94,16,21,13 CONTROL "4",IDC_LINK4P,"Button",BS_AUTORADIOBUTTON,142,16,21,13 - CONTROL "TCP/IP",IDC_LINKTCP,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,54,47,42,14 - CONTROL "UDP",IDC_LINKUDP,"Button",BS_AUTORADIOBUTTON | - WS_DISABLED,121,47,33,14 + CONTROL "TCP/IP",IDC_LINKTCP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,54,47,42,14 + CONTROL "UDP",IDC_LINKUDP,"Button",BS_AUTORADIOBUTTON | WS_DISABLED,121,47,33,14 PUSHBUTTON "Start!",IDC_SERVERSTART,79,89,50,17 LTEXT "Select number of players:",IDC_STATIC,60,7,89,10 LTEXT "Select protocol:",IDC_STATIC,78,33,53,11 - CONTROL "Speed hacks",IDC_SSPEED,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,76,70,57,12 + CONTROL "Speed hacks",IDC_SSPEED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,76,70,57,12 END 7535 DIALOGEX 0, 0, 188, 108 -STYLE WS_CHILD -FONT 8, "MS Sans Serif" +STYLE DS_SETFONT | WS_CHILD +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "TCP/IP",IDC_CLINKTCP,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,58,20,39,12 - CONTROL "UDP",IDC_CLINKUDP,"Button",BS_AUTORADIOBUTTON | - WS_DISABLED,118,20,32,12 + CONTROL "TCP/IP",IDC_CLINKTCP,"Button",BS_AUTORADIOBUTTON | WS_GROUP,58,20,39,12 + CONTROL "UDP",IDC_CLINKUDP,"Button",BS_AUTORADIOBUTTON | WS_DISABLED,118,20,32,12 EDITTEXT IDC_SERVERIP,84,39,79,12,ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "Connect",IDC_LINKCONNECT,75,81,59,16 LTEXT "Select protocol:",IDC_STATIC,78,7,53,9 LTEXT "Server IP address or hostname:",IDC_STATIC,7,37,62,18 LTEXT "Speed hacks:",IDC_STATIC,7,64,47,10 - CONTROL "Off (accurate)",IDC_SPEEDOFF,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,60,63,57,12 - CONTROL "On (fast)",IDC_SPEEDON,"Button",BS_AUTORADIOBUTTON,128, - 63,48,12 + CONTROL "Off (accurate)",IDC_SPEEDOFF,"Button",BS_AUTORADIOBUTTON | WS_GROUP,60,63,57,12 + CONTROL "On (fast)",IDC_SPEEDON,"Button",BS_AUTORADIOBUTTON,128,63,48,12 END -7536 DIALOG DISCARDABLE 0, 0, 186, 90 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +7536 DIALOG 0, 0, 186, 90 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Waiting for players" FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "Cancel",IDCANCEL,63,69,50,14 - CONTROL "Progress1",IDC_SERVERWAIT,"msctls_progress32",WS_BORDER, - 33,50,120,13 + CONTROL "Progress1",IDC_SERVERWAIT,"msctls_progress32",WS_BORDER,33,50,120,13 LTEXT "",IDC_STATIC1,7,7,154,8 LTEXT "",IDC_STATIC2,7,17,105,8 LTEXT "",IDC_STATIC3,7,25,105,8 LTEXT "",IDC_STATIC4,7,33,105,8 END -IDD_OPENDLG DIALOG DISCARDABLE 36, 24, 202, 117 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | - WS_SYSMENU +IDD_OPENDLG DIALOG 36, 24, 202, 117 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Open" FONT 8, "MS Shell Dlg" BEGIN LTEXT "File &name:",1090,2,1,81,8 EDITTEXT 1152,0,10,104,12,ES_AUTOHSCROLL | ES_OEMCONVERT - LISTBOX 1120,1,24,104,53,LBS_SORT | LBS_OWNERDRAWFIXED | - LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | - WS_TABSTOP + LISTBOX 1120,1,24,104,53,LBS_SORT | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "&Folders:",-1,112,0,53,9 LTEXT "",1088,113,10,86,9,SS_NOPREFIX - LISTBOX 1121,112,24,88,52,LBS_SORT | LBS_OWNERDRAWFIXED | - LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | - WS_TABSTOP + LISTBOX 1121,112,24,88,52,LBS_SORT | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "List files of &type:",1089,1,75,81,9 - COMBOBOX 1136,1,87,104,13,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP + COMBOBOX 1136,1,87,104,13,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Dri&ves:",1091,113,76,70,9 - COMBOBOX 1137,112,87,71,68,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | - CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | - WS_TABSTOP + COMBOBOX 1137,112,87,71,68,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,24,102,50,14,WS_GROUP PUSHBUTTON "Cancel",IDCANCEL,90,102,50,14,WS_GROUP END IDD_ABOUT DIALOGEX 0, 0, 179, 143 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW CAPTION "About" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN ICON 101,IDC_STATIC,6,6,20,20 CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,34,7,120,8 - CTEXT "Copyright © 2007 VBA development team",IDC_STATIC,16,36, - 144,8 + CTEXT "Copyright © 2007 VBA development team",IDC_STATIC,16,36,144,8 CTEXT "https://vbam.bountysource.com",IDC_URL,6,126,165,8 - CTEXT "Contributions by Costis and original VBA Team", - IDC_STATIC,7,49,165,8 + CTEXT "Contributions by Costis and original VBA Team",IDC_STATIC,7,49,165,8 CTEXT "Version",IDC_STATIC,47,17,27,8 CTEXT "",IDC_VERSION,80,18,60,8,SS_NOPREFIX GROUPBOX "VBA Development Team",IDC_STATIC,7,61,165,59 - LTEXT "mudlord\nNach\nJonas Quinn\nDJRobX\nSpacy",IDC_STATIC, - 15,70,143,44 + LTEXT "mudlord\nNach\nJonas Quinn\nDJRobX\nSpacy",IDC_STATIC,15,70,143,44 END IDD_DIRECTORIES DIALOGEX 0, 0, 222, 270 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Directories" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Game Boy Advance ROMs",IDC_STATIC,6,6,210,30 EDITTEXT IDC_ROM_PATH,12,18,180,12,ES_AUTOHSCROLL @@ -199,18 +173,17 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,120,246,48,18 PUSHBUTTON "Cancel",IDCANCEL,168,246,48,18 GROUPBOX "Relative Paths",IDC_STATIC,6,222,102,42 - CONTROL "Example:\n .\\battery\n ..\\screenshots\\vba", - IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,12,234, - 90,24 + CONTROL "Example:\n .\\battery\n ..\\screenshots\\vba",IDC_STATIC, + "Static",SS_LEFTNOWORDWRAP | WS_GROUP,12,234,90,24 GROUPBOX "Game Boy Color ROMs",IDC_STATIC,6,42,210,30 EDITTEXT IDC_GBCROM_PATH,12,54,180,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_GBCROM_DIR,192,54,18,12 END IDD_CONFIG DIALOGEX 0, 0, 448, 102 -STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Joypad configuration" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "Up",IDC_STATIC,6,6,36,12 EDITTEXT IDC_EDIT_UP,48,6,96,12,ES_AUTOHSCROLL @@ -238,50 +211,33 @@ BEGIN EDITTEXT IDC_EDIT_CAPTURE,348,24,96,12,ES_AUTOHSCROLL RTEXT "GS",IDC_STATIC,306,42,36,12 EDITTEXT IDC_EDIT_BUTTON_GS,348,42,96,12,ES_AUTOHSCROLL - CONTROL "Multiple key assignments",IDC_APPENDMODE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,348,60,96,12 + CONTROL "Multiple key assignments",IDC_APPENDMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,348,60,96,12 DEFPUSHBUTTON "OK",ID_OK,348,78,48,18 PUSHBUTTON "Cancel",ID_CANCEL,396,78,48,18 PUSHBUTTON "Clear all",IDC_CLEAR_ALL,306,60,36,12 END -IDD_CHEATS DIALOG DISCARDABLE 0, 0, 276, 253 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_CHEATS DIALOG 0, 0, 276, 253 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Search for cheats" FONT 8, "MS Sans Serif" BEGIN - CONTROL "",IDC_CHEAT_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,3,5,265,111 - CONTROL "Ol&d value",IDC_OLD_VALUE,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,11,129,46,10 - CONTROL "Specifi&c value",IDC_SPECIFIC_VALUE,"Button", - BS_AUTORADIOBUTTON,11,141,61,10 - CONTROL "&8 bits",IDC_SIZE_8,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,11,167,33,10 - CONTROL "&16 bits",IDC_SIZE_16,"Button",BS_AUTORADIOBUTTON,11, - 179,37,10 - CONTROL "&32 bits",IDC_SIZE_32,"Button",BS_AUTORADIOBUTTON,11, - 191,37,10 - CONTROL "&Equal",IDC_EQ,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 100,128,34,10 - CONTROL "&Not equal",IDC_NE,"Button",BS_AUTORADIOBUTTON,100,140, - 47,10 - CONTROL "&Less than",IDC_LT,"Button",BS_AUTORADIOBUTTON,100,152, - 47,10 - CONTROL "Le&ss or equal",IDC_LE,"Button",BS_AUTORADIOBUTTON,100, - 164,58,10 - CONTROL "&Greather than",IDC_GT,"Button",BS_AUTORADIOBUTTON,100, - 176,59,10 - CONTROL "G&reater or equal",IDC_GE,"Button",BS_AUTORADIOBUTTON, - 100,188,67,10 - CONTROL "S&igned",IDC_SIGNED,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,202,130,38,10 - CONTROL "&Unsigned",IDC_UNSIGNED,"Button",BS_AUTORADIOBUTTON,202, - 142,46,10 - CONTROL "&Hexadecimal",IDC_HEXADECIMAL,"Button", - BS_AUTORADIOBUTTON,202,154,57,10 - CONTROL "U&pdate values",IDC_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_GROUP | WS_TABSTOP,192,192,62,10 + CONTROL "",IDC_CHEAT_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,3,5,265,111 + CONTROL "Ol&d value",IDC_OLD_VALUE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,129,46,10 + CONTROL "Specifi&c value",IDC_SPECIFIC_VALUE,"Button",BS_AUTORADIOBUTTON,11,141,61,10 + CONTROL "&8 bits",IDC_SIZE_8,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,167,33,10 + CONTROL "&16 bits",IDC_SIZE_16,"Button",BS_AUTORADIOBUTTON,11,179,37,10 + CONTROL "&32 bits",IDC_SIZE_32,"Button",BS_AUTORADIOBUTTON,11,191,37,10 + CONTROL "&Equal",IDC_EQ,"Button",BS_AUTORADIOBUTTON | WS_GROUP,100,128,34,10 + CONTROL "&Not equal",IDC_NE,"Button",BS_AUTORADIOBUTTON,100,140,47,10 + CONTROL "&Less than",IDC_LT,"Button",BS_AUTORADIOBUTTON,100,152,47,10 + CONTROL "Le&ss or equal",IDC_LE,"Button",BS_AUTORADIOBUTTON,100,164,58,10 + CONTROL "&Greather than",IDC_GT,"Button",BS_AUTORADIOBUTTON,100,176,59,10 + CONTROL "G&reater or equal",IDC_GE,"Button",BS_AUTORADIOBUTTON,100,188,67,10 + CONTROL "S&igned",IDC_SIGNED,"Button",BS_AUTORADIOBUTTON | WS_GROUP,202,130,38,10 + CONTROL "&Unsigned",IDC_UNSIGNED,"Button",BS_AUTORADIOBUTTON,202,142,46,10 + CONTROL "&Hexadecimal",IDC_HEXADECIMAL,"Button",BS_AUTORADIOBUTTON,202,154,57,10 + CONTROL "U&pdate values",IDC_UPDATE,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,192,192,62,10 EDITTEXT IDC_VALUE,95,211,172,14,ES_AUTOHSCROLL PUSHBUTTON "&Start",IDC_START,15,237,50,14,WS_GROUP PUSHBUTTON "S&earch",IDC_SEARCH,80,236,50,14 @@ -294,26 +250,20 @@ BEGIN LTEXT "Enter &value:",IDC_STATIC,3,214,69,8 END -IDD_ADD_CHEAT DIALOG DISCARDABLE 0, 0, 186, 137 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_ADD_CHEAT DIALOG 0, 0, 186, 137 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Add cheat" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_ADDRESS,60,6,123,14,ES_AUTOHSCROLL EDITTEXT IDC_VALUE,60,24,123,14,ES_AUTOHSCROLL EDITTEXT IDC_DESC,60,42,123,14,ES_AUTOHSCROLL - CONTROL "8-bit",IDC_SIZE_8,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,11,70,29,10 - CONTROL "16-bit",IDC_SIZE_16,"Button",BS_AUTORADIOBUTTON,62,70, - 33,10 - CONTROL "32-bit",IDC_SIZE_32,"Button",BS_AUTORADIOBUTTON,117,70, - 33,10 - CONTROL "&Signed",IDC_SIGNED,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,11,97,38,10 - CONTROL "&Unsigned",IDC_UNSIGNED,"Button",BS_AUTORADIOBUTTON,62, - 98,46,10 - CONTROL "&Hexadecimal",IDC_HEXADECIMAL,"Button", - BS_AUTORADIOBUTTON,117,98,57,10 + CONTROL "8-bit",IDC_SIZE_8,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,70,29,10 + CONTROL "16-bit",IDC_SIZE_16,"Button",BS_AUTORADIOBUTTON,62,70,33,10 + CONTROL "32-bit",IDC_SIZE_32,"Button",BS_AUTORADIOBUTTON,117,70,33,10 + CONTROL "&Signed",IDC_SIGNED,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,11,97,38,10 + CONTROL "&Unsigned",IDC_UNSIGNED,"Button",BS_AUTORADIOBUTTON,62,98,46,10 + CONTROL "&Hexadecimal",IDC_HEXADECIMAL,"Button",BS_AUTORADIOBUTTON,117,98,57,10 DEFPUSHBUTTON "&OK",ID_OK,36,116,50,14,WS_GROUP PUSHBUTTON "&Cancel",ID_CANCEL,99,116,50,14 LTEXT "&Value:",IDC_STATIC,3,27,54,8 @@ -323,13 +273,12 @@ BEGIN LTEXT "&Description:",IDC_STATIC,3,45,55,8 END -IDD_CHEAT_LIST DIALOG DISCARDABLE 0, 0, 280, 250 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_CHEAT_LIST DIALOG 0, 0, 280, 250 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Cheat list" FONT 8, "MS Sans Serif" BEGIN - CONTROL "Restore &previous values",IDC_RESTORE,"Button", - BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,183,92,10 + CONTROL "Restore &previous values",IDC_RESTORE,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,183,92,10 PUSHBUTTON "&Code...",IDC_ADD_CODE,9,208,64,14,WS_GROUP PUSHBUTTON "C&heat...",IDC_ADD_CHEAT,75,208,64,14 PUSHBUTTON "&Gameshark...",IDC_ADD_GAMESHARK,141,208,64,14 @@ -338,33 +287,25 @@ BEGIN PUSHBUTTON "Remove A&ll",IDC_REMOVE_ALL,75,230,64,14 PUSHBUTTON "&Enable/Dis.",IDC_ENABLE,141,230,64,14 DEFPUSHBUTTON "&OK",ID_OK,206,230,64,14,WS_GROUP - CONTROL "",IDC_CHEAT_LIST,"SysListView32",LVS_REPORT | WS_BORDER | - WS_GROUP | WS_TABSTOP,5,15,269,156 + CONTROL "",IDC_CHEAT_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_GROUP | WS_TABSTOP,5,15,269,156 LTEXT "Status legend:",IDC_STATIC,6,3,46,8 LTEXT "E: Enabled",IDC_STATIC,188,3,36,8 LTEXT "D: Disabled",IDC_STATIC,234,3,38,8 GROUPBOX "Add",IDC_STATIC,5,199,268,27 END -IDD_ASSOCIATIONS DIALOG DISCARDABLE 0, 0, 116, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_ASSOCIATIONS DIALOG 0, 0, 116, 95 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Associations" FONT 8, "MS Sans Serif" BEGIN - CONTROL ".gb",IDC_GB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,15, - 26,10 - CONTROL ".sgb",IDC_SGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15, - 29,29,10 - CONTROL ".cgb",IDC_CGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15, - 43,30,10 - CONTROL ".gbc",IDC_GBC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15, - 57,30,10 - CONTROL ".gba",IDC_GBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75, - 13,30,10 - CONTROL ".agb",IDC_AGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75, - 27,30,10 - CONTROL ".bin",IDC_BIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75, - 41,27,10 + CONTROL ".gb",IDC_GB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,15,26,10 + CONTROL ".sgb",IDC_SGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,29,29,10 + CONTROL ".cgb",IDC_CGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,43,30,10 + CONTROL ".gbc",IDC_GBC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,57,30,10 + CONTROL ".gba",IDC_GBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,13,30,10 + CONTROL ".agb",IDC_AGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,27,30,10 + CONTROL ".bin",IDC_BIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,41,27,10 DEFPUSHBUTTON "OK",ID_OK,3,78,50,14 PUSHBUTTON "Cancel",ID_CANCEL,63,78,50,14 GROUPBOX "GBA Types",IDC_STATIC,63,3,50,51 @@ -372,9 +313,9 @@ BEGIN END IDD_GBA_ROM_INFO DIALOGEX 0, 0, 220, 142 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ROM Information" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",ID_OK,84,121,50,14 LTEXT "Game title:",IDC_STATIC,7,10,60,8 @@ -396,9 +337,9 @@ BEGIN END IDD_GB_ROM_INFO DIALOGEX 0, 0, 220, 225 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ROM Information" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",ID_OK,40,204,50,14 LTEXT "Game title:",IDC_STATIC,7,10,60,8 @@ -429,17 +370,14 @@ BEGIN LTEXT "Maker name:",IDC_STATIC,7,52,60,8 END -IDD_GB_CHEAT_LIST DIALOG DISCARDABLE 0, 0, 286, 221 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_GB_CHEAT_LIST DIALOG 0, 0, 286, 221 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Gameboy Cheat List" FONT 8, "MS Sans Serif" BEGIN - CONTROL "",IDC_CHEAT_LIST,"SysListView32",LVS_REPORT | WS_BORDER | - WS_GROUP | WS_TABSTOP,9,20,269,156 - PUSHBUTTON "Add &GameGenie...",IDC_ADD_GG_CHEAT,9,183,80,14, - WS_GROUP - PUSHBUTTON "&Add GameShark...",IDC_ADD_GS_CHEAT,103,183,80,14, - WS_GROUP + CONTROL "",IDC_CHEAT_LIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_GROUP | WS_TABSTOP,9,20,269,156 + PUSHBUTTON "Add &GameGenie...",IDC_ADD_GG_CHEAT,9,183,80,14,WS_GROUP + PUSHBUTTON "&Add GameShark...",IDC_ADD_GS_CHEAT,103,183,80,14,WS_GROUP PUSHBUTTON "&Remove",IDC_REMOVE,197,183,80,14 PUSHBUTTON "Remove A&ll",IDC_REMOVE_ALL,9,202,80,14 PUSHBUTTON "&Enable/Dis.",IDC_ENABLE,103,202,80,14 @@ -449,42 +387,39 @@ BEGIN LTEXT "D: Disabled",IDC_STATIC,241,9,38,8 END -IDD_ADD_CHEAT_DLG DIALOG DISCARDABLE 0, 0, 182, 107 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_ADD_CHEAT_DLG DIALOG 0, 0, 182, 107 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Title" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_DESC,60,7,120,14,ES_AUTOHSCROLL - EDITTEXT IDC_CODE,60,23,120,58,ES_MULTILINE | ES_UPPERCASE | - ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN + EDITTEXT IDC_CODE,60,23,120,58,ES_MULTILINE | ES_UPPERCASE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN DEFPUSHBUTTON "OK",ID_OK,33,86,50,14 PUSHBUTTON "Cancel",ID_CANCEL,99,86,50,14 LTEXT "&Description:",IDC_STATIC,3,10,54,8 LTEXT "&Code:",IDC_STATIC,3,29,54,8 END -IDD_GB_PRINTER DIALOG DISCARDABLE 0, 0, 178, 209 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_GB_PRINTER DIALOG 0, 0, 178, 209 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "GB Printer" FONT 8, "MS Sans Serif" BEGIN - CONTROL "&1x",IDC_1X,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13, - 166,22,10 + CONTROL "&1x",IDC_1X,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,166,22,10 CONTROL "&2x",IDC_2X,"Button",BS_AUTORADIOBUTTON,55,166,23,10 CONTROL "&3x",IDC_3X,"Button",BS_AUTORADIOBUTTON,98,166,23,10 CONTROL "&4x",IDC_4X,"Button",BS_AUTORADIOBUTTON,141,166,23,10 DEFPUSHBUTTON "&Print...",ID_PRINT,7,190,50,14,WS_GROUP PUSHBUTTON "&Save...",ID_SAVE,64,190,50,14 PUSHBUTTON "&Close",ID_OK,121,190,50,14 - CONTROL "",IDC_GB_PRINTER,"Static",SS_BLACKFRAME | WS_GROUP,7,6, - 162,146 + CONTROL "",IDC_GB_PRINTER,"Static",SS_BLACKFRAME | WS_GROUP,7,6,162,146 GROUPBOX "Print Size",IDC_STATIC,7,156,162,25 END IDD_MOTION_CONFIG DIALOGEX 0, 0, 234, 107 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Motion Sensor" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN EDITTEXT IDC_EDIT_UP,41,2,186,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_DOWN,41,16,186,12,ES_AUTOHSCROLL @@ -500,8 +435,8 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,66,135,10 END -IDD_LANG_SELECT DIALOG DISCARDABLE 0, 0, 186, 68 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_LANG_SELECT DIALOG 0, 0, 186, 68 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Language selection" FONT 8, "MS Sans Serif" BEGIN @@ -513,45 +448,35 @@ BEGIN LTEXT "",IDC_LANG_NAME,140,9,40,8,SS_NOPREFIX END -IDD_CODE_SELECT DIALOG DISCARDABLE 0, 0, 316, 235 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_CODE_SELECT DIALOG 0, 0, 316, 235 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select codes to import" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",ID_OK,91,214,50,14 PUSHBUTTON "Cancel",ID_CANCEL,174,214,50,14 - LISTBOX IDC_GAME_LIST,7,7,302,205,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | - WS_TABSTOP + LISTBOX IDC_GAME_LIST,7,7,302,205,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END -IDD_MAP_VIEW DIALOG DISCARDABLE 0, 0, 322, 238 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_MAP_VIEW DIALOG 0, 0, 322, 238 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Map view" FONT 8, "MS Sans Serif" BEGIN - CONTROL "Frame 0",IDC_FRAME_0,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,13,22,41,10 - CONTROL "Frame 1",IDC_FRAME_1,"Button",BS_AUTORADIOBUTTON,13,36, - 41,10 - CONTROL "BG0",IDC_BG0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13, - 63,30,10 + CONTROL "Frame 0",IDC_FRAME_0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,22,41,10 + CONTROL "Frame 1",IDC_FRAME_1,"Button",BS_AUTORADIOBUTTON,13,36,41,10 + CONTROL "BG0",IDC_BG0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,63,30,10 CONTROL "BG1",IDC_BG1,"Button",BS_AUTORADIOBUTTON,13,77,30,10 CONTROL "BG2",IDC_BG2,"Button",BS_AUTORADIOBUTTON,13,91,30,10 CONTROL "BG3",IDC_BG3,"Button",BS_AUTORADIOBUTTON,13,105,30,10 - CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | - WS_GROUP | WS_TABSTOP,7,122,68,10 - CONTROL "Auto update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_GROUP | WS_TABSTOP,7,134,55,10 + CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,122,68,10 + CONTROL "Auto update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,134,55,10 PUSHBUTTON "&Refresh",IDC_REFRESH,25,217,50,14,WS_GROUP PUSHBUTTON "&Save...",IDC_SAVE,88,217,50,14,WS_GROUP PUSHBUTTON "&Close",IDC_CLOSE,155,217,50,14 - CONTROL "MapView",IDC_MAP_VIEW,"VbaBitmapControl",WS_GROUP | - WS_TABSTOP,187,15,128,128 - CONTROL "Zoom",IDC_MAP_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | - WS_TABSTOP,7,148,64,64 - CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,187,164, - 48,47 + CONTROL "MapView",IDC_MAP_VIEW,"VbaBitmapControl",WS_GROUP | WS_TABSTOP,187,15,128,128 + CONTROL "Zoom",IDC_MAP_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | WS_TABSTOP,7,148,64,64 + CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,187,164,48,47 LTEXT "",IDC_R,245,173,50,8,SS_NOPREFIX LTEXT "",IDC_G,245,185,50,8,SS_NOPREFIX LTEXT "",IDC_B,245,197,50,8,SS_NOPREFIX @@ -584,8 +509,8 @@ BEGIN LTEXT "",IDC_PALETTE_NUM,130,135,53,8,SS_NOPREFIX END -IDD_PALETTE_VIEW DIALOG DISCARDABLE 0, 0, 316, 266 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_PALETTE_VIEW DIALOG 0, 0, 316, 266 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Palette View" FONT 8, "MS Sans Serif" BEGIN @@ -598,10 +523,8 @@ BEGIN LTEXT "",IDC_G,53,192,50,8,SS_NOPREFIX LTEXT "",IDC_B,53,204,50,8,SS_NOPREFIX LTEXT "",IDC_VALUE,53,216,50,8,SS_NOPREFIX - CONTROL "Custom1",IDC_COLOR,"VbaColorControl",WS_TABSTOP,161,168, - 50,50 - CONTROL "PaletteViewBG",IDC_PALETTE_VIEW,"VbaPaletteViewControl", - WS_TABSTOP,12,30,128,128 + CONTROL "Custom1",IDC_COLOR,"VbaColorControl",WS_TABSTOP,161,168,50,50 + CONTROL "PaletteViewBG",IDC_PALETTE_VIEW,"VbaPaletteViewControl",WS_TABSTOP,12,30,128,128 CONTROL "PaletteViewBG",IDC_PALETTE_VIEW_OBJ, "VbaPaletteViewControl",WS_TABSTOP,166,30,128,128 GROUPBOX "Background",IDC_STATIC,7,20,137,143 @@ -611,61 +534,45 @@ BEGIN LTEXT "G:",IDC_STATIC,7,192,43,8 LTEXT "B:",IDC_STATIC,7,204,38,8 LTEXT "Value:",IDC_STATIC,7,216,38,8 - LTEXT "Click on a color for more information",IDC_STATIC,7,7, - 302,8 - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,229,71,10 + LTEXT "Click on a color for more information",IDC_STATIC,7,7,302,8 + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,229,71,10 END -IDD_MEM_VIEWER DIALOG DISCARDABLE 0, 0, 380, 178 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_MEM_VIEWER DIALOG 0, 0, 380, 178 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Memory viewer" FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_ADDRESSES,7,7,109,30,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - CONTROL "8-bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 120,9,29,10 - CONTROL "16-bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,154,9,33, - 10 - CONTROL "32-bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,192,9,33, - 10 - EDITTEXT IDC_ADDRESS,238,7,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | - ES_WANTRETURN | WS_GROUP + COMBOBOX IDC_ADDRESSES,7,7,109,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "8-bit",IDC_8_BIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,120,9,29,10 + CONTROL "16-bit",IDC_16_BIT,"Button",BS_AUTORADIOBUTTON,154,9,33,10 + CONTROL "32-bit",IDC_32_BIT,"Button",BS_AUTORADIOBUTTON,192,9,33,10 + EDITTEXT IDC_ADDRESS,238,7,82,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_GROUP DEFPUSHBUTTON "&Go",IDC_GO,323,7,50,14,WS_GROUP - CONTROL "Viewer",IDC_VIEWER,"VbaMemoryViewer",WS_TABSTOP,7,22, - 366,112 - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,139,71,10 + CONTROL "Viewer",IDC_VIEWER,"VbaMemoryViewer",WS_TABSTOP,7,22,366,112 + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,139,71,10 PUSHBUTTON "&Refresh",IDC_REFRESH,67,157,50,14 PUSHBUTTON "&Load...",IDC_LOAD,132,157,50,14 PUSHBUTTON "&Save...",IDC_SAVE,197,157,50,14 PUSHBUTTON "&Close",IDC_CLOSE,262,157,50,14 - LTEXT "Current address:",IDC_CURRENT_ADDRESS_LABEL,210,142,77, - 8 - EDITTEXT IDC_CURRENT_ADDRESS,291,139,82,14,ES_RIGHT | - ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Current address:",IDC_CURRENT_ADDRESS_LABEL,210,142,77,8 + EDITTEXT IDC_CURRENT_ADDRESS,291,139,82,14,ES_RIGHT | ES_AUTOHSCROLL | WS_DISABLED END IDD_OAM_VIEW DIALOGEX 0, 0, 234, 185 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "OAM Viewer" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - EDITTEXT IDC_SPRITE,7,19,76,14,ES_RIGHT | ES_AUTOHSCROLL | - ES_NUMBER + EDITTEXT IDC_SPRITE,7,19,76,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER SCROLLBAR IDC_SCROLLBAR,7,33,76,11 - CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,138,79,10 + CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,138,79,10 PUSHBUTTON "&Refresh",IDC_REFRESH,7,164,50,14,WS_GROUP PUSHBUTTON "&Save...",IDC_SAVE,91,164,50,14,WS_GROUP PUSHBUTTON "&Close",IDC_CLOSE,177,164,50,14 - CONTROL "MapView",IDC_OAM_VIEW,"VbaBitmapControl",WS_GROUP | - WS_TABSTOP,87,7,64,64 - CONTROL "Zoom",IDC_OAM_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | - WS_TABSTOP,163,7,64,64 - CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,87,79,48, - 47 + CONTROL "MapView",IDC_OAM_VIEW,"VbaBitmapControl",WS_GROUP | WS_TABSTOP,87,7,64,64 + CONTROL "Zoom",IDC_OAM_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | WS_TABSTOP,163,7,64,64 + CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,87,79,48,47 LTEXT "",IDC_POS,31,47,50,8,SS_NOPREFIX LTEXT "",IDC_MODE,31,57,50,8,SS_NOPREFIX LTEXT "",IDC_COLORS,31,67,50,8,SS_NOPREFIX @@ -688,21 +595,18 @@ BEGIN LTEXT "Sprite:",IDC_STATIC,7,7,50,8 LTEXT "Rot.:",IDC_STATIC,7,117,24,8 LTEXT "Flags:",IDC_STATIC,7,127,24,8 - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,150,71,10 + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,150,71,10 END IDD_ACCEL_EDITOR DIALOGEX 0, 0, 399, 121 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Accelerator editor" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&Commands:",IDC_STATIC,7,7,38,8 - LISTBOX IDC_COMMANDS,7,18,153,67,LBS_SORT | LBS_NOINTEGRALHEIGHT | - LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_COMMANDS,7,18,153,67,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Current &Keys:",IDC_STATIC1,176,7,43,8 - LISTBOX IDC_CURRENTS,176,17,153,67,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_CURRENTS,176,17,153,67,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",ID_OK,342,9,50,14 PUSHBUTTON "Cancel",ID_CANCEL,342,25,50,14 LTEXT "Select &New Shortcut Key:",IDC_STATIC3,175,86,82,8 @@ -714,65 +618,48 @@ BEGIN LTEXT "Currently assigned to :",IDC_STATIC2,7,87,73,10 END -IDD_TILE_VIEWER DIALOG DISCARDABLE 0, 0, 326, 266 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_TILE_VIEWER DIALOG 0, 0, 326, 266 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Tile Viewer" FONT 8, "MS Sans Serif" BEGIN - CONTROL "16",IDC_16_COLORS,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,13,20,24,10 - CONTROL "256",IDC_256_COLORS,"Button",BS_AUTORADIOBUTTON,13,30, - 28,10 - CONTROL "0x6000000",IDC_CHARBASE_0,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,13,57,51,10 - CONTROL "0x6004000",IDC_CHARBASE_1,"Button",BS_AUTORADIOBUTTON, - 13,67,51,10 - CONTROL "0x6008000",IDC_CHARBASE_2,"Button",BS_AUTORADIOBUTTON, - 13,77,51,10 - CONTROL "0x600C000",IDC_CHARBASE_3,"Button",BS_AUTORADIOBUTTON, - 13,87,52,10 - CONTROL "0x6010000",IDC_CHARBASE_4,"Button",BS_AUTORADIOBUTTON, - 13,97,49,10 - CONTROL "Slider1",IDC_PALETTE_SLIDER,"msctls_trackbar32", - TBS_AUTOTICKS | WS_GROUP | WS_TABSTOP,1,124,76,22 - CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,149,79,10 + CONTROL "16",IDC_16_COLORS,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,20,24,10 + CONTROL "256",IDC_256_COLORS,"Button",BS_AUTORADIOBUTTON,13,30,28,10 + CONTROL "0x6000000",IDC_CHARBASE_0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,57,51,10 + CONTROL "0x6004000",IDC_CHARBASE_1,"Button",BS_AUTORADIOBUTTON,13,67,51,10 + CONTROL "0x6008000",IDC_CHARBASE_2,"Button",BS_AUTORADIOBUTTON,13,77,51,10 + CONTROL "0x600C000",IDC_CHARBASE_3,"Button",BS_AUTORADIOBUTTON,13,87,52,10 + CONTROL "0x6010000",IDC_CHARBASE_4,"Button",BS_AUTORADIOBUTTON,13,97,49,10 + CONTROL "Slider1",IDC_PALETTE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_GROUP | WS_TABSTOP,1,124,76,22 + CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,79,10 PUSHBUTTON "Refresh",IDC_REFRESH,7,245,50,14,WS_GROUP PUSHBUTTON "Save...",IDC_SAVE,138,245,50,14 PUSHBUTTON "Close",IDC_CLOSE,269,245,50,14 - CONTROL "Custom1",IDC_TILE_VIEW,"VbaBitmapControl",WS_GROUP | - WS_TABSTOP,191,7,128,128 + CONTROL "Custom1",IDC_TILE_VIEW,"VbaBitmapControl",WS_GROUP | WS_TABSTOP,191,7,128,128 GROUPBOX "Colors",IDC_STATIC,7,7,66,38 GROUPBOX "Char Base",IDC_STATIC,7,46,65,64 - CONTROL "Zoom",IDC_MAP_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | - WS_TABSTOP,7,174,64,64 - CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,98,183,48, - 47 + CONTROL "Zoom",IDC_MAP_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | WS_TABSTOP,7,174,64,64 + CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,98,183,48,47 LTEXT "",IDC_R,156,192,50,8,SS_NOPREFIX LTEXT "",IDC_G,156,204,50,8,SS_NOPREFIX LTEXT "",IDC_B,156,216,50,8,SS_NOPREFIX LTEXT "Palette:",IDC_STATIC,7,113,65,8 - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,160,71,10 + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,71,10 LTEXT "Tile:",IDC_STATIC,79,14,41,8 LTEXT "Address:",IDC_STATIC,79,26,41,8 LTEXT "",IDC_TILE_NUMBER,135,14,50,8,SS_NOPREFIX LTEXT "",IDC_ADDRESS,135,26,50,8,SS_NOPREFIX END -IDD_GB_COLORS DIALOG DISCARDABLE 0, 0, 169, 121 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_GB_COLORS DIALOG 0, 0, 169, 121 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Gameboy Mono Colors" FONT 8, "MS Sans Serif" BEGIN - CONTROL "Default",IDC_DEFAULT,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,7,39,10 - CONTROL "User 1",IDC_USER1,"Button",BS_AUTORADIOBUTTON,67,7,37, - 10 - CONTROL "User 2",IDC_USER2,"Button",BS_AUTORADIOBUTTON,125,7,37, - 10 - COMBOBOX IDC_PREDEFINED,7,21,155,30,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP + CONTROL "Default",IDC_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,7,39,10 + CONTROL "User 1",IDC_USER1,"Button",BS_AUTORADIOBUTTON,67,7,37,10 + CONTROL "User 2",IDC_USER2,"Button",BS_AUTORADIOBUTTON,125,7,37,10 + COMBOBOX IDC_PREDEFINED,7,21,155,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "",IDC_COLOR_BG0,15,47,28,14,WS_GROUP PUSHBUTTON "",IDC_COLOR_BG1,52,47,28,14 PUSHBUTTON "",IDC_COLOR_BG2,89,47,28,14 @@ -788,23 +675,18 @@ BEGIN GROUPBOX "Sprite",IDC_STATIC,8,67,154,30 END -IDD_DISASSEMBLE DIALOG DISCARDABLE 0, 0, 402, 225 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_DISASSEMBLE DIALOG 0, 0, 402, 225 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Disassemble" FONT 8, "MS Sans Serif" BEGIN - CONTROL "Automatic",IDC_AUTOMATIC,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,7,9,47,10 + CONTROL "Automatic",IDC_AUTOMATIC,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,9,47,10 CONTROL "ARM",IDC_ARM,"Button",BS_AUTORADIOBUTTON,62,9,32,10 - CONTROL "THUMB",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,103,9,42, - 10 - EDITTEXT IDC_ADDRESS,158,7,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | - WS_GROUP + CONTROL "THUMB",IDC_THUMB,"Button",BS_AUTORADIOBUTTON,103,9,42,10 + EDITTEXT IDC_ADDRESS,158,7,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | WS_GROUP DEFPUSHBUTTON "Go",IDC_GO,232,7,50,14 - LISTBOX IDC_DISASSEMBLE,7,25,276,161,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_TABSTOP - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,191,71,10 + LISTBOX IDC_DISASSEMBLE,7,25,276,161,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_TABSTOP + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,71,10 PUSHBUTTON "Refresh",IDC_REFRESH,120,204,50,14 PUSHBUTTON "Next",IDC_NEXT,233,204,50,14 PUSHBUTTON "Close",IDC_CLOSE,346,204,50,14 @@ -842,28 +724,21 @@ BEGIN LTEXT "R15:",IDC_STATIC,309,127,18,8 LTEXT "",IDC_R16,344,135,52,8,SS_NOPREFIX LTEXT "R16:",IDC_STATIC,309,135,20,8 - CONTROL "N",IDC_N,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,309,146,21,10 - CONTROL "Z",IDC_Z,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,309,156,21,10 - CONTROL "C",IDC_C,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,309,166,21,10 - CONTROL "V",IDC_V,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,309,176,21,10 - CONTROL "F",IDC_F,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,342,156,20,10 - CONTROL "I",IDC_I,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,342,146,18,10 - CONTROL "T",IDC_T,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,342,166,21,10 + CONTROL "N",IDC_N,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,309,146,21,10 + CONTROL "Z",IDC_Z,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,309,156,21,10 + CONTROL "C",IDC_C,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,309,166,21,10 + CONTROL "V",IDC_V,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,309,176,21,10 + CONTROL "F",IDC_F,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,342,156,20,10 + CONTROL "I",IDC_I,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,342,146,18,10 + CONTROL "T",IDC_T,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,342,166,21,10 LTEXT "Mode:",IDC_STATIC,341,176,21,8 LTEXT "",IDC_MODE,376,176,20,8,SS_NOPREFIX SCROLLBAR IDC_VSCROLL,283,25,10,161,SBS_VERT PUSHBUTTON "Goto R15",IDC_GOPC,7,204,50,14 END -IDD_GDB_PORT DIALOG DISCARDABLE 0, 0, 186, 51 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_GDB_PORT DIALOG 0, 0, 186, 51 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "GDB connection" FONT 8, "MS Sans Serif" BEGIN @@ -873,8 +748,8 @@ BEGIN EDITTEXT IDC_PORT,125,7,54,14,ES_RIGHT | ES_AUTOHSCROLL END -IDD_GDB_WAITING DIALOG DISCARDABLE 0, 0, 186, 44 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_GDB_WAITING DIALOG 0, 0, 186, 44 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Waiting..." FONT 8, "MS Sans Serif" BEGIN @@ -883,33 +758,22 @@ BEGIN LTEXT "",IDC_PORT,143,7,36,8,SS_NOPREFIX END -IDD_LOGGING DIALOG DISCARDABLE 0, 0, 366, 218 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_LOGGING DIALOG 0, 0, 366, 218 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Logging" FONT 8, "MS Sans Serif" BEGIN - CONTROL "SWI",IDC_VERBOSE_SWI,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,17,87,10 - CONTROL "Unaligned memory",IDC_VERBOSE_UNALIGNED_ACCESS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,30,87,10 - CONTROL "Illegal write",IDC_VERBOSE_ILLEGAL_WRITE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,43,87,10 - CONTROL "Illegal read",IDC_VERBOSE_ILLEGAL_READ,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,56,87,10 - CONTROL "DMA 0",IDC_VERBOSE_DMA0,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,69,87,10 - CONTROL "DMA 1",IDC_VERBOSE_DMA1,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,82,87,10 - CONTROL "DMA 2",IDC_VERBOSE_DMA2,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,95,87,10 - CONTROL "DMA 3",IDC_VERBOSE_DMA3,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,108,87,10 - CONTROL "Undefined instruction",IDC_VERBOSE_UNDEFINED,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,10,121,87,10 - CONTROL "AGBPrint",IDC_VERBOSE_AGBPRINT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,134,87,10 - EDITTEXT IDC_LOG,107,7,252,183,ES_MULTILINE | ES_AUTOVSCROLL | - ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL + CONTROL "SWI",IDC_VERBOSE_SWI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,17,87,10 + CONTROL "Unaligned memory",IDC_VERBOSE_UNALIGNED_ACCESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,30,87,10 + CONTROL "Illegal write",IDC_VERBOSE_ILLEGAL_WRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,43,87,10 + CONTROL "Illegal read",IDC_VERBOSE_ILLEGAL_READ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,56,87,10 + CONTROL "DMA 0",IDC_VERBOSE_DMA0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,69,87,10 + CONTROL "DMA 1",IDC_VERBOSE_DMA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,82,87,10 + CONTROL "DMA 2",IDC_VERBOSE_DMA2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,95,87,10 + CONTROL "DMA 3",IDC_VERBOSE_DMA3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,108,87,10 + CONTROL "Undefined instruction",IDC_VERBOSE_UNDEFINED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,121,87,10 + CONTROL "AGBPrint",IDC_VERBOSE_AGBPRINT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,134,87,10 + EDITTEXT IDC_LOG,107,7,252,183,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL PUSHBUTTON "Save...",IDC_SAVE,75,197,50,14 PUSHBUTTON "Clear",IDC_CLEAR,137,197,50,14 DEFPUSHBUTTON "OK",ID_OK,197,197,50,14 @@ -917,14 +781,13 @@ BEGIN END IDD_EXPORT_SPS DIALOGEX 0, 0, 248, 148 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Export GameShark Snapshot" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN EDITTEXT IDC_TITLE,84,7,157,14,ES_AUTOHSCROLL EDITTEXT IDC_DESC,84,27,157,14,ES_AUTOHSCROLL - EDITTEXT IDC_NOTES,84,47,157,73,ES_MULTILINE | ES_AUTOHSCROLL | - ES_WANTRETURN + EDITTEXT IDC_NOTES,84,47,157,73,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN DEFPUSHBUTTON "OK",ID_OK,67,127,50,14 PUSHBUTTON "Cancel",ID_CANCEL,130,127,50,14 LTEXT "Title:",IDC_STATIC,7,8,62,8 @@ -932,8 +795,8 @@ BEGIN LTEXT "Notes:",IDC_STATIC,7,48,60,8 END -IDD_ADDR_SIZE DIALOG DISCARDABLE 0, 0, 186, 67 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_ADDR_SIZE DIALOG 0, 0, 186, 67 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Enter address and size" FONT 8, "MS Sans Serif" BEGIN @@ -945,54 +808,48 @@ BEGIN LTEXT "Size:",IDC_STATIC,7,29,65,8 END -IDD_MODES DIALOG DISCARDABLE 0, 0, 208, 129 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_MODES DIALOG 0, 0, 208, 129 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select video mode" FONT 8, "MS Sans Serif" BEGIN - LISTBOX IDC_MODES,7,18,194,80,LBS_SORT | LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_MODES,7,18,194,80,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",ID_OK,45,108,50,14 PUSHBUTTON "Cancel",ID_CANCEL,112,108,50,14 LTEXT "Available video modes:",IDC_STATIC,7,7,194,8 END -IDD_DRIVERS DIALOG DISCARDABLE 0, 0, 208, 121 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_DRIVERS DIALOG 0, 0, 208, 121 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select video driver" FONT 8, "MS Sans Serif" BEGIN - LISTBOX IDC_DRIVERS,7,17,194,80,LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_DRIVERS,7,17,194,80,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",ID_OK,45,104,50,14 PUSHBUTTON "Cancel",ID_CANCEL,112,104,50,14 LTEXT "Available drivers:",IDC_STATIC,7,7,194,8 END -IDD_THROTTLE DIALOG DISCARDABLE 0, 0, 186, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_THROTTLE DIALOG 0, 0, 186, 63 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Throttle" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_THROTTLE,7,20,172,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",ID_OK,37,42,50,14 PUSHBUTTON "Cancel",ID_CANCEL,99,42,50,14 - LTEXT "Enter desired throttle (5%...1000%):",IDC_STATIC,7,7, - 172,8 + LTEXT "Enter desired throttle (5%...1000%):",IDC_STATIC,7,7,172,8 END -IDD_GB_DISASSEMBLE DIALOG DISCARDABLE 0, 0, 344, 225 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_GB_DISASSEMBLE DIALOG 0, 0, 344, 225 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "GB Disassemble" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_ADDRESS,7,7,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | - WS_GROUP + EDITTEXT IDC_ADDRESS,7,7,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | WS_GROUP DEFPUSHBUTTON "Go",IDC_GO,81,7,50,14 - LISTBOX IDC_DISASSEMBLE,7,25,222,161,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_TABSTOP - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,191,71,10 + LISTBOX IDC_DISASSEMBLE,7,25,222,161,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_TABSTOP + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,71,10 PUSHBUTTON "Refresh",IDC_REFRESH,100,204,50,14 PUSHBUTTON "Next",IDC_NEXT,193,204,50,14 PUSHBUTTON "Close",IDC_CLOSE,287,204,50,14 @@ -1008,14 +865,10 @@ BEGIN LTEXT "",IDC_R3,285,55,52,8,SS_NOPREFIX LTEXT "",IDC_R6,285,85,52,8,SS_NOPREFIX LTEXT "",IDC_LY,285,95,52,8,SS_NOPREFIX - CONTROL "N",IDC_N,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,250,109,21,10 - CONTROL "Z",IDC_Z,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,250,97,21,10 - CONTROL "C",IDC_C,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,250,133,21,10 - CONTROL "H",IDC_H,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,250,121,21,10 + CONTROL "N",IDC_N,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,250,109,21,10 + CONTROL "Z",IDC_Z,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,250,97,21,10 + CONTROL "C",IDC_C,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,250,133,21,10 + CONTROL "H",IDC_H,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,250,121,21,10 SCROLLBAR IDC_VSCROLL,229,25,10,161,SBS_VERT PUSHBUTTON "Goto PC",IDC_GOPC,7,204,50,14 LTEXT "SP:",IDC_STATIC,250,65,18,8 @@ -1024,25 +877,20 @@ BEGIN LTEXT "",IDC_R5,285,75,52,8,SS_NOPREFIX END -IDD_GB_OAM_VIEW DIALOG DISCARDABLE 0, 0, 234, 185 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_GB_OAM_VIEW DIALOG 0, 0, 234, 185 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "GB Oam Viewer" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_SPRITE,7,19,76,14,ES_RIGHT | ES_AUTOHSCROLL | - ES_NUMBER + EDITTEXT IDC_SPRITE,7,19,76,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER SCROLLBAR IDC_SCROLLBAR,7,33,76,11 - CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,138,79,10 + CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,138,79,10 PUSHBUTTON "&Refresh",IDC_REFRESH,7,164,50,14,WS_GROUP PUSHBUTTON "&Save...",IDC_SAVE,91,164,50,14,WS_GROUP PUSHBUTTON "&Close",IDC_CLOSE,177,164,50,14 - CONTROL "MapView",IDC_OAM_VIEW,"VbaBitmapControl",WS_GROUP | - WS_TABSTOP,87,7,64,64 - CONTROL "Zoom",IDC_OAM_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | - WS_TABSTOP,163,7,64,64 - CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,87,79,48, - 47 + CONTROL "MapView",IDC_OAM_VIEW,"VbaBitmapControl",WS_GROUP | WS_TABSTOP,87,7,64,64 + CONTROL "Zoom",IDC_OAM_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | WS_TABSTOP,163,7,64,64 + CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,87,79,48,47 LTEXT "",IDC_POS,31,47,50,8,SS_NOPREFIX LTEXT "",IDC_PALETTE,31,87,50,8,SS_NOPREFIX LTEXT "",IDC_TILE,31,57,50,8,SS_NOPREFIX @@ -1059,81 +907,63 @@ BEGIN LTEXT "OAP:",IDC_STATIC,7,77,24,8 LTEXT "Sprite:",IDC_STATIC,7,7,50,8 LTEXT "Flags:",IDC_STATIC,7,97,24,8 - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,150,71,10 + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,150,71,10 LTEXT "",IDC_BANK,31,107,50,8,SS_NOPREFIX LTEXT "Bank:",IDC_STATIC,7,107,24,8 END -IDD_GB_TILE_VIEWER DIALOG DISCARDABLE 0, 0, 326, 238 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_GB_TILE_VIEWER DIALOG 0, 0, 326, 238 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "GB Tile Viewer" FONT 8, "MS Sans Serif" BEGIN - CONTROL "0",IDC_BANK_0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13, - 20,20,10 + CONTROL "0",IDC_BANK_0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,20,20,10 CONTROL "1",IDC_BANK_1,"Button",BS_AUTORADIOBUTTON,13,30,20,10 - CONTROL "0x8000",IDC_CHARBASE_0,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,13,57,39,10 - CONTROL "0x8800",IDC_CHARBASE_1,"Button",BS_AUTORADIOBUTTON,13, - 67,39,10 - CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,122,79,10 + CONTROL "0x8000",IDC_CHARBASE_0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,57,39,10 + CONTROL "0x8800",IDC_CHARBASE_1,"Button",BS_AUTORADIOBUTTON,13,67,39,10 + CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,79,10 PUSHBUTTON "Refresh",IDC_REFRESH,7,217,50,14,WS_GROUP PUSHBUTTON "Save...",IDC_SAVE,138,217,50,14 PUSHBUTTON "Close",IDC_CLOSE,269,217,50,14 - CONTROL "Custom1",IDC_TILE_VIEW,"VbaBitmapControl",WS_GROUP | - WS_TABSTOP,191,7,128,128 + CONTROL "Custom1",IDC_TILE_VIEW,"VbaBitmapControl",WS_GROUP | WS_TABSTOP,191,7,128,128 GROUPBOX "VRAM Bank",IDC_STATIC,7,7,66,38 GROUPBOX "Char Base",IDC_STATIC,7,46,65,35 - CONTROL "Zoom",IDC_MAP_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | - WS_TABSTOP,7,147,64,64 - CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,98,156,48, - 47 + CONTROL "Zoom",IDC_MAP_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | WS_TABSTOP,7,147,64,64 + CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,98,156,48,47 LTEXT "",IDC_R,156,164,50,8,SS_NOPREFIX LTEXT "",IDC_G,156,176,50,8,SS_NOPREFIX LTEXT "",IDC_B,156,188,50,8,SS_NOPREFIX LTEXT "Palette:",IDC_STATIC,7,86,65,8 - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,133,71,10 + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,133,71,10 LTEXT "Tile:",IDC_STATIC,79,14,41,8 LTEXT "Address:",IDC_STATIC,79,26,41,8 LTEXT "",IDC_TILE_NUMBER,135,14,50,8,SS_NOPREFIX LTEXT "",IDC_ADDRESS,135,26,50,8,SS_NOPREFIX - CONTROL "Slider1",IDC_PALETTE_SLIDER,"msctls_trackbar32", - TBS_AUTOTICKS | WS_GROUP | WS_TABSTOP,1,98,76,22 + CONTROL "Slider1",IDC_PALETTE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_GROUP | WS_TABSTOP,1,98,76,22 END -IDD_GB_MAP_VIEW DIALOG DISCARDABLE 0, 0, 322, 238 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_GB_MAP_VIEW DIALOG 0, 0, 322, 238 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "GB Map Viewer" FONT 8, "MS Sans Serif" BEGIN - CONTROL "0x8000",IDC_BANK_0,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,13,22,39,10 - CONTROL "0x8800",IDC_BANK_1,"Button",BS_AUTORADIOBUTTON,13,36,39, - 10 - CONTROL "0x9800",IDC_BG0,"Button",BS_AUTORADIOBUTTON | WS_GROUP, - 13,63,39,10 + CONTROL "0x8000",IDC_BANK_0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,22,39,10 + CONTROL "0x8800",IDC_BANK_1,"Button",BS_AUTORADIOBUTTON,13,36,39,10 + CONTROL "0x9800",IDC_BG0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,63,39,10 CONTROL "0x9C00",IDC_BG1,"Button",BS_AUTORADIOBUTTON,13,77,40,10 - CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,122,68,10 + CONTROL "Stretch to fit",IDC_STRETCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,68,10 PUSHBUTTON "&Refresh",IDC_REFRESH,25,217,50,14,WS_GROUP PUSHBUTTON "&Save...",IDC_SAVE,88,217,50,14,WS_GROUP PUSHBUTTON "&Close",IDC_CLOSE,155,217,50,14 - CONTROL "MapView",IDC_MAP_VIEW,"VbaBitmapControl",WS_GROUP | - WS_TABSTOP,187,15,128,128 - CONTROL "Zoom",IDC_MAP_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | - WS_TABSTOP,7,148,64,64 - CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,187,164, - 48,47 + CONTROL "MapView",IDC_MAP_VIEW,"VbaBitmapControl",WS_GROUP | WS_TABSTOP,187,15,128,128 + CONTROL "Zoom",IDC_MAP_VIEW_ZOOM,"VbaZoomControl",WS_GROUP | WS_TABSTOP,7,148,64,64 + CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,187,164,48,47 LTEXT "",IDC_R,245,173,50,8,SS_NOPREFIX LTEXT "",IDC_G,245,185,50,8,SS_NOPREFIX LTEXT "",IDC_B,245,197,50,8,SS_NOPREFIX GROUPBOX "Char Base",IDC_STATIC,7,11,63,37 GROUPBOX "Map Base",IDC_STATIC,7,52,63,41 - CONTROL "Auto update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,134,55,10 + CONTROL "Auto update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,55,10 LTEXT "",IDC_XY,129,18,53,8,SS_NOPREFIX LTEXT "Priority:",IDC_STATIC,80,68,37,8 LTEXT "",IDC_PRIORITY,130,68,53,8,SS_NOPREFIX @@ -1147,8 +977,8 @@ BEGIN LTEXT "",IDC_PALETTE_NUM,130,58,53,8,SS_NOPREFIX END -IDD_GB_PALETTE_VIEW DIALOG DISCARDABLE 0, 0, 196, 234 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_GB_PALETTE_VIEW DIALOG 0, 0, 196, 234 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "GB Palette Viewer" FONT 8, "MS Sans Serif" BEGIN @@ -1161,10 +991,8 @@ BEGIN LTEXT "",IDC_G,53,141,50,8,SS_NOPREFIX LTEXT "",IDC_B,53,153,50,8,SS_NOPREFIX LTEXT "",IDC_VALUE,53,165,50,8,SS_NOPREFIX - CONTROL "Custom1",IDC_COLOR,"VbaColorControl",WS_TABSTOP,119,117, - 50,50 - CONTROL "PaletteViewBG",IDC_PALETTE_VIEW,"VbaPaletteViewControl", - WS_TABSTOP,11,30,64,64 + CONTROL "Custom1",IDC_COLOR,"VbaColorControl",WS_TABSTOP,119,117,50,50 + CONTROL "PaletteViewBG",IDC_PALETTE_VIEW,"VbaPaletteViewControl",WS_TABSTOP,11,30,64,64 CONTROL "PaletteViewBG",IDC_PALETTE_VIEW_OBJ, "VbaPaletteViewControl",WS_TABSTOP,120,30,64,64 GROUPBOX "BG",IDC_STATIC,6,20,74,81 @@ -1174,111 +1002,84 @@ BEGIN LTEXT "G:",IDC_STATIC,7,141,43,8 LTEXT "B:",IDC_STATIC,7,153,38,8 LTEXT "Value:",IDC_STATIC,7,165,38,8 - LTEXT "Click on a color for more information",IDC_STATIC,7,7, - 182,8 - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,178,71,10 + LTEXT "Click on a color for more information",IDC_STATIC,7,7,182,8 + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,178,71,10 END -IDD_MODE_CONFIRM DIALOG DISCARDABLE 0, 0, 186, 57 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_MODE_CONFIRM DIALOG 0, 0, 186, 57 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Confirm mode" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",ID_OK,31,36,50,14 PUSHBUTTON "Cancel",ID_CANCEL,103,36,50,14 - CTEXT "Do you want to keep the current mode?",IDC_STATIC,7,7, - 172,8 + CTEXT "Do you want to keep the current mode?",IDC_STATIC,7,7,172,8 CTEXT "",IDC_TIMER,7,19,172,8,SS_NOPREFIX,WS_EX_TOOLWINDOW END -IDD_REWIND_INTERVAL DIALOG DISCARDABLE 0, 0, 186, 68 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_REWIND_INTERVAL DIALOG 0, 0, 186, 68 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select rewind interval" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_INTERVAL,7,28,172,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",ID_OK,37,47,50,14 PUSHBUTTON "Cancel",ID_CANCEL,99,47,50,14 - LTEXT "Enter rewind interval (0...600) seconds:",IDC_STATIC,7, - 7,172,8 + LTEXT "Enter rewind interval (0...600) seconds:",IDC_STATIC,7,7,172,8 LTEXT "Enter 0 to disable rewind.",IDC_STATIC,7,17,172,8 END -IDD_IO_VIEWER DIALOG DISCARDABLE 0, 0, 269, 238 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_IO_VIEWER DIALOG 0, 0, 269, 238 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "I/O Viewer" FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_ADDRESSES,7,7,255,30,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_ADDRESSES,7,7,255,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "",IDC_VALUE,103,23,159,8 - CONTROL "",IDC_BIT_15,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34, - 255,10 - CONTROL "",IDC_BIT_14,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,44, - 255,10 - CONTROL "",IDC_BIT_13,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54, - 255,8 - CONTROL "",IDC_BIT_12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64, - 255,10 - CONTROL "",IDC_BIT_11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74, - 255,10 - CONTROL "",IDC_BIT_10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84, - 255,10 - CONTROL "",IDC_BIT_9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94, - 255,10 - CONTROL "",IDC_BIT_8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,104, - 255,10 - CONTROL "",IDC_BIT_7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114, - 255,10 - CONTROL "",IDC_BIT_6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,124, - 255,10 - CONTROL "",IDC_BIT_5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134, - 255,10 - CONTROL "",IDC_BIT_4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,144, - 255,10 - CONTROL "",IDC_BIT_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,154, - 255,10 - CONTROL "",IDC_BIT_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,164, - 255,10 - CONTROL "",IDC_BIT_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174, - 255,10 - CONTROL "",IDC_BIT_0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,184, - 255,10 - CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,201,71,10 + CONTROL "",IDC_BIT_15,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,255,10 + CONTROL "",IDC_BIT_14,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,44,255,10 + CONTROL "",IDC_BIT_13,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,255,8 + CONTROL "",IDC_BIT_12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,255,10 + CONTROL "",IDC_BIT_11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,255,10 + CONTROL "",IDC_BIT_10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,84,255,10 + CONTROL "",IDC_BIT_9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,255,10 + CONTROL "",IDC_BIT_8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,104,255,10 + CONTROL "",IDC_BIT_7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,255,10 + CONTROL "",IDC_BIT_6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,124,255,10 + CONTROL "",IDC_BIT_5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,255,10 + CONTROL "",IDC_BIT_4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,144,255,10 + CONTROL "",IDC_BIT_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,154,255,10 + CONTROL "",IDC_BIT_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,164,255,10 + CONTROL "",IDC_BIT_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,255,10 + CONTROL "",IDC_BIT_0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,184,255,10 + CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,201,71,10 DEFPUSHBUTTON "&Refresh",IDC_REFRESH,54,221,50,14 DEFPUSHBUTTON "&Apply",IDC_APPLY,110,221,50,14 PUSHBUTTON "&Close",IDC_CLOSE,166,221,50,14 LTEXT "Value:",IDC_STATIC,7,23,72,8 END -IDD_MAX_SCALE DIALOG DISCARDABLE 0, 0, 186, 68 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_MAX_SCALE DIALOG 0, 0, 186, 68 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Fullscreen scale" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_VALUE,7,28,172,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",ID_OK,37,47,50,14 PUSHBUTTON "Cancel",ID_CANCEL,99,47,50,14 - LTEXT "Enter the maxium fullscreen scale:",IDC_STATIC,7,7,172, - 8 + LTEXT "Enter the maxium fullscreen scale:",IDC_STATIC,7,7,172,8 LTEXT "Enter 0 to use maximum scale.",IDC_STATIC,7,17,172,8 END IDD_GAME_OVERRIDES DIALOGEX 0, 0, 268, 132 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Game overrides" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - COMBOBOX IDC_RTC,84,42,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_SAVE_TYPE,84,60,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_FLASH_SIZE,84,78,180,12,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_MIRRORING,84,96,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_RTC,84,42,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SAVE_TYPE,84,60,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FLASH_SIZE,84,78,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MIRRORING,84,96,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,6,114,72,12 PUSHBUTTON "Defaults",IDC_DEFAULTS,108,114,54,12 PUSHBUTTON "Cancel",IDCANCEL,192,114,72,12 @@ -1293,7 +1094,7 @@ BEGIN END IDD_BIOS DIALOGEX 0, 0, 220, 126 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "BIOS Files" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN @@ -1304,12 +1105,9 @@ BEGIN EDITTEXT IDC_GB_BIOS_PATH,12,18,180,12,ES_AUTOHSCROLL EDITTEXT IDC_GBA_BIOS_PATH,12,60,180,12,ES_AUTOHSCROLL GROUPBOX "Options",IDC_STATIC,6,90,72,30 - CONTROL "Skip boot logo",IDC_SKIP_BOOT_LOGO,"Button", - BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,102,60,12 - CONTROL "Enable",IDC_ENABLE_GB_BIOS,"Button",BS_AUTOCHECKBOX | - WS_GROUP | WS_TABSTOP,174,6,36,8 - CONTROL "Enable",IDC_ENABLE_GBA_BIOS,"Button",BS_AUTOCHECKBOX | - WS_GROUP | WS_TABSTOP,174,48,36,8 + CONTROL "Skip boot logo",IDC_SKIP_BOOT_LOGO,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,102,60,12 + CONTROL "Enable",IDC_ENABLE_GB_BIOS,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,174,6,36,8 + CONTROL "Enable",IDC_ENABLE_GBA_BIOS,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,174,48,36,8 PUSHBUTTON "...",IDC_SELECT_GB_BIOS_PATH,192,18,18,12 PUSHBUTTON "...",IDC_SELECT_GBA_BIOS_PATH,192,60,18,12 END @@ -1321,7 +1119,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO MOVEABLE PURE +GUIDELINES DESIGNINFO BEGIN IDD_OAL_CONFIG, DIALOG BEGIN @@ -1681,18 +1479,18 @@ END // TEXTINCLUDE // -1 TEXTINCLUDE MOVEABLE PURE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE MOVEABLE PURE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "#include ""resource2.h""\0" END -3 TEXTINCLUDE MOVEABLE PURE +3 TEXTINCLUDE BEGIN "#include ""vba.rc2""\0" END @@ -1705,7 +1503,7 @@ END // Menu // -IDR_MENU MENU DISCARDABLE +IDR_MENU MENU BEGIN POPUP "&File" BEGIN @@ -1718,9 +1516,7 @@ BEGIN POPUP "Load Game" BEGIN MENUITEM "Most recent", ID_FILE_LOADGAME_MOSTRECENT - MENUITEM "Auto load most recent", ID_FILE_LOADGAME_AUTOLOADMOSTRECENT - MENUITEM SEPARATOR MENUITEM "Slot #1", ID_FILE_LOADGAME_SLOT1 MENUITEM "Slot #2", ID_FILE_LOADGAME_SLOT2 @@ -1736,7 +1532,6 @@ BEGIN POPUP "Save Game" BEGIN MENUITEM "Oldest slot", ID_FILE_SAVEGAME_OLDESTSLOT - MENUITEM SEPARATOR MENUITEM "Slot #1", ID_FILE_SAVEGAME_SLOT1 MENUITEM "Slot #2", ID_FILE_SAVEGAME_SLOT2 @@ -1763,18 +1558,13 @@ BEGIN POPUP "Import" BEGIN MENUITEM "&Battery file...", ID_FILE_IMPORT_BATTERYFILE - MENUITEM "Gameshark &code file...", ID_FILE_IMPORT_GAMESHARKCODEFILE - MENUITEM "&Gameshark Snapshot...", ID_FILE_IMPORT_GAMESHARKSNAPSHOT - END POPUP "Export" BEGIN MENUITEM "&Battery file...", ID_FILE_EXPORT_BATTERYFILE - MENUITEM "&Gameshark Snapshot...", ID_FILE_EXPORT_GAMESHARKSNAPSHOT - END MENUITEM SEPARATOR MENUITEM "Screen Capture...", ID_FILE_SCREENCAPTURE @@ -1792,34 +1582,21 @@ BEGIN POPUP "Render API" BEGIN MENUITEM "Direct&Draw", ID_OPTIONS_VIDEO_RENDERMETHOD_DIRECTDRAW - MENUITEM " Emulation only", ID_OPTIONS_VIDEO_DDRAWEMULATIONONLY - MENUITEM " Use &Video Memory", ID_OPTIONS_VIDEO_DDRAWUSEVIDEOMEMORY - MENUITEM SEPARATOR MENUITEM "Direct&3D", ID_OPTIONS_VIDEO_RENDERMETHOD_DIRECT3D - MENUITEM " Filter: Nearest", ID_OPTIONS_VIDEO_RENDEROPTIONS_D3DNOFILTER - MENUITEM " Filter: Bilinear", ID_OPTIONS_VIDEO_RENDEROPTIONS_D3DBILINEAR - MENUITEM " Motion Blur", ID_RENDERAPI_D3DMOTIONBLUR - MENUITEM SEPARATOR MENUITEM "&OpenGL", ID_OPTIONS_VIDEO_RENDERMETHOD_OPENGL - MENUITEM " Filter: Nearest", ID_OPTIONS_VIDEO_RENDEROPTIONS_GLNEAREST - MENUITEM " Filter: Bilinear", ID_OPTIONS_VIDEO_RENDEROPTIONS_GLBILINEAR - MENUITEM " GLSL Shaders", ID_OPTIONS_VIDEO_RENDEROPTIONS_GLSLSHADERS - MENUITEM SEPARATOR MENUITEM "&VSync", ID_OPTIONS_VIDEO_VSYNC - MENUITEM "Triple Buffering", ID_OPTIONS_VIDEO_TRIPLEBUFFERING - END MENUITEM SEPARATOR POPUP "Windowed" @@ -1832,27 +1609,18 @@ BEGIN POPUP "Fullscreen" BEGIN MENUITEM "&Custom...", ID_OPTIONS_VIDEO_FULLSCREEN - MENUITEM SEPARATOR MENUITEM "320x240x16", ID_OPTIONS_VIDEO_FULLSCREEN320X240 - MENUITEM "640x480x16", ID_OPTIONS_VIDEO_FULLSCREEN640X480 - MENUITEM "800x600x16", ID_OPTIONS_VIDEO_FULLSCREEN800X600 - MENUITEM "1024x768x16", ID_OPTIONS_VIDEO_FULLSCREEN1024X768 - MENUITEM "1280x1024x16", ID_OPTIONS_VIDEO_FULLSCREEN1280X1024 - MENUITEM SEPARATOR MENUITEM "&Max Scale...", ID_OPTIONS_VIDEO_FULLSCREENMAXSCALE - MENUITEM "Stretch to &fit", ID_OPTIONS_VIDEO_FULLSCREENSTRETCHTOFIT - END MENUITEM SEPARATOR MENUITEM "D&isable status messages", ID_OPTIONS_EMULATOR_DISABLESTATUSMESSAGES - END POPUP "&Pixel Filter" BEGIN @@ -1862,48 +1630,32 @@ BEGIN POPUP "&2X" BEGIN MENUITEM "&Simple 2x", ID_OPTIONS_FILTER16BIT_SIMPLE2X - MENUITEM SEPARATOR MENUITEM "&Pixelate", ID_OPTIONS_FILTER16BIT_PIXELATEEXPERIMENTAL - MENUITEM "&TV Mode", ID_OPTIONS_FILTER_TVMODE - MENUITEM "Scan&lines", ID_OPTIONS_FILTER_SCANLINES - MENUITEM SEPARATOR MENUITEM "&Bilinear", ID_OPTIONS_FILTER_BILINEAR - MENUITEM "B&ilinear Plus", ID_OPTIONS_FILTER_BILINEARPLUS - MENUITEM SEPARATOR MENUITEM "AdvanceMAME Scale2x", ID_OPTIONS_FILTER16BIT_ADVANCEMAMESCALE2X - MENUITEM "&2xSaI", ID_OPTIONS_FILTER_2XSAI - MENUITEM "S&uper 2xSaI", ID_OPTIONS_FILTER_SUPER2XSAI - MENUITEM "Super &Eagle", ID_OPTIONS_FILTER_SUPEREAGLE - MENUITEM "&LQ2x", ID_OPTIONS_FILTER_LQ2X - MENUITEM "&HQ2x", ID_OPTIONS_FILTER_HQ2X - END POPUP "&3X" BEGIN MENUITEM "&Simple 3x", ID_OPTIONS_FILTER_SIMPLE3X - MENUITEM SEPARATOR MENUITEM "&HQ3x", ID_OPTIONS_FILTER_HQ3X - END POPUP "&4X" BEGIN MENUITEM "&Simple 4x", ID_OPTIONS_FILTER_SIMPLE4X - MENUITEM SEPARATOR MENUITEM "&HQ4x", ID_OPTIONS_FILTER_HQ4X - END END MENUITEM SEPARATOR @@ -1913,29 +1665,22 @@ BEGIN POPUP "&Interframe Blending" BEGIN MENUITEM "&None", ID_OPTIONS_FILTER_INTERFRAMEBLENDING_NONE - MENUITEM "&Motion Blur", ID_OPTIONS_FILTER_INTERFRAMEBLENDING_MOTIONBLUR - MENUITEM "&Smart", ID_OPTIONS_FILTER_INTERFRAMEBLENDING_SMART - END MENUITEM SEPARATOR MENUITEM "Disable &MMX", ID_OPTIONS_FILTER_DISABLEMMX - END POPUP "&Audio" BEGIN POPUP "Output API" BEGIN MENUITEM "DirectSound", ID_OUTPUTAPI_DIRECTSOUND - MENUITEM SEPARATOR MENUITEM "OpenAL", ID_OUTPUTAPI_OPENAL MENUITEM " Configuration...", ID_OUTPUTAPI_OALCONFIGURATION - MENUITEM SEPARATOR MENUITEM "&Sync game to audio", ID_OPTIONS_EMULATOR_SYNCHRONIZE - END MENUITEM SEPARATOR MENUITEM "&On", ID_OPTIONS_SOUND_ON @@ -1944,54 +1689,36 @@ BEGIN POPUP "&Volume" BEGIN MENUITEM "&Mute", ID_OPTIONS_SOUND_MUTE - MENUITEM SEPARATOR MENUITEM "2&5%", ID_OPTIONS_SOUND_VOLUME_25X - MENUITEM "5&0%", ID_OPTIONS_SOUND_VOLUME_5X - MENUITEM "&100%", ID_OPTIONS_SOUND_VOLUME_1X - MENUITEM "&200%", ID_OPTIONS_SOUND_VOLUME_2X - MENUITEM "&300%", ID_OPTIONS_SOUND_VOLUME_3X - MENUITEM "&400%", ID_OPTIONS_SOUND_VOLUME_4X - END POPUP "Sampling Rate" BEGIN MENUITEM "&11025 Hz", ID_OPTIONS_SOUND_11KHZ - MENUITEM "&22050 Hz", ID_OPTIONS_SOUND_22KHZ - MENUITEM "&44100 Hz", ID_OPTIONS_SOUND_44KHZ - END POPUP "PCM interpolation" BEGIN MENUITEM "On", ID_OPTIONS_SOUND_PCMINTERPOLATION_LINEAR - MENUITEM "Off", ID_OPTIONS_SOUND_PCMINTERPOLATION_NONE - END MENUITEM SEPARATOR MENUITEM "&Echo", ID_OPTIONS_SOUND_ECHO MENUITEM SEPARATOR POPUP "Sound Channels" BEGIN - MENUITEM "Channel &1", ID_OPTIONS_SOUND_CHANNEL1 - , CHECKED - MENUITEM "Channel &2", ID_OPTIONS_SOUND_CHANNEL2 - , CHECKED - MENUITEM "Channel &3", ID_OPTIONS_SOUND_CHANNEL3 - , CHECKED - MENUITEM "Channel &4", ID_OPTIONS_SOUND_CHANNEL4 - , CHECKED - MENUITEM "Direct Sound &A", ID_OPTIONS_SOUND_DIRECTSOUNDA - , CHECKED - MENUITEM "Direct Sound &B", ID_OPTIONS_SOUND_DIRECTSOUNDB - , CHECKED + MENUITEM "Channel &1", ID_OPTIONS_SOUND_CHANNEL1, CHECKED + MENUITEM "Channel &2", ID_OPTIONS_SOUND_CHANNEL2, CHECKED + MENUITEM "Channel &3", ID_OPTIONS_SOUND_CHANNEL3, CHECKED + MENUITEM "Channel &4", ID_OPTIONS_SOUND_CHANNEL4, CHECKED + MENUITEM "Direct Sound &A", ID_OPTIONS_SOUND_DIRECTSOUNDA, CHECKED + MENUITEM "Direct Sound &B", ID_OPTIONS_SOUND_DIRECTSOUNDB, CHECKED END END POPUP "&Input" @@ -1999,174 +1726,111 @@ BEGIN POPUP "&Set" BEGIN MENUITEM "Config &1...", ID_OPTIONS_JOYPAD_CONFIGURE_1 - MENUITEM "Config &2...", ID_OPTIONS_JOYPAD_CONFIGURE_2 - MENUITEM "Config &3...", ID_OPTIONS_JOYPAD_CONFIGURE_3 - MENUITEM "Config &4...", ID_OPTIONS_JOYPAD_CONFIGURE_4 - MENUITEM SEPARATOR MENUITEM "&Motion...", ID_OPTIONS_JOYPAD_MOTIONCONFIGURE - END POPUP "&Use" BEGIN MENUITEM "Config &1", ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_1 - MENUITEM "Config &2", ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_2 - MENUITEM "Config &3", ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_3 - MENUITEM "Config &4", ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_4 - END MENUITEM SEPARATOR POPUP "&Autofire" BEGIN MENUITEM "&A", ID_OPTIONS_JOYPAD_AUTOFIRE_A - MENUITEM "&B", ID_OPTIONS_JOYPAD_AUTOFIRE_B - MENUITEM "&L", ID_OPTIONS_JOYPAD_AUTOFIRE_L - MENUITEM "&R", ID_OPTIONS_JOYPAD_AUTOFIRE_R - END MENUITEM "Rewind interval...", ID_OPTIONS_EMULATOR_REWINDINTERVAL - END POPUP "&Speed" BEGIN POPUP "&Throttle" BEGIN MENUITEM "25%", ID_OPTIONS_FRAMESKIP_THROTTLE_25 - MENUITEM "50%", ID_OPTIONS_FRAMESKIP_THROTTLE_50 - MENUITEM "100%", ID_OPTIONS_FRAMESKIP_THROTTLE_100 - MENUITEM "150%", ID_OPTIONS_FRAMESKIP_THROTTLE_150 - MENUITEM "200%", ID_OPTIONS_FRAMESKIP_THROTTLE_200 - MENUITEM "&Other...", ID_OPTIONS_FRAMESKIP_THROTTLE_OTHER - MENUITEM "No throttle", ID_OPTIONS_FRAMESKIP_THROTTLE_NOTHROTTLE - END MENUITEM SEPARATOR POPUP "&Frame Skip" BEGIN MENUITEM "&No frame skip", ID_OPTIONS_VIDEO_FRAMESKIP_0 - MENUITEM "&1 frame", ID_OPTIONS_VIDEO_FRAMESKIP_1 - MENUITEM "&2 frames", ID_OPTIONS_VIDEO_FRAMESKIP_2 - MENUITEM "&3 frames", ID_OPTIONS_VIDEO_FRAMESKIP_3 - MENUITEM "&4 frames", ID_OPTIONS_VIDEO_FRAMESKIP_4 - MENUITEM "&5 frames", ID_OPTIONS_VIDEO_FRAMESKIP_5 - MENUITEM "&6 frames", ID_OPTIONS_VIDEO_FRAMESKIP_6 - MENUITEM "&7 frames", ID_OPTIONS_VIDEO_FRAMESKIP_7 - MENUITEM "&8 frames", ID_OPTIONS_VIDEO_FRAMESKIP_8 - MENUITEM "&9 frames", ID_OPTIONS_VIDEO_FRAMESKIP_9 - END MENUITEM "Turbo mode", ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE - END MENUITEM SEPARATOR POPUP "&Emulator" BEGIN MENUITEM "&Associate...", ID_OPTIONS_EMULATOR_ASSOCIATE - MENUITEM "&Directories...", ID_OPTIONS_EMULATOR_DIRECTORIES - MENUITEM "BIOS Files...", ID_EMULATOR_BIOSFILES POPUP "&Priority" BEGIN MENUITEM "&Highest", ID_OPTIONS_PRIORITY_HIGHEST - MENUITEM "&Above Normal", ID_OPTIONS_PRIORITY_ABOVENORMAL - MENUITEM "&Normal", ID_OPTIONS_PRIORITY_NORMAL - MENUITEM "&Below Normal", ID_OPTIONS_PRIORITY_BELOWNORMAL - END MENUITEM "&Remove intros (GBA)", ID_OPTIONS_EMULATOR_REMOVEINTROSGBA - MENUITEM "Automatic IPS patching", ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH - MENUITEM "Pause when inactive", ID_OPTIONS_EMULATOR_PAUSEWHENINACTIVE - MENUITEM "AGB Print", ID_OPTIONS_EMULATOR_AGBPRINT - MENUITEM "Real Time Clock", ID_OPTIONS_EMULATOR_REALTIMECLOCK - MENUITEM "&Game Overrides...", ID_OPTIONS_EMULATOR_GAMEOVERRIDES - MENUITEM "Auto hide menu", ID_OPTIONS_EMULATOR_AUTOHIDEMENU - POPUP "Show speed" BEGIN MENUITEM "None", ID_OPTIONS_EMULATOR_SHOWSPEED_NONE - MENUITEM "Percentage", ID_OPTIONS_EMULATOR_SHOWSPEED_PERCENTAGE - MENUITEM "Detailed", ID_OPTIONS_EMULATOR_SHOWSPEED_DETAILED - MENUITEM SEPARATOR MENUITEM "Transparent", ID_OPTIONS_EMULATOR_SHOWSPEED_TRANSPARENT - END POPUP "Save Type" BEGIN MENUITEM "&Automatic", ID_OPTIONS_EMULATOR_SAVETYPE_AUTOMATIC - MENUITEM "EEPROM", ID_OPTIONS_EMULATOR_SAVETYPE_EEPROM - MENUITEM "SRAM", ID_OPTIONS_EMULATOR_SAVETYPE_SRAM - MENUITEM "Flash", ID_OPTIONS_EMULATOR_SAVETYPE_FLASH - MENUITEM "EEPROM+Sensor", ID_OPTIONS_EMULATOR_SAVETYPE_EEPROMSENSOR - MENUITEM "None", ID_OPTIONS_EMULATOR_SAVETYPE_NONE - MENUITEM SEPARATOR MENUITEM "Flash 64 KB", ID_OPTIONS_EMULATOR_SAVETYPE_FLASH512K - MENUITEM "Flash 128 KB", ID_OPTIONS_EMULATOR_SAVETYPE_FLASH1M - END MENUITEM SEPARATOR POPUP "Screenshot &Format" BEGIN MENUITEM "&PNG", ID_OPTIONS_EMULATOR_PNGFORMAT - MENUITEM "&BMP", ID_OPTIONS_EMULATOR_BMPFORMAT - END END POPUP "&Gameboy" BEGIN MENUITEM "&Border", ID_OPTIONS_GAMEBOY_BORDER - MENUITEM "&Printer", ID_OPTIONS_GAMEBOY_PRINTER - MENUITEM "Border Automatic", ID_OPTIONS_GAMEBOY_BORDERAUTOMATIC - MENUITEM SEPARATOR MENUITEM "&Automatic", ID_OPTIONS_GAMEBOY_AUTOMATIC - MENUITEM "&GBA", ID_OPTIONS_GAMEBOY_GBA MENUITEM "&CGB/GBC", ID_OPTIONS_GAMEBOY_CGB MENUITEM "&SGB", ID_OPTIONS_GAMEBOY_SGB @@ -2174,25 +1838,18 @@ BEGIN MENUITEM "G&B", ID_OPTIONS_GAMEBOY_GB MENUITEM SEPARATOR MENUITEM "&Real Colors", ID_OPTIONS_GAMEBOY_REALCOLORS - MENUITEM "G&ameboy Colors", ID_OPTIONS_GAMEBOY_GAMEBOYCOLORS - MENUITEM "LCD colors", ID_OPTIONS_FILTER_LCDCOLORS - MENUITEM SEPARATOR MENUITEM "&Colors...", ID_OPTIONS_GAMEBOY_COLORS - END POPUP "&User Interface" BEGIN POPUP "&Language" BEGIN MENUITEM "&System", ID_OPTIONS_LANGUAGE_SYSTEM - MENUITEM "&English", ID_OPTIONS_LANGUAGE_ENGLISH - MENUITEM "&Other...", ID_OPTIONS_LANGUAGE_OTHER - END POPUP "&Skin" BEGIN @@ -2204,7 +1861,6 @@ BEGIN BEGIN MENUITEM "Enable GBA Linking", ID_OPTIONS_LINK_ENABLE MENUITEM "&Wireless Adapter", ID_OPTIONS_LINK_WIRELESSADAPTER - MENUITEM "&Log", ID_OPTIONS_LINK_LOG MENUITEM "&Options...", ID_OPTIONS_LINK_OPTIONS END @@ -2215,7 +1871,6 @@ BEGIN MENUITEM "&Cheat list...", ID_CHEATS_CHEATLIST MENUITEM SEPARATOR MENUITEM "&Automatic save/load cheats", ID_CHEATS_AUTOMATICSAVELOADCHEATS - MENUITEM "Disable cheats", ID_CHEATS_DISABLECHEATS MENUITEM "&Load cheat list...", ID_CHEATS_LOADCHEATLIST MENUITEM "Sa&ve cheat list...", ID_CHEATS_SAVECHEATLIST @@ -2236,33 +1891,23 @@ BEGIN BEGIN MENUITEM "Wait for connection...", ID_TOOLS_DEBUG_GDB MENUITEM "Load and wait...", ID_TOOLS_DEBUG_LOADANDWAIT - MENUITEM "Break into GDB", ID_TOOLS_DEBUG_BREAK MENUITEM "Disconnect", ID_TOOLS_DEBUG_DISCONNECT - END MENUITEM SEPARATOR POPUP "Record" BEGIN MENUITEM "Start sound recording...", ID_OPTIONS_SOUND_STARTRECORDING - MENUITEM "Stop sound recording", ID_OPTIONS_SOUND_STOPRECORDING - MENUITEM "Start AVI recording...", ID_TOOLS_RECORD_STARTAVIRECORDING - MENUITEM "Stop AVI recording", ID_TOOLS_RECORD_STOPAVIRECORDING - MENUITEM "Start movie recording...", ID_TOOLS_RECORD_STARTMOVIERECORDING - MENUITEM "Stop movie recording", ID_TOOLS_RECORD_STOPMOVIERECORDING - END POPUP "Play" BEGIN MENUITEM "Start playing movie...", ID_TOOLS_PLAY_STARTMOVIEPLAYING - MENUITEM "Stop playing movie", ID_TOOLS_PLAY_STOPMOVIEPLAYING - END MENUITEM SEPARATOR MENUITEM "Rewind", ID_TOOLS_REWIND @@ -2284,7 +1929,7 @@ END // Accelerator // -IDR_ACCELERATOR ACCELERATORS MOVEABLE PURE +IDR_ACCELERATOR ACCELERATORS BEGIN "C", ID_CHEATS_SEARCHFORCHEATS, VIRTKEY, CONTROL, NOINVERT "N", ID_DEBUG_NEXTFRAME, VIRTKEY, CONTROL, NOINVERT @@ -2335,8 +1980,7 @@ BEGIN "3", ID_OPTIONS_VIDEO_LAYERS_BG2, VIRTKEY, CONTROL, NOINVERT "4", ID_OPTIONS_VIDEO_LAYERS_BG3, VIRTKEY, CONTROL, NOINVERT "5", ID_OPTIONS_VIDEO_LAYERS_OBJ, VIRTKEY, CONTROL, NOINVERT - "8", ID_OPTIONS_VIDEO_LAYERS_OBJWIN, VIRTKEY, CONTROL, - NOINVERT + "8", ID_OPTIONS_VIDEO_LAYERS_OBJWIN, VIRTKEY, CONTROL, NOINVERT "6", ID_OPTIONS_VIDEO_LAYERS_WIN0, VIRTKEY, CONTROL, NOINVERT "7", ID_OPTIONS_VIDEO_LAYERS_WIN1, VIRTKEY, CONTROL, NOINVERT "B", ID_TOOLS_REWIND, VIRTKEY, CONTROL, NOINVERT @@ -2348,7 +1992,7 @@ END // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_UNSUPPORTED_VBA_SGM "Unsupported VisualBoyAdvance save game version %d" IDS_CANNOT_LOAD_SGM "Cannot load save game for %s" @@ -2368,7 +2012,7 @@ BEGIN IDS_UNKNOWN_THUMB_OPCODE "Unknown opcode %04x from %08x" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_ERROR_CREATING_FILE "Error creating file %s" IDS_FAILED_TO_READ_SGM "Battery file's size incompatible with the ROM settings %s (%d).\nWarning : save of the battery file is now disabled !" @@ -2388,7 +2032,7 @@ BEGIN IDS_UNSUPPORTED_CHEAT_LIST_VERSION "Unsupported cheat list version %d" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DIRECTX_7_REQUIRED "DirectX 7.0 or greater is required to run.\nDownload at http://www.microsoft.com/directx.\n\nError found at: %s" IDS_DISABLING_VIDEO_MEMORY "Disabling Use Video Memory setting" @@ -2410,7 +2054,7 @@ BEGIN IDS_INVALID_ADDRESS "Invalid address: %08x" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_MISALIGNED_HALFWORD "Misaligned half-word address: %08x" IDS_MISALIGNED_WORD "Misaligned word address: %08x" @@ -2430,7 +2074,7 @@ BEGIN IDS_SELECT_BATTERY_DIR "Select Battery directory:" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_SELECT_SAVE_DIR "Select Save Directory:" IDS_SELECT_CAPTURE_DIR "Select Capture directory:" @@ -2449,7 +2093,7 @@ BEGIN IDS_LOADED_STATE_N "Loaded state %d" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_WROTE_STATE "Wrote state" IDS_WROTE_STATE_N "Wrote state %d" @@ -2469,13 +2113,13 @@ BEGIN IDS_UNKNOWN "Unknown" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_NONE "None" IDS_FAILED_TO_LOAD_LIBRARY "Failed to load library %s" IDS_FAILED_TO_GET_LOCINFO "Failed to get locale information" IDS_SELECT_CHEAT_LIST_NAME "Select cheat list name" - IDS_FILTER_ROM "Game Boy Advance ROMs_*.GBA;*.AGB;*.BIN;*.ELF;*.ZIP;*.7Z;*.Z;*.GZ__" + IDS_FILTER_ROM "Game Boy Advance ROMs_*.GBA;*.AGB;*.BIN;*.ELF;*.MB;*.ZIP;*.7Z;*.Z;*.GZ__" IDS_FILTER_SGM "VisualBoyAdvance Save Game_*.SGM__" IDS_FILTER_CHEAT_LIST "VisualBoyAdvance Cheat List_*.CLT__" IDS_FILTER_PNG "PNG Image_*.PNG_BMP Image_*.BMP__" @@ -2488,7 +2132,7 @@ BEGIN IDS_SELECT_BATTERY_FILE "Select battery file" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_UNSUPPORTED_CHEAT_LIST_TYPE "Unsupported cheat list type %d" IDS_INVALID_GSA_CODE "Invalid GSA code. Format is XXXXXXXXYYYYYYYY." @@ -2503,7 +2147,7 @@ BEGIN IDS_OUT_OF_MEMORY "Failed to allocate memory for %s" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_FILTER_GBS "Gameboy Snapshot_*.GBS__" IDS_FILTER_GCF "Gameshark Code File_*.GCF__" @@ -2523,7 +2167,7 @@ BEGIN IDS_ERROR_LISTENING "Error listening on socket." END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_ERROR_CREATING_SOCKET "Error creating socket." IDS_ACK_NOT_RECEIVED "ACK not received from GDB." @@ -2544,7 +2188,7 @@ BEGIN IDS_END_OF_MOVIE "end of movie" END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_INVALID_INTERVAL_VALUE "Invalid rewind interval value. Please enter a number between 0 and 600 seconds." @@ -2552,7 +2196,7 @@ BEGIN IDS_MOVIE_PLAY "Playing a movie will load a save state which may erase your previous battery saves. Please be sure to have a saved state if you don't want to loose any previous data." END -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_OAL_NODEVICE "There are no sound devices present on this system." IDS_OAL_NODLL "OpenAL32.dll could not be found on your system. Please install the runtime from http://openal.org"