diff --git a/decompiler/IR2/AtomicOpTypeAnalysis.cpp b/decompiler/IR2/AtomicOpTypeAnalysis.cpp
index f9b199e786..3983b36946 100644
--- a/decompiler/IR2/AtomicOpTypeAnalysis.cpp
+++ b/decompiler/IR2/AtomicOpTypeAnalysis.cpp
@@ -745,7 +745,7 @@ TP_Type SimpleExpression::get_type_int2(const TypeState& input,
 
   // allow shifting stuff for setting bitfields
   if (m_kind == Kind::LEFT_SHIFT) {
-    return TP_Type::make_from_ts("int");
+    return TP_Type::make_from_ts(TypeSpec("int"));
   }
 
   throw std::runtime_error(fmt::format("Cannot get_type_int2: {}, args {} and {}",
diff --git a/decompiler/IR2/FormExpressionAnalysis.cpp b/decompiler/IR2/FormExpressionAnalysis.cpp
index bb95fc96b5..de154e9596 100644
--- a/decompiler/IR2/FormExpressionAnalysis.cpp
+++ b/decompiler/IR2/FormExpressionAnalysis.cpp
@@ -4658,8 +4658,8 @@ FormElement* try_make_nonzero_logtest(Form* in, FormPool& pool) {
    `(nonzero? (logand ,a ,b))
    )
  */
-  auto logand_matcher = Matcher::op(GenericOpMatcher::fixed(FixedOperatorKind::LOGAND),
-                                    {Matcher::any(0), Matcher::any(1)});
+  auto static const logand_matcher = Matcher::op(GenericOpMatcher::fixed(FixedOperatorKind::LOGAND),
+                                                 {Matcher::any(0), Matcher::any(1)});
   auto mr_logand = match(logand_matcher, in);
   if (mr_logand.matched) {
     return pool.alloc_element<GenericElement>(
@@ -4744,13 +4744,25 @@ FormElement* try_make_logtest_cpad_macro(Form* in, FormPool& pool) {
   `(logtest? (cpad-hold ,pad-idx) (pad-buttons ,@buttons))
   )
  */
-  auto cpad_matcher = Matcher::op(
+  auto static const cpad_matcher = Matcher::op(
       GenericOpMatcher::fixed(FixedOperatorKind::LOGTEST),
       {Matcher::deref(Matcher::symbol("*cpad-list*"), false,
                       {DerefTokenMatcher::string("cpads"), DerefTokenMatcher::any_expr_or_int(0),
                        DerefTokenMatcher::any_string(2), DerefTokenMatcher::integer(0)}),
        Matcher::op_with_rest(GenericOpMatcher::func(Matcher::constant_token("pad-buttons")), {})});
+  auto static const cpad_matcher_inv = Matcher::op(
+      GenericOpMatcher::fixed(FixedOperatorKind::LOGTEST),
+      {Matcher::op_with_rest(GenericOpMatcher::func(Matcher::constant_token("pad-buttons")), {}),
+       Matcher::deref(Matcher::symbol("*cpad-list*"), false,
+                      {DerefTokenMatcher::string("cpads"), DerefTokenMatcher::any_expr_or_int(0),
+                       DerefTokenMatcher::any_string(2), DerefTokenMatcher::integer(0)})});
+
+  bool inv_match = false;
   auto mr = match(cpad_matcher, in);
+  if (!mr.matched) {
+    mr = match(cpad_matcher_inv, in);
+    inv_match = true;
+  }
   if (mr.matched) {
     enum { ABS, REL, NIL } t = NIL;
     if (mr.maps.strings.at(2) == "button0-abs") {
@@ -4761,8 +4773,8 @@ FormElement* try_make_logtest_cpad_macro(Form* in, FormPool& pool) {
 
     if (t != NIL) {
       auto logtest_elt = dynamic_cast<GenericElement*>(in->at(0));
-      if (logtest_elt != nullptr) {
-        auto buttons_form = logtest_elt->elts().at(1);
+      if (logtest_elt) {
+        auto buttons_form = logtest_elt->elts().at(inv_match ? 0 : 1);
         std::vector<Form*> v;
         v.push_back(mr.int_or_form_to_form(pool, 0));
         GenericElement* butts =
@@ -4916,7 +4928,14 @@ FormElement* ConditionElement::make_equal_check_generic(const Env& env,
       return pool.alloc_element<GenericElement>(GenericOperator::make_fixed(FixedOperatorKind::EQ),
                                                 forms_with_cast);
     } else {
-      {
+      nice_constant =
+          try_make_constant_for_compare(source_forms.at(0), source_types.at(1), pool, env);
+      if (nice_constant) {
+        auto forms_with_cast = source_forms;
+        forms_with_cast.at(0) = nice_constant;
+        return pool.alloc_element<GenericElement>(
+            GenericOperator::make_fixed(FixedOperatorKind::EQ), forms_with_cast);
+      } else {
         // (= (ja-group)
         //    (-> self draw art-group data 7)
         //    )
diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc
index 2771b26d19..3cbc55bd35 100644
--- a/decompiler/config/jak2/all-types.gc
+++ b/decompiler/config/jak2/all-types.gc
@@ -3456,13 +3456,13 @@
     (x        14)
     (square   15)
     ;; only 16 buttons are mapped to hardware, the rest are 'actions' or something else
-    (l-analog-down 16)
+    (l-analog-up 16)
     (l-analog-right 17)
-    (l-analog-up 18)
+    (l-analog-down 18)
     (l-analog-left 19)
-    (r-analog-down 20)
+    (r-analog-up 20)
     (r-analog-right 21)
-    (r-analog-up 22)
+    (r-analog-down 22)
     (r-analog-left 23)
     (confirm 24)
     )
diff --git a/goal_src/jak2/engine/game/task/task-control.gc b/goal_src/jak2/engine/game/task/task-control.gc
index c0e78b6a0e..0ef00e749c 100644
--- a/goal_src/jak2/engine/game/task/task-control.gc
+++ b/goal_src/jak2/engine/game/task/task-control.gc
@@ -1649,9 +1649,7 @@
          (when (or (and (logtest? (-> self flags) (fail-mission-flags famflags-0))
                         (>= (- (current-time) (-> self grabbed-time)) (the-as time-frame (-> self reset-delay)))
                         )
-                   (or (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
-                       (logtest? (-> self flags) (fail-mission-flags famflags-3))
-                       )
+                   (or (cpad-pressed? 0 confirm) (logtest? (-> self flags) (fail-mission-flags famflags-3)))
                    )
            (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
            (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
@@ -1665,9 +1663,7 @@
        )
       (((fail-mission-message fammsg-1))
        (until #f
-         (when (or (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
-                   (logtest? (-> self flags) (fail-mission-flags famflags-3))
-                   )
+         (when (or (cpad-pressed? 0 confirm) (logtest? (-> self flags) (fail-mission-flags famflags-3)))
            (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
            (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
            (set! (-> self retry) #t)
diff --git a/goal_src/jak2/engine/ps2/pad.gc b/goal_src/jak2/engine/ps2/pad.gc
index 29c18b1525..eec9b6cd19 100644
--- a/goal_src/jak2/engine/ps2/pad.gc
+++ b/goal_src/jak2/engine/ps2/pad.gc
@@ -38,13 +38,13 @@ The cpad-set-buzz! function can be used for vibration.
     (x        14)
     (square   15)
     ;; only 16 buttons are mapped to hardware, the rest are 'actions' or something else
-    (l-analog-down 16)
+    (l-analog-up 16)
     (l-analog-right 17)
-    (l-analog-up 18)
+    (l-analog-down 18)
     (l-analog-left 19)
-    (r-analog-down 20)
+    (r-analog-up 20)
     (r-analog-right 21)
-    (r-analog-up 22)
+    (r-analog-down 22)
     (r-analog-left 23)
     (confirm 24)
     )
@@ -284,7 +284,7 @@ The cpad-set-buzz! function can be used for vibration.
         (cpad-get-data pad)
         (adjust-to-screen-flip pad)
         (cond
-          ((zero? (logand (-> pad valid) 128))
+          ((not (logtest? (-> pad valid) 128))
            (dotimes (buzz-i 2)
              (cond
                ((and (-> pad buzz) (< (get-current-time) (-> pad buzz-time buzz-i)) (= *master-mode* 'game))
@@ -402,10 +402,10 @@ The cpad-set-buzz! function can be used for vibration.
            (let ((buttons-pushed (the-as pad-buttons (-> pad button0))))
              (cond
                ((< (-> pad lefty) (the-as uint 30))
-                (set! buttons-pushed (logior (pad-buttons l-analog-down) buttons-pushed))
+                (set! buttons-pushed (logior (pad-buttons l-analog-up) buttons-pushed))
                 )
                ((< (the-as uint 225) (-> pad lefty))
-                (set! buttons-pushed (logior (pad-buttons l-analog-up) buttons-pushed))
+                (set! buttons-pushed (logior (pad-buttons l-analog-down) buttons-pushed))
                 )
                )
              (cond
@@ -418,10 +418,10 @@ The cpad-set-buzz! function can be used for vibration.
                )
              (cond
                ((< (-> pad righty) (the-as uint 30))
-                (set! buttons-pushed (logior (pad-buttons r-analog-down) buttons-pushed))
+                (set! buttons-pushed (logior (pad-buttons r-analog-up) buttons-pushed))
                 )
                ((< (the-as uint 225) (-> pad righty))
-                (set! buttons-pushed (logior (pad-buttons r-analog-up) buttons-pushed))
+                (set! buttons-pushed (logior (pad-buttons r-analog-down) buttons-pushed))
                 )
                )
              (cond
diff --git a/goal_src/jak2/engine/ui/progress/progress-draw.gc b/goal_src/jak2/engine/ui/progress/progress-draw.gc
index a547707c44..0f33bb340a 100644
--- a/goal_src/jak2/engine/ui/progress/progress-draw.gc
+++ b/goal_src/jak2/engine/ui/progress/progress-draw.gc
@@ -3558,7 +3558,9 @@
               )
             )
           (cond
-            ((and (= (-> *setting-control* user-default language) (language-enum german)) (= 454 (-> sv-80 text-name)))
+            ((and (= (-> *setting-control* user-default language) (language-enum german))
+                  (= (text-id progress-missions-stadium-board1) (-> sv-80 text-name))
+                  )
              (let ((v1-71 arg1))
                (set! (-> v1-71 scale) 0.45)
                )
@@ -7223,7 +7225,10 @@
          (set! (-> arg1 origin y) (+ -25.0 (-> arg1 origin y)))
          (print-menu-text (lookup-text! *common-text* (-> obj name) #f) (-> obj scale) arg1 arg0)
          )
-        ((and (= *title* (-> arg0 current-options)) (= 339 (-> obj name)) (memcard-unlocked-secrets? #f))
+        ((and (= *title* (-> arg0 current-options))
+              (= (text-id progress-root-secrets) (-> obj name))
+              (memcard-unlocked-secrets? #f)
+              )
          (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
          )
         ((!= (-> obj name) (text-id progress-root-secrets))
diff --git a/goal_src/jak2/engine/ui/progress/progress.gc b/goal_src/jak2/engine/ui/progress/progress.gc
index 6cd157e53d..3e046ed55c 100644
--- a/goal_src/jak2/engine/ui/progress/progress.gc
+++ b/goal_src/jak2/engine/ui/progress/progress.gc
@@ -979,7 +979,7 @@
         (cond
           ((-> obj selected-option)
            (cond
-             ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+             ((cpad-pressed? 0 confirm)
               (set! (-> obj selected-option) #f)
               )
              ((cpad-pressed? 0 triangle)
@@ -993,7 +993,7 @@
            )
           (else
             (cond
-              ((logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 up l-analog-up)
                (cond
                  ((= (-> obj current-options) *main-options*)
                   (sound-play "ring-select")
@@ -1014,7 +1014,7 @@
                   )
                  )
                )
-              ((logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 down l-analog-down)
                (cond
                  ((= (-> obj current-options) *main-options*)
                   (sound-play "ring-select")
@@ -1032,7 +1032,7 @@
                   )
                  )
                )
-              ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 confirm)
                (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
                (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
                (if (not (-> *progress-state* clear-screen))
@@ -1732,7 +1732,7 @@
     (cond
       (arg1
         (cond
-          ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 left l-analog-left)
            (when (not (-> v1-1 0))
              (set! gp-0 #t)
              (when (= (-> obj value-to-modify) (&-> *setting-control* user-default vibration))
@@ -1742,11 +1742,11 @@
              (set! (-> v1-1 0) #t)
              )
            )
-          ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 right l-analog-right)
            (set! gp-0 (-> v1-1 0))
            (set! (-> v1-1 0) #f)
            )
-          ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 confirm)
            (cond
              ((and (-> v1-1 0) (= (-> obj value-to-modify) (&-> *setting-control* user-default use-progressive-scan)))
               (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -1762,7 +1762,7 @@
           )
         )
       (else
-        (if (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        (if (cpad-pressed? 0 confirm)
             (set! (-> *progress-state* on-off-choice) (-> obj value-to-modify 0))
             )
         )
@@ -1781,17 +1781,17 @@
         )
     (when arg1
       (cond
-        ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 left l-analog-left)
          (when (not (-> v1-1 0))
            (set! gp-0 #t)
            (set! (-> v1-1 0) #t)
            )
          )
-        ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 right l-analog-right)
          (set! gp-0 (-> v1-1 0))
          (set! (-> v1-1 0) #f)
          )
-        ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 confirm)
          (cond
            ((and (-> v1-1 0) (= (-> obj name) (text-id progress-root-restart-mission)))
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -1824,13 +1824,13 @@
       (cond
         (arg1
           (cond
-            ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-abs 0))
+            ((cpad-hold? 0 left l-analog-left)
              (seek! (-> (the-as (pointer float) gp-0)) 0.0 (* 0.02 (-> self clock time-adjust-ratio)))
              (if (!= (-> (the-as (pointer float) gp-0)) 0.0)
                  (set! s4-0 #t)
                  )
              )
-            ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-abs 0))
+            ((cpad-hold? 0 right l-analog-right)
              (seek! (-> (the-as (pointer float) gp-0)) 1.0 (* 0.02 (-> self clock time-adjust-ratio)))
              (if (!= (-> (the-as (pointer float) gp-0)) 1.0)
                  (set! s4-0 #t)
@@ -1843,20 +1843,20 @@
           )
         (else
           (cond
-            ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-abs 0))
+            ((cpad-hold? 0 left l-analog-left)
              (seek! (-> (the-as (pointer float) gp-0)) 0.0 (* 0.02 (-> self clock time-adjust-ratio)))
              (if (!= (-> (the-as (pointer float) gp-0)) 0.0)
                  (set! s4-0 #t)
                  )
              )
-            ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-abs 0))
+            ((cpad-hold? 0 right l-analog-right)
              (seek! (-> (the-as (pointer float) gp-0)) 1.0 (* 0.02 (-> self clock time-adjust-ratio)))
              (if (!= (-> (the-as (pointer float) gp-0)) 1.0)
                  (set! s4-0 #t)
                  )
              )
             )
-          (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          (when (cpad-pressed? 0 confirm)
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
             (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
             )
@@ -1907,11 +1907,11 @@
         (cond
           (arg1
             (cond
-              ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 left l-analog-left)
                (set! (-> *setting-control* user-default stereo-mode) (min-max-wrap-around (+ a0-1 -1) 0 a3-0))
                (set! v1-4 #t)
                )
-              ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 right l-analog-right)
                (set! (-> *setting-control* user-default stereo-mode) (min-max-wrap-around (+ a0-1 1) 0 a3-0))
                (set! v1-4 #t)
                )
@@ -1921,7 +1921,7 @@
               )
             )
           (else
-            (if (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+            (if (cpad-pressed? 0 confirm)
                 (set! (-> *progress-state* stereo-mode-backup) (-> *setting-control* user-default stereo-mode))
                 )
             )
@@ -1940,7 +1940,7 @@
   (cond
     ((cpad-pressed? 0 start)
      )
-    ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+    ((cpad-pressed? 0 confirm)
      (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
      (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
      (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle))
@@ -1997,7 +1997,7 @@
     ((not (-> arg0 selected-option))
      (let ((a0-53 (-> arg0 current-options options)))
        (cond
-         ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 left l-analog-left)
           (if (!= (length a0-53) 1)
               (sound-play "ring-select")
               )
@@ -2010,7 +2010,7 @@
              )
             )
           )
-         ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 right l-analog-right)
           (if (!= (length a0-53) 1)
               (sound-play "ring-select")
               )
@@ -2058,7 +2058,7 @@
     (set! (-> arg0 option-index) 0)
     0
     )
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (cond
@@ -2101,7 +2101,7 @@
       (set-next-state arg0 'secrets-insufficient-space 0)
       )
     (cond
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2195,7 +2195,7 @@
       ((not (-> arg0 selected-option))
        (let ((a0-131 (-> arg0 current-options options)))
          (cond
-           ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+           ((cpad-pressed? 0 left l-analog-left)
             (when (!= (length a0-131) 1)
               )
             (cond
@@ -2207,7 +2207,7 @@
                )
               )
             )
-           ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+           ((cpad-pressed? 0 right l-analog-right)
             (when (!= (length a0-131) 1)
               )
             (cond
@@ -2238,7 +2238,7 @@
     (cond
       ((cpad-pressed? 0 triangle)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (let ((s5-0 #f))
@@ -2282,15 +2282,15 @@
         (set-next-state arg0 a1-2 0)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> s4-0 0)))
        (set! (-> s4-0 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> s4-0 0))
        (set! (-> s4-0 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2325,15 +2325,15 @@
           )
       )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> s4-0 0)))
        (set! (-> s4-0 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> s4-0 0))
        (set! (-> s4-0 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2369,19 +2369,19 @@
            (= (-> *progress-state* starting-state) 'no-memory-card)
            )
        (cond
-         ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 left l-analog-left)
           (when (and (not (-> s5-0 0)) (not (-> *progress-state* clear-screen)))
             (sound-play "generic-beep")
             (set! (-> s5-0 0) #t)
             )
           )
-         ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 right l-analog-right)
           (when (and (-> s5-0 0) (not (-> *progress-state* clear-screen)))
             (sound-play "generic-beep")
             (set! (-> s5-0 0) #f)
             )
           )
-         ((and (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)) (!= (-> arg0 current) 'none))
+         ((and (cpad-pressed? 0 confirm) (!= (-> arg0 current) 'none))
           (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
           (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
           (set! (-> *progress-state* clear-screen) (the-as basic #t))
@@ -2432,7 +2432,7 @@
            (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle))
            (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle))
            )
-          ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 confirm)
            (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
            (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
            (cond
@@ -2458,7 +2458,7 @@
   "Handle progress menu navigation logic."
   (&-> *progress-state* yes-no-choice)
   (cond
-    ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+    ((cpad-pressed? 0 confirm)
      (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
      (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
      (sound-play "generic-beep")
@@ -2478,15 +2478,15 @@
         (gp-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> v1-1 0))
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (set! (-> *progress-state* video-mode-timeout) 0)
@@ -2516,15 +2516,15 @@
         (s5-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! s5-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! s5-0 (-> v1-1 0))
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2562,17 +2562,17 @@
         (gp-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        (set! (-> *progress-state* graphic-options-progressive-scan) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> v1-1 0))
        (set! (-> *progress-state* graphic-options-progressive-scan) #f)
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (set! (-> *progress-state* progressive-mode-timeout) 0)
@@ -2607,15 +2607,15 @@
         (s5-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! s5-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! s5-0 (-> v1-1 0))
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2651,7 +2651,7 @@
 
 (defmethod respond-progress menu-card-removed-option ((obj menu-card-removed-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2667,7 +2667,7 @@
     ((= (progress-method-28 arg0 'select-load) 'select-load)
      (set-next-state arg0 'select-load 0)
      )
-    ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+    ((cpad-pressed? 0 confirm)
      (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
      (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
      (sound-play "generic-beep")
@@ -2679,7 +2679,7 @@
 
 (defmethod respond-progress menu-error-loading-option ((obj menu-error-loading-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2690,7 +2690,7 @@
 
 (defmethod respond-progress menu-error-auto-saving-option ((obj menu-error-auto-saving-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2701,7 +2701,7 @@
 
 (defmethod respond-progress menu-error-disc-removed-option ((obj menu-error-disc-removed-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (when (is-cd-in?)
@@ -2714,7 +2714,7 @@
 
 (defmethod respond-progress menu-error-reading-option ((obj menu-error-reading-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2725,7 +2725,7 @@
 
 (defmethod respond-progress menu-icon-info-option ((obj menu-icon-info-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2740,15 +2740,15 @@
         (gp-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> v1-1 0))
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2787,15 +2787,15 @@
       (set-next-state arg0 a1-2 0)
       )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> s4-0 0)))
        (set! (-> s4-0 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> s4-0 0))
        (set! (-> s4-0 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2841,10 +2841,8 @@
       (set-next-state arg0 'secrets-insufficient-space 0)
       )
     (cond
-      ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-           (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
-                (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                )
+      ((or (cpad-pressed? 0 up l-analog-up)
+           (and (cpad-hold? 0 up l-analog-up) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
            )
        (set! (-> obj last-move) (the-as uint (current-time)))
        (when (> (-> obj task-index) 0)
@@ -2853,10 +2851,8 @@
          (set! (-> arg0 sliding-height) -1.0)
          )
        )
-      ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-           (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
-                (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                )
+      ((or (cpad-pressed? 0 down l-analog-down)
+           (and (cpad-hold? 0 down l-analog-down) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
            )
        (set! (-> obj last-move) (the-as uint (current-time)))
        (let ((s3-0 -1))
@@ -2888,7 +2884,7 @@
            )
          )
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (sound-play "generic-beep")
@@ -2952,10 +2948,8 @@
          )
         )
       (cond
-        ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-             (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
-                  (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                  )
+        ((or (cpad-pressed? 0 up l-analog-up)
+             (and (cpad-hold? 0 up l-analog-up) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
              )
          (set! (-> obj last-move) (the-as uint (current-time)))
          (when (> (-> obj task-index) 0)
@@ -2964,10 +2958,8 @@
            (set! (-> arg0 sliding-height) -1.0)
            )
          )
-        ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-             (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
-                  (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                  )
+        ((or (cpad-pressed? 0 down l-analog-down)
+             (and (cpad-hold? 0 down l-analog-down) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
              )
          (set! (-> obj last-move) (the-as uint (current-time)))
          (when (< (-> obj task-index) (+ (length s4-0) -1))
@@ -2976,7 +2968,7 @@
            (set! (-> arg0 sliding-height) 1.0)
            )
          )
-        ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 confirm)
          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
          (sound-play "generic-beep")
@@ -3021,10 +3013,8 @@
         )
   (let ((s5-0 #f))
     (cond
-      ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-           (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
-                (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                )
+      ((or (cpad-pressed? 0 up l-analog-up)
+           (and (cpad-hold? 0 up l-analog-up) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
            )
        (set! (-> obj last-move) (the-as uint (current-time)))
        (when (> (-> obj task-line-index) 0)
@@ -3033,10 +3023,8 @@
          (set! (-> arg0 sliding-height) -1.0)
          )
        )
-      ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-           (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
-                (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                )
+      ((or (cpad-pressed? 0 down l-analog-down)
+           (and (cpad-hold? 0 down l-analog-down) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
            )
        (set! (-> obj last-move) (the-as uint (current-time)))
        (when (< (-> obj task-line-index) (+ (-> *progress-state* total-num-tasks) -1))
@@ -3045,7 +3033,7 @@
          (set! s5-0 #t)
          )
        )
-      ((logtest? (pad-buttons triangle confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 triangle confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle confirm))
        (if (!= (-> *progress-state* starting-state) 'title)
@@ -3083,8 +3071,8 @@
   (when (-> *bigmap* progress-minimap)
     (let ((s5-0 #f))
       (cond
-        ((or (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             (and (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-abs 0))
+        ((or (cpad-pressed? 0 right l-analog-right)
+             (and (cpad-hold? 0 right l-analog-right)
                   (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
                   )
              )
@@ -3098,10 +3086,8 @@
            (set! (-> obj slide-dir) -1.0)
            )
          )
-        ((or (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             (and (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-abs 0))
-                  (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                  )
+        ((or (cpad-pressed? 0 left l-analog-left)
+             (and (cpad-hold? 0 left l-analog-left) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
              )
          (when (< 1 (get-num-highscores))
            (set! (-> obj last-move) (the-as uint (current-time)))
@@ -3113,7 +3099,7 @@
            (set! (-> obj slide-dir) 1.0)
            )
          )
-        ((logtest? (pad-buttons triangle confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 triangle confirm)
          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle confirm))
          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle confirm))
          (set! (-> arg0 sliding) 0.0)
@@ -3170,7 +3156,7 @@
       (let ((s5-2 #f))
         (cond
           ((= arg1 #t)
-           (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+           (when (cpad-pressed? 0 confirm)
              (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
              (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
              (sound-play "generic-beep")
@@ -3179,10 +3165,8 @@
            )
           (else
             (cond
-              ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-                   (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
-                        (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                        )
+              ((or (cpad-pressed? 0 down l-analog-down)
+                   (and (cpad-hold? 0 down l-analog-down) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
                    )
                (set! (-> obj last-move) (the-as uint (current-time)))
                (when (< (-> obj item-index) s2-0)
@@ -3193,10 +3177,8 @@
                  (set! (-> arg0 sliding-off) 0.0)
                  )
                )
-              ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-                   (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
-                        (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                        )
+              ((or (cpad-pressed? 0 up l-analog-up)
+                   (and (cpad-hold? 0 up l-analog-up) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
                    )
                (set! (-> obj last-move) (the-as uint (current-time)))
                (when (< s3-0 (-> obj item-index))
@@ -3207,7 +3189,7 @@
                  (set! (-> arg0 sliding-off) 0.0)
                  )
                )
-              ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 confirm)
                (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
                (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
                (let ((v1-74 (-> obj item-index)))
@@ -3264,8 +3246,8 @@
     (cond
       ((= (-> *progress-state* game-options-item-picked) #f)
        (cond
-         ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-              (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
+         ((or (cpad-pressed? 0 down l-analog-down)
+              (and (cpad-hold? 0 down l-analog-down)
                    (>= (- (current-time) (the-as int (-> *progress-state* game-options-last-move))) (seconds 0.5))
                    )
               )
@@ -3280,8 +3262,8 @@
               )
             )
           )
-         ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-              (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
+         ((or (cpad-pressed? 0 up l-analog-up)
+              (and (cpad-hold? 0 up l-analog-up)
                    (>= (- (current-time) (the-as int (-> *progress-state* game-options-last-move))) (seconds 0.5))
                    )
               )
@@ -3291,7 +3273,7 @@
               (set! (-> *progress-state* game-options-item-selected) 3)
               )
           )
-         ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 confirm)
           (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
           (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
           (set! (-> *progress-state* game-options-last-move) (the-as uint (current-time)))
@@ -3324,17 +3306,15 @@
                 (the-as int (-> *setting-control* user-default subtitle-language))
                 )
           )
-         ((logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons up l-analog-down))
-          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons up l-analog-down))
+         ((cpad-pressed? 0 up l-analog-up)
+          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons up l-analog-up))
+          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons up l-analog-up))
           )
-         ((logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons down l-analog-up))
-          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons down l-analog-up))
+         ((cpad-pressed? 0 down l-analog-down)
+          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons down l-analog-down))
+          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons down l-analog-down))
           )
-         ((and (zero? (-> *progress-state* game-options-item-selected))
-               (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (zero? (-> *progress-state* game-options-item-selected)) (cpad-pressed? 0 left l-analog-left))
           (sound-play "generic-beep")
           (when (not (-> *progress-state* game-options-vibrations))
             (set! (-> *cpad-list* cpads 0 buzz-pause-val 0) (the-as uint 255))
@@ -3342,47 +3322,35 @@
             (set! (-> *progress-state* game-options-vibrations) #t)
             )
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 1)
-               (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 1) (cpad-pressed? 0 left l-analog-left))
           (sound-play "generic-beep")
           (if (not (-> *progress-state* game-options-subtitles))
               (set! (-> *progress-state* game-options-subtitles) #t)
               )
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 2)
-               (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 2) (cpad-pressed? 0 left l-analog-left))
           (sound-play "generic-beep")
           (if (zero? (-> *progress-state* game-options-subtitle-language-index))
               (set! (-> *progress-state* game-options-subtitle-language-index) 6)
               (+! (-> *progress-state* game-options-subtitle-language-index) -1)
               )
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 3)
-               (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 3) (cpad-pressed? 0 left l-analog-left))
           (sound-play "generic-beep")
           (if (zero? (-> *progress-state* game-options-language-index))
               (set! (-> *progress-state* game-options-language-index) 6)
               (+! (-> *progress-state* game-options-language-index) -1)
               )
           )
-         ((and (zero? (-> *progress-state* game-options-item-selected))
-               (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (zero? (-> *progress-state* game-options-item-selected)) (cpad-pressed? 0 right l-analog-right))
           (sound-play "generic-beep")
           (set! (-> *progress-state* game-options-vibrations) #f)
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 1)
-               (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 1) (cpad-pressed? 0 right l-analog-right))
           (sound-play "generic-beep")
           (set! (-> *progress-state* game-options-subtitles) #f)
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 2)
-               (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 2) (cpad-pressed? 0 right l-analog-right))
           (sound-play "generic-beep")
           (cond
             ((= (-> *progress-state* game-options-subtitle-language-index) 6)
@@ -3394,9 +3362,7 @@
               )
             )
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 3)
-               (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 3) (cpad-pressed? 0 right l-analog-right))
           (sound-play "generic-beep")
           (cond
             ((= (-> *progress-state* game-options-language-index) 6)
@@ -3408,7 +3374,7 @@
               )
             )
           )
-         ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 confirm)
           (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
           (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
           (sound-play "generic-beep")
@@ -3445,25 +3411,25 @@
     (cond
       (#t
         (cond
-          ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-abs 0))
+          ((cpad-hold? 0 left l-analog-left)
            (set! (-> *setting-control* user-default display-dx)
                  (min-max-wrap-around (+ (-> *setting-control* user-default display-dx) -2) -96 96)
                  )
            (set! v1-0 #t)
            )
-          ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-abs 0))
+          ((cpad-hold? 0 right l-analog-right)
            (set! (-> *setting-control* user-default display-dx)
                  (min-max-wrap-around (+ (-> *setting-control* user-default display-dx) 2) -96 96)
                  )
            (set! v1-0 #t)
            )
-          ((logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
+          ((cpad-hold? 0 up l-analog-up)
            (set! (-> *setting-control* user-default display-dy)
                  (min-max-wrap-around (+ (-> *setting-control* user-default display-dy) -2) -48 48)
                  )
            (set! v1-0 #f)
            )
-          ((logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
+          ((cpad-hold? 0 down l-analog-down)
            (set! (-> *setting-control* user-default display-dy)
                  (min-max-wrap-around (+ (-> *setting-control* user-default display-dy) 2) -48 48)
                  )
@@ -3476,7 +3442,7 @@
           )
         )
       (else
-        (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        (when (cpad-pressed? 0 confirm)
           (set! (-> *progress-state* center-x-backup) (-> *setting-control* user-default display-dx))
           (set! (-> *progress-state* center-y-backup) (-> *setting-control* user-default display-dy))
           )
@@ -3500,8 +3466,8 @@
   (cond
     ((= (-> *progress-state* graphic-options-item-picked) #f)
      (cond
-       ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-            (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
+       ((or (cpad-pressed? 0 down l-analog-down)
+            (and (cpad-hold? 0 down l-analog-down)
                  (>= (- (current-time) (the-as int (-> *progress-state* graphic-options-last-move))) (seconds 0.5))
                  )
             )
@@ -3522,8 +3488,8 @@
             )
           )
         )
-       ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-            (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
+       ((or (cpad-pressed? 0 up l-analog-up)
+            (and (cpad-hold? 0 up l-analog-up)
                  (>= (- (current-time) (the-as int (-> *progress-state* graphic-options-last-move))) (seconds 0.5))
                  )
             )
@@ -3544,7 +3510,7 @@
             )
           )
         )
-       ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+       ((cpad-pressed? 0 confirm)
         (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
         (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
         (set! (-> *progress-state* graphic-options-last-move) (the-as uint (current-time)))
@@ -3583,61 +3549,47 @@
         (set! (-> *progress-state* video-mode-choice) (get-video-mode))
         )
        ((and (zero? (-> *progress-state* graphic-options-item-selected))
-             (logtest? (pad-buttons up right down left l-analog-down l-analog-right l-analog-up l-analog-left)
-                       (-> *cpad-list* cpads 0 button0-rel 0)
-                       )
+             (cpad-pressed? 0 up right down left l-analog-up l-analog-right l-analog-down l-analog-left)
              )
         (let ((t9-13 update-center-screen))
           #t
           (t9-13)
           )
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 1)
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 1) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (set! (-> *progress-state* graphic-options-aspect-ratio) 'aspect4x3)
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 2)
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 2) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (if (not (-> *progress-state* graphic-options-progressive-scan))
             (set! (-> *progress-state* graphic-options-progressive-scan) #t)
             )
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 3)
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 3) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (if (!= (-> *progress-state* video-mode-choice) 'pal)
             (set! (-> *progress-state* video-mode-choice) 'pal)
             )
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 1)
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 1) (cpad-pressed? 0 right l-analog-right))
         (sound-play "generic-beep")
         (set! (-> *progress-state* graphic-options-aspect-ratio) 'aspect16x9)
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 2)
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 2) (cpad-pressed? 0 right l-analog-right))
         (when (-> *progress-state* graphic-options-progressive-scan)
           (sound-play "generic-beep")
           (set! (-> *progress-state* graphic-options-progressive-scan) #f)
           (set! (-> *setting-control* user-default use-progressive-scan) #f)
           )
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 3)
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 3) (cpad-pressed? 0 right l-analog-right))
         (sound-play "generic-beep")
         (if (!= (-> *progress-state* video-mode-choice) 'ntsc)
             (set! (-> *progress-state* video-mode-choice) 'ntsc)
             )
         )
-       ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+       ((cpad-pressed? 0 confirm)
         (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
         (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
         (sound-play "generic-beep")
@@ -3690,18 +3642,18 @@
         )
     (when arg2
       (cond
-        ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 left l-analog-left)
          (when (not (-> v1-1 0))
            (set! gp-0 #t)
            (set! (-> v1-1 0) #t)
            )
          )
-        ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 right l-analog-right)
          (set! gp-0 (-> v1-1 0))
          (set! (-> v1-1 0) #f)
          (format #t "HL ~A~%" (-> v1-1 0))
          )
-        ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 confirm)
          (cond
            ((and (-> v1-1 0) (= (-> arg0 name) (text-id progress-root-restart-mission)))
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -3733,8 +3685,8 @@
      (set! (-> arg0 selected-option) #f)
      (set! (-> arg0 option-index) (-> *progress-state* qr-options-item-selected))
      (cond
-       ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-            (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
+       ((or (cpad-pressed? 0 down l-analog-down)
+            (and (cpad-hold? 0 down l-analog-down)
                  (>= (- (current-time) (the-as int (-> *progress-state* qr-options-last-move))) (seconds 0.5))
                  )
             )
@@ -3754,8 +3706,8 @@
             )
           )
         )
-       ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-            (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
+       ((or (cpad-pressed? 0 up l-analog-up)
+            (and (cpad-hold? 0 up l-analog-up)
                  (>= (- (current-time) (the-as int (-> *progress-state* qr-options-last-move))) (seconds 0.5))
                  )
             )
@@ -3773,7 +3725,7 @@
             )
           )
         )
-       ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+       ((cpad-pressed? 0 confirm)
         (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
         (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
         (set! (-> *progress-state* qr-options-last-move) (the-as uint (current-time)))
@@ -3810,27 +3762,19 @@
         (set! (-> arg0 selected-option) #f)
         (set! (-> *progress-state* yes-no-choice) #f)
         )
-       ((and (zero? (-> *progress-state* qr-options-item-selected))
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (zero? (-> *progress-state* qr-options-item-selected)) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (update-restart-quit obj arg0 #t)
         )
-       ((and (zero? (-> *progress-state* qr-options-item-selected))
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (zero? (-> *progress-state* qr-options-item-selected)) (cpad-pressed? 0 right l-analog-right))
         (sound-play "generic-beep")
         (update-restart-quit obj arg0 #t)
         )
-       ((and (= (-> *progress-state* qr-options-item-selected) 1)
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* qr-options-item-selected) 1) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (update-restart-quit obj arg0 #t)
         )
-       ((and (= (-> *progress-state* qr-options-item-selected) 1)
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* qr-options-item-selected) 1) (cpad-pressed? 0 right l-analog-right))
         (sound-play "generic-beep")
         (update-restart-quit obj arg0 #t)
         )
@@ -3841,7 +3785,7 @@
         (set! (-> arg0 selected-option) #f)
         (set! (-> *progress-state* yes-no-choice) #f)
         )
-       ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+       ((cpad-pressed? 0 confirm)
         (sound-play "generic-beep")
         (when (zero? (-> *progress-state* qr-options-item-selected))
           (set! (-> arg0 selected-option) #t)
diff --git a/goal_src/jak2/levels/city/ctywide-obs.gc b/goal_src/jak2/levels/city/ctywide-obs.gc
index 35d23c2424..bd3161b342 100644
--- a/goal_src/jak2/levels/city/ctywide-obs.gc
+++ b/goal_src/jak2/levels/city/ctywide-obs.gc
@@ -3445,7 +3445,7 @@ This commonly includes things such as:
               (+! gp-0 1)
               )
             )
-          (when (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
+          (when (cpad-pressed? 0 down l-analog-down)
             (+! s5-0 1)
             (cond
               ((< (+ gp-0 -1) s5-0)
@@ -3457,7 +3457,7 @@ This commonly includes things such as:
                 )
               )
             )
-          (when (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
+          (when (cpad-pressed? 0 up l-analog-up)
             (+! s5-0 -1)
             (cond
               ((< s5-0 0)
@@ -3751,7 +3751,7 @@ This commonly includes things such as:
       (let ((gp-0 (add-process *gui-control* self (gui-channel bbush) (gui-action play) "cityv174" -99.0 0)))
         (while (nonzero? (get-status *gui-control* gp-0))
           (suspend)
-          (when (or (cpad-pressed? 0 triangle) (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)))
+          (when (or (cpad-pressed? 0 triangle) (cpad-pressed? 0 confirm))
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle circle x confirm))
             (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle circle x confirm))
             (set-action!
@@ -3771,7 +3771,7 @@ This commonly includes things such as:
         )
       (when (not s5-0)
         (until #f
-          (when (or (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)) (cpad-pressed? 0 triangle))
+          (when (or (cpad-pressed? 0 confirm) (cpad-pressed? 0 triangle))
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle circle x confirm))
             (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle circle x confirm))
             (sound-play "menu-pick")
diff --git a/goal_src/jak2/levels/common/race/race-manager.gc b/goal_src/jak2/levels/common/race/race-manager.gc
index a65ff4526d..ef43a8fa03 100644
--- a/goal_src/jak2/levels/common/race/race-manager.gc
+++ b/goal_src/jak2/levels/common/race/race-manager.gc
@@ -1485,7 +1485,7 @@
          (draw-message-retry self)
          (when (>= (- (current-time) (-> self state-time)) (seconds 0.5))
            (cond
-             ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+             ((cpad-pressed? 0 confirm)
               (stop-speech self)
               (send-event (ppointer->process (-> self parent)) 'retry-immediately)
               (sleep-code)
@@ -1501,7 +1501,7 @@
         (else
           (draw-message-continue self)
           (when (>= (- (current-time) (-> self state-time)) (seconds 0.5))
-            (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+            (when (cpad-pressed? 0 confirm)
               (stop-speech self)
               (send-event (ppointer->process (-> self parent)) 'complete)
               (sleep-code)
@@ -1540,7 +1540,7 @@
       (-> self race-state info)
       (when (>= (- (current-time) (-> self state-time)) (seconds 0.5))
         (cond
-          ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 confirm)
            (stop-speech self)
            (send-event (ppointer->process (-> self parent)) 'retry-immediately)
            (sleep-code)
diff --git a/goal_src/jak2/levels/demo/demo-obs.gc b/goal_src/jak2/levels/demo/demo-obs.gc
index a902b6052f..42d2be0668 100644
--- a/goal_src/jak2/levels/demo/demo-obs.gc
+++ b/goal_src/jak2/levels/demo/demo-obs.gc
@@ -503,19 +503,15 @@
     (until #f
       (when (not (paused?))
         (cond
-          ((and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-                (> (-> self selected) 0)
-                )
+          ((and (cpad-pressed? 0 up l-analog-up) (> (-> self selected) 0))
            (seekl! (-> self selected) 0 1)
            (sound-play "dmenu-move")
            )
-          ((and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-                (< (-> self selected) (+ (-> gp-1 length) -1))
-                )
+          ((and (cpad-pressed? 0 down l-analog-down) (< (-> self selected) (+ (-> gp-1 length) -1)))
            (seekl! (-> self selected) (+ (-> gp-1 length) -1) 1)
            (sound-play "dmenu-move")
            )
-          ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 confirm)
            (sound-play "dmenu-pick")
            (return (the-as object (-> self selected)))
            )
diff --git a/goal_src/jak2/levels/gungame/gungame-obs.gc b/goal_src/jak2/levels/gungame/gungame-obs.gc
index 53709b6270..76ba37a686 100644
--- a/goal_src/jak2/levels/gungame/gungame-obs.gc
+++ b/goal_src/jak2/levels/gungame/gungame-obs.gc
@@ -370,23 +370,22 @@ This commonly includes things such as:
     )
   :trans (behavior ()
     (when (and (zero? (-> self start-time))
-               (or (and (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
-                        (let ((a1-0 (new 'stack-no-clear 'event-message-block)))
-                          (set! (-> a1-0 from) (process->ppointer self))
-                          (set! (-> a1-0 num-params) 1)
-                          (set! (-> a1-0 message) 'player-in-open-area?)
-                          (set! (-> a1-0 param 0) (the-as uint #f))
-                          (let ((t9-0 send-event-function)
-                                (v1-11 (-> self actor-group 1 data 0 actor))
-                                )
-                            (t9-0
-                              (if v1-11
-                                  (-> v1-11 extra process)
-                                  )
-                              a1-0
-                              )
-                            )
-                          )
+               (or (and (cpad-pressed? 0 confirm) (let ((a1-0 (new 'stack-no-clear 'event-message-block)))
+                                                    (set! (-> a1-0 from) (process->ppointer self))
+                                                    (set! (-> a1-0 num-params) 1)
+                                                    (set! (-> a1-0 message) 'player-in-open-area?)
+                                                    (set! (-> a1-0 param 0) (the-as uint #f))
+                                                    (let ((t9-0 send-event-function)
+                                                          (v1-11 (-> self actor-group 1 data 0 actor))
+                                                          )
+                                                      (t9-0
+                                                        (if v1-11
+                                                            (-> v1-11 extra process)
+                                                            )
+                                                        a1-0
+                                                        )
+                                                      )
+                                                    )
                         )
                    (let ((a1-1 (new 'stack-no-clear 'event-message-block)))
                      (set! (-> a1-1 from) (process->ppointer self))
@@ -528,7 +527,7 @@ This commonly includes things such as:
     (none)
     )
   :trans (behavior ()
-    (when (and (zero? (-> self start-time)) (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)))
+    (when (and (zero? (-> self start-time)) (cpad-pressed? 0 confirm))
       (let ((a1-3 (new 'stack-no-clear 'event-message-block)))
         (set! (-> a1-3 from) (process->ppointer self))
         (set! (-> a1-3 num-params) 1)
@@ -653,7 +652,7 @@ This commonly includes things such as:
     (if (task-node-open? (game-task-node city-yellow-gun-training-introduction))
         (go-virtual yellow-training-intro)
         )
-    (when (and (zero? (-> self start-time)) (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)))
+    (when (and (zero? (-> self start-time)) (cpad-pressed? 0 confirm))
       (let ((a1-3 (new 'stack-no-clear 'event-message-block)))
         (set! (-> a1-3 from) (process->ppointer self))
         (set! (-> a1-3 num-params) 1)
@@ -1999,7 +1998,7 @@ This commonly includes things such as:
   )
 
 (defmethod training-manager-method-22 training-manager ((obj training-manager) (arg0 symbol))
-  (local-vars (v1-28 symbol) (a0-18 symbol) (sv-48 process) (sv-64 process-tree) (sv-80 process-tree))
+  (local-vars (v1-28 symbol) (a0-18 symbol) (sv-48 process) (sv-64 process) (sv-80 process))
   (let ((s4-0 (new 'static 'fact-info :pickup-type (pickup-type ammo-red) :pickup-spawn-amount 20.0))
         (s3-0 (new 'stack-no-clear 'vector))
         (s2-0 (new 'stack-no-clear 'sphere))
@@ -2034,14 +2033,14 @@ This commonly includes things such as:
                 )
               )
           (set! a0-18 (when v1-21
-                        (set! sv-64 (the-as process-tree a0-18))
+                        (set! sv-64 (the-as process a0-18))
                         (set! sv-64 (-> v1-21 0 self))
                         a0-18
                         )
                 )
           )
         (set! v1-28 (when (type? sv-64 process-focusable)
-                      (set! sv-80 (the-as process-tree v1-28))
+                      (set! sv-80 (the-as process v1-28))
                       (set! sv-80 sv-64)
                       v1-28
                       )
diff --git a/goal_src/jak2/levels/title/title-obs.gc b/goal_src/jak2/levels/title/title-obs.gc
index dd9c43464d..ffa6a152c8 100644
--- a/goal_src/jak2/levels/title/title-obs.gc
+++ b/goal_src/jak2/levels/title/title-obs.gc
@@ -481,7 +481,7 @@
         (s4-0 #f)
         )
     (while (not (or (>= (- (current-time) s3-0) arg1) (and (>= (- (current-time) s3-0) arg0) s4-0)))
-      (if (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      (if (cpad-pressed? 0 confirm)
           (set! s4-0 #t)
           )
       (when (cpad-pressed? 0 triangle)
@@ -504,19 +504,15 @@
     (until #f
       (when (not (paused?))
         (cond
-          ((and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-                (> (-> self selected) 0)
-                )
+          ((and (cpad-pressed? 0 up l-analog-up) (> (-> self selected) 0))
            (seekl! (-> self selected) 0 1)
            (sound-play "dmenu-move")
            )
-          ((and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-                (< (-> self selected) (+ (-> gp-1 length) -1))
-                )
+          ((and (cpad-pressed? 0 down l-analog-down) (< (-> self selected) (+ (-> gp-1 length) -1)))
            (seekl! (-> self selected) (+ (-> gp-1 length) -1) 1)
            (sound-play "dmenu-move")
            )
-          ((or (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((or (cpad-pressed? 0 confirm)
                (and (cpad-pressed? 0 start)
                     (or (not *debug-segment*) (not (logtest? (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons l3))))
                     )
diff --git a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
index 0933d6b9ec..80f2ca4548 100644
--- a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
+++ b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
@@ -1612,9 +1612,7 @@
          (when (or (and (logtest? (-> self flags) (fail-mission-flags famflags-0))
                         (>= (- (current-time) (-> self grabbed-time)) (the-as time-frame (-> self reset-delay)))
                         )
-                   (or (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
-                       (logtest? (-> self flags) (fail-mission-flags famflags-3))
-                       )
+                   (or (cpad-pressed? 0 confirm) (logtest? (-> self flags) (fail-mission-flags famflags-3)))
                    )
            (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
            (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
@@ -1628,9 +1626,7 @@
        )
       (((fail-mission-message fammsg-1))
        (until #f
-         (when (or (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
-                   (logtest? (-> self flags) (fail-mission-flags famflags-3))
-                   )
+         (when (or (cpad-pressed? 0 confirm) (logtest? (-> self flags) (fail-mission-flags famflags-3)))
            (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
            (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
            (set! (-> self retry) #t)
diff --git a/test/decompiler/reference/jak2/engine/ps2/pad_REF.gc b/test/decompiler/reference/jak2/engine/ps2/pad_REF.gc
index 86a531f447..2b44c19eb8 100644
--- a/test/decompiler/reference/jak2/engine/ps2/pad_REF.gc
+++ b/test/decompiler/reference/jak2/engine/ps2/pad_REF.gc
@@ -418,10 +418,10 @@
            (let ((buttons-pushed (the-as pad-buttons (-> pad button0))))
              (cond
                ((< (-> pad lefty) (the-as uint 30))
-                (set! buttons-pushed (logior (pad-buttons l-analog-down) buttons-pushed))
+                (set! buttons-pushed (logior (pad-buttons l-analog-up) buttons-pushed))
                 )
                ((< (the-as uint 225) (-> pad lefty))
-                (set! buttons-pushed (logior (pad-buttons l-analog-up) buttons-pushed))
+                (set! buttons-pushed (logior (pad-buttons l-analog-down) buttons-pushed))
                 )
                )
              (cond
@@ -434,10 +434,10 @@
                )
              (cond
                ((< (-> pad righty) (the-as uint 30))
-                (set! buttons-pushed (logior (pad-buttons r-analog-down) buttons-pushed))
+                (set! buttons-pushed (logior (pad-buttons r-analog-up) buttons-pushed))
                 )
                ((< (the-as uint 225) (-> pad righty))
-                (set! buttons-pushed (logior (pad-buttons r-analog-up) buttons-pushed))
+                (set! buttons-pushed (logior (pad-buttons r-analog-down) buttons-pushed))
                 )
                )
              (cond
diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
index 51faac29a8..09bd9b5b4f 100644
--- a/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
+++ b/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
@@ -3740,7 +3740,9 @@
               )
             )
           (cond
-            ((and (= (-> *setting-control* user-default language) (language-enum german)) (= 454 (-> sv-80 text-name)))
+            ((and (= (-> *setting-control* user-default language) (language-enum german))
+                  (= (text-id progress-missions-stadium-board1) (-> sv-80 text-name))
+                  )
              (let ((v1-71 arg1))
                (set! (-> v1-71 scale) 0.45)
                )
@@ -7969,7 +7971,10 @@
          (set! (-> arg1 origin y) (+ -25.0 (-> arg1 origin y)))
          (print-menu-text (lookup-text! *common-text* (-> obj name) #f) (-> obj scale) arg1 arg0)
          )
-        ((and (= *title* (-> arg0 current-options)) (= 339 (-> obj name)) (memcard-unlocked-secrets? #f))
+        ((and (= *title* (-> arg0 current-options))
+              (= (text-id progress-root-secrets) (-> obj name))
+              (memcard-unlocked-secrets? #f)
+              )
          (print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
          )
         ((!= (-> obj name) (text-id progress-root-secrets))
diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
index 227c8327cf..97037e50d0 100644
--- a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
+++ b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
@@ -1078,7 +1078,7 @@
         (cond
           ((-> obj selected-option)
            (cond
-             ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+             ((cpad-pressed? 0 confirm)
               (set! (-> obj selected-option) #f)
               )
              ((cpad-pressed? 0 triangle)
@@ -1092,7 +1092,7 @@
            )
           (else
             (cond
-              ((logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 up l-analog-up)
                (cond
                  ((= (-> obj current-options) *main-options*)
                   (sound-play "ring-select")
@@ -1113,7 +1113,7 @@
                   )
                  )
                )
-              ((logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 down l-analog-down)
                (cond
                  ((= (-> obj current-options) *main-options*)
                   (sound-play "ring-select")
@@ -1131,7 +1131,7 @@
                   )
                  )
                )
-              ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 confirm)
                (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
                (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
                (if (not (-> *progress-state* clear-screen))
@@ -1847,7 +1847,7 @@
     (cond
       (arg1
         (cond
-          ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 left l-analog-left)
            (when (not (-> v1-1 0))
              (set! gp-0 #t)
              (when (= (-> obj value-to-modify) (&-> *setting-control* user-default vibration))
@@ -1857,11 +1857,11 @@
              (set! (-> v1-1 0) #t)
              )
            )
-          ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 right l-analog-right)
            (set! gp-0 (-> v1-1 0))
            (set! (-> v1-1 0) #f)
            )
-          ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 confirm)
            (cond
              ((and (-> v1-1 0) (= (-> obj value-to-modify) (&-> *setting-control* user-default use-progressive-scan)))
               (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -1877,7 +1877,7 @@
           )
         )
       (else
-        (if (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        (if (cpad-pressed? 0 confirm)
             (set! (-> *progress-state* on-off-choice) (-> obj value-to-modify 0))
             )
         )
@@ -1897,17 +1897,17 @@
         )
     (when arg1
       (cond
-        ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 left l-analog-left)
          (when (not (-> v1-1 0))
            (set! gp-0 #t)
            (set! (-> v1-1 0) #t)
            )
          )
-        ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 right l-analog-right)
          (set! gp-0 (-> v1-1 0))
          (set! (-> v1-1 0) #f)
          )
-        ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 confirm)
          (cond
            ((and (-> v1-1 0) (= (-> obj name) (text-id progress-root-restart-mission)))
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -1941,13 +1941,13 @@
       (cond
         (arg1
           (cond
-            ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-abs 0))
+            ((cpad-hold? 0 left l-analog-left)
              (seek! (-> (the-as (pointer float) gp-0)) 0.0 (* 0.02 (-> self clock time-adjust-ratio)))
              (if (!= (-> (the-as (pointer float) gp-0)) 0.0)
                  (set! s4-0 #t)
                  )
              )
-            ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-abs 0))
+            ((cpad-hold? 0 right l-analog-right)
              (seek! (-> (the-as (pointer float) gp-0)) 1.0 (* 0.02 (-> self clock time-adjust-ratio)))
              (if (!= (-> (the-as (pointer float) gp-0)) 1.0)
                  (set! s4-0 #t)
@@ -1960,20 +1960,20 @@
           )
         (else
           (cond
-            ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-abs 0))
+            ((cpad-hold? 0 left l-analog-left)
              (seek! (-> (the-as (pointer float) gp-0)) 0.0 (* 0.02 (-> self clock time-adjust-ratio)))
              (if (!= (-> (the-as (pointer float) gp-0)) 0.0)
                  (set! s4-0 #t)
                  )
              )
-            ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-abs 0))
+            ((cpad-hold? 0 right l-analog-right)
              (seek! (-> (the-as (pointer float) gp-0)) 1.0 (* 0.02 (-> self clock time-adjust-ratio)))
              (if (!= (-> (the-as (pointer float) gp-0)) 1.0)
                  (set! s4-0 #t)
                  )
              )
             )
-          (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          (when (cpad-pressed? 0 confirm)
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
             (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
             )
@@ -2025,11 +2025,11 @@
         (cond
           (arg1
             (cond
-              ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 left l-analog-left)
                (set! (-> *setting-control* user-default stereo-mode) (min-max-wrap-around (+ a0-1 -1) 0 a3-0))
                (set! v1-4 #t)
                )
-              ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 right l-analog-right)
                (set! (-> *setting-control* user-default stereo-mode) (min-max-wrap-around (+ a0-1 1) 0 a3-0))
                (set! v1-4 #t)
                )
@@ -2039,7 +2039,7 @@
               )
             )
           (else
-            (if (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+            (if (cpad-pressed? 0 confirm)
                 (set! (-> *progress-state* stereo-mode-backup) (-> *setting-control* user-default stereo-mode))
                 )
             )
@@ -2059,7 +2059,7 @@
   (cond
     ((cpad-pressed? 0 start)
      )
-    ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+    ((cpad-pressed? 0 confirm)
      (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
      (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
      (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle))
@@ -2116,7 +2116,7 @@
     ((not (-> arg0 selected-option))
      (let ((a0-53 (-> arg0 current-options options)))
        (cond
-         ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 left l-analog-left)
           (if (!= (length a0-53) 1)
               (sound-play "ring-select")
               )
@@ -2129,7 +2129,7 @@
              )
             )
           )
-         ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 right l-analog-right)
           (if (!= (length a0-53) 1)
               (sound-play "ring-select")
               )
@@ -2178,7 +2178,7 @@
     (set! (-> arg0 option-index) 0)
     0
     )
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (cond
@@ -2222,7 +2222,7 @@
       (set-next-state arg0 'secrets-insufficient-space 0)
       )
     (cond
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2316,7 +2316,7 @@
       ((not (-> arg0 selected-option))
        (let ((a0-131 (-> arg0 current-options options)))
          (cond
-           ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+           ((cpad-pressed? 0 left l-analog-left)
             (when (!= (length a0-131) 1)
               )
             (cond
@@ -2328,7 +2328,7 @@
                )
               )
             )
-           ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+           ((cpad-pressed? 0 right l-analog-right)
             (when (!= (length a0-131) 1)
               )
             (cond
@@ -2360,7 +2360,7 @@
     (cond
       ((cpad-pressed? 0 triangle)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (let ((s5-0 #f))
@@ -2405,15 +2405,15 @@
         (set-next-state arg0 a1-2 0)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> s4-0 0)))
        (set! (-> s4-0 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> s4-0 0))
        (set! (-> s4-0 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2449,15 +2449,15 @@
           )
       )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> s4-0 0)))
        (set! (-> s4-0 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> s4-0 0))
        (set! (-> s4-0 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2494,19 +2494,19 @@
            (= (-> *progress-state* starting-state) 'no-memory-card)
            )
        (cond
-         ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 left l-analog-left)
           (when (and (not (-> s5-0 0)) (not (-> *progress-state* clear-screen)))
             (sound-play "generic-beep")
             (set! (-> s5-0 0) #t)
             )
           )
-         ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 right l-analog-right)
           (when (and (-> s5-0 0) (not (-> *progress-state* clear-screen)))
             (sound-play "generic-beep")
             (set! (-> s5-0 0) #f)
             )
           )
-         ((and (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)) (!= (-> arg0 current) 'none))
+         ((and (cpad-pressed? 0 confirm) (!= (-> arg0 current) 'none))
           (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
           (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
           (set! (-> *progress-state* clear-screen) (the-as basic #t))
@@ -2557,7 +2557,7 @@
            (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle))
            (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle))
            )
-          ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 confirm)
            (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
            (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
            (cond
@@ -2584,7 +2584,7 @@
   "Handle progress menu navigation logic."
   (&-> *progress-state* yes-no-choice)
   (cond
-    ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+    ((cpad-pressed? 0 confirm)
      (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
      (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
      (sound-play "generic-beep")
@@ -2605,15 +2605,15 @@
         (gp-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> v1-1 0))
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (set! (-> *progress-state* video-mode-timeout) 0)
@@ -2644,15 +2644,15 @@
         (s5-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! s5-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! s5-0 (-> v1-1 0))
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2691,17 +2691,17 @@
         (gp-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        (set! (-> *progress-state* graphic-options-progressive-scan) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> v1-1 0))
        (set! (-> *progress-state* graphic-options-progressive-scan) #f)
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (set! (-> *progress-state* progressive-mode-timeout) 0)
@@ -2737,15 +2737,15 @@
         (s5-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! s5-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! s5-0 (-> v1-1 0))
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2782,7 +2782,7 @@
 ;; definition for method 9 of type menu-card-removed-option
 (defmethod respond-progress menu-card-removed-option ((obj menu-card-removed-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2799,7 +2799,7 @@
     ((= (progress-method-28 arg0 'select-load) 'select-load)
      (set-next-state arg0 'select-load 0)
      )
-    ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+    ((cpad-pressed? 0 confirm)
      (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
      (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
      (sound-play "generic-beep")
@@ -2812,7 +2812,7 @@
 ;; definition for method 9 of type menu-error-loading-option
 (defmethod respond-progress menu-error-loading-option ((obj menu-error-loading-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2824,7 +2824,7 @@
 ;; definition for method 9 of type menu-error-auto-saving-option
 (defmethod respond-progress menu-error-auto-saving-option ((obj menu-error-auto-saving-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2836,7 +2836,7 @@
 ;; definition for method 9 of type menu-error-disc-removed-option
 (defmethod respond-progress menu-error-disc-removed-option ((obj menu-error-disc-removed-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (when (is-cd-in?)
@@ -2850,7 +2850,7 @@
 ;; definition for method 9 of type menu-error-reading-option
 (defmethod respond-progress menu-error-reading-option ((obj menu-error-reading-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2862,7 +2862,7 @@
 ;; definition for method 9 of type menu-icon-info-option
 (defmethod respond-progress menu-icon-info-option ((obj menu-icon-info-option) (arg0 progress) (arg1 object))
   "Handle progress menu navigation logic."
-  (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+  (when (cpad-pressed? 0 confirm)
     (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
     (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
     (sound-play "generic-beep")
@@ -2878,15 +2878,15 @@
         (gp-0 #f)
         )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> v1-1 0)))
        (set! (-> v1-1 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> v1-1 0))
        (set! (-> v1-1 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2926,15 +2926,15 @@
       (set-next-state arg0 a1-2 0)
       )
     (cond
-      ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 left l-analog-left)
        (set! gp-0 (not (-> s4-0 0)))
        (set! (-> s4-0 0) #t)
        )
-      ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 right l-analog-right)
        (set! gp-0 (-> s4-0 0))
        (set! (-> s4-0 0) #f)
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (cond
@@ -2981,10 +2981,8 @@
       (set-next-state arg0 'secrets-insufficient-space 0)
       )
     (cond
-      ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-           (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
-                (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                )
+      ((or (cpad-pressed? 0 up l-analog-up)
+           (and (cpad-hold? 0 up l-analog-up) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
            )
        (set! (-> obj last-move) (the-as uint (current-time)))
        (when (> (-> obj task-index) 0)
@@ -2993,10 +2991,8 @@
          (set! (-> arg0 sliding-height) -1.0)
          )
        )
-      ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-           (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
-                (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                )
+      ((or (cpad-pressed? 0 down l-analog-down)
+           (and (cpad-hold? 0 down l-analog-down) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
            )
        (set! (-> obj last-move) (the-as uint (current-time)))
        (let ((s3-0 -1))
@@ -3028,7 +3024,7 @@
            )
          )
        )
-      ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
        (sound-play "generic-beep")
@@ -3093,10 +3089,8 @@
          )
         )
       (cond
-        ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-             (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
-                  (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                  )
+        ((or (cpad-pressed? 0 up l-analog-up)
+             (and (cpad-hold? 0 up l-analog-up) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
              )
          (set! (-> obj last-move) (the-as uint (current-time)))
          (when (> (-> obj task-index) 0)
@@ -3105,10 +3099,8 @@
            (set! (-> arg0 sliding-height) -1.0)
            )
          )
-        ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-             (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
-                  (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                  )
+        ((or (cpad-pressed? 0 down l-analog-down)
+             (and (cpad-hold? 0 down l-analog-down) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
              )
          (set! (-> obj last-move) (the-as uint (current-time)))
          (when (< (-> obj task-index) (+ (length s4-0) -1))
@@ -3117,7 +3109,7 @@
            (set! (-> arg0 sliding-height) 1.0)
            )
          )
-        ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 confirm)
          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
          (sound-play "generic-beep")
@@ -3164,10 +3156,8 @@
         )
   (let ((s5-0 #f))
     (cond
-      ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-           (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
-                (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                )
+      ((or (cpad-pressed? 0 up l-analog-up)
+           (and (cpad-hold? 0 up l-analog-up) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
            )
        (set! (-> obj last-move) (the-as uint (current-time)))
        (when (> (-> obj task-line-index) 0)
@@ -3176,10 +3166,8 @@
          (set! (-> arg0 sliding-height) -1.0)
          )
        )
-      ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-           (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
-                (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                )
+      ((or (cpad-pressed? 0 down l-analog-down)
+           (and (cpad-hold? 0 down l-analog-down) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
            )
        (set! (-> obj last-move) (the-as uint (current-time)))
        (when (< (-> obj task-line-index) (+ (-> *progress-state* total-num-tasks) -1))
@@ -3188,7 +3176,7 @@
          (set! s5-0 #t)
          )
        )
-      ((logtest? (pad-buttons triangle confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      ((cpad-pressed? 0 triangle confirm)
        (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle confirm))
        (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle confirm))
        (if (!= (-> *progress-state* starting-state) 'title)
@@ -3227,8 +3215,8 @@
   (when (-> *bigmap* progress-minimap)
     (let ((s5-0 #f))
       (cond
-        ((or (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             (and (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-abs 0))
+        ((or (cpad-pressed? 0 right l-analog-right)
+             (and (cpad-hold? 0 right l-analog-right)
                   (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
                   )
              )
@@ -3242,10 +3230,8 @@
            (set! (-> obj slide-dir) -1.0)
            )
          )
-        ((or (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             (and (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-abs 0))
-                  (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                  )
+        ((or (cpad-pressed? 0 left l-analog-left)
+             (and (cpad-hold? 0 left l-analog-left) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
              )
          (when (< 1 (get-num-highscores))
            (set! (-> obj last-move) (the-as uint (current-time)))
@@ -3257,7 +3243,7 @@
            (set! (-> obj slide-dir) 1.0)
            )
          )
-        ((logtest? (pad-buttons triangle confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 triangle confirm)
          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle confirm))
          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle confirm))
          (set! (-> arg0 sliding) 0.0)
@@ -3315,7 +3301,7 @@
       (let ((s5-2 #f))
         (cond
           ((= arg1 #t)
-           (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+           (when (cpad-pressed? 0 confirm)
              (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
              (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
              (sound-play "generic-beep")
@@ -3324,10 +3310,8 @@
            )
           (else
             (cond
-              ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-                   (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
-                        (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                        )
+              ((or (cpad-pressed? 0 down l-analog-down)
+                   (and (cpad-hold? 0 down l-analog-down) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
                    )
                (set! (-> obj last-move) (the-as uint (current-time)))
                (when (< (-> obj item-index) s2-0)
@@ -3338,10 +3322,8 @@
                  (set! (-> arg0 sliding-off) 0.0)
                  )
                )
-              ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-                   (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
-                        (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2))
-                        )
+              ((or (cpad-pressed? 0 up l-analog-up)
+                   (and (cpad-hold? 0 up l-analog-up) (>= (- (current-time) (the-as int (-> obj last-move))) (seconds 0.2)))
                    )
                (set! (-> obj last-move) (the-as uint (current-time)))
                (when (< s3-0 (-> obj item-index))
@@ -3352,7 +3334,7 @@
                  (set! (-> arg0 sliding-off) 0.0)
                  )
                )
-              ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+              ((cpad-pressed? 0 confirm)
                (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
                (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
                (let ((v1-74 (-> obj item-index)))
@@ -3410,8 +3392,8 @@
     (cond
       ((= (-> *progress-state* game-options-item-picked) #f)
        (cond
-         ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-              (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
+         ((or (cpad-pressed? 0 down l-analog-down)
+              (and (cpad-hold? 0 down l-analog-down)
                    (>= (- (current-time) (the-as int (-> *progress-state* game-options-last-move))) (seconds 0.5))
                    )
               )
@@ -3426,8 +3408,8 @@
               )
             )
           )
-         ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-              (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
+         ((or (cpad-pressed? 0 up l-analog-up)
+              (and (cpad-hold? 0 up l-analog-up)
                    (>= (- (current-time) (the-as int (-> *progress-state* game-options-last-move))) (seconds 0.5))
                    )
               )
@@ -3437,7 +3419,7 @@
               (set! (-> *progress-state* game-options-item-selected) 3)
               )
           )
-         ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 confirm)
           (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
           (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
           (set! (-> *progress-state* game-options-last-move) (the-as uint (current-time)))
@@ -3470,17 +3452,15 @@
                 (the-as int (-> *setting-control* user-default subtitle-language))
                 )
           )
-         ((logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons up l-analog-down))
-          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons up l-analog-down))
+         ((cpad-pressed? 0 up l-analog-up)
+          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons up l-analog-up))
+          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons up l-analog-up))
           )
-         ((logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons down l-analog-up))
-          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons down l-analog-up))
+         ((cpad-pressed? 0 down l-analog-down)
+          (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons down l-analog-down))
+          (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons down l-analog-down))
           )
-         ((and (zero? (-> *progress-state* game-options-item-selected))
-               (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (zero? (-> *progress-state* game-options-item-selected)) (cpad-pressed? 0 left l-analog-left))
           (sound-play "generic-beep")
           (when (not (-> *progress-state* game-options-vibrations))
             (set! (-> *cpad-list* cpads 0 buzz-pause-val 0) (the-as uint 255))
@@ -3488,47 +3468,35 @@
             (set! (-> *progress-state* game-options-vibrations) #t)
             )
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 1)
-               (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 1) (cpad-pressed? 0 left l-analog-left))
           (sound-play "generic-beep")
           (if (not (-> *progress-state* game-options-subtitles))
               (set! (-> *progress-state* game-options-subtitles) #t)
               )
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 2)
-               (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 2) (cpad-pressed? 0 left l-analog-left))
           (sound-play "generic-beep")
           (if (zero? (-> *progress-state* game-options-subtitle-language-index))
               (set! (-> *progress-state* game-options-subtitle-language-index) 6)
               (+! (-> *progress-state* game-options-subtitle-language-index) -1)
               )
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 3)
-               (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 3) (cpad-pressed? 0 left l-analog-left))
           (sound-play "generic-beep")
           (if (zero? (-> *progress-state* game-options-language-index))
               (set! (-> *progress-state* game-options-language-index) 6)
               (+! (-> *progress-state* game-options-language-index) -1)
               )
           )
-         ((and (zero? (-> *progress-state* game-options-item-selected))
-               (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (zero? (-> *progress-state* game-options-item-selected)) (cpad-pressed? 0 right l-analog-right))
           (sound-play "generic-beep")
           (set! (-> *progress-state* game-options-vibrations) #f)
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 1)
-               (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 1) (cpad-pressed? 0 right l-analog-right))
           (sound-play "generic-beep")
           (set! (-> *progress-state* game-options-subtitles) #f)
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 2)
-               (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 2) (cpad-pressed? 0 right l-analog-right))
           (sound-play "generic-beep")
           (cond
             ((= (-> *progress-state* game-options-subtitle-language-index) 6)
@@ -3540,9 +3508,7 @@
               )
             )
           )
-         ((and (= (-> *progress-state* game-options-item-selected) 3)
-               (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-               )
+         ((and (= (-> *progress-state* game-options-item-selected) 3) (cpad-pressed? 0 right l-analog-right))
           (sound-play "generic-beep")
           (cond
             ((= (-> *progress-state* game-options-language-index) 6)
@@ -3554,7 +3520,7 @@
               )
             )
           )
-         ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+         ((cpad-pressed? 0 confirm)
           (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
           (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
           (sound-play "generic-beep")
@@ -3592,25 +3558,25 @@
     (cond
       (#t
         (cond
-          ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-abs 0))
+          ((cpad-hold? 0 left l-analog-left)
            (set! (-> *setting-control* user-default display-dx)
                  (min-max-wrap-around (+ (-> *setting-control* user-default display-dx) -2) -96 96)
                  )
            (set! v1-0 #t)
            )
-          ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-abs 0))
+          ((cpad-hold? 0 right l-analog-right)
            (set! (-> *setting-control* user-default display-dx)
                  (min-max-wrap-around (+ (-> *setting-control* user-default display-dx) 2) -96 96)
                  )
            (set! v1-0 #t)
            )
-          ((logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
+          ((cpad-hold? 0 up l-analog-up)
            (set! (-> *setting-control* user-default display-dy)
                  (min-max-wrap-around (+ (-> *setting-control* user-default display-dy) -2) -48 48)
                  )
            (set! v1-0 #f)
            )
-          ((logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
+          ((cpad-hold? 0 down l-analog-down)
            (set! (-> *setting-control* user-default display-dy)
                  (min-max-wrap-around (+ (-> *setting-control* user-default display-dy) 2) -48 48)
                  )
@@ -3623,7 +3589,7 @@
           )
         )
       (else
-        (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        (when (cpad-pressed? 0 confirm)
           (set! (-> *progress-state* center-x-backup) (-> *setting-control* user-default display-dx))
           (set! (-> *progress-state* center-y-backup) (-> *setting-control* user-default display-dy))
           )
@@ -3648,8 +3614,8 @@
   (cond
     ((= (-> *progress-state* graphic-options-item-picked) #f)
      (cond
-       ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-            (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
+       ((or (cpad-pressed? 0 down l-analog-down)
+            (and (cpad-hold? 0 down l-analog-down)
                  (>= (- (current-time) (the-as int (-> *progress-state* graphic-options-last-move))) (seconds 0.5))
                  )
             )
@@ -3670,8 +3636,8 @@
             )
           )
         )
-       ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-            (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
+       ((or (cpad-pressed? 0 up l-analog-up)
+            (and (cpad-hold? 0 up l-analog-up)
                  (>= (- (current-time) (the-as int (-> *progress-state* graphic-options-last-move))) (seconds 0.5))
                  )
             )
@@ -3692,7 +3658,7 @@
             )
           )
         )
-       ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+       ((cpad-pressed? 0 confirm)
         (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
         (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
         (set! (-> *progress-state* graphic-options-last-move) (the-as uint (current-time)))
@@ -3731,61 +3697,47 @@
         (set! (-> *progress-state* video-mode-choice) (get-video-mode))
         )
        ((and (zero? (-> *progress-state* graphic-options-item-selected))
-             (logtest? (pad-buttons up right down left l-analog-down l-analog-right l-analog-up l-analog-left)
-                       (-> *cpad-list* cpads 0 button0-rel 0)
-                       )
+             (cpad-pressed? 0 up right down left l-analog-up l-analog-right l-analog-down l-analog-left)
              )
         (let ((t9-13 update-center-screen))
           #t
           (t9-13)
           )
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 1)
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 1) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (set! (-> *progress-state* graphic-options-aspect-ratio) 'aspect4x3)
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 2)
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 2) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (if (not (-> *progress-state* graphic-options-progressive-scan))
             (set! (-> *progress-state* graphic-options-progressive-scan) #t)
             )
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 3)
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 3) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (if (!= (-> *progress-state* video-mode-choice) 'pal)
             (set! (-> *progress-state* video-mode-choice) 'pal)
             )
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 1)
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 1) (cpad-pressed? 0 right l-analog-right))
         (sound-play "generic-beep")
         (set! (-> *progress-state* graphic-options-aspect-ratio) 'aspect16x9)
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 2)
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 2) (cpad-pressed? 0 right l-analog-right))
         (when (-> *progress-state* graphic-options-progressive-scan)
           (sound-play "generic-beep")
           (set! (-> *progress-state* graphic-options-progressive-scan) #f)
           (set! (-> *setting-control* user-default use-progressive-scan) #f)
           )
         )
-       ((and (= (-> *progress-state* graphic-options-item-selected) 3)
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* graphic-options-item-selected) 3) (cpad-pressed? 0 right l-analog-right))
         (sound-play "generic-beep")
         (if (!= (-> *progress-state* video-mode-choice) 'ntsc)
             (set! (-> *progress-state* video-mode-choice) 'ntsc)
             )
         )
-       ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+       ((cpad-pressed? 0 confirm)
         (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
         (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
         (sound-play "generic-beep")
@@ -3839,18 +3791,18 @@
         )
     (when arg2
       (cond
-        ((logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 left l-analog-left)
          (when (not (-> v1-1 0))
            (set! gp-0 #t)
            (set! (-> v1-1 0) #t)
            )
          )
-        ((logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 right l-analog-right)
          (set! gp-0 (-> v1-1 0))
          (set! (-> v1-1 0) #f)
          (format #t "HL ~A~%" (-> v1-1 0))
          )
-        ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+        ((cpad-pressed? 0 confirm)
          (cond
            ((and (-> v1-1 0) (= (-> arg0 name) (text-id progress-root-restart-mission)))
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
@@ -3883,8 +3835,8 @@
      (set! (-> arg0 selected-option) #f)
      (set! (-> arg0 option-index) (-> *progress-state* qr-options-item-selected))
      (cond
-       ((or (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-            (and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-abs 0))
+       ((or (cpad-pressed? 0 down l-analog-down)
+            (and (cpad-hold? 0 down l-analog-down)
                  (>= (- (current-time) (the-as int (-> *progress-state* qr-options-last-move))) (seconds 0.5))
                  )
             )
@@ -3904,8 +3856,8 @@
             )
           )
         )
-       ((or (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-            (and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-abs 0))
+       ((or (cpad-pressed? 0 up l-analog-up)
+            (and (cpad-hold? 0 up l-analog-up)
                  (>= (- (current-time) (the-as int (-> *progress-state* qr-options-last-move))) (seconds 0.5))
                  )
             )
@@ -3923,7 +3875,7 @@
             )
           )
         )
-       ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+       ((cpad-pressed? 0 confirm)
         (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
         (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
         (set! (-> *progress-state* qr-options-last-move) (the-as uint (current-time)))
@@ -3960,27 +3912,19 @@
         (set! (-> arg0 selected-option) #f)
         (set! (-> *progress-state* yes-no-choice) #f)
         )
-       ((and (zero? (-> *progress-state* qr-options-item-selected))
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (zero? (-> *progress-state* qr-options-item-selected)) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (update-restart-quit obj arg0 #t)
         )
-       ((and (zero? (-> *progress-state* qr-options-item-selected))
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (zero? (-> *progress-state* qr-options-item-selected)) (cpad-pressed? 0 right l-analog-right))
         (sound-play "generic-beep")
         (update-restart-quit obj arg0 #t)
         )
-       ((and (= (-> *progress-state* qr-options-item-selected) 1)
-             (logtest? (pad-buttons left l-analog-left) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* qr-options-item-selected) 1) (cpad-pressed? 0 left l-analog-left))
         (sound-play "generic-beep")
         (update-restart-quit obj arg0 #t)
         )
-       ((and (= (-> *progress-state* qr-options-item-selected) 1)
-             (logtest? (pad-buttons right l-analog-right) (-> *cpad-list* cpads 0 button0-rel 0))
-             )
+       ((and (= (-> *progress-state* qr-options-item-selected) 1) (cpad-pressed? 0 right l-analog-right))
         (sound-play "generic-beep")
         (update-restart-quit obj arg0 #t)
         )
@@ -3991,7 +3935,7 @@
         (set! (-> arg0 selected-option) #f)
         (set! (-> *progress-state* yes-no-choice) #f)
         )
-       ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+       ((cpad-pressed? 0 confirm)
         (sound-play "generic-beep")
         (when (zero? (-> *progress-state* qr-options-item-selected))
           (set! (-> arg0 selected-option) #t)
@@ -4011,7 +3955,3 @@
     )
   0
   )
-
-
-
-
diff --git a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc
index 59e7102917..06e7183424 100644
--- a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc
@@ -3589,7 +3589,7 @@ This commonly includes things such as:
               (+! gp-0 1)
               )
             )
-          (when (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
+          (when (cpad-pressed? 0 down l-analog-down)
             (+! s5-0 1)
             (cond
               ((< (+ gp-0 -1) s5-0)
@@ -3601,7 +3601,7 @@ This commonly includes things such as:
                 )
               )
             )
-          (when (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
+          (when (cpad-pressed? 0 up l-analog-up)
             (+! s5-0 -1)
             (cond
               ((< s5-0 0)
@@ -3895,7 +3895,7 @@ This commonly includes things such as:
       (let ((gp-0 (add-process *gui-control* self (gui-channel bbush) (gui-action play) "cityv174" -99.0 0)))
         (while (nonzero? (get-status *gui-control* gp-0))
           (suspend)
-          (when (or (cpad-pressed? 0 triangle) (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)))
+          (when (or (cpad-pressed? 0 triangle) (cpad-pressed? 0 confirm))
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle circle x confirm))
             (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle circle x confirm))
             (set-action!
@@ -3915,7 +3915,7 @@ This commonly includes things such as:
         )
       (when (not s5-0)
         (until #f
-          (when (or (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)) (cpad-pressed? 0 triangle))
+          (when (or (cpad-pressed? 0 confirm) (cpad-pressed? 0 triangle))
             (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons triangle circle x confirm))
             (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons triangle circle x confirm))
             (sound-play "menu-pick")
diff --git a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc
index f86063aecb..e5d8d83d57 100644
--- a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc
+++ b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc
@@ -1519,7 +1519,7 @@
          (draw-message-retry self)
          (when (>= (- (current-time) (-> self state-time)) (seconds 0.5))
            (cond
-             ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+             ((cpad-pressed? 0 confirm)
               (stop-speech self)
               (send-event (ppointer->process (-> self parent)) 'retry-immediately)
               (sleep-code)
@@ -1535,7 +1535,7 @@
         (else
           (draw-message-continue self)
           (when (>= (- (current-time) (-> self state-time)) (seconds 0.5))
-            (when (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+            (when (cpad-pressed? 0 confirm)
               (stop-speech self)
               (send-event (ppointer->process (-> self parent)) 'complete)
               (sleep-code)
@@ -1575,7 +1575,7 @@
       (-> self race-state info)
       (when (>= (- (current-time) (-> self state-time)) (seconds 0.5))
         (cond
-          ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 confirm)
            (stop-speech self)
            (send-event (ppointer->process (-> self parent)) 'retry-immediately)
            (sleep-code)
diff --git a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc
index 44cf34f615..d4291282d3 100644
--- a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc
@@ -532,19 +532,15 @@
     (until #f
       (when (not (paused?))
         (cond
-          ((and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-                (> (-> self selected) 0)
-                )
+          ((and (cpad-pressed? 0 up l-analog-up) (> (-> self selected) 0))
            (seekl! (-> self selected) 0 1)
            (sound-play "dmenu-move")
            )
-          ((and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-                (< (-> self selected) (+ (-> gp-1 length) -1))
-                )
+          ((and (cpad-pressed? 0 down l-analog-down) (< (-> self selected) (+ (-> gp-1 length) -1)))
            (seekl! (-> self selected) (+ (-> gp-1 length) -1) 1)
            (sound-play "dmenu-move")
            )
-          ((logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((cpad-pressed? 0 confirm)
            (sound-play "dmenu-pick")
            (return (the-as object (-> self selected)))
            )
diff --git a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc
index ba86794430..7e8f15f368 100644
--- a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc
@@ -436,23 +436,22 @@ This commonly includes things such as:
     )
   :trans (behavior ()
     (when (and (zero? (-> self start-time))
-               (or (and (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
-                        (let ((a1-0 (new 'stack-no-clear 'event-message-block)))
-                          (set! (-> a1-0 from) (process->ppointer self))
-                          (set! (-> a1-0 num-params) 1)
-                          (set! (-> a1-0 message) 'player-in-open-area?)
-                          (set! (-> a1-0 param 0) (the-as uint #f))
-                          (let ((t9-0 send-event-function)
-                                (v1-11 (-> self actor-group 1 data 0 actor))
-                                )
-                            (t9-0
-                              (if v1-11
-                                  (-> v1-11 extra process)
-                                  )
-                              a1-0
-                              )
-                            )
-                          )
+               (or (and (cpad-pressed? 0 confirm) (let ((a1-0 (new 'stack-no-clear 'event-message-block)))
+                                                    (set! (-> a1-0 from) (process->ppointer self))
+                                                    (set! (-> a1-0 num-params) 1)
+                                                    (set! (-> a1-0 message) 'player-in-open-area?)
+                                                    (set! (-> a1-0 param 0) (the-as uint #f))
+                                                    (let ((t9-0 send-event-function)
+                                                          (v1-11 (-> self actor-group 1 data 0 actor))
+                                                          )
+                                                      (t9-0
+                                                        (if v1-11
+                                                            (-> v1-11 extra process)
+                                                            )
+                                                        a1-0
+                                                        )
+                                                      )
+                                                    )
                         )
                    (let ((a1-1 (new 'stack-no-clear 'event-message-block)))
                      (set! (-> a1-1 from) (process->ppointer self))
@@ -595,7 +594,7 @@ This commonly includes things such as:
     (none)
     )
   :trans (behavior ()
-    (when (and (zero? (-> self start-time)) (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)))
+    (when (and (zero? (-> self start-time)) (cpad-pressed? 0 confirm))
       (let ((a1-3 (new 'stack-no-clear 'event-message-block)))
         (set! (-> a1-3 from) (process->ppointer self))
         (set! (-> a1-3 num-params) 1)
@@ -721,7 +720,7 @@ This commonly includes things such as:
     (if (task-node-open? (game-task-node city-yellow-gun-training-introduction))
         (go-virtual yellow-training-intro)
         )
-    (when (and (zero? (-> self start-time)) (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0)))
+    (when (and (zero? (-> self start-time)) (cpad-pressed? 0 confirm))
       (let ((a1-3 (new 'stack-no-clear 'event-message-block)))
         (set! (-> a1-3 from) (process->ppointer self))
         (set! (-> a1-3 num-params) 1)
diff --git a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc
index 1c75db60c1..50806ff779 100644
--- a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc
+++ b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc
@@ -511,7 +511,7 @@
         (s4-0 #f)
         )
     (while (not (or (>= (- (current-time) s3-0) arg1) (and (>= (- (current-time) s3-0) arg0) s4-0)))
-      (if (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+      (if (cpad-pressed? 0 confirm)
           (set! s4-0 #t)
           )
       (when (cpad-pressed? 0 triangle)
@@ -535,19 +535,15 @@
     (until #f
       (when (not (paused?))
         (cond
-          ((and (logtest? (pad-buttons up l-analog-down) (-> *cpad-list* cpads 0 button0-rel 0))
-                (> (-> self selected) 0)
-                )
+          ((and (cpad-pressed? 0 up l-analog-up) (> (-> self selected) 0))
            (seekl! (-> self selected) 0 1)
            (sound-play "dmenu-move")
            )
-          ((and (logtest? (pad-buttons down l-analog-up) (-> *cpad-list* cpads 0 button0-rel 0))
-                (< (-> self selected) (+ (-> gp-1 length) -1))
-                )
+          ((and (cpad-pressed? 0 down l-analog-down) (< (-> self selected) (+ (-> gp-1 length) -1)))
            (seekl! (-> self selected) (+ (-> gp-1 length) -1) 1)
            (sound-play "dmenu-move")
            )
-          ((or (logtest? (pad-buttons confirm) (-> *cpad-list* cpads 0 button0-rel 0))
+          ((or (cpad-pressed? 0 confirm)
                (and (cpad-pressed? 0 start)
                     (or (not *debug-segment*) (not (logtest? (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons l3))))
                     )