diff --git a/src/drivers/win/debugger.cpp b/src/drivers/win/debugger.cpp index b5297275..2ad1db6f 100644 --- a/src/drivers/win/debugger.cpp +++ b/src/drivers/win/debugger.cpp @@ -550,13 +550,15 @@ void UpdateDebugger() //If not in the 0-239 pixel range, make special cases for display if (scanline == 240 && vblankScanLines < 22) { - if (scanline + vblankScanLines == 261) - sprintf(str, "Scanline -1, PPU pixel %d", vblankPixel); //Pre-render + if (!vblankScanLines) //Idle scanline (240) + sprintf(str, "Idle %d\t %d",scanline,vblankPixel); + else if (scanline + vblankScanLines == 261) + sprintf(str, "Prerender -1 %d", vblankPixel); //Pre-render else - sprintf(str, "Scanline %d, PPU pixel %d", scanline+vblankScanLines,vblankPixel); + sprintf(str, "Vblank %d %d", scanline+vblankScanLines,vblankPixel); //Vblank lines (241-260) } else - sprintf(str, "Scanline %d, PPU pixel %d", scanline,ppupixel); + sprintf(str, "%d\t %d", scanline,ppupixel); //Scanlines 0 - 239 SetDlgItemText(hDebug, IDC_DEBUGGER_VAL_SLINE, str); diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index ccca1e38..0da8574d 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -961,23 +961,24 @@ BEGIN LTEXT "Sprite:",65530,394,196,21,10 EDITTEXT IDC_DEBUGGER_VAL_PPU,367,195,25,12,ES_UPPERCASE | ES_WANTRETURN EDITTEXT IDC_DEBUGGER_VAL_SPR,415,195,15,12,ES_UPPERCASE | ES_WANTRETURN - LTEXT "Scanline:",IDC_DEBUGGER_VAL_SLINE,432,196,102,10 + LTEXT "",IDC_DEBUGGER_VAL_SLINE,436,202,102,10 CONTROL "",IDC_DEBUGGER_ADDR_LINE,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,5,307,328,10 CONTROL "Break on Bad Opcode",IDC_DEBUGGER_BREAK_ON_BAD_OP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,437,132,90,10 - CONTROL "Symbolic debugging",IDC_DEBUGGER_ENABLE_SYMBOLIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,213,79,10 - PUSHBUTTON "Reload Symbols",IDC_DEBUGGER_RELOAD_SYMS,427,211,55,14 + CONTROL "Symbolic debugging",IDC_DEBUGGER_ENABLE_SYMBOLIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,215,79,10 + PUSHBUTTON "Reload Symbols",IDC_DEBUGGER_RELOAD_SYMS,427,215,55,14 GROUPBOX "Bookmarks",45535,348,227,119,80 LISTBOX LIST_DEBUGGER_BOOKMARKS,351,236,67,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_DEBUGGER_BOOKMARK,421,236,40,14,ES_AUTOHSCROLL PUSHBUTTON "Add",IDC_DEBUGGER_BOOKMARK_ADD,421,252,40,14 PUSHBUTTON "Delete",IDC_DEBUGGER_BOOKMARK_DEL,421,268,40,14 - PUSHBUTTON "Rom Patcher",IDC_DEBUGGER_ROM_PATCHER,487,211,46,14 + PUSHBUTTON "Rom Patcher",IDC_DEBUGGER_ROM_PATCHER,487,215,46,14 CONTROL "",IDC_DEBUGGER_ICONTRAY,"Static",SS_BLACKFRAME,5,6,10,301 PUSHBUTTON "",IDC_DEBUGGER_RESTORESIZE,348,308,9,7 LTEXT "Restore original window size",IDC_STATIC,359,308,90,8 PUSHBUTTON "Run Line",IDC_DEBUGGER_RUN_LINE,349,39,37,14 PUSHBUTTON "128 Lines",IDC_DEBUGGER_RUN_FRAME2,389,39,37,14 + LTEXT "Scanline: PPU Pixel:",IDC_STATIC,436,191,78,8 END TRACER DIALOGEX 65527, 65513, 398, 319