[jak2] adjust progress generic item sizes + add scrolling effect (#3231)

Makes most of the options larger to reduce the amount of dead space and
adds a smooth scrolling effect instead of having "pages".


![imagem](https://github.com/open-goal/jak-project/assets/7569514/fc483dea-226c-44ff-96e0-680e89a6df81)

Button remap menu has no scrolling. Fixes #2984

goal_src/goal-lib.gc

@@ -546,7 +546,6 @@
 (defmacro symbol-member? (sym lst)
   "is sym present in lst? uses or, so it short circuits."
   (with-gensyms (sym-var)
-  (fmt #t "{}" lst)
   `(let ((,sym-var ,sym))
                                                       ;; TODO fix this bug
     (or ,@(apply (lambda (x) `(= ,sym-var (quote ,x))) (second lst))))

goal_src/jak2/engine/math/math.gc

@@ -616,6 +616,11 @@
   `(set! ,place (seekl ,place ,target ,rate))
   )
 
+(defmacro seek-ease! (place target rate min-threshold rate-min)
+  "Macro to use seek-ease in-place. place is the base, and where the result is stored."
+  `(set! ,place (seek-ease ,place ,target ,rate ,min-threshold ,rate-min))
+  )
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;; random vu hardware
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

goal_src/jak2/engine/scene/scene.gc

@@ -1081,7 +1081,8 @@
       (disable *screen-filter*)
       (deactivate self)
       )
-    (when (< (-> self scene-index) (+ (-> self scene-list length) -1))
+    ;; og:preserve-this there is a bug here. scene-index has already been advanced by this point, so we need to backtrack when checking things
+    (when (< (#if PC_PORT (1- (-> self scene-index)) (-> self scene-index)) (+ (-> self scene-list length) -1))
       (set! (-> self scene-index) (+ (-> self scene-list length) -1))
       (scene-player-method-24 self (-> self scene-list (-> self scene-index)) #t)
       )

goal_src/jak2/pc/progress/progress-generic-draw-pc.gc

@@ -1,6 +1,21 @@
 ;;-*-Lisp-*-
 (in-package goal)
 
+
+;;
+
+(defglobalconstant DEBUG_PAGE_ROWS #f)
+
+(defconstant FONT_SIZE_HEADER 0.6) ;; font size for the decoration text
+(defconstant FONT_SIZE_OPTION 0.5) ;; font size for regular options
+(defconstant FONT_SIZE_OPTION_EXTRA 0.35) ;; font size for option sub-text
+(defconstant HIGHLIGHT_SIZE 18) ;; default highlight size for options
+(defconstant HIGHLIGHT_SIZE_LARGE 33)
+
+
+;;
+
+
 (defun draw-page-border ((hud-bounds hud-box) (alpha float))
   (let ((x-pos 70)
         (y-pos 112)
@@ -58,13 +73,13 @@
 
 (defun draw-page-header ((font-ctx font-context) (text text-id))
   (let ((x-pos 70)
-        (y-pos 80)
+        (y-pos 82)
         (width 375))
     (when (= (get-aspect-ratio) 'aspect16x9)
       (set! x-pos 79)
       (set! y-pos 55)
       (set! width 356))
-    (set-scale! font-ctx 0.55)
+    (set-scale! font-ctx FONT_SIZE_HEADER)
     (set! (-> font-ctx origin y) (the float y-pos))
     (set-color! font-ctx (font-color progress))
     (print-game-text (lookup-text! *common-text* text #f) font-ctx #f 44 (bucket-id progress)))
@@ -129,9 +144,11 @@
   (none))
 
 (defun-debug draw-generic-page-row-line ((y-coord int))
-  (with-dma-buffer-add-bucket ((buf (-> *display* frames (-> *display* on-screen) global-buf))
-                               (bucket-id debug-no-zbuf2))
-    (draw-sprite2d-xy buf 0 y-coord 512 1 (static-rgba #xff #xff #xff #x40))))
+  (#when DEBUG_PAGE_ROWS
+    (with-dma-buffer-add-bucket ((buf (-> *display* frames (-> *display* on-screen) global-buf))
+                                (bucket-id debug-no-zbuf2))
+      (draw-sprite2d-xy buf 0 y-coord 512 1 (static-rgba #xff #xff #xff #x40))))
+  0)
 
 (defmethod draw-option ((obj menu-generic-scrolling-page) (progress progress) (font-ctx font-context) (arg3 int) (arg4 symbol))
   (when (or (zero? (-> obj mounted?)) (not (-> obj mounted?)))
@@ -155,19 +172,35 @@
     (draw-page-background font-alpha)
     (begin-scissor-scrolling-page hud-bounds)
     (if (= (get-aspect-ratio) 'aspect16x9)
-      (set! (-> font-ctx origin y) (+ 86.0 margin-top-bottom))
-      (set! (-> font-ctx origin y) (+ 112.0 margin-top-bottom)))
+        (set! (-> font-ctx origin y) (+ 86.0 margin-top-bottom))
+        (set! (-> font-ctx origin y) (+ 112.0 margin-top-bottom)))
+    
+    ;; do scrolling. if we notice we need to scroll too much, we just snap immediately instead of smoothly stepping.
+    (cond
+      ((> (-> *progress-pc-generic-store* current-menu-scroll-index) (-> *progress-pc-generic-store* current-menu-hover-index))
+        (if (>= (abs (- (-> *progress-pc-generic-store* current-menu-scroll-index) (the float (-> *progress-pc-generic-store* current-menu-hover-index)))) 2.0)
+            (set! (-> *progress-pc-generic-store* current-menu-scroll-index) (the float (-> *progress-pc-generic-store* current-menu-hover-index)))
+            (seek-ease! (-> *progress-pc-generic-store* current-menu-scroll-index) (the float (-> *progress-pc-generic-store* current-menu-hover-index)) (* 0.125 (-> PP clock time-adjust-ratio)) 0.3 (* 0.00125 (-> PP clock time-adjust-ratio)))))
+      ((< (+ (-> *progress-pc-generic-store* current-menu-scroll-index) (1- max-page-size)) (-> *progress-pc-generic-store* current-menu-hover-index))
+        (if (>= (abs (- (-> *progress-pc-generic-store* current-menu-scroll-index) (the float (- (-> *progress-pc-generic-store* current-menu-hover-index) (1- max-page-size))))) 2.0)
+            (set! (-> *progress-pc-generic-store* current-menu-scroll-index) (the float (- (-> *progress-pc-generic-store* current-menu-hover-index) (1- max-page-size))))
+            (seek-ease! (-> *progress-pc-generic-store* current-menu-scroll-index) (the float (- (-> *progress-pc-generic-store* current-menu-hover-index) (1- max-page-size))) (* 0.125 (-> PP clock time-adjust-ratio)) 0.3 (* 0.00125 (-> PP clock time-adjust-ratio)))))
+      )
+    
     ;; render items
-    (let* ((menu-option-index (max 0 (* (/ (-> *progress-pc-generic-store* current-menu-hover-index) max-page-size) max-page-size)))
-           (end-index (min (-> obj menu-options length) (+ menu-option-index max-page-size))))
-      (while (< menu-option-index end-index)
-        (let ((menu-option (-> obj menu-options menu-option-index)))
+    (let* ((start-index (the int (-> *progress-pc-generic-store* current-menu-scroll-index)))
+            ;; we add 1 because the scroll effect will reveal 1 extra
+           (end-index (min (-> obj menu-options length) (+ start-index max-page-size 1))))
+      ;; scroll adjust
+      (-! (-> font-ctx origin y) (* line-height (abs (- (-> *progress-pc-generic-store* current-menu-scroll-index) start-index))))
+      (while (< start-index end-index)
+        (let ((menu-option (-> obj menu-options start-index)))
           (when (nonzero? menu-option)
             ;; save the y,x position as who knows where it will end up after the component finishes rendering
             (let ((old-y-pos (-> font-ctx origin y))
                   (old-x-pos (-> font-ctx origin x)))
-              (draw-option menu-option progress font-ctx menu-option-index
-                           (= (-> obj selected-option-index) menu-option-index))
+              (draw-option menu-option progress font-ctx start-index
+                           (= (-> obj selected-option-index) start-index))
               ;; move to the next line
               (set! (-> font-ctx origin y) (+ old-y-pos line-height))
               ;; - debugging, draw the dividing lines to make centering new items easier
@@ -175,18 +208,12 @@
               (set! (-> font-ctx origin x) old-x-pos)
               ;; reset the font color
               (set-color! font-ctx (font-color progress)))))
-        (+! menu-option-index 1)))
+        (+! start-index 1)))
     ;; end
     (end-scissor-scrolling-page hud-bounds 1.0)
     (set-flags! font-ctx (font-flags kerning large))
-    (let* ((draw-up-arrow? (and (not (zero? (-> *progress-pc-generic-store* current-menu-hover-index)))
-                                (>= (-> *progress-pc-generic-store* current-menu-hover-index) max-page-size)))
-           (last-page-remainder (mod (-> obj menu-options length) max-page-size))
-           (last-page-starting-index (if (zero? last-page-remainder)
-                                         (- (-> obj menu-options length) max-page-size)
-                                         (- (-> obj menu-options length) last-page-remainder)))
-           (draw-down-arrow? (and (> (-> obj menu-options length) max-page-size)
-                                  (< (-> *progress-pc-generic-store* current-menu-hover-index) last-page-starting-index))))
+    (let ((draw-up-arrow? (< 0 (-> *progress-pc-generic-store* current-menu-hover-index)))
+          (draw-down-arrow? (< (-> *progress-pc-generic-store* current-menu-hover-index) (1- (-> obj menu-options length)))))
       (draw-scrolling-page-up-down-arrows font-ctx draw-up-arrow? draw-down-arrow?))))
   (none))
 
@@ -214,18 +241,18 @@
     (max! alpha 0.0)
     (set! (-> font-ctx alpha) alpha)
     (set-flags! font-ctx (font-flags kerning middle large))
-    (set-scale! font-ctx 0.45)
+    (set-scale! font-ctx FONT_SIZE_OPTION)
     (+! (-> font-ctx origin y) (if (= (get-aspect-ratio) 'aspect4x3) 7.0 5.0))
     (cond
       (selected?
         (set-color! font-ctx (font-color progress-force-selected))
-        (draw-generic-highlight (the int (- (-> font-ctx origin y) 2.0)) 32 alpha)
+        (draw-generic-highlight (the int (- (-> font-ctx origin y) 2.0)) HIGHLIGHT_SIZE_LARGE alpha)
         (print-game-text (lookup-text! *common-text* (-> obj name) #f) font-ctx #f 44 (bucket-id progress))
         (+! (-> font-ctx origin y) line-height)
         (set! *progress-generic-temp-string* (clear *progress-generic-temp-string*))
         (if (-> obj value)
-          (format *progress-generic-temp-string* "~33L~S~35L ~S" (lookup-text! *common-text* (-> obj truthy-text) #f) (lookup-text! *common-text* (-> obj falsey-text) #f))
-          (format *progress-generic-temp-string* "~35L~S ~33L~S~1L" (lookup-text! *common-text* (-> obj truthy-text) #f) (lookup-text! *common-text* (-> obj falsey-text) #f))))
+            (format *progress-generic-temp-string* "~33L~S~35L ~S" (lookup-text! *common-text* (-> obj truthy-text) #f) (lookup-text! *common-text* (-> obj falsey-text) #f))
+            (format *progress-generic-temp-string* "~35L~S ~33L~S~1L" (lookup-text! *common-text* (-> obj truthy-text) #f) (lookup-text! *common-text* (-> obj falsey-text) #f))))
       ;; hover case
       (else
         (cond
@@ -234,10 +261,10 @@
                 ((-> obj should-disable?)))
            (set-color! font-ctx (font-color progress-option-off))
            (when (= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
-            (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) 15 0.5)))
+            (draw-generic-highlight (the int (+ -2.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE (* 0.5 alpha))))
           ((= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
             (set-color! font-ctx (progress-selected 0))
-            (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) 15 alpha))
+            (draw-generic-highlight (the int (+ -2.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE alpha))
           (else
             (set-color! font-ctx (font-color progress))))
         (print-game-text (lookup-text! *common-text* (-> obj name) #f) font-ctx #f 44 (bucket-id progress))
@@ -247,15 +274,15 @@
           (if actual-value
             (format *progress-generic-temp-string* "~1L~S~35L ~S" (lookup-text! *common-text* (-> obj truthy-text) #f) (lookup-text! *common-text* (-> obj falsey-text) #f))
             (format *progress-generic-temp-string* "~35L~S ~1L~S~1L" (lookup-text! *common-text* (-> obj truthy-text) #f) (lookup-text! *common-text* (-> obj falsey-text) #f))))))
-    (set-scale! font-ctx 0.35)
+    (set-scale! font-ctx FONT_SIZE_OPTION_EXTRA)
     (print-game-text *progress-generic-temp-string* font-ctx #f 44 (bucket-id progress)))
   (none))
 
 (defmethod draw-option ((obj menu-generic-carousel-option)
-                                                     (progress progress)
-                                                     (font-ctx font-context)
-                                                     (option-index int)
-                                                     (selected? symbol))
+                        (progress progress)
+                        (font-ctx font-context)
+                        (option-index int)
+                        (selected? symbol))
   (when (not (-> obj mounted?))
     (on-mount! obj))
   (let ((alpha (fmax (* 2.0 (- 0.5 (-> progress menu-transition))) 0.0)))
@@ -267,16 +294,16 @@
     (cond
       (selected?
        (set! (-> font-ctx color) (font-color progress-force-selected))
-       (draw-generic-highlight (the int (- (-> font-ctx origin y) 1.0)) 30 alpha))
+       (draw-generic-highlight (the int (- (-> font-ctx origin y) 2.0)) HIGHLIGHT_SIZE_LARGE alpha))
       ((and (nonzero? (-> obj should-disable?))
             (!= (-> obj should-disable?) #f)
             ((-> obj should-disable?)))
        (set-color! font-ctx (font-color progress-option-off))
        (when (= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
-         (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) 15 0.5)))
+         (draw-generic-highlight (the int (+ -2.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE (* 0.5 alpha))))
       ((= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
        (set! (-> font-ctx color) (progress-selected 0))
-       (draw-generic-highlight (the int (- (-> font-ctx origin y) 1.0)) 16 alpha)))
+       (draw-generic-highlight (the int (- (-> font-ctx origin y) 2.0)) HIGHLIGHT_SIZE alpha)))
     (print-game-text (lookup-text! *common-text* (-> obj name) #f) font-ctx #f 44 (bucket-id progress))
     (+! (-> font-ctx origin y) 18.0)
     (set! (-> font-ctx scale) 0.35)
@@ -299,7 +326,7 @@
     (max! alpha 0.0)
     (set! (-> font-ctx alpha) alpha)
     (set-flags! font-ctx (font-flags kerning middle large))
-    (set-scale! font-ctx 0.45)
+    (set-scale! font-ctx FONT_SIZE_OPTION)
     (+! (-> font-ctx origin y) (if (= (get-aspect-ratio) 'aspect4x3) 14.0 11.0))
     (cond
       ((and (nonzero? (-> option should-disable?))
@@ -307,10 +334,10 @@
             ((-> option should-disable?)))
       (set-color! font-ctx (font-color progress-option-off))
       (when (= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
-        (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) 15 0.5)))
+        (draw-generic-highlight (the int (+ -2.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE (* 0.5 alpha))))
       ((= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
         (set-color! font-ctx (progress-selected 0))
-        (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) 17 alpha))
+        (draw-generic-highlight (the int (+ -2.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE alpha))
       (else
         (set-color! font-ctx (font-color progress))))
     (print-game-text str font-ctx #f 44 (bucket-id progress)))
@@ -334,18 +361,18 @@
        (max! alpha 0.0)
        (set! (-> font-ctx alpha) alpha)
        (set-flags! font-ctx (font-flags kerning middle large))
-       (set-scale! font-ctx 0.45)
+       (set-scale! font-ctx FONT_SIZE_OPTION)
        (+! (-> font-ctx origin y) (if (= (get-aspect-ratio) 'aspect4x3) 7.0 5.0))
        (cond
          (selected?
            (set-color! font-ctx (font-color progress-force-selected))
-           (draw-generic-highlight (the int (- (-> font-ctx origin y) 2.0)) 32 alpha)
+           (draw-generic-highlight (the int (- (-> font-ctx origin y) 2.0)) HIGHLIGHT_SIZE_LARGE alpha)
            (print-game-text (lookup-text! *common-text* (-> obj name) #f) font-ctx #f 44 (bucket-id progress))
            (+! (-> font-ctx origin y) line-height)
            (set! *progress-generic-temp-string* (clear *progress-generic-temp-string*))
            (if (-> obj confirmed?)
-             (format *progress-generic-temp-string* "~33L~S~35L ~S" (lookup-text! *common-text* (text-id progress-yes) #f) (lookup-text! *common-text* (text-id progress-no) #f))
-             (format *progress-generic-temp-string* "~35L~S ~33L~S~1L" (lookup-text! *common-text* (text-id progress-yes) #f) (lookup-text! *common-text* (text-id progress-no) #f))))
+               (format *progress-generic-temp-string* "~33L~S~35L ~S" (lookup-text! *common-text* (text-id progress-yes) #f) (lookup-text! *common-text* (text-id progress-no) #f))
+               (format *progress-generic-temp-string* "~35L~S ~33L~S~1L" (lookup-text! *common-text* (text-id progress-yes) #f) (lookup-text! *common-text* (text-id progress-no) #f))))
          ;; hover case
          (else
            (cond
@@ -354,19 +381,19 @@
                    ((-> obj should-disable?)))
               (set-color! font-ctx (font-color progress-option-off))
               (when (= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
-                (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) 15 0.5)))
+                (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE (* 0.5 alpha))))
              ((= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
                (set-color! font-ctx (progress-selected 0))
-               (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) 15 alpha))
+               (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE alpha))
              (else
                (set-color! font-ctx (font-color progress))))
            (print-game-text (lookup-text! *common-text* (-> obj name) #f) font-ctx #f 44 (bucket-id progress))
            (+! (-> font-ctx origin y) line-height)
            (set! *progress-generic-temp-string* (clear *progress-generic-temp-string*))
            (if (-> obj confirmed?)
-             (format *progress-generic-temp-string* "~1L~S~35L ~S" (lookup-text! *common-text* (text-id progress-yes) #f) (lookup-text! *common-text* (text-id progress-no) #f))
-             (format *progress-generic-temp-string* "~35L~S ~1L~S~1L" (lookup-text! *common-text* (text-id progress-yes) #f) (lookup-text! *common-text* (text-id progress-no) #f)))))
-       (set-scale! font-ctx 0.35)
+               (format *progress-generic-temp-string* "~1L~S~35L ~S" (lookup-text! *common-text* (text-id progress-yes) #f) (lookup-text! *common-text* (text-id progress-no) #f))
+               (format *progress-generic-temp-string* "~35L~S ~1L~S~1L" (lookup-text! *common-text* (text-id progress-yes) #f) (lookup-text! *common-text* (text-id progress-no) #f)))))
+       (set-scale! font-ctx FONT_SIZE_OPTION_EXTRA)
        (print-game-text *progress-generic-temp-string* font-ctx #f 44 (bucket-id progress))))
     (else
      (draw-generic-simple-string-option obj progress font-ctx option-index (lookup-text! *common-text* (-> obj name) #f))))
@@ -378,7 +405,7 @@
   (let ((alpha (max 0.0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
         (slider-value (if selected? (-> obj value) (call-get-value-fn obj))))
     (set! (-> font-ctx alpha) alpha)
-    (set-scale! font-ctx 0.45)
+    (set-scale! font-ctx FONT_SIZE_OPTION)
     (+! (-> font-ctx origin y) 20.0)
     (case (get-aspect-ratio)
       (('aspect4x3))
@@ -386,10 +413,10 @@
     (set-flags! font-ctx (font-flags kerning middle large))
     (cond
       (selected?
-        (set-scale! font-ctx 0.35)
+        (set-scale! font-ctx FONT_SIZE_OPTION_EXTRA)
         (+! (-> font-ctx origin y) (if (= (get-aspect-ratio) 'aspect4x3) -15.0 -15.0))
         (set-color! font-ctx (font-color progress-force-selected))
-        (draw-generic-highlight (the int (+ -2.0 (-> font-ctx origin y))) 35 alpha)
+        (draw-generic-highlight (the int (+ -2.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE_LARGE alpha)
         (if (= (-> obj show-decimal?) #t)
           (print-game-text (string-format "~S: ~,,2f" (lookup-text! *common-text* (-> obj name) #f) slider-value) font-ctx #f 44 (bucket-id progress))
           (print-game-text (string-format "~S: ~D" (lookup-text! *common-text* (-> obj name) #f) slider-value) font-ctx #f 44 (bucket-id progress)))
@@ -446,10 +473,10 @@
                 ((-> obj should-disable?)))
           (set-color! font-ctx (font-color progress-option-off))
           (when (= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
-            (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) 15 0.5)))
+            (draw-generic-highlight (the int (+ -1.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE (* 0.5 alpha))))
           ((= option-index (-> *progress-pc-generic-store* current-menu-hover-index))
             (set-color! font-ctx (progress-selected 0))
-            (draw-generic-highlight (the int (+ -2.0 (-> font-ctx origin y))) 18 alpha))
+            (draw-generic-highlight (the int (+ -2.0 (-> font-ctx origin y))) HIGHLIGHT_SIZE alpha))
           (else
             (set-color! font-ctx (font-color progress))))
         (if (= (-> obj show-decimal?) #t)

goal_src/jak2/pc/progress/progress-generic-h-pc.gc

@@ -10,7 +10,8 @@
    ;; generic function to potentially run some setup code when the entry is loaded
    (on-load (function none))
    ;; so we can restore back to the same menu position
-   (hover-index int32)
+   (hover-index   int32)
+   (scroll-index  int32)
    ;; symbol used normally for progress stuff
    (progress-id symbol))
   (:methods
@@ -20,6 +21,7 @@
   "Isolated type for keeping track of some global state, as re-using the normal [[*progress*]] object
    can lead to unexpected behaviour -- they change some values all over the place"
   ((current-menu-hover-index int32)
+   (current-menu-scroll-index float)
    (clear-screen? symbol)
    (keybind-select-time time-frame)
    (history-stack generic-progress-state-entry 10 :inline)
@@ -254,4 +256,5 @@
           (set! ,field val)
           (commit-to-file *pc-settings*))))
 
-(define *progress-generic-temp-string* (new 'global 'string 512 (the string #f)))
+(define *progress-generic-temp-string* (new 'global 'string 512 (the string #f)))
+

goal_src/jak2/pc/progress/progress-generic-pc.gc

@@ -59,11 +59,13 @@
     (if (has-history? this)
       (let ((stack-entry (-> this history-stack (-> this history-stack-index))))
         (set! (-> stack-entry hover-index) (-> this current-menu-hover-index))
+        (set! (-> stack-entry scroll-index) (the int (-> this current-menu-scroll-index)))
         (set! (-> stack-entry progress-id) (-> progress current)))
       (let ((stack-entry (-> this history-stack (-> this history-stack-index))))
         (set! (-> stack-entry ref) (-> progress current-options))
         (set! (-> stack-entry on-load) on-load)
         (set! (-> stack-entry hover-index) (-> this current-menu-hover-index))
+        (set! (-> stack-entry scroll-index) (the int (-> this current-menu-scroll-index)))
         (set! (-> stack-entry progress-id) (-> progress current))))
     ;; push the target history entry now
     (inc! (-> this history-stack-index))
@@ -95,6 +97,7 @@
     (set! (-> this history-stack-index) 0)
     (set! (-> this clear-screen?) #f)
     (set! (-> this current-menu-hover-index) 0)
+    (set! (-> this current-menu-scroll-index) 0.0)
     (let ((stack-entry (-> this history-stack (-> this history-stack-index))))
       (set! (-> stack-entry hover-index) 0)
       (set! (-> stack-entry ref) #f)
@@ -106,6 +109,7 @@
   (set! (-> this history-stack-index) 0)
   (set! (-> this clear-screen?) #t)
   (set! (-> this current-menu-hover-index) 0)
+  (set! (-> this current-menu-scroll-index) 0.0)
   (none))
 
 (defmethod on-mount! ((this menu-generic-option))
@@ -265,19 +269,19 @@
     (if (= (-> this selected-option-index) -1)
       (cond
         ((or (cpad-pressed? 0 down l-analog-down)
-            (and (cpad-hold? 0 down l-analog-down)
-                  (>= (- (current-time) (the-as int (-> this last-move))) (seconds 0.5))))
-        (set! (-> this last-move) (current-time))
-        (cond
-          ((< (-> *progress-pc-generic-store* current-menu-hover-index) (dec (-> this menu-options length)))
-            (+! (-> *progress-pc-generic-store* current-menu-hover-index) 1)
-            (sound-play "roll-over"))
-          (else
-            (set! (-> *progress-pc-generic-store* current-menu-hover-index) 0)
-            (sound-play "roll-over"))))
+             (and (cpad-hold? 0 down l-analog-down)
+                  (>= (- (current-time) (the-as int (-> this last-move))) (seconds 0.2))))
+          (set! (-> this last-move) (current-time))
+          (cond
+            ((< (-> *progress-pc-generic-store* current-menu-hover-index) (dec (-> this menu-options length)))
+              (+! (-> *progress-pc-generic-store* current-menu-hover-index) 1)
+              (sound-play "roll-over"))
+            (else
+              (set! (-> *progress-pc-generic-store* current-menu-hover-index) 0)
+              (sound-play "roll-over"))))
         ((or (cpad-pressed? 0 up l-analog-up)
-              (and (cpad-hold? 0 up l-analog-up)
-                  (>= (- (current-time) (the-as int (-> this last-move))) (seconds 0.5))))
+             (and (cpad-hold? 0 up l-analog-up)
+                  (>= (- (current-time) (the-as int (-> this last-move))) (seconds 0.2))))
           (set! (-> this last-move) (current-time))
           (+! (-> *progress-pc-generic-store* current-menu-hover-index) -1)
           (sound-play "roll-over")
@@ -292,8 +296,7 @@
                        (!= (-> (the-as menu-generic-option menu-option) should-disable?) #f)
                        ((-> (the-as menu-generic-option menu-option) should-disable?)))
                (sound-play "roll-over")
-               (logclear! (-> *cpad-list* cpads 0 button0-abs 0) (pad-buttons confirm))
-               (logclear! (-> *cpad-list* cpads 0 button0-rel 0) (pad-buttons confirm))
+               (cpad-clear! 0 confirm)
                (return 0))
              ;; ignore confirm if it's a link
              (cond
@@ -306,7 +309,7 @@
         ;; we are in a sub-page, time to go back
         (when (has-history? *progress-pc-generic-store*)
           (back! *progress-pc-generic-store* progress)
-          (sound-play "score-slide"))))
+          (sound-play "generic-beep"))))
       ;; menu option already selected
       (cond
         ((cpad-pressed? 0 confirm)
@@ -363,7 +366,7 @@
   (when (and selected? (cpad-pressed? 0 confirm))
     (navigate! *progress-pc-generic-store* progress (-> this target) (-> this on-load))
     (set! (-> progress selected-option) #f)
-    (sound-play "score-slide"))
+    (sound-play "generic-beep"))
   0)
 
 (defmethod respond-progress ((this menu-generic-confirm-option) (progress progress) (selected? symbol))
@@ -414,7 +417,7 @@
     (cond
       ((or (cpad-pressed? 0 down l-analog-down)
            (and (cpad-hold? 0 down l-analog-down)
-                (>= (- (current-time) (the-as int (-> this last-move))) (seconds 0.5))))
+                (>= (- (current-time) (the-as int (-> this last-move))) (seconds 0.2))))
        (set! (-> this last-move) (current-time))
        (cond
          ((< (-> *progress-pc-generic-store* current-menu-hover-index) (dec (-> this entries length)))
@@ -425,7 +428,7 @@
            (sound-play "roll-over"))))
       ((or (cpad-pressed? 0 up l-analog-up)
             (and (cpad-hold? 0 up l-analog-up)
-                 (>= (- (current-time) (the-as int (-> this last-move))) (seconds 0.5))))
+                 (>= (- (current-time) (the-as int (-> this last-move))) (seconds 0.2))))
        (set! (-> this last-move) (current-time))
        (+! (-> *progress-pc-generic-store* current-menu-hover-index) -1)
        (sound-play "roll-over")

goal_src/jak2/pc/progress/progress-pc.gc

@@ -357,6 +357,7 @@
        ;; restore state from the history entry
        (set! (-> *progress-pc-generic-store* clear-screen?) #f)
        (set! (-> *progress-pc-generic-store* current-menu-hover-index) (-> curr-history-entry hover-index))
+       (set! (-> *progress-pc-generic-store* current-menu-scroll-index) (the float (-> curr-history-entry scroll-index)))
        (if (!= (-> curr-history-entry progress-id) 'generic-menu)
         ;; do a recursive call to hit the relevant case in this switch
         (set-menu-options obj (-> curr-history-entry progress-id))

goal_src/jak2/pc/progress/progress-static-pc.gc

@@ -77,7 +77,8 @@ This gives us more freedom to write code how we want.
       (progress-new-generic-link-to-keybind-details-page (text-id progress-reassign-binds-keyboard)
           :should-disable? (lambda () (not (-> *pc-settings* keyboard-enabled?)))
           :device-type keyboard
-          :entries (l-analog-up l-analog-down l-analog-left l-analog-right r-analog-up r-analog-down r-analog-left r-analog-left r-analog-right select l3 r3 start dpad-up dpad-right dpad-down dpad-left l2 r2 l1 r1 triangle circle cross square)
+          :entries (l-analog-up l-analog-down l-analog-left l-analog-right r-analog-up r-analog-down r-analog-left r-analog-left r-analog-right
+                    select l3 r3 start dpad-up dpad-right dpad-down dpad-left l2 r2 l1 r1 triangle circle cross square)
           :confirm ((text-id progress-restore-defaults) (lambda () (pc-reset-bindings-to-defaults! 0 1))))
       (progress-new-generic-link-to-keybind-details-page (text-id progress-reassign-binds-mouse)
           :should-disable? (lambda () (not (-> *pc-settings* mouse-enabled?)))