diff --git a/src/drivers/win/cheat.cpp b/src/drivers/win/cheat.cpp index 8327f3a9..84a798d7 100644 --- a/src/drivers/win/cheat.cpp +++ b/src/drivers/win/cheat.cpp @@ -326,9 +326,6 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l SendDlgItemMessage(hwndDlg, IDC_CHEAT_VAL_LT_BY, EM_SETLIMITTEXT, 2, 0); SendDlgItemMessage(hwndDlg, IDC_CHEAT_TEXT, EM_SETLIMITTEXT, 10, 0); - //disable or enable buttons - CheckDlgButton(hwndDlg, IDC_RADIO_ADDRESS, MF_CHECKED); - possiTotalCount = 0; possiItemCount = SendDlgItemMessage(hwndDlg, IDC_CHEAT_LIST_POSSIBILITIES, LVM_GETCOUNTPERPAGE, 0, 0); @@ -438,9 +435,14 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l } break; case WM_COMMAND: - switch (HIWORD(wParam)) { + { + static int editMode = 0; + + switch (HIWORD(wParam)) + { case BN_CLICKED: - switch (LOWORD(wParam)) { + switch (LOWORD(wParam)) + { case CHEAT_CONTEXT_LIST_TOGGLECHEAT: { LVITEM lvi; @@ -524,7 +526,7 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l tempWatch.Type = 'h'; tempWatch.Address = possiList[sel].addr; tempWatch.WrongEndian = false; - if(InsertWatch(tempWatch, hwndDlg) && !RamWatchHWnd) + if (InsertWatch(tempWatch, hwndDlg) && !RamWatchHWnd) SendMessage(hAppWnd, WM_COMMAND, ID_RAM_WATCH, 0); SetForegroundWindow(RamWatchHWnd); } @@ -542,19 +544,19 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l break; case IDC_CHEAT_PAUSEWHENACTIVE: pauseWhileActive ^= 1; - if ((EmulationPaused == 1 ? true : false) != pauseWhileActive) + if ((EmulationPaused == 1 ? true : false) != pauseWhileActive) { EmulationPaused = (pauseWhileActive ? 1 : 0); wasPausedByCheats = pauseWhileActive; if (EmulationPaused) FCEU_printf("Emulation paused: %d\n", EmulationPaused); } - break; + break; case IDC_BTN_CHEAT_ADD: { char name[256] = { 0 }; uint32 a; uint8 v = 0; int c = 0; GetUICheatInfo(hwndDlg, name, &a, &v, &c); - + if (FCEUI_AddCheat(name, a, v, c, 1)) { RedoCheatsCallB(name, a, v, c, 1, 1, NULL); @@ -592,7 +594,8 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l UpdateCheatRelatedWindow(); UpdateCheatListGroupBoxUI(); } - } else { + } + else { if (selcheat >= 0) { FCEUI_DelCheat(selcheat); SendDlgItemMessage(hwndDlg, IDC_LIST_CHEATS, LVM_DELETEITEM, selcheat, 0); @@ -639,10 +642,10 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l const char filter[] = "Cheat files (*.cht)\0*.cht\0All Files (*.*)\0*.*\0\0"; ofn.lpstrFilter = filter; - char nameo[2048] = {0}; - ofn.lpstrFile = nameo; + char nameo[2048] = { 0 }; + ofn.lpstrFile = nameo; ofn.nMaxFile = 2048; - ofn.Flags = OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_FILEMUSTEXIST; + ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT | OFN_FILEMUSTEXIST; std::string initdir = FCEU_GetPath(FCEUMKF_CHEAT); ofn.lpstrInitialDir = initdir.c_str(); @@ -662,7 +665,7 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l case IDC_BTN_CHEAT_RESET: FCEUI_CheatSearchBegin(); ShowResults(hwndDlg); - EnableCheatButtons(hwndDlg,TRUE); + EnableCheatButtons(hwndDlg, TRUE); break; case IDC_BTN_CHEAT_KNOWN: { @@ -676,7 +679,7 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l break; case IDC_BTN_CHEAT_EQ: searchdone = 1; - FCEUI_CheatSearchEnd(FCEU_SEARCH_PUERLY_RELATIVE_CHANGE,0,0); + FCEUI_CheatSearchEnd(FCEU_SEARCH_PUERLY_RELATIVE_CHANGE, 0, 0); ShowResults(hwndDlg); break; case IDC_BTN_CHEAT_NE: @@ -715,41 +718,36 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l ShowResults(hwndDlg); } break; - case IDC_RADIO_ADDRESS: - case IDC_RADIO_TEXT_CODE: - ToggleCheatInputMode(hwndDlg, LOWORD(wParam)); - break; } - break; - case EN_UPDATE: - switch (LOWORD(wParam)) - { + break; + case EN_SETFOCUS: + switch (LOWORD(wParam)) + { + case IDC_CHEAT_ADDR: + case IDC_CHEAT_VAL: + case IDC_CHEAT_COM: editMode = 0; break; + case IDC_CHEAT_TEXT: editMode = 1; break; + } + break; + case EN_UPDATE: + switch (LOWORD(wParam)) + { case IDC_CHEAT_ADDR: case IDC_CHEAT_VAL: case IDC_CHEAT_COM: { - if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_ADDRESS)) + if (editMode == 0) { char buf[16]; uint32 a; uint8 v; int c; GetUICheatInfo(hwndDlg, NULL, &a, &v, &c); GetCheatStr(buf, a, v, c); SetDlgItemText(hwndDlg, IDC_CHEAT_TEXT, buf); } - - // it was saparated to the text/game genie position - /* - if (dodecode && (strlen(buf) == 6 || strlen(buf) == 8)) - if (FCEUI_DecodeGG(buf, &GGaddr, &GGval, &GGcomp)) { - a = GGaddr; - v = GGval; - c = GGcomp; - } - */ } break; case IDC_CHEAT_TEXT: { - if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_TEXT_CODE)) + if (editMode == 1) { char buf[16]; GetDlgItemText(hwndDlg, IDC_CHEAT_TEXT, buf, 16); @@ -765,11 +763,12 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l FCEUI_DecodeGG(buf, &a, &v, &c); SetDlgItemText(hwndDlg, IDC_CHEAT_ADDR, (LPTSTR)(a == -1 ? "" : U16ToStr(a))); - SetDlgItemText(hwndDlg, IDC_CHEAT_VAL, (LPTSTR)(v == -1 ? "" : U8ToStr(v))); - SetDlgItemText(hwndDlg, IDC_CHEAT_COM, (LPTSTR)(c == -1 ? "" : U8ToStr(c))); - } + SetDlgItemText(hwndDlg, IDC_CHEAT_VAL, (LPTSTR)(v == -1 ? "" : U8ToStr(v))); + SetDlgItemText(hwndDlg, IDC_CHEAT_COM, (LPTSTR)(c == -1 ? "" : U8ToStr(c))); + } } } + } } break; case WM_NOTIFY: @@ -975,16 +974,6 @@ void UpdateCheatsAdded() UpdateCheatListGroupBoxUI(); } -void ToggleCheatInputMode(HWND hwndDlg, int modeId) -{ - EnableWindow(GetDlgItem(hwndDlg, IDC_CHEAT_ADDR), modeId == IDC_RADIO_ADDRESS); - EnableWindow(GetDlgItem(hwndDlg, IDC_CHEAT_VAL), modeId == IDC_RADIO_ADDRESS); - EnableWindow(GetDlgItem(hwndDlg, IDC_CHEAT_COM), modeId == IDC_RADIO_ADDRESS); - EnableWindow(GetDlgItem(hwndDlg, IDC_CHEAT_VAL_LABEL), modeId == IDC_RADIO_ADDRESS); - EnableWindow(GetDlgItem(hwndDlg, IDC_CHEAT_COM_LABEL), modeId == IDC_RADIO_ADDRESS); - EnableWindow(GetDlgItem(hwndDlg, IDC_CHEAT_TEXT), modeId == IDC_RADIO_TEXT_CODE); -} - BOOL CALLBACK GGConvCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { char str[100]; diff --git a/src/drivers/win/memwatch.cpp b/src/drivers/win/memwatch.cpp index b2a203d1..9f3af8a2 100644 --- a/src/drivers/win/memwatch.cpp +++ b/src/drivers/win/memwatch.cpp @@ -702,7 +702,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA const int FMAX = 6; string formula[FMAX] = {"> than", "> by 1", "< than", "< by 1", "equal", "!equal"}; - const int kLabelControls[] = {MW_ValueLabel1,MW_ValueLabel2}; + const int kLabelControls[] = {MW_VALUELABEL1,MW_VALUELABEL2}; switch(uMsg) { @@ -846,10 +846,7 @@ static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA ClearAllText(); RamChange(); break; - - case MEMW_FILE_RECENT: - break; - + case MEMW_OPTIONS_LOADSTART: //Load on Start up MemWatchLoadOnStart ^= 1; CheckMenuItem(memwmenu, MEMW_OPTIONS_LOADSTART, MemWatchLoadOnStart ? MF_CHECKED : MF_UNCHECKED); diff --git a/src/drivers/win/replay.cpp b/src/drivers/win/replay.cpp index d2fb74a2..acfecfbd 100644 --- a/src/drivers/win/replay.cpp +++ b/src/drivers/win/replay.cpp @@ -269,11 +269,6 @@ void UpdateReplayDialog(HWND hwndDlg) free(fn); } - else - { - EnableWindow(GetDlgItem(hwndDlg,IDC_EDIT_OFFSET),FALSE); - EnableWindow(GetDlgItem(hwndDlg,IDC_EDIT_FROM),FALSE); - } if(doClear) { diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 30192e26..b513395e 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -13,7 +13,6 @@ ///////////////////////////////////////////////////////////////////////////// // Neutral resources - #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1252) @@ -206,14 +205,14 @@ BEGIN MENUITEM "1 on, 1 off", MENU_AUTOFIRE_PATTERN_1 MENUITEM "1 on, 2 off", MENU_AUTOFIRE_PATTERN_2 MENUITEM "1 on, 3 off", MENU_AUTOFIRE_PATTERN_3 - MENUITEM "1 on, 4 off", ID_DEBUG_DEBUGGER - MENUITEM "1 on, 5 off", ID_DEBUG_PPUVIEWER - MENUITEM "2 on, 1 off", ID_DEBUG_NAMETABLEVIEWER - MENUITEM "2 on, 2 off", ID_DEBUG_HEXEDITOR - MENUITEM "2 on, 3 off", ID_DEBUG_TRACELOGGER + MENUITEM "1 on, 4 off", MENU_AUTOFIRE_PATTERN_4 + MENUITEM "1 on, 5 off", MENU_AUTOFIRE_PATTERN_5 + MENUITEM "2 on, 1 off", MENU_AUTOFIRE_PATTERN_6 + MENUITEM "2 on, 2 off", MENU_AUTOFIRE_PATTERN_7 + MENUITEM "2 on, 3 off", MENU_AUTOFIRE_PATTERN_8 MENUITEM "2 on, 4 off", MENU_AUTOFIRE_PATTERN_9 - MENUITEM "3 on, 1 off", ID_DEBUG_GAMEGENIEDECODER - MENUITEM "3 on, 2 off", ID_DEBUG_CDLOGGER + MENUITEM "3 on, 1 off", MENU_AUTOFIRE_PATTERN_10 + MENUITEM "3 on, 2 off", MENU_AUTOFIRE_PATTERN_11 MENUITEM "3 on, 3 off", MENU_AUTOFIRE_PATTERN_12 MENUITEM "4 on, 1 off", MENU_AUTOFIRE_PATTERN_13 MENUITEM "4 on, 2 off", MENU_AUTOFIRE_PATTERN_14 @@ -1078,7 +1077,7 @@ BEGIN GROUPBOX "Output/Output Format:",302,10,9,131,93,WS_GROUP CONTROL "Sound enabled.",CHECK_SOUND_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,22,117,12 GROUPBOX "Buffering:",127,150,9,131,93,WS_GROUP - CONTROL "Use Global Focus",124,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,22,100,12 + CONTROL "Use Global Focus",CHECK_SOUND_GLOBAL_FOCUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,22,100,12 CTEXT "Sound Latency",65459,162,50,107,8 CONTROL "",CTL_LATENCY_TRACKBAR,"msctls_trackbar32",WS_TABSTOP,162,70,107,13 GROUPBOX "Master",125,19,142,44,93,WS_GROUP @@ -1334,10 +1333,10 @@ BEGIN EDITTEXT 1069,171,182,55,14,ES_AUTOHSCROLL LTEXT "Name",65428,41,7,20,8 LTEXT "Address",65427,6,7,26,8 - LTEXT "Value",MW_ValueLabel1,101,7,19,8 + LTEXT "Value",MW_VALUELABEL1,101,7,19,8 LTEXT "Name",65425,171,7,20,8 LTEXT "Address",65424,135,7,26,8 - LTEXT "Value",MW_ValueLabel2,231,7,19,8 + LTEXT "Value",MW_VALUELABEL2,231,7,19,8 LTEXT " ",EDIT00_RESULTS,89,225,26,8 GROUPBOX "Memory Change Monitoring",IDC_STATIC,0,202,129,57,BS_CENTER LTEXT "Address",IDC_STATIC,6,213,26,8 @@ -1827,10 +1826,10 @@ BEGIN CONTROL " Piano Roll",IDC_CHECK_PIANO_ROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,68,67,10 CONTROL " Selection",IDC_CHECK_SELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,83,67,10 GROUPBOX "Greenzone saving options",IDC_STATIC,13,98,97,72 - CONTROL " all frames",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,23,109,77,10 - CONTROL " every 16th frame",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,23,124,77,10 - CONTROL " marked frames",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,23,139,77,10 - CONTROL " don't save",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,23,154,77,10 + CONTROL " all frames",IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES,"Button",BS_AUTORADIOBUTTON,23,109,77,10 + CONTROL " every 16th frame",IDC_RADIO_GREENZONE_SAVINGMODE_EVERY16FRAME,"Button",BS_AUTORADIOBUTTON,23,124,77,10 + CONTROL " marked frames",IDC_RADIO_GREENZONE_SAVINGMODE_MARKEDFRAMES,"Button",BS_AUTORADIOBUTTON,23,139,77,10 + CONTROL " don't save",IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE,"Button",BS_AUTORADIOBUTTON,23,154,77,10 END ASSEMBLER DIALOGEX 0, 0, 202, 135 @@ -1973,47 +1972,47 @@ BEGIN LTEXT "New Selection Name:",-1,5,240,68,8 END -CHEATCONSOLE DIALOGEX 0, 0, 395, 216 +CHEATCONSOLE DIALOGEX 0, 0, 386, 217 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Cheat Search" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Active Cheats",IDC_GROUPBOX_CHEATLIST,5,2,178,209,WS_TABSTOP - GROUPBOX "Cheat Search",IDC_GROUPBOX_CHEATSEARCH,188,2,201,209,WS_TABSTOP - CONTROL "",IDC_LIST_CHEATS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,11,11,167,131 - LTEXT "Name:",IDC_STATIC,13,147,22,10 - LTEXT "Value:",IDC_CHEAT_VAL_LABEL,83,162,22,8 - LTEXT "Compare:",IDC_CHEAT_COM_LABEL,126,162,34,8 - EDITTEXT IDC_CHEAT_NAME,37,145,141,12,ES_AUTOHSCROLL | ES_WANTRETURN - EDITTEXT IDC_CHEAT_ADDR,54,160,25,12,ES_UPPERCASE | ES_WANTRETURN - EDITTEXT IDC_CHEAT_VAL,107,160,16,12,ES_UPPERCASE | ES_WANTRETURN - EDITTEXT IDC_CHEAT_COM,162,160,16,12,ES_UPPERCASE | ES_WANTRETURN - DEFPUSHBUTTON "Add",IDC_BTN_CHEAT_ADD,11,192,36,16 - PUSHBUTTON "Delete",IDC_BTN_CHEAT_DEL,49,192,36,16 - PUSHBUTTON "Update",IDC_BTN_CHEAT_UPD,87,192,36,16 - PUSHBUTTON "Reset",IDC_BTN_CHEAT_RESET,200,12,55,15 - PUSHBUTTON "Known Value:",IDC_BTN_CHEAT_KNOWN,200,32,55,15 - LTEXT "0x",IDC_CHEAT_LABEL_KNOWN,225,51,9,8 - EDITTEXT IDC_CHEAT_VAL_KNOWN,236,49,18,12,ES_UPPERCASE - GROUPBOX "Previous Compare",IDC_GROUP_PREV_COM,193,63,69,132 - PUSHBUTTON "Equal",IDC_BTN_CHEAT_EQ,200,75,55,15,WS_GROUP - PUSHBUTTON "Not Equal",IDC_BTN_CHEAT_NE,200,96,55,15 - CONTROL "By:",IDC_CHEAT_CHECK_NE_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,114,22,10 - EDITTEXT IDC_CHEAT_VAL_NE_BY,236,113,18,12,ES_UPPERCASE | ES_WANTRETURN - PUSHBUTTON "Greater Than",IDC_BTN_CHEAT_GT,200,129,55,15 - CONTROL "By:",IDC_CHEAT_CHECK_GT_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,147,22,10 - EDITTEXT IDC_CHEAT_VAL_GT_BY,236,146,18,12,ES_UPPERCASE | ES_WANTRETURN - PUSHBUTTON "Less Than",IDC_BTN_CHEAT_LT,200,162,55,15 - CONTROL "By:",IDC_CHEAT_CHECK_LT_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,180,22,10 - EDITTEXT IDC_CHEAT_VAL_LT_BY,236,179,18,12,ES_UPPERCASE | ES_WANTRETURN - GROUPBOX "Possibilities",IDC_CHEAT_BOX_POSSIBILITIES,266,8,117,187,WS_TABSTOP - CONTROL "",IDC_CHEAT_LIST_POSSIBILITIES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,272,18,106,172 + GROUPBOX "Active Cheats",IDC_GROUPBOX_CHEATLIST,5,2,169,209,WS_TABSTOP + GROUPBOX "Cheat Search",IDC_GROUPBOX_CHEATSEARCH,179,2,201,209,WS_TABSTOP + CONTROL "",IDC_LIST_CHEATS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,11,11,157,133 + LTEXT "Name:",IDC_STATIC,12,149,22,10 + LTEXT "Value:",IDC_CHEAT_VAL_LABEL,73,163,22,8 + LTEXT "Compare:",IDC_CHEAT_COM_LABEL,117,163,34,8 + EDITTEXT IDC_CHEAT_NAME,37,147,131,12,ES_AUTOHSCROLL | ES_WANTRETURN + EDITTEXT IDC_CHEAT_ADDR,44,161,25,12,ES_UPPERCASE | ES_WANTRETURN + EDITTEXT IDC_CHEAT_VAL,97,161,16,12,ES_UPPERCASE | ES_WANTRETURN + EDITTEXT IDC_CHEAT_COM,152,161,16,12,ES_UPPERCASE | ES_WANTRETURN + DEFPUSHBUTTON "Add",IDC_BTN_CHEAT_ADD,9,192,36,16 + PUSHBUTTON "Delete",IDC_BTN_CHEAT_DEL,45,192,36,16 + PUSHBUTTON "Update",IDC_BTN_CHEAT_UPD,81,192,36,16 + PUSHBUTTON "Reset",IDC_BTN_CHEAT_RESET,191,12,55,15 + PUSHBUTTON "Known Value:",IDC_BTN_CHEAT_KNOWN,191,32,55,15 + LTEXT "0x",IDC_CHEAT_LABEL_KNOWN,216,51,9,8 + EDITTEXT IDC_CHEAT_VAL_KNOWN,227,49,18,12,ES_UPPERCASE + GROUPBOX "Previous Compare",IDC_GROUP_PREV_COM,184,63,69,132 + PUSHBUTTON "Equal",IDC_BTN_CHEAT_EQ,191,75,55,15,WS_GROUP + PUSHBUTTON "Not Equal",IDC_BTN_CHEAT_NE,191,96,55,15 + CONTROL "By:",IDC_CHEAT_CHECK_NE_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,203,114,22,10 + EDITTEXT IDC_CHEAT_VAL_NE_BY,227,113,18,12,ES_UPPERCASE | ES_WANTRETURN + PUSHBUTTON "Greater Than",IDC_BTN_CHEAT_GT,191,129,55,15 + CONTROL "By:",IDC_CHEAT_CHECK_GT_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,203,147,22,10 + EDITTEXT IDC_CHEAT_VAL_GT_BY,227,146,18,12,ES_UPPERCASE | ES_WANTRETURN + PUSHBUTTON "Less Than",IDC_BTN_CHEAT_LT,191,162,55,15 + CONTROL "By:",IDC_CHEAT_CHECK_LT_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,203,180,22,10 + EDITTEXT IDC_CHEAT_VAL_LT_BY,227,179,18,12,ES_UPPERCASE | ES_WANTRETURN + GROUPBOX "Possibilities",IDC_CHEAT_BOX_POSSIBILITIES,257,8,117,187,WS_TABSTOP + CONTROL "",IDC_CHEAT_LIST_POSSIBILITIES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,263,18,106,172 CONTROL " Pause emulation when this window is active",IDC_CHEAT_PAUSEWHENACTIVE, - "Button",BS_AUTOCHECKBOX,198,198,157,10 - PUSHBUTTON "Import...",IDC_BTN_CHEAT_ADDFROMFILE,136,192,43,16 - CONTROL "Address:",IDC_RADIO_ADDRESS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,161,42,10 - CONTROL "Cheat Code / Game Genie:",IDC_RADIO_TEXT_CODE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,176,101,10 - EDITTEXT IDC_CHEAT_TEXT,115,175,63,12,ES_UPPERCASE | ES_AUTOHSCROLL | WS_DISABLED + "Button",BS_AUTOCHECKBOX,185,198,157,10 + PUSHBUTTON "Import...",IDC_BTN_CHEAT_ADDFROMFILE,126,192,43,16 + EDITTEXT IDC_CHEAT_TEXT,105,175,63,12,ES_UPPERCASE | ES_AUTOHSCROLL + LTEXT "Address:",IDC_CHEAT_ADDRESS_LABEL,12,163,30,8 + LTEXT "Cheat code / Game Genie:",IDC_CHEAT_CODE_GG_LABEL,12,177,87,8 END IDD_LUA DIALOGEX 0, 0, 270, 150 @@ -2222,10 +2221,10 @@ BEGIN CONTROL " Selection",IDC_CHECK_SELECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,92,67,10 GROUPBOX "File contents",IDC_STATIC,105,4,111,177 GROUPBOX "Greenzone saving options",IDC_STATIC,112,106,97,69 - CONTROL " all frames",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,122,117,77,10 - CONTROL " every 16th frame",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,122,131,77,10 - CONTROL " marked frames",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,122,145,77,10 - CONTROL " don't save",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,122,159,77,10 + CONTROL " all frames",IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES,"Button",BS_AUTORADIOBUTTON,122,117,77,10 + CONTROL " every 16th frame", IDC_RADIO_GREENZONE_SAVINGMODE_EVERY16FRAME,"Button",BS_AUTORADIOBUTTON,122,131,77,10 + CONTROL " marked frames", IDC_RADIO_GREENZONE_SAVINGMODE_MARKEDFRAMES,"Button",BS_AUTORADIOBUTTON,122,145,77,10 + CONTROL " don't save", IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE,"Button",BS_AUTORADIOBUTTON,122,159,77,10 CONTROL " Autosave project",IDC_AUTOSAVE_PROJECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,17,81,10 CONTROL " silently",IDC_SILENT_AUTOSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,47,42,10 LTEXT "every",IDC_AUTOSAVE_PERIOD_EVERY_TEXT,14,32,21,8 @@ -2433,8 +2432,8 @@ BEGIN "CHEATCONSOLE", DIALOG BEGIN - RIGHTMARGIN, 394 - BOTTOMMARGIN, 215 + RIGHTMARGIN, 385 + BOTTOMMARGIN, 216 END "VIDEOCONFIG", DIALOG diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index 8f8f6adc..e4cfd2dc 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -5,7 +5,6 @@ #define CLOSE_BUTTON 1 #define BUTTON_CLOSE 1 #define BTN_CLOSE 1 -#define IDB_CLOSE_LOG 1 #define MENU_OPEN_FILE 100 #define EDIT_ROMS 100 #define LBL_LOG_TEXT 100 @@ -16,11 +15,9 @@ #define GRP_GAMEPAD1 100 #define IDC_TRACER_LOG 100 #define MENU_MV_FILE_SAVE 100 -#define IDC_VIDEOCONFIG_MODE 100 #define IDC_ROMPATCHER_OFFSET_BOX 100 #define IDC_ASSEMBLER_HISTORY 100 #define MENU_CLOSE_FILE 101 -#define IDI_ICON1 101 #define CB_DISABLE_SPEED_THROTTLING 101 #define LBL_CDLOGGER_DATACOUNT 101 #define GRP_PPUVIEW_TABLES 101 @@ -34,7 +31,6 @@ #define IDC_ROMPATCHER_DOTNES_OFFSET 101 #define IDC_NTVIEW_TABLE_BOX 101 #define IDC_ASSEMBLER_DISASSEMBLY 101 -#define IDI_ICON2 102 #define MENU_RECENT_FILES 102 #define CB_LOAD_FILE_OPEN 102 #define LBL_CDLOGGER_UNDEFCOUNT 102 @@ -108,10 +104,8 @@ #define IDC_CHEAT_VAL_GT_BY 109 #define IDC_DEBUGGER_SEEK_TO 109 #define IDC_ROMPATCHER_PATCH_DATA 109 -#define IDC_ADDBP_MODE_X2 109 #define IDC_ADDBP_MODE_F 109 #define BTN_CDLOGGER_SAVE_UNUSED 109 -#define IDC_VIDEOCONFIG_43 109 #define IDC_VIDEOCONFIG_TVASPECT 109 #define IDC_GROUP_LOG_OPTIONS 109 #define IDC_CHEAT_VAL_LT_BY 110 @@ -130,7 +124,6 @@ #define IDC_CHECK_LOG_PROCESSOR_STATUS 111 #define IDC_DEBUGGER_RELOAD_SYMS 111 #define IDC_ROMPATCHER_BTN_SAVE 111 -#define IDC_CHEAT_VAL2 111 #define IDC_CHEAT_COM 111 #define IDC_VIDEOCONFIG_DIRECTDRAW_FS 111 #define BTN_AUTO_HOLD 112 @@ -141,50 +134,36 @@ #define IDC_EXTRA_LOG_OPTIONS 113 #define BTN_CLEAR_AH 114 #define IDC_CHECK_LOG_NEW_INSTRUCTIONS 114 -#define IDD_DIALOG1 114 #define IDC_DEBUGGER_RUN_LINE 114 #define LBL_CDLOGGER_VROMREADCOUNT 114 #define LBL_AUTO_HOLD 115 #define IDC_CHECK_LOG_NEW_DATA 115 -#define IDD_DIALOG2 115 -#define IDC_DEBUGGER_STEP_OUT3 115 #define IDC_DEBUGGER_RUN_FRAME2 115 #define LBL_CDLOGGER_UNDEFVROMCOUNT 115 #define LBL_CLEAR_AH 116 #define IDC_CHECK_LOG_UPDATE_WINDOW 116 -#define IDC_DEBUGGER_RESET_CYCLES_COUNTER 116 #define IDC_DEBUGGER_RESET_COUNTERS 116 #define CHEAT_CONTEXT_LIST_TOGGLECHEAT 117 -#define IDC_DEBUGGER_RESET_ON_STEP 117 #define IDC_DEBUGGER_BREAK_ON_CYCLES 117 -#define IDC_CHECK_LINES_TABBING 117 #define IDC_CHECK_CODE_TABBING 117 #define CHEAT_CONTEXT_LIST_POKECHEATVALUE 118 -#define IDC_DEBUGGER_RESET_ON_BP0 118 #define IDC_CHECK_LOG_STATUSES_TO_THE_LEFT 118 -#define IDC_DEBUGGER_BOOKMARK_DEL2 118 #define IDC_DEBUGGER_BOOKMARK_NAME 118 #define CHEAT_CONTEXT_LIST_GOTOINHEXEDITOR 119 #define IDC_DEBUGGER_BREAK_ON_INSTRUCTIONS 119 -#define IDC_CHECK_LOG_FRAME_NUMBER 119 #define IDC_CHECK_LOG_FRAMES_COUNT 119 #define IDC_CHECK_LOG_CYCLES_COUNT 120 #define CHEAT_CONTEXT_LIST_DELETESELECTEDCHEATS 120 -#define IDC_CHECK_LOG_FRAME_NUMBER3 121 #define IDC_CHECK_LOG_INSTRUCTIONS_COUNT 121 #define COMBO_SOUND_8BIT 122 -#define IDD_DIALOG3 123 #define IDC_CHECK_SYMBOLIC_TRACING 123 #define CHECK_SOUND_GLOBAL_FOCUS 124 -#define INSERTCOMMENTSUBTITLE 124 #define IDC_CHECK_LOG_MESSAGES 124 #define IDC_CHECK_LOG_BREAKPOINTS 125 #define CHECK_SOUND_ENABLED 126 #define CTL_LATENCY_TRACKBAR 128 #define COMBO_SOUND_QUALITY 129 #define CHECK_SOUND_MUTEFA 130 -#define IDC_DISABLE_HW_ACCEL_WIN 130 -#define IDC_DISABLE_HW_ACCEL_FS 131 #define DEBUGGER_CONTEXT_TOGGLEBREAK 132 #define MENU_RECORD_MOVIE 141 #define MENU_REPLAY_MOVIE 142 @@ -271,12 +250,10 @@ #define IDC_ASSEMBLER_UNDO 203 #define MENU_INSERT_COIN 204 #define COMBO_NETMOO_LOCAL_PLAYERS 204 -#define MENU_MV_EDIT_FIND_NEXT 204 #define IDC_DEBUGGER_FLAG_D 204 #define IDC_GROUP_PREV_COM 204 #define IDC_NETMOO_KEY 205 #define IDC_DEBUGGER_FLAG_I 205 -#define IDB_BITMAP20 205 #define IDB_TE_GREEN_ARROW 205 #define IDC_NETMOO_PASS 206 #define IDC_DEBUGGER_FLAG_Z 206 @@ -368,13 +345,10 @@ #define IDD_TASEDITOR_SAVINGOPTIONS 289 #define IDD_SYMBOLIC_DEBUG_NAMING 290 #define DLG_SNESPAD 291 -#define IDB_PNG2 298 #define MENU_HIDE_MENU 300 #define COMBO_FILTER 300 -#define IDC_EDIT_AUTHORINFO 300 #define IDC_LABEL_LENGTH 300 #define MENU_MV_VIEW_RAM 300 -#define IDC_RADIO_SCALE 300 #define IDC_DEBUGGER_DISASSEMBLY 300 #define IDC_ASSEMBLER_DEFPUSHBUTTON 300 #define MENU_RUN_IN_BACKGROUND 301 @@ -382,20 +356,14 @@ #define IDC_LABEL_FRAMES 301 #define IDC_BTN_CHEAT_ADD 301 #define MENU_MV_VIEW_PPU 301 -#define IDC_RADIO_STRETCH 301 #define IDC_DEBUGGER_DISASSEMBLY_VSCR 301 #define MENU_BACKGROUND_INPUT 302 #define IDC_LABEL_UNDOCOUNT 302 #define IDC_BTN_CHEAT_DEL 302 -#define IDC_VIDEOCONFIG_XSCALE 302 #define IDC_DEBUGGER_BP_LIST 302 #define MENU_MV_VIEW_OAM 302 #define MENU_MV_VIEW_ROM 303 -#define MENU_SHOW_STATUS_ICON 303 -#define IDC_LABEL_AUTHORINFO 303 #define IDC_BTN_CHEAT_UPD 303 -#define IDC_VIDEOCONFIG_YSCALE 303 -#define IDC_DEBUGGER_DISASSEMBLY2 303 #define IDC_DEBUGGER_DISASSEMBLY_LEFT_PANEL 303 #define MENU_ENABLE_AUTOSAVE 304 #define IDC_LABEL_ROMUSED 304 @@ -419,10 +387,8 @@ #define IDC_LABEL_PALUSED 309 #define MENU_GAME_GENIE 310 #define IDC_DEBUGGER_VAL_PPU 310 -#define IDC_LABEL_PALUSED2 310 #define IDC_LABEL_NEWPPUUSED 310 #define IDC_DEBUGGER_VAL_SPR 311 -#define IDC_LABEL_TWEAKCOUNT 311 #define IDC_BTN_CHEAT_ADDFROMFILE 311 #define IDC_DEBUGGER_BOOKMARK 312 #define IDC_DEBUGGER_CYCLES_EXCEED 313 @@ -433,7 +399,6 @@ #define MENU_NTSC 330 #define MENU_PAL 331 #define MENU_DENDY 332 -#define CHECK_DISABLE_FOURSCORE 400 #define MENU_MV_BOOKMARKS_RM_ALL 400 #define IDC_WINSIZE_MUL_X 400 #define IDC_CHEAT_CHECK_NE_BY 401 @@ -445,9 +410,7 @@ #define IDC_CHEAT_CHECK_LT_BY 403 #define IDC_FORCE_ASPECT_CORRECTION 403 #define IDC_DEBUGGER_VAL_S 403 -#define IDC_VIDEOCONFIG_ASPECT_X 404 #define IDC_TVASPECT_X 404 -#define IDC_VIDEOCONFIG_ASPECT_Y 405 #define IDC_DEBUGGER_VAL_S2 405 #define IDC_TVASPECT_Y 405 #define IDC_VIDEOCONFIG_SCALER_WIN 406 @@ -467,29 +430,23 @@ #define IDC_DEBUGGER_VAL_CYCLES_COUNT 503 #define CTL_VOLUME_TRACKBAR_NOISE 504 #define IDC_DEBUGGER_VAL_PPUPIXEL 504 -#define IDC_SCANLINE_FIRST_NTSC2 504 -#define CTL_VOLUME_TRACKBAR_NOISE2 505 #define CTL_VOLUME_TRACKBAR_PCM 505 #define IDC_DEBUGGER_VAL_CYCLES_COUNT2 505 -#define IDC_DEBUGGER_VAL_CYCLES_COUNT3 506 #define IDC_DEBUGGER_VAL_INSTRUCTIONS_COUNT 506 #define IDC_DEBUGGER_VAL_INSTRUCTIONS_COUNT2 507 #define IDC_VIDEOCONFIG_NO8LIM 600 #define IDC_DEBUGGER_ROM_PATCHER 602 #define LIST_DEBUGGER_BOOKMARKS 701 #define BTN_CANCEL 800 -#define IDC_EDIT_OFFSET 1000 #define IDC_GAME_GENIE_CODE 1000 #define IDC_MEMVIEWFIND_WHAT 1000 #define IDC_BOOKMARK_DESCRIPTION 1000 #define MW_ADDR00 1001 -#define IDC_EDIT_FROM 1001 #define IDC_GAME_GENIE_ADDR 1001 #define IDC_MEMVIEWFIND_TYPE_HEX 1001 #define IDC_NTVIEW_MIRROR_HORIZONTAL 1001 #define IDC_CHECK_STOPMOVIE 1002 #define IDC_GAME_GENIE_COMP 1002 -#define IDC_TRACER_STATS 1002 #define IDC_MEMVIEWFIND_TYPE_TEXT 1002 #define IDC_NTVIEW_MIRROR_VERTICAL 1002 #define LV_MAPPING 1003 @@ -515,7 +472,6 @@ #define MW_ADDR05 1016 #define MW_ADDR06 1019 #define MW_ADDR07 1022 -#define GUI_BOT_BOTMODE 1025 #define MW_ADDR08 1025 #define MW_ADDR09 1028 #define MW_ADDR10 1031 @@ -532,7 +488,6 @@ #define MW_ADDR21 1064 #define MW_ADDR22 1067 #define MW_ADDR23 1070 -#define GUI_BOT_PART_LAST 1090 #define BTN_ALLOW_LRUD 1117 #define BTN_PRESET_SET1 1119 #define BTN_PRESET_SET2 1120 @@ -544,49 +499,36 @@ #define BTN_PRESET_EXPORT2 1126 #define BTN_PRESET_EXPORT3 1127 #define IDC_LIST1 1130 -#define IDC_HACKY2 1131 -#define IDC_HACKY1 1132 #define IDC_BUTTON_METADATA 1132 -#define IDC_HACKYEXPORT 1133 -#define IDC_BUTTON1 1133 #define MEMW_EXPANDCOLLAPSE 1133 #define IDC_SOUND_RESTOREDEFAULTVOL 1133 #define TASEDITOR_REWIND 1133 -#define IDC_BUTTON2 1134 #define TASEDITOR_FORWARD 1134 -#define IDC_BUTTON3 1135 #define TASEDITOR_REWIND_FULL 1135 -#define IDC_BUTTON4 1136 #define TASEDITOR_FORWARD_FULL 1136 #define TASEDITOR_PLAYSTOP 1137 -#define IDC_RADIO1 1138 +#define IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES 1138 #define IDC_RADIO_UP 1138 -#define IDC_RADIO2 1139 #define IDC_RADIO_ALL 1139 -#define IDC_RADIO3 1140 +#define IDC_RADIO_GREENZONE_SAVINGMODE_EVERY16FRAME 1139 #define IDC_RADIO_1P 1140 -#define IDC_RADIO4 1141 +#define IDC_RADIO_GREENZONE_SAVINGMODE_MARKEDFRAMES 1140 #define IDC_RADIO_2P 1141 +#define IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE 1141 #define MEMW_EDIT00FORMULA 1142 -#define IDC_RADIO5 1142 #define IDC_RADIO_3P 1142 #define MEMW_EDIT01FORMULA 1143 -#define IDC_RADIO6 1143 #define IDC_RADIO_4P 1143 #define IDC_PROGRESS_BUTTON 1144 #define MEMW_EDIT02FORMULA 1144 -#define IDC_BUTTON7 1145 #define MEMW_EDIT03FORMULA 1145 #define TASEDITOR_PREV_MARKER 1145 -#define IDC_BUTTON8 1146 #define TASEDITOR_FIND_BEST_SIMILAR_MARKER 1146 -#define IDC_EDIT1 1147 #define IDC_SELECTION_MARKER_EDIT 1147 #define IDC_NOTE_TO_FIND 1147 #define IDC_AUTOSAVE_PERIOD 1147 #define IDC_EXTRA_SCANLINES 1147 #define IDC_CHEAT_TEXT 1147 -#define IDC_BUTTON9 1148 #define TASEDITOR_FIND_NEXT_SIMILAR_MARKER 1148 #define IDC_SYMBOLIC_ADDRESS 1148 #define IDC_VBLANK_SCANLINES 1148 @@ -597,15 +539,10 @@ #define TASEDITOR_NEXT_MARKER 1151 #define IDC_SYMBOLIC_COMMENT 1151 #define IDC_BRANCHES_BUTTON 1152 -#define IDC_JUMP_PLAYBACK_BUTTON 1153 -#define IDC_EDIT2 1154 #define IDC_PLAYBACK_MARKER_EDIT 1154 -#define IDC_JUMP_SELECTION_BUTTON 1155 #define TASEDITOR_RUN_MANUAL 1156 #define CHECK_SOUND_MUTETURBO 1179 #define IDC_EDIT_AUTHOR 1180 -#define MEMW_STATIC 1181 -#define MEMW_RESULTS 1184 #define MEMW_EDIT00RESET 1184 #define MEMW_EDIT01RESET 1185 #define MEMW_EDIT02RESET 1186 @@ -615,24 +552,19 @@ #define MEMW_EDIT02RMADDRESS 1190 #define MEMW_EDIT03RMADDRESS 1191 #define IDC_DEBUGGER_RESTORESIZE 1191 -#define MEMW_EDIT04RMADDRESS 1192 #define IDC_MOVIE_CLOSE 1192 #define EDIT00_RESULTS 1193 #define IDC_MOVIE_PAUSEAFTERPLAYBACK 1193 #define EDIT01_RESULTS 1194 #define IDC_MOVIE_BINDSAVESTATES 1194 #define EDIT02_RESULTS 1195 -#define IDC_MOVIE_DISPLAYSTATUSICON 1195 #define EDIT03_RESULTS 1196 #define IDC_MOVIE_DISPLAYSUBTITLES 1196 #define IDC_MOVIE_SUBTITLESINAVI 1197 #define IDC_MOVIE_AUTOBACKUP 1198 -#define IDC_SOUNDS_RESTOREDEFAULTS 1199 -#define BTN_CANCELED 1200 #define ID_SOUND_TRITOP 1201 #define IDC_MOVIE_SUGGEST_READONLY 1201 #define ID_SOUND_QUALITYNOTIFY 1202 -#define IDC_CHECK1 1203 #define CB_ENABLECONTEXTMENU 1203 #define DEBUGAUTOLOAD 1203 #define IDC_CHEAT_PAUSEWHENACTIVE 1203 @@ -649,36 +581,24 @@ #define CHECK_DEEMPH_SWAP 1203 #define IDC_CHECK_LOG_BANK_NUMBER 1203 #define IDC_VOLUMEGROUP 1204 -#define IDC_OMITBLANK 1204 -#define IDC_CHECK3 1204 #define IDC_CHECK_MARKERS 1204 #define IDC_RECORDING 1204 #define IDC_COPY_MARKERS 1204 -#define IDC_AUTORESUMECDLOGGING2 1204 #define IDC_AUTOSAVECDL 1204 #define IDC_INVERT_THE_MASK 1204 -#define IDC_DEBUGGER_PREDEFINEDREGS 1204 #define IDC_DEBUGGER_PREDEFINED_REGS 1204 #define IDC_RAMLIST 1205 -#define IDC_CHECK4 1205 #define IDC_CHECK_BOOKMARKS 1205 -#define IDC_SUPERIMPOSE2 1205 #define IDC_RUN_AUTO 1205 #define IDC_AUTOLOADCDL 1205 -#define IDC_INVERT_THE_MASK2 1205 #define IDC_SPRITE16_MODE 1205 #define IDC_C_SEARCH 1206 -#define IDC_CHECK5 1206 -#define IDC_CHECK_GREENZONE 1206 #define IDC_USEPATTERN 1206 #define IDC_C_ADDCHEAT 1207 -#define IDC_CHECK6 1207 #define IDC_CHECK_HISTORY 1207 #define IDC_C_WATCH 1208 -#define IDC_CHECK7 1208 #define IDC_CHECK_SELECTION 1208 #define IDC_C_RESET 1209 -#define IDC_CHECK8 1209 #define IDC_CHECK_PIANO_ROLL 1209 #define IDC_C_ELIMINATE 1210 #define IDC_LESSTHAN 1211 @@ -709,18 +629,14 @@ #define IDC_C_RESET_CHANGES 1236 #define IDC_C_UNDO 1237 #define IDC_WATCHLIST 1238 -#define IDC_C_ELIMINATE2 1238 #define IDC_C_HEXEDITOR 1238 #define IDC_C_WATCH_EDIT 1239 #define IDC_C_WATCH_REMOVE 1240 #define IDC_C_WATCH_DUPLICATE 1241 #define ID_WATCHES_UPDOWN 1242 #define IDC_C_WATCH_UP 1243 -#define IDC_C_WATCH_DUPLICATE2 1243 -#define IDC_C_WATCH_Separator 1243 #define IDC_C_WATCH_DOWN 1244 #define IDC_PROMPT_TEXT 1245 -#define IDC_PROMPT_TEXT2 1246 #define IDC_PROMPT_EDIT 1247 #define IDC_BUTTON_LUABROWSE 1248 #define IDC_BUTTON_LUARUN 1249 @@ -737,26 +653,20 @@ #define IDC_SINGLEINSTANCE 1258 #define IDC_MOVIE_CLOSEAFTERPLAYBACK 1258 #define IDC_C_WATCH_SEPARATE 1259 -#define IDC_TWEAKCOUNT 1260 #define CHECK_AUTORESTORE_PLAYBACK 1261 #define CB_FS_BY_DOUBLECLICK 1261 #define IDC_PROGRESS1 1262 #define CHECK_FOLLOW_CURSOR 1263 #define IDC_BOOKMARKS_BOX 1264 #define IDC_BRANCHES_BITMAP 1265 -#define IDC_SCREENSHOT_BITMAP 1266 #define CHECK_TURBO_SEEK 1266 #define IDC_TEXT_SELECTION 1267 #define IDC_TEXT_CLIPBOARD 1268 #define IDC_RADIO_1PLAYER 1269 -#define IDC_TEXT_SELECTION2 1269 -#define CHECK_AUTOADJUSTINPUTDUETOLAG 1269 #define IDC_RADIO_2PLAYERS 1270 #define IDC_PLAYBACK_MARKER 1270 #define IDC_RADIO_FOURSCORE 1271 #define IDC_SELECTION_MARKER 1271 -#define IDC_NOTE_TOOLTIP_EDIT 1272 -#define IDC_SELECTION_MARKER2 1272 #define IDC_RADIO_DOWN 1273 #define IDC_PLAYBACK_BOX 1275 #define IDC_RECORDER_BOX 1276 @@ -771,8 +681,6 @@ #define ID_CHR2 1284 #define ID_CHR3 1285 #define ID_STATIC 1286 -#define ID_CDL_OPTIONS 1287 -#define ID_CDL_GENERATEROM 1288 #define CTL_PALSAT_TRACKBAR 1291 #define CB_SKIP_7BIT 1293 #define STATIC_SATVALUE 1294 @@ -784,9 +692,6 @@ #define STATIC_CONTRASTVALUE 1300 #define CTL_PALBRIGHT_TRACKBAR 1301 #define STATIC_BRIGHTVALUE 1302 -#define IDC_RICHEDIT21 1304 -#define IDC_RICHEDIT_DISASM 1304 -#define IDC_CHECK2 1305 #define DEBUGIDAFONT 1305 #define IDC_AUTOSAVE_PERIOD_EVERY_TEXT 1306 #define IDC_AUTOSAVE_PERIOD_MINUTES_TEXT 1307 @@ -794,11 +699,10 @@ #define IDC_EXTRA_SCANLINES_TEXT 1309 #define IDC_DATASIZE_GROUPBOX 1310 #define IDC_DATATYPE_GROUPBOX 1311 -#define IDC_RADIO_ADDRESS 1312 -#define IDC_RADIO_TEXT_CODE 1313 +#define IDC_CHEAT_CODE_GG_LABEL 1312 +#define IDC_CHEAT_ADDRESS_LABEL 1313 #define IDC_CHEAT_VAL_LABEL 1314 #define IDC_CHEAT_COM_LABEL 1315 -#define IDC_CHEAT_KNOWN_LABEL 1316 #define IDC_CHEAT_LABEL_KNOWN 1316 #define MENU_NETWORK 40040 #define MENU_PALETTE 40041 @@ -809,7 +713,6 @@ #define MENU_ABOUT 40046 #define MENU_MSGLOG 40047 #define MENU_CHEATS 40048 -#define MENU_BASIC_BOT 40049 #define MENU_AUTOFIRE_PATTERN_1 40050 #define MENU_AUTOFIRE_PATTERN_2 40051 #define MENU_AUTOFIRE_PATTERN_3 40052 @@ -839,7 +742,6 @@ #define MENU_AUTOFIRE_OFFSET_5 40069 #define MENU_AUTOFIRE_OFFSET_6 40070 #define MENU_ALTERNATE_AB 40071 -#define MENU_EXTERNAL_INPUT 40072 #define MENU_PPUVIEWER 40074 #define MENU_NAMETABLEVIEWER 40075 #define MENU_HEXEDITOR 40076 @@ -848,7 +750,6 @@ #define MENU_GAMEGENIEDECODER 40079 #define MENU_DEBUGGER 40080 #define MENU_MEMORY_WATCH 40081 -#define MENU_RAMFILTER 40082 #define ID_FILE_RECENT 40100 #define MEMW_HELP_WCOMMANDS 40101 #define MEMW_OPTIONS_LOADLASTFILE 40102 @@ -856,71 +757,33 @@ #define MEMW_FILE_OPEN 40104 #define MEMW_FILE_SAVE 40105 #define MEMW_FILE_SAVEAS 40106 -#define MEMW_FILE_RECENT 40107 #define MEMW_FILE_CLOSE 40108 #define MEMW_OPTIONS_LOADSTART 40109 #define ID_FILE_RECORDMODE_TRUNCATE 40110 #define ID_FILE_RECORDMODE_OVERWRITE 40111 #define ID_FILE_RECORDMODE_INSERT 40112 -#define ID_FILE_RECORDMODE_XOR 40113 #define FCEUX_CONTEXT_RECORDMODE_TRUNCATE 40115 #define FCEUX_CONTEXT_RECORDMODE_OVERWRITE 40116 #define FCEUX_CONTEXT_RECORDMODE_INSERT 40117 -#define FCEUX_CONTEXT_RECORDMODE_XOR 40118 #define MENU_RECORD_WAV 40120 #define MENU_STOP_WAV 40121 -#define MENU_TASEDIT 40124 -#define MENU_PAUSEAFTERPLAYBACK 40126 #define ID_FILE_NEXTRECORDMODE 40127 #define ID_FILE_PREVRECORDMODE 40128 #define ACCEL_CTRL_O 40130 -#define ACCEL_CTRL_E 40131 #define ACCEL_CTRL_W 40132 #define ACCEL_CTRL_S 40134 #define ACCEL_CTRL_SHIFT_S 40135 #define ACCEL_CTRL_N 40136 #define ACCEL_CTRL_C 40138 #define MENU_HELP 40140 -#define ID_FILE_OOADFM2 40141 -#define ID_FILE_OPENFM2 40142 -#define ID_FILE_SAVEFM2 40143 -#define ID_TWEAKS_DISPLAYBG 40144 -#define ID_TWEAKS_DISPLAYOBJ 40145 -#define ID_ 40146 #define MENU_DISPLAY_BG 40147 #define MENU_DISPLAY_OBJ 40148 -#define ID_FILE_CONVERTMOVIE 40149 #define MENU_CONVERT_MOVIE 40150 -#define ID_STRAY_INSERTFRAMES 40151 -#define MENU_INSERTFRAMES 40152 -#define ID_SELECTED_INSERTFRAME 40153 -#define ID_SELECTED_DELETEFRAME 40154 -#define MENU_DELETEFRAME 40155 -#define MENU_DELETEFRAMES 40156 -#define MENU_STRAY_INSERTFRAMES 40157 #define ID_TOOLS_TEXTHOOKER 40158 -#define ID_Menu 40159 -#define ID_STRAY_TRUNCATE 40160 -#define ID_SELECTED_BRANCH 40161 -#define ID_SELECTED_INSERTMARKER 40162 -#define ID_SELECTED_CREATEMACRO 40163 -#define ID_EDIT 40164 -#define ID_EDIT_COPY40165 40165 -#define ID_EDIT_PASTE40166 40166 -#define ID_EDIT_CUT40167 40167 -#define ID_EDIT_COPYTONEW 40168 #define ID_EDIT_DELETE 40169 -#define ID_HELP_TASEDITHELP 40170 -#define ID_FILE_NEWPROJECTCTRL 40171 #define ID_FILE_SAVEPROJECT 40172 -#define ID_FILE_SAVEAS 40173 -#define ID_FILE_CLOSECTRL 40174 -#define ID_Menu40175 40175 -#define ID_Menu40176 40176 #define ID_EDIT_TRUNCATE 40177 #define ID_FILE_IMPORT 40178 -#define ID_FILE_NEWPROJECT 40179 -#define ID_FILE_OPEN_PROJECT 40180 #define ID_FILE_OPENPROJECT 40181 #define ID_FILE_SAVEPROJECTAS 40182 #define ID_FILE_EXPORTFM2 40183 @@ -928,27 +791,13 @@ #define ACCEL_CTRL_V 40195 #define ACCEL_CTRL_SHIFT_V 40196 #define ACCEL_CTRL_DELETE 40197 -#define ID_ACCEL_CTRL_T 40198 -#define ACCEL_CTRL_T 40198 #define ACCEL_CTRL_B 40199 #define ID_CONTEXT_SELECTED_TRUNCATE 40200 -#define ID_CONTEXT_STRAY_TRUNCATE 40201 -#define ID_VIEW 40202 -#define MENU_CONTEXT_STRAY_INSERTFRAMES 40203 #define ID_CONTEXT_SELECTED_INSERTFRAMES 40204 #define ID_CONTEXT_SELECTED_DELETEFRAMES 40205 -#define ID_SELECTED_REMOVEMARKER 40206 -#define ID_CONTEXT_SELECTED_PASTETONEW 40207 -#define ID_CONTEXT_SELECTED_BRANCH 40210 -#define ID_EDIT_BRANCHCTRL 40211 -#define ID_EDIT_BRANCH 40212 #define ID_EDIT_SELECTALL 40214 -#define ID_EDIT_REMOVEMARKER 40215 -#define ID_FILE_CLOSECTRL40216 40216 #define ID_MEMWVIEW_FILE_CLOSE 40217 -#define ID_FILE_CLOSE40218 40218 #define MENU_MV_FILE_GOTO_ADDRESS 40219 -#define MENU_BASIC_BOT2 40220 #define ID_FILE_TRUNCATE_MOVIE 40221 #define FCEUX_CONTEXT_TRUNCATE_MOVIE 40222 #define ID_FILE_INSERT_1_FRAME 40223 @@ -957,140 +806,54 @@ #define FCEUX_CONTEXT_DELETE_1_FRAME 40226 #define ID_FILE_OPENLUAWINDOW 40229 #define ID_FILE_CLOSELUAWINDOWS 40230 -#define ID_CONFIG_DISPLAY 40231 -#define ID_DISPLAY_INPUTDISPLAY 40232 -#define ID_DISPLAY_LAGCOUNTER 40233 -#define FCUE_DISPLAY_INPUTDISPLAY 40234 -#define FCEU_DISPLAY_LAGCOUNTER 40235 -#define MENU_DISPLAY_INPUTDISPLAY 40236 #define MENU_DISPLAY_LAGCOUNTER 40237 -#define ID_DISPLAY_FRAMEADV 40238 #define MENU_DISPLAY_FA_LAGSKIP 40239 -#define ID_DISPLAY_INPUTDISPLAY40240 40240 -#define ID_LAGCOUNTER_OFF 40241 -#define ID_LAGCOUNTER_1PLAYER 40242 -#define ID_LAGCOUNTER_2PLAYER 40243 -#define ID_LAGCOUNTER_4PLAYER 40244 -#define ID_DISPLAY_LAGCOUNTER40245 40245 -#define MENU_INPUTDISPLAY_OFF 40246 -#define MENU_INPUTDISPLAY_1P 40247 -#define MENU_INPUTDISPLAY_2P 40248 -#define MENU_INPUTDISPLAY_4P 40249 #define MENU_INPUTDISPLAY_0 40250 #define MENU_INPUTDISPLAY_1 40251 #define MENU_INPUTDISPLAY_2 40252 #define MENU_INPUTDISPLAY_4 40253 #define ID_DISPLAY_FRAMECOUNTER 40254 -#define ID_CONFIG_BINDSAVESTATESTOMOVIE 40255 #define MENU_CONFIG_BINDSAVES 40256 -#define MEMVIEW_HELP 40257 #define MENU_MV_HELP 40258 -#define ID_DISPLAY_MOVESUBTITLES 40259 -#define ID_DISPLAY_MOVIESUBTITLES 40260 -#define ID_DISPLAY_MOVIESUBTITLESINAVI 40261 -#define ID_DISPLAY_MOVIESUBTITLES_AVI 40262 #define ID_NES_PAUSE 40263 -#define ID_NES_FRAMEADVANCE 40264 #define ID_NES_SPEEDUP 40265 #define ID_NES_SLOWDOWN 40266 -#define ID_NES_FASTESTSPEED 40267 #define ID_NES_NORMALSPEED 40268 #define ID_NES_TURBO 40269 #define ID_NES_SLOWESTSPEED 40270 -#define ID_NES_EMULATIONSPEED 40271 #define ID_FILE_SCREENSHOT 40272 -#define ID_FILE_RESTARTMOVIE 40273 #define ID_FILE_PLAYMOVIEFROMBEGINNING 40274 -#define ID_GAME_INSERTSUBTITLE 40275 -#define ID_GAME_INSERTCOMMENT 40276 -#define ID_GAME_HELP 40277 -#define ID_GAME_REPLAYMOVIE 40278 -#define ID_GAME_HELP40279 40279 -#define FCEU_CONTEXT_INSERTSUBTITLE 40280 #define FCEU_CONTEXT_MOVIEHELP 40281 #define FCEUX_CONTEXT_REPLAYMOVIE 40282 -#define FCEU_CONTEXT_ROMHELP 40283 -#define ID_NOGAME_OPENROM 40284 -#define ID_NOGAME_HELP 40285 #define FCEU_CONTEXT_OPENROM 40286 #define FCEU_CONTEXT_FCEUHELP 40287 -#define FCEU_CONTEXT_INSERTCOMMENT 40288 -#define ID_FILE_MOVIE 40289 -#define ID_FILE_RECORDAVI 40290 -#define ID_FILE_LUA 40291 -#define ID_NES_EMULATION 40292 -#define ID_GAME_PLAYMOVIEFROMBEGINNING 40293 -#define ID_GAME_STOPMOVIE 40294 #define FCEU_CONTEXT_PLAYMOVIEFROMBEGINNING 40295 #define FCEU_CONTEXT_STOPMOVIE 40296 -#define ID_GAME_CLOSEROM 40297 #define FCEU_CONTEXT_CLOSEROM 40298 -#define ID_GAME_PLAYMOVIEFROMBEGINNING40299 40299 -#define ID_GAME_STOPMOVIERECORDING 40300 -#define ID_GAME_HELP40301 40301 -#define ID_GAME_RECORDMOVIE 40302 #define FCEUX_CONTEXT_RECORDMOVIE 40303 -#define ID_GAME_SCREENSHOT 40304 #define FCEUX_CONTEXT_SCREENSHOT 40305 -#define ID_GAME_REWINDTOLASTAUTO 40306 #define FCEUX_CONTEXT_REWINDTOLASTAUTO 40307 -#define ID_GAME_REWINDTOLASTAUTO40308 40308 -#define ID_GAME_REWINDTOLASTAUTO40309 40309 -#define ID_GAME_VIEWCOMMENTSSUBTITLES 40310 #define FCEUX_CONTEXT_VIEWCOMMENTSSUBTITLES 40311 -#define ID_GAME_VIEWCOMMENTSSUBTITLES40312 40312 -#define ID_OPTIONS_COLLAPSETO1COLUMN 40313 #define MEMW_OPTIONS_EXPANDCOLLAPSE 40314 -#define ID_GAME_UNDOLOADSTATE 40315 #define FCEUX_CONTEXT_UNDOLOADSTATE 40316 -#define ID_GAME_UNDOLOADSTATE40317 40317 -#define ID_GAME_UNDOLOADSTATE40318 40318 -#define ID_GAME_MAKEBACKUP 40319 #define FCEUX_CONTEXT_MAKEBACKUP 40320 -#define ID_CONFIG_MOVIEOPTIONS 40321 #define MENU_MOVIEOPTIONS 40322 -#define ID_GAME_UNDOSAVESTATE 40323 #define FCEUX_CONTEXT_UNDOSAVESTATE 40324 -#define ID_GAME_UNDOSAVESTATE40325 40325 -#define ID_GAME_UNDOSAVESTATE40326 40326 -#define ID_NOGAME_OPENMOSTRECENTROM 40327 #define FCEUX_CONTEXT_RECENTROM1 40328 -#define ID_NES_EMULATION40329 40329 -#define ID_MOVIE_TOGGLEREAD 40330 #define ID_FILE_MOVIE_TOGGLEREAD 40331 -#define ID_LUA_RELOADLUASCRIPT 40332 -#define ID_FILE_LUA_RELOADLUASCRIPT 40333 -#define ID_GAME_SWITCHTOREAD 40334 #define FCEUX_CONTEXT_READONLYTOGGLE 40335 -#define ID_GAME_TOGGLETOREAD 40336 -#define ID_FILE_SAVESTATE 40337 -#define ID_CONFIG_ENABLE 40338 -#define ID_SAVESTATE_QUICKSAVE 40339 -#define ID_SAVESTATE_QUICKLOAD 40340 -#define ID_SAVESTATE 40341 -#define ID_LOADSTATE 40342 #define MENU_LOADSTATE 40343 #define MENU_SAVESTATE 40344 -#define ID_SAVESTATE_NEXTSAVESLOT 40345 -#define ID_SAVESTATE_PREVIOUSSAVESLOT 40346 #define MENU_NEXTSAVESTATE 40347 #define MENU_PREVIOUSSAVESTATE 40348 -#define ID_SAVESTATE_VIEWSAVESLOTS 40349 #define MENU_VIEWSAVESLOTS 40350 -#define ID_LUA_RECENT 40351 #define MENU_LUA_RECENT 40352 -#define ID_Menu40353 40353 #define MENU_MOVIE_RECENT 40354 -#define ID_GAME_LOADLASTMOVIE 40355 #define FCEUX_CONTEXT_LOADLASTMOVIE 40356 -#define ID_GAME_SAVEMOVIEAS 40357 #define FCEUX_CONTEXT_SAVEMOVIEAS 40358 #define ID_FILE_TOGGLE_RECORDING_MOVIE 40359 #define FCEUX_CONTEXT_TOGGLE_RECORDING 40360 #define ID_OPTIONS_BINDTOMAINWINDOW 40361 -#define ID_CONFIG_PPU 40362 -#define ID_PPU_NEWPPU 40363 -#define ID_PPU_OLDPPU 40364 #define ID_NEWPPU 40365 #define ID_OLDPPU 40366 #define ID_CONFIG_SAVECONFIGFILE 40367 @@ -1105,69 +868,42 @@ #define ID_RAM_SEARCH 40376 #define ID_RAM_WATCH 40377 #define RW_MENU_FIRST_RECENT_FILE 40380 -#define RW_MENU_LAST_RECENT_FILE 40400 -#define ID_ENABLE_BACKUPSAVESTATES 40401 +#define RW_MENU_LAST_RECENT_FILE 40400#define ID_ENABLE_BACKUPSAVESTATES 40401 #define ID_ENABLE_COMPRESSSAVESTATES 40402 -#define ID_AVI_DISABLEMOV 40403 -#define ID_AVI_DISMOVIEMESS 40404 #define ID_AVI_DISMOVIEMESSAGE 40405 #define ID_INPUTDISPLAY_OLDSTYLEDISP 40406 -#define ID_GAME_RECOVERY 40407 -#define ID_SAVESTATE_RECOVERY 40408 #define ID_CONTEXT_FULLSAVESTATES 40409 #define ID_FILE_SAVESCREENSHOTAS 40411 -#define ID_WATCHES_ADDSEPARATOR 40412 -#define ID_WATCHES_SEPARATOR 40413 -#define IDC_C_WATCHES_SEPARATOR 40414 -#define IDC_C_WATCH_SEPARATORS 40415 -#define IDC_C_WATCH_Separa 40416 -#define ID_GAME_USECONFIG 40417 #define FCEUX_CONTEXT_GUICONFIG 40418 -#define ID_SELECTED_INSERTFRAMES 40422 -#define ID_CONTEXT_SELECTED_INSERTFRAME 40423 -#define ID_SELECTED_INSERTFRAMES40424 40424 #define ID_CONTEXT_SELECTED_INSERTFRAMES2 40425 #define ACCEL_CTRL_F 40429 -#define ACCEL_CTRL_P 40430 #define ID_CONFIG_SETGREENZONECAPACITY 40432 #define ACCEL_CTRL_INSERT 40433 #define ID_DISPLAY_RERECORDCOUNTER 40436 #define ID_DISPLAY_MOVIESTATUSICON 40437 -#define ID_AVI_DISPLAYHUD 40438 -#define ID_AVI_STOPWAV 40439 #define ID_AVI_ENABLEHUDRECORDING 40440 -#define ID_VIEW_SHOWDOTINEMPTYCELLS 40441 #define ACCEL_INS 40442 #define ACCEL_DEL 40443 -#define ID_SELECTED_CLEARSELECTION 40445 -#define ID_CONTEXT_SELECTED_CLEARSELECTION 40446 #define ID_CONTEXT_SELECTED_CLEARFRAMES 40447 -#define ID_VIEW_SHOW 40448 #define ID_EDIT_CLEAR 40450 #define ID_EDIT_INSERTFRAMES 40451 #define ID_EDIT_INSERT 40452 -#define ID_EDIT_SELECTBETWEENMARKERS 40453 #define ID_CONFIG_BINDMARKERSTOINPUT 40454 #define ACCEL_CTRL_A 40455 #define ID_EDIT_SELECTMIDMARKERS 40457 #define ID_SELECTED_SELECTMIDMARKERS 40458 -#define ID_EDIT_CLONEFRAME 40459 #define ID_EDIT_CLONEFRAMES 40460 -#define ACCEL_SHIFT_INS 40461 #define ACCEL_CTRL_SHIFT_INS 40461 #define ID_SELECTED_CLONE 40463 -#define ID_CONFIG_Q 40464 #define ACCEL_CTRL_Z 40465 #define ACCEL_CTRL_Y 40466 #define ID_EDIT_UNDO 40468 #define ID_EDIT_REDO 40469 #define ID_CONFIG_SETMAXUNDOLEVELS 40470 -#define ID_VIEW_X 40471 #define ID_VIEW_JUMPWHENMAKINGUNDO 40472 #define ID_CONFIG_BRANCHESRESTOREFULLMOVIE 40473 #define ID_CONFIG_OLDBRANCHINGCONTROLS 40474 #define ID_CONFIG_HUDINBRANCHSCREENSHOTS 40475 -#define ID_CONFIG_SETAUTOSAVEPERIOD 40476 #define ACCEL_CTRL_Q 40478 #define ID_EDIT_SELECTIONUNDO 40481 #define ID_EDIT_SELECTIONREDO 40482 @@ -1176,49 +912,29 @@ #define ID_HELP_ABOUT 40485 #define ID_VIEW_ENABLEHOTCHANGES 40488 #define ID_VIEW_SHOWBRANCHSCREENSHOTS 40489 -#define ID_CONFIG_USE1PFORRECORDING2P 40490 #define ID_CONFIG_USE1PFORRECORDING 40491 #define ID_CONFIG_COMBINECONSECUTIVERECORDINGS 40492 -#define ACCEL_SHIFT_V 40493 #define ID_EDIT_PASTEINSERT 40495 -#define ID_SELECTED_SETMARKER 40498 -#define ID_SELECTED_CLEARMARKER 40499 -#define ID_SELECTED_REMOVEMARKER40500 40500 -#define ID_CONFIG_KEYBOARDCONTROLSINPIANOROLL 40501 #define ACCEL_CTRL_PGUP 40502 #define ACCEL_CTRL_PGDN 40503 #define ACCEL_SHIFT_PGUP 40504 #define ACCEL_SHIFT_PGDN 40505 -#define ID_ACCELERATOR40506 40506 #define ID_VIEW_FOLLOWMARKERNOTECONTEXT 40507 #define ID_VIEW_SHOWBRANCHTOOLTIPS 40508 #define ID_CONFIG_USEINPUTKEYSFORCOLUMNSET 40509 #define ID_CONFIG_EMPTYNEWMARKERNOTES 40510 -#define ID_EDIT_FINDNOTE 40513 -#define ID_CONFIG_REAPPEARINGFINDNOTEDIALOG 40514 #define ID_VIEW_FINDNOTE 40515 -#define ID_CONFIG_SILENTAUTOSAVE 40516 #define ID_FILE_CLOSE 40517 #define ID_EDIT_PASTE 40520 #define ID_EDIT_COPY 40521 #define ID_EDIT_CUT 40522 -#define ID_HELP_TASEDITORHELP 40523 #define MENU_TASEDITOR 40524 #define ID_FILE_NEW 40525 -#define ID_HELP_SHOWTOOLTIPS 40526 #define ID_HELP_TOOLTIPS 40527 -#define ID_STRAY_UNPAUSEEMULATOR 40528 -#define ID_STRAY_UNPAUSE 40529 -#define ID_STRAY_TRUNCATE40530 40530 -#define ID_PATTERN 40531 -#define ID_PATTERN_TESTPATTERN 40532 -#define ID_PATTERN40533 40533 #define ID_PATTERN_TEST 40534 -#define ID_CONFIG_COLUMNSETPATTERNSKIPSLAG 40535 #define ID_EDIT_DESELECT 40536 #define ID_SELECTED_DESELECT 40537 #define ID_CONFIG_DRAWINPUTBYDRAGGING 40539 -#define ID_CONFIG_DOUBLECLICKONFRAME 40540 #define ACCEL_CTRL_UP 40541 #define ACCEL_CTRL_DOWN 40542 #define ACCEL_CTRL_LEFT 40543 @@ -1238,67 +954,51 @@ #define ID_CONFIG_AUTOPAUSEATTHEENDOFMOVIE 40559 #define ID_SELECTED_SETMARKERS 40560 #define ID_SELECTED_REMOVEMARKERS 40561 -#define ACCEL_CTRL_SPACEBAR 40563 -#define ACCEL_CTRL_SPACE 40563 #define ID_HELP_OPEN_MANUAL 40564 #define ID_DISPLAY_FPS 40565 -#define ID_CONFIG_AUTO 40566 #define ID_CONFIG_ADJUSTLAG 40567 #define ID_CONFIG_PATTERNSKIPSLAG 40568 #define CLEAR_LOG 40569 #define CLOSE_LOG 40570 #define ID_SELECTED_UNGREENZONE 40571 -#define ID_SELECTED_F 40572 +#define CHEAT_CONTEXT_POSSI_GOTOINHEXEDITOR 40572 #define ID_CONFIG_ENABLEGREENZONING 40573 #define ID_EMULATIONSPEED_SETFRAMEADVANCEDELAY 40574 -#define ID_Menu40575 40575 #define ID_EMULATIONSPEED_SETCUSTOMSPEEDFORFRAMEADVANCE 40576 #define ID_EMULATIONSPEED_CUSTOMSPEED 40577 -#define ID_ENABLE_AUTO 40578 #define ID_ENABLE_AUTORESUME 40579 -#define ID_CONFIG_COMPACTQUICKSAVING 40580 #define ID_CONFIG_SAVING_OPTIONS 40581 #define ID_CDLFILENAME 40582 -#define ID_VIEW_A 40583 -#define ID_VIEW_HIGHLIGHT 40584 -#define ID_VIEW_HIGHLIGHT_ACTIVITY 40585 #define ID_HIGHLIGHTING_FADEWHENPAUSED 40586 #define ID_HIGHLIGHTING_SETFADINGPERIOD 40587 #define ID_HIGHLIGHTING_HIGHLIGHT_ACTIVITY 40588 -#define ID_DUMPTOFILE_CPUBUS 40589 #define MENU_MV_FILE_DUMP_64K 40590 -#define ID_CONFIG_REGION 40591 #define MENU_MV_FILE_DUMP_OAM 40592 #define MENU_RAMINIT_DEFAULT 40593 #define MENU_RAMINIT_FF 40594 #define MENU_RAMINIT_00 40595 #define MENU_RAMINIT_RANDOM 40596 -#define ID_COPY_SELECTALL 40596 #define MENU_MV_FILE_LOAD_RAM 40597 -#define ID_COPY_COPY 40597 #define MENU_MV_FILE_LOAD_PPU 40598 #define DISASM_CONTEXT_COPY 40598 #define MENU_MV_FILE_LOAD_OAM 40599 #define DISASM_CONTEXT_SELECTALL 40599 #define CHEAT_CONTEXT_POSSI_ADDTOMEMORYWATCH 40600 #define CHEAT_CONTEXT_POSSI_ADDCHEAT 40601 -#define CHEAT_CONTEXT_POSSI_GOTOINHEXEDITOR 40602 #define CHEAT_CONTEXT_POSSI_ADDTORAMWATCH 40603 -#define IDC_DEBUGGER_ICONTRAY 55535 -#define MW_ValueLabel2 65423 -#define MW_ValueLabel1 65426 +#define MW_VALUELABEL2 65423 +#define MW_VALUELABEL1 65426 #define IDC_STATIC_SLASHTEXT 65442 #define IDC_BOOKMARK_NAME_TEXT 65532 -#define ID_CDL 65533 #define IDC_NTVIEW_SCANLINE_TEXT 65534 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 304 -#define _APS_NEXT_COMMAND_VALUE 40611 -#define _APS_NEXT_CONTROL_VALUE 1317 +#define _APS_NEXT_RESOURCE_VALUE 303 +#define _APS_NEXT_COMMAND_VALUE 40000 +#define _APS_NEXT_CONTROL_VALUE 1011 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/src/drivers/win/taseditor.cpp b/src/drivers/win/taseditor.cpp index 86f89e6b..d0daa0f8 100644 --- a/src/drivers/win/taseditor.cpp +++ b/src/drivers/win/taseditor.cpp @@ -485,7 +485,21 @@ void SaveCompact_SetDialogItems(HWND hwndDlg) CheckDlgButton(hwndDlg, IDC_CHECK_HISTORY, taseditorConfig.saveCompact_SaveHistory?BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CHECK_PIANO_ROLL, taseditorConfig.saveCompact_SavePianoRoll?BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CHECK_SELECTION, taseditorConfig.saveCompact_SaveSelection?BST_CHECKED : BST_UNCHECKED); - CheckRadioButton(hwndDlg, IDC_RADIO1, IDC_RADIO4, IDC_RADIO1 + (taseditorConfig.saveCompact_GreenzoneSavingMode % GREENZONE_SAVING_MODES_TOTAL)); + switch (taseditorConfig.saveCompact_GreenzoneSavingMode % GREENZONE_SAVING_MODES_TOTAL) + { + case GREENZONE_SAVING_MODE_ALL: + CheckRadioButton(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES); + break; + case GREENZONE_SAVING_MODE_16TH: + CheckRadioButton(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE, IDC_RADIO_GREENZONE_SAVINGMODE_EVERY16FRAME); + break; + case GREENZONE_SAVING_MODE_MARKED: + CheckRadioButton(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE, IDC_RADIO_GREENZONE_SAVINGMODE_MARKEDFRAMES); + break; + case GREENZONE_SAVING_MODE_NO: + default: + CheckRadioButton(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE); + } } void SaveCompact_GetDialogItems(HWND hwndDlg) { @@ -495,11 +509,11 @@ void SaveCompact_GetDialogItems(HWND hwndDlg) taseditorConfig.saveCompact_SaveHistory = (SendDlgItemMessage(hwndDlg, IDC_CHECK_HISTORY, BM_GETCHECK, 0, 0) == BST_CHECKED); taseditorConfig.saveCompact_SavePianoRoll = (SendDlgItemMessage(hwndDlg, IDC_CHECK_PIANO_ROLL, BM_GETCHECK, 0, 0) == BST_CHECKED); taseditorConfig.saveCompact_SaveSelection = (SendDlgItemMessage(hwndDlg, IDC_CHECK_SELECTION, BM_GETCHECK, 0, 0) == BST_CHECKED); - if (SendDlgItemMessage(hwndDlg, IDC_RADIO1, BM_GETCHECK, 0, 0) == BST_CHECKED) + if (SendDlgItemMessage(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, BM_GETCHECK, 0, 0) == BST_CHECKED) taseditorConfig.saveCompact_GreenzoneSavingMode = GREENZONE_SAVING_MODE_ALL; - else if (SendDlgItemMessage(hwndDlg, IDC_RADIO2, BM_GETCHECK, 0, 0) == BST_CHECKED) + else if (SendDlgItemMessage(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_EVERY16FRAME, BM_GETCHECK, 0, 0) == BST_CHECKED) taseditorConfig.saveCompact_GreenzoneSavingMode = GREENZONE_SAVING_MODE_16TH; - else if (SendDlgItemMessage(hwndDlg, IDC_RADIO3, BM_GETCHECK, 0, 0) == BST_CHECKED) + else if (SendDlgItemMessage(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_MARKEDFRAMES, BM_GETCHECK, 0, 0) == BST_CHECKED) taseditorConfig.saveCompact_GreenzoneSavingMode = GREENZONE_SAVING_MODE_MARKED; else taseditorConfig.saveCompact_GreenzoneSavingMode = GREENZONE_SAVING_MODE_NO; @@ -681,7 +695,21 @@ BOOL CALLBACK savingOptionsWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LP CheckDlgButton(hwndDlg, IDC_CHECK_HISTORY, taseditorConfig.projectSavingOptions_SaveHistory?BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CHECK_PIANO_ROLL, taseditorConfig.projectSavingOptions_SavePianoRoll?BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CHECK_SELECTION, taseditorConfig.projectSavingOptions_SaveSelection?BST_CHECKED : BST_UNCHECKED); - CheckRadioButton(hwndDlg, IDC_RADIO1, IDC_RADIO4, IDC_RADIO1 + (taseditorConfig.projectSavingOptions_GreenzoneSavingMode % GREENZONE_SAVING_MODES_TOTAL)); + switch (taseditorConfig.saveCompact_GreenzoneSavingMode % GREENZONE_SAVING_MODES_TOTAL) + { + case GREENZONE_SAVING_MODE_ALL: + CheckRadioButton(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES); + break; + case GREENZONE_SAVING_MODE_16TH: + CheckRadioButton(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE, IDC_RADIO_GREENZONE_SAVINGMODE_EVERY16FRAME); + break; + case GREENZONE_SAVING_MODE_MARKED: + CheckRadioButton(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE, IDC_RADIO_GREENZONE_SAVINGMODE_MARKEDFRAMES); + break; + case GREENZONE_SAVING_MODE_NO: + default: + CheckRadioButton(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE, IDC_RADIO_GREENZONE_SAVINGMODE_DONTSAVE); + } EnableWindow(GetDlgItem(hwndDlg, IDC_AUTOSAVE_PERIOD), taseditorConfig.autosaveEnabled); EnableWindow(GetDlgItem(hwndDlg, IDC_AUTOSAVE_PERIOD_EVERY_TEXT), taseditorConfig.autosaveEnabled); EnableWindow(GetDlgItem(hwndDlg, IDC_AUTOSAVE_PERIOD_MINUTES_TEXT), taseditorConfig.autosaveEnabled); @@ -719,11 +747,11 @@ BOOL CALLBACK savingOptionsWndProc(HWND hwndDlg, UINT message, WPARAM wParam, LP taseditorConfig.projectSavingOptions_SaveHistory = (SendDlgItemMessage(hwndDlg, IDC_CHECK_HISTORY, BM_GETCHECK, 0, 0) == BST_CHECKED); taseditorConfig.projectSavingOptions_SavePianoRoll = (SendDlgItemMessage(hwndDlg, IDC_CHECK_PIANO_ROLL, BM_GETCHECK, 0, 0) == BST_CHECKED); taseditorConfig.projectSavingOptions_SaveSelection = (SendDlgItemMessage(hwndDlg, IDC_CHECK_SELECTION, BM_GETCHECK, 0, 0) == BST_CHECKED); - if (SendDlgItemMessage(hwndDlg, IDC_RADIO1, BM_GETCHECK, 0, 0) == BST_CHECKED) + if (SendDlgItemMessage(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_ALLFRAMES, BM_GETCHECK, 0, 0) == BST_CHECKED) taseditorConfig.projectSavingOptions_GreenzoneSavingMode = GREENZONE_SAVING_MODE_ALL; - else if (SendDlgItemMessage(hwndDlg, IDC_RADIO2, BM_GETCHECK, 0, 0) == BST_CHECKED) + else if (SendDlgItemMessage(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_EVERY16FRAME, BM_GETCHECK, 0, 0) == BST_CHECKED) taseditorConfig.projectSavingOptions_GreenzoneSavingMode = GREENZONE_SAVING_MODE_16TH; - else if (SendDlgItemMessage(hwndDlg, IDC_RADIO3, BM_GETCHECK, 0, 0) == BST_CHECKED) + else if (SendDlgItemMessage(hwndDlg, IDC_RADIO_GREENZONE_SAVINGMODE_MARKEDFRAMES, BM_GETCHECK, 0, 0) == BST_CHECKED) taseditorConfig.projectSavingOptions_GreenzoneSavingMode = GREENZONE_SAVING_MODE_MARKED; else taseditorConfig.projectSavingOptions_GreenzoneSavingMode = GREENZONE_SAVING_MODE_NO; diff --git a/src/drivers/win/taseditor/taseditor_window.cpp b/src/drivers/win/taseditor/taseditor_window.cpp index 815c6a46..55699f18 100644 --- a/src/drivers/win/taseditor/taseditor_window.cpp +++ b/src/drivers/win/taseditor/taseditor_window.cpp @@ -1138,19 +1138,19 @@ BOOL CALLBACK TASEditorWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara FCEUI_MovieToggleReadOnly(); CheckDlgButton(taseditorWindow.hwndTASEditor, IDC_RECORDING, movie_readonly?BST_UNCHECKED : BST_CHECKED); break; - case IDC_RADIO2: + case IDC_RADIO_ALL: recorder.multitrackRecordingJoypadNumber = MULTITRACK_RECORDING_ALL; break; - case IDC_RADIO3: + case IDC_RADIO_1P: recorder.multitrackRecordingJoypadNumber = MULTITRACK_RECORDING_1P; break; - case IDC_RADIO4: + case IDC_RADIO_2P: recorder.multitrackRecordingJoypadNumber = MULTITRACK_RECORDING_2P; break; - case IDC_RADIO5: + case IDC_RADIO_3P: recorder.multitrackRecordingJoypadNumber = MULTITRACK_RECORDING_3P; break; - case IDC_RADIO6: + case IDC_RADIO_4P: recorder.multitrackRecordingJoypadNumber = MULTITRACK_RECORDING_4P; break; case IDC_SUPERIMPOSE: diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index 0e4b684a..ddfa0d37 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -408,7 +408,7 @@ void UpdateCheckedMenuItems() FCEUI_GetRenderPlanes(spr,bg); static int *polo[] = { &genie, &status_icon}; - static int polo2[]={ MENU_GAME_GENIE, MENU_SHOW_STATUS_ICON }; + static int polo2[]={ MENU_GAME_GENIE, ID_DISPLAY_MOVIESTATUSICON }; int x; // Check or uncheck the necessary menu items