Changed keys in debug screens (to save bouncing the A key if used to select)

2 files changed, 13 insertions, 12 deletions

diff --git a/INSTRUCTION b/INSTRUCTION
index 0c3b021..fef5555 100644
--- a/INSTRUCTION
+++ b/INSTRUCTION
@@ -29,7 +29,8 @@ emulation.  Click on the MENU banner to display the main menu.
 2. The Main Menu
 ----------------
 
-The main menu shows the following options:
+The main menu shows the following options.  To interact with the menu either
+use the touchscreen or up/down on the pad and A to select:
 
     Reset Spectrum              - Reset the spectrum.
     Load TAP File               - Load a TAP file from the SD card.  To load the
@@ -76,18 +77,18 @@ following options:
                                   memory.  Press the joypad up/down to decrement
                                   and increment the displayed address.  Press
                                   the shoulder buttons to move in pages.  Press
-                                  the A button to enter an address.  Press the
+                                  the B button to enter an address.  Press the
                                   START button to exit.
     Memory Viewer               - Displays a hex dump of the spectrum's memory.
                                   Press the joypad up/down to decrement and
                                   increment the displayed address.  Press the
                                   shoulder buttons to move in pages.  Press the
-                                  A button to enter an address.  Press the START
+                                  B button to enter an address.  Press the START
                                   button to exit.
     CPU Info                    - Displays a screen with the Z80's registers.
                                   Press the shoulder buttons to cycle which
                                   register pointer is dumped to the screen.
-                                  Press the A button to execute the next
-                                  instruction.  Hold the B button to execute
+                                  Press the B button to execute the next
+                                  instruction.  Hold the X button to execute
                                   quickly.  Press the START button to exit.
     
diff --git a/source/main.c b/source/main.c
index 355bf31..76c6f43 100644
--- a/source/main.c
+++ b/source/main.c
@@ -279,7 +279,7 @@ static void DebugDisassembler(Z80 *cpu)
 
 	while(SK_GetBareEvent(&ev))
 	{
-	    if (!ev.pressed)
+	    if (ev.pressed)
 	    {
                 switch(ev.key)
                 {
@@ -303,7 +303,7 @@ static void DebugDisassembler(Z80 *cpu)
                         done = TRUE;
                         break;
 
-                    case SK_PAD_A:
+                    case SK_PAD_B:
                     {
                         char addrstr[32] = {0};
 
@@ -377,7 +377,7 @@ static void DebugMemory(Z80 *cpu)
 
 	while(SK_GetBareEvent(&ev))
 	{
-	    if (!ev.pressed)
+	    if (ev.pressed)
 	    {
                 switch(ev.key)
                 {
@@ -401,7 +401,7 @@ static void DebugMemory(Z80 *cpu)
                         done = TRUE;
                         break;
 
-                    case SK_PAD_A:
+                    case SK_PAD_B:
                     {
                         char addrstr[32] = {0};
 
@@ -578,14 +578,14 @@ static void DebugCPU(Z80 *cpu)
 
         FB_EndFrame();
 
-        if (SK_KeyPressed(SK_PAD_B))
+        if (SK_KeyPressed(SK_PAD_X))
         {
             Z80SingleStep(cpu);
         }
 
 	while(SK_GetBareEvent(&ev))
 	{
-	    if (!ev.pressed)
+	    if (ev.pressed)
 	    {
                 switch(ev.key)
                 {
@@ -608,7 +608,7 @@ static void DebugCPU(Z80 *cpu)
                         done = TRUE;
                         break;
 
-                    case SK_PAD_A:
+                    case SK_PAD_B:
                         Z80SingleStep(cpu);
                         break;