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

[decompiler] as-type and font method support (#3855)

Browse Source 
Add support for `as-type` macro, and detecting inline font methods. This
works in all three games but I've only updated jak 3's goal_src for now.
Eventually I will go back and work through the others, but I want to get
more decompiler features in first.


![image](https://github.com/user-attachments/assets/5c31bf85-97b4-437c-bc4b-dc054e60551e)

---------

Co-authored-by: water111 <awaterford1111445@gmail.com>
This commit is contained in:
water111
2025-02-01 21:23:11 -05:00
committed by GitHub
parent d5590ab638
commit 48cb9bb787
645 changed files with 5391 additions and 16694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+132 -396
View File
@@ -141,15 +141,9 @@
)
)
)
(let ((v1-91 s0-1))
(set! (-> v1-91 width) (the float 328))
)
(let ((v1-92 s0-1))
(set! (-> v1-92 height) (the float 50))
)
(let ((v1-93 s0-1))
(set! (-> v1-93 scale) 0.7)
)
(set-width! s0-1 328)
(set-height! s0-1 50)
(set-scale! s0-1 0.7)
(set! (-> s0-1 flags) (font-flags shadow kerning middle middle-vert large))
(set! sv-224 print-game-text-scaled)
(let ((a0-47 (lookup-text! *common-text* (-> s5-0 task-info (-> this task-index) task-name s1-0) #f))
@@ -165,12 +159,8 @@
(let ((a0-49 s0-1))
(set! (-> a0-49 color) (font-color progress-blue))
)
(let ((v1-104 s0-1))
(set! (-> v1-104 height) (the float 15))
)
(let ((v1-105 s0-1))
(set! (-> v1-105 scale) 0.5)
)
(set-height! s0-1 15)
(set-scale! s0-1 0.5)
(print-game-text-scaled
(lookup-text! *common-text* (text-id task-completed) #f)
f30-0
@@ -234,12 +224,8 @@
)
)
)
(let ((v1-19 s4-1))
(set! (-> v1-19 width) (the float 328))
)
(let ((v1-20 s4-1))
(set! (-> v1-20 height) (the float 70))
)
(set-width! s4-1 328)
(set-height! s4-1 70)
(set! (-> s4-1 flags) (font-flags shadow kerning large))
(let ((s3-1 print-game-text-scaled))
(format
@@ -250,9 +236,7 @@
)
(s3-1 *temp-string* f30-0 s4-1 (the int (* 128.0 f30-0)))
)
(let ((v1-26 s4-1))
(set! (-> v1-26 width) (the float 428))
)
(set-width! s4-1 428)
(+! (-> s4-1 origin x) -220.0)
(+! (-> s4-1 origin y) 40.0)
(set! (-> s4-1 flags) (font-flags shadow kerning middle large))
@@ -318,20 +302,14 @@
)
)
)
(let ((v1-9 s4-1))
(set! (-> v1-9 width) (the float 328))
)
(let ((v1-10 s4-1))
(set! (-> v1-10 height) (the float 70))
)
(set-width! s4-1 328)
(set-height! s4-1 70)
(set! (-> s4-1 flags) (font-flags shadow kerning large))
(let ((s3-1 print-game-text-scaled))
(format (clear *temp-string*) "~D/~D" s2-0 (-> *game-counts* data arg0 buzzer-count))
(s3-1 *temp-string* f30-0 s4-1 (the int (* 128.0 f30-0)))
)
(let ((v1-14 s4-1))
(set! (-> v1-14 width) (the float 428))
)
(set-width! s4-1 428)
(+! (-> s4-1 origin x) -220.0)
(+! (-> s4-1 origin y) 40.0)
(set! (-> s4-1 flags) (font-flags shadow kerning middle large))
@@ -356,15 +334,9 @@
;; definition for method 35 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-storage-error ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.55)
)
(let ((v1-1 arg0))
(set! (-> v1-1 width) (the float 265))
)
(let ((v1-2 arg0))
(set! (-> v1-2 height) (the float 55))
)
(set-scale! arg0 0.55)
(set-width! arg0 265)
(set-height! arg0 55)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(let ((s4-0 (text-id memcard-not-formatted-title)))
(case (-> this display-state)
@@ -382,12 +354,8 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 70.0)
(let ((v1-12 arg0))
(set! (-> v1-12 width) (the float 350))
)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 40))
)
(set-width! arg0 350)
(set-height! arg0 40)
(let ((s4-1 print-game-text-scaled))
(format
(clear *temp-string*)
@@ -400,18 +368,14 @@
(s4-1 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(set! (-> arg0 origin y) 115.0)
(let ((v1-17 arg0))
(set! (-> v1-17 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id memcard-space-requirement2) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-19 arg0))
(set! (-> v1-19 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 160.0)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
@@ -427,15 +391,9 @@
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-format ((this progress) (arg0 font-context))
(set! (-> arg0 origin y) 35.0)
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.55)
)
(let ((v1-1 arg0))
(set! (-> v1-1 width) (the float 265))
)
(let ((v1-2 arg0))
(set! (-> v1-2 height) (the float 55))
)
(set-scale! arg0 0.55)
(set-width! arg0 265)
(set-height! arg0 55)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(let ((s4-0 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id memcard-not-formatted-title) #f) 1)
@@ -443,25 +401,17 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 105.0)
(let ((v1-7 arg0))
(set! (-> v1-7 width) (the float 360))
)
(let ((v1-8 arg0))
(set! (-> v1-8 height) (the float 40))
)
(set-width! arg0 360)
(set-height! arg0 40)
(print-game-text-scaled
(lookup-text! *common-text* (text-id memcard-not-formatted-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-10 arg0))
(set! (-> v1-10 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 138.0)
(let ((v1-11 arg0))
(set! (-> v1-11 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id format?) #f)
(-> this transition-percentage-invert)
@@ -475,18 +425,12 @@
;; definition for method 36 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-data-exists ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 55.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 365))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 75))
)
(set-width! arg0 365)
(set-height! arg0 75)
(print-game-text-scaled
(lookup-text! *common-text* (text-id save-data-already-exists) #f)
(-> this transition-percentage-invert)
@@ -494,12 +438,8 @@
128
)
(set! (-> arg0 origin y) 140.0)
(let ((v1-7 arg0))
(set! (-> v1-7 width) (the float 360))
)
(let ((v1-8 arg0))
(set! (-> v1-8 height) (the float 40))
)
(set-width! arg0 360)
(set-height! arg0 40)
(print-game-text-scaled
(lookup-text! *common-text* (text-id overwrite?) #f)
(-> this transition-percentage-invert)
@@ -513,29 +453,19 @@
;; definition for method 37 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-no-data ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 40.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 365))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 75))
)
(set-width! arg0 365)
(set-height! arg0 75)
(let ((s4-0 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id no-save-data) #f) 1)
(s4-0 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(set! (-> arg0 origin y) 130.0)
(let ((v1-7 arg0))
(set! (-> v1-7 width) (the float 360))
)
(let ((v1-8 arg0))
(set! (-> v1-8 height) (the float 40))
)
(set-width! arg0 360)
(set-height! arg0 40)
(print-game-text-scaled
(lookup-text! *common-text* (text-id create-save-data?) #f)
(-> this transition-percentage-invert)
@@ -549,18 +479,12 @@
;; definition for method 38 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-accessing ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 1.0)
)
(set-scale! arg0 1.0)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 35.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 365))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 75))
)
(set-width! arg0 365)
(set-height! arg0 75)
(when (or (< (mod (-> *display* real-frame-counter) 300) 150) (!= (-> this transition-percentage-invert) 1.0))
(let ((a1-1 (text-id loading-data)))
(case (-> this display-state)
@@ -577,18 +501,12 @@
(print-game-text-scaled (lookup-text! *common-text* a1-1 #f) (-> this transition-percentage-invert) arg0 128)
)
)
(let ((v1-18 arg0))
(set! (-> v1-18 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 15 (-> this left-x-offset))))
(set! (-> arg0 origin y) 100.0)
(let ((v1-22 arg0))
(set! (-> v1-22 width) (the float 370))
)
(let ((v1-23 arg0))
(set! (-> v1-23 height) (the float 75))
)
(set-width! arg0 370)
(set-height! arg0 75)
(let ((s4-1 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id memcard-do-not-remove) #f) 1)
(s4-1 *temp-string* (-> this transition-percentage-invert) arg0 128)
@@ -600,29 +518,19 @@
;; definition for method 39 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-insert ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 35.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 310))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 110))
)
(set-width! arg0 310)
(set-height! arg0 110)
(let ((s4-0 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id insert-memcard) #f) 1)
(s4-0 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(let ((v1-7 arg0))
(set! (-> v1-7 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 130.0)
(let ((v1-8 arg0))
(set! (-> v1-8 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id back?) #f)
(-> this transition-percentage-invert)
@@ -676,18 +584,12 @@
(set! f0-13 0.0)
)
(let ((s4-1 (the int (* 128.0 f0-13))))
(let ((v1-29 arg0))
(set! (-> v1-29 scale) 0.5)
)
(set-scale! arg0 0.5)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 102 (-> this left-x-offset))))
(set! (-> arg0 origin y) 5.0)
(let ((v1-33 arg0))
(set! (-> v1-33 width) (the float 200))
)
(let ((v1-34 arg0))
(set! (-> v1-34 height) (the float 20))
)
(set-width! arg0 200)
(set-height! arg0 20)
(print-game-text
(lookup-text!
*common-text*
@@ -703,9 +605,7 @@
22
)
(set! (-> arg0 origin y) 26.0)
(let ((v1-37 arg0))
(set! (-> v1-37 height) (the float 20))
)
(set-height! arg0 20)
(let ((s3-3 (-> this card-info))
(s2-0 23)
)
@@ -715,15 +615,11 @@
(let ((a0-17 arg0))
(set! (-> a0-17 color) (font-color default))
)
(let ((v1-42 arg0))
(set! (-> v1-42 width) (the float 320))
)
(set-width! arg0 320)
(cond
((and s3-3 (= (-> s3-3 formatted) 1) (= (-> s3-3 inited) 1) (= (-> s3-3 file s1-0 present) 1))
(set! (-> this particles s2-0 init-pos x) (the float (- 66 (-> this left-x-offset))))
(let ((v1-57 arg0))
(set! (-> v1-57 scale) 0.6)
)
(set-scale! arg0 0.6)
(if (and (< (-> s3-3 file s1-0 level-index) (length *level-task-data-remap*))
(> (-> s3-3 file s1-0 level-index) 0)
)
@@ -750,15 +646,11 @@
(-> this in-transition)
)
)
(let ((v1-87 arg0))
(set! (-> v1-87 scale) 0.5)
)
(set-scale! arg0 0.5)
(+! (-> arg0 origin y) 16.0)
(set! (-> arg0 flags) (font-flags shadow kerning middle large))
(set! (-> arg0 origin x) (the float (- -73 (-> this left-x-offset))))
(let ((v1-91 arg0))
(set! (-> v1-91 width) (the float 350))
)
(set-width! arg0 350)
(let ((s0-2 print-game-text))
(set! sv-16 format)
(let ((a0-40 (clear *temp-string*))
@@ -792,9 +684,7 @@
(s0-4 *temp-string* arg0 #f s4-1 22)
)
(+! (-> arg0 origin y) 1.0)
(let ((v1-108 arg0))
(set! (-> v1-108 scale) 1.0)
)
(set-scale! arg0 1.0)
(set! (-> arg0 flags) (font-flags shadow kerning right large))
(set! (-> arg0 origin x) (the float (- 352 (-> this left-x-offset))))
(let ((s0-5 print-game-text))
@@ -807,9 +697,7 @@
)
(s0-5 *temp-string* arg0 #f s4-1 22)
)
(let ((v1-116 arg0))
(set! (-> v1-116 scale) 0.5)
)
(set-scale! arg0 0.5)
(+! (-> arg0 origin y) 9.0)
(set! (-> arg0 flags) (font-flags shadow kerning large))
(set! (-> arg0 origin x) (the float (- 85 (-> this left-x-offset))))
@@ -854,13 +742,9 @@
(else
(+! (-> arg0 origin y) 18.0)
(set! (-> arg0 origin x) (the float (- 28 (-> this left-x-offset))))
(let ((v1-131 arg0))
(set! (-> v1-131 scale) 0.8)
)
(set-scale! arg0 0.8)
(set! (-> arg0 flags) (font-flags shadow kerning middle large))
(let ((v1-133 arg0))
(set! (-> v1-133 width) (the float 350))
)
(set-width! arg0 350)
(cond
((= (scf-get-territory) 1)
(let ((s0-10 print-game-text))
@@ -903,9 +787,7 @@
(else
(set! (-> this particles s2-0 init-pos x) -320.0)
(+! (-> arg0 origin y) 12.0)
(let ((v1-173 arg0))
(set! (-> v1-173 scale) 0.7)
)
(set-scale! arg0 0.7)
(print-game-text (lookup-text! *common-text* (text-id empty) #f) arg0 #f s4-1 22)
(+! (-> arg0 origin y) 29.0)
)
@@ -922,18 +804,12 @@
;; definition for method 41 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-auto-save-error ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.6)
)
(set-scale! arg0 0.6)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 70 (-> this left-x-offset))))
(set! (-> arg0 origin y) 5.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 265))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 35))
)
(set-width! arg0 265)
(set-height! arg0 35)
(print-game-text-scaled
(lookup-text! *common-text* (text-id error-saving) #f)
(-> this transition-percentage-invert)
@@ -942,23 +818,15 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 34.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 360))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 50))
)
(set-width! arg0 360)
(set-height! arg0 50)
(let ((s4-1 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id check-memcard) #f) 1)
(s4-1 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(set! (-> arg0 origin y) 89.0)
(let ((v1-12 arg0))
(set! (-> v1-12 width) (the float 360))
)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 20))
)
(set-width! arg0 360)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-disabled-title) #f)
(-> this transition-percentage-invert)
@@ -966,25 +834,17 @@
128
)
(set! (-> arg0 origin y) 118.0)
(let ((v1-15 arg0))
(set! (-> v1-15 width) (the float 360))
)
(let ((v1-16 arg0))
(set! (-> v1-16 height) (the float 60))
)
(set-width! arg0 360)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-disabled-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-18 arg0))
(set! (-> v1-18 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 160.0)
(let ((v1-19 arg0))
(set! (-> v1-19 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -998,30 +858,20 @@
;; definition for method 42 of type progress
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-removed ((this progress) (arg0 font-context))
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.6)
)
(set-scale! arg0 0.6)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(set! (-> arg0 origin x) (the float (- 70 (-> this left-x-offset))))
(set! (-> arg0 origin y) 10.0)
(let ((v1-4 arg0))
(set! (-> v1-4 width) (the float 265))
)
(let ((v1-5 arg0))
(set! (-> v1-5 height) (the float 55))
)
(set-width! arg0 265)
(set-height! arg0 55)
(let ((s4-0 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id memcard-removed) #f) 1)
(s4-0 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 78.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 360))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 20))
)
(set-width! arg0 360)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-disabled-title) #f)
(-> this transition-percentage-invert)
@@ -1029,25 +879,17 @@
128
)
(set! (-> arg0 origin y) 112.0)
(let ((v1-12 arg0))
(set! (-> v1-12 width) (the float 360))
)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 60))
)
(set-width! arg0 360)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-disabled-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-15 arg0))
(set! (-> v1-15 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 160.0)
(let ((v1-16 arg0))
(set! (-> v1-16 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1062,15 +904,9 @@
;; INFO: Return type mismatch int vs none.
(defmethod draw-memcard-error ((this progress) (arg0 font-context))
(set! (-> arg0 origin y) 15.0)
(let ((v1-0 arg0))
(set! (-> v1-0 scale) 0.7)
)
(let ((v1-1 arg0))
(set! (-> v1-1 width) (the float 265))
)
(let ((v1-2 arg0))
(set! (-> v1-2 height) (the float 55))
)
(set-scale! arg0 0.7)
(set-width! arg0 265)
(set-height! arg0 55)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(let ((s4-0 (text-id error-loading)))
(case (-> this display-state)
@@ -1091,23 +927,15 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 80.0)
(let ((v1-13 arg0))
(set! (-> v1-13 width) (the float 360))
)
(let ((v1-14 arg0))
(set! (-> v1-14 height) (the float 70))
)
(set-width! arg0 360)
(set-height! arg0 70)
(let ((s4-1 print-game-text-scaled))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id check-memcard-and-retry) #f) 1)
(s4-1 *temp-string* (-> this transition-percentage-invert) arg0 128)
)
(let ((v1-16 arg0))
(set! (-> v1-16 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 155.0)
(let ((v1-17 arg0))
(set! (-> v1-17 height) (the float 60))
)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1123,15 +951,9 @@
(defmethod draw-auto-save ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 35 (-> this left-x-offset))))
(set! (-> arg0 origin y) 18.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 330))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 60))
)
(set-scale! arg0 0.6)
(set-width! arg0 330)
(set-height! arg0 60)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-warn-title) #f)
@@ -1141,25 +963,17 @@
)
(set! (-> arg0 origin x) (the float (- 15 (-> this left-x-offset))))
(set! (-> arg0 origin y) 110.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 370))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 60))
)
(set-width! arg0 370)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id autosave-warn-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-12 arg0))
(set! (-> v1-12 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 175.0)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 20))
)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1191,15 +1005,9 @@
(defmethod draw-pal-change-to-60hz ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 20.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 40))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 40)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-change-to-60hz) #f)
@@ -1209,12 +1017,8 @@
)
(set! (-> arg0 origin x) (the float (- 15 (-> this left-x-offset))))
(set! (-> arg0 origin y) 60.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 370))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 60))
)
(set-width! arg0 370)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-60hz-warn-support) #f)
(-> this transition-percentage-invert)
@@ -1222,22 +1026,16 @@
128
)
(set! (-> arg0 origin y) 120.0)
(let ((v1-12 arg0))
(set! (-> v1-12 height) (the float 50))
)
(set-height! arg0 50)
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-60hz-warn-timer) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-14 arg0))
(set! (-> v1-14 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 175.0)
(let ((v1-15 arg0))
(set! (-> v1-15 height) (the float 20))
)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1253,15 +1051,9 @@
(defmethod draw-no-disc ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 50.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 40))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 40)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id no-disc-title) #f)
@@ -1271,12 +1063,8 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 90.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 360))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 60))
)
(set-width! arg0 360)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id no-disc-msg) #f)
(-> this transition-percentage-invert)
@@ -1284,13 +1072,9 @@
128
)
(when (is-cd-in?)
(let ((v1-13 arg0))
(set! (-> v1-13 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 155.0)
(let ((v1-14 arg0))
(set! (-> v1-14 height) (the float 20))
)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1307,15 +1091,9 @@
(defmethod draw-bad-disc ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 50.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 40))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 40)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id bad-disc-title) #f)
@@ -1325,25 +1103,17 @@
)
(set! (-> arg0 origin x) (the float (- 20 (-> this left-x-offset))))
(set! (-> arg0 origin y) 90.0)
(let ((v1-9 arg0))
(set! (-> v1-9 width) (the float 360))
)
(let ((v1-10 arg0))
(set! (-> v1-10 height) (the float 60))
)
(set-width! arg0 360)
(set-height! arg0 60)
(print-game-text-scaled
(lookup-text! *common-text* (text-id bad-disc-msg) #f)
(-> this transition-percentage-invert)
arg0
128
)
(let ((v1-12 arg0))
(set! (-> v1-12 scale) 0.65)
)
(set-scale! arg0 0.65)
(set! (-> arg0 origin y) 155.0)
(let ((v1-13 arg0))
(set! (-> v1-13 height) (the float 20))
)
(set-height! arg0 20)
(print-game-text-scaled
(lookup-text! *common-text* (text-id continue?) #f)
(-> this transition-percentage-invert)
@@ -1359,15 +1129,9 @@
(defmethod draw-quit ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 70.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 40))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 40)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id quit?) #f)
@@ -1384,15 +1148,9 @@
(defmethod draw-pal-now-60hz ((this progress) (arg0 font-context))
(set! (-> arg0 origin x) (the float (- 50 (-> this left-x-offset))))
(set! (-> arg0 origin y) 45.0)
(let ((v1-2 arg0))
(set! (-> v1-2 scale) 0.6)
)
(let ((v1-3 arg0))
(set! (-> v1-3 width) (the float 300))
)
(let ((v1-4 arg0))
(set! (-> v1-4 height) (the float 50))
)
(set-scale! arg0 0.6)
(set-width! arg0 300)
(set-height! arg0 50)
(set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-now-60hz) #f)
@@ -1401,9 +1159,7 @@
128
)
(set! (-> arg0 origin y) 95.0)
(let ((v1-7 arg0))
(set! (-> v1-7 height) (the float 50))
)
(set-height! arg0 50)
(print-game-text-scaled
(lookup-text! *common-text* (text-id screen-60hz-keep?) #f)
(-> this transition-percentage-invert)
@@ -1615,12 +1371,8 @@
(set! sv-112
(new 'stack 'font-context *font-default-matrix* 0 0 0.0 (font-color default) (font-flags shadow kerning))
)
(let ((v1-11 sv-112))
(set! (-> v1-11 width) (the float 350))
)
(let ((v1-12 sv-112))
(set! (-> v1-12 height) (the float 25))
)
(set-width! sv-112 350)
(set-height! sv-112 25)
(set! (-> sv-112 flags) (font-flags shadow kerning middle middle-vert large))
(dotimes (s0-0 (length s3-0))
(set! sv-912 (the-as string #f))
@@ -1679,9 +1431,7 @@
(set! (-> sv-112 origin y) (the float (+ s2-1 -8)))
)
)
(let ((v1-64 sv-112))
(set! (-> v1-64 scale) 0.6)
)
(set-scale! sv-112 0.6)
(set! sv-288 print-game-text)
(let ((a0-23 (lookup-text! *common-text* (-> s3-0 s0-0 name) #f))
(a1-11 sv-112)
@@ -1958,9 +1708,7 @@
)
)
)
(let ((v1-246 sv-112))
(set! (-> v1-246 scale) (* arg2 f0-23))
)
(set-scale! sv-112 (* arg2 f0-23))
(let ((t9-60 print-game-text)
(a1-64 sv-112)
(a2-50 #f)
@@ -2061,26 +1809,14 @@
)
)
)
(let ((v1-29 s4-2))
(set! (-> v1-29 width) (the float 100))
)
(let ((v1-30 s4-2))
(set! (-> v1-30 height) (the float 15))
)
(let ((v1-31 s4-2))
(set! (-> v1-31 scale) 0.5)
)
(set-width! s4-2 100)
(set-height! s4-2 15)
(set-scale! s4-2 0.5)
(set! (-> s4-2 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id options) #f) s4-2 #f 128 22)
(let ((v1-34 s4-2))
(set! (-> v1-34 width) (the float 160))
)
(let ((v1-35 s4-2))
(set! (-> v1-35 height) (the float 22))
)
(let ((v1-36 s4-2))
(set! (-> v1-36 scale) 1.3)
)
(set-width! s4-2 160)
(set-height! s4-2 22)
(set-scale! s4-2 1.3)
(let ((a0-31 s4-2))
(set! (-> a0-31 color) (font-color progress-percent))
)
test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc
Generated Vendored
+4 -12
View File
@@ -2370,12 +2370,8 @@
)
)
)
(let ((v1-103 s5-1))
(set! (-> v1-103 width) (the float 328))
)
(let ((v1-104 s5-1))
(set! (-> v1-104 height) (the float 45))
)
(set-width! s5-1 328)
(set-height! s5-1 45)
(set! (-> s5-1 flags) (font-flags shadow kerning middle middle-vert large))
(print-game-text-scaled
(lookup-text! *common-text* (-> gp-0 level-name-id) #f)
@@ -2655,12 +2651,8 @@
)
)
)
(let ((v1-42 gp-4))
(set! (-> v1-42 width) (the float 328))
)
(let ((v1-43 gp-4))
(set! (-> v1-43 height) (the float 100))
)
(set-width! gp-4 328)
(set-height! gp-4 100)
(logior! (-> gp-4 flags) (font-flags shadow kerning large))
(draw-debug-text-box gp-4)
(print-game-text (-> *common-text* data (-> self current-debug-string) text) gp-4 #f 128 22)