3 files changed, 18 insertions, 8 deletions

diff --git a/src/core/hid/hid_types.h b/src/core/hid/hid_types.h
index 59ec593b8..f8a0d5edd 100644
--- a/src/core/hid/hid_types.h
+++ b/src/core/hid/hid_types.h
@@ -231,7 +231,12 @@ enum class NpadButton : u64 {
     RightSR = 1U << 27,
 
     Palma = 1U << 28,
+    Verification = 1U << 29,
     HandheldLeftB = 1U << 30,
+    LagonCLeft = 1U << 31,
+    LagonCUp = 1ULL << 32,
+    LagonCRight = 1ULL << 33,
+    LagonCDown = 1ULL << 34,
 };
 DECLARE_ENUM_FLAG_OPERATORS(NpadButton);
 
@@ -278,7 +283,12 @@ struct NpadButtonState {
         BitField<27, 1, u64> right_sr;
 
         BitField<28, 1, u64> palma;
+        BitField<29, 1, u64> verification;
         BitField<30, 1, u64> handheld_left_b;
+        BitField<31, 1, u64> lagon_c_left;
+        BitField<32, 1, u64> lagon_c_up;
+        BitField<33, 1, u64> lagon_c_right;
+        BitField<34, 1, u64> lagon_c_down;
     };
 };
 static_assert(sizeof(NpadButtonState) == 0x8, "NpadButtonState has incorrect size.");
diff --git a/src/core/hid/input_interpreter.cpp b/src/core/hid/input_interpreter.cpp
index 7e7c1816f..870422d82 100644
--- a/src/core/hid/input_interpreter.cpp
+++ b/src/core/hid/input_interpreter.cpp
@@ -20,7 +20,7 @@ InputInterpreter::InputInterpreter(Core::System& system)
 InputInterpreter::~InputInterpreter() = default;
 
 void InputInterpreter::PollInput() {
-    const u32 button_state = npad.GetAndResetPressState();
+    const u64 button_state = npad.GetAndResetPressState();
 
     previous_index = current_index;
     current_index = (current_index + 1) % button_states.size();
@@ -32,7 +32,7 @@ void InputInterpreter::ResetButtonStates() {
     previous_index = 0;
     current_index = 0;
 
-    button_states[0] = 0xFFFFFFFF;
+    button_states[0] = 0xFFFFFFFFFFFFFFFF;
 
     for (std::size_t i = 1; i < button_states.size(); ++i) {
         button_states[i] = 0;
@@ -40,22 +40,22 @@ void InputInterpreter::ResetButtonStates() {
 }
 
 bool InputInterpreter::IsButtonPressed(Core::HID::NpadButton button) const {
-    return (button_states[current_index] & static_cast<u32>(button)) != 0;
+    return (button_states[current_index] & static_cast<u64>(button)) != 0;
 }
 
 bool InputInterpreter::IsButtonPressedOnce(Core::HID::NpadButton button) const {
-    const bool current_press = (button_states[current_index] & static_cast<u32>(button)) != 0;
-    const bool previous_press = (button_states[previous_index] & static_cast<u32>(button)) != 0;
+    const bool current_press = (button_states[current_index] & static_cast<u64>(button)) != 0;
+    const bool previous_press = (button_states[previous_index] & static_cast<u64>(button)) != 0;
 
     return current_press && !previous_press;
 }
 
 bool InputInterpreter::IsButtonHeld(Core::HID::NpadButton button) const {
-    u32 held_buttons{button_states[0]};
+    u64 held_buttons{button_states[0]};
 
     for (std::size_t i = 1; i < button_states.size(); ++i) {
         held_buttons &= button_states[i];
     }
 
-    return (held_buttons & static_cast<u32>(button)) != 0;
+    return (held_buttons & static_cast<u64>(button)) != 0;
 }
diff --git a/src/core/hid/input_interpreter.h b/src/core/hid/input_interpreter.h
index 1791cf9b7..1c2e02142 100644
--- a/src/core/hid/input_interpreter.h
+++ b/src/core/hid/input_interpreter.h
@@ -105,7 +105,7 @@ private:
     Service::HID::Controller_NPad& npad;
 
     /// Stores 9 consecutive button states polled from HID.
-    std::array<u32, 9> button_states{};
+    std::array<u64, 9> button_states{};
 
     std::size_t previous_index{};
     std::size_t current_index{};