mirror of
https://github.com/open-goal/jak-project
synced 2026-09-07 11:36:26 -04:00
[goos] fix pretty printer bugs, update ref after pretty printer changes (#1063)
* update ref after pretty printer changes * another try
This commit is contained in:
+24
-29
@@ -124,12 +124,11 @@
|
||||
(+! s0-0 1)
|
||||
)
|
||||
(when *common-text*
|
||||
(when (and
|
||||
(!= s1-0 -1)
|
||||
(> (-> s5-0 nb-of-tasks) 0)
|
||||
(>= (-> obj task-index) 0)
|
||||
(< (-> obj task-index) (-> s5-0 nb-of-tasks))
|
||||
)
|
||||
(when (and (!= s1-0 -1)
|
||||
(> (-> s5-0 nb-of-tasks) 0)
|
||||
(>= (-> obj task-index) 0)
|
||||
(< (-> obj task-index) (-> s5-0 nb-of-tasks))
|
||||
)
|
||||
(let ((s0-1 (new
|
||||
'stack
|
||||
'font-context
|
||||
@@ -726,10 +725,9 @@
|
||||
(let ((v1-57 arg0))
|
||||
(set! (-> v1-57 scale) 0.6)
|
||||
)
|
||||
(if (and
|
||||
(< (-> s3-3 file s1-0 level-index) (length *level-task-data-remap*))
|
||||
(> (-> s3-3 file s1-0 level-index) 0)
|
||||
)
|
||||
(if (and (< (-> s3-3 file s1-0 level-index) (length *level-task-data-remap*))
|
||||
(> (-> s3-3 file s1-0 level-index) 0)
|
||||
)
|
||||
(print-game-text
|
||||
(lookup-text!
|
||||
*common-text*
|
||||
@@ -747,14 +745,12 @@
|
||||
(set! (-> a0-28 color) (font-color blue-white))
|
||||
)
|
||||
(cond
|
||||
((or
|
||||
(>= 600 (- (-> *display* real-frame-counter) (-> obj last-option-index-change)))
|
||||
(or
|
||||
(< (mod (- (-> *display* real-frame-counter) (-> obj last-option-index-change)) 1200) 600)
|
||||
(!= (-> obj option-index) s1-0)
|
||||
(-> obj in-transition)
|
||||
((or (>= 600 (- (-> *display* real-frame-counter) (-> obj last-option-index-change)))
|
||||
(or (< (mod (- (-> *display* real-frame-counter) (-> obj last-option-index-change)) 1200) 600)
|
||||
(!= (-> obj option-index) s1-0)
|
||||
(-> obj in-transition)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((v1-87 arg0))
|
||||
(set! (-> v1-87 scale) 0.5)
|
||||
)
|
||||
@@ -1180,9 +1176,9 @@
|
||||
(set! (-> *progress-process* 0 particles 31 init-pos x)
|
||||
(the float
|
||||
(- (if (or (< (mod (-> *display* real-frame-counter) 300) 270) (!= (-> obj transition-percentage-invert) 1.0))
|
||||
205
|
||||
-320
|
||||
)
|
||||
205
|
||||
-320
|
||||
)
|
||||
(-> obj left-x-offset)
|
||||
)
|
||||
)
|
||||
@@ -1756,10 +1752,9 @@
|
||||
((= v1-81 1)
|
||||
(set! sv-512 (-> obj language-selection))
|
||||
(set! sv-448 (-> (the-as (pointer uint64) (-> s3-0 s0-0 value-to-modify))))
|
||||
(if (and
|
||||
(zero? (scf-get-territory))
|
||||
(not (and (= *progress-cheat* 'language) (cpad-hold? 0 l2) (cpad-hold? 0 r2)))
|
||||
)
|
||||
(if (and (zero? (scf-get-territory))
|
||||
(not (and (= *progress-cheat* 'language) (cpad-hold? 0 l2) (cpad-hold? 0 r2)))
|
||||
)
|
||||
(set! sv-464 5)
|
||||
(set! sv-464 6)
|
||||
)
|
||||
@@ -2096,11 +2091,11 @@
|
||||
)
|
||||
(set! (-> s4-2 origin x)
|
||||
(+ (- 435.0 (the float (if (< (-> *progress-process* 0 completion-percentage) 10.0)
|
||||
93
|
||||
80
|
||||
)
|
||||
)
|
||||
)
|
||||
93
|
||||
80
|
||||
)
|
||||
)
|
||||
)
|
||||
f30-0
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user