diff --git a/doc/notes.txt b/doc/notes.txt
index b6d71339..1478d060 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -23,7 +23,6 @@ TODO:
- what if error in include file you can't edit b/c it never appears?
- online help
- show self-modifying code insns left of editor
-- facade/kbd shortcuts for emulators, focus
- update Javatari version? (and others?)
- unify versioning
- disassembler for uploaded ROMs
@@ -166,8 +165,10 @@ TODO:
- switching platform of a repo?
- make sure to flatten subdirs
- astrocade
-- ctrl+alt+l on ubuntu locks screen
-- alt-D doesn't work anymore
+- keyboard shortcuts
+ - ctrl+alt+l on ubuntu locks screen
+ - alt-D doesn't work anymore
+ - facade/kbd shortcuts for emulators, focus
- cookie
- list of stuff for policy
- popup
diff --git a/index.html b/index.html
index 20994e56..52be4dc6 100644
--- a/index.html
+++ b/index.html
@@ -259,6 +259,11 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
\ Select
Enter Start
+
+ ←↑↓→ Joypad
+ Space Button A
+ Shift Button B
+
←↑↓→ Joystick
Space Button 1
diff --git a/presets/nes/hello.c b/presets/nes/hello.c
index d8983253..ac803f9e 100644
--- a/presets/nes/hello.c
+++ b/presets/nes/hello.c
@@ -16,7 +16,7 @@ void main(void) {
// set palette colors
pal_col(0,0x02); // set screen to dark blue
- pal_col(1,0x14); // pink
+ pal_col(1,0x14); // fuchsia
pal_col(2,0x20); // grey
pal_col(3,0x30); // white
diff --git a/src/ui.ts b/src/ui.ts
index 37f3cee6..4b3d4260 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -1426,14 +1426,14 @@ function setupDebugControls() {
// create toolbar buttons
uitoolbar = new Toolbar($("#toolbar")[0], null);
uitoolbar.grp.prop('id','debug_bar');
- uitoolbar.add('ctrl+alt+.', 'Reset', 'glyphicon-refresh', resetAndDebug).prop('id','dbg_reset');
- uitoolbar.add('ctrl+alt+p', 'Pause', 'glyphicon-pause', pause).prop('id','dbg_pause');
- uitoolbar.add('ctrl+alt+r', 'Resume', 'glyphicon-play', resume).prop('id','dbg_go');
+ uitoolbar.add('ctrl+alt+r', 'Reset', 'glyphicon-refresh', resetAndDebug).prop('id','dbg_reset');
+ uitoolbar.add('ctrl+alt+,', 'Pause', 'glyphicon-pause', pause).prop('id','dbg_pause');
+ uitoolbar.add('ctrl+alt+.', 'Resume', 'glyphicon-play', resume).prop('id','dbg_go');
if (platform.step) {
uitoolbar.add('ctrl+alt+s', 'Single Step', 'glyphicon-step-forward', singleStep).prop('id','dbg_step');
}
if (platform.runToVsync) {
- uitoolbar.add('ctrl+alt+v', 'Next Frame', 'glyphicon-forward', singleFrameStep).prop('id','dbg_tovsync');
+ uitoolbar.add('ctrl+alt+n', 'Next Frame/Interrupt', 'glyphicon-forward', singleFrameStep).prop('id','dbg_tovsync');
}
if ((platform.runEval || platform.runToPC) && !platform_id.startsWith('verilog')) {
uitoolbar.add('ctrl+alt+l', 'Run To Line', 'glyphicon-save', runToCursor).prop('id','dbg_toline');