From 1ff55d5015ab22225e2d79213acd16a4a9b814e1 Mon Sep 17 00:00:00 2001 From: ManDude <7569514+ManDude@users.noreply.github.com> Date: Sun, 24 Sep 2023 03:00:09 +0100 Subject: [PATCH] fix `(font-flags left)` name + fix `right` flag not reflecting in debug text box (#3020) Fixes #3016 Fixes #3017 --- decompiler/config/jak1/all-types.gc | 2 +- decompiler/config/jak2/all-types.gc | 2 +- .../engine/common-obs/process-taskable.gc | 4 +- goal_src/jak1/engine/game/game-save.gc | 2 +- goal_src/jak1/engine/gfx/font-h.gc | 2 +- goal_src/jak1/engine/ui/hud-classes.gc | 2 +- .../jak1/engine/ui/progress/progress-draw.gc | 42 +++++++++---------- goal_src/jak1/engine/ui/progress/progress.gc | 2 +- goal_src/jak1/engine/ui/text.gc | 12 ++++-- goal_src/jak1/levels/rolling/rolling-obs.gc | 6 +-- goal_src/jak1/levels/title/title-obs.gc | 2 +- .../levels/village_common/villagep-obs.gc | 2 +- goal_src/jak1/pc/debug/pc-debug-common.gc | 2 +- goal_src/jak1/pc/progress-pc.gc | 12 +++--- goal_src/jak1/pc/subtitle.gc | 4 +- goal_src/jak2/engine/game/game-save.gc | 2 +- .../jak2/engine/game/task/task-control.gc | 2 +- goal_src/jak2/engine/gfx/font-h.gc | 2 +- .../process-drawable/process-taskable.gc | 2 +- goal_src/jak2/engine/scene/scene.gc | 4 +- .../jak2/engine/ui/progress/progress-draw.gc | 36 ++++++++-------- goal_src/jak2/engine/ui/progress/progress.gc | 4 +- goal_src/jak2/engine/ui/text.gc | 14 +++++-- goal_src/jak2/levels/city/ctywide-obs.gc | 2 +- goal_src/jak2/levels/common/race/race-hud.gc | 2 +- .../jak2/levels/common/race/race-manager.gc | 4 +- goal_src/jak2/levels/demo/demo-obs.gc | 2 +- goal_src/jak2/levels/gungame/gungame-obs.gc | 2 +- goal_src/jak2/levels/title/title-obs.gc | 2 +- goal_src/jak2/pc/damage-number.gc | 2 +- goal_src/jak2/pc/progress/progress-draw-pc.gc | 8 ++-- .../pc/progress/progress-generic-draw-pc.gc | 4 +- goal_src/jak2/pc/subtitle2.gc | 2 +- .../engine/common-obs/process-taskable_REF.gc | 4 +- .../jak1/engine/game/game-save_REF.gc | 2 +- .../jak1/engine/ui/hud-classes_REF.gc | 2 +- .../engine/ui/progress/progress-draw_REF.gc | 42 +++++++++---------- .../jak1/engine/ui/progress/progress_REF.gc | 2 +- .../reference/jak1/engine/ui/text_REF.gc | 6 +-- .../jak1/levels/rolling/rolling-obs_REF.gc | 6 +-- .../jak1/levels/title/title-obs_REF.gc | 2 +- .../levels/village_common/villagep-obs_REF.gc | 2 +- .../jak2/engine/game/game-save_REF.gc | 2 +- .../jak2/engine/game/task/task-control_REF.gc | 2 +- .../process-drawable/process-taskable_REF.gc | 2 +- .../reference/jak2/engine/scene/scene_REF.gc | 4 +- .../engine/ui/progress/progress-draw_REF.gc | 40 ++++++++---------- .../jak2/engine/ui/progress/progress_REF.gc | 4 +- .../reference/jak2/engine/ui/text_REF.gc | 6 +-- .../jak2/levels/city/ctywide-obs_REF.gc | 2 +- .../jak2/levels/common/race/race-hud_REF.gc | 2 +- .../levels/common/race/race-manager_REF.gc | 4 +- .../jak2/levels/demo/demo-obs_REF.gc | 2 +- .../jak2/levels/gungame/gungame-obs_REF.gc | 2 +- .../jak2/levels/title/title-obs_REF.gc | 2 +- 55 files changed, 172 insertions(+), 164 deletions(-) diff --git a/decompiler/config/jak1/all-types.gc b/decompiler/config/jak1/all-types.gc index cdd9e75fd6..aa5629a25e 100644 --- a/decompiler/config/jak1/all-types.gc +++ b/decompiler/config/jak1/all-types.gc @@ -5986,7 +5986,7 @@ (shadow 0) (kerning 1) (middle 2) - (left 3) + (middle-vert 3) (right 4) (large 5) (pc-hack 6) diff --git a/decompiler/config/jak2/all-types.gc b/decompiler/config/jak2/all-types.gc index e5d5e1c087..773447cc9b 100644 --- a/decompiler/config/jak2/all-types.gc +++ b/decompiler/config/jak2/all-types.gc @@ -6381,7 +6381,7 @@ (shadow 0) (kerning 1) (middle 2) - (left 3) + (middle-vert 3) (right 4) (large 5) (pc-hack 6) diff --git a/goal_src/jak1/engine/common-obs/process-taskable.gc b/goal_src/jak1/engine/common-obs/process-taskable.gc index ad1d7516f7..9dfd32d697 100644 --- a/goal_src/jak1/engine/common-obs/process-taskable.gc +++ b/goal_src/jak1/engine/common-obs/process-taskable.gc @@ -71,7 +71,7 @@ (let ((v1-6 a1-2)) (set! (-> v1-6 scale) 0.9) ) - (set! (-> a1-2 flags) (font-flags shadow kerning left large)) + (set! (-> a1-2 flags) (font-flags shadow kerning middle-vert large)) (print-game-text (-> obj message) a1-2 #f 128 22) ) ) @@ -924,7 +924,7 @@ (let ((v1-59 gp-1)) (set! (-> v1-59 scale) 0.9) ) - (set! (-> gp-1 flags) (font-flags shadow kerning left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle-vert large)) (print-game-text (lookup-text! *common-text* (-> self talk-message) #f) gp-1 #f 128 22) ) (when (and (cpad-pressed? 0 circle) (process-grab? *target*)) diff --git a/goal_src/jak1/engine/game/game-save.gc b/goal_src/jak1/engine/game/game-save.gc index 91d5223239..3e8e4d43cd 100644 --- a/goal_src/jak1/engine/game/game-save.gc +++ b/goal_src/jak1/engine/game/game-save.gc @@ -1245,7 +1245,7 @@ (let ((v1-17 gp-1)) (set! (-> v1-17 height) (the float 20)) ) - (set! (-> gp-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) ;; if this is the first time saving, display a warning. (when (zero? (-> *game-info* auto-save-count)) diff --git a/goal_src/jak1/engine/gfx/font-h.gc b/goal_src/jak1/engine/gfx/font-h.gc index 5b777e1159..62c5316884 100644 --- a/goal_src/jak1/engine/gfx/font-h.gc +++ b/goal_src/jak1/engine/gfx/font-h.gc @@ -53,7 +53,7 @@ (shadow 0) (kerning 1) (middle 2) - (left 3) + (middle-vert 3) (right 4) (large 5) (pc-hack 6) ;; added, widescreen small text hack diff --git a/goal_src/jak1/engine/ui/hud-classes.gc b/goal_src/jak1/engine/ui/hud-classes.gc index 70acde1dff..cb23c10154 100644 --- a/goal_src/jak1/engine/ui/hud-classes.gc +++ b/goal_src/jak1/engine/ui/hud-classes.gc @@ -514,7 +514,7 @@ (let ((v1-14 s5-1)) (set! (-> v1-14 scale) 0.6) ) - (set! (-> s5-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> s5-1 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* (-> *level-task-data* (-> obj level-index) level-name-id) #f) s5-1 diff --git a/goal_src/jak1/engine/ui/progress/progress-draw.gc b/goal_src/jak1/engine/ui/progress/progress-draw.gc index b5259d0a2b..91143ada57 100644 --- a/goal_src/jak1/engine/ui/progress/progress-draw.gc +++ b/goal_src/jak1/engine/ui/progress/progress-draw.gc @@ -152,7 +152,7 @@ (let ((v1-93 s0-1)) (set! (-> v1-93 scale) 0.7) ) - (set! (-> s0-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> s0-1 flags) (font-flags shadow kerning middle middle-vert large)) (set! sv-224 print-game-text-scaled) (let ((a0-47 (lookup-text! *common-text* (-> s5-0 task-info (-> obj task-index) task-name s1-0) #f)) (a1-57 f30-0) @@ -361,7 +361,7 @@ (let ((v1-2 arg0)) (set! (-> v1-2 height) (the float 55)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s4-0 (text-id memcard-not-formatted-title))) (case (-> obj display-state) (((progress-screen memcard-no-space)) @@ -430,7 +430,7 @@ (let ((v1-2 arg0)) (set! (-> v1-2 height) (the float 55)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s4-0 print-game-text-scaled)) (format (clear *temp-string*) (lookup-text! *common-text* (text-id memcard-not-formatted-title) #f) 1) (s4-0 *temp-string* (-> obj transition-percentage-invert) arg0 128) @@ -470,7 +470,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.65) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 20 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 55.0) (let ((v1-4 arg0)) @@ -506,7 +506,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.65) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 20 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 40.0) (let ((v1-4 arg0)) @@ -540,7 +540,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 1.0) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 20 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 35.0) (let ((v1-4 arg0)) @@ -568,7 +568,7 @@ (let ((v1-18 arg0)) (set! (-> v1-18 scale) 0.65) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 15 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 100.0) (let ((v1-22 arg0)) @@ -589,7 +589,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.65) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 50 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 35.0) (let ((v1-4 arg0)) @@ -673,7 +673,7 @@ (let ((v1-29 arg0)) (set! (-> v1-29 scale) 0.5) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 102 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 5.0) (let ((v1-33 arg0)) @@ -705,7 +705,7 @@ ) (dotimes (s1-0 4) (set! (-> arg0 origin x) (the float (- 41 (-> obj left-x-offset)))) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((a0-17 arg0)) (set! (-> a0-17 color) (font-color default)) ) @@ -904,7 +904,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.6) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 70 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 5.0) (let ((v1-4 arg0)) @@ -978,7 +978,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.6) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 70 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 10.0) (let ((v1-4 arg0)) @@ -1046,7 +1046,7 @@ (let ((v1-2 arg0)) (set! (-> v1-2 height) (the float 55)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s4-0 (text-id error-loading))) (case (-> obj display-state) (((progress-screen memcard-error-saving)) @@ -1105,7 +1105,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 60)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id autosave-warn-title) #f) (-> obj transition-percentage-invert) @@ -1171,7 +1171,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 40)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id screen-change-to-60hz) #f) (-> obj transition-percentage-invert) @@ -1231,7 +1231,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 40)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id no-disc-title) #f) (-> obj transition-percentage-invert) @@ -1283,7 +1283,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 40)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id bad-disc-title) #f) (-> obj transition-percentage-invert) @@ -1333,7 +1333,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 40)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id quit?) #f) (-> obj transition-percentage-invert) @@ -1356,7 +1356,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 50)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id screen-now-60hz) #f) (-> obj transition-percentage-invert) @@ -1502,7 +1502,7 @@ ) (set-width! font 350) (set-height! font 25) - (set! (-> font flags) (font-flags shadow kerning middle left large)) + (set! (-> font flags) (font-flags shadow kerning middle middle-vert large)) (dotimes (s0-0 (length s3-0)) (let ((option-str (the string #f)) (x-off 27) @@ -1811,7 +1811,7 @@ ) ) (set! (-> s4-2 origin y) 180.0) - (set! (-> s4-2 flags) (font-flags shadow kerning middle left large)) + (set! (-> s4-2 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s3-3 print-game-text)) (format (clear *temp-string*) "~2D%" (the int (-> *progress-process* 0 completion-percentage))) (s3-3 *temp-string* s4-2 #f (the int (* 128.0 f28-0)) 22) diff --git a/goal_src/jak1/engine/ui/progress/progress.gc b/goal_src/jak1/engine/ui/progress/progress.gc index ff9365e615..c33ceddc09 100644 --- a/goal_src/jak1/engine/ui/progress/progress.gc +++ b/goal_src/jak1/engine/ui/progress/progress.gc @@ -2097,7 +2097,7 @@ (let ((v1-104 s5-1)) (set! (-> v1-104 height) (the float 45)) ) - (set! (-> s5-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> s5-1 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (-> gp-0 level-name-id) #f) f30-0 diff --git a/goal_src/jak1/engine/ui/text.gc b/goal_src/jak1/engine/ui/text.gc index cbd1bf9859..d9e8a2ef77 100644 --- a/goal_src/jak1/engine/ui/text.gc +++ b/goal_src/jak1/engine/ui/text.gc @@ -358,6 +358,9 @@ (let ((s5-0 (new 'static 'vector4w)) (gp-0 (new 'static 'matrix)) ) + (#when PC_PORT + (if (logtest? (-> arg0 flags) (font-flags right)) + (set! (-> arg0 width) (- (-> arg0 width))))) (let ((s4-0 (new 'static 'vector))) (set-vector! s4-0 (-> arg0 origin x) (-> arg0 origin y) 0.0 1.0) (set! (-> s4-0 x) (* (-> s4-0 x) (-> *video-parms* relative-x-scale-reciprical))) @@ -417,6 +420,9 @@ (the-as vector (-> gp-0 vector)) (the-as vector s5-0) ) + (#when PC_PORT + (if (logtest? (-> arg0 flags) (font-flags right)) + (set! (-> arg0 width) (- (-> arg0 width))))) ) 0 (none) @@ -446,7 +452,7 @@ (if (logtest? (-> font-ctxt flags) (font-flags middle)) (+! (-> font-ctxt origin x) (* 0.5 (- orig-width scaled-width))) ) - (if (logtest? (-> font-ctxt flags) (font-flags left)) + (if (logtest? (-> font-ctxt flags) (font-flags middle-vert)) ;; this code is really weird. it does the divide with an int, but fails ;; to convert it back to a float before adding?? (+! (-> font-ctxt origin y) (the-as float (/ (the int (- orig-height scaled-height)) 2))) @@ -514,8 +520,8 @@ (set! (-> gp-0 flags) (-> font-ctxt flags)) (set! (-> gp-0 color) (-> font-ctxt color)) (set! (-> gp-0 scale) sv-136) - (when (logtest? (-> gp-0 flags) (font-flags left)) - (logclear! (-> gp-0 flags) (font-flags left)) + (when (logtest? (-> gp-0 flags) (font-flags middle-vert)) + (logclear! (-> gp-0 flags) (font-flags middle-vert)) (let ((f30-0 (-> gp-0 width)) (f28-0 (-> gp-0 height)) ) diff --git a/goal_src/jak1/levels/rolling/rolling-obs.gc b/goal_src/jak1/levels/rolling/rolling-obs.gc index a63a1cc01a..afa0c254ac 100644 --- a/goal_src/jak1/levels/rolling/rolling-obs.gc +++ b/goal_src/jak1/levels/rolling/rolling-obs.gc @@ -1057,7 +1057,7 @@ ) (set! (-> gp-0 origin x) 156.0) (set! (-> gp-0 origin y) 80.0) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((a0-15 gp-0)) (set! (-> a0-15 color) (font-color red)) ) @@ -1085,7 +1085,7 @@ ) (set! (-> gp-0 origin x) 156.0) (set! (-> gp-0 origin y) 80.0) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((a0-23 gp-0)) (set! (-> a0-23 color) (font-color red)) ) @@ -1159,7 +1159,7 @@ (let ((v1-21 gp-0)) (set! (-> v1-21 height) (the float 50)) ) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* (text-id race-aborted) #f) gp-0 #f 128 22) ) ) diff --git a/goal_src/jak1/levels/title/title-obs.gc b/goal_src/jak1/levels/title/title-obs.gc index dab366b0c2..30cf2aec20 100644 --- a/goal_src/jak1/levels/title/title-obs.gc +++ b/goal_src/jak1/levels/title/title-obs.gc @@ -856,7 +856,7 @@ (let ((v1-13 gp-0)) (set! (-> v1-13 height) (the float 40)) ) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* (text-id press-start) #f) gp-0 #f 128 22) ) ) diff --git a/goal_src/jak1/levels/village_common/villagep-obs.gc b/goal_src/jak1/levels/village_common/villagep-obs.gc index b851534954..5fe6e0cdc1 100644 --- a/goal_src/jak1/levels/village_common/villagep-obs.gc +++ b/goal_src/jak1/levels/village_common/villagep-obs.gc @@ -308,7 +308,7 @@ (let ((v1-40 s1-3)) (set! (-> v1-40 height) (the float 55)) ) - (set! (-> s1-3 flags) (font-flags shadow kerning middle left large)) + (set! (-> s1-3 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* (text-id warp-gate-use-dpad) #f) s1-3 #f 128 22) (+! (-> s1-3 origin y) 35.0) (let ((v1-43 s1-3)) diff --git a/goal_src/jak1/pc/debug/pc-debug-common.gc b/goal_src/jak1/pc/debug/pc-debug-common.gc index e6d2f6357c..ef89acaea5 100644 --- a/goal_src/jak1/pc/debug/pc-debug-common.gc +++ b/goal_src/jak1/pc/debug/pc-debug-common.gc @@ -37,7 +37,7 @@ (draw-sprite2d-xy ,buf (+ bar-x used-x) used-y (- bar-width used-x) MEM_BAR_HEIGHT MEM_BAR_BG_COL) (draw-string-xy ,name ,buf (- bar-x MEM_BAR_HORZ_PAD) used-y (font-color red) (font-flags shadow kerning right)) (draw-string-xy (if (zero? total) "NO HEAP" (string-format "~,,2f%" (* used-p 100))) ,buf (+ bar-x used-x) used-y (font-color default) (font-flags shadow kerning middle)) - (draw-string-xy (string-format "~,,1fM" (/ total (* 1024 1024))) ,buf (+ bar-x bar-width MEM_BAR_HORZ_PAD) used-y (font-color red) (font-flags shadow kerning left)) + (draw-string-xy (string-format "~,,1fM" (/ total (* 1024 1024))) ,buf (+ bar-x bar-width MEM_BAR_HORZ_PAD) used-y (font-color red) (font-flags shadow kerning middle-vert)) ) ) (defmacro draw-memory-bar-kheap (buf heap &key (name #f) &key idx &key color) diff --git a/goal_src/jak1/pc/progress-pc.gc b/goal_src/jak1/pc/progress-pc.gc index 9216f9bf98..f079a885bc 100644 --- a/goal_src/jak1/pc/progress-pc.gc +++ b/goal_src/jak1/pc/progress-pc.gc @@ -2151,7 +2151,7 @@ ;; set the common params for the text drawing (set-width! font 370) (set-height! font 25) - (set! (-> font flags) (font-flags shadow kerning middle left large)) + (set! (-> font flags) (font-flags shadow kerning middle middle-vert large)) ;; set scroll arrow sprite vertical position right now (set! (-> obj particles 32 init-pos y) (the float (* 2 (- y-off 20)))) ;; when scrolling we draw an extra line @@ -2594,7 +2594,7 @@ (defun draw-memcard-speedrun-options ((obj progress) (arg0 font-context)) (set-scale! arg0 0.85) - (set-flags! arg0 (font-flags shadow kerning middle left large)) + (set-flags! arg0 (font-flags shadow kerning middle middle-vert large)) (set-origin! arg0 (- 20 (-> obj left-x-offset)) 30) (set-width! arg0 360) (set-color! arg0 (font-color progress-blue)) @@ -2602,7 +2602,7 @@ (print-game-text-scaled (lookup-text! *common-text* (text-id speedrun-options-heading) #f) (-> obj transition-percentage-invert) arg0 128) (set-scale! arg0 0.6) - (set-flags! arg0 (font-flags shadow kerning middle left large)) + (set-flags! arg0 (font-flags shadow kerning middle middle-vert large)) (set-origin! arg0 (- 20 (-> obj left-x-offset)) 60) (set-width! arg0 360) (set-height! arg0 20) @@ -2613,7 +2613,7 @@ (defun draw-memcard-auto-save-disabled ((obj progress) (arg0 font-context)) (set-scale! arg0 0.6) - (set-flags! arg0 (font-flags shadow kerning middle left large)) + (set-flags! arg0 (font-flags shadow kerning middle middle-vert large)) (set-origin! arg0 (- 20 (-> obj left-x-offset)) 38) (set-width! arg0 360) (set-height! arg0 20) @@ -2637,7 +2637,7 @@ (set-scale! arg0 0.6) (set-width! arg0 300) (set-height! arg0 40) - (set-flags! arg0 (font-flags shadow kerning middle left large)) + (set-flags! arg0 (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id disable-auto-save-query) #f) (-> obj transition-percentage-invert) arg0 128) @@ -2897,7 +2897,7 @@ ) (set-width! s5-1 328) (set-height! s5-1 45) - (set! (-> s5-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> s5-1 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (-> gp-0 level-name-id) #f) f30-0 s5-1 (the int (* 128.0 f30-0))) ) ) diff --git a/goal_src/jak1/pc/subtitle.gc b/goal_src/jak1/pc/subtitle.gc index 1381867b8e..fe9f087d2d 100644 --- a/goal_src/jak1/pc/subtitle.gc +++ b/goal_src/jak1/pc/subtitle.gc @@ -363,8 +363,8 @@ (set! (-> gp-0 flags) (-> font-ctxt flags)) (set! (-> gp-0 color) (-> font-ctxt color)) (set! (-> gp-0 scale) sv-136) - (when (logtest? (-> gp-0 flags) (font-flags left)) - (logclear! (-> gp-0 flags) (font-flags left)) + (when (logtest? (-> gp-0 flags) (font-flags middle-vert)) + (logclear! (-> gp-0 flags) (font-flags middle-vert)) (let ((f30-0 (-> gp-0 width)) (f28-0 (-> gp-0 height)) ) diff --git a/goal_src/jak2/engine/game/game-save.gc b/goal_src/jak2/engine/game/game-save.gc index 1190b77a91..10210d96d5 100644 --- a/goal_src/jak2/engine/game/game-save.gc +++ b/goal_src/jak2/engine/game/game-save.gc @@ -1675,7 +1675,7 @@ (let ((v1-19 gp-1)) (set! (-> v1-19 height) (the float 20)) ) - (set! (-> gp-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (when (and (>= 1 (-> *game-info* auto-save-count)) (-> self next-state) (= (-> self next-state name) 'save)) (print-game-text (lookup-text! *common-text* (text-id progress-memcard-saving-data) #f) diff --git a/goal_src/jak2/engine/game/task/task-control.gc b/goal_src/jak2/engine/game/task/task-control.gc index cef814c1a0..dbbbcebd50 100644 --- a/goal_src/jak2/engine/game/task/task-control.gc +++ b/goal_src/jak2/engine/game/task/task-control.gc @@ -1510,7 +1510,7 @@ (let ((v1-9 gp-0)) (set! (-> v1-9 height) (the float 35)) ) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s4-0 (if (logtest? (-> obj flags) (fail-mission-flags famflags-2)) (the-as int (-> obj fail-message)) 393 diff --git a/goal_src/jak2/engine/gfx/font-h.gc b/goal_src/jak2/engine/gfx/font-h.gc index ba49b415ab..1b06257f10 100644 --- a/goal_src/jak2/engine/gfx/font-h.gc +++ b/goal_src/jak2/engine/gfx/font-h.gc @@ -60,7 +60,7 @@ (shadow 0) (kerning 1) (middle 2) - (left 3) + (middle-vert 3) (right 4) (large 5) (pc-hack 6) diff --git a/goal_src/jak2/engine/process-drawable/process-taskable.gc b/goal_src/jak2/engine/process-drawable/process-taskable.gc index a1f7457008..6294b76f5f 100644 --- a/goal_src/jak2/engine/process-drawable/process-taskable.gc +++ b/goal_src/jak2/engine/process-drawable/process-taskable.gc @@ -243,7 +243,7 @@ Seen take in - `true-func` which takes no args TODO - seems fishy (let ((v1-86 s5-1)) (set! (-> v1-86 scale) 0.9) ) - (set! (-> s5-1 flags) (font-flags shadow kerning left large)) + (set! (-> s5-1 flags) (font-flags shadow kerning middle-vert large)) (print-game-text (lookup-text! *common-text* (-> self talk-message) #f) s5-1 #f 44 (bucket-id progress)) ) (when (cpad-pressed? 0 triangle) diff --git a/goal_src/jak2/engine/scene/scene.gc b/goal_src/jak2/engine/scene/scene.gc index 5e1790f2e1..dbd07321a3 100644 --- a/goal_src/jak2/engine/scene/scene.gc +++ b/goal_src/jak2/engine/scene/scene.gc @@ -770,14 +770,14 @@ (set! (-> v1-27 scale) 0.6) ) ) - (set! (-> s2-0 flags) (font-flags kerning middle left large)) + (set! (-> s2-0 flags) (font-flags kerning middle middle-vert large)) (+! (-> s2-0 origin x) -1.0) (+! (-> s2-0 origin y) -1.0) (set! (-> s2-0 color) (font-color font-color-39)) (+! (-> s2-0 origin x) 1.0) (+! (-> s2-0 origin y) 1.0) (set! (-> s2-0 color) (font-color default)) - (set! (-> s2-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> s2-0 flags) (font-flags shadow kerning middle middle-vert large)) ;; og:preserve-this (#if PC_PORT (if (or (!= (-> self type) scene-player) diff --git a/goal_src/jak2/engine/ui/progress/progress-draw.gc b/goal_src/jak2/engine/ui/progress/progress-draw.gc index 88d4c5291a..c883fffeb2 100644 --- a/goal_src/jak2/engine/ui/progress/progress-draw.gc +++ b/goal_src/jak2/engine/ui/progress/progress-draw.gc @@ -2395,7 +2395,7 @@ (set! (-> s4-0 color) (progress-selected 0)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 120.0) (set! (-> arg1 origin y) 110.0) @@ -2450,7 +2450,7 @@ (set! (-> a0-3 color) (font-color progress)) ) (let ((a0-4 arg1)) - (set! (-> a0-4 flags) (font-flags kerning middle left large)) + (set! (-> a0-4 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 75.0) (set! (-> arg1 origin y) 80.0) @@ -2540,7 +2540,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 130.0) @@ -2585,7 +2585,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 130.0) @@ -2631,7 +2631,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 100.0) @@ -2698,7 +2698,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 77.0) (set! (-> arg1 origin y) 85.0) @@ -2773,7 +2773,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 80.0) @@ -2834,7 +2834,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 120.0) @@ -2892,7 +2892,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 120.0) @@ -2966,7 +2966,7 @@ ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s3-0 (-> *level* default-level)) ) (let ((a0-16 arg1)) - (set! (-> a0-16 flags) (font-flags kerning middle left large)) + (set! (-> a0-16 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 80.0) @@ -3017,7 +3017,7 @@ (set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition))) (set-color! arg1 (font-color progress)) (set-scale! arg1 0.5) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 80.0) (set-width! arg1 360) @@ -3060,7 +3060,7 @@ (set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition))) (set-color! arg1 (font-color progress)) (set-scale! arg1 0.5) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 120.0) (set-width! arg1 360) @@ -3097,7 +3097,7 @@ (set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition))) (set-color! arg1 (font-color progress)) (set-scale! arg1 0.5) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 110.0) (set-width! arg1 360) @@ -3131,7 +3131,7 @@ (set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition))) (set-color! arg1 (font-color progress)) (set-scale! arg1 0.5) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 85.0) (set-width! arg1 360) @@ -3186,7 +3186,7 @@ (set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition))) (set-color! arg1 (font-color progress)) (set-scale! arg1 0.5) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 130.0) (set-width! arg1 360) @@ -3223,7 +3223,7 @@ (set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition))) (set-color! arg1 (font-color progress)) (set-scale! arg1 0.5) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 75.0) (set-width! arg1 360) @@ -3278,7 +3278,7 @@ (set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition))) (set-color! arg1 (font-color progress)) (set-scale! arg1 0.55) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 90.0) (set-width! arg1 360) @@ -3315,7 +3315,7 @@ (set! (-> arg1 alpha) (- 1.0 (-> arg0 menu-transition))) (set-color! arg1 (font-color progress)) (set-scale! arg1 0.55) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 160.0) (set-width! arg1 330) diff --git a/goal_src/jak2/engine/ui/progress/progress.gc b/goal_src/jak2/engine/ui/progress/progress.gc index 296c677b96..e1ca9646e1 100644 --- a/goal_src/jak2/engine/ui/progress/progress.gc +++ b/goal_src/jak2/engine/ui/progress/progress.gc @@ -1320,8 +1320,8 @@ (set-width! sv-144 355) (set-height! sv-144 30) (set! (-> sv-144 flags) (if (= (-> *setting-control* user-default language) (language-enum japanese)) - (font-flags middle left large) - (font-flags kerning middle left large) + (font-flags middle middle-vert large) + (font-flags kerning middle middle-vert large) ) ) (let ((s3-0 sv-144)) diff --git a/goal_src/jak2/engine/ui/text.gc b/goal_src/jak2/engine/ui/text.gc index 4bd7cabc0d..9894892471 100644 --- a/goal_src/jak2/engine/ui/text.gc +++ b/goal_src/jak2/engine/ui/text.gc @@ -314,8 +314,11 @@ in a single text group and file." ) (defun draw-debug-text-box ((arg0 font-context)) - "Draws some lines" + "Draws the boundaries of the font context. requires any cheat to be enabled." (when *cheat-mode* + (#when PC_PORT + (if (logtest? (-> arg0 flags) (font-flags right)) + (set! (-> arg0 width) (- (-> arg0 width))))) (let ((s5-0 (new 'static 'vector4w)) (gp-0 (new 'static 'vector4w-4)) ) @@ -353,6 +356,9 @@ in a single text group and file." (add-debug-line2d #t (bucket-id debug-no-zbuf1) (-> gp-0 vector 2) (-> gp-0 vector 3) s5-0) (add-debug-line2d #t (bucket-id debug-no-zbuf1) (-> gp-0 vector 3) (the-as vector4w (-> gp-0 vector)) s5-0) ) + (#when PC_PORT + (if (logtest? (-> arg0 flags) (font-flags right)) + (set! (-> arg0 width) (- (-> arg0 width))))) ) 0 (none) @@ -372,7 +378,7 @@ in a single text group and file." (if (logtest? (-> arg2 flags) (font-flags middle)) (+! (-> arg2 origin x) (* 0.5 (- f26-0 f0-1))) ) - (if (logtest? (-> arg2 flags) (font-flags left)) + (if (logtest? (-> arg2 flags) (font-flags middle-vert)) (+! (-> arg2 origin y) (* 0.5 (- f30-0 f1-2))) ) (let ((v1-10 arg2)) @@ -422,8 +428,8 @@ in a single text group and file." (set! sv-20 (-> arg1 origin y)) (set! sv-24 (-> arg1 flags)) (set! sv-28 (-> arg1 color)) - (when (logtest? (-> arg1 flags) (font-flags left)) - (logclear! (-> arg1 flags) (font-flags left)) + (when (logtest? (-> arg1 flags) (font-flags middle-vert)) + (logclear! (-> arg1 flags) (font-flags middle-vert)) (+! (-> arg1 origin y) (the float (the int (* 0.5 (- (-> arg1 height) (print-game-text arg0 arg1 #t 44 (bucket-id progress)))))) ) diff --git a/goal_src/jak2/levels/city/ctywide-obs.gc b/goal_src/jak2/levels/city/ctywide-obs.gc index e13eec62bc..423fcf1b56 100644 --- a/goal_src/jak2/levels/city/ctywide-obs.gc +++ b/goal_src/jak2/levels/city/ctywide-obs.gc @@ -3431,7 +3431,7 @@ This commonly includes things such as: ) ) ) - (set! (-> s1-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> s1-0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((v1-48 s1-0)) (set! (-> v1-48 width) (the float 440)) ) diff --git a/goal_src/jak2/levels/common/race/race-hud.gc b/goal_src/jak2/levels/common/race/race-hud.gc index 21fd798ae7..064229a9ea 100644 --- a/goal_src/jak2/levels/common/race/race-hud.gc +++ b/goal_src/jak2/levels/common/race/race-hud.gc @@ -305,7 +305,7 @@ (set! (-> a0-12 color) (font-color red)) ) (let ((a0-13 s1-0)) - (set! (-> a0-13 flags) (font-flags kerning middle left large)) + (set! (-> a0-13 flags) (font-flags kerning middle middle-vert large)) ) (let ((v1-19 s1-0)) (set! (-> v1-19 scale) 1.0) diff --git a/goal_src/jak2/levels/common/race/race-manager.gc b/goal_src/jak2/levels/common/race/race-manager.gc index a006974419..f0905e626a 100644 --- a/goal_src/jak2/levels/common/race/race-manager.gc +++ b/goal_src/jak2/levels/common/race/race-manager.gc @@ -1237,7 +1237,7 @@ ) (set! (-> gp-1 origin x) (the float (- 256 (the int (* 0.5 (-> gp-1 width)))))) (set! (-> gp-1 origin y) 320.0) - (set! (-> gp-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s5-0 print-game-text)) (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-x-to-continue) #f) 1) (s5-0 *temp-string* gp-1 #f 44 (bucket-id progress)) @@ -1265,7 +1265,7 @@ ) (set! (-> gp-1 origin x) (the float (- 256 (the int (* 0.5 (-> gp-1 width)))))) (set! (-> gp-1 origin y) 320.0) - (set! (-> gp-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s5-0 print-game-text)) (format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1) (s5-0 *temp-string* gp-1 #f 44 (bucket-id progress)) diff --git a/goal_src/jak2/levels/demo/demo-obs.gc b/goal_src/jak2/levels/demo/demo-obs.gc index a6412d7e0d..8819c2e5e9 100644 --- a/goal_src/jak2/levels/demo/demo-obs.gc +++ b/goal_src/jak2/levels/demo/demo-obs.gc @@ -532,7 +532,7 @@ (let ((v1-26 sv-112)) (set! (-> v1-26 height) (the float 50)) ) - (set! (-> sv-112 flags) (font-flags shadow kerning middle left large)) + (set! (-> sv-112 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> sv-112 scale) 0.7) (dotimes (s5-4 (-> gp-1 length)) (if (= (-> self selected) s5-4) diff --git a/goal_src/jak2/levels/gungame/gungame-obs.gc b/goal_src/jak2/levels/gungame/gungame-obs.gc index 946596a08e..a6a31a9b3f 100644 --- a/goal_src/jak2/levels/gungame/gungame-obs.gc +++ b/goal_src/jak2/levels/gungame/gungame-obs.gc @@ -225,7 +225,7 @@ This commonly includes things such as: (new 'stack 'font-context *font-default-matrix* 32 290 0.0 (font-color default) (font-flags shadow kerning)) ) ) - (set! (-> s5-1 flags) (font-flags shadow kerning left large)) + (set! (-> s5-1 flags) (font-flags shadow kerning middle-vert large)) (let ((v1-4 s5-1)) (set! (-> v1-4 width) (the float 440)) ) diff --git a/goal_src/jak2/levels/title/title-obs.gc b/goal_src/jak2/levels/title/title-obs.gc index f712f7fd1d..9813b3c83a 100644 --- a/goal_src/jak2/levels/title/title-obs.gc +++ b/goal_src/jak2/levels/title/title-obs.gc @@ -532,7 +532,7 @@ (let ((v1-36 sv-112)) (set! (-> v1-36 height) (the float 50)) ) - (set! (-> sv-112 flags) (font-flags shadow kerning middle left large)) + (set! (-> sv-112 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> sv-112 scale) 0.7) (dotimes (s5-4 (-> gp-1 length)) (if (= (-> self selected) s5-4) diff --git a/goal_src/jak2/pc/damage-number.gc b/goal_src/jak2/pc/damage-number.gc index 6d83a871c3..4d6adb25d4 100644 --- a/goal_src/jak2/pc/damage-number.gc +++ b/goal_src/jak2/pc/damage-number.gc @@ -401,7 +401,7 @@ ;; init font (set! (-> self font) (new 'process 'font-context *font-default-matrix* 0 0 0.0 (font-color default) (font-flags shadow kerning))) (set-scale! (-> self font) 0.35) - (set-flags! (-> self font) (font-flags shadow kerning large middle left)) + (set-flags! (-> self font) (font-flags shadow kerning large middle middle-vert)) (set-width! (-> self font) 34) (set-height! (-> self font) 10) diff --git a/goal_src/jak2/pc/progress/progress-draw-pc.gc b/goal_src/jak2/pc/progress/progress-draw-pc.gc index 3bd57a0144..9f576b231f 100644 --- a/goal_src/jak2/pc/progress/progress-draw-pc.gc +++ b/goal_src/jak2/pc/progress/progress-draw-pc.gc @@ -1662,7 +1662,7 @@ ) (draw (-> obj sprites 0) s3-0 (-> *level* default-level)) ) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 80.0) (set-width! arg1 330) @@ -1925,7 +1925,7 @@ (set! (-> arg1 origin y) (the float sv-48)) (set! (-> arg1 height) 50.0) (set-color! arg1 (font-color progress)) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* arg3 #f) arg1 #f 44 (bucket-id progress)) (set-vector! (-> arg0 box 0 color) 64 128 128 (the int (* 128.0 arg2))) (draw-savegame-box arg0 (the float gp-0) (the float (+ gp-0 s3-0)) (the float s5-0) (the float s5-0)) @@ -2207,7 +2207,7 @@ (*! (-> arg1 width) (-> *pc-settings* aspect-ratio-reciprocal)) ) (set-color! arg1 (font-color progress)) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* arg3 #f) arg1 #f 44 (bucket-id progress)) (set-vector! (-> arg0 box 0 color) 64 128 128 (the int (* 128.0 arg2))) (draw-savegame-box arg0 (the float list-x) (the float (+ list-x full-w)) (the float list-y) (the float list-y)) @@ -2436,7 +2436,7 @@ (set-color! arg1 (font-color progress)) (when (-> *progress-state-pc* music-player-track) (print-game-text (lookup-text! *common-text* (text-id progress-music-player-now-playing) #f) arg1 #f 44 (bucket-id progress))) - (set-flags! arg1 (font-flags kerning middle left large)) + (set-flags! arg1 (font-flags kerning middle middle-vert large)) (+! (-> arg1 origin y) 110.0) (set-scale! arg1 0.48) (cond diff --git a/goal_src/jak2/pc/progress/progress-generic-draw-pc.gc b/goal_src/jak2/pc/progress/progress-generic-draw-pc.gc index 9834141e33..b64d768057 100644 --- a/goal_src/jak2/pc/progress/progress-generic-draw-pc.gc +++ b/goal_src/jak2/pc/progress/progress-generic-draw-pc.gc @@ -531,7 +531,7 @@ (else (set-color! font-ctx (font-color progress)))) ;; Print left aligned text - (set-flags! font-ctx (font-flags kerning left large)) + (set-flags! font-ctx (font-flags kerning middle-vert large)) (-! (-> font-ctx origin y) 1.0) (when (= (get-aspect-ratio) 'aspect16x9) (+! (-> font-ctx origin x) 5.0)) @@ -570,7 +570,7 @@ (else (set-color! font-ctx (font-color progress)))) ;; Print left aligned text - (set-flags! font-ctx (font-flags kerning left large)) + (set-flags! font-ctx (font-flags kerning middle-vert large)) (-! (-> font-ctx origin y) 1.0) (when (= (get-aspect-ratio) 'aspect16x9) (+! (-> font-ctx origin x) 5.0)) diff --git a/goal_src/jak2/pc/subtitle2.gc b/goal_src/jak2/pc/subtitle2.gc index 6d7a2aa4b0..ed9686637f 100644 --- a/goal_src/jak2/pc/subtitle2.gc +++ b/goal_src/jak2/pc/subtitle2.gc @@ -835,7 +835,7 @@ (process-mask-clear! (-> self mask) menu) (set! (-> self font) (new 'process 'font-context *font-default-matrix* - 0 0 0.0 (font-color default) (font-flags shadow kerning left middle large))) + 0 0 0.0 (font-color default) (font-flags shadow kerning middle-vert middle large))) (clear-queue self) (dotimes (i PC_SUBTITLE_MAX_LINES) (set! (-> self lines 0 elts i line) #f) diff --git a/test/decompiler/reference/jak1/engine/common-obs/process-taskable_REF.gc b/test/decompiler/reference/jak1/engine/common-obs/process-taskable_REF.gc index 058e3a2f23..9b51de4767 100644 --- a/test/decompiler/reference/jak1/engine/common-obs/process-taskable_REF.gc +++ b/test/decompiler/reference/jak1/engine/common-obs/process-taskable_REF.gc @@ -59,7 +59,7 @@ (let ((v1-6 a1-2)) (set! (-> v1-6 scale) 0.9) ) - (set! (-> a1-2 flags) (font-flags shadow kerning left large)) + (set! (-> a1-2 flags) (font-flags shadow kerning middle-vert large)) (print-game-text (-> obj message) a1-2 #f 128 22) ) ) @@ -959,7 +959,7 @@ (let ((v1-59 gp-1)) (set! (-> v1-59 scale) 0.9) ) - (set! (-> gp-1 flags) (font-flags shadow kerning left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle-vert large)) (print-game-text (lookup-text! *common-text* (-> self talk-message) #f) gp-1 #f 128 22) ) (when (and (cpad-pressed? 0 circle) (process-grab? *target*)) diff --git a/test/decompiler/reference/jak1/engine/game/game-save_REF.gc b/test/decompiler/reference/jak1/engine/game/game-save_REF.gc index 6359de9c48..248dd7caa9 100644 --- a/test/decompiler/reference/jak1/engine/game/game-save_REF.gc +++ b/test/decompiler/reference/jak1/engine/game/game-save_REF.gc @@ -1286,7 +1286,7 @@ (let ((v1-17 gp-1)) (set! (-> v1-17 height) (the float 20)) ) - (set! (-> gp-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (when (zero? (-> *game-info* auto-save-count)) (print-game-text (lookup-text! *common-text* (text-id saving-data) #f) gp-1 #f 128 22) (set! (-> gp-1 origin x) 20.0) diff --git a/test/decompiler/reference/jak1/engine/ui/hud-classes_REF.gc b/test/decompiler/reference/jak1/engine/ui/hud-classes_REF.gc index ceb733b8ac..2ac6c5a30d 100644 --- a/test/decompiler/reference/jak1/engine/ui/hud-classes_REF.gc +++ b/test/decompiler/reference/jak1/engine/ui/hud-classes_REF.gc @@ -563,7 +563,7 @@ (let ((v1-14 s5-1)) (set! (-> v1-14 scale) 0.6) ) - (set! (-> s5-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> s5-1 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* (-> *level-task-data* (-> obj level-index) level-name-id) #f) s5-1 diff --git a/test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc b/test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc index 526feb579e..0ac67c65ab 100644 --- a/test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc +++ b/test/decompiler/reference/jak1/engine/ui/progress/progress-draw_REF.gc @@ -150,7 +150,7 @@ (let ((v1-93 s0-1)) (set! (-> v1-93 scale) 0.7) ) - (set! (-> s0-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> s0-1 flags) (font-flags shadow kerning middle middle-vert large)) (set! sv-224 print-game-text-scaled) (let ((a0-47 (lookup-text! *common-text* (-> s5-0 task-info (-> obj task-index) task-name s1-0) #f)) (a1-57 f30-0) @@ -365,7 +365,7 @@ (let ((v1-2 arg0)) (set! (-> v1-2 height) (the float 55)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s4-0 (text-id memcard-not-formatted-title))) (case (-> obj display-state) (((progress-screen memcard-no-space)) @@ -436,7 +436,7 @@ (let ((v1-2 arg0)) (set! (-> v1-2 height) (the float 55)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s4-0 print-game-text-scaled)) (format (clear *temp-string*) (lookup-text! *common-text* (text-id memcard-not-formatted-title) #f) 1) (s4-0 *temp-string* (-> obj transition-percentage-invert) arg0 128) @@ -478,7 +478,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.65) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 20 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 55.0) (let ((v1-4 arg0)) @@ -516,7 +516,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.65) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 20 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 40.0) (let ((v1-4 arg0)) @@ -552,7 +552,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 1.0) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 20 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 35.0) (let ((v1-4 arg0)) @@ -580,7 +580,7 @@ (let ((v1-18 arg0)) (set! (-> v1-18 scale) 0.65) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 15 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 100.0) (let ((v1-22 arg0)) @@ -603,7 +603,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.65) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 50 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 35.0) (let ((v1-4 arg0)) @@ -679,7 +679,7 @@ (let ((v1-29 arg0)) (set! (-> v1-29 scale) 0.5) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 102 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 5.0) (let ((v1-33 arg0)) @@ -711,7 +711,7 @@ ) (dotimes (s1-0 4) (set! (-> arg0 origin x) (the float (- 41 (-> obj left-x-offset)))) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((a0-17 arg0)) (set! (-> a0-17 color) (font-color default)) ) @@ -925,7 +925,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.6) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 70 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 5.0) (let ((v1-4 arg0)) @@ -1001,7 +1001,7 @@ (let ((v1-0 arg0)) (set! (-> v1-0 scale) 0.6) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> arg0 origin x) (the float (- 70 (-> obj left-x-offset)))) (set! (-> arg0 origin y) 10.0) (let ((v1-4 arg0)) @@ -1071,7 +1071,7 @@ (let ((v1-2 arg0)) (set! (-> v1-2 height) (the float 55)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s4-0 (text-id error-loading))) (case (-> obj display-state) (((progress-screen memcard-error-saving)) @@ -1132,7 +1132,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 60)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id autosave-warn-title) #f) (-> obj transition-percentage-invert) @@ -1200,7 +1200,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 40)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id screen-change-to-60hz) #f) (-> obj transition-percentage-invert) @@ -1262,7 +1262,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 40)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id no-disc-title) #f) (-> obj transition-percentage-invert) @@ -1316,7 +1316,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 40)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id bad-disc-title) #f) (-> obj transition-percentage-invert) @@ -1368,7 +1368,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 40)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id quit?) #f) (-> obj transition-percentage-invert) @@ -1393,7 +1393,7 @@ (let ((v1-4 arg0)) (set! (-> v1-4 height) (the float 50)) ) - (set! (-> arg0 flags) (font-flags shadow kerning middle left large)) + (set! (-> arg0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (text-id screen-now-60hz) #f) (-> obj transition-percentage-invert) @@ -1621,7 +1621,7 @@ (let ((v1-12 sv-112)) (set! (-> v1-12 height) (the float 25)) ) - (set! (-> sv-112 flags) (font-flags shadow kerning middle left large)) + (set! (-> sv-112 flags) (font-flags shadow kerning middle middle-vert large)) (dotimes (s0-0 (length s3-0)) (set! sv-912 (the-as string #f)) (set! sv-128 27) @@ -2095,7 +2095,7 @@ ) ) (set! (-> s4-2 origin y) 180.0) - (set! (-> s4-2 flags) (font-flags shadow kerning middle left large)) + (set! (-> s4-2 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s3-3 print-game-text)) (format (clear *temp-string*) "~2D%" (the int (-> *progress-process* 0 completion-percentage))) (s3-3 *temp-string* s4-2 #f (the int (* 128.0 f28-0)) 22) diff --git a/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc index 913926a40c..84687bb4c6 100644 --- a/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc +++ b/test/decompiler/reference/jak1/engine/ui/progress/progress_REF.gc @@ -2379,7 +2379,7 @@ (let ((v1-104 s5-1)) (set! (-> v1-104 height) (the float 45)) ) - (set! (-> s5-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> s5-1 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text-scaled (lookup-text! *common-text* (-> gp-0 level-name-id) #f) f30-0 diff --git a/test/decompiler/reference/jak1/engine/ui/text_REF.gc b/test/decompiler/reference/jak1/engine/ui/text_REF.gc index 26642fe69b..d8d300b4dc 100644 --- a/test/decompiler/reference/jak1/engine/ui/text_REF.gc +++ b/test/decompiler/reference/jak1/engine/ui/text_REF.gc @@ -288,7 +288,7 @@ (if (logtest? (-> font-ctxt flags) (font-flags middle)) (+! (-> font-ctxt origin x) (* 0.5 (- f26-0 f0-1))) ) - (if (logtest? (-> font-ctxt flags) (font-flags left)) + (if (logtest? (-> font-ctxt flags) (font-flags middle-vert)) (+! (-> font-ctxt origin y) (the-as float (gpr->fpr (/ (the int (- f30-0 f1-2)) 2)))) ) (let ((v1-10 font-ctxt)) @@ -400,8 +400,8 @@ (set! (-> gp-0 flags) (-> font-ctxt flags)) (set! (-> gp-0 color) (-> font-ctxt color)) (set! (-> gp-0 scale) sv-136) - (when (logtest? (-> gp-0 flags) (font-flags left)) - (logclear! (-> gp-0 flags) (font-flags left)) + (when (logtest? (-> gp-0 flags) (font-flags middle-vert)) + (logclear! (-> gp-0 flags) (font-flags middle-vert)) (let ((f30-0 (-> gp-0 width)) (f28-0 (-> gp-0 height)) ) diff --git a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc index 097b7652af..1e2a254741 100644 --- a/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/rolling/rolling-obs_REF.gc @@ -1278,7 +1278,7 @@ ) (set! (-> gp-0 origin x) 156.0) (set! (-> gp-0 origin y) 80.0) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((a0-15 gp-0)) (set! (-> a0-15 color) (font-color red)) ) @@ -1312,7 +1312,7 @@ ) (set! (-> gp-0 origin x) 156.0) (set! (-> gp-0 origin y) 80.0) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((a0-23 gp-0)) (set! (-> a0-23 color) (font-color red)) ) @@ -1391,7 +1391,7 @@ (let ((v1-21 gp-0)) (set! (-> v1-21 height) (the float 50)) ) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* (text-id race-aborted) #f) gp-0 #f 128 22) ) ) diff --git a/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc b/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc index b865424666..b8fb1e9b48 100644 --- a/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/title/title-obs_REF.gc @@ -855,7 +855,7 @@ (let ((v1-13 gp-0)) (set! (-> v1-13 height) (the float 40)) ) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* (text-id press-start) #f) gp-0 #f 128 22) ) ) diff --git a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc index e67da98b04..09d4d5d65a 100644 --- a/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc +++ b/test/decompiler/reference/jak1/levels/village_common/villagep-obs_REF.gc @@ -339,7 +339,7 @@ (let ((v1-40 s1-3)) (set! (-> v1-40 height) (the float 55)) ) - (set! (-> s1-3 flags) (font-flags shadow kerning middle left large)) + (set! (-> s1-3 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text (lookup-text! *common-text* (text-id warp-gate-use-dpad) #f) s1-3 #f 128 22) (+! (-> s1-3 origin y) 35.0) (let ((v1-43 s1-3)) diff --git a/test/decompiler/reference/jak2/engine/game/game-save_REF.gc b/test/decompiler/reference/jak2/engine/game/game-save_REF.gc index cdc8091981..0515d5dffb 100644 --- a/test/decompiler/reference/jak2/engine/game/game-save_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/game-save_REF.gc @@ -1909,7 +1909,7 @@ (let ((v1-19 gp-1)) (set! (-> v1-19 height) (the float 20)) ) - (set! (-> gp-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (when (and (>= 1 (-> *game-info* auto-save-count)) (-> self next-state) (= (-> self next-state name) 'save)) (print-game-text (lookup-text! *common-text* (text-id progress-memcard-saving-data) #f) diff --git a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc index 881ae613e1..e9df9fd91e 100644 --- a/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc +++ b/test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc @@ -1472,7 +1472,7 @@ (let ((v1-9 gp-0)) (set! (-> v1-9 height) (the float 35)) ) - (set! (-> gp-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s4-0 (if (logtest? (-> obj flags) (fail-mission-flags famflags-2)) (the-as int (-> obj fail-message)) 393 diff --git a/test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc b/test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc index 274b6f58c5..ec372519c5 100644 --- a/test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc +++ b/test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc @@ -245,7 +245,7 @@ Seen take in - `true-func` which takes no args TODO - seems fishy (let ((v1-86 s5-1)) (set! (-> v1-86 scale) 0.9) ) - (set! (-> s5-1 flags) (font-flags shadow kerning left large)) + (set! (-> s5-1 flags) (font-flags shadow kerning middle-vert large)) (print-game-text (lookup-text! *common-text* (-> self talk-message) #f) s5-1 #f 44 (bucket-id progress)) ) (when (cpad-pressed? 0 triangle) diff --git a/test/decompiler/reference/jak2/engine/scene/scene_REF.gc b/test/decompiler/reference/jak2/engine/scene/scene_REF.gc index 8e2590cc73..521ce47d9e 100644 --- a/test/decompiler/reference/jak2/engine/scene/scene_REF.gc +++ b/test/decompiler/reference/jak2/engine/scene/scene_REF.gc @@ -872,14 +872,14 @@ (set! (-> v1-27 scale) 0.6) ) ) - (set! (-> s2-0 flags) (font-flags kerning middle left large)) + (set! (-> s2-0 flags) (font-flags kerning middle middle-vert large)) (+! (-> s2-0 origin x) -1.0) (+! (-> s2-0 origin y) -1.0) (set! (-> s2-0 color) (font-color font-color-39)) (+! (-> s2-0 origin x) 1.0) (+! (-> s2-0 origin y) 1.0) (set! (-> s2-0 color) (font-color default)) - (set! (-> s2-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> s2-0 flags) (font-flags shadow kerning middle middle-vert large)) (print-game-text (the-as string s3-0) s2-0 #f 44 (bucket-id subtitle)) (gui-control-method-12 *gui-control* diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc index 8482015048..95713607dd 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc @@ -2569,7 +2569,7 @@ (set! (-> s4-0 color) (progress-selected 0)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 120.0) (set! (-> arg1 origin y) 110.0) @@ -2626,7 +2626,7 @@ (set! (-> a0-3 color) (font-color progress)) ) (let ((a0-4 arg1)) - (set! (-> a0-4 flags) (font-flags kerning middle left large)) + (set! (-> a0-4 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 75.0) (set! (-> arg1 origin y) 80.0) @@ -2718,7 +2718,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 130.0) @@ -2765,7 +2765,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 130.0) @@ -2813,7 +2813,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 100.0) @@ -2882,7 +2882,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 77.0) (set! (-> arg1 origin y) 85.0) @@ -2959,7 +2959,7 @@ (set! (-> a0-2 color) (font-color progress)) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 80.0) @@ -3022,7 +3022,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 120.0) @@ -3082,7 +3082,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 120.0) @@ -3158,7 +3158,7 @@ ((method-of-type hud-sprite draw) (the-as hud-sprite (-> obj sprites)) s3-0 (-> *level* default-level)) ) (let ((a0-16 arg1)) - (set! (-> a0-16 flags) (font-flags kerning middle left large)) + (set! (-> a0-16 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 80.0) @@ -3216,7 +3216,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 80.0) @@ -3270,7 +3270,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 120.0) @@ -3316,7 +3316,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 110.0) @@ -3359,7 +3359,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 85.0) @@ -3427,7 +3427,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 130.0) @@ -3473,7 +3473,7 @@ (set! (-> v1-2 scale) 0.5) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 75.0) @@ -3541,7 +3541,7 @@ (set! (-> v1-2 scale) 0.55) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 80.0) (set! (-> arg1 origin y) 90.0) @@ -3587,7 +3587,7 @@ (set! (-> v1-2 scale) 0.55) ) (let ((a0-3 arg1)) - (set! (-> a0-3 flags) (font-flags kerning middle left large)) + (set! (-> a0-3 flags) (font-flags kerning middle middle-vert large)) ) (set! (-> arg1 origin x) 90.0) (set! (-> arg1 origin y) 160.0) @@ -7806,10 +7806,6 @@ ;; definition for method 10 of type menu-sub-menu-option ;; INFO: Used lq/sq ;; WARN: Return type mismatch int vs none. -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 349] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 361] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 417] -;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 435] (defmethod draw-option menu-sub-menu-option ((obj menu-sub-menu-option) (arg0 progress) (arg1 font-context) (arg2 int) (arg3 symbol)) (local-vars (sv-16 dma-buffer)) (let ((f30-0 (* 2.0 (- 0.5 (-> arg0 menu-transition)))) diff --git a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc index b93a504975..57635dbd20 100644 --- a/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc @@ -1439,8 +1439,8 @@ (set! (-> v1-30 height) (the float 30)) ) (set! (-> sv-144 flags) (if (= (-> *setting-control* user-default language) (language-enum japanese)) - (font-flags middle left large) - (font-flags kerning middle left large) + (font-flags middle middle-vert large) + (font-flags kerning middle middle-vert large) ) ) (let ((s3-0 sv-144)) diff --git a/test/decompiler/reference/jak2/engine/ui/text_REF.gc b/test/decompiler/reference/jak2/engine/ui/text_REF.gc index df4039a606..226606d109 100644 --- a/test/decompiler/reference/jak2/engine/ui/text_REF.gc +++ b/test/decompiler/reference/jak2/engine/ui/text_REF.gc @@ -403,7 +403,7 @@ in a single text group and file." (if (logtest? (-> arg2 flags) (font-flags middle)) (+! (-> arg2 origin x) (* 0.5 (- f26-0 f0-1))) ) - (if (logtest? (-> arg2 flags) (font-flags left)) + (if (logtest? (-> arg2 flags) (font-flags middle-vert)) (+! (-> arg2 origin y) (* 0.5 (- f30-0 f1-2))) ) (let ((v1-10 arg2)) @@ -516,8 +516,8 @@ in a single text group and file." (set! sv-20 (-> arg1 origin y)) (set! sv-24 (-> arg1 flags)) (set! sv-28 (-> arg1 color)) - (when (logtest? (-> arg1 flags) (font-flags left)) - (logclear! (-> arg1 flags) (font-flags left)) + (when (logtest? (-> arg1 flags) (font-flags middle-vert)) + (logclear! (-> arg1 flags) (font-flags middle-vert)) (+! (-> arg1 origin y) (the float (the int (* 0.5 (- (-> arg1 height) (print-game-text arg0 arg1 #t 44 (bucket-id progress)))))) ) diff --git a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc index a439184911..e40e0381fb 100644 --- a/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/city/ctywide-obs_REF.gc @@ -3576,7 +3576,7 @@ This commonly includes things such as: ) ) ) - (set! (-> s1-0 flags) (font-flags shadow kerning middle left large)) + (set! (-> s1-0 flags) (font-flags shadow kerning middle middle-vert large)) (let ((v1-48 s1-0)) (set! (-> v1-48 width) (the float 440)) ) diff --git a/test/decompiler/reference/jak2/levels/common/race/race-hud_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-hud_REF.gc index 73e38641f5..d2e0df4aaf 100644 --- a/test/decompiler/reference/jak2/levels/common/race/race-hud_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/race-hud_REF.gc @@ -329,7 +329,7 @@ (set! (-> a0-12 color) (font-color red)) ) (let ((a0-13 s1-0)) - (set! (-> a0-13 flags) (font-flags kerning middle left large)) + (set! (-> a0-13 flags) (font-flags kerning middle middle-vert large)) ) (let ((v1-19 s1-0)) (set! (-> v1-19 scale) 1.0) diff --git a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc index 2f01e113ef..a503b98597 100644 --- a/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc +++ b/test/decompiler/reference/jak2/levels/common/race/race-manager_REF.gc @@ -1268,7 +1268,7 @@ ) (set! (-> gp-1 origin x) (the float (- 256 (the int (* 0.5 (-> gp-1 width)))))) (set! (-> gp-1 origin y) 320.0) - (set! (-> gp-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s5-0 print-game-text)) (format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-x-to-continue) #f) 1) (s5-0 *temp-string* gp-1 #f 44 (bucket-id progress)) @@ -1298,7 +1298,7 @@ ) (set! (-> gp-1 origin x) (the float (- 256 (the int (* 0.5 (-> gp-1 width)))))) (set! (-> gp-1 origin y) 320.0) - (set! (-> gp-1 flags) (font-flags shadow kerning middle left large)) + (set! (-> gp-1 flags) (font-flags shadow kerning middle middle-vert large)) (let ((s5-0 print-game-text)) (format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1) (s5-0 *temp-string* gp-1 #f 44 (bucket-id progress)) diff --git a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc index 229f8ad95c..05278fe163 100644 --- a/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/demo/demo-obs_REF.gc @@ -560,7 +560,7 @@ (let ((v1-26 sv-112)) (set! (-> v1-26 height) (the float 50)) ) - (set! (-> sv-112 flags) (font-flags shadow kerning middle left large)) + (set! (-> sv-112 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> sv-112 scale) 0.7) (dotimes (s5-4 (-> gp-1 length)) (if (= (-> self selected) s5-4) diff --git a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc index d42b5ed00d..e02cdee029 100644 --- a/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc @@ -289,7 +289,7 @@ This commonly includes things such as: (new 'stack 'font-context *font-default-matrix* 32 290 0.0 (font-color default) (font-flags shadow kerning)) ) ) - (set! (-> s5-1 flags) (font-flags shadow kerning left large)) + (set! (-> s5-1 flags) (font-flags shadow kerning middle-vert large)) (let ((v1-4 s5-1)) (set! (-> v1-4 width) (the float 440)) ) diff --git a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc index 122405da08..2d1f059a2a 100644 --- a/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/jak2/levels/title/title-obs_REF.gc @@ -562,7 +562,7 @@ (let ((v1-36 sv-112)) (set! (-> v1-36 height) (the float 50)) ) - (set! (-> sv-112 flags) (font-flags shadow kerning middle left large)) + (set! (-> sv-112 flags) (font-flags shadow kerning middle middle-vert large)) (set! (-> sv-112 scale) 0.7) (dotimes (s5-4 (-> gp-1 length)) (if (= (-> self selected) s5-4)