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

d/jak2: finish progress-draw

Browse Source
This commit is contained in:
Tyler Wilding
2022-09-26 23:20:53 -04:00
parent 6085894ea7
commit 28344c06b0
18 changed files with 16338 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/jak2/all-types.gc
+40 -23
View File
@@ -6575,6 +6575,7 @@
;; text-id-h ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; +++text-id-h:game-text-id
(defenum game-text-id
:type uint32
:bitfield #f
@@ -6588,7 +6589,20 @@
(progress-video-j1n2 289)
(progress-draw-yes-or-no-1-TODO 292)
(progress-draw-yes-or-no-2-TODO 293)
(progress-1kj2n3kj1n23 296)
(progress-n2jk3n45234 298)
(progress-1ikjhb231hjik2b31ihb231 303)
(progress-kj1n23123 308)
(progress-k1jnb231kjhnb23 311)
(progress-loj1n23 312)
(progress-2k3jn4234 313)
(progress-2kj3n24kn 314)
(progress-2kjn34 315)
(progress-2klj342n43 316)
(progress-l2jm342m34 317)
(progress-2m342kmj34 318)
(progress-kj1bn23kj1n23 339)
(progress-1l2jnm31lk2m3 340)
(progress-unlocked-oj1n23jn1 345)
(progress-unlocked-k1231kkj 346)
(progress-unlocked-jn12j 347)
@@ -6598,12 +6612,14 @@
(progress-unlocked-iwudnq 351)
(progress-unlocked-n51i51n 352)
(progress-1k2ijn1jkn3 360)
(progress-1kjn2jn31kj3 361)
(progress-1kj2n31j23 367)
(progress-iko1jn231kjhn23 368)
(progress-1klj2n31j2n3 369)
(progress-i1un23i12b341 370)
(progress-2kj3n2kji3n42 377)
(progress-draw-continue-retry-1-TODO 382)
(progress-1klj2n31j23 383)
(progress-j1n23j1kn23kjn12 395)
(progress-2j021j394j 396)
(progress-kj6n324i63n 397)
@@ -6658,6 +6674,7 @@
(progress-main-364jn6n 547)
(progress-ikj123i1khb231 784)
)
;; ---text-id-h:game-text-id
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -12062,7 +12079,7 @@
(game-info-method-26 () none 26)
(get-next-attack-id (_type_) uint 27)
(game-info-method-28 () none 28)
(game-info-method-29 () none 29)
(get-game-score-ref (_type_ int) (pointer float) 29)
(game-info-method-30 () none 30)
)
)
@@ -20236,7 +20253,7 @@
)
(deftype menu-option (basic)
((name uint32 :offset-assert 4)
((name game-text-id :offset-assert 4)
(scale float :offset-assert 8)
(unknown function :offset-assert 12)
;; No idea what is going on here....
@@ -29227,7 +29244,7 @@
(define-extern *highscores-options* "List of [[menu-highscores-option]]" menu-option-list)
(define-extern *secret-options* menu-option-list)
(define-extern *language-name-remap* (array game-text-id))
(define-extern *stereo-mode-name-remap* (array uint64))
(define-extern *stereo-mode-name-remap* (array game-text-id))
(define-extern *hud-ring-graphic-remap* (array uint64)) ;; these are probably bitfields of some kind
(define-extern *hud-ring-kiosk-graphic-remap* (array uint64))
(define-extern *hud-ring-demo-graphic-remap* (array uint64))
@@ -29333,13 +29350,13 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(deftype print-highscore-obj (basic)
((self basic :offset-assert 4)
((self texture-page :offset-assert 4)
(index int32 :offset-assert 8)
(previous basic :offset-assert 12)
(previous texture-page :offset-assert 12) ; guess
(place int32 :offset-assert 16)
(score float :offset-assert 20)
(game-score basic :offset-assert 24)
(context basic :offset-assert 28)
(context font-context :offset-assert 28)
(local-scale float :offset-assert 32)
(interp float :offset-assert 36)
)
@@ -29351,12 +29368,12 @@
(define-extern progress-selected (function int int :behavior progress))
(define-extern draw-percent-bar (function int int float rgba none)) ;;
(define-extern draw-highlight (function int int float pointer))
(define-extern draw-busy-loading (function object float :behavior progress))
(define-extern draw-previous-next (function object int int none))
(define-extern draw-up-down (function object none))
(define-extern draw-missions-up-down (function object none))
(define-extern draw-scene-up-down (function object none))
(define-extern begin-scissor (function vector none))
(define-extern draw-busy-loading (function font-context float :behavior progress))
(define-extern draw-previous-next (function menu-highscores-option font-context symbol none))
(define-extern draw-up-down (function font-context none))
(define-extern draw-missions-up-down (function font-context none))
(define-extern draw-scene-up-down (function font-context none))
(define-extern begin-scissor (function vector progress none))
(define-extern end-scissor (function none))
(define-extern begin-scissor-secret (function vector none))
(define-extern end-scissor-secret (function none))
@@ -29378,20 +29395,20 @@
(define-extern get-level-icon-id-02 "TODO - Icon id enum perhaps?" (function int uint))
(define-extern get-level-icon-id-03 "TODO - Icon id enum perhaps?" (function int uint))
(define-extern get-level-icon-id-04 "TODO - Icon id enum perhaps?" (function int uint))
(define-extern draw-decoration (function none))
(define-extern draw-missions-decoration (function none))
(define-extern draw-sound-options-decoration (function menu-slider-option font-context int symbol none))
(define-extern draw-decoration-secrets (function menu-secret-option font-context float none))
(define-extern draw-decoration-load-save (function symbol font-context float int none))
(define-extern sort-task-node-result (function object none))
(define-extern draw-decoration (function menu-quit-qr-option font-context float int symbol float none))
(define-extern draw-missions-decoration (function menu-missions-option font-context float game-text-id none))
(define-extern draw-sound-options-decoration (function menu-slider-option font-context float symbol game-text-id none))
(define-extern draw-decoration-secrets (function menu-secret-option font-context float game-text-id pointer))
(define-extern draw-decoration-load-save (function menu-memcard-slot-option font-context float int none))
(define-extern sort-task-node-result (function int none))
(define-extern find-mission-text-at-index (function int game-task-node-info))
(define-extern draw-secret-list (function none))
(define-extern draw-highscore-icon (function menu-highscores-option uint int int none))
;; (define-extern draw-highscore-cup function)
(define-extern draw-secret-list (function secret-item-option progress font-context int symbol float none))
(define-extern draw-highscore-icon (function menu-highscores-option uint int int float pointer))
(define-extern draw-highscore-cup (function texture-page object int int float float pointer))
(define-extern get-highscore-score "TODO - takes and returns an enum?" (function int int))
(define-extern eval-highscore (function object none))
(define-extern eval-highscore (function print-highscore-obj none))
(define-extern str-print-time (function float string))
(define-extern print-highscore (function print-highscore-obj none))
(define-extern print-highscore (function print-highscore-obj float))
(define-extern get-highscore-text "TODO - takes an enum?" (function int game-text-id))
(define-extern get-highscore-text-sub "TODO - takes an enum?" (function int game-text-id))
(define-extern get-highscore-icon "TODO - Icon id enum perhaps?" (function int uint))
decompiler/config/jak2/type_casts.jsonc
+267 -43
View File
@@ -13309,16 +13309,46 @@
]
],
"(method 13 sync-linear)": [
["_stack_", 16, "res-tag"],
[35, "v1", "(pointer float)"]
[
"_stack_",
16,
"res-tag"
],
[
35,
"v1",
"(pointer float)"
]
],
"(method 13 sync-eased)": [
["_stack_", 16, "res-tag"],
[[31, 54], "v1", "(pointer float)"]
[
"_stack_",
16,
"res-tag"
],
[
[
31,
54
],
"v1",
"(pointer float)"
]
],
"(method 13 sync-paused)": [
["_stack_", 16, "res-tag"],
[[29, 45], "v1", "(pointer float)"]
[
"_stack_",
16,
"res-tag"
],
[
[
29,
45
],
"v1",
"(pointer float)"
]
],
"(method 25 progress)": [
[
@@ -13593,75 +13623,269 @@
"dma-packet"
]
],
"(method 10 menu-memcard-slot-option)": [
"(method 10 menu-highscores-option)": [
[
162,
"a0",
17,
"v1",
"float"
],
[
322,
"t1",
51,
"f0",
"float"
],
[
541,
"t1",
14,
"v1",
"float"
],
]
],
"draw-percent-bar": [
[
677,
"a0",
"float"
],
[
38,
41
],
"v1",
"dma-packet"
]
],
"draw-highscore-icon": [
[
691,
"a0",
"float"
],
[
36,
39
],
"v1",
"dma-packet"
]
],
"begin-scissor": [
[
728,
"a0",
"float"
],
[
70,
73
],
"v1",
"dma-packet"
]
],
"draw-savegame-box": [
[
767,
"a0",
"float"
],
[
25,
28
],
"v1",
"dma-packet"
]
],
"draw-decoration": [
[
805,
"a0",
"float"
[
176,
179
],
"v1",
"dma-packet"
]
],
"draw-missions-decoration": [
[
[
137,
140
],
"v1",
"dma-packet"
]
],
"draw-sound-options-decoration": [
[
[
151,
154
],
"v1",
"dma-packet"
]
],
"draw-decoration-secrets": [
[
[
139,
142
],
"v1",
"dma-packet"
]
],
"draw-decoration-load-save": [
[
[
173,
176
],
"v1",
"dma-packet"
]
],
"(method 10 menu-secret-option)": [
[
47,
25,
"v1",
"float"
],
[
106,
"a0",
22,
"v1",
"float"
],
[
63,
"f0",
"float"
],
[
[
137,
140
],
"v1",
"dma-packet"
]
],
"(method 10 menu-memcard-slot-option)": [
[
[
333,
336
],
"v1",
"dma-packet"
],
[
[
552,
555
],
"v1",
"dma-packet"
],
[
[
874,
877
],
"v1",
"dma-packet"
],
[
[
941,
944
],
"v1",
"dma-packet"
],
[
[
1034,
1037
],
"v1",
"dma-packet"
],
[
[
1107,
1110
],
"v1",
"dma-packet"
],
[
[
1186,
1189
],
"v1",
"dma-packet"
],
[
59,
"f0",
"float"
]
],
"(method 10 menu-highscores-option)": [
"(method 10 menu-icon-info-option)": [
[
31,
[
71,
74
],
"v1",
"dma-packet"
]
],
"find-mission-text-at-index": [
[
201,
"v1",
"symbol" // this is a lie, but it's needed to work around the useless`cmove-#f-zero` it's not a symbol
]
],
"(method 10 menu-missions-option)": [
[
78,
"f0",
"float"
]
],
"draw-highscore-cup": [
[
[
74,
77
],
"v1",
"dma-packet"
]
],
"(method 10 menu-slider-option)": [
[
[
415,
418
],
"v1",
"dma-packet"
],
[
38,
[
768,
771
],
"v1",
"float"
"dma-packet"
]
],
"(method 10 menu-sub-menu-option)": [
[
[
237,
240
],
"v1",
"dma-packet"
],
[
122,
"a0",
"float"
[
334,
337
],
"v1",
"dma-packet"
]
]
}
goal_src/jak2/engine/game/game-info-h.gc
+6 -2
View File
@@ -130,6 +130,10 @@
(define-extern bug-report-display (function none))
(define-extern trsq->continue-point (function trsq none))
;; NOTE - for progress
(declare-type highscore-info structure)
(define-extern *highscore-info-array* (array highscore-info))
;; DECOMP BEGINS
(local-vars (gp-0 game-info))
@@ -291,7 +295,7 @@
(last-continue continue-point :offset-assert 244)
(play-list (array game-task-info) :offset-assert 248)
(sub-task-list (array game-task-node-info) :offset-assert 252)
(unknown-pad5 array :offset-assert 256)
(mission-list (array game-task-node-info) :offset-assert 256)
(task-counter uint32 :offset-assert 260)
(unknown-pad6 uint32 :offset-assert 264)
(level-opened uint8 32 :offset-assert 268)
@@ -372,7 +376,7 @@
(game-info-method-26 () none 26)
(get-next-attack-id (_type_) uint 27)
(game-info-method-28 () none 28)
(game-info-method-29 () none 29)
(get-game-score-ref (_type_ int) (pointer float) 29)
(game-info-method-30 () none 30)
)
)
goal_src/jak2/engine/game/task/task-control-h.gc
+1 -1
View File
@@ -1327,7 +1327,7 @@
(:methods
(dummy-9 () none 9)
(dummy-10 () none 10)
(dummy-11 () none 11)
(open? (_type_) symbol 11)
(dummy-12 () none 12)
(dummy-13 () none 13)
)
goal_src/jak2/engine/ui/hud-h.gc
+1
View File
@@ -13,6 +13,7 @@
;; NOTE - for progress
(define-extern hide-hud (function symbol none))
(define-extern hud-hidden? (function symbol))
(define-extern set-hud-piece-position! (function basic int int none))
;; DECOMP BEGINS
goal_src/jak2/engine/ui/progress/progress-draw.gc
+7835
View File
File diff suppressed because it is too large Load Diff
goal_src/jak2/engine/ui/progress/progress-h.gc
+9 -9
View File
@@ -16,7 +16,7 @@
(define-extern activate-progress (function process symbol none))
(define-extern memcard-unlocked-secrets? (function symbol symbol))
(define-extern progress-selected (function int none :behavior progress))
(define-extern progress-selected (function int int :behavior progress))
(define-extern get-num-highscores (function int))
(define-extern get-next-highscore (function int int))
(define-extern get-prev-highscore (function int int))
@@ -73,11 +73,11 @@
(deftype menu-option (basic)
((name uint32 :offset-assert 4)
(scale basic :offset-assert 8)
(unknown function :offset-assert 12)
(box menu-option 1 :offset-assert 16)
(unknown-options menu-option 7 :offset-assert 20)
((name game-text-id :offset-assert 4)
(scale float :offset-assert 8)
(unknown function :offset-assert 12)
(box menu-option 1 :offset-assert 16)
(unknown-options menu-option 7 :offset-assert 20)
)
:method-count-assert 12
:size-assert #x30
@@ -192,8 +192,9 @@
(deftype menu-memcard-slot-option (menu-option)
((sprites hud-sprite 5 :inline :offset-assert 48)
(pad uint8 32 :offset-assert 368)
((sprites hud-sprite 5 :inline :offset-assert 48)
(something-hud-related basic :offset 112)
(pad uint8 32 :offset-assert 368)
)
:method-count-assert 12
:size-assert #x190
@@ -576,4 +577,3 @@
:size-assert #x54
:flag-assert #xc00000054
)
goal_src/jak2/engine/ui/progress/progress-static.gc
+1 -1
View File
@@ -144,7 +144,7 @@
)
(define *stereo-mode-name-remap*
(the-as (array uint64) (new 'static 'boxed-array :type uint32 #x104 #x105 #x106))
(the-as (array game-text-id) (new 'static 'boxed-array :type uint32 #x104 #x105 #x106))
)
(define *hud-ring-graphic-remap*
goal_src/jak2/engine/ui/progress/progress.gc
+1 -2
View File
@@ -56,7 +56,7 @@
(total-num-tasks int32 :offset-assert 208)
(scene-player-act int32 :offset-assert 212)
(stereo-mode-backup int32 :offset-assert 216)
(secrets-unlocked basic :offset-assert 220)
(secrets-unlocked symbol :offset-assert 220)
(missions-total-spacing float :offset-assert 224)
(clear-screen basic :offset-assert 228)
)
@@ -1189,7 +1189,6 @@
;; WARN: Stack slot offset 148 signed mismatch
;; WARN: Stack slot offset 148 signed mismatch
;; WARN: Stack slot offset 148 signed mismatch
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 111]
(defbehavior progress-post progress ()
(local-vars (sv-144 font-context) (sv-148 int) (sv-152 hud-box) (sv-156 symbol))
(when (-> self current-options)
goal_src/jak2/engine/ui/text-h.gc
+2
View File
@@ -13,6 +13,8 @@
This function made more sense back when text files were split up, but in the end they put everything
in a single text group and file."
(function int none))
(define-extern print-game-text-scaled "Print text, with a given scaling" (function string float font-context int none))
(define-extern print-game-text "Print text." (function string font-context symbol int int float))
;; DECOMP BEGINS
goal_src/jak2/engine/ui/text-id-h.gc
+97 -4
View File
@@ -5,12 +5,105 @@
;; name in dgo: text-id-h
;; dgos: ENGINE, GAME
;; DECOMP BEGINS
;; +++game-text-id
(defenum game-text-id
:type uint32
:bitfield #f
;; GAME-TEXT-ID ENUM BEGINS
(pause 257)
;; GAME-TEXT-ID ENUM ENDS
(progress-on-off-1TODO 270)
(progress-on-off-2TODO 271)
(progress-1k2jn1kj2n3 272)
(progress-kj1231nj23 286)
(progress-12434g343v 287)
(progress-video-asda 288)
(progress-video-j1n2 289)
(progress-draw-yes-or-no-1-TODO 292)
(progress-draw-yes-or-no-2-TODO 293)
(progress-1kj2n3kj1n23 296)
(progress-n2jk3n45234 298)
(progress-1ikjhb231hjik2b31ihb231 303)
(progress-kj1n23123 308)
(progress-k1jnb231kjhnb23 311)
(progress-loj1n23 312)
(progress-2k3jn4234 313)
(progress-2kj3n24kn 314)
(progress-2kjn34 315)
(progress-2klj342n43 316)
(progress-l2jm342m34 317)
(progress-2m342kmj34 318)
(progress-kj1bn23kj1n23 339)
(progress-1l2jnm31lk2m3 340)
(progress-unlocked-oj1n23jn1 345)
(progress-unlocked-k1231kkj 346)
(progress-unlocked-jn12j 347)
(progress-unlocked-m12312 348)
(progress-unlocked-1231h2bn 349)
(progress-unlocked-akjisndaj 350)
(progress-unlocked-iwudnq 351)
(progress-unlocked-n51i51n 352)
(progress-1k2ijn1jkn3 360)
(progress-1kjn2jn31kj3 361)
(progress-1kj2n31j23 367)
(progress-iko1jn231kjhn23 368)
(progress-1klj2n31j2n3 369)
(progress-i1un23i12b341 370)
(progress-2kj3n2kji3n42 377)
(progress-draw-continue-retry-1-TODO 382)
(progress-1klj2n31j23 383)
(progress-j1n23j1kn23kjn12 395)
(progress-2j021j394j 396)
(progress-kj6n324i63n 397)
(progress-3iou4n3i45n3 398)
(progress-39u4n359n45 399)
(progress-iun34593n45 400)
(progress-on2394234n 401)
(progress-l1jkn231jkn23 402)
(progress-kj1n231kjn2 403)
(progress-1lkjn231jnk2 404)
(progress-n12n211n1n 405)
(progress-2iu3bn4289u34n 406)
(progress-oj1n23kj1n23123 409)
(progress-1kjn231kjn23 410)
(progress-1kj2b31k2b3 411)
(progress-j1nb23kj1hbn2 412)
(progress-1kj2bkoij1231 413)
(progress-1nmn1221n21n12n 414)
(progress-busy-loading-TODO 416)
(progress-1jib12o3nj12j3 419)
(progress-1m23n1n23n21 420)
(progress-1jk2n31jkn23n1j 421)
(progress-1n23kjn12nk3j12 422)
(progress-draw-continue-retry-2-TODO 423)
(progress-kj12k3j1n23n 424)
(progress-1kj2bn31kjhnb2 426)
(progress-jk1n23kj1n2 429)
(progress-k1jn23k1h23b 430)
(progress-k1jn23kj1n23 431)
(progress-1kjn231j2 432)
(progress-1kj2n31kjn231 433)
(progress-1kj2n31jkn23 434)
(progress-1kjn2123919 435)
(progress-jn12n3j1n2 436)
(progress-n12jin313 437)
(progress-main-23jn42 531)
(progress-main-63j46j3n4 532)
(progress-main-m123j1m 533)
(progress-main-634jn6 534)
(progress-main-52o352nm 535)
(progress-main-63jk46n3 536)
(progress-main-j324nm3 537)
(progress-main-k1j2n3n1 538)
(progress-main-6mn346mn 539)
(progress-main-63jn463jn 540)
(progress-main-63j46n3j 541)
(progress-main-52kj3n52 542)
(progress-main-52jn35j2 543)
(progress-main-3643m6m 544)
(progress-main-36j46jn 545)
(progress-main-63mn46nm 546)
(progress-main-364jn6n 547)
(progress-ikj123i1khb231 784)
)
;; ---game-text-id
;; DECOMP BEGINS
test/decompiler/reference/jak2/engine/data/art-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -611,7 +611,7 @@
(get-skeleton-origin (_type_) vector 9)
(draw-control-method-10 () none 10)
(draw-control-method-11 () none 11)
(draw-control-method-12 (_type_ int int) none 12)
(draw-control-method-12 (_type_ uint int) none 12)
(draw-control-method-13 () none 13)
(draw-control-method-14 (_type_ cspace-array joint-control) none 14)
)
test/decompiler/reference/jak2/engine/game/game-info-h_REF.gc
Generated Vendored
+1 -1
View File
@@ -262,7 +262,7 @@
(last-continue continue-point :offset-assert 244)
(play-list (array game-task-info) :offset-assert 248)
(sub-task-list (array game-task-node-info) :offset-assert 252)
(unknown-pad5 array :offset-assert 256)
(mission-list (array game-task-node-info) :offset-assert 256)
(task-counter uint32 :offset-assert 260)
(unknown-pad6 uint32 :offset-assert 264)
(level-opened uint8 32 :offset-assert 268)
test/decompiler/reference/jak2/engine/target/logic-target_REF.gc
Generated Vendored
+2 -2
View File
@@ -1899,11 +1899,11 @@
(when (!= (-> self beard?) v1-248)
(cond
(v1-248
(draw-control-method-12 (-> self draw) 2 0)
(draw-control-method-12 (-> self draw) (the-as uint 2) 0)
(set! (-> self beard?) #t)
)
(else
(draw-control-method-12 (-> self draw) 0 2)
(draw-control-method-12 (-> self draw) (the-as uint 0) 2)
(set! (-> self beard?) #f)
)
)
test/decompiler/reference/jak2/engine/ui/progress/progress-draw_REF.gc
Generated Vendored
+8036
View File
File diff suppressed because it is too large Load Diff
test/decompiler/reference/jak2/engine/ui/progress/progress-h_REF.gc
Generated Vendored
+13 -12
View File
@@ -90,11 +90,11 @@
;; definition of type menu-option
(deftype menu-option (basic)
((name uint32 :offset-assert 4)
(scale basic :offset-assert 8)
(unknown basic :offset-assert 12)
(box menu-option 1 :offset-assert 16)
(padding uint32 7 :offset-assert 20)
((name uint32 :offset-assert 4)
(scale float :offset-assert 8)
(unknown function :offset-assert 12)
(box menu-option 1 :offset-assert 16)
(unknown-options menu-option 7 :offset-assert 20)
)
:method-count-assert 12
:size-assert #x30
@@ -122,7 +122,7 @@
;; definition of type menu-on-off-option
(deftype menu-on-off-option (menu-option)
((value-to-modify pointer :offset-assert 48)
((value-to-modify (pointer symbol) :offset-assert 48)
)
:method-count-assert 12
:size-assert #x34
@@ -170,10 +170,10 @@
;; definition of type menu-language-option
(deftype menu-language-option (menu-option)
((language-selection uint64 :offset-assert 48)
(language-direction basic :offset-assert 56)
(language-transition basic :offset-assert 60)
(language-x-offset int32 :offset-assert 64)
((language-selection language-enum :offset-assert 48)
(language-direction symbol :offset-assert 56)
(language-transition basic :offset-assert 60)
(language-x-offset int32 :offset-assert 64)
)
:method-count-assert 12
:size-assert #x44
@@ -392,8 +392,9 @@
;; definition of type menu-memcard-slot-option
(deftype menu-memcard-slot-option (menu-option)
((sprites hud-sprite 5 :inline :offset-assert 48)
(pad uint8 32 :offset-assert 368)
((sprites hud-sprite 5 :inline :offset-assert 48)
(something-hud-related basic :offset 112)
(pad uint8 32 :offset-assert 368)
)
:method-count-assert 12
:size-assert #x190
test/decompiler/reference/jak2/engine/ui/progress/progress-static_REF.gc
Generated Vendored
+24 -18
View File
@@ -144,19 +144,31 @@
(define *quit-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82))
;; definition for symbol *select-start-options*, type menu-option-list
(define *select-start-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82))
(define *select-start-options*
"List of [[menu-select-start-option]]"
(new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82)
)
;; definition for symbol *select-scene-options*, type menu-option-list
(define *select-scene-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82))
(define *select-scene-options*
"List of [[menu-select-scene-option]]"
(new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82)
)
;; definition for symbol *bigmap-options*, type menu-option-list
(define *bigmap-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82))
;; definition for symbol *missions-options*, type menu-option-list
(define *missions-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82))
(define *missions-options*
"List of [[menu-missions-option]]"
(new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82)
)
;; definition for symbol *highscores-options*, type menu-option-list
(define *highscores-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82))
(define *highscores-options*
"List of [[menu-highscores-option]]"
(new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82)
)
;; definition for symbol *secret-options*, type menu-option-list
(define *secret-options* (new 'static 'menu-option-list :y-center #xc6 :y-space 30 :scale 0.82))
@@ -168,30 +180,24 @@
)
)
;; definition for symbol *stereo-mode-name-remap*, type menu-option-list
;; definition for symbol *stereo-mode-name-remap*, type (array uint64)
(define *stereo-mode-name-remap*
(the-as menu-option-list (new 'static 'boxed-array :type uint32 #x104 #x105 #x106))
(the-as (array uint64) (new 'static 'boxed-array :type uint32 #x104 #x105 #x106))
)
;; definition for symbol *hud-ring-graphic-remap*, type menu-option-list
;; definition for symbol *hud-ring-graphic-remap*, type (array uint64)
(define *hud-ring-graphic-remap*
(the-as menu-option-list
(new 'static 'boxed-array :type uint64 #x80 #x40 #x10 #x4 #x8 #x400 #x20 #x100 #x200 #x2)
)
(new 'static 'boxed-array :type uint64 #x80 #x40 #x10 #x4 #x8 #x400 #x20 #x100 #x200 #x2)
)
;; definition for symbol *hud-ring-kiosk-graphic-remap*, type menu-option-list
;; definition for symbol *hud-ring-kiosk-graphic-remap*, type (array uint64)
(define *hud-ring-kiosk-graphic-remap*
(the-as menu-option-list
(new 'static 'boxed-array :type uint64 #x40 #x80 #x2 #x200 #x200 #x200 #x200 #x200 #x200 #x200)
)
(new 'static 'boxed-array :type uint64 #x40 #x80 #x2 #x200 #x200 #x200 #x200 #x200 #x200 #x200)
)
;; definition for symbol *hud-ring-demo-graphic-remap*, type menu-option-list
;; definition for symbol *hud-ring-demo-graphic-remap*, type (array uint64)
(define *hud-ring-demo-graphic-remap*
(the-as menu-option-list
(new 'static 'boxed-array :type uint64 #x80 #x2 #x200 #x200 #x200 #x200 #x200 #x200 #x200 #x200)
)
(new 'static 'boxed-array :type uint64 #x80 #x2 #x200 #x200 #x200 #x200 #x200 #x200 #x200 #x200)
)
;; definition of type hud-scene-info
test/decompiler/reference/jak2/engine/ui/progress/progress_REF.gc
Generated Vendored
+1 -2
View File
@@ -47,7 +47,7 @@
(total-num-tasks int32 :offset-assert 208)
(scene-player-act int32 :offset-assert 212)
(stereo-mode-backup int32 :offset-assert 216)
(secrets-unlocked basic :offset-assert 220)
(secrets-unlocked symbol :offset-assert 220)
(missions-total-spacing float :offset-assert 224)
(clear-screen basic :offset-assert 228)
)
@@ -2327,7 +2327,6 @@
;; WARN: Stack slot offset 148 signed mismatch
;; WARN: Stack slot offset 148 signed mismatch
;; WARN: Return type mismatch int vs none.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code? [OP: 111]
(defbehavior progress-post progress ()
(local-vars (sv-144 font-context) (sv-148 int) (sv-152 hud-box) (sv-156 symbol))
(when (-> self current-options)