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

[decomp] collectables, fix float bug in a few files (#2082)

Browse Source 
Fixes https://github.com/open-goal/jak-project/issues/1931
Also decompile collectables.gc
This commit is contained in:
water111
2023-01-01 18:05:31 -05:00
committed by GitHub
parent 5333aa3fb2
commit 308038a20f
30 changed files with 6518 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/goos/Printer.cpp
+2 -3
View File
@@ -4,6 +4,7 @@
#include <mutex>
#include "common/goos/Object.h"
#include "common/util/print_float.h"
#include "third-party/fmt/core.h"
@@ -24,9 +25,7 @@ const std::unordered_map<u32, std::string> const_floats = {{0x40490fda, "PI"},
goos::Object float_representation(float value) {
u32 int_value;
memcpy(&int_value, &value, 4);
u8 exp = (int_value >> 23) & 0xff;
u32 mant = int_value & 0x7fffff;
if ((exp == 0 && mant != 0) || exp == 0xff || !std::isfinite(value)) {
if (!proper_float(value)) {
// lg::warn("PS2-incompatible float (0x{:08X}) detected! Writing as the-as cast.", int_value);
return pretty_print::build_list("the-as", "float", fmt::format("#x{:x}", int_value));
} else if (const_floats.find(int_value) != const_floats.end()) {
common/util/print_float.cpp
+12
View File
@@ -208,3 +208,15 @@ int float_to_cstr(float value, char* buffer, bool append_trailing_decimal) {
}
return i;
}
bool proper_float(float value) {
u32 int_value;
memcpy(&int_value, &value, 4);
u8 exp = (int_value >> 23) & 0xff;
u32 mant = int_value & 0x7fffff;
if ((exp == 0 && mant != 0) || exp == 0xff || !std::isfinite(value)) {
return false;
} else {
return true;
}
}
common/util/print_float.h
+1
View File
@@ -11,3 +11,4 @@ std::string meters_to_string(float value, bool append_trailing_decimal = false);
std::string degrees_to_string(float value, bool append_trailing_decimal = false);
std::string seconds_to_string(s64 value, bool append_trailing_decimal = false);
int float_to_cstr(float value, char* buffer, bool append_trailing_decimal = true);
bool proper_float(float value);
decompiler/IR2/FormExpressionAnalysis.cpp
+4 -3
View File
@@ -812,10 +812,11 @@ void SimpleExpressionElement::update_from_stack_gpr_to_fpr(const Env& env,
auto int_constant = get_goal_integer_constant(frm, env);
if (int_constant && u64_valid_for_float_constant(*int_constant)) {
float flt;
memcpy(&flt, &int_constant.value(), sizeof(float));
result->push_back(pool.alloc_element<ConstantFloatElement>(flt));
return;
if (proper_float(flt)) {
result->push_back(pool.alloc_element<ConstantFloatElement>(flt));
return;
}
}
}
// converting something else to an FPR, put an expression around it.
decompiler/config/jak2/all-types.gc
+111 -149
View File
@@ -29956,206 +29956,168 @@
;; collectables ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
#|
(deftype collectable (UNKNOWN)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
(defenum collectable-flag
:type uint32
:bitfield #t
(bounce 0) ;; 1
(fadeout 1) ;; 2
(pickup 2) ;; 4
(do-fadeout 3) ;; 8
(suck-in 4) ;; 16
(no-eco-blue 5) ;; 32
(no-bob 6) ;; 64
(no-distance-check-fadeout 7) ;; 128
)
|#
#|
(deftype eco (UNKNOWN)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
(deftype collectable (process-drawable)
((root-override2 collide-shape-moving :offset 128 :score 1000)
(pickup-type pickup-type :offset-assert 200)
(pickup-amount float :offset-assert 204)
(notify handle :offset-assert 208)
(old-base vector :inline :offset-assert 224)
(base vector :inline :offset-assert 240)
(extra-trans vector :inline :offset-assert 256)
(jump-pos vector :inline :offset-assert 272)
(flags collectable-flag :offset-assert 288)
(birth-time seconds :offset-assert 296)
(collect-timeout seconds :offset-assert 304)
(fadeout-timeout seconds :offset-assert 312)
(bob-offset seconds :offset-assert 320)
(bob-amount float :offset-assert 328)
(pickup-handle handle :offset-assert 336)
(actor-pause symbol :offset-assert 344)
(collect-effect basic :offset-assert 348)
(collect-effect2 basic :offset-assert 352)
(target handle :offset-assert 360)
(suck-time seconds :offset-assert 368)
(suck-y-offset float :offset-assert 376)
(speed vector :inline :offset-assert 384)
(movie-pos-index int32 :offset-assert 400)
)
:flag-assert #x2401200194 ;; L802
(:methods
(blocked () _type_ :state 20)
(wait () _type_ :state 21)
(deploy () _type_ :state 22)
(suck (handle) _type_ :state 23)
(jump () _type_ :state 24)
(fade () _type_ :state 25)
(pickup (symbol handle) _type_ :state 26)
(die () _type_ :state 27)
(notice-blue (handle) _type_ :state 28)
(init-common (_type_ entity-actor pickup-type float) none 29) ;; seen it.
(initialize-effects (_type_ pickup-type) none 30)
(go-to-initial-state (_type_) none 31)
(initialize-options (_type_ int float fact-info) collectable 32)
(initialize-allocations (_type_) none 33)
(common-post (_type_) none 34)
(do-pickup (_type_ handle) none 35)
)
)
|#
#|
(deftype eco-yellow (UNKNOWN)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
(deftype eco (collectable)
(
(respan-delay seconds :offset-assert 408))
:flag-assert #x24012001a0 ;; L803
)
|#
#|
(deftype eco-red (UNKNOWN)
(deftype eco-yellow (eco)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x24012001a0 ;; L803
)
|#
#|
(deftype eco-blue (UNKNOWN)
(deftype eco-red (eco)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x24012001a0 ;; L803
)
|#
#|
(deftype eco-green (UNKNOWN)
(deftype eco-blue (eco)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x24012001a0 ;; L803
)
|#
#|
(deftype health (UNKNOWN)
(deftype eco-green (eco)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x24012001a0 ;; L803
)
|#
#|
(deftype eco-pill (UNKNOWN)
(deftype health (collectable)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x2401200194 ;; L802
)
|#
#|
(deftype money (UNKNOWN)
(deftype eco-pill (collectable)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x2401200194 ;; L802
)
|#
#|
(deftype gem (UNKNOWN)
(deftype money (collectable)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x2401200194 ;; L802
)
|#
#|
(deftype skill (UNKNOWN)
(deftype gem (money)
((roty-speed degrees :offset-assert 404)
(bounce-time seconds :offset-assert 408)
)
:flag-assert #x24012001a0 ;; L803
)
(deftype skill (money)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x2401200194 ;; L802
)
|#
#|
(deftype fuel-cell (UNKNOWN)
(deftype fuel-cell (process-hidden) ;; rip
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #xf00000080 ;; L801
)
|#
#|
(deftype trick-point (UNKNOWN)
(deftype trick-point (collectable)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x2401200194 ;; L802
)
|#
#|
(deftype skate-point (UNKNOWN)
(deftype skate-point (trick-point)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x2401200194 ;; L802
)
|#
#|
(deftype ammo-collectable (UNKNOWN)
(deftype ammo-collectable (collectable)
((ammo-effect basic :offset-assert 404))
:flag-assert #x2401200198 ;; L800
)
(deftype ammo (ammo-collectable)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x2401200198 ;; L800
)
|#
#|
(deftype ammo (UNKNOWN)
(deftype shield (ammo-collectable)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x2401200198 ;; L800
)
|#
#|
(deftype shield (UNKNOWN)
(deftype upgrade-collectable (ammo-collectable)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #x2401200198 ;; L800
)
|#
#|
(deftype upgrade-collectable (UNKNOWN)
(deftype ecovent (process-hidden)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
:flag-assert #xf00000080 ;; L801
)
|#
#|
(deftype ecovent (UNKNOWN)
()
:method-count-assert 0
:size-assert #x0
:flag-assert #x0
;; Failed to read fields.
)
|#
;; (define-extern initialize-eco-by-other function) ;; (function vector vector fact-info none :behavior eco)
;; (define-extern add-blue-shake function) ;; (function vector vector vector vector)
;; (define-extern check-blue-suck function) ;; (function process-drawable none :behavior eco-collectable)
;; (define-extern add-blue-motion function) ;; (function symbol symbol symbol symbol symbol :behavior eco-collectable)
;; (define-extern collectable-standard-event-handler function)
;; (define-extern money-init-by-other function) ;; (function vector vector fact-info entity-actor none :behavior money)
;; (define-extern money-init-by-other-no-bob function) ;; (function vector vector fact-info float entity-actor none :behavior money)
;; (define-extern *collectable-dummy-shadow-control* shadow-control)
;; (define-extern initialize-ammo-by-other function)
;; (define-extern initialize-upgrade-by-other function)
(define-extern initialize-eco-by-other (function vector vector fact-info none :behavior eco))
(define-extern add-blue-shake (function vector vector vector vector))
(define-extern check-blue-suck (function process-drawable symbol :behavior eco))
(define-extern add-blue-motion (function symbol symbol symbol symbol symbol :behavior eco))
(define-extern collectable-standard-event-handler (function process int symbol event-message-block object :behavior collectable))
(define-extern money-init-by-other (function vector vector fact-info entity-actor none :behavior money))
(define-extern money-init-by-other-no-bob (function vector vector fact-info float entity-actor none :behavior money))
(define-extern *collectable-dummy-shadow-control* shadow-control)
(define-extern initialize-ammo-by-other (function vector vector fact-info none :behavior ammo))
(define-extern initialize-upgrade-by-other (function vector vector fact-info entity-actor none :behavior upgrade-collectable))
(define-extern birth-pickup-at-point (function vector pickup-type float symbol process-tree fact-info (pointer process) :behavior process))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
decompiler/config/jak2/anonymous_function_types.jsonc
+3
View File
@@ -649,5 +649,8 @@
[0, "(function process-drawable vector)"],
[1, "(function float)"],
[3, "(function none :behavior scene-player)"]
],
"collectables": [
[69, "(function part-tracker vector)"]
]
}
decompiler/config/jak2/label_types.jsonc
+17
View File
@@ -784,5 +784,22 @@
["L3069", "vector"],
["L3068", "vector"],
["L3067", "vector"]
],
"collectables": [
["L562", "uint64", true],
["L563", "uint64", true],
["L564", "uint64", true],
["L565", "uint64", true],
["L566", "uint64", true],
["L567", "uint64", true],
["L568", "uint64", true],
["L569", "uint64", true],
["L570", "uint64", true],
["L571", "uint64", true],
["L572", "uint64", true],
["L800", "uint64", true],
["L801", "uint64", true],
["L802", "uint64", true],
["L803", "uint64", true]
]
}
decompiler/config/jak2/stack_structures.jsonc
+2 -1
View File
@@ -1272,5 +1272,6 @@
],
"(method 18 nav-mesh)": [[16, "nav-ray"]],
"(post idle gun-dummy)": [[16, "event-message-block"]],
"(method 23 training-manager)": [[16, "vector"]]
"(method 23 training-manager)": [[16, "vector"]],
"birth-pickup-at-point": [[16, "vector"]]
}
decompiler/config/jak2/type_casts.jsonc
+46 -1
View File
@@ -5466,5 +5466,50 @@
],
"(method 23 training-manager)": [[104, "s0", "process-focusable"]],
"(method 11 training-manager)": [["_stack_", 16, "res-tag"]],
"attach-pod-part": [[32, "v1", "float"]]
"attach-pod-part": [[32, "v1", "float"]],
"(method 30 collectable)": [[109, "v1", "collide-shape"]],
"(method 32 collectable)": [
[19, "v1", "int"],
[19, "a0", "int"],
[23, "a0", "int"],
[155, "v1", "process-drawable"]
],
"(anon-function 69 collectables)": [
//[[1, 6], "v1", "handle"],
[2, "v1", "handle"],
[5, "v1", "handle"],
[8, "v1", "handle"],
[13, "v1", "collectable"],
[[34, 39], "a0", "process-focusable"]
],
"check-blue-suck": [
[19, "v1", "collide-shape"]
],
"add-blue-motion": [
[27, "s2", "process-focusable"]
],
"collectable-standard-event-handler": [
[84, "a0", "vector"],
[102, "a0", "vector"],
[[167, 171], "a0", "process"],
[[292, 296], "a0", "process"]
],
"(event pickup collectable)": [
[17, "a0", "vector"],
[18, "v1", "vector"]
],
"(code die eco)": [
[55, "v1", "float"]
],
"(code pickup eco)": [
[39, "v0", "state"],
[41, "t9", "(function none)"]
],
"(method 10 gem)": [
[12, "t9", "(function gem none)"]
],
"(method 9 fact-info)": [
[245, "a0", "process-drawable"],
[293, "a0", "process-drawable"]
]
}
goal_src/jak2/engine/ambient/ambient.gc
+2 -2
View File
@@ -304,10 +304,10 @@
)
)
(let ((v1-14 gp-0))
(set! (-> v1-14 width) (the float (the-as float #x1b8)))
(set! (-> v1-14 width) (the float 440))
)
(let ((v1-15 gp-0))
(set! (-> v1-15 height) (the float (the-as float #x8c)))
(set! (-> v1-15 height) (the float 140))
)
(set! (-> gp-0 flags) (font-flags shadow kerning middle large))
(if (logtest? (-> obj message flags) 32)
goal_src/jak2/engine/common_objs/collectables.gc
+2741 -2
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/engine/game/game-h.gc
+2
View File
@@ -15,6 +15,8 @@
(declare-type carry-info basic)
(declare-type touching-shapes-entry structure)
(declare-type rigid-body-control basic)
(define-extern eco-blue-glow (function vector none))
(define-extern process-contact-action (function process none :behavior target))
(define-extern vector<-cspace! (function vector cspace vector))
goal_src/jak2/engine/game/game-save.gc
+5 -5
View File
@@ -1661,10 +1661,10 @@
)
)
(let ((v1-5 gp-0))
(set! (-> v1-5 width) (the float (the-as float #x1b8)))
(set! (-> v1-5 width) (the float 440))
)
(let ((v1-6 gp-0))
(set! (-> v1-6 height) (the float (the-as float #x50)))
(set! (-> v1-6 height) (the float 80))
)
(set! (-> gp-0 flags) (font-flags shadow kerning))
(format (clear *temp-string*) "~S / ~S ~D~%" (-> self mode) (-> self state name) (-> self which))
@@ -1688,10 +1688,10 @@
(set! (-> v1-17 scale) 0.8)
)
(let ((v1-18 gp-1))
(set! (-> v1-18 width) (the float (the-as float #x1b0)))
(set! (-> v1-18 width) (the float 432))
)
(let ((v1-19 gp-1))
(set! (-> v1-19 height) (the float (the-as float #x14)))
(set! (-> v1-19 height) (the float 20))
)
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
(when (and (>= 1 (-> *game-info* auto-save-count)) (-> self next-state) (= (-> self next-state name) 'save))
@@ -1702,7 +1702,7 @@
(set! (-> v1-30 scale) 0.7)
)
(let ((v1-31 gp-1))
(set! (-> v1-31 height) (the float (the-as float #xc8)))
(set! (-> v1-31 height) (the float 200))
)
(let ((s5-2 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-dont-remove) #f) 1)
goal_src/jak2/engine/game/task/task-control.gc
+5 -6
View File
@@ -1434,10 +1434,10 @@
(set! (-> v1-7 scale) 0.7)
)
(let ((v1-8 gp-0))
(set! (-> v1-8 width) (the float (the-as float #x12c)))
(set! (-> v1-8 width) (the float 300))
)
(let ((v1-9 gp-0))
(set! (-> v1-9 height) (the float (the-as float #x23)))
(set! (-> v1-9 height) (the float 35))
)
(set! (-> gp-0 flags) (font-flags shadow kerning middle left large))
(let ((s4-0 (if (logtest? (-> obj flags) (fail-mission-flags famflags-2))
@@ -1455,14 +1455,14 @@
)
(when (= (-> obj message) (fail-mission-message fammsg-1))
(let ((v1-17 gp-0))
(set! (-> v1-17 height) (the float (the-as float #x5f)))
(set! (-> v1-17 height) (the float 95))
)
(let ((s5-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id text-x18a) #f) 1)
(s5-1 *temp-string* gp-0 #f 44 (bucket-id progress))
)
(let ((v1-19 gp-0))
(set! (-> v1-19 height) (the float (the-as float #x9b)))
(set! (-> v1-19 height) (the float 155))
)
(let ((s5-2 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id text-x180) #f) 1)
@@ -2199,8 +2199,7 @@
:virtual #t
:event task-manager-event-handler
:exit (behavior ()
;; todo
; (disable *screen-filter*)
(disable *screen-filter*)
(none)
)
:code (behavior ()
goal_src/jak2/engine/process-drawable/process-taskable.gc
+2 -2
View File
@@ -267,10 +267,10 @@
)
)
(let ((v1-84 s5-1))
(set! (-> v1-84 width) (the float (the-as float #x154)))
(set! (-> v1-84 width) (the float 340))
)
(let ((v1-85 s5-1))
(set! (-> v1-85 height) (the float (the-as float #x50)))
(set! (-> v1-85 height) (the float 80))
)
(let ((v1-86 s5-1))
(set! (-> v1-86 scale) 0.9)
goal_src/jak2/engine/scene/scene.gc
+4 -4
View File
@@ -805,10 +805,10 @@
)
)
(let ((v1-20 s2-0))
(set! (-> v1-20 width) (the float (the-as float #x1d1)))
(set! (-> v1-20 width) (the float 465))
)
(let ((v1-21 s2-0))
(set! (-> v1-21 height) (the float (the-as float #x46)))
(set! (-> v1-21 height) (the float 70))
)
(let ((v1-22 s2-0))
(set! (-> v1-22 scale) 0.5)
@@ -1457,10 +1457,10 @@
)
)
(let ((v1-121 gp-6))
(set! (-> v1-121 width) (the float (the-as float #x1b8)))
(set! (-> v1-121 width) (the float 440))
)
(let ((v1-122 gp-6))
(set! (-> v1-122 height) (the float (the-as float #x30)))
(set! (-> v1-122 height) (the float 48))
)
(let ((v1-123 gp-6))
(set! (-> v1-123 scale) 0.5)
goal_src/jak2/engine/ui/progress/progress-draw.gc
+74 -74
View File
@@ -2747,10 +2747,10 @@
(set! (-> arg1 origin x) 120.0)
(set! (-> arg1 origin y) 110.0)
(let ((v1-8 arg1))
(set! (-> v1-8 width) (the float (the-as float #x10e)))
(set! (-> v1-8 width) (the float 270))
)
(let ((v1-9 arg1))
(set! (-> v1-9 height) (the float (the-as float #x23)))
(set! (-> v1-9 height) (the float 35))
)
(if (< f30-0 0.0)
0.0
@@ -2774,7 +2774,7 @@
)
(set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y)))
(let ((v1-25 arg1))
(set! (-> v1-25 height) (the float (the-as float #xa0)))
(set! (-> v1-25 height) (the float 160))
)
(let ((a0-16 arg1))
(set! (-> a0-16 color) (font-color #7efbfb))
@@ -2803,10 +2803,10 @@
(set! (-> arg1 origin x) 75.0)
(set! (-> arg1 origin y) 80.0)
(let ((v1-8 arg1))
(set! (-> v1-8 width) (the float (the-as float #x168)))
(set! (-> v1-8 width) (the float 360))
)
(let ((v1-9 arg1))
(set! (-> v1-9 height) (the float (the-as float #x50)))
(set! (-> v1-9 height) (the float 80))
)
(let ((s4-0 410))
(case (-> arg0 current)
@@ -2824,7 +2824,7 @@
)
(set! (-> arg1 origin y) (+ 80.0 (-> arg1 origin y)))
(let ((v1-17 arg1))
(set! (-> v1-17 height) (the float (the-as float #x32)))
(set! (-> v1-17 height) (the float 50))
)
(let ((s4-1 print-game-text))
(format
@@ -2839,7 +2839,7 @@
)
(set! (-> arg1 origin y) (+ 55.0 (-> arg1 origin y)))
(let ((v1-22 arg1))
(set! (-> v1-22 height) (the float (the-as float #x5a)))
(set! (-> v1-22 height) (the float 90))
)
(cond
((and (!= (-> *progress-state* starting-state) 'insufficient-space)
@@ -2893,10 +2893,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 130.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x3c)))
(set! (-> v1-7 height) (the float 60))
)
(let ((s5-0 409))
(progress-method-28 arg0 'select-save)
@@ -2907,7 +2907,7 @@
)
(set! (-> arg1 origin y) (+ 140.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x1e)))
(set! (-> v1-13 height) (the float 30))
)
(let ((s5-1 arg1))
(set! (-> s5-1 color) (the-as font-color (progress-selected 0)))
@@ -2938,10 +2938,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 130.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x5f)))
(set! (-> v1-7 height) (the float 95))
)
(let ((s5-0 print-game-text))
(format
@@ -2953,7 +2953,7 @@
)
(set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x3c)))
(set! (-> v1-10 height) (the float 60))
)
(let ((s5-1 arg1))
(set! (-> s5-1 color) (the-as font-color (progress-selected 0)))
@@ -2984,10 +2984,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 100.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x2d)))
(set! (-> v1-7 height) (the float 45))
)
(let ((s5-0 425))
(case (-> arg0 current)
@@ -3008,7 +3008,7 @@
)
(set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y)))
(let ((v1-16 arg1))
(set! (-> v1-16 height) (the float (the-as float #x69)))
(set! (-> v1-16 height) (the float 105))
)
(let ((s5-1 print-game-text))
(format
@@ -3020,7 +3020,7 @@
)
(set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y)))
(let ((v1-19 arg1))
(set! (-> v1-19 height) (the float (the-as float #x2d)))
(set! (-> v1-19 height) (the float 45))
)
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
@@ -3051,10 +3051,10 @@
(set! (-> arg1 origin x) 77.0)
(set! (-> arg1 origin y) 85.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x19)))
(set! (-> v1-7 height) (the float 25))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-error-while-saving) #f)
@@ -3065,7 +3065,7 @@
)
(set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x3c)))
(set! (-> v1-10 height) (the float 60))
)
(let ((s5-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-check) #f) 1)
@@ -3073,7 +3073,7 @@
)
(set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x2d)))
(set! (-> v1-13 height) (the float 45))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-disabled) #f)
@@ -3084,7 +3084,7 @@
)
(set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y)))
(let ((v1-16 arg1))
(set! (-> v1-16 height) (the float (the-as float #x5f)))
(set! (-> v1-16 height) (the float 95))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-reenabling-info) #f)
@@ -3095,7 +3095,7 @@
)
(set! (-> arg1 origin y) (+ 90.0 (-> arg1 origin y)))
(let ((v1-19 arg1))
(set! (-> v1-19 height) (the float (the-as float #x19)))
(set! (-> v1-19 height) (the float 25))
)
(let ((s5-4 arg1))
(set! (-> s5-4 color) (the-as font-color (progress-selected 0)))
@@ -3126,10 +3126,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 80.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x46)))
(set! (-> v1-7 height) (the float 70))
)
(let ((s5-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-was-removed) #f) 1)
@@ -3145,7 +3145,7 @@
)
(set! (-> arg1 origin y) (+ 65.0 (-> arg1 origin y)))
(let ((v1-12 arg1))
(set! (-> v1-12 height) (the float (the-as float #x5a)))
(set! (-> v1-12 height) (the float 90))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-reenabling-info) #f)
@@ -3156,7 +3156,7 @@
)
(set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y)))
(let ((v1-15 arg1))
(set! (-> v1-15 height) (the float (the-as float #x23)))
(set! (-> v1-15 height) (the float 35))
)
(let ((s5-3 arg1))
(set! (-> s5-3 color) (the-as font-color (progress-selected 0)))
@@ -3187,10 +3187,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 120.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x23)))
(set! (-> v1-7 height) (the float 35))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-disc-removed-notice) #f)
@@ -3201,7 +3201,7 @@
)
(set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x55)))
(set! (-> v1-10 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-disc-removed-prompt) #f)
@@ -3213,7 +3213,7 @@
(when (is-cd-in?)
(set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y)))
(let ((v1-14 arg1))
(set! (-> v1-14 height) (the float (the-as float #x32)))
(set! (-> v1-14 height) (the float 50))
)
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
@@ -3245,10 +3245,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 120.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x23)))
(set! (-> v1-7 height) (the float 35))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-disc-read-error) #f)
@@ -3259,7 +3259,7 @@
)
(set! (-> arg1 origin y) (+ 55.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x55)))
(set! (-> v1-10 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-disc-read-error-prompt) #f)
@@ -3270,7 +3270,7 @@
)
(set! (-> arg1 origin y) (+ 105.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x32)))
(set! (-> v1-13 height) (the float 50))
)
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
@@ -3332,10 +3332,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 80.0)
(let ((v1-27 arg1))
(set! (-> v1-27 width) (the float (the-as float #x14a)))
(set! (-> v1-27 width) (the float 330))
)
(let ((v1-28 arg1))
(set! (-> v1-28 height) (the float (the-as float #x55)))
(set! (-> v1-28 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-explanation) #f)
@@ -3346,7 +3346,7 @@
)
(set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y)))
(let ((v1-31 arg1))
(set! (-> v1-31 height) (the float (the-as float #x5f)))
(set! (-> v1-31 height) (the float 95))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-dont-remove) #f)
@@ -3357,7 +3357,7 @@
)
(set! (-> arg1 origin y) (+ 90.0 (-> arg1 origin y)))
(let ((v1-34 arg1))
(set! (-> v1-34 height) (the float (the-as float #x32)))
(set! (-> v1-34 height) (the float 50))
)
(let ((s5-3 arg1))
(set! (-> s5-3 color) (the-as font-color (progress-selected 0)))
@@ -3388,10 +3388,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 80.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x55)))
(set! (-> v1-7 height) (the float 85))
)
(let ((s4-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-unformatted) #f) 1)
@@ -3399,7 +3399,7 @@
)
(set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x55)))
(set! (-> v1-10 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-formatting-required-notice) #f)
@@ -3410,7 +3410,7 @@
)
(set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x19)))
(set! (-> v1-13 height) (the float 25))
)
(draw-highlight (the int (-> arg1 origin y)) 44 (-> arg1 alpha))
(print-game-text
@@ -3440,10 +3440,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 120.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x55)))
(set! (-> v1-7 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-overwrite-warning) #f)
@@ -3454,7 +3454,7 @@
)
(set! (-> arg1 origin y) (+ 105.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x2d)))
(set! (-> v1-10 height) (the float 45))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-overwrite-confirm) #f)
@@ -3484,10 +3484,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 110.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x5a)))
(set! (-> v1-7 height) (the float 90))
)
(let ((s4-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-no-jak2-found) #f) 1)
@@ -3495,7 +3495,7 @@
)
(set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x3c)))
(set! (-> v1-10 height) (the float 60))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-create-jak2-file?) #f)
@@ -3525,10 +3525,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 85.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x2d)))
(set! (-> v1-7 height) (the float 45))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-60hz-change-notice) #f)
@@ -3539,7 +3539,7 @@
)
(set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x5f)))
(set! (-> v1-10 height) (the float 95))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-warning-1) #f)
@@ -3550,7 +3550,7 @@
)
(set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x37)))
(set! (-> v1-13 height) (the float 55))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-warning-2) #f)
@@ -3561,7 +3561,7 @@
)
(set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y)))
(let ((v1-16 arg1))
(set! (-> v1-16 height) (the float (the-as float #x1e)))
(set! (-> v1-16 height) (the float 30))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-continue?) #f)
@@ -3591,10 +3591,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 130.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x32)))
(set! (-> v1-7 height) (the float 50))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-60hz-change-complete) #f)
@@ -3605,7 +3605,7 @@
)
(set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x32)))
(set! (-> v1-10 height) (the float 50))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-mode-revert?) #f)
@@ -3635,10 +3635,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 75.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x32)))
(set! (-> v1-7 height) (the float 50))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-change-notice) #f)
@@ -3649,7 +3649,7 @@
)
(set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x5a)))
(set! (-> v1-10 height) (the float 90))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-warning-1) #f)
@@ -3660,7 +3660,7 @@
)
(set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x4b)))
(set! (-> v1-13 height) (the float 75))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-warning-2) #f)
@@ -3671,7 +3671,7 @@
)
(set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y)))
(let ((v1-16 arg1))
(set! (-> v1-16 height) (the float (the-as float #x1e)))
(set! (-> v1-16 height) (the float 30))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-continue?) #f)
@@ -3701,10 +3701,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 90.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x50)))
(set! (-> v1-7 height) (the float 80))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-change-complete) #f)
@@ -3715,7 +3715,7 @@
)
(set! (-> arg1 origin y) (+ 100.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x4b)))
(set! (-> v1-10 height) (the float 75))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-mode-revert?) #f)
@@ -3745,10 +3745,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 160.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x46)))
(set! (-> v1-7 height) (the float 70))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-quit-game-confirm) #f)
@@ -3797,10 +3797,10 @@
)
(set! (-> arg1 origin y) 100.0)
(let ((v1-9 arg1))
(set! (-> v1-9 width) (the float (the-as float #x159)))
(set! (-> v1-9 width) (the float 345))
)
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #xd2)))
(set! (-> v1-10 height) (the float 210))
)
(let* ((v1-11 (-> arg0 current))
(a3-1 (cond
@@ -3980,10 +3980,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 100.0)
(let ((v1-14 arg1))
(set! (-> v1-14 width) (the float (the-as float #x14f)))
(set! (-> v1-14 width) (the float 335))
)
(let ((v1-15 arg1))
(set! (-> v1-15 height) (the float (the-as float #xd2)))
(set! (-> v1-15 height) (the float 210))
)
(let ((a1-9 arg1))
(set! (-> a1-9 color) (font-color #7efbfb))
@@ -4764,13 +4764,13 @@
(case (get-aspect-ratio)
(('aspect4x3)
(let ((v1-68 arg1))
(set! (-> v1-68 height) (the float (the-as float #xb9)))
(set! (-> v1-68 height) (the float 185))
)
(set! (-> arg1 origin y) 133.0)
)
(('aspect16x9)
(let ((v1-72 arg1))
(set! (-> v1-72 height) (the float (the-as float #xb9)))
(set! (-> v1-72 height) (the float 185))
)
(set! (-> arg1 origin y) 133.0)
)
@@ -5767,7 +5767,7 @@
(set! (-> sv-140 origin y) (+ 46.0 (-> sv-140 origin y)))
(set! (-> sv-140 origin x) 65.0)
(let ((v1-46 sv-140))
(set! (-> v1-46 width) (the float (the-as float #x16f)))
(set! (-> v1-46 width) (the float 367))
)
(let ((a0-23 sv-140))
(set! (-> a0-23 flags) (font-flags kerning large))
goal_src/jak2/engine/ui/progress/progress.gc
+2 -2
View File
@@ -1338,10 +1338,10 @@
(set! (-> sv-144 origin x) 79.0)
(set! (-> sv-144 origin y) (the float sv-148))
(let ((v1-29 sv-144))
(set! (-> v1-29 width) (the float (the-as float #x163)))
(set! (-> v1-29 width) (the float 355))
)
(let ((v1-30 sv-144))
(set! (-> v1-30 height) (the float (the-as float #x1e)))
(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)
goal_src/jak2/levels/common/warp-gate.gc
+2 -2
View File
@@ -587,10 +587,10 @@
)
)
(let ((v1-51 gp-0))
(set! (-> v1-51 width) (the float (the-as float #x154)))
(set! (-> v1-51 width) (the float 340))
)
(let ((v1-52 gp-0))
(set! (-> v1-52 height) (the float (the-as float #x50)))
(set! (-> v1-52 height) (the float 80))
)
(let ((v1-53 gp-0))
(set! (-> v1-53 scale) 0.9)
goal_src/jak2/levels/gungame/gungame-obs.gc
+2 -2
View File
@@ -230,10 +230,10 @@
)
(set! (-> s5-1 flags) (font-flags shadow kerning left large))
(let ((v1-4 s5-1))
(set! (-> v1-4 width) (the float (the-as float #x1b8)))
(set! (-> v1-4 width) (the float 440))
)
(let ((v1-5 s5-1))
(set! (-> v1-5 height) (the float (the-as float #x50)))
(set! (-> v1-5 height) (the float 80))
)
(let ((v1-6 s5-1))
(set! (-> v1-6 scale) 0.7)
test/decompiler/reference/jak2/engine/ambient/ambient_REF.gc
Generated Vendored
+2 -2
View File
@@ -319,10 +319,10 @@
)
)
(let ((v1-14 gp-0))
(set! (-> v1-14 width) (the float (the-as float #x1b8)))
(set! (-> v1-14 width) (the float 440))
)
(let ((v1-15 gp-0))
(set! (-> v1-15 height) (the float (the-as float #x8c)))
(set! (-> v1-15 height) (the float 140))
)
(set! (-> gp-0 flags) (font-flags shadow kerning middle large))
(if (logtest? (-> obj message flags) 32)
test/decompiler/reference/jak2/engine/common_objs/collectables_REF.gc
Generated Vendored
+3382
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/game/game-save_REF.gc
Generated Vendored
+5 -5
View File
@@ -1895,10 +1895,10 @@
)
)
(let ((v1-5 gp-0))
(set! (-> v1-5 width) (the float (the-as float #x1b8)))
(set! (-> v1-5 width) (the float 440))
)
(let ((v1-6 gp-0))
(set! (-> v1-6 height) (the float (the-as float #x50)))
(set! (-> v1-6 height) (the float 80))
)
(set! (-> gp-0 flags) (font-flags shadow kerning))
(format (clear *temp-string*) "~S / ~S ~D~%" (-> self mode) (-> self state name) (-> self which))
@@ -1922,10 +1922,10 @@
(set! (-> v1-17 scale) 0.8)
)
(let ((v1-18 gp-1))
(set! (-> v1-18 width) (the float (the-as float #x1b0)))
(set! (-> v1-18 width) (the float 432))
)
(let ((v1-19 gp-1))
(set! (-> v1-19 height) (the float (the-as float #x14)))
(set! (-> v1-19 height) (the float 20))
)
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
(when (and (>= 1 (-> *game-info* auto-save-count)) (-> self next-state) (= (-> self next-state name) 'save))
@@ -1936,7 +1936,7 @@
(set! (-> v1-30 scale) 0.7)
)
(let ((v1-31 gp-1))
(set! (-> v1-31 height) (the float (the-as float #xc8)))
(set! (-> v1-31 height) (the float 200))
)
(let ((s5-2 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-dont-remove) #f) 1)
test/decompiler/reference/jak2/engine/game/task/task-control_REF.gc
Generated Vendored
+4 -4
View File
@@ -1485,10 +1485,10 @@
(set! (-> v1-7 scale) 0.7)
)
(let ((v1-8 gp-0))
(set! (-> v1-8 width) (the float (the-as float #x12c)))
(set! (-> v1-8 width) (the float 300))
)
(let ((v1-9 gp-0))
(set! (-> v1-9 height) (the float (the-as float #x23)))
(set! (-> v1-9 height) (the float 35))
)
(set! (-> gp-0 flags) (font-flags shadow kerning middle left large))
(let ((s4-0 (if (logtest? (-> obj flags) (fail-mission-flags famflags-2))
@@ -1506,14 +1506,14 @@
)
(when (= (-> obj message) (fail-mission-message fammsg-1))
(let ((v1-17 gp-0))
(set! (-> v1-17 height) (the float (the-as float #x5f)))
(set! (-> v1-17 height) (the float 95))
)
(let ((s5-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id text-x18a) #f) 1)
(s5-1 *temp-string* gp-0 #f 44 (bucket-id progress))
)
(let ((v1-19 gp-0))
(set! (-> v1-19 height) (the float (the-as float #x9b)))
(set! (-> v1-19 height) (the float 155))
)
(let ((s5-2 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id text-x180) #f) 1)
test/decompiler/reference/jak2/engine/process-drawable/process-taskable_REF.gc
Generated Vendored
+2 -2
View File
@@ -229,10 +229,10 @@
)
)
(let ((v1-84 s5-1))
(set! (-> v1-84 width) (the float (the-as float #x154)))
(set! (-> v1-84 width) (the float 340))
)
(let ((v1-85 s5-1))
(set! (-> v1-85 height) (the float (the-as float #x50)))
(set! (-> v1-85 height) (the float 80))
)
(let ((v1-86 s5-1))
(set! (-> v1-86 scale) 0.9)
test/decompiler/reference/jak2/engine/scene/scene_REF.gc
Generated Vendored
+4 -4
View File
@@ -969,10 +969,10 @@
)
)
(let ((v1-20 s2-0))
(set! (-> v1-20 width) (the float (the-as float #x1d1)))
(set! (-> v1-20 width) (the float 465))
)
(let ((v1-21 s2-0))
(set! (-> v1-21 height) (the float (the-as float #x46)))
(set! (-> v1-21 height) (the float 70))
)
(let ((v1-22 s2-0))
(set! (-> v1-22 scale) 0.5)
@@ -1624,10 +1624,10 @@
)
)
(let ((v1-121 gp-6))
(set! (-> v1-121 width) (the float (the-as float #x1b8)))
(set! (-> v1-121 width) (the float 440))
)
(let ((v1-122 gp-6))
(set! (-> v1-122 height) (the float (the-as float #x30)))
(set! (-> v1-122 height) (the float 48))
)
(let ((v1-123 gp-6))
(set! (-> v1-123 scale) 0.5)
test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+74 -74
View File
@@ -2904,10 +2904,10 @@
(set! (-> arg1 origin x) 120.0)
(set! (-> arg1 origin y) 110.0)
(let ((v1-8 arg1))
(set! (-> v1-8 width) (the float (the-as float #x10e)))
(set! (-> v1-8 width) (the float 270))
)
(let ((v1-9 arg1))
(set! (-> v1-9 height) (the float (the-as float #x23)))
(set! (-> v1-9 height) (the float 35))
)
(if (< f30-0 0.0)
0.0
@@ -2931,7 +2931,7 @@
)
(set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y)))
(let ((v1-25 arg1))
(set! (-> v1-25 height) (the float (the-as float #xa0)))
(set! (-> v1-25 height) (the float 160))
)
(let ((a0-16 arg1))
(set! (-> a0-16 color) (font-color #7efbfb))
@@ -2962,10 +2962,10 @@
(set! (-> arg1 origin x) 75.0)
(set! (-> arg1 origin y) 80.0)
(let ((v1-8 arg1))
(set! (-> v1-8 width) (the float (the-as float #x168)))
(set! (-> v1-8 width) (the float 360))
)
(let ((v1-9 arg1))
(set! (-> v1-9 height) (the float (the-as float #x50)))
(set! (-> v1-9 height) (the float 80))
)
(let ((s4-0 410))
(case (-> arg0 current)
@@ -2983,7 +2983,7 @@
)
(set! (-> arg1 origin y) (+ 80.0 (-> arg1 origin y)))
(let ((v1-17 arg1))
(set! (-> v1-17 height) (the float (the-as float #x32)))
(set! (-> v1-17 height) (the float 50))
)
(let ((s4-1 print-game-text))
(format
@@ -2998,7 +2998,7 @@
)
(set! (-> arg1 origin y) (+ 55.0 (-> arg1 origin y)))
(let ((v1-22 arg1))
(set! (-> v1-22 height) (the float (the-as float #x5a)))
(set! (-> v1-22 height) (the float 90))
)
(cond
((and (!= (-> *progress-state* starting-state) 'insufficient-space)
@@ -3054,10 +3054,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 130.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x3c)))
(set! (-> v1-7 height) (the float 60))
)
(let ((s5-0 409))
(progress-method-28 arg0 'select-save)
@@ -3068,7 +3068,7 @@
)
(set! (-> arg1 origin y) (+ 140.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x1e)))
(set! (-> v1-13 height) (the float 30))
)
(let ((s5-1 arg1))
(set! (-> s5-1 color) (the-as font-color (progress-selected 0)))
@@ -3101,10 +3101,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 130.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x5f)))
(set! (-> v1-7 height) (the float 95))
)
(let ((s5-0 print-game-text))
(format
@@ -3116,7 +3116,7 @@
)
(set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x3c)))
(set! (-> v1-10 height) (the float 60))
)
(let ((s5-1 arg1))
(set! (-> s5-1 color) (the-as font-color (progress-selected 0)))
@@ -3149,10 +3149,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 100.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x2d)))
(set! (-> v1-7 height) (the float 45))
)
(let ((s5-0 425))
(case (-> arg0 current)
@@ -3173,7 +3173,7 @@
)
(set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y)))
(let ((v1-16 arg1))
(set! (-> v1-16 height) (the float (the-as float #x69)))
(set! (-> v1-16 height) (the float 105))
)
(let ((s5-1 print-game-text))
(format
@@ -3185,7 +3185,7 @@
)
(set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y)))
(let ((v1-19 arg1))
(set! (-> v1-19 height) (the float (the-as float #x2d)))
(set! (-> v1-19 height) (the float 45))
)
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
@@ -3218,10 +3218,10 @@
(set! (-> arg1 origin x) 77.0)
(set! (-> arg1 origin y) 85.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x19)))
(set! (-> v1-7 height) (the float 25))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-error-while-saving) #f)
@@ -3232,7 +3232,7 @@
)
(set! (-> arg1 origin y) (+ 25.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x3c)))
(set! (-> v1-10 height) (the float 60))
)
(let ((s5-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-check) #f) 1)
@@ -3240,7 +3240,7 @@
)
(set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x2d)))
(set! (-> v1-13 height) (the float 45))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-disabled) #f)
@@ -3251,7 +3251,7 @@
)
(set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y)))
(let ((v1-16 arg1))
(set! (-> v1-16 height) (the float (the-as float #x5f)))
(set! (-> v1-16 height) (the float 95))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-reenabling-info) #f)
@@ -3262,7 +3262,7 @@
)
(set! (-> arg1 origin y) (+ 90.0 (-> arg1 origin y)))
(let ((v1-19 arg1))
(set! (-> v1-19 height) (the float (the-as float #x19)))
(set! (-> v1-19 height) (the float 25))
)
(let ((s5-4 arg1))
(set! (-> s5-4 color) (the-as font-color (progress-selected 0)))
@@ -3295,10 +3295,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 80.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x46)))
(set! (-> v1-7 height) (the float 70))
)
(let ((s5-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-was-removed) #f) 1)
@@ -3314,7 +3314,7 @@
)
(set! (-> arg1 origin y) (+ 65.0 (-> arg1 origin y)))
(let ((v1-12 arg1))
(set! (-> v1-12 height) (the float (the-as float #x5a)))
(set! (-> v1-12 height) (the float 90))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-reenabling-info) #f)
@@ -3325,7 +3325,7 @@
)
(set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y)))
(let ((v1-15 arg1))
(set! (-> v1-15 height) (the float (the-as float #x23)))
(set! (-> v1-15 height) (the float 35))
)
(let ((s5-3 arg1))
(set! (-> s5-3 color) (the-as font-color (progress-selected 0)))
@@ -3358,10 +3358,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 120.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x23)))
(set! (-> v1-7 height) (the float 35))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-disc-removed-notice) #f)
@@ -3372,7 +3372,7 @@
)
(set! (-> arg1 origin y) (+ 45.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x55)))
(set! (-> v1-10 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-disc-removed-prompt) #f)
@@ -3384,7 +3384,7 @@
(when (is-cd-in?)
(set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y)))
(let ((v1-14 arg1))
(set! (-> v1-14 height) (the float (the-as float #x32)))
(set! (-> v1-14 height) (the float 50))
)
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
@@ -3418,10 +3418,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 120.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x23)))
(set! (-> v1-7 height) (the float 35))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-disc-read-error) #f)
@@ -3432,7 +3432,7 @@
)
(set! (-> arg1 origin y) (+ 55.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x55)))
(set! (-> v1-10 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-disc-read-error-prompt) #f)
@@ -3443,7 +3443,7 @@
)
(set! (-> arg1 origin y) (+ 105.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x32)))
(set! (-> v1-13 height) (the float 50))
)
(let ((s5-2 arg1))
(set! (-> s5-2 color) (the-as font-color (progress-selected 0)))
@@ -3507,10 +3507,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 80.0)
(let ((v1-27 arg1))
(set! (-> v1-27 width) (the float (the-as float #x14a)))
(set! (-> v1-27 width) (the float 330))
)
(let ((v1-28 arg1))
(set! (-> v1-28 height) (the float (the-as float #x55)))
(set! (-> v1-28 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-explanation) #f)
@@ -3521,7 +3521,7 @@
)
(set! (-> arg1 origin y) (+ 115.0 (-> arg1 origin y)))
(let ((v1-31 arg1))
(set! (-> v1-31 height) (the float (the-as float #x5f)))
(set! (-> v1-31 height) (the float 95))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-autosave-dont-remove) #f)
@@ -3532,7 +3532,7 @@
)
(set! (-> arg1 origin y) (+ 90.0 (-> arg1 origin y)))
(let ((v1-34 arg1))
(set! (-> v1-34 height) (the float (the-as float #x32)))
(set! (-> v1-34 height) (the float 50))
)
(let ((s5-3 arg1))
(set! (-> s5-3 color) (the-as font-color (progress-selected 0)))
@@ -3565,10 +3565,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 80.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x55)))
(set! (-> v1-7 height) (the float 85))
)
(let ((s4-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-unformatted) #f) 1)
@@ -3576,7 +3576,7 @@
)
(set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x55)))
(set! (-> v1-10 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-formatting-required-notice) #f)
@@ -3587,7 +3587,7 @@
)
(set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x19)))
(set! (-> v1-13 height) (the float 25))
)
(draw-highlight (the int (-> arg1 origin y)) 44 (-> arg1 alpha))
(print-game-text
@@ -3619,10 +3619,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 120.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x55)))
(set! (-> v1-7 height) (the float 85))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-overwrite-warning) #f)
@@ -3633,7 +3633,7 @@
)
(set! (-> arg1 origin y) (+ 105.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x2d)))
(set! (-> v1-10 height) (the float 45))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-overwrite-confirm) #f)
@@ -3665,10 +3665,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 110.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x5a)))
(set! (-> v1-7 height) (the float 90))
)
(let ((s4-0 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (game-text-id progress-memcard-no-jak2-found) #f) 1)
@@ -3676,7 +3676,7 @@
)
(set! (-> arg1 origin y) (+ 95.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x3c)))
(set! (-> v1-10 height) (the float 60))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-create-jak2-file?) #f)
@@ -3708,10 +3708,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 85.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x2d)))
(set! (-> v1-7 height) (the float 45))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-60hz-change-notice) #f)
@@ -3722,7 +3722,7 @@
)
(set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x5f)))
(set! (-> v1-10 height) (the float 95))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-warning-1) #f)
@@ -3733,7 +3733,7 @@
)
(set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x37)))
(set! (-> v1-13 height) (the float 55))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-warning-2) #f)
@@ -3744,7 +3744,7 @@
)
(set! (-> arg1 origin y) (+ 60.0 (-> arg1 origin y)))
(let ((v1-16 arg1))
(set! (-> v1-16 height) (the float (the-as float #x1e)))
(set! (-> v1-16 height) (the float 30))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-continue?) #f)
@@ -3776,10 +3776,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 130.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x32)))
(set! (-> v1-7 height) (the float 50))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-60hz-change-complete) #f)
@@ -3790,7 +3790,7 @@
)
(set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x32)))
(set! (-> v1-10 height) (the float 50))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-mode-revert?) #f)
@@ -3822,10 +3822,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 75.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x32)))
(set! (-> v1-7 height) (the float 50))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-change-notice) #f)
@@ -3836,7 +3836,7 @@
)
(set! (-> arg1 origin y) (+ 50.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x5a)))
(set! (-> v1-10 height) (the float 90))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-warning-1) #f)
@@ -3847,7 +3847,7 @@
)
(set! (-> arg1 origin y) (+ 85.0 (-> arg1 origin y)))
(let ((v1-13 arg1))
(set! (-> v1-13 height) (the float (the-as float #x4b)))
(set! (-> v1-13 height) (the float 75))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-warning-2) #f)
@@ -3858,7 +3858,7 @@
)
(set! (-> arg1 origin y) (+ 70.0 (-> arg1 origin y)))
(let ((v1-16 arg1))
(set! (-> v1-16 height) (the float (the-as float #x1e)))
(set! (-> v1-16 height) (the float 30))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-memcard-continue?) #f)
@@ -3890,10 +3890,10 @@
(set! (-> arg1 origin x) 80.0)
(set! (-> arg1 origin y) 90.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x168)))
(set! (-> v1-6 width) (the float 360))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x50)))
(set! (-> v1-7 height) (the float 80))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-progressivescan-change-complete) #f)
@@ -3904,7 +3904,7 @@
)
(set! (-> arg1 origin y) (+ 100.0 (-> arg1 origin y)))
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #x4b)))
(set! (-> v1-10 height) (the float 75))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-graphics-mode-revert?) #f)
@@ -3936,10 +3936,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 160.0)
(let ((v1-6 arg1))
(set! (-> v1-6 width) (the float (the-as float #x14a)))
(set! (-> v1-6 width) (the float 330))
)
(let ((v1-7 arg1))
(set! (-> v1-7 height) (the float (the-as float #x46)))
(set! (-> v1-7 height) (the float 70))
)
(print-game-text
(lookup-text! *common-text* (game-text-id progress-quit-game-confirm) #f)
@@ -3991,10 +3991,10 @@
)
(set! (-> arg1 origin y) 100.0)
(let ((v1-9 arg1))
(set! (-> v1-9 width) (the float (the-as float #x159)))
(set! (-> v1-9 width) (the float 345))
)
(let ((v1-10 arg1))
(set! (-> v1-10 height) (the float (the-as float #xd2)))
(set! (-> v1-10 height) (the float 210))
)
(let* ((v1-11 (-> arg0 current))
(a3-1 (cond
@@ -4177,10 +4177,10 @@
(set! (-> arg1 origin x) 90.0)
(set! (-> arg1 origin y) 100.0)
(let ((v1-14 arg1))
(set! (-> v1-14 width) (the float (the-as float #x14f)))
(set! (-> v1-14 width) (the float 335))
)
(let ((v1-15 arg1))
(set! (-> v1-15 height) (the float (the-as float #xd2)))
(set! (-> v1-15 height) (the float 210))
)
(let ((a1-9 arg1))
(set! (-> a1-9 color) (font-color #7efbfb))
@@ -5345,13 +5345,13 @@
(case (get-aspect-ratio)
(('aspect4x3)
(let ((v1-68 arg1))
(set! (-> v1-68 height) (the float (the-as float #xb9)))
(set! (-> v1-68 height) (the float 185))
)
(set! (-> arg1 origin y) 133.0)
)
(('aspect16x9)
(let ((v1-72 arg1))
(set! (-> v1-72 height) (the float (the-as float #xb9)))
(set! (-> v1-72 height) (the float 185))
)
(set! (-> arg1 origin y) 133.0)
)
@@ -6499,7 +6499,7 @@
(set! (-> sv-140 origin y) (+ 46.0 (-> sv-140 origin y)))
(set! (-> sv-140 origin x) 65.0)
(let ((v1-46 sv-140))
(set! (-> v1-46 width) (the float (the-as float #x16f)))
(set! (-> v1-46 width) (the float 367))
)
(let ((a0-23 sv-140))
(set! (-> a0-23 flags) (font-flags kerning large))
test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
Generated Vendored
+2 -2
View File
@@ -1459,10 +1459,10 @@
(set! (-> sv-144 origin x) 79.0)
(set! (-> sv-144 origin y) (the float sv-148))
(let ((v1-29 sv-144))
(set! (-> v1-29 width) (the float (the-as float #x163)))
(set! (-> v1-29 width) (the float 355))
)
(let ((v1-30 sv-144))
(set! (-> v1-30 height) (the float (the-as float #x1e)))
(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)
test/decompiler/reference/jak2/levels/common/warp-gate_REF.gc
Generated Vendored
+2 -2
View File
@@ -634,10 +634,10 @@
)
)
(let ((v1-51 gp-0))
(set! (-> v1-51 width) (the float (the-as float #x154)))
(set! (-> v1-51 width) (the float 340))
)
(let ((v1-52 gp-0))
(set! (-> v1-52 height) (the float (the-as float #x50)))
(set! (-> v1-52 height) (the float 80))
)
(let ((v1-53 gp-0))
(set! (-> v1-53 scale) 0.9)
test/decompiler/reference/jak2/levels/gungame/gungame-obs_REF.gc
Generated Vendored
+2 -2
View File
@@ -294,10 +294,10 @@
)
(set! (-> s5-1 flags) (font-flags shadow kerning left large))
(let ((v1-4 s5-1))
(set! (-> v1-4 width) (the float (the-as float #x1b8)))
(set! (-> v1-4 width) (the float 440))
)
(let ((v1-5 s5-1))
(set! (-> v1-5 height) (the float (the-as float #x50)))
(set! (-> v1-5 height) (the float 80))
)
(let ((v1-6 s5-1))
(set! (-> v1-6 scale) 0.7)