mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-07 11:36:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

small cleanup to progress-draw.gc and set-font-color (#2653)

Browse Source
This commit is contained in:
ManDude
2023-05-15 20:45:28 +01:00
committed by GitHub
parent e30ecb361f
commit cf048a9e37
65 changed files with 1622 additions and 1498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+118 -132
View File
@@ -2,8 +2,9 @@
(in-package goal)
;; definition for function progress-selected
;; WARN: Return type mismatch int vs font-color.
(defbehavior progress-selected progress ((arg0 int))
(let ((gp-0 33))
(let ((color (font-color #7ffcfc)))
(cond
((< 4 (the-as int (logand (-> self clock integral-frame-counter) 7)))
(set! (-> *progress-state* color-flash-counter) 1)
@@ -15,21 +16,44 @@
)
(cond
((zero? (-> *progress-state* color-flash-counter))
(set-font-color gp-0 0 64 128 128)
(set-font-color gp-0 1 64 128 128)
(set-font-color
(the-as font-color color)
0
(new 'static 'rgba :r #x40)
(new 'static 'rgba :r #x80)
(new 'static 'rgba :r #x80)
)
(set-font-color
(the-as font-color color)
1
(new 'static 'rgba :r #x40)
(new 'static 'rgba :r #x80)
(new 'static 'rgba :r #x80)
)
)
(else
(set-font-color gp-0 0 255 255 255)
(set-font-color gp-0 1 255 255 255)
(set-font-color
(the-as font-color color)
0
(new 'static 'rgba :r #xff)
(new 'static 'rgba :r #xff)
(new 'static 'rgba :r #xff)
)
(set-font-color
(the-as font-color color)
1
(new 'static 'rgba :r #xff)
(new 'static 'rgba :r #xff)
(new 'static 'rgba :r #xff)
)
)
)
gp-0
(the-as font-color color)
)
)
;; definition for function draw-percent-bar
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-8 8) 0) at op 39
(defun draw-percent-bar ((arg0 int) (arg1 int) (arg2 float) (arg3 rgba))
(with-dma-buffer-add-bucket ((s2-0 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id particles)
@@ -42,7 +66,6 @@
)
;; definition for function draw-highlight
;; ERROR: Failed store: (s.w! (+ v1-6 8) 0) at op 45
(defun draw-highlight ((arg0 int) (arg1 int) (arg2 float))
(let ((s3-0 (if (= (get-aspect-ratio) 'aspect4x3)
70
@@ -128,7 +151,7 @@
(set! (-> a0-1 flags) (font-flags kerning large))
)
(let ((s2-0 arg1))
(set! (-> s2-0 color) (the-as font-color (progress-selected 200)))
(set! (-> s2-0 color) (progress-selected 200))
)
(let ((v1-15 arg1))
(set! (-> v1-15 scale) 0.6)
@@ -256,8 +279,6 @@
)
;; definition for function begin-scissor
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-23 8) 0) at op 71
(defun begin-scissor ((arg0 hud-box) (arg1 progress))
(cond
((or (= (-> arg1 current) 'bigmap) (= (-> arg1 next) 'bigmap))
@@ -285,12 +306,9 @@
(setup-scissor arg0 s4-0)
)
0
(none)
)
;; definition for function end-scissor
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-7 8) 0) at op 17
(defun end-scissor ((arg0 hud-box) (arg1 float))
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id progress)
@@ -298,12 +316,9 @@
(restore-scissor arg0 s5-0)
)
0
(none)
)
;; definition for function begin-scissor-secret
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-17 8) 0) at op 50
(defun begin-scissor-secret ((arg0 hud-box) (arg1 progress))
(cond
((= (get-aspect-ratio) 'aspect16x9)
@@ -325,12 +340,9 @@
(setup-scissor arg0 s4-0)
)
0
(none)
)
;; definition for function end-scissor-secret
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-7 8) 0) at op 17
(defun end-scissor-secret ((arg0 hud-box) (arg1 float))
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id progress)
@@ -338,13 +350,10 @@
(restore-scissor arg0 s5-0)
)
0
(none)
)
;; definition for function begin-scissor-missions
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-17 8) 0) at op 50
(defun begin-scissor-missions ((arg0 hud-box) (arg1 float))
(defun begin-scissor-missions ((arg0 hud-box))
(cond
((= (get-aspect-ratio) 'aspect16x9)
(set! (-> arg0 min x) 79.0)
@@ -365,12 +374,9 @@
(setup-scissor arg0 s4-0)
)
0
(none)
)
;; definition for function end-scissor-missions
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-7 8) 0) at op 17
(defun end-scissor-missions ((arg0 hud-box) (arg1 float))
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id progress)
@@ -378,12 +384,9 @@
(restore-scissor arg0 s5-0)
)
0
(none)
)
;; definition for function begin-scissor-scene
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-17 8) 0) at op 50
(defun begin-scissor-scene ((arg0 hud-box))
(cond
((= (get-aspect-ratio) 'aspect16x9)
@@ -405,12 +408,9 @@
(setup-scissor arg0 s4-0)
)
0
(none)
)
;; definition for function end-scissor-scene
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-7 8) 0) at op 17
(defun end-scissor-scene ((arg0 hud-box) (arg1 float))
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id progress)
@@ -418,12 +418,9 @@
(restore-scissor arg0 s5-0)
)
0
(none)
)
;; definition for function begin-scissor-level
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-17 8) 0) at op 50
(defun begin-scissor-level ((arg0 hud-box))
(cond
((= (get-aspect-ratio) 'aspect16x9)
@@ -445,12 +442,9 @@
(setup-scissor arg0 s4-0)
)
0
(none)
)
;; definition for function end-scissor-level
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-7 8) 0) at op 17
(defun end-scissor-level ((arg0 hud-box) (arg1 float))
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id progress)
@@ -458,7 +452,6 @@
(restore-scissor arg0 s5-0)
)
0
(none)
)
;; definition for function print-language-name
@@ -473,7 +466,12 @@
(+! (-> arg1 origin x) (the float s5-0))
(let ((f30-0 (- 1.0 (* 0.0033333334 (the float arg2)))))
(set! (-> arg1 alpha) f30-0)
(print-game-text-scaled (lookup-text! *common-text* (-> *language-name-remap* arg0) #f) f30-0 arg1 320)
(print-game-text-scaled
(lookup-text! *common-text* (-> *language-name-remap* arg0) #f)
f30-0
arg1
(bucket-id progress)
)
)
(set! (-> arg1 origin x) (- (-> arg1 origin x) (the float s5-0)))
)
@@ -635,7 +633,7 @@
;; definition for method 10 of type menu-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-option ((obj menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-option ((obj menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
0
(none)
)
@@ -643,7 +641,7 @@
;; definition for method 10 of type menu-on-off-option
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-on-off-option ((obj menu-on-off-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-on-off-option ((obj menu-on-off-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-8 string) (sv-16 string))
(let ((s3-0 (if arg3
(&-> *progress-state* on-off-choice)
@@ -709,7 +707,7 @@
;; definition for method 10 of type menu-yes-no-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-yes-no-option ((obj menu-yes-no-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-yes-no-option ((obj menu-yes-no-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-8 string))
(let ((s3-0 (&-> *progress-state* yes-no-choice)))
(set! a0-8
@@ -757,7 +755,7 @@
;; definition for method 10 of type menu-video-mode-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-video-mode-option ((obj menu-video-mode-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-video-mode-option ((obj menu-video-mode-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((s3-0 (&-> *progress-state* video-mode-choice))
(f28-0 (* 2.0 (- 0.5 (-> arg0 menu-transition))))
(f30-0 (-> arg1 origin y))
@@ -818,7 +816,7 @@
(cond
((= (-> *progress-state* graphic-options-item-selected) 3)
(let ((s2-4 arg1))
(set! (-> s2-4 color) (the-as font-color (progress-selected 0)))
(set! (-> s2-4 color) (progress-selected 0))
)
(draw-highlight (the int (+ -9.0 (-> arg1 origin y))) 22 f28-0)
)
@@ -869,7 +867,7 @@
;; definition for method 10 of type menu-unlocked-menu-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-unlocked-menu-option ((obj menu-unlocked-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-unlocked-menu-option ((obj menu-unlocked-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((s5-0 (memcard-unlocked-secrets? #t))
(f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition))))
)
@@ -1052,7 +1050,7 @@
;; definition for method 10 of type menu-main-menu-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-main-menu-option ((obj menu-main-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-main-menu-option ((obj menu-main-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(-> arg1 flags)
(when (and (= (-> arg0 menu-transition) 0.0) (and (= (-> arg0 ring-angle) (-> arg0 ring-want-angle))
(nonzero? (-> obj name))
@@ -1305,7 +1303,6 @@
)
;; definition for function draw-savegame-box
;; ERROR: Failed store: (s.w! (+ v1-7 8) 0) at op 26
(defun draw-savegame-box ((arg0 menu-option) (arg1 float) (arg2 float) (arg3 float) (arg4 float))
(set! (-> arg0 box 0 min x) arg1)
(set! (-> arg0 box 0 max x) arg2)
@@ -1580,7 +1577,6 @@
;; definition for function draw-decoration
;; INFO: Used lq/sq
;; ERROR: Failed store: (s.w! (+ v1-41 8) 0) at op 177
(defun draw-decoration ((arg0 menu-option) (arg1 font-context) (arg2 float) (arg3 int) (arg4 symbol) (arg5 float))
(local-vars
(sv-16 symbol)
@@ -1694,7 +1690,6 @@
;; definition for function draw-missions-decoration
;; INFO: Used lq/sq
;; ERROR: Failed store: (s.w! (+ v1-28 8) 0) at op 138
(defun draw-missions-decoration ((arg0 menu-missions-option) (arg1 font-context) (arg2 float) (arg3 text-id))
(local-vars
(sv-16 int)
@@ -1770,7 +1765,6 @@
;; definition for function draw-sound-options-decoration
;; INFO: Used lq/sq
;; ERROR: Failed store: (s.w! (+ v1-34 8) 0) at op 152
(defun draw-sound-options-decoration ((arg0 menu-slider-option) (arg1 font-context) (arg2 float) (arg3 symbol) (arg4 text-id))
(local-vars
(sv-16 font-context)
@@ -1860,7 +1854,6 @@
;; definition for function draw-decoration-secrets
;; INFO: Used lq/sq
;; ERROR: Failed store: (s.w! (+ v1-30 8) 0) at op 140
(defun draw-decoration-secrets ((arg0 menu-option) (arg1 font-context) (arg2 float) (arg3 text-id))
(local-vars
(sv-16 int)
@@ -1938,7 +1931,6 @@
;; definition for function draw-decoration-load-save
;; INFO: Used lq/sq
;; ERROR: Failed store: (s.w! (+ v1-45 8) 0) at op 174
(defun draw-decoration-load-save ((arg0 menu-option) (arg1 font-context) (arg2 float) (arg3 int))
(local-vars
(sv-16 int)
@@ -2129,8 +2121,7 @@
;; WARN: Stack slot offset 36 signed mismatch
;; WARN: Stack slot offset 16 signed mismatch
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-95 8) 0) at op 334
(defmethod menu-option-method-10 menu-memcard-slot-option ((obj menu-memcard-slot-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-memcard-slot-option ((obj menu-memcard-slot-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(v0-74 pointer)
(sv-16 float)
@@ -2187,7 +2178,7 @@
(else
(let ((s2-3 arg1))
(set! (-> s2-3 color) (if (= arg2 sv-20)
(the-as font-color (progress-selected 0))
(the-as font-color (the-as int (progress-selected 0)))
(font-color #7efbfb)
)
)
@@ -2568,7 +2559,7 @@
;; definition for method 10 of type menu-loading-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-loading-option ((obj menu-loading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-loading-option ((obj menu-loading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(with-pp
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
@@ -2576,7 +2567,7 @@
(set! (-> v1-3 scale) 0.55)
)
(let ((s4-0 arg1))
(set! (-> s4-0 color) (the-as font-color (progress-selected 0)))
(set! (-> s4-0 color) (progress-selected 0))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2627,7 +2618,7 @@
;; definition for method 10 of type menu-insufficient-space-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-insufficient-space-option ((obj menu-insufficient-space-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-insufficient-space-option ((obj menu-insufficient-space-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(when (!= (-> arg0 current) 'none)
(let ((v1-3 arg1))
@@ -2693,7 +2684,7 @@
)
(set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y)))
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-2 color) (progress-selected 0))
)
(draw-highlight (the int (+ 30.0 (-> arg1 origin y))) 24 (-> arg1 alpha))
(print-game-text
@@ -2706,7 +2697,7 @@
)
(else
(let ((s4-2 arg1))
(set! (-> s4-2 color) (the-as font-color (progress-selected 0)))
(set! (-> s4-2 color) (progress-selected 0))
)
(set! (-> arg1 origin y) (+ 20.0 (-> arg1 origin y)))
(draw-highlight (the int (+ 30.0 (-> arg1 origin y))) 24 (-> arg1 alpha))
@@ -2720,7 +2711,7 @@
;; definition for method 10 of type menu-secrets-insufficient-space-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-secrets-insufficient-space-option ((obj menu-secrets-insufficient-space-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-secrets-insufficient-space-option ((obj menu-secrets-insufficient-space-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -2751,7 +2742,7 @@
(set! (-> v1-13 height) (the float 30))
)
(let ((s5-1 arg1))
(set! (-> s5-1 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-1 color) (progress-selected 0))
)
(draw-highlight (the int (-> arg1 origin y)) 24 (-> arg1 alpha))
(print-game-text
@@ -2767,7 +2758,7 @@
;; definition for method 10 of type menu-insert-card-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-insert-card-option ((obj menu-insert-card-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-insert-card-option ((obj menu-insert-card-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -2799,7 +2790,7 @@
(set! (-> v1-10 height) (the float 60))
)
(let ((s5-1 arg1))
(set! (-> s5-1 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-1 color) (progress-selected 0))
)
(draw-highlight (the int (+ 17.0 (-> arg1 origin y))) 24 (-> arg1 alpha))
(print-game-text
@@ -2815,7 +2806,7 @@
;; definition for method 10 of type menu-error-loading-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-error-loading-option ((obj menu-error-loading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-error-loading-option ((obj menu-error-loading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -2868,7 +2859,7 @@
(set! (-> v1-19 height) (the float 45))
)
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-2 color) (progress-selected 0))
)
(draw-highlight (the int (+ 9.0 (-> arg1 origin y))) 24 (-> arg1 alpha))
(print-game-text
@@ -2884,7 +2875,7 @@
;; definition for method 10 of type menu-error-auto-saving-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-error-auto-saving-option ((obj menu-error-auto-saving-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-error-auto-saving-option ((obj menu-error-auto-saving-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -2945,7 +2936,7 @@
(set! (-> v1-19 height) (the float 25))
)
(let ((s5-4 arg1))
(set! (-> s5-4 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-4 color) (progress-selected 0))
)
(draw-highlight (the int (-> arg1 origin y)) 22 (-> arg1 alpha))
(print-game-text
@@ -2961,7 +2952,7 @@
;; definition for method 10 of type menu-card-removed-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-card-removed-option ((obj menu-card-removed-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-card-removed-option ((obj menu-card-removed-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((v1-1 arg1))
(set! (-> v1-1 scale) 0.5)
@@ -3008,7 +2999,7 @@
(set! (-> v1-15 height) (the float 35))
)
(let ((s5-3 arg1))
(set! (-> s5-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-3 color) (progress-selected 0))
)
(draw-highlight (the int (+ 5.0 (-> arg1 origin y))) 24 (-> arg1 alpha))
(print-game-text
@@ -3024,7 +3015,7 @@
;; definition for method 10 of type menu-error-disc-removed-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-error-disc-removed-option ((obj menu-error-disc-removed-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-error-disc-removed-option ((obj menu-error-disc-removed-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3067,7 +3058,7 @@
(set! (-> v1-14 height) (the float 50))
)
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-2 color) (progress-selected 0))
)
(draw-highlight (the int (+ 12.0 (-> arg1 origin y))) 24 (-> arg1 alpha))
(print-game-text
@@ -3084,7 +3075,7 @@
;; definition for method 10 of type menu-error-reading-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-error-reading-option ((obj menu-error-reading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-error-reading-option ((obj menu-error-reading-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3126,7 +3117,7 @@
(set! (-> v1-13 height) (the float 50))
)
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-2 color) (progress-selected 0))
)
(draw-highlight (the int (+ 12.0 (-> arg1 origin y))) 24 (-> arg1 alpha))
(print-game-text
@@ -3142,8 +3133,7 @@
;; definition for method 10 of type menu-icon-info-option
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-16 8) 0) at op 72
(defmethod menu-option-method-10 menu-icon-info-option ((obj menu-icon-info-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-icon-info-option ((obj menu-icon-info-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3203,7 +3193,7 @@
(set! (-> v1-34 height) (the float 50))
)
(let ((s5-3 arg1))
(set! (-> s5-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-3 color) (progress-selected 0))
)
(draw-highlight (the int (+ 12.0 (-> arg1 origin y))) 24 (-> arg1 alpha))
(print-game-text
@@ -3219,7 +3209,7 @@
;; definition for method 10 of type menu-format-card-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-format-card-option ((obj menu-format-card-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-format-card-option ((obj menu-format-card-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3273,7 +3263,7 @@
;; definition for method 10 of type menu-already-exists-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-already-exists-option ((obj menu-already-exists-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-already-exists-option ((obj menu-already-exists-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3319,7 +3309,7 @@
;; definition for method 10 of type menu-create-game-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-create-game-option ((obj menu-create-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-create-game-option ((obj menu-create-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3362,7 +3352,7 @@
;; definition for method 10 of type menu-video-mode-warning-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-video-mode-warning-option ((obj menu-video-mode-warning-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-video-mode-warning-option ((obj menu-video-mode-warning-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3430,7 +3420,7 @@
;; definition for method 10 of type menu-video-mode-ok-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-video-mode-ok-option ((obj menu-video-mode-ok-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-video-mode-ok-option ((obj menu-video-mode-ok-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3476,7 +3466,7 @@
;; definition for method 10 of type menu-progressive-mode-warning-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-progressive-mode-warning-option ((obj menu-progressive-mode-warning-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-progressive-mode-warning-option ((obj menu-progressive-mode-warning-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3544,7 +3534,7 @@
;; definition for method 10 of type menu-progressive-mode-ok-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-progressive-mode-ok-option ((obj menu-progressive-mode-ok-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-progressive-mode-ok-option ((obj menu-progressive-mode-ok-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3590,7 +3580,7 @@
;; definition for method 10 of type menu-quit-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-quit-option ((obj menu-quit-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-quit-option ((obj menu-quit-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color #7efbfb))
@@ -3627,7 +3617,7 @@
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
;; WARN: disable def twice: 147. This may happen when a cond (no else) is nested inside of another conditional, but it should be rare.
(defmethod menu-option-method-10 menu-select-start-option ((obj menu-select-start-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-select-start-option ((obj menu-select-start-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(sv-48 int)
(sv-64 int)
@@ -3742,7 +3732,7 @@
((zero? s2-0)
(set! (-> obj real-task-index) sv-64)
(set! sv-96 arg1)
(set! (-> sv-96 color) (the-as font-color (progress-selected 0)))
(set! (-> sv-96 color) (progress-selected 0))
(draw-highlight (+ s0-0 47) 50 f30-0)
)
(else
@@ -3796,7 +3786,7 @@
;; definition for method 10 of type menu-select-scene-option
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-select-scene-option ((obj menu-select-scene-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-select-scene-option ((obj menu-select-scene-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(sv-48 int)
(sv-64 (function string font-context symbol int bucket-id float))
@@ -3935,12 +3925,12 @@
(cond
((and (< s3-0 s4-0) (!= (-> arg0 sliding-height) 0.0))
(set! sv-192 arg1)
(set! (-> sv-192 color) (the-as font-color (progress-selected 0)))
(set! (-> sv-192 color) (progress-selected 0))
(draw-highlight (+ (the int f26-0) -2 s0-1) (the int f26-0) f30-0)
)
((or (and (= s3-0 s4-0) (= (fabs (-> arg0 sliding-height)) 0.0)) (zero? s3-0))
(set! sv-208 arg1)
(set! (-> sv-208 color) (the-as font-color (progress-selected 0)))
(set! (-> sv-208 color) (progress-selected 0))
(draw-highlight (+ s0-1 -2) (the int f26-0) f30-0)
)
(else
@@ -3974,7 +3964,7 @@
;; definition for method 10 of type menu-bigmap-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-bigmap-option ((obj menu-bigmap-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-bigmap-option ((obj menu-bigmap-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
0
(none)
)
@@ -4193,7 +4183,7 @@
;; WARN: Stack slot offset 20 signed mismatch
;; WARN: Stack slot offset 20 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-missions-option ((obj menu-missions-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-missions-option ((obj menu-missions-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(f0-50 float)
(sv-16 float)
@@ -4278,7 +4268,7 @@
)
)
)
(begin-scissor-missions sv-276 (the-as float arg0))
(begin-scissor-missions sv-276)
(let ((a0-27 arg1))
(set! (-> a0-27 flags) (font-flags kerning large))
)
@@ -4488,7 +4478,7 @@
(else
(let ((s3-1 arg2))
(set! (-> s3-1 color) (if (= arg3 1)
(the-as font-color (progress-selected 0))
(the-as font-color (the-as int (progress-selected 0)))
(font-color #7efbfb)
)
)
@@ -4894,8 +4884,7 @@
;; WARN: Stack slot offset 112 signed mismatch
;; WARN: Stack slot offset 108 signed mismatch
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-42 8) 0) at op 138
(defmethod menu-option-method-10 menu-secret-option ((obj menu-secret-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-secret-option ((obj menu-secret-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(sv-16 float)
(sv-20 symbol)
@@ -5143,7 +5132,6 @@
)
;; definition for function draw-highscore-icon
;; ERROR: Failed store: (s.w! (+ v1-8 8) 0) at op 37
(defun draw-highscore-icon ((arg0 menu-highscores-option) (arg1 uint) (arg2 int) (arg3 int) (arg4 float))
(set! (-> arg0 sprites 0 tex) (lookup-texture-by-id (the-as texture-id arg1)))
(set! (-> arg0 sprites 0 scale-x) arg4)
@@ -5157,7 +5145,6 @@
)
;; definition for function draw-highscore-cup
;; ERROR: Failed store: (s.w! (+ v1-20 8) 0) at op 75
(defun draw-highscore-cup ((arg0 texture-page) (arg1 int) (arg2 int) (arg3 int) (arg4 float) (arg5 float))
"First int is an enum"
(let ((a0-1 (the-as uint #xc9300300)))
@@ -6045,7 +6032,7 @@
;; WARN: Stack slot offset 120 signed mismatch
;; WARN: Stack slot offset 108 signed mismatch
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-highscores-option ((obj menu-highscores-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-highscores-option ((obj menu-highscores-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(sv-96 float)
(sv-100 float)
@@ -6350,7 +6337,7 @@
;; definition for method 10 of type menu-on-off-game-vibrations-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-on-off-game-vibrations-option ((obj menu-on-off-game-vibrations-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-on-off-game-vibrations-option ((obj menu-on-off-game-vibrations-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-10 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -6397,7 +6384,7 @@
(cond
((zero? (-> *progress-state* game-options-item-selected))
(let ((s2-3 arg1))
(set! (-> s2-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s2-3 color) (progress-selected 0))
)
(draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 22 f30-0)
)
@@ -6440,7 +6427,7 @@
;; definition for method 10 of type menu-on-off-game-subtitles-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-on-off-game-subtitles-option ((obj menu-on-off-game-subtitles-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-on-off-game-subtitles-option ((obj menu-on-off-game-subtitles-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-11 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -6487,7 +6474,7 @@
(cond
((= (-> *progress-state* game-options-item-selected) 1)
(let ((s2-3 arg1))
(set! (-> s2-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s2-3 color) (progress-selected 0))
)
(draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 22 f30-0)
)
@@ -6530,7 +6517,7 @@
;; definition for method 10 of type menu-subtitle-language-game-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-subtitle-language-game-option ((obj menu-subtitle-language-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-subtitle-language-game-option ((obj menu-subtitle-language-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(with-pp
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(let ((v1-2 arg1))
@@ -6595,7 +6582,7 @@
)
(set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x)))
(let ((s5-3 arg1))
(set! (-> s5-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-3 color) (progress-selected 0))
)
(let ((v1-43 (if (and (= (scf-get-territory) 1) (zero? (-> *progress-state* game-options-subtitle-language-index)))
7
@@ -6616,7 +6603,7 @@
(cond
((= (-> *progress-state* game-options-item-selected) 2)
(let ((s4-4 arg1))
(set! (-> s4-4 color) (the-as font-color (progress-selected 0)))
(set! (-> s4-4 color) (progress-selected 0))
)
(draw-highlight (the int (-> arg1 origin y)) 24 f30-0)
)
@@ -6665,7 +6652,7 @@
;; definition for method 10 of type menu-language-game-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-language-game-option ((obj menu-language-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-language-game-option ((obj menu-language-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(with-pp
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(let ((v1-2 arg1))
@@ -6733,7 +6720,7 @@
)
(set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x)))
(let ((s5-3 arg1))
(set! (-> s5-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s5-3 color) (progress-selected 0))
)
(let ((v1-43 (if (and (= (scf-get-territory) 1) (zero? (-> *progress-state* game-options-language-index)))
7
@@ -6754,7 +6741,7 @@
(cond
((= (-> *progress-state* game-options-item-selected) 3)
(let ((s3-1 arg1))
(set! (-> s3-1 color) (the-as font-color (progress-selected 0)))
(set! (-> s3-1 color) (progress-selected 0))
)
(draw-highlight (the int (-> arg1 origin y)) 24 f30-0)
)
@@ -6808,7 +6795,7 @@
;; definition for method 10 of type menu-sub-menu-game-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-sub-menu-game-option ((obj menu-sub-menu-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-sub-menu-game-option ((obj menu-sub-menu-game-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((f0-1 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
395.0
(-> arg1 origin y)
@@ -6831,7 +6818,7 @@
;; definition for method 10 of type menu-aspect-ratio-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-aspect-ratio-option ((obj menu-aspect-ratio-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-aspect-ratio-option ((obj menu-aspect-ratio-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-12 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -6888,7 +6875,7 @@
(cond
((= (-> *progress-state* graphic-options-item-selected) 1)
(let ((s2-3 arg1))
(set! (-> s2-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s2-3 color) (progress-selected 0))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 25 f30-0)
)
@@ -6938,12 +6925,12 @@
;; definition for method 10 of type menu-on-off-progressive-scan-graphic-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-on-off-progressive-scan-graphic-option ((obj menu-on-off-progressive-scan-graphic-option)
(arg0 progress)
(arg1 font-context)
(arg2 int)
(arg3 symbol)
)
(defmethod draw-option menu-on-off-progressive-scan-graphic-option ((obj menu-on-off-progressive-scan-graphic-option)
(arg0 progress)
(arg1 font-context)
(arg2 int)
(arg3 symbol)
)
(local-vars (a0-11 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -6997,7 +6984,7 @@
(cond
((= (-> *progress-state* graphic-options-item-selected) 2)
(let ((s2-3 arg1))
(set! (-> s2-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s2-3 color) (progress-selected 0))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 24 f30-0)
)
@@ -7046,7 +7033,7 @@
;; definition for method 10 of type menu-center-screen-graphic-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-center-screen-graphic-option ((obj menu-center-screen-graphic-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-center-screen-graphic-option ((obj menu-center-screen-graphic-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
(set! f30-0 0.0)
@@ -7133,7 +7120,7 @@
(cond
((zero? (-> *progress-state* graphic-options-item-selected))
(let ((s4-3 arg1))
(set! (-> s4-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s4-3 color) (progress-selected 0))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 25 f30-0)
)
@@ -7153,7 +7140,7 @@
;; definition for method 10 of type menu-restart-mission-qr-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-restart-mission-qr-option ((obj menu-restart-mission-qr-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-restart-mission-qr-option ((obj menu-restart-mission-qr-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-11 string))
(let ((f0-1 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f0-1 0.0)
@@ -7218,7 +7205,7 @@
;; definition for method 10 of type menu-quit-qr-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-quit-qr-option ((obj menu-quit-qr-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-quit-qr-option ((obj menu-quit-qr-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (a0-12 string))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(if (< f30-0 0.0)
@@ -7295,7 +7282,7 @@
;; definition for method 10 of type menu-slider-option
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-slider-option ((obj menu-slider-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-slider-option ((obj menu-slider-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars
(v0-42 pointer)
(sv-16 progress)
@@ -7668,7 +7655,7 @@
;; definition for method 10 of type menu-stereo-mode-sound-option
;; WARN: Return type mismatch int vs none.
(defmethod menu-option-method-10 menu-stereo-mode-sound-option ((obj menu-stereo-mode-sound-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-stereo-mode-sound-option ((obj menu-stereo-mode-sound-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (s5-0 int))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))))
(let ((v1-2 arg1))
@@ -7728,7 +7715,7 @@
)
(set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x)))
(let ((s4-3 arg1))
(set! (-> s4-3 color) (the-as font-color (progress-selected 0)))
(set! (-> s4-3 color) (progress-selected 0))
)
(let ((a0-23 arg1))
(set! (-> a0-23 flags) (font-flags kerning middle large))
@@ -7776,12 +7763,11 @@
;; definition for method 10 of type menu-sub-menu-option
;; INFO: Used lq/sq
;; WARN: Return type mismatch int vs none.
;; ERROR: Failed store: (s.w! (+ v1-87 8) 0) at op 335
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 349]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 361]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 417]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 435]
(defmethod menu-option-method-10 menu-sub-menu-option ((obj menu-sub-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(defmethod draw-option menu-sub-menu-option ((obj menu-sub-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol))
(local-vars (sv-16 dma-buffer))
(let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition))))
(s2-0 (the int (+ -1.0 (-> arg1 origin y))))
@@ -7821,7 +7807,7 @@
(when (nonzero? (-> obj name))
(let ((s0-0 arg1))
(set! (-> s0-0 color) (if (= arg2 (-> arg0 option-index))
(the-as font-color (progress-selected 0))
(the-as font-color (the-as int (progress-selected 0)))
(font-color #7efbfb)
)
)
@@ -7829,7 +7815,7 @@
(cond
((= arg2 (-> arg0 option-index))
(let ((s0-1 arg1))
(set! (-> s0-1 color) (the-as font-color (progress-selected 0)))
(set! (-> s0-1 color) (progress-selected 0))
)
)
(else
test/decompiler/reference/jak2/engine/ui/progress/progress-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -101,7 +101,7 @@
:flag-assert #xc00000030
(:methods
(respond-progress (_type_ progress object) int :behavior progress 9)
(menu-option-method-10 (_type_ progress font-context int symbol) none 10)
(draw-option (_type_ progress font-context int symbol) none 10)
(menu-option-method-11 () none 11)
)
)
test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
Generated Vendored
+2 -3
View File
@@ -1396,7 +1396,6 @@
)
;; definition for function end-scan
;; ERROR: Failed store: (s.w! (+ v1-8 8) 0) at op 19
(defun end-scan ((arg0 hud-box) (arg1 float))
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) global-buf))
(bucket-id progress)
@@ -1462,12 +1461,12 @@
)
(let ((s3-0 sv-144))
(set! (-> s3-0 color) (if (and (= s4-1 (-> self option-index)) (= (-> self menu-transition) 0.0))
(the-as font-color (progress-selected 0))
(the-as font-color (the-as int (progress-selected 0)))
(font-color #7efbfb)
)
)
)
(menu-option-method-10
(draw-option
(-> gp-0 s4-1)
self
sv-144
test/decompiler/reference/jak2/engine/ui/text_REF.gc
Generated Vendored
+1 -1
View File
@@ -389,7 +389,7 @@ in a single text group and file."
;; definition for function print-game-text-scaled
;; WARN: Return type mismatch int vs none.
(defun print-game-text-scaled ((arg0 string) (arg1 float) (arg2 font-context) (arg3 int))
(defun print-game-text-scaled ((arg0 string) (arg1 float) (arg2 font-context) (arg3 bucket-id))
"Print text, with a given scaling"
(let ((f26-0 (-> arg2 width))
(f30-0 (-> arg2 height))