diff --git a/src/inputtester.c b/src/inputtester.c
index 6c8ae24..d9f2540 100644
--- a/src/inputtester.c
+++ b/src/inputtester.c
@@ -89,7 +89,7 @@ char button_name[BUTTON_COUNT][12] = {
 char button_x[BUTTON_COUNT] = {6, 2, 4, 4, 24, 22, 22, 20, 3, 23, 9, 13};
 char button_y[BUTTON_COUNT] = {5, 5, 6, 4, 5, 6, 4, 5, 1, 1, 5, 5};
 #define color_button_active 0xFF
-#define color_button_inactive 0b10100100
+#define color_button_inactive 0b11100100
 
 char analog_offset_x[PAD_COUNT] = {1, 20};
 char analog_offset_y[PAD_COUNT] = {5, 5};
@@ -443,8 +443,8 @@ void inputtester_analog()
         signed char ax = analog_l[(analog_pad * 16)];
         signed char ay = analog_l[(analog_pad * 16) + 8];
 
-        analog_x[analog_pad] = ax / analog_ratio;
-        analog_y[analog_pad] = ay / analog_ratio;
+        analog_x[side] = ax / analog_ratio;
+        analog_y[side] = ay / analog_ratio;
 
         // Set new color
         set_fgcolour(0xFF, analog_x[side] + mx, analog_y[side] + my);
diff --git a/verilator/sim_main.cpp b/verilator/sim_main.cpp
index 90e6c6b..abe5dd6 100644
--- a/verilator/sim_main.cpp
+++ b/verilator/sim_main.cpp
@@ -341,10 +341,10 @@ int main(int argc, char** argv, char** env) {
 		top->joystick_r_analog_0 += 1;
 		top->joystick_r_analog_0 -= 256;
 
-		top->joystick_l_analog_1 -= 0;
-		top->joystick_l_analog_1 += 512;
-		top->joystick_r_analog_1 = 30;
-		top->joystick_r_analog_1 += 512;
+		top->joystick_l_analog_1 += 1;
+		top->joystick_l_analog_1 -= 256;
+		top->joystick_r_analog_1 += 1;
+		top->joystick_r_analog_1 -= 256;
 
 		top->joystick_l_analog_2 = 40;
 		top->joystick_l_analog_2 += 1024;