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

Update font-color enum (#2670)

Browse Source 
Gives proper names to almost every color. It is very apparent that some
colors are context-sensitive/made for a specific purpose, so those
colors were named after that purpose instead of a generic color name.
This commit is contained in:
ManDude
2023-05-24 06:57:05 +01:00
committed by GitHub
parent 057ae361bf
commit 25fd007233
86 changed files with 570 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak1/all-types.gc
+23 -32
View File
@@ -5919,46 +5919,37 @@
:type uint64
(default 0)
(white 1)
(gray 2)
(orange-red 3)
(bright-orange-red 4)
(dark-yellow 5)
(bright-green 6)
(dark-blue 7)
(light-blue 8)
(dark-pink 9)
(lighter-blue 10)
(dark-light-blue 11)
(dim-white 12)
(dim-gray 13)
(orange-red-2 14)
(yellow-green 15)
(dark-green 16)
(another-gray 17)
(dark-dark-green 18)
(flat-dark-purple 19)
(transparent 2)
(red 3)
(orange 4)
(yellow 5)
(green 6)
(blue 7)
(cyan 8)
(pink 9)
(menu-selected 10)
(menu-selected-parent 11)
(menu 12)
(menu-parent 13)
(menu-func-bad 14)
(menu-flag-on 15)
(menu-flag-on-parent 16)
(menu-flag-off 17)
(menu-flag-off-parent 18)
(menu-invalid 19)
(flat-yellow 20)
(blue-white 21)
(progress-memcard 21)
(pad-back 22)
(pad-shine 23)
(pad-square 24)
(pad-circle 25)
(pad-triangle 26)
(pad-x 27)
(lighter-lighter-blue 28)
(yellow-orange 29)
(yellow-green-2 30)
(another-light-blue 31)
(progress-blue 28)
(progress-yellow 29)
(progress-selected 30)
(progress-percent 31)
(credits 32)
(red-orange 33)
(another-orange-red 34)
(red 3)
(red2 4)
(yellow 5)
(green 6)
(blue 7)
(cyan 10)
(red-reverse 33)
(red-obverse 34)
)
decompiler/config/jak2/all-types.gc
+30 -30
View File
@@ -6311,44 +6311,44 @@
(defenum font-color
:type uint32
(default 0)
(font-color-1 1)
(font-color-2 2)
(white 1)
(transparent 2)
(red 3)
(gold 4)
(orange 4)
(yellow 5)
(green 6)
(blue 7)
(cyan 8)
(magenta 9)
(font-color-10 10)
(font-color-11 11)
(white 12)
(font-color-13 13)
(font-color-14 14)
(font-color-15 15)
(font-color-16 16)
(font-color-17 17)
(font-color-18 18)
(font-color-19 19)
(pink 9)
(menu-selected 10)
(menu-selected-parent 11)
(menu 12)
(menu-parent 13)
(menu-func-bad 14)
(menu-flag-on 15)
(menu-flag-on-parent 16)
(menu-flag-off 17)
(menu-flag-off-parent 18)
(menu-invalid 19)
(flat-yellow 20)
(font-color-21 21)
(font-color-22 22)
(font-color-23 23)
(font-color-24 24)
(font-color-25 25)
(font-color-26 26)
(font-color-27 27)
(font-color-28 28)
(font-color-29 29)
(font-color-30 30)
(font-color-31 31)
(font-color-32 32)
(font-color-33 33)
(font-color-34 34)
(font-color-35 35)
(pad-back 22)
(pad-shine 23)
(pad-square 24)
(pad-circle 25)
(pad-triangle 26)
(pad-x 27)
(progress-old-blue 28)
(progress-old-yellow 29)
(progress-old-selected 30)
(progress-old-percent 31)
(progress 32)
(progress-selected 33)
(progress-force-selected 34)
(progress-option-off 35)
(font-color-36 36)
(font-color-37 37)
(font-color-38 38)
(credits-staff-title1 37)
(credits-staff-title2 38)
(font-color-39 39)
)
;; ---font-h:font-color
goal_src/jak1/engine/common-obs/process-drawable.gc
+1 -1
View File
@@ -448,7 +448,7 @@
(the-as bucket-id s3-0)
*temp-string*
(-> self root trans)
(font-color orange-red)
(font-color red)
(the-as vector2h #f)
)
)
goal_src/jak1/engine/debug/anim-tester.gc
+18 -18
View File
@@ -333,7 +333,7 @@
s4-2
(+ (-> arg0 left) (-> *DISP_LIST-bank* BORDER_WIDTH))
(+ (-> arg0 top) (-> *DISP_LIST-bank* BORDER_HEIGHT) (-> *DISP_LIST-bank* TV_SPACING))
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-12 (-> s4-2 base)))
@@ -921,8 +921,8 @@
(-> arg1 xpos)
(-> arg1 ypos)
(if (= (-> arg1 the-index) (-> arg1 current-index))
(font-color yellow-green)
(font-color dim-white)
(font-color menu-flag-on)
(font-color menu)
)
(font-flags shadow kerning)
)
@@ -999,7 +999,7 @@
s4-1
(-> arg1 xpos)
(-> arg1 ypos)
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-4 (-> s4-1 base)))
@@ -1048,8 +1048,8 @@
(-> arg1 xpos)
(-> arg1 ypos)
(if (= (-> arg1 the-index) (-> arg1 current-index))
(font-color yellow-green)
(font-color dim-white)
(font-color menu-flag-on)
(font-color menu)
)
(font-flags shadow kerning)
)
@@ -1170,7 +1170,7 @@
s4-1
(-> arg1 xpos)
(-> arg1 ypos)
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-4 (-> s4-1 base)))
@@ -1223,8 +1223,8 @@
(-> arg1 xpos)
(-> arg1 ypos)
(if (= (-> arg1 the-index) (-> arg1 current-index))
(font-color yellow-green)
(font-color dim-white)
(font-color menu-flag-on)
(font-color menu)
)
(font-flags shadow kerning)
)
@@ -1340,7 +1340,7 @@
s4-1
(-> arg1 xpos)
(-> arg1 ypos)
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-4 (-> s4-1 base)))
@@ -1495,8 +1495,8 @@
(-> arg1 ypos)
(the-as float 0.0)
(if (= (-> arg1 the-index) (-> arg1 current-index))
(font-color yellow-green)
(font-color dim-white)
(font-color menu-flag-on)
(font-color menu)
)
(font-flags shadow kerning)
)
@@ -1957,7 +1957,7 @@
)
(let ((s1-6 draw-string-xy))
(format (clear *temp-string*) "--Seq--(~-17S)--" (-> (the-as anim-test-sequence s4-0) privname))
(s1-6 *temp-string* s3-3 (-> arg1 xpos) (-> arg1 ypos) (font-color dim-white) (font-flags shadow kerning))
(s1-6 *temp-string* s3-3 (-> arg1 xpos) (-> arg1 ypos) (font-color menu) (font-flags shadow kerning))
)
(let ((a3-17 (-> s3-3 base)))
(let ((v1-355 (the-as object (-> s3-3 base))))
@@ -1987,7 +1987,7 @@
s4-2
(+ (-> arg1 xpos) (* (-> *ANIM_TESTER-bank* EDIT_STATS_X) (-> *DISP_LIST-bank* CHAR_WIDTH)))
(-> arg1 ypos)
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-21 (-> s4-2 base)))
@@ -2045,7 +2045,7 @@
s5-0
(-> *ANIM_TESTER-bank* ANIM_LIST_X)
(-> *ANIM_TESTER-bank* ANIM_LIST_Y)
(font-color orange-red-2)
(font-color menu-func-bad)
(font-flags shadow kerning)
)
(let ((a3-1 (-> s5-0 base)))
@@ -2087,7 +2087,7 @@
s5-1
(-> *ANIM_TESTER-bank* ANIM_LIST_X)
(-> *ANIM_TESTER-bank* ANIM_LIST_Y)
(font-color orange-red-2)
(font-color menu-func-bad)
(font-flags shadow kerning)
)
(let ((a3-3 (-> s5-1 base)))
@@ -2130,7 +2130,7 @@
s5-2
(-> *ANIM_TESTER-bank* EDIT_LIST_X)
(-> *ANIM_TESTER-bank* EDIT_LIST_Y)
(font-color orange-red-2)
(font-color menu-func-bad)
(font-flags shadow kerning)
)
(let ((a3-5 (-> s5-2 base)))
@@ -2161,7 +2161,7 @@
s5-3
(-> *ANIM_TESTER-bank* EDIT_LIST_X)
(-> *ANIM_TESTER-bank* EDIT_LIST_Y)
(font-color orange-red-2)
(font-color menu-func-bad)
(font-flags shadow kerning)
)
(let ((a3-7 (-> s5-3 base)))
goal_src/jak1/engine/debug/menu.gc
+18 -18
View File
@@ -755,9 +755,9 @@
The submenus parameter is the number of _open_ menus below the one containing this item"
(let ((s5-0 (-> item parent context font)))
(set-origin! s5-0 x y)
(set! (-> s5-0 color) (cond ((zero? submenus) (font-color dim-white)) ;; in the active menu, white
(selected (font-color dark-light-blue)) ;; a parent, but selected
(else (font-color dim-gray)) ;; a parent, but not selected
(set! (-> s5-0 color) (cond ((zero? submenus) (font-color menu)) ;; in the active menu, white
(selected (font-color menu-selected-parent)) ;; a parent, but selected
(else (font-color menu-parent)) ;; a parent, but not selected
))
(with-dma-buffer-add-bucket ((s3-0 (-> (current-frame) debug-buf))
(bucket-id debug-no-zbuf))
@@ -779,20 +779,20 @@
((> (-> item hilite-timer) 0)
;; if the hilite is >0, we ran the function successfully, so we hilite in blue for a bit
(1-! (-> item hilite-timer))
(font-color lighter-blue)
(font-color menu-selected)
)
((< (-> item hilite-timer) 0)
;; if we're negative, it failed, so hilite in red
(1+! (-> item hilite-timer))
(font-color orange-red-2)
(font-color menu-func-bad)
)
((nonzero? submenus)
;; in a parent menu
(font-color dim-gray)
(font-color menu-parent)
)
(else
;; option in the active menu.
(font-color dim-white)
(font-color menu)
)
)
)
@@ -811,19 +811,19 @@
(set! (-> v1-2 color)
(cond
((= (-> item is-on) 'invalid)
(font-color flat-dark-purple) ;; can't use this one.
(font-color menu-invalid) ;; can't use this one.
)
((-> item is-on)
(if (zero? submenus)
(font-color yellow-green) ;; on, and in active menu
(font-color dark-green) ;; on, and in parent menu
(font-color menu-flag-on) ;; on, and in active menu
(font-color menu-flag-on-parent) ;; on, and in parent menu
)
)
((zero? submenus)
(font-color another-gray) ;; off, and in active menu
(font-color menu-flag-off) ;; off, and in active menu
)
(else
(font-color dark-dark-green) ;; off, and in parent menu
(font-color menu-flag-off-parent) ;; off, and in parent menu
)
)
)
@@ -843,15 +843,15 @@
(cond
((zero? submenus)
(if (-> item grabbed-joypad-p)
(font-color lighter-blue) ;; active menu, using joypad
(font-color dim-white) ;; active menu, but not grabbed
(font-color menu-selected) ;; active menu, using joypad
(font-color menu) ;; active menu, but not grabbed
)
)
(selected
(font-color dark-light-blue) ;; not sure how this case can happen
(font-color menu-selected-parent) ;; not sure how this case can happen
)
(else
(font-color dim-gray)
(font-color menu-parent)
)
)
)
@@ -958,8 +958,8 @@
;; dim it if it's in a parent menu.
(set! (-> menu context font color)
(if (nonzero? submenus)
(font-color dim-gray)
(font-color dim-white)
(font-color menu-parent)
(font-color menu)
)
)
(set-origin! (-> menu context font) s3-1 s2-1)
goal_src/jak1/engine/entity/ambient.gc
+1 -1
View File
@@ -693,7 +693,7 @@
(bucket-id debug-no-zbuf)
*temp-string*
(-> arg0 bsphere)
(font-color orange-red)
(font-color red)
(the-as vector2h #f)
)
)
goal_src/jak1/engine/game/main.gc
+1 -1
View File
@@ -792,7 +792,7 @@
(bucket-id debug))
(if (and (= *master-mode* 'pause) (!= *cheat-mode* 'camera))
(draw-string-xy (lookup-text! *common-text* (text-id pause) #f)
s3-1 256 160 (font-color orange-red) (font-flags shadow kerning middle large))
s3-1 256 160 (font-color red) (font-flags shadow kerning middle large))
)
;; draw console text on screen
goal_src/jak1/engine/geometry/path.gc
+4 -4
View File
@@ -21,7 +21,7 @@
(the-as bucket-id s3-0)
*temp-string*
(-> obj process root trans)
(font-color orange-red)
(font-color red)
(the-as vector2h #f)
)
)
@@ -52,7 +52,7 @@
(s1-0 68)
)
(format (clear *temp-string*) "~D" s5-1)
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color bright-orange-red) (the-as vector2h #f))
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
)
)
)
@@ -280,7 +280,7 @@
(the-as bucket-id s3-0)
*temp-string*
(-> obj process root trans)
(font-color orange-red)
(font-color red)
(the-as vector2h #f)
)
)
@@ -309,7 +309,7 @@
(s1-0 68)
)
(format (clear *temp-string*) "~D" s5-1)
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color bright-orange-red) (the-as vector2h #f))
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
)
)
)
goal_src/jak1/engine/gfx/font-h.gc
+52 -61
View File
@@ -10,48 +10,39 @@
(defenum font-color
:type uint64
(default 0) ;; menu and HUD
(white 1) ;; debug, camera settings, actor marks
(gray 2) ;; unused?
(orange-red 3) ;; debug values, subtitles - character names
(bright-orange-red 4) ;; debug, path marks numbers
(dark-yellow 5) ;; HUD, other numbers
(bright-green 6) ;; HUD, health numbers
(dark-blue 7) ;; unused?
(light-blue 8) ;; unused?
(dark-pink 9) ;; unused?
(lighter-blue 10) ;; debug, selected using joypad
(dark-light-blue 11) ;; debug, parent of active menu
(dim-white 12) ;; debug, active menu, regular
(dim-gray 13) ;; debug, parent menu, regular
(orange-red-2 14) ;; debug, anim-tester
(yellow-green 15) ;; debug, active menu, enabled
(dark-green 16) ;; debug, parent menu, enabled
(another-gray 17) ;; debug, active menu, disabled
(dark-dark-green 18) ;; debug, parent menu, disabled
(flat-dark-purple 19) ;; menu and debug, grayed out option
(flat-yellow 20) ;; debug, rev.
(blue-white 21) ;; menu, under percentage, save slot stats
(default 0)
(white 1)
(transparent 2)
(red 3)
(orange 4)
(yellow 5)
(green 6)
(blue 7)
(cyan 8)
(pink 9)
(menu-selected 10)
(menu-selected-parent 11)
(menu 12)
(menu-parent 13)
(menu-func-bad 14)
(menu-flag-on 15)
(menu-flag-on-parent 16)
(menu-flag-off 17)
(menu-flag-off-parent 18)
(menu-invalid 19)
(flat-yellow 20)
(progress-memcard 21)
(pad-back 22)
(pad-shine 23)
(pad-square 24)
(pad-circle 25)
(pad-triangle 26)
(pad-x 27)
(lighter-lighter-blue 28) ;; menu, location name, task status
(yellow-orange 29) ;; menu, power cell description
(yellow-green-2 30) ;; menu, selected
(another-light-blue 31) ;; menu, completion percentage
(progress-blue 28)
(progress-yellow 29)
(progress-selected 30)
(progress-percent 31)
(credits 32)
(red-orange 33) ;; pc-pad-utils?
(another-orange-red 34) ;; unused?
(red 3)
(red2 4)
(yellow 5)
(green 6)
(blue 7)
(cyan 10)
(red-reverse 33)
(red-obverse 34)
)
@@ -420,7 +411,7 @@
(static-rgba #x60 #x60 #x60 #x80)
)
)
;; 02 - gray
;; 02 - transparent
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -430,7 +421,7 @@
(static-rgba #x60 #x60 #x60 #x40)
)
)
;; 03 - orange-red (debug values, subtitles - character names)
;; 03 - red (debug values, subtitles - character names)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -440,7 +431,7 @@
(static-rgba #x60 #x00 #x00 #x80)
)
)
;; 04 - bright-orange-red (debug, path marks numbers)
;; 04 - orange (debug, path marks numbers)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -450,7 +441,7 @@
(static-rgba #x80 #x00 #x00 #x80)
)
)
;; 05 - dark-yellow (HUD, other numbers)
;; 05 - yellow (HUD, other numbers)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -460,7 +451,7 @@
(static-rgba #x28 #x28 #x00 #x80)
)
)
;; 06 - bright-green (HUD, health numbers)
;; 06 - green (HUD, health numbers)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -470,7 +461,7 @@
(static-rgba #x00 #x30 #x00 #x80)
)
)
;; 07 - dark-blue
;; 07 - blue
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -480,7 +471,7 @@
(static-rgba #x00 #x00 #x60 #x80)
)
)
;; 08 - light-blue
;; 08 - cyan
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -490,7 +481,7 @@
(static-rgba #x00 #x20 #x50 #x80)
)
)
;; 09 - dark-pink
;; 09 - pink
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -500,7 +491,7 @@
(static-rgba #x30 #x00 #x30 #x80)
)
)
;; 10 - lighter-blue (debug, selected using joypad)
;; 10 - menu-selected (debug, selected using joypad)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -510,7 +501,7 @@
(static-rgba #x00 #x40 #x60 #x80)
)
)
;; 11 - dark-light-blue (debug, parent of active menu)
;; 11 - menu-selected-parent (debug, parent of active menu)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -520,7 +511,7 @@
(static-rgba #x00 #x20 #x40 #x80)
)
)
;; 12 - dim-white (debug, active menu, regular)
;; 12 - menu (debug, active menu, regular)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -530,7 +521,7 @@
(static-rgba #x50 #x50 #x50 #x80)
)
)
;; 13 - dim-gray (debug, parent menu, regular)
;; 13 - menu-parent (debug, parent menu, regular)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -540,7 +531,7 @@
(static-rgba #x28 #x28 #x28 #x80)
)
)
;; 14 - orange-red-2 (debug, anim-tester)
;; 14 - menu-func-bad (debug, anim-tester)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -550,7 +541,7 @@
(static-rgba #x60 #x00 #x00 #x80)
)
)
;; 15 - yellow-green (debug, active menu, enabled)
;; 15 - menu-flag-on (debug, active menu, enabled)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -560,7 +551,7 @@
(static-rgba #x00 #x60 #x00 #x80)
)
)
;; 16 - dark-green (debug, parent menu, enabled)
;; 16 - menu-flag-on-parent (debug, parent menu, enabled)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -570,7 +561,7 @@
(static-rgba #x00 #x38 #x00 #x80)
)
)
;; 17 - another-gray (debug, active menu, disabled)
;; 17 - menu-flag-off (debug, active menu, disabled)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -580,7 +571,7 @@
(static-rgba #x30 #x40 #x30 #x80)
)
)
;; 18 - dark-dark-green (debug, parent menu, disabled)
;; 18 - menu-flag-off-parent (debug, parent menu, disabled)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -590,7 +581,7 @@
(static-rgba #x18 #x28 #x18 #x80)
)
)
;; 19 - flat-dark-purple (menu and debug, grayed out option)
;; 19 - menu-invalid (menu and debug, grayed out option)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -610,7 +601,7 @@
(static-rgba #x80 #x79 #x48 #x80)
)
)
;; 21 - blue-white (menu, under percentage, save slot stats)
;; 21 - progress-memcard (menu, under percentage, save slot stats)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -680,7 +671,7 @@
(static-rgba #x46 #x4a #x78 #x80)
)
)
;; 28 - lighter-lighter-blue (menu, location name, task status)
;; 28 - progress-blue (menu, location name, task status)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -690,7 +681,7 @@
(static-rgba #x29 #x63 #x70 #x80)
)
)
;; 29 - yellow-orange (menu, power cell description)
;; 29 - progress-yellow (menu, power cell description)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -700,7 +691,7 @@
(static-rgba #x76 #x40 #x14 #x80)
)
)
;; 30 - yellow-green-2 (menu, selected)
;; 30 - progress-selected (menu, selected)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -710,7 +701,7 @@
(static-rgba #x1b #x51 #x20 #x80)
)
)
;; 31 - another-light-blue (menu, completion percentage)
;; 31 - progress-percent (menu, completion percentage)
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -720,7 +711,7 @@
(static-rgba #x00 #x3c #x4f #x80)
)
)
;; 32 - light-yellow
;; 32 - credits
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -730,7 +721,7 @@
(static-rgba #x30 #x38 #x30 #x80)
)
)
;; 33 - red-orange
;; 33 - red-reverse
(new 'static 'char-color
:color
(new 'static 'array rgba 4
@@ -740,7 +731,7 @@
(static-rgba #x80 #x60 #x20 #x80)
)
)
;; 34 - another-orange-red
;; 34 - red-obverse
(new 'static 'char-color
:color
(new 'static 'array rgba 4
goal_src/jak1/engine/gfx/hw/display.gc
+2 -2
View File
@@ -312,7 +312,7 @@
(define *font-context* (new 'global 'font-context *font-default-matrix* 0 24 0.0 (font-color default) (font-flags shadow kerning)))
;; not used, but looks like it would work for the "PAUSE" text.
(define *pause-context* (new 'global 'font-context *font-default-matrix* 256 170 0.0 (font-color orange-red) (font-flags shadow kerning)))
(define *pause-context* (new 'global 'font-context *font-default-matrix* 256 170 0.0 (font-color red) (font-flags shadow kerning)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; PROFILE BAR
@@ -451,7 +451,7 @@
(the float *ticks-per-frame*)
)))
(draw-string-xy (string-format "~5,,2f" f30-0) buf 488 (+ bar-pos 8)
(if (>= f30-0 100.0) (font-color orange-red) (font-color default)) ;; turn red if over 100.
(if (>= f30-0 100.0) (font-color red) (font-color default)) ;; turn red if over 100.
(font-flags shadow right)
)
f30-0
goal_src/jak1/engine/gfx/ocean/ocean-mid.gc
+1 -1
View File
@@ -1133,7 +1133,7 @@
(bucket-id debug-no-zbuf)
*temp-string*
p0
(font-color orange-red)
(font-color red)
(the vector2h #f)
)
)
goal_src/jak1/engine/ps2/memcard-h.gc
+1 -1
View File
@@ -97,7 +97,7 @@
)
)
)
(draw-string-xy *temp-string* dma-buf 32 (+ (* 12 slot-idx) 8) (font-color orange-red) (font-flags shadow))
(draw-string-xy *temp-string* dma-buf 32 (+ (* 12 slot-idx) 8) (font-color red) (font-flags shadow))
)
)
(none)
goal_src/jak1/engine/ui/hud-classes.gc
+12 -12
View File
@@ -153,7 +153,7 @@
)
2
)
(font-color bright-green)
(font-color green)
(font-flags shadow kerning large)
)
)
@@ -501,7 +501,7 @@
-17
)
0.0
(font-color orange-red)
(font-color red)
(font-flags shadow kerning)
)
)
@@ -543,7 +543,7 @@
)
s5-0
)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning middle large)
)
)
@@ -759,7 +759,7 @@
buf
string-x
(- string-y 5)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
0.8
)
@@ -776,7 +776,7 @@
buf
string-x
(- string-y 5)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
0.8
)
@@ -789,7 +789,7 @@
buf
string-x
string-y
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
)
)
@@ -1159,7 +1159,7 @@
buf
string-x
(- string-y 5)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
0.8
)
@@ -1184,7 +1184,7 @@
buf
string-x
(- string-y 5)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
0.8
)
@@ -1197,7 +1197,7 @@
buf
string-x
string-y
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
)
)
@@ -1457,7 +1457,7 @@
buf
string-x
(- string-y 5)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
0.8
)
@@ -1474,7 +1474,7 @@
buf
string-x
(- string-y 5)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
0.8
)
@@ -1487,7 +1487,7 @@
buf
string-x
string-y
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
)
)
goal_src/jak1/engine/ui/progress/progress-draw.gc
+8 -8
View File
@@ -138,7 +138,7 @@
(- (+ s2-0 32) (-> obj left-x-offset))
(+ (/ s4-1 2) 125)
8325000.0
(font-color yellow-orange)
(font-color progress-yellow)
(font-flags shadow kerning)
)
)
@@ -165,7 +165,7 @@
(set! (-> s0-1 origin x) (the float (- (+ s2-0 32) (-> obj left-x-offset))))
(set! (-> s0-1 origin y) (the float (+ (/ s4-1 2) 175)))
(let ((a0-49 s0-1))
(set! (-> a0-49 color) (font-color lighter-lighter-blue))
(set! (-> a0-49 color) (font-color progress-blue))
)
(let ((v1-104 s0-1))
(set! (-> v1-104 height) (the float 15))
@@ -736,7 +736,7 @@
(print-game-text "OLD SAVE GAME" arg0 #f s4-1 22)
)
(let ((a0-28 arg0))
(set! (-> a0-28 color) (font-color blue-white))
(set! (-> a0-28 color) (font-color progress-memcard))
)
(cond
((or (>= (seconds 2) (- (-> *display* real-frame-counter) (-> obj last-option-index-change)))
@@ -1585,7 +1585,7 @@
(set! (-> obj language-x-offset) 0)
)
(set! (-> font origin y) (the float (+ s2-1 3)))
(set-color! font (font-color lighter-lighter-blue))
(set-color! font (font-color progress-blue))
0
(let ((next-lang (mod (+ old-lang 1) max-lang))
(a0-66 (mod (+ max-lang -1 old-lang) max-lang))
@@ -1630,7 +1630,7 @@
)
)
(if (not (-> obj language-transition))
(set-color! font (font-color yellow-green-2)))
(set-color! font (font-color progress-selected)))
(print-language-name (the-as int old-lang) font (-> obj language-x-offset) (-> obj language-direction))
))
(((game-option-type center-screen))
@@ -1677,7 +1677,7 @@
(when option-str
(let ((f0-23 (-> obj transition-percentage-invert)))
(set-color! font (if (and (= s0-0 (-> obj option-index)) (not (-> obj in-transition)))
(font-color yellow-green-2)
(font-color progress-selected)
(font-color default)
)
)
@@ -1799,7 +1799,7 @@
(set! (-> v1-36 scale) 1.3)
)
(let ((a0-31 s4-2))
(set! (-> a0-31 color) (font-color another-light-blue))
(set! (-> a0-31 color) (font-color progress-percent))
)
(set! (-> s4-2 origin x)
(+ (- 435.0 (the float (if (< (-> *progress-process* 0 completion-percentage) 10.0)
@@ -1856,7 +1856,7 @@
s3-5
(the int (+ 430.0 f30-0))
200
(font-color blue-white)
(font-color progress-memcard)
(font-flags shadow kerning middle)
)
(let ((a3-9 (-> s3-5 base)))
goal_src/jak1/engine/ui/progress/progress.gc
+1 -1
View File
@@ -2160,7 +2160,7 @@
(- 32 (-> self left-x-offset))
(the int (* (+ 42.0 (the float (/ v1-98 2))) f30-0))
8325000.0
(font-color lighter-lighter-blue)
(font-color progress-blue)
(font-flags shadow kerning)
)
)
goal_src/jak1/examples/debug-draw-example.gc
+1 -1
View File
@@ -59,7 +59,7 @@
(add-debug-x #t (bucket-id debug-draw0) (new 'static 'vector) (new 'static 'rgba :g #x80 :a #x80))
(add-debug-box #t (bucket-id debug-draw0) p0 p2 (new 'static 'rgba :b #x80 :a #x80))
(add-debug-flat-triangle #t (bucket-id debug-draw0) p0 p1 p2 (new 'static 'rgba :r #x80))
(add-debug-text-3d #t (bucket-id debug-draw0) "triangle!" p0 (font-color yellow-green) (the vector2h #f))
(add-debug-text-3d #t (bucket-id debug-draw0) "triangle!" p0 (font-color menu-flag-on) (the vector2h #f))
(add-debug-sphere #t (bucket-id debug-draw0) p2 (meters 0.5) (new 'static 'rgba :r #x80))
)
)
goal_src/jak1/levels/jungle/fisher.gc
+2 -2
View File
@@ -1066,7 +1066,7 @@
435
10
0.0
(font-color orange-red)
(font-color red)
(font-flags shadow kerning)
)
)
@@ -1358,7 +1358,7 @@
56
100
0.0
(font-color orange-red)
(font-color red)
(font-flags shadow kerning)
)
)
goal_src/jak1/levels/rolling/rolling-obs.gc
+4 -4
View File
@@ -1041,7 +1041,7 @@
0
0
0.0
(font-color yellow-orange)
(font-color progress-yellow)
(font-flags shadow kerning)
)
)
@@ -1081,7 +1081,7 @@
(set! (-> gp-0 origin y) 80.0)
(set! (-> gp-0 flags) (font-flags shadow kerning middle left large))
(let ((a0-15 gp-0))
(set! (-> a0-15 color) (font-color orange-red))
(set! (-> a0-15 color) (font-color red))
)
(print-game-text (lookup-text! *common-text* (text-id new-record) #f) gp-0 #f 128 22)
)
@@ -1109,7 +1109,7 @@
(set! (-> gp-0 origin y) 80.0)
(set! (-> gp-0 flags) (font-flags shadow kerning middle left large))
(let ((a0-23 gp-0))
(set! (-> a0-23 color) (font-color orange-red))
(set! (-> a0-23 color) (font-color red))
)
(print-game-text (lookup-text! *common-text* (text-id try-again) #f) gp-0 #f 128 22)
)
@@ -1181,7 +1181,7 @@
156
80
0.0
(font-color orange-red)
(font-color red)
(font-flags shadow kerning)
)
)
goal_src/jak1/levels/village_common/villagep-obs.gc
+2 -2
View File
@@ -321,7 +321,7 @@
(set! (-> v1-43 height) (the float 40))
)
(let ((a0-34 s1-3))
(set! (-> a0-34 color) (font-color lighter-lighter-blue))
(set! (-> a0-34 color) (font-color progress-blue))
)
0
(let ((s0-3 (get-next-slot-up self gp-0)))
@@ -379,7 +379,7 @@
)
(when (not s5-0)
(let ((a0-47 s1-3))
(set! (-> a0-47 color) (font-color yellow-orange))
(set! (-> a0-47 color) (font-color progress-yellow))
)
)
(print-level-name gp-0 s1-3 s2-0 (the-as int s4-0))
goal_src/jak1/pc/debug/anim-tester-x.gc
+3 -3
View File
@@ -244,21 +244,21 @@
(let ((items-drawn (-> lst offset))
(i 0)
(color (font-color dim-white))
(color (font-color menu))
(text-len 0.0))
(with-dma-buffer-add-bucket ((buf (-> (current-frame) debug-buf))
(bucket-id debug-no-zbuf))
(when (nonzero? (length title))
(set! text-len (draw-string-xy title buf 9 (+ 28 4 (* items-drawn 8)) (font-color dim-white) (font-flags shadow kerning)))
(set! text-len (draw-string-xy title buf 9 (+ 28 4 (* items-drawn 8)) (font-color menu) (font-flags shadow kerning)))
(1+! items-drawn)
)
(do-atx-list (item lst)
(let ((selected? (= i (-> lst selection))))
(set! color (if (= (-> item extra) sel-obj) (font-color yellow-green) (font-color dim-white)))
(set! color (if (= (-> item extra) sel-obj) (font-color menu-flag-on) (font-color menu)))
(let ((this-len (draw-string-xy (-> item group name) buf 21 (+ 28 4 (* items-drawn 8)) color (font-flags shadow kerning))))
(if (> this-len text-len)
goal_src/jak1/pc/progress-pc.gc
+13 -13
View File
@@ -661,7 +661,7 @@
(set! (-> *progress-carousell* x-offset) 0)
)
(set! (-> font origin y) (the float (+ y-off 3)))
(set-color! font (font-color lighter-lighter-blue))
(set-color! font (font-color progress-blue))
0
(let ((next-lang (mod (+ old-lang 1) max-lang))
(prev-lang (mod (+ max-lang -1 old-lang) max-lang))
@@ -674,7 +674,7 @@
(let ((a2-22 (- 200 (+ (-> *progress-carousell* x-offset) 100))))
(print-string-in-carousell (-> options prev-lang) font a2-22 #f)
)
(set-color! font (font-color lighter-lighter-blue))
(set-color! font (font-color progress-blue))
(let ((a2-23 (+ (-> *progress-carousell* x-offset) 100)))
(cond
((< a2-23 150)
@@ -701,7 +701,7 @@
)
)
)
(set-color! font (font-color lighter-lighter-blue))
(set-color! font (font-color progress-blue))
(let ((a2-27 (- 200 (+ (-> *progress-carousell* x-offset) 100))))
(print-string-in-carousell (-> options next-lang) font a2-27 #t)
)
@@ -709,7 +709,7 @@
)
)
(if (not (-> *progress-carousell* transition))
(set-color! font (font-color yellow-green-2)))
(set-color! font (font-color progress-selected)))
(print-string-in-carousell (-> options old-lang) font (-> *progress-carousell* x-offset) (-> *progress-carousell* direction))
)
)
@@ -2128,7 +2128,7 @@
(set! (-> obj language-x-offset) 0)
)
(set! (-> font origin y) (the float (+ y-off 3)))
(set-color! font (font-color lighter-lighter-blue))
(set-color! font (font-color progress-blue))
0
(let ((next-lang (mod (+ old-lang 1) max-lang))
(prev-lang (mod (+ max-lang -1 old-lang) max-lang))
@@ -2141,7 +2141,7 @@
(let ((a2-22 (- 200 (+ (-> obj language-x-offset) 100))))
(print-language-name prev-lang font a2-22 #f)
)
(set-color! font (font-color lighter-lighter-blue))
(set-color! font (font-color progress-blue))
(let ((a2-23 (+ (-> obj language-x-offset) 100)))
(cond
((< a2-23 150)
@@ -2168,7 +2168,7 @@
)
)
)
(set-color! font (font-color lighter-lighter-blue))
(set-color! font (font-color progress-blue))
(let ((a2-27 (- 200 (+ (-> obj language-x-offset) 100))))
(print-language-name (the int next-lang) font a2-27 #t)
)
@@ -2176,7 +2176,7 @@
)
)
(if (not (-> obj language-transition))
(set-color! font (font-color yellow-green-2)))
(set-color! font (font-color progress-selected)))
(print-language-name (the-as int old-lang) font (-> obj language-x-offset) (-> obj language-direction))
))
(((game-option-type aspect-ratio))
@@ -2298,10 +2298,10 @@
((and (!= index (-> obj option-index))
(or locked? (= locked-str option-str)))
;; for "locked" options!
(font-color flat-dark-purple))
(font-color menu-invalid))
((and (= index (-> obj option-index))
(not (or (progress-scrolling?) (-> obj in-transition))))
(font-color yellow-green-2))
(font-color progress-selected))
(else
(font-color default))
))
@@ -2331,7 +2331,7 @@
(set-flags! arg0 (font-flags shadow kerning middle left large))
(set-origin! arg0 (- 20 (-> obj left-x-offset)) 30)
(set-width! arg0 360)
(set-color! arg0 (font-color lighter-lighter-blue))
(set-color! arg0 (font-color progress-blue))
(set-height! arg0 20)
(print-game-text-scaled (lookup-text! *common-text* (text-id speedrun-options-heading) #f)
(-> obj transition-percentage-invert) arg0 128)
@@ -2340,7 +2340,7 @@
(set-origin! arg0 (- 20 (-> obj left-x-offset)) 60)
(set-width! arg0 360)
(set-height! arg0 20)
(set-color! arg0 (font-color yellow-orange))
(set-color! arg0 (font-color progress-yellow))
(print-game-text-scaled (lookup-text! *common-text* (text-id speedrun-options-warning) #f)
(-> obj transition-percentage-invert) arg0 128)
0)
@@ -2613,7 +2613,7 @@
(- 32 (-> self left-x-offset))
(the int (* (+ 42.0 (the float (/ v1-98 2))) f30-0))
8325000.0
(font-color lighter-lighter-blue)
(font-color progress-blue)
(font-flags shadow kerning)
))
)
goal_src/jak1/pc/util/font-encode-test.gc
+1 -1
View File
@@ -39,7 +39,7 @@
(process-spawn-function process :name 'font-encode
(lambda :behavior process ()
(let ((fnt (new 'stack 'font-context *font-default-matrix* FONT_ENCODE_TEXT_LEFT FONT_ENCODE_TEXT_Y 0.0
(font-color orange-red) (font-flags shadow kerning large middle)))
(font-color red) (font-flags shadow kerning large middle)))
)
(set-width! fnt 400)
goal_src/jak2/engine/camera/cam-layout.gc
+1 -1
View File
@@ -167,7 +167,7 @@
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) debug-buf))
(bucket-id debug2)
)
(draw-string-xy arg2 s5-0 arg0 arg1 (font-color font-color-1) (font-flags shadow kerning))
(draw-string-xy arg2 s5-0 arg0 arg1 (font-color white) (font-flags shadow kerning))
)
)
goal_src/jak2/engine/collide/collide-edge-grab.gc
+1 -1
View File
@@ -589,7 +589,7 @@
)
(sv-32 a0-10 a1-4 a2-2)
)
(s2-0 s1-0 (the-as bucket-id s0-0) *temp-string* s3-0 (font-color font-color-1) (the-as vector2h #f))
(s2-0 s1-0 (the-as bucket-id s0-0) *temp-string* s3-0 (font-color white) (the-as vector2h #f))
)
)
)
goal_src/jak2/engine/debug/editable.gc
+6 -6
View File
@@ -123,7 +123,7 @@
(s1-0 (bucket-id debug-no-zbuf1))
)
(format (clear *temp-string*) "region-~D~%" (-> obj id))
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* arg0 (font-color font-color-1) sv-32)
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* arg0 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
(when (>= arg1 1)
@@ -134,7 +134,7 @@
(s1-1 (bucket-id debug-no-zbuf1))
)
(format (clear *temp-string*) "(on-enter ~S)" s4-1)
(s3-1 s2-1 (the-as bucket-id s1-1) *temp-string* arg0 (font-color font-color-1) sv-32)
(s3-1 s2-1 (the-as bucket-id s1-1) *temp-string* arg0 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -146,7 +146,7 @@
(s1-2 318)
)
(format (clear *temp-string*) "(on-inside ~S)" s4-2)
(s3-2 s2-2 (the-as bucket-id s1-2) *temp-string* arg0 (font-color font-color-1) sv-32)
(s3-2 s2-2 (the-as bucket-id s1-2) *temp-string* arg0 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -158,7 +158,7 @@
(s2-3 318)
)
(format (clear *temp-string*) "(on-exit ~S)" s5-1)
(s4-3 s3-3 (the-as bucket-id s2-3) *temp-string* arg0 (font-color font-color-1) sv-32)
(s4-3 s3-3 (the-as bucket-id s2-3) *temp-string* arg0 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -951,7 +951,7 @@
(s3-1 318)
)
(format (clear *temp-string*) "~S~%" (-> obj name))
(s5-1 s4-1 (the-as bucket-id s3-1) *temp-string* (-> obj trans) (font-color font-color-1) (the-as vector2h #f))
(s5-1 s4-1 (the-as bucket-id s3-1) *temp-string* (-> obj trans) (font-color white) (the-as vector2h #f))
)
)
((method-of-type editable-sphere editable-method-10) obj)
@@ -1186,7 +1186,7 @@
(-> gp-0 s4-1)
(if (logtest? (-> obj flags) (editable-flag orient))
(font-color yellow)
(font-color font-color-1)
(font-color white)
)
(the-as vector2h #f)
)
goal_src/jak2/engine/debug/menu.gc
+14 -14
View File
@@ -740,13 +740,13 @@
)
(set! (-> s5-0 color) (cond
((zero? arg3)
(font-color white)
(font-color menu)
)
(arg4
(font-color font-color-11)
(font-color menu-selected-parent)
)
(else
(font-color font-color-13)
(font-color menu-parent)
)
)
)
@@ -807,19 +807,19 @@
)
(set! (-> v1-2 color) (cond
((= (-> arg0 is-on) 'invalid)
(font-color font-color-19)
(font-color menu-invalid)
)
((-> arg0 is-on)
(if (zero? arg3)
(font-color font-color-15)
(font-color font-color-16)
(font-color menu-flag-on)
(font-color menu-flag-on-parent)
)
)
((zero? arg3)
(font-color font-color-17)
(font-color menu-flag-off)
)
(else
(font-color font-color-18)
(font-color menu-flag-off-parent)
)
)
)
@@ -844,15 +844,15 @@
(set! (-> s5-0 color) (cond
((zero? arg3)
(if (-> arg0 grabbed-joypad-p)
(font-color font-color-10)
(font-color white)
(font-color menu-selected)
(font-color menu)
)
)
(arg4
(font-color font-color-11)
(font-color menu-selected-parent)
)
(else
(font-color font-color-13)
(font-color menu-parent)
)
)
)
@@ -949,8 +949,8 @@
(while (not (null? s1-1))
(when (= s0-1 arg3)
(set! (-> arg0 context font color) (if (nonzero? arg4)
(font-color font-color-13)
(font-color white)
(font-color menu-parent)
(font-color menu)
)
)
(let ((v1-20 (-> arg0 context font))
goal_src/jak2/engine/draw/drawable.gc
+1 -1
View File
@@ -213,7 +213,7 @@
(bucket-id debug-no-zbuf1)
arg1
(-> arg0 bsphere)
(font-color font-color-1)
(font-color white)
(the-as vector2h #f)
)
)
goal_src/jak2/engine/entity/entity.gc
+4 -4
View File
@@ -1107,7 +1107,7 @@
(-> (the-as process-drawable arg0) root trans)
(if (logtest? (-> sv-16 extra perm status) (entity-perm-status bit-0 bit-1))
(font-color red)
(font-color font-color-1)
(font-color white)
)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 8))
)
@@ -1123,7 +1123,7 @@
(the-as bucket-id s3-1)
*temp-string*
(-> (the-as process-drawable arg0) root trans)
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 24))
)
)
@@ -1135,7 +1135,7 @@
(bucket-id debug-no-zbuf1)
(symbol->string v1-49)
(-> (the-as process-drawable arg0) root trans)
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 24))
)
)
@@ -1184,7 +1184,7 @@
"#f"
)
(-> (the-as process-drawable arg0) root trans)
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 16))
)
(label cfg-51)
goal_src/jak2/engine/game/game-info.gc
+2 -2
View File
@@ -892,7 +892,7 @@
(+ (the int (/ (the float (+ (/ (-> s3-0 x) 16) -1792)) (-> *video-params* relative-x-scale))) -48)
(+ (/ (-> s3-0 y) 16) -1855)
0.0
(font-color gold)
(font-color orange)
(font-flags shadow kerning)
)
)
@@ -1186,7 +1186,7 @@
(bucket-id debug-no-zbuf1)
(-> obj name)
(-> obj trans)
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 8))
)
(let ((a3-2 (vector-z-quaternion! (new-stack-vector0) (the-as quaternion (-> obj quat)))))
goal_src/jak2/engine/game/task/task-control.gc
+1 -1
View File
@@ -1413,7 +1413,7 @@
70
20
0.0
(font-color gold)
(font-color orange)
(font-flags shadow kerning)
)
)
goal_src/jak2/engine/geometry/path.gc
+2 -2
View File
@@ -52,7 +52,7 @@
(s1-0 (bucket-id debug-no-zbuf1))
)
(format (clear *temp-string*) "~D" s5-1)
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color gold) (the-as vector2h #f))
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
)
)
)
@@ -430,7 +430,7 @@ using the fractional component of `idx` as the interpolant, return this result
(s1-0 (bucket-id debug-no-zbuf1))
)
(format (clear *temp-string*) "~D" s5-1)
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color gold) (the-as vector2h #f))
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
)
)
)
goal_src/jak2/engine/gfx/font-h.gc
+31 -31
View File
@@ -11,44 +11,44 @@
(defenum font-color
:type uint32
(default 0)
(font-color-1 1)
(font-color-2 2)
(white 1)
(transparent 2)
(red 3)
(gold 4)
(orange 4)
(yellow 5)
(green 6)
(blue 7)
(cyan 8)
(magenta 9)
(font-color-10 10)
(font-color-11 11)
(white 12)
(font-color-13 13)
(font-color-14 14)
(font-color-15 15)
(font-color-16 16)
(font-color-17 17)
(font-color-18 18)
(font-color-19 19)
(pink 9)
(menu-selected 10)
(menu-selected-parent 11)
(menu 12)
(menu-parent 13)
(menu-func-bad 14)
(menu-flag-on 15)
(menu-flag-on-parent 16)
(menu-flag-off 17)
(menu-flag-off-parent 18)
(menu-invalid 19)
(flat-yellow 20)
(font-color-21 21)
(font-color-22 22)
(font-color-23 23)
(font-color-24 24)
(font-color-25 25)
(font-color-26 26)
(font-color-27 27)
(font-color-28 28)
(font-color-29 29)
(font-color-30 30)
(font-color-31 31)
(font-color-32 32)
(font-color-33 33)
(font-color-34 34)
(font-color-35 35)
(pad-back 22)
(pad-shine 23)
(pad-square 24)
(pad-circle 25)
(pad-triangle 26)
(pad-x 27)
(progress-old-blue 28)
(progress-old-yellow 29)
(progress-old-selected 30)
(progress-old-percent 31)
(progress 32)
(progress-selected 33)
(progress-force-selected 34)
(progress-option-off 35)
(font-color-36 36)
(font-color-37 37)
(font-color-38 38)
(credits-staff-title1 37)
(credits-staff-title2 38)
(font-color-39 39)
)
;; ---font-color
@@ -723,7 +723,7 @@
(set! (-> *font-work* color-table color color (* vert 2) g) (-> rgba-green r))
(set! (-> *font-work* color-table color color (* vert 2) b) (-> rgba-blue r))
;; missing?
;; (set! (-> *font-work* color-table color (1+ (* vert 2)) r) (-> rgba-green r))
;; (set! (-> *font-work* color-table color (1+ (* vert 2)) r) (-> rgba-red r))
(set! (-> *font-work* color-table color color (1+ (* vert 2)) g) (-> rgba-green r))
(set! (-> *font-work* color-table color color (1+ (* vert 2)) b) (-> rgba-blue r))
0
goal_src/jak2/engine/level/region.gc
+4 -4
View File
@@ -94,7 +94,7 @@
(s3-0 (bucket-id debug-no-zbuf1))
)
(format (clear *temp-string*) "region-~D~%" (-> obj region id))
(s5-0 s4-0 (the-as bucket-id s3-0) *temp-string* sv-36 (font-color font-color-1) sv-32)
(s5-0 s4-0 (the-as bucket-id s3-0) *temp-string* sv-36 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
(let ((s5-1 (-> obj region on-enter)))
@@ -104,7 +104,7 @@
(s2-1 (bucket-id debug-no-zbuf1))
)
(format (clear *temp-string*) "(on-enter ~S)" s5-1)
(s4-1 s3-1 (the-as bucket-id s2-1) *temp-string* sv-36 (font-color font-color-1) sv-32)
(s4-1 s3-1 (the-as bucket-id s2-1) *temp-string* sv-36 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -116,7 +116,7 @@
(s2-2 (bucket-id debug-no-zbuf1))
)
(format (clear *temp-string*) "(on-inside ~S)" s5-2)
(s4-2 s3-2 (the-as bucket-id s2-2) *temp-string* sv-36 (font-color font-color-1) sv-32)
(s4-2 s3-2 (the-as bucket-id s2-2) *temp-string* sv-36 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -128,7 +128,7 @@
(s3-3 (bucket-id debug-no-zbuf1))
)
(format (clear *temp-string*) "(on-exit ~S)" gp-1)
(s5-3 s4-3 (the-as bucket-id s3-3) *temp-string* sv-36 (font-color font-color-1) sv-32)
(s5-3 s4-3 (the-as bucket-id s3-3) *temp-string* sv-36 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
goal_src/jak2/engine/nav/nav-mesh.gc
+3 -3
View File
@@ -389,7 +389,7 @@
(bucket-id debug-no-zbuf1)
(res-lump-struct obj 'name string)
s5-0
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 8))
)
(let ((s4-1 add-debug-text-3d)
@@ -402,7 +402,7 @@
(the-as bucket-id s2-1)
*temp-string*
s5-0
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 16))
)
)
@@ -548,7 +548,7 @@
(the-as bucket-id s2-1)
*temp-string*
(-> gp-0 1)
(font-color magenta)
(font-color pink)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 8))
)
)
goal_src/jak2/engine/ui/hud.gc
+1 -1
View File
@@ -1177,7 +1177,7 @@
(dotimes (v1-9 14)
(set! (-> self strings v1-9 text) #f)
(set! (-> self strings v1-9 scale) 1.0)
(set! (-> self strings v1-9 color) (font-color font-color-1))
(set! (-> self strings v1-9 color) (font-color white))
(set! (-> self strings v1-9 flags) (font-flags shadow kerning large))
(set! (-> self strings v1-9 pos 0) 0)
(set! (-> self strings v1-9 pos 2) #xfffffff)
goal_src/jak2/engine/ui/progress/progress-draw.gc
+74 -74
View File
@@ -9,7 +9,7 @@
;; WARN: Return type mismatch int vs font-color.
(defbehavior progress-selected progress ((arg0 int))
(let ((color (font-color font-color-33)))
(let ((color (font-color progress-selected)))
(cond
((< 4 (the-as int (logand (-> self clock integral-frame-counter) 7)))
(set! (-> *progress-state* color-flash-counter) 1)
@@ -458,7 +458,7 @@
)
(set! (-> arg1 origin x) (- (-> arg1 origin x) (the float s5-0)))
)
(set! (-> arg1 color) (font-color font-color-32))
(set! (-> arg1 color) (font-color progress))
0
(none)
)
@@ -625,7 +625,7 @@
(arg3
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color font-color-34))
(set! (-> a0-1 color) (font-color progress-force-selected))
)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
(set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y)))
@@ -684,7 +684,7 @@
(arg3
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color font-color-34))
(set! (-> a0-1 color) (font-color progress-force-selected))
)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
(set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y)))
@@ -749,7 +749,7 @@
)
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-6 arg1))
(set! (-> a0-6 color) (font-color font-color-34))
(set! (-> a0-6 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 44 f28-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -789,7 +789,7 @@
)
(else
(let ((a0-23 arg1))
(set! (-> a0-23 color) (font-color font-color-32))
(set! (-> a0-23 color) (font-color progress))
)
)
)
@@ -1024,7 +1024,7 @@
(set! (-> v1-7 scale) 0.75)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-3 arg1))
@@ -1599,7 +1599,7 @@
(set! (-> arg1 origin y) (the float sv-48))
(set! (-> arg1 height) 50.0)
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((a0-2 arg1))
(set! (-> a0-2 flags) (font-flags kerning middle large))
@@ -1682,7 +1682,7 @@
(set! (-> sv-48 height) 50.0)
(set! (-> sv-48 origin y) (the float sv-16))
(let ((a0-2 sv-48))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(set! sv-32 print-game-text)
(let ((a0-4 (lookup-text! *common-text* s0-0 #f))
@@ -1757,7 +1757,7 @@
(set! (-> sv-16 origin y) (the float sv-32))
(set! (-> sv-16 height) 50.0)
(let ((a0-2 sv-16))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(set! (-> sv-16 origin x) 80.0)
(let ((a0-3 sv-16))
@@ -1844,7 +1844,7 @@
(set! (-> sv-48 origin y) (the float sv-16))
(set! (-> sv-48 height) 50.0)
(let ((a0-2 sv-48))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(set! sv-32 print-game-text)
(let ((a0-4 (lookup-text! *common-text* s0-0 #f))
@@ -1937,7 +1937,7 @@
(set! (-> a0-6 flags) (font-flags kerning middle large))
)
(let ((a0-7 sv-80))
(set! (-> a0-7 color) (font-color font-color-32))
(set! (-> a0-7 color) (font-color progress))
)
(set! sv-48 print-game-text)
(let* ((a0-8 *common-text*)
@@ -2034,7 +2034,7 @@
(let ((s2-3 arg1))
(set! (-> s2-3 color) (if (= arg2 sv-20)
(the-as font-color (the-as int (progress-selected 0)))
(font-color font-color-32)
(font-color progress)
)
)
)
@@ -2220,7 +2220,7 @@
(s2-7 *temp-string* arg1 #f 44 (bucket-id progress))
)
(let ((a0-45 arg1))
(set! (-> a0-45 color) (font-color font-color-32))
(set! (-> a0-45 color) (font-color progress))
)
(set! (-> arg1 origin x) 250.0)
(set! (-> arg1 origin y) 110.0)
@@ -2457,7 +2457,7 @@
(set! (-> v1-25 height) (the float 160))
)
(let ((a0-16 arg1))
(set! (-> a0-16 color) (font-color font-color-32))
(set! (-> a0-16 color) (font-color progress))
)
(let ((s5-2 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-dont-remove) #f) 1)
@@ -2474,7 +2474,7 @@
(set! (-> v1-3 scale) 0.5)
)
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-32))
(set! (-> a0-3 color) (font-color progress))
)
(let ((a0-4 arg1))
(set! (-> a0-4 flags) (font-flags kerning middle left large))
@@ -2564,7 +2564,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2609,7 +2609,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2655,7 +2655,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2722,7 +2722,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2797,7 +2797,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2855,7 +2855,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -2913,7 +2913,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -2969,7 +2969,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3043,7 +3043,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3095,7 +3095,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3139,7 +3139,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3180,7 +3180,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3246,7 +3246,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3290,7 +3290,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3356,7 +3356,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.55)
@@ -3400,7 +3400,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.55)
@@ -3459,7 +3459,7 @@
(set! (-> a0-3 flags) (font-flags kerning middle large))
)
(let ((a0-4 arg1))
(set! (-> a0-4 color) (font-color font-color-32))
(set! (-> a0-4 color) (font-color progress))
)
(set! (-> arg1 origin y) 100.0)
(let ((v1-9 arg1))
@@ -3553,7 +3553,7 @@
)
(else
(let ((a0-35 arg1))
(set! (-> a0-35 color) (font-color font-color-32))
(set! (-> a0-35 color) (font-color progress))
)
)
)
@@ -3654,7 +3654,7 @@
(set! (-> v1-15 height) (the float 210))
)
(let ((a1-9 arg1))
(set! (-> a1-9 color) (font-color font-color-32))
(set! (-> a1-9 color) (font-color progress))
)
(if (or (= (-> *setting-control* user-default language) (language-enum french))
(= (-> *setting-control* user-default language) (language-enum spanish))
@@ -3748,7 +3748,7 @@
)
(else
(let ((a0-21 arg1))
(set! (-> a0-21 color) (font-color font-color-32))
(set! (-> a0-21 color) (font-color progress))
)
)
)
@@ -3988,7 +3988,7 @@
(set! (-> arg1 origin x) 60.0)
(set! (-> arg1 origin y) 80.0)
(let ((a0-21 arg1))
(set! (-> a0-21 color) (font-color font-color-32))
(set! (-> a0-21 color) (font-color progress))
)
(let ((v1-40 (-> obj page-index)))
(cond
@@ -4210,7 +4210,7 @@
(let ((s3-1 arg2))
(set! (-> s3-1 color) (if (= arg3 1)
(the-as font-color (the-as int (progress-selected 0)))
(font-color font-color-32)
(font-color progress)
)
)
)
@@ -4236,7 +4236,7 @@
)
(set! (-> arg2 origin x) 360.0)
(let ((a0-35 arg2))
(set! (-> a0-35 color) (font-color font-color-32))
(set! (-> a0-35 color) (font-color progress))
)
)
)
@@ -4382,7 +4382,7 @@
(set! (-> a0-21 flags) (font-flags kerning middle large))
)
(let ((a0-22 arg1))
(set! (-> a0-22 color) (font-color font-color-32))
(set! (-> a0-22 color) (font-color progress))
)
(set! (-> arg1 origin x) 59.0)
(let ((v1-54 arg1))
@@ -5382,7 +5382,7 @@
(set! (-> a0-4 flags) (font-flags kerning middle large))
)
(let ((a0-5 sv-140))
(set! (-> a0-5 color) (font-color font-color-32))
(set! (-> a0-5 color) (font-color progress))
)
(set! (-> sv-140 origin x) 59.0)
(set! (-> sv-140 origin y) 78.0)
@@ -5424,7 +5424,7 @@
(set! (-> a0-23 flags) (font-flags kerning large))
)
(let ((a0-24 sv-140))
(set! (-> a0-24 color) (font-color font-color-34))
(set! (-> a0-24 color) (font-color progress-force-selected))
)
(set! (-> sv-140 origin x) (+ 20.0 sv-120 (-> sv-140 origin x)))
(let ((v1-53 sv-140))
@@ -5483,7 +5483,7 @@
)
(set! sv-108 (-> sv-140 origin x))
(let ((a0-54 sv-140))
(set! (-> a0-54 color) (font-color font-color-32))
(set! (-> a0-54 color) (font-color progress))
)
(+! (-> sv-140 origin x) sv-120)
(let ((v1-96 sv-140))
@@ -5538,7 +5538,7 @@
(set! (-> a0-74 flags) (font-flags kerning large))
)
(let ((a0-75 sv-140))
(set! (-> a0-75 color) (font-color font-color-34))
(set! (-> a0-75 color) (font-color progress-force-selected))
)
(set! (-> sv-140 origin x) (+ 20.0 sv-124 (-> sv-140 origin x)))
(let ((v1-142 sv-140))
@@ -5597,7 +5597,7 @@
)
(set! sv-108 (-> sv-140 origin x))
(let ((a0-105 sv-140))
(set! (-> a0-105 color) (font-color font-color-32))
(set! (-> a0-105 color) (font-color progress))
)
(+! (-> sv-140 origin x) sv-124)
(let ((v1-185 sv-140))
@@ -5656,7 +5656,7 @@
((and (zero? (-> *progress-state* game-options-item-selected)) (-> *progress-state* game-options-item-picked))
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-34))
(set! (-> a0-2 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 41 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -5693,7 +5693,7 @@
)
(else
(let ((a0-17 arg1))
(set! (-> a0-17 color) (font-color font-color-32))
(set! (-> a0-17 color) (font-color progress))
)
)
)
@@ -5744,7 +5744,7 @@
((and (= (-> *progress-state* game-options-item-selected) 1) (-> *progress-state* game-options-item-picked))
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-34))
(set! (-> a0-3 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 41 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -5781,7 +5781,7 @@
)
(else
(let ((a0-20 arg1))
(set! (-> a0-20 color) (font-color font-color-32))
(set! (-> a0-20 color) (font-color progress))
)
)
)
@@ -5841,7 +5841,7 @@
(cond
((and (= (-> *progress-state* game-options-item-selected) 2) (-> *progress-state* game-options-item-picked))
(let ((a0-7 arg1))
(set! (-> a0-7 color) (font-color font-color-34))
(set! (-> a0-7 color) (font-color progress-force-selected))
)
(draw-highlight (the int (-> arg1 origin y)) 44 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -5860,13 +5860,13 @@
)
)
(let ((a0-12 arg1))
(set! (-> a0-12 color) (font-color font-color-32))
(set! (-> a0-12 color) (font-color progress))
)
(let ((v1-33 arg1))
(set! (-> v1-33 scale) 0.5)
)
(let ((a0-14 arg1))
(set! (-> a0-14 color) (font-color font-color-32))
(set! (-> a0-14 color) (font-color progress))
)
(set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x)))
(let ((s5-1 print-game-text))
@@ -5908,7 +5908,7 @@
)
(else
(let ((a0-31 arg1))
(set! (-> a0-31 color) (font-color font-color-32))
(set! (-> a0-31 color) (font-color progress))
)
)
)
@@ -5920,7 +5920,7 @@
(set! (-> v1-54 scale) 0.5)
)
(let ((a0-36 arg1))
(set! (-> a0-36 color) (font-color font-color-32))
(set! (-> a0-36 color) (font-color progress))
)
(set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y)))
(let ((a0-37 arg1))
@@ -5974,7 +5974,7 @@
(cond
((and (= (-> *progress-state* game-options-item-selected) 3) (-> *progress-state* game-options-item-picked))
(let ((a0-7 arg1))
(set! (-> a0-7 color) (font-color font-color-34))
(set! (-> a0-7 color) (font-color progress-force-selected))
)
(draw-highlight (the int (-> arg1 origin y)) 44 f30-0)
(let ((s3-0 print-game-text))
@@ -5996,13 +5996,13 @@
)
)
(let ((a0-14 arg1))
(set! (-> a0-14 color) (font-color font-color-32))
(set! (-> a0-14 color) (font-color progress))
)
(let ((v1-33 arg1))
(set! (-> v1-33 scale) 0.5)
)
(let ((a0-16 arg1))
(set! (-> a0-16 color) (font-color font-color-32))
(set! (-> a0-16 color) (font-color progress))
)
(set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x)))
(let ((s5-1 print-game-text))
@@ -6044,7 +6044,7 @@
)
(else
(let ((a0-33 arg1))
(set! (-> a0-33 color) (font-color font-color-32))
(set! (-> a0-33 color) (font-color progress))
)
)
)
@@ -6059,7 +6059,7 @@
(set! (-> v1-54 scale) 0.5)
)
(let ((a0-40 arg1))
(set! (-> a0-40 color) (font-color font-color-32))
(set! (-> a0-40 color) (font-color progress))
)
(format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> *language-name-remap* (-> s4-0 0)) #f))
*temp-string*
@@ -6133,7 +6133,7 @@
)
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-4 arg1))
(set! (-> a0-4 color) (font-color font-color-34))
(set! (-> a0-4 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 42 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -6174,7 +6174,7 @@
)
(else
(let ((a0-21 arg1))
(set! (-> a0-21 color) (font-color font-color-32))
(set! (-> a0-21 color) (font-color progress))
)
)
)
@@ -6240,7 +6240,7 @@
)
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-34))
(set! (-> a0-3 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 42 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -6281,7 +6281,7 @@
)
(else
(let ((a0-20 arg1))
(set! (-> a0-20 color) (font-color font-color-32))
(set! (-> a0-20 color) (font-color progress))
)
)
)
@@ -6340,7 +6340,7 @@
(set! (-> v1-10 scale) 0.6)
)
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-34))
(set! (-> a0-3 color) (font-color progress-force-selected))
)
(set! (-> arg1 width) 350.0)
(set! (-> arg1 height) 60.0)
@@ -6415,7 +6415,7 @@
)
(else
(let ((a0-31 arg1))
(set! (-> a0-31 color) (font-color font-color-32))
(set! (-> a0-31 color) (font-color progress))
)
)
)
@@ -6444,7 +6444,7 @@
(cond
((and (zero? (-> *progress-state* qr-options-item-selected)) (-> *progress-state* qr-options-item-picked))
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-34))
(set! (-> a0-2 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 50 f0-1)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -6507,7 +6507,7 @@
(cond
((and (= (-> *progress-state* qr-options-item-selected) 1) (-> *progress-state* qr-options-item-picked))
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-34))
(set! (-> a0-3 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 50 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -6669,7 +6669,7 @@
(set! sv-128 (-> obj value-to-modify))
(set! (-> s5-0 origin y) (+ -8.0 (-> s5-0 origin y)))
(let ((a0-12 s5-0))
(set! (-> a0-12 color) (font-color font-color-34))
(set! (-> a0-12 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> s5-0 origin y))) 52 f30-0)
(set! sv-144 print-game-text)
@@ -6965,7 +6965,7 @@
arg3
)
(let ((a0-7 arg1))
(set! (-> a0-7 color) (font-color font-color-34))
(set! (-> a0-7 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 42 f30-0)
(let ((s3-1 print-game-text))
@@ -6974,13 +6974,13 @@
)
(set! (-> arg1 origin y) (+ 22.0 (-> arg1 origin y)))
(let ((a0-13 arg1))
(set! (-> a0-13 color) (font-color font-color-32))
(set! (-> a0-13 color) (font-color progress))
)
(let ((v1-22 arg1))
(set! (-> v1-22 scale) 0.5)
)
(let ((a0-15 arg1))
(set! (-> a0-15 color) (font-color font-color-32))
(set! (-> a0-15 color) (font-color progress))
)
(set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x)))
(let ((s4-1 print-game-text))
@@ -7023,7 +7023,7 @@
(set! (-> v1-39 scale) 0.5)
)
(let ((a0-33 arg1))
(set! (-> a0-33 color) (font-color font-color-32))
(set! (-> a0-33 color) (font-color progress))
)
(format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> *stereo-mode-name-remap* s5-0) #f))
(let ((a0-37 *temp-string*))
@@ -7085,7 +7085,7 @@
(let ((s0-0 arg1))
(set! (-> s0-0 color) (if (= arg2 (-> arg0 option-index))
(the-as font-color (the-as int (progress-selected 0)))
(font-color font-color-32)
(font-color progress)
)
)
)
@@ -7097,7 +7097,7 @@
)
(else
(let ((a0-9 arg1))
(set! (-> a0-9 color) (font-color font-color-32))
(set! (-> a0-9 color) (font-color progress))
)
)
)
goal_src/jak2/engine/ui/progress/progress.gc
+1 -1
View File
@@ -1341,7 +1341,7 @@
(let ((s3-0 sv-144))
(set! (-> s3-0 color) (if (and (= s4-1 (-> self option-index)) (= (-> self menu-transition) 0.0))
(progress-selected 0)
(font-color font-color-32)
(font-color progress)
)
)
)
goal_src/jak2/levels/city/common/ctywide-obs.gc
+2 -2
View File
@@ -3540,7 +3540,7 @@ This commonly includes things such as:
(set! (-> v1-51 origin y) (the float a0-59))
)
(let ((a0-60 s1-0))
(set! (-> a0-60 color) (font-color font-color-29))
(set! (-> a0-60 color) (font-color progress-old-yellow))
)
(let ((s0-0 print-game-text))
(set! sv-352 format)
@@ -3570,7 +3570,7 @@ This commonly includes things such as:
)
(let ((a0-68 s1-0))
(set! (-> a0-68 color) (if (= s0-1 s5-0)
(font-color font-color-30)
(font-color progress-old-selected)
(font-color default)
)
)
goal_src/jak2/levels/city/common/height-map.gc
+1 -1
View File
@@ -80,7 +80,7 @@
(the-as bucket-id s2-0)
*temp-string*
s5-0
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 16))
)
)
goal_src/jak2/levels/common/ai/bot.gc
+1 -1
View File
@@ -56,7 +56,7 @@
(bucket-id debug-no-zbuf1)
spot-id
(-> spot center)
(font-color font-color-1)
(font-color white)
(the-as vector2h #f)
)
)
goal_src/jak2/levels/common/battle.gc
+1 -1
View File
@@ -830,7 +830,7 @@
(-> obj stat-child-count)
(-> obj allies length)
)
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* s4-0 (font-color gold) (the-as vector2h #f))
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* s4-0 (font-color orange) (the-as vector2h #f))
)
)
(dotimes (s5-1 (-> obj spawners length))
goal_src/jak2/levels/common/enemy/hover/hover-nav-control.gc
+1 -1
View File
@@ -242,7 +242,7 @@
(add-debug-x #t (bucket-id debug2) (-> s4-0 pos) *color-white*)
(format (clear *temp-string*) "~d" s5-0)
(let ((a2-2 *temp-string*))
(add-debug-text-3d #t (bucket-id debug2) a2-2 (-> s4-0 pos) (font-color font-color-1) (the-as vector2h #f))
(add-debug-text-3d #t (bucket-id debug2) a2-2 (-> s4-0 pos) (font-color white) (the-as vector2h #f))
)
(dotimes (s3-1 (-> s4-0 count))
(let ((a2-3 (new 'stack-no-clear 'vector)))
goal_src/jak2/levels/common/races/race-hud.gc
+4 -4
View File
@@ -381,7 +381,7 @@
(let ((s2-1 (-> s5-0 lap-time-array (+ (- -1 s4-0) (-> s5-0 lap-count)))))
(set! (-> obj strings s3-0 scale) 0.5)
(set! (-> obj strings s3-0 flags) (font-flags kerning large))
(set! (-> obj strings s3-0 color) (font-color font-color-1))
(set! (-> obj strings s3-0 color) (font-color white))
(set-as-offset-from!
(the-as hud-sprite (&+ (-> obj strings 0 pos) (* 48 s3-0)))
(the-as vector4w (-> obj strings 1 pos))
@@ -401,7 +401,7 @@
(let ((s3-1 (+ s3-0 1)))
(set! (-> obj strings s3-1 scale) 0.5)
(set! (-> obj strings s3-1 flags) (font-flags kerning right large))
(set! (-> obj strings s3-1 color) (font-color font-color-1))
(set! (-> obj strings s3-1 color) (font-color white))
(set-as-offset-from!
(the-as hud-sprite (&+ (-> obj strings 0 pos) (* 48 s3-1)))
(the-as vector4w (-> obj strings 2 pos))
@@ -441,9 +441,9 @@
(set! (-> obj strings 0 flags) (font-flags kerning middle large))
(set! (-> obj strings 0 color) (font-color red))
(set! (-> obj strings 1 flags) (font-flags kerning large))
(set! (-> obj strings 1 color) (font-color font-color-1))
(set! (-> obj strings 1 color) (font-color white))
(set! (-> obj strings 2 flags) (font-flags kerning large))
(set! (-> obj strings 2 color) (font-color font-color-1))
(set! (-> obj strings 2 color) (font-color white))
0
(none)
)
goal_src/jak2/levels/common/races/race-manager.gc
+2 -2
View File
@@ -1256,7 +1256,7 @@
70
20
0.0
(font-color gold)
(font-color orange)
(font-flags shadow kerning)
)
)
@@ -1292,7 +1292,7 @@
70
20
0.0
(font-color gold)
(font-color orange)
(font-flags shadow kerning)
)
)
goal_src/jak2/levels/common/races/race-mesh.gc
+1 -1
View File
@@ -413,7 +413,7 @@
(s2-0 318)
)
(format (clear *temp-string*) "~D" arg0)
(s4-1 s3-1 (the-as bucket-id s2-0) *temp-string* s5-0 (font-color font-color-1) (the-as vector2h #f))
(s4-1 s3-1 (the-as bucket-id s2-0) *temp-string* s5-0 (font-color white) (the-as vector2h #f))
)
)
)
goal_src/jak2/levels/demo/demo-obs.gc
+2 -2
View File
@@ -533,8 +533,8 @@
(set! (-> sv-112 scale) 0.7)
(dotimes (s5-4 (-> gp-1 length))
(if (= (-> self selected) s5-4)
(set! (-> sv-112 color) (font-color font-color-30))
(set! (-> sv-112 color) (font-color font-color-1))
(set! (-> sv-112 color) (font-color progress-old-selected))
(set! (-> sv-112 color) (font-color white))
)
(print-game-text
(lookup-text! *common-text* (the-as text-id (-> gp-1 s5-4)) #f)
goal_src/jak2/levels/title/title-obs.gc
+2 -2
View File
@@ -539,8 +539,8 @@
(set! (-> sv-112 scale) 0.7)
(dotimes (s5-4 (-> gp-1 length))
(if (= (-> self selected) s5-4)
(set! (-> sv-112 color) (font-color font-color-30))
(set! (-> sv-112 color) (font-color font-color-1))
(set! (-> sv-112 color) (font-color progress-old-selected))
(set! (-> sv-112 color) (font-color white))
)
(print-game-text
(lookup-text! *common-text* (the-as text-id (-> gp-1 s5-4)) #f)
goal_src/jak2/pc/debug/anim-tester-x.gc
+3 -3
View File
@@ -245,21 +245,21 @@
(let ((items-drawn (-> lst offset))
(i 0)
(color (font-color white))
(color (font-color menu))
(text-len (the draw-string-result 0)))
(with-dma-buffer-add-bucket ((buf (-> (current-frame) debug-buf))
(bucket-id debug-no-zbuf1))
(when (nonzero? (length title))
(set! text-len (draw-string-xy title buf 9 (+ 28 4 (* items-drawn 14)) (font-color white) (font-flags shadow kerning)))
(set! text-len (draw-string-xy title buf 9 (+ 28 4 (* items-drawn 14)) (font-color menu) (font-flags shadow kerning)))
(1+! items-drawn)
)
(do-atx-list (item lst)
(let ((selected? (= i (-> lst selection))))
(set! color (if (= (-> item extra) sel-obj) (font-color green) (font-color white)))
(set! color (if (= (-> item extra) sel-obj) (font-color green) (font-color menu)))
(let ((this-len (draw-string-xy (-> item group name) buf 21 (+ 28 4 (* items-drawn 14)) color (font-flags shadow kerning))))
(if (> this-len text-len)
goal_src/jak2/pc/features/speedruns.gc
+1 -1
View File
@@ -82,5 +82,5 @@
(-> *pc-settings* speedrunner-mode?)
(enum->string speedrun-category (-> *speedrun-info* category))
(-> *autosplit-info-jak2* res-fortress-escape))
buf 0 (- 220 (* 8 4)) (font-color font-color-29) (font-flags shadow kerning))))
buf 0 (- 220 (* 8 4)) (font-color progress-old-yellow) (font-flags shadow kerning))))
(none))
test/decompiler/reference/jak1/engine/debug/anim-tester_REF.gc
Generated Vendored
+18 -18
View File
@@ -359,7 +359,7 @@
s4-2
(+ (-> arg0 left) (-> *DISP_LIST-bank* BORDER_WIDTH))
(+ (-> arg0 top) (-> *DISP_LIST-bank* BORDER_HEIGHT) (-> *DISP_LIST-bank* TV_SPACING))
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-12 (-> s4-2 base)))
@@ -1159,8 +1159,8 @@
(-> arg1 xpos)
(-> arg1 ypos)
(if (= (-> arg1 the-index) (-> arg1 current-index))
(font-color yellow-green)
(font-color dim-white)
(font-color menu-flag-on)
(font-color menu)
)
(font-flags shadow kerning)
)
@@ -1237,7 +1237,7 @@
s4-1
(-> arg1 xpos)
(-> arg1 ypos)
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-4 (-> s4-1 base)))
@@ -1287,8 +1287,8 @@
(-> arg1 xpos)
(-> arg1 ypos)
(if (= (-> arg1 the-index) (-> arg1 current-index))
(font-color yellow-green)
(font-color dim-white)
(font-color menu-flag-on)
(font-color menu)
)
(font-flags shadow kerning)
)
@@ -1409,7 +1409,7 @@
s4-1
(-> arg1 xpos)
(-> arg1 ypos)
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-4 (-> s4-1 base)))
@@ -1463,8 +1463,8 @@
(-> arg1 xpos)
(-> arg1 ypos)
(if (= (-> arg1 the-index) (-> arg1 current-index))
(font-color yellow-green)
(font-color dim-white)
(font-color menu-flag-on)
(font-color menu)
)
(font-flags shadow kerning)
)
@@ -1580,7 +1580,7 @@
s4-1
(-> arg1 xpos)
(-> arg1 ypos)
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-4 (-> s4-1 base)))
@@ -1746,8 +1746,8 @@
(-> arg1 ypos)
(the-as float 0.0)
(if (= (-> arg1 the-index) (-> arg1 current-index))
(font-color yellow-green)
(font-color dim-white)
(font-color menu-flag-on)
(font-color menu)
)
(font-flags shadow kerning)
)
@@ -2208,7 +2208,7 @@
)
(let ((s1-6 draw-string-xy))
(format (clear *temp-string*) "--Seq--(~-17S)--" (-> (the-as anim-test-sequence s4-0) privname))
(s1-6 *temp-string* s3-3 (-> arg1 xpos) (-> arg1 ypos) (font-color dim-white) (font-flags shadow kerning))
(s1-6 *temp-string* s3-3 (-> arg1 xpos) (-> arg1 ypos) (font-color menu) (font-flags shadow kerning))
)
(let ((a3-17 (-> s3-3 base)))
(let ((v1-355 (the-as object (-> s3-3 base))))
@@ -2238,7 +2238,7 @@
s4-2
(+ (-> arg1 xpos) (* (-> *ANIM_TESTER-bank* EDIT_STATS_X) (-> *DISP_LIST-bank* CHAR_WIDTH)))
(-> arg1 ypos)
(font-color dim-white)
(font-color menu)
(font-flags shadow kerning)
)
(let ((a3-21 (-> s4-2 base)))
@@ -2298,7 +2298,7 @@
s5-0
(-> *ANIM_TESTER-bank* ANIM_LIST_X)
(-> *ANIM_TESTER-bank* ANIM_LIST_Y)
(font-color orange-red-2)
(font-color menu-func-bad)
(font-flags shadow kerning)
)
(let ((a3-1 (-> s5-0 base)))
@@ -2340,7 +2340,7 @@
s5-1
(-> *ANIM_TESTER-bank* ANIM_LIST_X)
(-> *ANIM_TESTER-bank* ANIM_LIST_Y)
(font-color orange-red-2)
(font-color menu-func-bad)
(font-flags shadow kerning)
)
(let ((a3-3 (-> s5-1 base)))
@@ -2383,7 +2383,7 @@
s5-2
(-> *ANIM_TESTER-bank* EDIT_LIST_X)
(-> *ANIM_TESTER-bank* EDIT_LIST_Y)
(font-color orange-red-2)
(font-color menu-func-bad)
(font-flags shadow kerning)
)
(let ((a3-5 (-> s5-2 base)))
@@ -2414,7 +2414,7 @@
s5-3
(-> *ANIM_TESTER-bank* EDIT_LIST_X)
(-> *ANIM_TESTER-bank* EDIT_LIST_Y)
(font-color orange-red-2)
(font-color menu-func-bad)
(font-flags shadow kerning)
)
(let ((a3-7 (-> s5-3 base)))
test/decompiler/reference/jak1/engine/debug/menu_REF.gc
Generated Vendored
+14 -14
View File
@@ -854,13 +854,13 @@
)
(set! (-> s5-0 color) (cond
((zero? arg3)
(font-color dim-white)
(font-color menu)
)
(arg4
(font-color dark-light-blue)
(font-color menu-selected-parent)
)
(else
(font-color dim-gray)
(font-color menu-parent)
)
)
)
@@ -949,19 +949,19 @@
)
(set! (-> v1-2 color) (cond
((= (-> arg0 is-on) 'invalid)
(font-color flat-dark-purple)
(font-color menu-invalid)
)
((-> arg0 is-on)
(if (zero? arg3)
(font-color yellow-green)
(font-color dark-green)
(font-color menu-flag-on)
(font-color menu-flag-on-parent)
)
)
((zero? arg3)
(font-color another-gray)
(font-color menu-flag-off)
)
(else
(font-color dark-dark-green)
(font-color menu-flag-off-parent)
)
)
)
@@ -1000,15 +1000,15 @@
(set! (-> s5-0 color) (cond
((zero? arg3)
(if (-> arg0 grabbed-joypad-p)
(font-color cyan)
(font-color dim-white)
(font-color menu-selected)
(font-color menu)
)
)
(arg4
(font-color dark-light-blue)
(font-color menu-selected-parent)
)
(else
(font-color dim-gray)
(font-color menu-parent)
)
)
)
@@ -1135,8 +1135,8 @@
(while (not (null? s1-1))
(when (= s0-1 arg3)
(set! (-> arg0 context font color) (if (nonzero? arg4)
(font-color dim-gray)
(font-color dim-white)
(font-color menu-parent)
(font-color menu)
)
)
(let ((v1-16 (-> arg0 context font))
test/decompiler/reference/jak1/engine/draw/process-drawable_REF.gc
Generated Vendored
+1 -8
View File
@@ -407,14 +407,7 @@
(s3-0 68)
)
(format (clear *temp-string*) "~2j~s art error for ~s" arg0 (-> self name))
(s5-0
s4-0
(the-as bucket-id s3-0)
*temp-string*
(-> self root trans)
(font-color orange-red)
(the-as vector2h #f)
)
(s5-0 s4-0 (the-as bucket-id s3-0) *temp-string* (-> self root trans) (font-color red) (the-as vector2h #f))
)
)
(suspend)
test/decompiler/reference/jak1/engine/entity/ambient_REF.gc
Generated Vendored
+1 -1
View File
@@ -666,7 +666,7 @@
(bucket-id debug-no-zbuf)
*temp-string*
(-> arg0 bsphere)
(font-color orange-red)
(font-color red)
(the-as vector2h #f)
)
)
test/decompiler/reference/jak1/engine/game/main_REF.gc
Generated Vendored
+1 -1
View File
@@ -1233,7 +1233,7 @@
s3-1
256
160
(font-color orange-red)
(font-color red)
(font-flags shadow kerning middle large)
)
)
test/decompiler/reference/jak1/engine/gfx/hw/display_REF.gc
Generated Vendored
+4 -12
View File
@@ -200,17 +200,9 @@
)
;; definition for symbol *pause-context*, type font-context
(define *pause-context* (new
'global
'font-context
*font-default-matrix*
256
170
0.0
(font-color orange-red)
(font-flags shadow kerning)
)
)
(define *pause-context*
(new 'global 'font-context *font-default-matrix* 256 170 0.0 (font-color red) (font-flags shadow kerning))
)
;; definition for method 11 of type profile-bar
(defmethod add-frame profile-bar ((obj profile-bar) (name symbol) (color rgba))
@@ -346,7 +338,7 @@
488
(+ bar-pos 8)
(if (>= f30-0 100.0)
(font-color orange-red)
(font-color red)
(font-color default)
)
(font-flags shadow right)
test/decompiler/reference/jak1/engine/nav/path_REF.gc
Generated Vendored
+4 -4
View File
@@ -17,7 +17,7 @@
(the-as bucket-id s3-0)
*temp-string*
(-> obj process root trans)
(font-color orange-red)
(font-color red)
(the-as vector2h #f)
)
)
@@ -48,7 +48,7 @@
(s1-0 68)
)
(format (clear *temp-string*) "~D" s5-1)
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color bright-orange-red) (the-as vector2h #f))
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
)
)
)
@@ -296,7 +296,7 @@
(the-as bucket-id s3-0)
*temp-string*
(-> obj process root trans)
(font-color orange-red)
(font-color red)
(the-as vector2h #f)
)
)
@@ -325,7 +325,7 @@
(s1-0 68)
)
(format (clear *temp-string*) "~D" s5-1)
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color bright-orange-red) (the-as vector2h #f))
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
)
)
)
test/decompiler/reference/jak1/engine/ps2/memcard-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -138,7 +138,7 @@
)
)
)
(draw-string-xy *temp-string* dma-buf 32 (+ (* 12 slot-idx) 8) (font-color orange-red) (font-flags shadow))
(draw-string-xy *temp-string* dma-buf 32 (+ (* 12 slot-idx) 8) (font-color red) (font-flags shadow))
)
)
0
test/decompiler/reference/jak1/engine/ui/hud-classes_REF.gc
Generated Vendored
+6 -6
View File
@@ -163,7 +163,7 @@
)
2
)
(font-color bright-green)
(font-color green)
(font-flags shadow kerning large)
)
)
@@ -551,7 +551,7 @@
-17
)
0.0
(font-color orange-red)
(font-color red)
(font-flags shadow kerning)
)
)
@@ -593,7 +593,7 @@
)
s5-0
)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning middle large)
)
)
@@ -827,7 +827,7 @@
)
2
)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
)
)
@@ -1246,7 +1246,7 @@
)
2
)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
)
)
@@ -1546,7 +1546,7 @@
)
2
)
(font-color dark-yellow)
(font-color yellow)
(font-flags shadow kerning large)
)
)
test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+8 -8
View File
@@ -136,7 +136,7 @@
(- (+ s2-0 32) (-> obj left-x-offset))
(+ (/ s4-1 2) 125)
8325000.0
(font-color yellow-orange)
(font-color progress-yellow)
(font-flags shadow kerning)
)
)
@@ -163,7 +163,7 @@
(set! (-> s0-1 origin x) (the float (- (+ s2-0 32) (-> obj left-x-offset))))
(set! (-> s0-1 origin y) (the float (+ (/ s4-1 2) 175)))
(let ((a0-49 s0-1))
(set! (-> a0-49 color) (font-color lighter-lighter-blue))
(set! (-> a0-49 color) (font-color progress-blue))
)
(let ((v1-104 s0-1))
(set! (-> v1-104 height) (the float 15))
@@ -741,7 +741,7 @@
(print-game-text "OLD SAVE GAME" arg0 #f s4-1 22)
)
(let ((a0-28 arg0))
(set! (-> a0-28 color) (font-color blue-white))
(set! (-> a0-28 color) (font-color progress-memcard))
)
(cond
((or (>= (seconds 2) (- (-> *display* real-frame-counter) (-> obj last-option-index-change)))
@@ -1768,7 +1768,7 @@
)
(set! (-> sv-112 origin y) (the float (+ s2-1 3)))
(let ((a0-62 sv-112))
(set! (-> a0-62 color) (font-color lighter-lighter-blue))
(set! (-> a0-62 color) (font-color progress-blue))
)
0
(set! sv-480 (mod (+ sv-512 1) sv-464))
@@ -1824,7 +1824,7 @@
)
(when (not (-> obj language-transition))
(let ((a0-75 sv-112))
(set! (-> a0-75 color) (font-color yellow-green-2))
(set! (-> a0-75 color) (font-color progress-selected))
)
)
(let ((t9-32 print-language-name)
@@ -1944,7 +1944,7 @@
(let ((f0-23 (-> obj transition-percentage-invert)))
(let ((v1-235 sv-112))
(set! (-> v1-235 color) (if (and (= s0-0 (-> obj option-index)) (not (-> obj in-transition)))
(font-color yellow-green-2)
(font-color progress-selected)
(font-color default)
)
)
@@ -2082,7 +2082,7 @@
(set! (-> v1-36 scale) 1.3)
)
(let ((a0-31 s4-2))
(set! (-> a0-31 color) (font-color another-light-blue))
(set! (-> a0-31 color) (font-color progress-percent))
)
(set! (-> s4-2 origin x)
(+ (- 435.0 (the float (if (< (-> *progress-process* 0 completion-percentage) 10.0)
@@ -2139,7 +2139,7 @@
s3-5
(the int (+ 430.0 f30-0))
200
(font-color blue-white)
(font-color progress-memcard)
(font-flags shadow kerning middle)
)
(let ((a3-9 (-> s3-5 base)))
test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc
Generated Vendored
+1 -1
View File
@@ -2376,7 +2376,7 @@
(- 32 (-> self left-x-offset))
(the int (* (+ 42.0 (the float (/ v1-98 2))) f30-0))
(the-as float 8325000.0)
(font-color lighter-lighter-blue)
(font-color progress-blue)
(font-flags shadow kerning)
)
)
test/decompiler/reference/jak1/levels/jungle/fisher_REF.gc
Generated Vendored
+4 -12
View File
@@ -1161,17 +1161,9 @@
;; definition for function fisher-draw-display
;; INFO: Return type mismatch float vs none.
(defbehavior fisher-draw-display fisher ((arg0 fisher))
(let ((s5-0 (new
'stack
'font-context
*font-default-matrix*
435
10
0.0
(font-color orange-red)
(font-flags shadow kerning)
)
)
(let ((s5-0
(new 'stack 'font-context *font-default-matrix* 435 10 0.0 (font-color red) (font-flags shadow kerning))
)
)
(let ((v1-1 s5-0))
(set! (-> v1-1 width) (the float 200))
@@ -1466,7 +1458,7 @@
s5-0
256
100
(font-color orange-red)
(font-color red)
(font-flags shadow kerning middle large)
)
(let ((a3-1 (-> s5-0 base)))
test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc
Generated Vendored
+6 -14
View File
@@ -1262,7 +1262,7 @@
0
0
0.0
(font-color yellow-orange)
(font-color progress-yellow)
(font-flags shadow kerning)
)
)
@@ -1302,7 +1302,7 @@
(set! (-> gp-0 origin y) 80.0)
(set! (-> gp-0 flags) (font-flags shadow kerning middle left large))
(let ((a0-15 gp-0))
(set! (-> a0-15 color) (font-color orange-red))
(set! (-> a0-15 color) (font-color red))
)
(print-game-text (lookup-text! *common-text* (text-id new-record) #f) gp-0 #f 128 22)
)
@@ -1336,7 +1336,7 @@
(set! (-> gp-0 origin y) 80.0)
(set! (-> gp-0 flags) (font-flags shadow kerning middle left large))
(let ((a0-23 gp-0))
(set! (-> a0-23 color) (font-color orange-red))
(set! (-> a0-23 color) (font-color red))
)
(print-game-text (lookup-text! *common-text* (text-id try-again) #f) gp-0 #f 128 22)
)
@@ -1406,17 +1406,9 @@
(send-event (ppointer->process (-> *hud-parts* money)) 'enable)
)
(when (< (mod (-> *display* real-frame-counter) 90) 60)
(let ((gp-0 (new
'stack
'font-context
*font-default-matrix*
156
80
0.0
(font-color orange-red)
(font-flags shadow kerning)
)
)
(let ((gp-0
(new 'stack 'font-context *font-default-matrix* 156 80 0.0 (font-color red) (font-flags shadow kerning))
)
)
(let ((v1-20 gp-0))
(set! (-> v1-20 width) (the float 200))
test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc
Generated Vendored
+2 -2
View File
@@ -352,7 +352,7 @@
(set! (-> v1-43 height) (the float 40))
)
(let ((a0-34 s1-3))
(set! (-> a0-34 color) (font-color lighter-lighter-blue))
(set! (-> a0-34 color) (font-color progress-blue))
)
0
(let ((s0-3 (get-next-slot-up self gp-0)))
@@ -410,7 +410,7 @@
)
(when (not s5-0)
(let ((a0-47 s1-3))
(set! (-> a0-47 color) (font-color yellow-orange))
(set! (-> a0-47 color) (font-color progress-yellow))
)
)
(print-level-name gp-0 s1-3 s2-0 (the-as int s4-0))
test/decompiler/reference/jak2/engine/camera/cam-layout_REF.gc
Generated Vendored
+1 -1
View File
@@ -300,7 +300,7 @@
(with-dma-buffer-add-bucket ((s5-0 (-> *display* frames (-> *display* on-screen) debug-buf))
(bucket-id debug2)
)
(draw-string-xy arg2 s5-0 arg0 arg1 (font-color font-color-1) (font-flags shadow kerning))
(draw-string-xy arg2 s5-0 arg0 arg1 (font-color white) (font-flags shadow kerning))
)
)
test/decompiler/reference/jak2/engine/collide/collide-edge-grab_REF.gc
Generated Vendored
+1 -1
View File
@@ -649,7 +649,7 @@
)
(sv-32 a0-10 a1-4 a2-2)
)
(s2-0 s1-0 (the-as bucket-id s0-0) *temp-string* s3-0 (font-color font-color-1) (the-as vector2h #f))
(s2-0 s1-0 (the-as bucket-id s0-0) *temp-string* s3-0 (font-color white) (the-as vector2h #f))
)
)
)
test/decompiler/reference/jak2/engine/debug/editable_REF.gc
Generated Vendored
+6 -13
View File
@@ -124,7 +124,7 @@
(s1-0 318)
)
(format (clear *temp-string*) "region-~D~%" (-> obj id))
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* arg0 (font-color font-color-1) sv-32)
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* arg0 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
(when (>= arg1 1)
@@ -135,7 +135,7 @@
(s1-1 318)
)
(format (clear *temp-string*) "(on-enter ~S)" s4-1)
(s3-1 s2-1 (the-as bucket-id s1-1) *temp-string* arg0 (font-color font-color-1) sv-32)
(s3-1 s2-1 (the-as bucket-id s1-1) *temp-string* arg0 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -147,7 +147,7 @@
(s1-2 318)
)
(format (clear *temp-string*) "(on-inside ~S)" s4-2)
(s3-2 s2-2 (the-as bucket-id s1-2) *temp-string* arg0 (font-color font-color-1) sv-32)
(s3-2 s2-2 (the-as bucket-id s1-2) *temp-string* arg0 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -159,7 +159,7 @@
(s2-3 318)
)
(format (clear *temp-string*) "(on-exit ~S)" s5-1)
(s4-3 s3-3 (the-as bucket-id s2-3) *temp-string* arg0 (font-color font-color-1) sv-32)
(s4-3 s3-3 (the-as bucket-id s2-3) *temp-string* arg0 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -1022,14 +1022,7 @@
(s3-1 318)
)
(format (clear *temp-string*) "~S~%" (-> obj name))
(s5-1
s4-1
(the-as bucket-id s3-1)
*temp-string*
(-> obj trans)
(font-color font-color-1)
(the-as vector2h #f)
)
(s5-1 s4-1 (the-as bucket-id s3-1) *temp-string* (-> obj trans) (font-color white) (the-as vector2h #f))
)
)
((method-of-type editable-sphere editable-method-10) obj)
@@ -1282,7 +1275,7 @@
(-> gp-0 s4-1)
(if (logtest? (-> obj flags) (editable-flag orient))
(font-color yellow)
(font-color font-color-1)
(font-color white)
)
(the-as vector2h #f)
)
test/decompiler/reference/jak2/engine/debug/menu_REF.gc
Generated Vendored
+14 -14
View File
@@ -922,13 +922,13 @@
)
(set! (-> s5-0 color) (cond
((zero? arg3)
(font-color white)
(font-color menu)
)
(arg4
(font-color font-color-11)
(font-color menu-selected-parent)
)
(else
(font-color font-color-13)
(font-color menu-parent)
)
)
)
@@ -989,19 +989,19 @@
)
(set! (-> v1-2 color) (cond
((= (-> arg0 is-on) 'invalid)
(font-color font-color-19)
(font-color menu-invalid)
)
((-> arg0 is-on)
(if (zero? arg3)
(font-color font-color-15)
(font-color font-color-16)
(font-color menu-flag-on)
(font-color menu-flag-on-parent)
)
)
((zero? arg3)
(font-color font-color-17)
(font-color menu-flag-off)
)
(else
(font-color font-color-18)
(font-color menu-flag-off-parent)
)
)
)
@@ -1026,15 +1026,15 @@
(set! (-> s5-0 color) (cond
((zero? arg3)
(if (-> arg0 grabbed-joypad-p)
(font-color font-color-10)
(font-color white)
(font-color menu-selected)
(font-color menu)
)
)
(arg4
(font-color font-color-11)
(font-color menu-selected-parent)
)
(else
(font-color font-color-13)
(font-color menu-parent)
)
)
)
@@ -1133,8 +1133,8 @@
(while (not (null? s1-1))
(when (= s0-1 arg3)
(set! (-> arg0 context font color) (if (nonzero? arg4)
(font-color font-color-13)
(font-color white)
(font-color menu-parent)
(font-color menu)
)
)
(let ((v1-20 (-> arg0 context font))
test/decompiler/reference/jak2/engine/draw/drawable_REF.gc
Generated Vendored
+1 -1
View File
@@ -181,7 +181,7 @@
(bucket-id debug-no-zbuf1)
arg1
(-> arg0 bsphere)
(font-color font-color-1)
(font-color white)
(the-as vector2h #f)
)
)
test/decompiler/reference/jak2/engine/entity/entity_REF.gc
Generated Vendored
+6 -4
View File
@@ -71,6 +71,7 @@
)
;; definition for method 3 of type actor-group
;; INFO: this function exists in multiple non-identical object files
(defmethod inspect actor-group ((obj actor-group))
(format #t "[~8x] ~A~%" obj (-> obj type))
(format #t "~Tlength: ~D~%" (-> obj length))
@@ -530,6 +531,7 @@
)
;; definition for method 2 of type process
;; INFO: this function exists in multiple non-identical object files
(defmethod print process ((obj process))
(cond
((and (-> obj top-thread) (!= (-> obj status) 'dead))
@@ -1308,7 +1310,7 @@
(-> (the-as process-drawable arg0) root trans)
(if (logtest? (-> sv-16 extra perm status) (entity-perm-status bit-0 bit-1))
(font-color red)
(font-color font-color-1)
(font-color white)
)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 8))
)
@@ -1324,7 +1326,7 @@
(the-as bucket-id s3-1)
*temp-string*
(-> (the-as process-drawable arg0) root trans)
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 24))
)
)
@@ -1336,7 +1338,7 @@
(bucket-id debug-no-zbuf1)
(symbol->string v1-49)
(-> (the-as process-drawable arg0) root trans)
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 24))
)
)
@@ -1385,7 +1387,7 @@
"#f"
)
(-> (the-as process-drawable arg0) root trans)
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 16))
)
(label cfg-51)
test/decompiler/reference/jak2/engine/game/game-info_REF.gc
Generated Vendored
+2 -2
View File
@@ -780,7 +780,7 @@
(+ (the int (/ (the float (+ (/ (-> s3-0 x) 16) -1792)) (-> *video-params* relative-x-scale))) -48)
(+ (/ (-> s3-0 y) 16) -1855)
0.0
(font-color gold)
(font-color orange)
(font-flags shadow kerning)
)
)
@@ -1082,7 +1082,7 @@
(bucket-id debug-no-zbuf1)
(-> obj name)
(-> obj trans)
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 8))
)
(let ((a3-2 (vector-z-quaternion! (new-stack-vector0) (the-as quaternion (-> obj quat)))))
test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
Generated Vendored
+1 -1
View File
@@ -1459,7 +1459,7 @@
(= (get-status *gui-control* (-> obj message-id)) (gui-status active))
)
(let ((gp-0
(new 'stack 'font-context *font-default-matrix* 70 20 0.0 (font-color gold) (font-flags shadow kerning))
(new 'stack 'font-context *font-default-matrix* 70 20 0.0 (font-color orange) (font-flags shadow kerning))
)
)
(set! (-> gp-0 origin x) 120.0)
test/decompiler/reference/jak2/engine/geometry/path_REF.gc
Generated Vendored
+2 -2
View File
@@ -48,7 +48,7 @@
(s1-0 318)
)
(format (clear *temp-string*) "~D" s5-1)
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color gold) (the-as vector2h #f))
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
)
)
)
@@ -447,7 +447,7 @@ using the fractional component of `idx` as the interpolant, return this result
(s1-0 318)
)
(format (clear *temp-string*) "~D" s5-1)
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color gold) (the-as vector2h #f))
(s3-1 s2-1 (the-as bucket-id s1-0) *temp-string* s4-1 (font-color orange) (the-as vector2h #f))
)
)
)
test/decompiler/reference/jak2/engine/level/region_REF.gc
Generated Vendored
+4 -4
View File
@@ -101,7 +101,7 @@
(s3-0 318)
)
(format (clear *temp-string*) "region-~D~%" (-> obj region id))
(s5-0 s4-0 (the-as bucket-id s3-0) *temp-string* sv-36 (font-color font-color-1) sv-32)
(s5-0 s4-0 (the-as bucket-id s3-0) *temp-string* sv-36 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
(let ((s5-1 (-> obj region on-enter)))
@@ -111,7 +111,7 @@
(s2-1 318)
)
(format (clear *temp-string*) "(on-enter ~S)" s5-1)
(s4-1 s3-1 (the-as bucket-id s2-1) *temp-string* sv-36 (font-color font-color-1) sv-32)
(s4-1 s3-1 (the-as bucket-id s2-1) *temp-string* sv-36 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -123,7 +123,7 @@
(s2-2 318)
)
(format (clear *temp-string*) "(on-inside ~S)" s5-2)
(s4-2 s3-2 (the-as bucket-id s2-2) *temp-string* sv-36 (font-color font-color-1) sv-32)
(s4-2 s3-2 (the-as bucket-id s2-2) *temp-string* sv-36 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
@@ -135,7 +135,7 @@
(s3-3 318)
)
(format (clear *temp-string*) "(on-exit ~S)" gp-1)
(s5-3 s4-3 (the-as bucket-id s3-3) *temp-string* sv-36 (font-color font-color-1) sv-32)
(s5-3 s4-3 (the-as bucket-id s3-3) *temp-string* sv-36 (font-color white) sv-32)
)
(+! (-> sv-32 y) 8)
)
test/decompiler/reference/jak2/engine/nav/nav-mesh_REF.gc
Generated Vendored
+3 -3
View File
@@ -409,7 +409,7 @@
(bucket-id debug-no-zbuf1)
(res-lump-struct obj 'name string)
s5-0
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 8))
)
(let ((s4-1 add-debug-text-3d)
@@ -422,7 +422,7 @@
(the-as bucket-id s2-1)
*temp-string*
s5-0
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 16))
)
)
@@ -576,7 +576,7 @@
(the-as bucket-id s2-1)
*temp-string*
(-> gp-0 1)
(font-color magenta)
(font-color pink)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 8))
)
)
test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+74 -74
View File
@@ -4,7 +4,7 @@
;; definition for function progress-selected
;; WARN: Return type mismatch int vs font-color.
(defbehavior progress-selected progress ((arg0 int))
(let ((color (font-color font-color-33)))
(let ((color (font-color progress-selected)))
(cond
((< 4 (the-as int (logand (-> self clock integral-frame-counter) 7)))
(set! (-> *progress-state* color-flash-counter) 1)
@@ -475,7 +475,7 @@
)
(set! (-> arg1 origin x) (- (-> arg1 origin x) (the float s5-0)))
)
(set! (-> arg1 color) (font-color font-color-32))
(set! (-> arg1 color) (font-color progress))
0
(none)
)
@@ -654,7 +654,7 @@
(arg3
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color font-color-34))
(set! (-> a0-1 color) (font-color progress-force-selected))
)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
(set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y)))
@@ -715,7 +715,7 @@
(arg3
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color font-color-34))
(set! (-> a0-1 color) (font-color progress-force-selected))
)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
(set! (-> arg1 origin y) (+ 18.0 (-> arg1 origin y)))
@@ -782,7 +782,7 @@
)
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-6 arg1))
(set! (-> a0-6 color) (font-color font-color-34))
(set! (-> a0-6 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 44 f28-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -822,7 +822,7 @@
)
(else
(let ((a0-23 arg1))
(set! (-> a0-23 color) (font-color font-color-32))
(set! (-> a0-23 color) (font-color progress))
)
)
)
@@ -1061,7 +1061,7 @@
(set! (-> v1-7 scale) 0.75)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition)))
(let ((a0-3 arg1))
@@ -1643,7 +1643,7 @@
(set! (-> arg1 origin y) (the float sv-48))
(set! (-> arg1 height) 50.0)
(let ((a0-1 arg1))
(set! (-> a0-1 color) (font-color font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((a0-2 arg1))
(set! (-> a0-2 flags) (font-flags kerning middle large))
@@ -1728,7 +1728,7 @@
(set! (-> sv-48 height) 50.0)
(set! (-> sv-48 origin y) (the float sv-16))
(let ((a0-2 sv-48))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(set! sv-32 print-game-text)
(let ((a0-4 (lookup-text! *common-text* s0-0 #f))
@@ -1805,7 +1805,7 @@
(set! (-> sv-16 origin y) (the float sv-32))
(set! (-> sv-16 height) 50.0)
(let ((a0-2 sv-16))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(set! (-> sv-16 origin x) 80.0)
(let ((a0-3 sv-16))
@@ -1894,7 +1894,7 @@
(set! (-> sv-48 origin y) (the float sv-16))
(set! (-> sv-48 height) 50.0)
(let ((a0-2 sv-48))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(set! sv-32 print-game-text)
(let ((a0-4 (lookup-text! *common-text* s0-0 #f))
@@ -1989,7 +1989,7 @@
(set! (-> a0-6 flags) (font-flags kerning middle large))
)
(let ((a0-7 sv-80))
(set! (-> a0-7 color) (font-color font-color-32))
(set! (-> a0-7 color) (font-color progress))
)
(set! sv-48 print-game-text)
(let* ((a0-8 *common-text*)
@@ -2179,7 +2179,7 @@
(let ((s2-3 arg1))
(set! (-> s2-3 color) (if (= arg2 sv-20)
(the-as font-color (the-as int (progress-selected 0)))
(font-color font-color-32)
(font-color progress)
)
)
)
@@ -2365,7 +2365,7 @@
(s2-7 *temp-string* arg1 #f 44 (bucket-id progress))
)
(let ((a0-45 arg1))
(set! (-> a0-45 color) (font-color font-color-32))
(set! (-> a0-45 color) (font-color progress))
)
(set! (-> arg1 origin x) 250.0)
(set! (-> arg1 origin y) 110.0)
@@ -2604,7 +2604,7 @@
(set! (-> v1-25 height) (the float 160))
)
(let ((a0-16 arg1))
(set! (-> a0-16 color) (font-color font-color-32))
(set! (-> a0-16 color) (font-color progress))
)
(let ((s5-2 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-memcard-dont-remove) #f) 1)
@@ -2623,7 +2623,7 @@
(set! (-> v1-3 scale) 0.5)
)
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-32))
(set! (-> a0-3 color) (font-color progress))
)
(let ((a0-4 arg1))
(set! (-> a0-4 flags) (font-flags kerning middle left large))
@@ -2715,7 +2715,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2762,7 +2762,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2810,7 +2810,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2879,7 +2879,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -2956,7 +2956,7 @@
(set! (-> v1-1 scale) 0.5)
)
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-32))
(set! (-> a0-2 color) (font-color progress))
)
(let ((a0-3 arg1))
(set! (-> a0-3 flags) (font-flags kerning middle left large))
@@ -3016,7 +3016,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3076,7 +3076,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3134,7 +3134,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3210,7 +3210,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3264,7 +3264,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3310,7 +3310,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3353,7 +3353,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3421,7 +3421,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3467,7 +3467,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.5)
@@ -3535,7 +3535,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.55)
@@ -3581,7 +3581,7 @@
(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 font-color-32))
(set! (-> a0-1 color) (font-color progress))
)
(let ((v1-2 arg1))
(set! (-> v1-2 scale) 0.55)
@@ -3643,7 +3643,7 @@
(set! (-> a0-3 flags) (font-flags kerning middle large))
)
(let ((a0-4 arg1))
(set! (-> a0-4 color) (font-color font-color-32))
(set! (-> a0-4 color) (font-color progress))
)
(set! (-> arg1 origin y) 100.0)
(let ((v1-9 arg1))
@@ -3735,7 +3735,7 @@
)
(else
(let ((a0-35 arg1))
(set! (-> a0-35 color) (font-color font-color-32))
(set! (-> a0-35 color) (font-color progress))
)
)
)
@@ -3839,7 +3839,7 @@
(set! (-> v1-15 height) (the float 210))
)
(let ((a1-9 arg1))
(set! (-> a1-9 color) (font-color font-color-32))
(set! (-> a1-9 color) (font-color progress))
)
(if (or (= (-> *setting-control* user-default language) (language-enum french))
(= (-> *setting-control* user-default language) (language-enum spanish))
@@ -3933,7 +3933,7 @@
)
(else
(let ((a0-21 arg1))
(set! (-> a0-21 color) (font-color font-color-32))
(set! (-> a0-21 color) (font-color progress))
)
)
)
@@ -4254,7 +4254,7 @@
(set! (-> arg1 origin x) 60.0)
(set! (-> arg1 origin y) 80.0)
(let ((a0-21 arg1))
(set! (-> a0-21 color) (font-color font-color-32))
(set! (-> a0-21 color) (font-color progress))
)
(let ((v1-40 (-> obj page-index)))
(cond
@@ -4477,7 +4477,7 @@
(let ((s3-1 arg2))
(set! (-> s3-1 color) (if (= arg3 1)
(the-as font-color (the-as int (progress-selected 0)))
(font-color font-color-32)
(font-color progress)
)
)
)
@@ -4503,7 +4503,7 @@
)
(set! (-> arg2 origin x) 360.0)
(let ((a0-35 arg2))
(set! (-> a0-35 color) (font-color font-color-32))
(set! (-> a0-35 color) (font-color progress))
)
)
)
@@ -4951,7 +4951,7 @@
(set! (-> a0-21 flags) (font-flags kerning middle large))
)
(let ((a0-22 arg1))
(set! (-> a0-22 color) (font-color font-color-32))
(set! (-> a0-22 color) (font-color progress))
)
(set! (-> arg1 origin x) 59.0)
(let ((v1-54 arg1))
@@ -6100,7 +6100,7 @@
(set! (-> a0-4 flags) (font-flags kerning middle large))
)
(let ((a0-5 sv-140))
(set! (-> a0-5 color) (font-color font-color-32))
(set! (-> a0-5 color) (font-color progress))
)
(set! (-> sv-140 origin x) 59.0)
(set! (-> sv-140 origin y) 78.0)
@@ -6142,7 +6142,7 @@
(set! (-> a0-23 flags) (font-flags kerning large))
)
(let ((a0-24 sv-140))
(set! (-> a0-24 color) (font-color font-color-34))
(set! (-> a0-24 color) (font-color progress-force-selected))
)
(set! (-> sv-140 origin x) (+ 20.0 sv-120 (-> sv-140 origin x)))
(let ((v1-53 sv-140))
@@ -6201,7 +6201,7 @@
)
(set! sv-108 (-> sv-140 origin x))
(let ((a0-54 sv-140))
(set! (-> a0-54 color) (font-color font-color-32))
(set! (-> a0-54 color) (font-color progress))
)
(+! (-> sv-140 origin x) sv-120)
(let ((v1-96 sv-140))
@@ -6256,7 +6256,7 @@
(set! (-> a0-74 flags) (font-flags kerning large))
)
(let ((a0-75 sv-140))
(set! (-> a0-75 color) (font-color font-color-34))
(set! (-> a0-75 color) (font-color progress-force-selected))
)
(set! (-> sv-140 origin x) (+ 20.0 sv-124 (-> sv-140 origin x)))
(let ((v1-142 sv-140))
@@ -6315,7 +6315,7 @@
)
(set! sv-108 (-> sv-140 origin x))
(let ((a0-105 sv-140))
(set! (-> a0-105 color) (font-color font-color-32))
(set! (-> a0-105 color) (font-color progress))
)
(+! (-> sv-140 origin x) sv-124)
(let ((v1-185 sv-140))
@@ -6376,7 +6376,7 @@
((and (zero? (-> *progress-state* game-options-item-selected)) (-> *progress-state* game-options-item-picked))
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-34))
(set! (-> a0-2 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 41 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -6413,7 +6413,7 @@
)
(else
(let ((a0-17 arg1))
(set! (-> a0-17 color) (font-color font-color-32))
(set! (-> a0-17 color) (font-color progress))
)
)
)
@@ -6466,7 +6466,7 @@
((and (= (-> *progress-state* game-options-item-selected) 1) (-> *progress-state* game-options-item-picked))
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-34))
(set! (-> a0-3 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 41 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -6503,7 +6503,7 @@
)
(else
(let ((a0-20 arg1))
(set! (-> a0-20 color) (font-color font-color-32))
(set! (-> a0-20 color) (font-color progress))
)
)
)
@@ -6565,7 +6565,7 @@
(cond
((and (= (-> *progress-state* game-options-item-selected) 2) (-> *progress-state* game-options-item-picked))
(let ((a0-7 arg1))
(set! (-> a0-7 color) (font-color font-color-34))
(set! (-> a0-7 color) (font-color progress-force-selected))
)
(draw-highlight (the int (-> arg1 origin y)) 44 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -6584,13 +6584,13 @@
)
)
(let ((a0-12 arg1))
(set! (-> a0-12 color) (font-color font-color-32))
(set! (-> a0-12 color) (font-color progress))
)
(let ((v1-33 arg1))
(set! (-> v1-33 scale) 0.5)
)
(let ((a0-14 arg1))
(set! (-> a0-14 color) (font-color font-color-32))
(set! (-> a0-14 color) (font-color progress))
)
(set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x)))
(let ((s5-1 print-game-text))
@@ -6632,7 +6632,7 @@
)
(else
(let ((a0-31 arg1))
(set! (-> a0-31 color) (font-color font-color-32))
(set! (-> a0-31 color) (font-color progress))
)
)
)
@@ -6644,7 +6644,7 @@
(set! (-> v1-54 scale) 0.5)
)
(let ((a0-36 arg1))
(set! (-> a0-36 color) (font-color font-color-32))
(set! (-> a0-36 color) (font-color progress))
)
(set! (-> arg1 origin y) (+ 24.0 (-> arg1 origin y)))
(let ((a0-37 arg1))
@@ -6700,7 +6700,7 @@
(cond
((and (= (-> *progress-state* game-options-item-selected) 3) (-> *progress-state* game-options-item-picked))
(let ((a0-7 arg1))
(set! (-> a0-7 color) (font-color font-color-34))
(set! (-> a0-7 color) (font-color progress-force-selected))
)
(draw-highlight (the int (-> arg1 origin y)) 44 f30-0)
(let ((s3-0 print-game-text))
@@ -6722,13 +6722,13 @@
)
)
(let ((a0-14 arg1))
(set! (-> a0-14 color) (font-color font-color-32))
(set! (-> a0-14 color) (font-color progress))
)
(let ((v1-33 arg1))
(set! (-> v1-33 scale) 0.5)
)
(let ((a0-16 arg1))
(set! (-> a0-16 color) (font-color font-color-32))
(set! (-> a0-16 color) (font-color progress))
)
(set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x)))
(let ((s5-1 print-game-text))
@@ -6770,7 +6770,7 @@
)
(else
(let ((a0-33 arg1))
(set! (-> a0-33 color) (font-color font-color-32))
(set! (-> a0-33 color) (font-color progress))
)
)
)
@@ -6785,7 +6785,7 @@
(set! (-> v1-54 scale) 0.5)
)
(let ((a0-40 arg1))
(set! (-> a0-40 color) (font-color font-color-32))
(set! (-> a0-40 color) (font-color progress))
)
(format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> *language-name-remap* (-> s4-0 0)) #f))
*temp-string*
@@ -6863,7 +6863,7 @@
)
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-4 arg1))
(set! (-> a0-4 color) (font-color font-color-34))
(set! (-> a0-4 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 42 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -6904,7 +6904,7 @@
)
(else
(let ((a0-21 arg1))
(set! (-> a0-21 color) (font-color font-color-32))
(set! (-> a0-21 color) (font-color progress))
)
)
)
@@ -6972,7 +6972,7 @@
)
(set! (-> arg1 origin y) (+ -8.0 (-> arg1 origin y)))
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-34))
(set! (-> a0-3 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 42 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -7013,7 +7013,7 @@
)
(else
(let ((a0-20 arg1))
(set! (-> a0-20 color) (font-color font-color-32))
(set! (-> a0-20 color) (font-color progress))
)
)
)
@@ -7074,7 +7074,7 @@
(set! (-> v1-10 scale) 0.6)
)
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-34))
(set! (-> a0-3 color) (font-color progress-force-selected))
)
(set! (-> arg1 width) 350.0)
(set! (-> arg1 height) 60.0)
@@ -7149,7 +7149,7 @@
)
(else
(let ((a0-31 arg1))
(set! (-> a0-31 color) (font-color font-color-32))
(set! (-> a0-31 color) (font-color progress))
)
)
)
@@ -7180,7 +7180,7 @@
(cond
((and (zero? (-> *progress-state* qr-options-item-selected)) (-> *progress-state* qr-options-item-picked))
(let ((a0-2 arg1))
(set! (-> a0-2 color) (font-color font-color-34))
(set! (-> a0-2 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 50 f0-1)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -7245,7 +7245,7 @@
(cond
((and (= (-> *progress-state* qr-options-item-selected) 1) (-> *progress-state* qr-options-item-picked))
(let ((a0-3 arg1))
(set! (-> a0-3 color) (font-color font-color-34))
(set! (-> a0-3 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> arg1 origin y))) 50 f30-0)
(print-game-text (lookup-text! *common-text* (-> obj name) #f) arg1 #f 44 (bucket-id progress))
@@ -7410,7 +7410,7 @@
(set! sv-128 (-> obj value-to-modify))
(set! (-> s5-0 origin y) (+ -8.0 (-> s5-0 origin y)))
(let ((a0-12 s5-0))
(set! (-> a0-12 color) (font-color font-color-34))
(set! (-> a0-12 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -2.0 (-> s5-0 origin y))) 52 f30-0)
(set! sv-144 print-game-text)
@@ -7708,7 +7708,7 @@
arg3
)
(let ((a0-7 arg1))
(set! (-> a0-7 color) (font-color font-color-34))
(set! (-> a0-7 color) (font-color progress-force-selected))
)
(draw-highlight (the int (+ -1.0 (-> arg1 origin y))) 42 f30-0)
(let ((s3-1 print-game-text))
@@ -7717,13 +7717,13 @@
)
(set! (-> arg1 origin y) (+ 22.0 (-> arg1 origin y)))
(let ((a0-13 arg1))
(set! (-> a0-13 color) (font-color font-color-32))
(set! (-> a0-13 color) (font-color progress))
)
(let ((v1-22 arg1))
(set! (-> v1-22 scale) 0.5)
)
(let ((a0-15 arg1))
(set! (-> a0-15 color) (font-color font-color-32))
(set! (-> a0-15 color) (font-color progress))
)
(set! (-> arg1 origin x) (+ -70.0 (-> arg1 origin x)))
(let ((s4-1 print-game-text))
@@ -7766,7 +7766,7 @@
(set! (-> v1-39 scale) 0.5)
)
(let ((a0-33 arg1))
(set! (-> a0-33 color) (font-color font-color-32))
(set! (-> a0-33 color) (font-color progress))
)
(format (clear *temp-string*) "~S" (lookup-text! *common-text* (-> *stereo-mode-name-remap* s5-0) #f))
(let ((a0-37 *temp-string*))
@@ -7831,7 +7831,7 @@
(let ((s0-0 arg1))
(set! (-> s0-0 color) (if (= arg2 (-> arg0 option-index))
(the-as font-color (the-as int (progress-selected 0)))
(font-color font-color-32)
(font-color progress)
)
)
)
@@ -7843,7 +7843,7 @@
)
(else
(let ((a0-9 arg1))
(set! (-> a0-9 color) (font-color font-color-32))
(set! (-> a0-9 color) (font-color progress))
)
)
)
test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
Generated Vendored
+1 -1
View File
@@ -1462,7 +1462,7 @@
(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 (the-as int (progress-selected 0)))
(font-color font-color-32)
(font-color progress)
)
)
)
test/decompiler/reference/jak2/levels/city/common/ctywide-obs_REF.gc
Generated Vendored
+2 -2
View File
@@ -3684,7 +3684,7 @@ This commonly includes things such as:
(set! (-> v1-51 origin y) (the float a0-59))
)
(let ((a0-60 s1-0))
(set! (-> a0-60 color) (font-color font-color-29))
(set! (-> a0-60 color) (font-color progress-old-yellow))
)
(let ((s0-0 print-game-text))
(set! sv-352 format)
@@ -3714,7 +3714,7 @@ This commonly includes things such as:
)
(let ((a0-68 s1-0))
(set! (-> a0-68 color) (if (= s0-1 s5-0)
(font-color font-color-30)
(font-color progress-old-selected)
(font-color default)
)
)
test/decompiler/reference/jak2/levels/city/common/height-map_REF.gc
Generated Vendored
+1 -1
View File
@@ -80,7 +80,7 @@
(the-as bucket-id s2-0)
*temp-string*
s5-0
(font-color font-color-1)
(font-color white)
(new 'static 'vector2h :data (new 'static 'array int16 2 0 16))
)
)
test/decompiler/reference/jak2/levels/common/ai/bot_REF.gc
Generated Vendored
+1 -1
View File
@@ -54,7 +54,7 @@
(bucket-id debug-no-zbuf1)
spot-id
(-> spot center)
(font-color font-color-1)
(font-color white)
(the-as vector2h #f)
)
)
test/decompiler/reference/jak2/levels/common/battle_REF.gc
Generated Vendored
+1 -1
View File
@@ -978,7 +978,7 @@
(-> obj stat-child-count)
(-> obj allies length)
)
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* s4-0 (font-color gold) (the-as vector2h #f))
(s3-0 s2-0 (the-as bucket-id s1-0) *temp-string* s4-0 (font-color orange) (the-as vector2h #f))
)
)
(dotimes (s5-1 (-> obj spawners length))
test/decompiler/reference/jak2/levels/common/enemy/hover/hover-nav-control_REF.gc
Generated Vendored
+1 -1
View File
@@ -266,7 +266,7 @@
(add-debug-x #t (bucket-id debug2) (-> s4-0 pos) *color-white*)
(format (clear *temp-string*) "~d" s5-0)
(let ((a2-2 *temp-string*))
(add-debug-text-3d #t (bucket-id debug2) a2-2 (-> s4-0 pos) (font-color font-color-1) (the-as vector2h #f))
(add-debug-text-3d #t (bucket-id debug2) a2-2 (-> s4-0 pos) (font-color white) (the-as vector2h #f))
)
(dotimes (s3-1 (-> s4-0 count))
(let ((a2-3 (new 'stack-no-clear 'vector)))
test/decompiler/reference/jak2/levels/common/races/race-hud_REF.gc
Generated Vendored
+4 -4
View File
@@ -405,7 +405,7 @@
(let ((s2-1 (-> s5-0 lap-time-array (+ (- -1 s4-0) (-> s5-0 lap-count)))))
(set! (-> obj strings s3-0 scale) 0.5)
(set! (-> obj strings s3-0 flags) (font-flags kerning large))
(set! (-> obj strings s3-0 color) (font-color font-color-1))
(set! (-> obj strings s3-0 color) (font-color white))
(set-as-offset-from!
(the-as hud-sprite (&+ (-> obj strings 0 pos) (* 48 s3-0)))
(the-as vector4w (-> obj strings 1 pos))
@@ -425,7 +425,7 @@
(let ((s3-1 (+ s3-0 1)))
(set! (-> obj strings s3-1 scale) 0.5)
(set! (-> obj strings s3-1 flags) (font-flags kerning right large))
(set! (-> obj strings s3-1 color) (font-color font-color-1))
(set! (-> obj strings s3-1 color) (font-color white))
(set-as-offset-from!
(the-as hud-sprite (&+ (-> obj strings 0 pos) (* 48 s3-1)))
(the-as vector4w (-> obj strings 2 pos))
@@ -469,9 +469,9 @@
(set! (-> obj strings 0 flags) (font-flags kerning middle large))
(set! (-> obj strings 0 color) (font-color red))
(set! (-> obj strings 1 flags) (font-flags kerning large))
(set! (-> obj strings 1 color) (font-color font-color-1))
(set! (-> obj strings 1 color) (font-color white))
(set! (-> obj strings 2 flags) (font-flags kerning large))
(set! (-> obj strings 2 color) (font-color font-color-1))
(set! (-> obj strings 2 color) (font-color white))
0
(none)
)
test/decompiler/reference/jak2/levels/common/races/race-manager_REF.gc
Generated Vendored
+2 -2
View File
@@ -1289,7 +1289,7 @@
(defmethod race-manager-method-24 race-manager ((obj race-manager))
(when (= (get-status *gui-control* (-> obj message-id)) (gui-status active))
(let ((gp-1
(new 'stack 'font-context *font-default-matrix* 70 20 0.0 (font-color gold) (font-flags shadow kerning))
(new 'stack 'font-context *font-default-matrix* 70 20 0.0 (font-color orange) (font-flags shadow kerning))
)
)
(let ((v1-4 gp-1))
@@ -1319,7 +1319,7 @@
(defmethod race-manager-method-25 race-manager ((obj race-manager))
(when (= (get-status *gui-control* (-> obj message-id)) (gui-status active))
(let ((gp-1
(new 'stack 'font-context *font-default-matrix* 70 20 0.0 (font-color gold) (font-flags shadow kerning))
(new 'stack 'font-context *font-default-matrix* 70 20 0.0 (font-color orange) (font-flags shadow kerning))
)
)
(let ((v1-4 gp-1))
test/decompiler/reference/jak2/levels/common/races/race-mesh_REF.gc
Generated Vendored
+1 -1
View File
@@ -595,7 +595,7 @@
(s2-0 318)
)
(format (clear *temp-string*) "~D" arg0)
(s4-1 s3-1 (the-as bucket-id s2-0) *temp-string* s5-0 (font-color font-color-1) (the-as vector2h #f))
(s4-1 s3-1 (the-as bucket-id s2-0) *temp-string* s5-0 (font-color white) (the-as vector2h #f))
)
)
)
test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc
Generated Vendored
+2 -2
View File
@@ -562,8 +562,8 @@
(set! (-> sv-112 scale) 0.7)
(dotimes (s5-4 (-> gp-1 length))
(if (= (-> self selected) s5-4)
(set! (-> sv-112 color) (font-color font-color-30))
(set! (-> sv-112 color) (font-color font-color-1))
(set! (-> sv-112 color) (font-color progress-old-selected))
(set! (-> sv-112 color) (font-color white))
)
(print-game-text
(lookup-text! *common-text* (the-as text-id (-> gp-1 s5-4)) #f)
test/decompiler/reference/jak2/levels/title/title-obs_REF.gc
Generated Vendored
+2 -2
View File
@@ -570,8 +570,8 @@
(set! (-> sv-112 scale) 0.7)
(dotimes (s5-4 (-> gp-1 length))
(if (= (-> self selected) s5-4)
(set! (-> sv-112 color) (font-color font-color-30))
(set! (-> sv-112 color) (font-color font-color-1))
(set! (-> sv-112 color) (font-color progress-old-selected))
(set! (-> sv-112 color) (font-color white))
)
(print-game-text
(lookup-text! *common-text* (the-as text-id (-> gp-1 s5-4)) #f)