Add back controller support

2 files changed, 7 insertions, 7 deletions

diff --git a/src/input.c b/src/input.c
index c257271..375bd23 100644
--- a/src/input.c
+++ b/src/input.c
@@ -5,8 +5,8 @@ typedef enum {
 } ControlMethod;
 
 const ControlMethod ctrl_methods[] = {
-    CONTROL_MOUSE,
     CONTROL_CONTROLLER,
+    CONTROL_MOUSE,
 };
 static ControlMethod ctrl_idx = 0;
 
@@ -21,7 +21,7 @@ static Mouse mouse = {SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2};
 void
 handle_input() {
     poll_keys();
-    if (key_tap(KEY_SELECT)) {
+    if (key_tap(KEY_L) || key_tap(KEY_R)) {
         // Reset control variables on method switch.
         switch (ctrl_methods[ctrl_idx]) {
             case CONTROL_CONTROLLER: {
@@ -67,12 +67,12 @@ handle_input() {
         } else {
             *flag &= ~0x02;
         }
-        if (key_tap(KEY_L)) {
+        if (key_tap(KEY_SELECT)) {
             *flag |= 0x04;
         } else {
             *flag &= ~0x04;
         }
-        if (key_tap(KEY_R)) {
+        if (key_tap(KEY_START)) {
             *flag |= 0x08;
         } else {
             *flag &= ~0x08;
@@ -202,4 +202,3 @@ handle_input() {
         }
     }
 }
-
diff --git a/src/main.c b/src/main.c
index 1679e1b..cb6091f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -200,8 +200,9 @@ deo_stub(u8 *dev, u8 port) {
 
 u16
 dei_stub(u8 *dev, u8 port) {
-    (void)dev;
-    (void)port;
+    if (port == 0) {
+        return PEEK2(dev);
+    }
     return dev[port];
 }