diff --git a/machines/agb02/agb/agb.cpp b/machines/agb02/agb/agb.cpp
index 904badb..646029f 100644
--- a/machines/agb02/agb/agb.cpp
+++ b/machines/agb02/agb/agb.cpp
@@ -17,8 +17,8 @@ constexpr std::pair<double, double> joystick_movement(1.0, 1.0);
 
 const gpiod::line::offsets drive_down = { 21, 13, 6 };
 
-const gpiod::line::offsets decoder = { 2, 3, 4, 14, 15, 18, 23, 24 }; // lsbf
-const gpiod::line::offsets joystick = { 0, 0, 0, 0 }; // x+, y+, x-, y-
+const gpiod::line::offsets decoder = { 3, 4, 17, 27, 24, 23, 18, 15 }; // lsbf
+const gpiod::line::offsets joystick = { 26, 19, 5, 0 }; // x+, y+, x-, y-
 const gpiod::line::offset black_button = 16;
 const gpiod::line::offset white_button = 20;